gentoo auto-resync : 11:01:2024 - 19:06:52

5 files changed, 10 insertions, 135 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 469fed16e20e..65c239b53fbf 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 373aaa4e6c38..9b242f22e372 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -1,8 +1,6 @@
 AUX 79_mod_security.conf 729 BLAKE2B 5a415b7890a6d9553ec6e974825adad596a8f6d5c3b9ca0b7b9c4b2c3a788838d272343037d91cf94e8195510e7e395fc07d6a2ef2c6647695470714a79a7875 SHA512 2b99b28b58795dd45a76046609e7a4a6958ebd28c28c288cb7b732ec99191e218e6dd838a3c288220f267ad8c3b6004d1d6c6addac8df8be4c568a9f2fb54a92
 AUX mod_security-2.9.3-autoconf_lua_package_name.patch 350 BLAKE2B 272cb5f4c2fc666423b762d3ceca73f305ba7b280e4ac3e65f45111cea18b4b1edc923c56225f4a422cdeb54b381a40f5152a338d767b037bf1c7806de1bc4a5 SHA512 0abeba7b02cd0aef25f61a811b258bee6025c43ec9c2ebe98542e2e5dab2cb2060055058d4c2f2b235f7b2773ced53ab2173be6c9de3cb46c16d5bdbd7af13c8
 AUX modsecurity-2.7.conf 394 BLAKE2B c9d55e8b4419e5b54a364e03dd02e9d0e5609954d1538c77baa33e0abc46110fa8aaf3207490a80a2fedc13d42558632703ee4552ebbaa99d67d929720008dd2 SHA512 ab8c1ee6372249613f853654f115102c7951ea021f47389510bca6c5d1226e7aa9d90bb47649cf4ca62b8d8f926eba9f5c0b02321851ec2e8452de70dd4c1839
-DIST modsecurity-2.9.6.tar.gz 4316582 BLAKE2B f344f8630218c401a3b0eb0de9f5f23d9d1f9f65bf5c4cff2d8d0ea3ebd27cf0202ce2199b1c6d923237ee49a3b151cce46a8de3563fa743cf119c8c25270af3 SHA512 54b3316950094b3951fcfdd82bbacd34dfa8f5500b9a772d3296f411711bad0dcad51068b25cb2c196fdc4b2e1095d54701370d25180c0c68cf0913bd7d4ea03
 DIST modsecurity-2.9.7.tar.gz 4320766 BLAKE2B 2e0c62ae4f6fcef0b41bf1f74ab5acbae485e728f35bf621a96e622d86e2256c7e052d3a452ff49a4c4cb824243e71a706f9a5868bb3f77e37191a1dfe1b371b SHA512 a333d142f0dedf332a3cccca8267ccf9193cd4ad5a026b3cdbe0713dd1f3edde33739eae8baced2c63409cc0b220001e0a226ea032874a97c08e4065eb1fbdd5
-EBUILD mod_security-2.9.6.ebuild 2931 BLAKE2B 08a8f6a93e70d500a6bb42be6e716bd1aaed9e5f79111fc37c6c99aea90db46ae87bd84b476ed0b4c823bdcaa904314420efcdb2bcfd987d21fd9f1c7f0e6816 SHA512 6cd1ba268e27d0b2e41118a71a3ff7c3a611515109ed5431764684ab6eb03fe1644a2ef46d59904ab4d3f3331d9a49a779e0f15b549c0c75c071d72a504197a9
 EBUILD mod_security-2.9.7.ebuild 3024 BLAKE2B 9d6eee3233fe87c8c166a9245184902ac8ad9af806465186b9fb17d6be90d471f555f819bd611ebb0cc65065308786d729cb9106d14389ba8469bfc06ea1f8a3 SHA512 d4cd9bce1ed2fde8231d40fa65e0294bba8113b4dbd83ff8fa958d1fcd4db5da3eb442b0ccb2fda3b92f938a30b6098989018c6a9f6e653b55636436e9f31df6
 MISC metadata.xml 1110 BLAKE2B 0f41b3a576170632aadbe53c213b4774618719d41ca4f7099cc96d4e009f065e162789025e7c6a2db32076a448d7c88b405631e796133ef65cc2b03aa2894673 SHA512 6f9e932ff1123863a0617c27c3ac0e4df6f1df5745f00c640b4d2d6e66b5c92f784e55087c70617177b6745998c8cf5e328a50a970e4b55eda547c3a1ea1462e
