gentoo auto-resync : 05:02:2023 - 15:17:02

4 files changed, 138 insertions, 1 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 6e472383da64..8e509956ac8e 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 c2b009646289..53a1ee309a0d 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -2,5 +2,7 @@ AUX 79_mod_security.conf 729 BLAKE2B 5a415b7890a6d9553ec6e974825adad596a8f6d5c3b
 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
-MISC metadata.xml 1010 BLAKE2B d8c9d6cb841ebd546aa9ac5c6e5078f846b31f8c499e69bef93777c512cc180068064b5d5c6a65c4cce179b3a5946cf3a6572ae10a2eaf6d25c6e1ac81b964f4 SHA512 0b06a417e39afc6326940eff1ed4da2aaed091b1fe01eabb58c62e5131ae7a4c922ca118799f26c91325187022052a34cd3c7979719e50b1a8837ab23468b13d
+EBUILD mod_security-2.9.7.ebuild 3026 BLAKE2B a66894e91d80acb8de5186e6c7b723b81f1f5080c752657901e092d9930a24b4961ca6b997e3c7ec3c9b9807465f85ba1c4eea85020f919b018bfd4b0c7a05ec SHA512 b2f02e704b617b8fbf12457bb2e52e4e471e2f2bd69857f50ad650e9887d8d21c27913af15e41ff6f1424002be51406e91c8728aee8f79e3f972bc3972c6c8d3
+MISC metadata.xml 1110 BLAKE2B 0f41b3a576170632aadbe53c213b4774618719d41ca4f7099cc96d4e009f065e162789025e7c6a2db32076a448d7c88b405631e796133ef65cc2b03aa2894673 SHA512 6f9e932ff1123863a0617c27c3ac0e4df6f1df5745f00c640b4d2d6e66b5c92f784e55087c70617177b6745998c8cf5e328a50a970e4b55eda547c3a1ea1462e
diff --git a/www-apache/mod_security/metadata.xml b/www-apache/mod_security/metadata.xml
index f17aaffc87b9..b17d41d2886d 100644
--- a/www-apache/mod_security/metadata.xml
+++ b/www-apache/mod_security/metadata.xml
@@ -27,6 +27,10 @@
     <flag name="mlogc">
       Build and install the ModSecurity Audit Log Collector (mlogc).
     </flag>
+
+    <flag name="pcre2">
+      Use <pkg>dev-libs/libpcre2</pkg> as regex implementation
+    </flag>
   </use>
 
   <upstream>
diff --git a/www-apache/mod_security/mod_security-2.9.7.ebuild b/www-apache/mod_security/mod_security-2.9.7.ebuild
new file mode 100644
index 000000000000..6905aea4982b
--- /dev/null
+++ b/www-apache/mod_security/mod_security-2.9.7.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2023 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 pcre2"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+DEPEND="dev-libs/apr:1=
+	dev-libs/apr-util:1[openssl]
+	dev-libs/expat
+	dev-libs/libxml2
+	dev-libs/libpcre[jit?]
+	net-misc/curl
+	sys-apps/util-linux
+	sys-libs/gdbm:=
+	virtual/libcrypt:=
+	fuzzyhash? ( app-crypt/ssdeep )
+	json? ( dev-libs/yajl )
+	lua? ( ${LUA_DEPS} )
+	mlogc? ( net-misc/curl )
+	pcre2? ( dev-libs/libpcre2:= )
+	www-servers/apache[apache2_modules_unique_id]"
+BDEPEND="doc? ( app-doc/doxygen )"
+RDEPEND="${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_enable doc docs)
+		$(use_enable jit pcre-jit)
+		$(use_enable lua lua-cache)
+		$(use_enable mlogc)
+		$(use_with fuzzyhash ssdeep)
+		$(use_with json yajl)
+		$(use_with lua)
+		$(use_with pcre2)
+	)
+
+	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"
+}