gentoo auto-resync : 02:12:2022 - 08:55:37

6 files changed, 4 insertions, 39 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 2cd205621186..93b0a5750d14 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index ce03f71bffaf..ae1e8ee92d96 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -5,5 +5,5 @@ DIST modsecurity-2.9.5.tar.gz 4315037 BLAKE2B f6e607f344038c74fbbacbba6bbeb5953a
 DIST modsecurity-2.9.6.tar.gz 4316582 BLAKE2B f344f8630218c401a3b0eb0de9f5f23d9d1f9f65bf5c4cff2d8d0ea3ebd27cf0202ce2199b1c6d923237ee49a3b151cce46a8de3563fa743cf119c8c25270af3 SHA512 54b3316950094b3951fcfdd82bbacd34dfa8f5500b9a772d3296f411711bad0dcad51068b25cb2c196fdc4b2e1095d54701370d25180c0c68cf0913bd7d4ea03
 EBUILD mod_security-2.9.5-r1.ebuild 2936 BLAKE2B d56fab859bc895277502a55215ed73b6ee2e42a3a259b2ced63121e791661746ed4935911e20e069e1090b73584f4fcbfd00d34f646fdfe64840bdb85326d159 SHA512 9f2b70bff4dbc2d1b6d04546ada68bb7295416a3f41ccfef6056e0db10c1dbbd2b4722f20596cf75ccbee62c270696973ed2a9a236255e97e07a7a67c559a003
 EBUILD mod_security-2.9.5.ebuild 2918 BLAKE2B 8d83eb1f0ff8b009e04134bfd0b87e1aa8b09cd0f244945bb74a884a8659f59e645888280f66aec86c6fc1c02e8e0c3dc8478ae67ba115a4682fab13dbdaec85 SHA512 6decbeaa979a16892ac5f0a0701aa896ee3ddc1b55c679fb0a03b817d298f35ec74f2102a96c400456c929d0a1e52598b726275afa6450a071bfffbbe0ed8430
-EBUILD mod_security-2.9.6.ebuild 2933 BLAKE2B 18612151353a716e469cc982d4ce0c6fbf3343e4654282843513d2640d0335ff4a6a414e0fcda4ba55fb85da79119820abffff516a239eecd1d31f1aa43e41be SHA512 c6e11f85c1db643247957414039fa9e693d65cfd2555871d2a0f5907139114809260d960d559f158c809ad721a5ad60244644f0bb9c887a2480ac47bdcf68756
+EBUILD mod_security-2.9.6.ebuild 2931 BLAKE2B 08a8f6a93e70d500a6bb42be6e716bd1aaed9e5f79111fc37c6c99aea90db46ae87bd84b476ed0b4c823bdcaa904314420efcdb2bcfd987d21fd9f1c7f0e6816 SHA512 6cd1ba268e27d0b2e41118a71a3ff7c3a611515109ed5431764684ab6eb03fe1644a2ef46d59904ab4d3f3331d9a49a779e0f15b549c0c75c071d72a504197a9
 MISC metadata.xml 1010 BLAKE2B d8c9d6cb841ebd546aa9ac5c6e5078f846b31f8c499e69bef93777c512cc180068064b5d5c6a65c4cce179b3a5946cf3a6572ae10a2eaf6d25c6e1ac81b964f4 SHA512 0b06a417e39afc6326940eff1ed4da2aaed091b1fe01eabb58c62e5131ae7a4c922ca118799f26c91325187022052a34cd3c7979719e50b1a8837ab23468b13d