diff --git a/www-apache/mod_security/mod_security-2.9.6.ebuild b/www-apache/mod_security/mod_security-2.9.6.ebuild
deleted file mode 100644
index 7855dcafcbd0..000000000000
--- a/www-apache/mod_security/mod_security-2.9.6.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-
-inherit autotools apache-module lua-single
-
-MY_PN=modsecurity
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Application firewall and intrusion detection for Apache"
-HOMEPAGE="https://github.com/SpiderLabs/ModSecurity"
-SRC_URI="https://github.com/SpiderLabs/ModSecurity/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc fuzzyhash geoip jit json lua mlogc"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-COMMON_DEPEND="dev-libs/apr
-	dev-libs/apr-util[openssl]
-	dev-libs/libxml2
-	dev-libs/libpcre[jit?]
-	virtual/libcrypt:=
-	fuzzyhash? ( app-crypt/ssdeep )
-	json? ( dev-libs/yajl )
-	lua? ( ${LUA_DEPS} )
-	mlogc? ( net-misc/curl )
-	www-servers/apache[apache2_modules_unique_id]"
-BDEPEND="doc? ( app-doc/doxygen )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	geoip? ( dev-libs/geoip )
-	mlogc? ( dev-lang/perl )"
-PDEPEND=">=www-apache/modsecurity-crs-3.3.2"
-
-S="${WORKDIR}/${MY_P}"
-
-APACHE2_MOD_FILE="apache2/.libs/${PN}2.so"
-APACHE2_MOD_CONF="79_${PN}"
-APACHE2_MOD_DEFINE="SECURITY"
-
-# Tests require symbols only defined within the Apache binary.
-RESTRICT=test
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.3-autoconf_lua_package_name.patch
-)
-
-need_apache2
-
-pkg_setup() {
-	_init_apache2
-	_init_apache2_late
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		--enable-request-early
-		--with-apxs="${APXS}"
-		--with-pic
-		$(use_with fuzzyhash ssdeep)
-		$(use_with json yajl)
-		$(use_enable mlogc)
-		$(use_with lua)
-		$(use_enable lua lua-cache)
-		$(use_enable jit pcre-jit)
-		$(use_enable doc docs) )
-
-	econf ${myconf[@]}
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	apache-module_src_install
-
-	dodoc CHANGES README.md modsecurity.conf-recommended unicode.mapping
-
-	if use doc; then
-		dodoc -r doc/apache/html
-	fi
-
-	if use mlogc; then
-		insinto /etc/
-		newins mlogc/mlogc-default.conf mlogc.conf
-		dobin mlogc/mlogc
-		dobin mlogc/mlogc-batch-load.pl
-		newdoc mlogc/INSTALL INSTALL-mlogc
-	fi
-
-	# Use /var/lib instead of /var/cache. This stuff is "persistent,"
-	# and isn't a cached copy of something that we can recreate.
-	# Bug 605496.
-	keepdir /var/lib/modsecurity
-	fowners apache:apache /var/lib/modsecurity
-	fperms 0750 /var/lib/modsecurity
-	for dir in data tmp upload; do
-		keepdir "/var/lib/modsecurity/${dir}"
-		fowners apache:apache "/var/lib/modsecurity/${dir}"
-		fperms 0750 "/var/lib/modsecurity/${dir}"
-	done
-}
-
-pkg_postinst() {
-	elog "The base configuration file has been renamed ${APACHE2_MOD_CONF}"
-	elog "so that you can put your own configuration in (for example)"
-	elog "90_modsecurity_local.conf."
-	elog ""
-	elog "That would be the correct place for site-global security rules."
-	elog "Note: 80_modsecurity_crs.conf is used by www-apache/modsecurity-crs"
-}
diff --git a/www-apache/modsecurity-crs/Manifest b/www-apache/modsecurity-crs/Manifest
index 4a889f9c8388..dacc855a0e04 100644
--- a/www-apache/modsecurity-crs/Manifest
+++ b/www-apache/modsecurity-crs/Manifest
@@ -1,6 +1,6 @@
 AUX 80_mod_security-crs.conf 289 BLAKE2B 441b2f4d46e62ff24886b94dc933b08de8693ad7198cc855a8b0c322ba045e6409b7d3b7b2e2fdc0bd412ee9fdd3761987d59f405de5a84d5e8c96d2dd14ab76 SHA512 e5b86164a68e15d67a294688c993799fca10928c1265cee04555becfb17fb516314471d8c4eaea1205ac1703890cedb4647d93ce75b0a2a1ab9a401a495465dc
