Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apache/modsecurity-crs/
Date: Tue, 29 Dec 2020 02:00:23
Message-Id: 1609207182.afcb3db2b6daac76d20b7c7009305e75f8b7e3bb.sam@gentoo
1 commit: afcb3db2b6daac76d20b7c7009305e75f8b7e3bb
2 Author: John Helmert III <jchelmert3 <AT> posteo <DOT> net>
3 AuthorDate: Sun Dec 27 07:29:37 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 29 01:59:42 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afcb3db2
7
8 www-apache/modsecurity-crs: security cleanup (drop <3.3.0)
9
10 Bug: https://bugs.gentoo.org/719250
11 Package-Manager: Portage-3.0.12, Repoman-3.0.2
12 Signed-off-by: John Helmert III <jchelmert3 <AT> posteo.net>
13 Closes: https://github.com/gentoo/gentoo/pull/18826
14 Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16 www-apache/modsecurity-crs/Manifest | 2 -
17 .../modsecurity-crs/modsecurity-crs-3.0.2.ebuild | 55 ----------------------
18 .../modsecurity-crs/modsecurity-crs-3.1.0.ebuild | 38 ---------------
19 3 files changed, 95 deletions(-)
20
21 diff --git a/www-apache/modsecurity-crs/Manifest b/www-apache/modsecurity-crs/Manifest
22 index 06878bd7d39..400f6d47b8f 100644
23 --- a/www-apache/modsecurity-crs/Manifest
24 +++ b/www-apache/modsecurity-crs/Manifest
25 @@ -1,3 +1 @@
26 -DIST modsecurity-crs-3.0.2.tar.gz 156751 BLAKE2B 111a330b6081d476899be321e15d74379b3c3db23f429a4a4ef1900c87e4b29229638acf3bb367745446ef97ccba4679db91b0d84bae93f2c127bbb6e8031851 SHA512 ae8fe9a0f00a57708c8680cb76882214e4f5ff647e13087aaf1bfc7382cefb38d2f3a88eb1f210031b553f56d3e44c12dbdc68f8b0d09fb4a9e2f15a70d885aa
27 -DIST modsecurity-crs-3.1.0.tar.gz 250617 BLAKE2B 6081d09e90f3c18435e046264ff8c0b700fd0c8c2b6377f44517fce3ad74dcf1d6a8cf7eaf055b85040b21196b603bcb762f5a7ed237d14b6a05f1febd623cda SHA512 d613d2af8248424ac5d4d006a9f221b07c714fb47f84e6ec237b1389379b50dce984f51121cc22b69d148910169b5257b11558656640bc8349d0b09d9e70bb11
28 DIST modsecurity-crs-3.3.0.tar.gz 290379 BLAKE2B 557a41e937564698809ecca40d4e76e5c1d3617b62189b7ca230ac7533cba14fdf619bef81c1e40a996dd260d2eb52c27563437dd795c2412bf38715f026f300 SHA512 12043aae12b5e01455e229136411e1fdef3a14318aff191d190b567463b63efb72630a695449b56f1d654ed1cfc0b4eb452a64502c35337d37cce920d5fa4ea4
29
30 diff --git a/www-apache/modsecurity-crs/modsecurity-crs-3.0.2.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-3.0.2.ebuild
31 deleted file mode 100644
32 index be8a3b86af7..00000000000
33 --- a/www-apache/modsecurity-crs/modsecurity-crs-3.0.2.ebuild
34 +++ /dev/null
35 @@ -1,55 +0,0 @@
36 -# Copyright 1999-2018 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=6
40 -
41 -DESCRIPTION="Core Rule Set for ModSecurity"
42 -HOMEPAGE="
43 - https://www.owasp.org/index.php/Category:OWASP_ModSecurity_Core_Rule_Set_Project
44 - https://modsecurity.org/crs/
45 - https://coreruleset.org/"
46 -SRC_URI="https://github.com/SpiderLabs/owasp-${PN}/archive/v${PV}.tar.gz
47 - -> ${P}.tar.gz"
48 -
49 -LICENSE="Apache-2.0"
50 -SLOT="0"
51 -KEYWORDS="amd64 x86"
52 -IUSE=""
53 -
54 -DEPEND=""
55 -RDEPEND=">=www-apache/mod_security-2.9.1"
56 -
57 -S="${WORKDIR}/owasp-${P}"
58 -
59 -src_install() {
60 - insinto "/usr/share/${PN}"
61 - doins -r rules
62 -
63 - dodoc CHANGES CONTRIBUTORS KNOWN_BUGS README.md crs-setup.conf.example \
64 - id_renumbering/{IDNUMBERING,IdNumbering.csv}
65 -
66 - # I don't think it's worth pulling in apache-module.eclass just for
67 - # this path...
68 - insinto /etc/apache2/modules.d
69 - doins "${FILESDIR}/80_mod_security-crs.conf"
70 -}
71 -
72 -pkg_postinst() {
73 - einfo "The CRS configuration file has been installed to"
74 - einfo
75 - einfo " ${ROOT}etc/apache2/modules.d/80_mod_security-crs.conf"
76 - einfo
77 - einfo "The CRS rules have been renumbered as of version 3.0.0."
78 - einfo "If your configuration refers to any rules based on their"
79 - einfo "number, then you will need to update your configuration"
80 - einfo "to reflect the new numbering system. You can find more"
81 - einfo "information in"
82 - einfo
83 - einfo " ${ROOT}usr/share/doc/${PF}/IDNUMBERING"
84 - einfo
85 - einfo "and a CSV file containing the old -> new rule number"
86 - einfo "mapping was installed as"
87 - einfo
88 - einfo " ${ROOT}usr/share/doc/${PF}/IdNumbering.csv"
89 - einfo
90 -}
91
92 diff --git a/www-apache/modsecurity-crs/modsecurity-crs-3.1.0.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-3.1.0.ebuild
93 deleted file mode 100644
94 index c0b847fe636..00000000000
95 --- a/www-apache/modsecurity-crs/modsecurity-crs-3.1.0.ebuild
96 +++ /dev/null
97 @@ -1,38 +0,0 @@
98 -# Copyright 1999-2019 Gentoo Authors
99 -# Distributed under the terms of the GNU General Public License v2
100 -
101 -EAPI=7
102 -
103 -DESCRIPTION="Core Rule Set for ModSecurity"
104 -HOMEPAGE="
105 - https://www.owasp.org/index.php/Category:OWASP_ModSecurity_Core_Rule_Set_Project
106 - https://modsecurity.org/crs/
107 - https://coreruleset.org/"
108 -SRC_URI="https://github.com/SpiderLabs/owasp-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
109 -
110 -LICENSE="Apache-2.0"
111 -SLOT="0"
112 -KEYWORDS="~amd64 ~x86"
113 -IUSE=""
114 -
115 -DEPEND=""
116 -RDEPEND=">=www-apache/mod_security-2.9.1"
117 -
118 -S="${WORKDIR}/owasp-${P}"
119 -
120 -src_install() {
121 - insinto "/usr/share/${PN}"
122 - doins -r rules
123 -
124 - dodoc CHANGES CONTRIBUTORS.md KNOWN_BUGS README.md crs-setup.conf.example
125 -
126 - # I don't think it's worth pulling in apache-module.eclass just for
127 - # this path...
128 - insinto /etc/apache2/modules.d
129 - doins "${FILESDIR}/80_mod_security-crs.conf"
130 -}
131 -
132 -pkg_postinst() {
133 - einfo "The CRS configuration file has been installed to:"
134 - einfo " ${ROOT}/etc/apache2/modules.d/80_mod_security-crs.conf"
135 -}