gentoo resync : 29.01.2021

4 files changed, 3 insertions, 114 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index a98c669f1de8..6e78d833a82c 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 3074490e7c86..fc08acfd5b8e 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -2,6 +2,5 @@ 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.3.tar.gz 4307670 BLAKE2B 337ea15cc8805af7ab43aed8aecf4c72ccc586d0d7e9d9b91f036a61baa70d1ac8b4ad8045a2bb7a13515912a15fba7d3cdb9670ae6730de43b1e44ee90ded6d SHA512 4e1ea5dd8edadf8f630e4fe92a200d3a8e78963fce3128b5975a1e1ecd0e8bf9ceecd9905c95f8c508932ccd837f1d8ae8bb2ba423307718c3c6a4ae9b783ddd
-EBUILD mod_security-2.9.3-r100.ebuild 2851 BLAKE2B 2ce146a5fa6e98367e1aa04af2020aded1df267114d4e1e3427ae5c7c48eaa1f0e90ea478b750a46c24e047c8b56f9f1b0ed3c961800fc96eaa8999b797fc376 SHA512 16e168aa3a048c1cccfa97b2fa34b7f8fa52abb8469ceb14f298d03ff38b47ecd729f7797e168da7e7a4652da9cfff6ddbd2bd293697e8f8fea0175e5f629041
-EBUILD mod_security-2.9.3.ebuild 2616 BLAKE2B 631564cae9c3f1eb59581a5a28b9959e44ef2da0c05f063c51df464acc9e775263f524d168027dea3ba52ba8acf7398326dcab8dae9c5b7d2e4283ffc710a784 SHA512 a773cde184c3a8f8f03d6eaddefabd9ec700262350cdd99d26eaba0ec13b97a0b281124412f9652652b09e62145eec1db0e540064490335ef5c4023d8ac1064f
+EBUILD mod_security-2.9.3-r100.ebuild 2849 BLAKE2B 25a047e91c5bcd5af99a98d3f375f04408a82b5148f515749ecac12451f05e660145787da6fc68a23c4943832fa9d7981b7308160d21232dc34e960ea6908765 SHA512 e0217d04636dd5084fd8f8b5c2bca710fd17d3d26ccba60bcf49523b10581e48046198e2cc5526882a644a5f270ca90315a4afb42088a7eaa035f522d5277a7b
 MISC metadata.xml 1009 BLAKE2B a3a9f32a3cebe4447b0ec621c62292f77bb988a3860f6eae63974b794a028f763a5603f35673d9cb82d3836ed24168c12e24ede6109db65dc9521617b293cec9 SHA512 98f9e6ded7565d6d0dbb50804de7fbf9079bc7f8ed2cfe1fe640d09a23fb88e9ef3242557b2418e3c12af747b7b647b29cc950702bbef57050d56d5e5012852d
diff --git a/www-apache/mod_security/mod_security-2.9.3-r100.ebuild b/www-apache/mod_security/mod_security-2.9.3-r100.ebuild
index 270824b6cb66..b367e95e44be 100644
--- a/www-apache/mod_security/mod_security-2.9.3-r100.ebuild
+++ b/www-apache/mod_security/mod_security-2.9.3-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://www.modsecurity.org/tarball/${PV}/${MY_P}.tar.gz"
 
 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/mod_security/mod_security-2.9.3.ebuild b/www-apache/mod_security/mod_security-2.9.3.ebuild
deleted file mode 100644
index c7a7974d2d08..000000000000
--- a/www-apache/mod_security/mod_security-2.9.3.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit apache-module
-
-MY_PN=modsecurity
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Application firewall and intrusion detection for Apache"
-HOMEPAGE="https://www.modsecurity.org/"
-SRC_URI="https://www.modsecurity.org/tarball/${PV}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc fuzzyhash geoip jit json lua mlogc"
-
-COMMON_DEPEND="dev-libs/apr
-	dev-libs/apr-util[openssl]
-	dev-libs/libxml2
-	dev-libs/libpcre[jit?]
-	fuzzyhash? ( app-crypt/ssdeep )
-	json? ( dev-libs/yajl )
-	lua? ( dev-lang/lua:0 )
-	mlogc? ( net-misc/curl )
-	www-servers/apache[apache2_modules_unique_id]"
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )"
-RDEPEND="${COMMON_DEPEND}
-	geoip? ( dev-libs/geoip )
-	mlogc? ( dev-lang/perl )"
-PDEPEND=">=www-apache/modsecurity-crs-2.2.6-r1"
-
-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
-
-need_apache2
-
-pkg_setup() {
-	_init_apache2
-	_init_apache2_late
-}
-
-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
-
-	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"
-}