-DIST modsecurity-crs-3.3.4.tar.gz 301112 BLAKE2B 0df4b70c5ecc1852fe3cde74783494636c530cc8a2b8ddc0269da25703521532ee3ed6ba1e572b854fe6912f31d2ed1fe4c917b13dc22b37763dbe73ef8c7b72 SHA512 a8b8b210054a9a4e3f8e45a5a9428110bb4075e40430e3fc16f4717e363af141265b1fb5c173ff96abeff0ac61ef5eef667a4b9cb703f8edc15e48deb3342827
 DIST modsecurity-crs-3.3.5.tar.gz 299458 BLAKE2B b8617de77cf5168c7b95fab46eae45e2101b4ec7a537d8d471b9b1b27a856b1d370a9de43ee262c07dc9371b3ff79cd86b7328b171fde003da9110897206e91e SHA512 001f9afe25f479dd988aaec1a4a2c0197b2d27e00d2cd10b70892e4889b399259cd0655f42a96965ae655855abdb7f9d8295c225ae17bf1e47361b70232633e5
-EBUILD modsecurity-crs-3.3.4.ebuild 1059 BLAKE2B df001f20eecdcafb5f5fd12bbaaa37ba304659c31322d8b00856ac571af11611c67441e19f3c897856ef13bfa9b7cf945e371ab7dff0e36f0353adfbb287fff9 SHA512 b2c33f63d218d6e0b0fd5074d2195d5a15c738e28a32764b11b9eaa3167292755e047863ded83880afa2e321e9a7bd3f9b180976265cc8c2a3c863095e3d2a84
+DIST modsecurity-crs-4.0.0_rc2.tar.gz 491479 BLAKE2B 71a016b7e45a991373357ece9cc7a59afe54daf91ffa826b76fd4a986b6e8989efb54ca3b83fac9307cf6ede1e1f7a78f9534cc5682e63ea3d75b9092c295d30 SHA512 302129aa3c476afd84b41bfdf73afaa1561f300ecad6ea3540d977639dc3c2167169298fbbe453ceb108d10dee3835b2e4f30f0c12cc413d3acd530906123021
 EBUILD modsecurity-crs-3.3.5.ebuild 1062 BLAKE2B 3b697a9b74293ef96c1d4d7638abb79a3ed32e393eb788e9e8efb552e6624b904b71ccae381a5db9597bc225e51e4ba665e10b9621342a26ea0f586bede77925 SHA512 e97eb99fbd642956c3b64e6e7cb260bf1c5b83122d9c79822f1d2b8c533337fe9c179b2011782988a31f7073447b2e97c05c308c48abd4c6fce1de0bf9c7a7f8
+EBUILD modsecurity-crs-4.0.0_rc2.ebuild 1098 BLAKE2B fb13e454c1ab3e99b724890e027b7c202d300d98c728b567599d7b036e6c4015ad11714f2b8855c4cf1219cd779afe9418a86bd3239ac0a3ba0c3ae717e68295 SHA512 67dcdb18c8b15e670b2e8afd4d48036a442d693d66e486498106f6cbf92ad51bd16d769dac978e991d4106569767ea5581f0f5c7ffacb5d6eff787c63449a91e
 MISC metadata.xml 254 BLAKE2B 1d5f172b57a97b9a944fc05ce672b09fa81d2468756786518e06e809bffe571e7296fd1dd3988833af4dfbf85d14ad5cfd89fc337562f044422d30cb87740169 SHA512 817d5613af5a0a1e9a2aadcc5319fef2c0c36fa979c2c514e7b938eeebb2a4d83cc2ec478f4f26fef937847b2ffebd5671dbe5aa7b4c43122efd629f57b17d16
diff --git a/www-apache/modsecurity-crs/modsecurity-crs-3.3.4.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-4.0.0_rc2.ebuild
index 867ab1147f42..1a0a134d3046 100644
--- a/www-apache/modsecurity-crs/modsecurity-crs-3.3.4.ebuild
+++ b/www-apache/modsecurity-crs/modsecurity-crs-4.0.0_rc2.ebuild
@@ -1,27 +1,29 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit optfeature
 
+MY_PV=${PV/_/-}
+
 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"
-S="${WORKDIR}/coreruleset-${PV}"
+SRC_URI="https://github.com/coreruleset/coreruleset/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/coreruleset-${MY_PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+apache2"
 
 RDEPEND="apache2? ( >=www-apache/mod_security-2.9.6 )"
 
-DOCS=( CHANGES CONTRIBUTORS.md crs-setup.conf.example KNOWN_BUGS README.md )
+DOCS=( CHANGES.md CONTRIBUTORS.md crs-setup.conf.example KNOWN_BUGS.md README.md )
 
 src_install() {
 	insinto "/usr/share/${PN}"
-	doins -r rules
+	doins -r plugins rules
 
 	einstalldocs