diff --git a/www-apache/mod_security/mod_security-2.9.6.ebuild b/www-apache/mod_security/mod_security-2.9.6.ebuild
index b268a75af0c6..7855dcafcbd0 100644
--- a/www-apache/mod_security/mod_security-2.9.6.ebuild
+++ b/www-apache/mod_security/mod_security-2.9.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/SpiderLabs/ModSecurity/releases/download/v${PV}/${MY
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc fuzzyhash geoip jit json lua mlogc"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
diff --git a/www-apache/modsecurity-crs/Manifest b/www-apache/modsecurity-crs/Manifest
index 4a74ebba5f86..aab39dcf4e57 100644
--- a/www-apache/modsecurity-crs/Manifest
+++ b/www-apache/modsecurity-crs/Manifest
@@ -1,6 +1,4 @@
 AUX 80_mod_security-crs.conf 289 BLAKE2B 441b2f4d46e62ff24886b94dc933b08de8693ad7198cc855a8b0c322ba045e6409b7d3b7b2e2fdc0bd412ee9fdd3761987d59f405de5a84d5e8c96d2dd14ab76 SHA512 e5b86164a68e15d67a294688c993799fca10928c1265cee04555becfb17fb516314471d8c4eaea1205ac1703890cedb4647d93ce75b0a2a1ab9a401a495465dc
-DIST modsecurity-crs-3.3.2.tar.gz 290450 BLAKE2B 2935b781af44a206eec881a2c06669db91da98a4d74936299651a77417a2eeaf6d4ab9a1566c08fc4bfb2a60d0b38e71d746d726578ce220b59c9c9cbd800190 SHA512 a5d96fb949da82120a1c4cda4dcf804b06aaae71f25cded5ee998d2c4e766ae2de88e42cd52fc9d63e204415e829af27d80614e58b55509e7bd7ffc20a26cfba
 DIST modsecurity-crs-3.3.4.tar.gz 301112 BLAKE2B 0df4b70c5ecc1852fe3cde74783494636c530cc8a2b8ddc0269da25703521532ee3ed6ba1e572b854fe6912f31d2ed1fe4c917b13dc22b37763dbe73ef8c7b72 SHA512 a8b8b210054a9a4e3f8e45a5a9428110bb4075e40430e3fc16f4717e363af141265b1fb5c173ff96abeff0ac61ef5eef667a4b9cb703f8edc15e48deb3342827
-EBUILD modsecurity-crs-3.3.2.ebuild 864 BLAKE2B e4e27d9568b68fca964da7e72a8a3508a74f349d2a706a2828fc076324285da2debc3d086960ced40d24b0a1d7bb39ed040e20530916d3496f83204345ecc2eb SHA512 e195c92405f68c839d4d3b82b4951d9b19db5d5cc09d798ae66c94f7d684a0bd68c61380af21f03dd105bb09840f0d15e560cfa08b291587f54d201bddf55a61
-EBUILD modsecurity-crs-3.3.4.ebuild 1061 BLAKE2B 178504371814129253a1e3487a4be879128f1854a111969246714ef039ce1f3122294b3f5edac28225f5af222a2408c3c860c50638422dba810d8eb2f35f6784 SHA512 f544409bcec7866b525b4ed83ca47a93a065b012e944bc8515195f364c6c759ee69693f8886654661eadcfb41a49f8cbe9b830f2174efaec4852015fee46be2c
+EBUILD modsecurity-crs-3.3.4.ebuild 1059 BLAKE2B df001f20eecdcafb5f5fd12bbaaa37ba304659c31322d8b00856ac571af11611c67441e19f3c897856ef13bfa9b7cf945e371ab7dff0e36f0353adfbb287fff9 SHA512 b2c33f63d218d6e0b0fd5074d2195d5a15c738e28a32764b11b9eaa3167292755e047863ded83880afa2e321e9a7bd3f9b180976265cc8c2a3c863095e3d2a84
 MISC metadata.xml 254 BLAKE2B 1d5f172b57a97b9a944fc05ce672b09fa81d2468756786518e06e809bffe571e7296fd1dd3988833af4dfbf85d14ad5cfd89fc337562f044422d30cb87740169 SHA512 817d5613af5a0a1e9a2aadcc5319fef2c0c36fa979c2c514e7b938eeebb2a4d83cc2ec478f4f26fef937847b2ffebd5671dbe5aa7b4c43122efd629f57b17d16
diff --git a/www-apache/modsecurity-crs/modsecurity-crs-3.3.2.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-3.3.2.ebuild
deleted file mode 100644
index a16ae9fa633f..000000000000
--- a/www-apache/modsecurity-crs/modsecurity-crs-3.3.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-DESCRIPTION="OWASP ModSecurity Core Rule Set"
-HOMEPAGE="https://coreruleset.org/"
-SRC_URI="https://github.com/coreruleset/coreruleset/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=www-apache/mod_security-2.9.1"
-
-S="${WORKDIR}/coreruleset-${PV}"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins -r rules
-
-	dodoc CHANGES CONTRIBUTORS.md KNOWN_BUGS README.md crs-setup.conf.example
-
-	# I don't think it's worth pulling in apache-module.eclass just for
-	# this path...
-	insinto /etc/apache2/modules.d
-	doins "${FILESDIR}/80_mod_security-crs.conf"
-}
-
-pkg_postinst() {
-	einfo "The CRS configuration file has been installed to:"
-	einfo "  ${ROOT}/etc/apache2/modules.d/80_mod_security-crs.conf"
-}
diff --git a/www-apache/modsecurity-crs/modsecurity-crs-3.3.4.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-3.3.4.ebuild
index 9782d5529222..867ab1147f42 100644
--- a/www-apache/modsecurity-crs/modsecurity-crs-3.3.4.ebuild
+++ b/www-apache/modsecurity-crs/modsecurity-crs-3.3.4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/coreruleset-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+apache2"
 
 RDEPEND="apache2? ( >=www-apache/mod_security-2.9.6 )"