gentoo resync : 25.11.2020

15 files changed, 368 insertions, 32 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index f07efbb4330e..d9076e206ce5 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/libapreq2/Manifest b/www-apache/libapreq2/Manifest
index 73b4cb1c8266..6549d672fc22 100644
--- a/www-apache/libapreq2/Manifest
+++ b/www-apache/libapreq2/Manifest
@@ -1,5 +1,7 @@
 AUX 76_mod_apreq.conf 316 BLAKE2B 368a404fae7bf917eb61090c90b19d090d607f54ffb717f1fa7154af6db0c1b71f6022e4ee38b1588c56b6777adb5eee4402377a33c4d78601bb19d0074a8de3 SHA512 2a4d7c8415162d27ae182f091b8a2219c2865ff7ace0a5b8944e853cd256955888482877ab7cce55342a3d30686f9d7932bbbfdcc8c037e15c92e60de9eab20b
 AUX libapreq2-2.08-doc.patch 1188 BLAKE2B 296bf0b1e23389c0d418df23768e68932c22f0b4f51f1b7e3e4e2d0f4d96dde2a687c9c2e5885fbdba2b936efd5947d13c3aacc7ba69d40ce5a956593fce4ca4 SHA512 dc889d7890d9059efdb3fcd4d6b1e485929b69c073ff6266b90f82e89efe5bdd633fd4dc09ccd4aac3f8816271c00dca69b39ffe4706baf7d3094404784cd766
 DIST libapreq2-2.13.tar.gz 891320 BLAKE2B 6e896b95a17d7e4eede651bd74f21280d77b38c1c96be790c34993307a0435ea6d4626825dc215680e1fa2cd6a3ec635fcbeb9fda3b34e687ed8f7641b4fee7e SHA512 54553cb90c0d3f6fb34ff19364c5804976c4aff1bae551ae051fdd06f41695770f1e285c40e03dbd93ae738adc332f38f1a1994167598364071feaec833fdf05
+DIST libapreq2-2.15.tar.gz 839618 BLAKE2B 875aa8091512cf6b43c8654579b3d4779ea50835784380dcf69ca048f9b8d4ef6e573fef5ee03c0e47a929dcd8c4643d5dc861d875122095024bca6e8fbbf38c SHA512 abdc34f4867ba891966e7296c8110cffaa723f9b966522a1de352bc459e89e5cfc60de25dcd20cf0fa9b7cdf9282719b0276b621af8aa7bb770c89a7fbae4701
 EBUILD libapreq2-2.13-r1.ebuild 1431 BLAKE2B 3fb9ee38eca5794203c451fc80cce1b6c5871559142b0410a0ab639ca9333d82e29440a38eb09521b2af89c7e257794ec5973d846a4375a6dab280a36f5ea642 SHA512 751c34af300a3b020a0df6ad82882ffdf840f6fd28295c3bc388d3c902080efab7537e9ea349880a478e274b9966c8eefa8f27a1db4295dfe53df11ad189e60a
+EBUILD libapreq2-2.15.ebuild 1559 BLAKE2B 5be336e3f8fa03d4c0234df4fdf11b08cd8bd28093f98ac45047bbf5defa0e14c5cc07a607a2bbfe9abb4acf372f4ac7c16371161b7f7f89b8828c66b9cdd39e SHA512 aa0e32e960db21598b1878cc59a0876a3099be11da15002e71c3e023e228f0cf9d5afa9a83a772479e68e3dada4c6ebbbe6b5215a070b19afc4c6fc3235141fe
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/www-apache/libapreq2/libapreq2-2.15.ebuild b/www-apache/libapreq2/libapreq2-2.15.ebuild
new file mode 100644
index 000000000000..03aadcb290e7
--- /dev/null
+++ b/www-apache/libapreq2/libapreq2-2.15.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit apache-module perl-module
+
+DESCRIPTION="A library for manipulating client request data via the Apache API"
+SRC_URI="mirror://apache/httpd/libapreq/${P}.tar.gz"
+HOMEPAGE="https://httpd.apache.org/apreq/"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="perl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	perl? (
+		>=dev-perl/ExtUtils-XSBuilder-0.23
+		virtual/perl-version
+		>=www-apache/mod_perl-2
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/Apache-Test )
+"
+
+PATCHES=(
+	"${FILESDIR}"/libapreq2-2.08-doc.patch
+)
+
+APACHE2_MOD_FILE="module/apache2/.libs/mod_apreq2.so"
+APACHE2_MOD_CONF="76_mod_apreq"
+APACHE2_MOD_DEFINE="APREQ"
+DOCFILES="docs/html/*.html CHANGES README INSTALL MANIFEST"
+
+need_apache2
+
+pkg_setup() {
+	perl_set_version
+}
+
+src_prepare() {
+	default
+
+	sed -i -e "s/PERL \$PERL_OPTS/PERL/" "${S}"/acinclude.m4 || die
+	sed -i -e "s/PERL \$PERL_OPTS/PERL/" "${S}"/aclocal.m4 || die
+	sed -i -e "s/PERL \$PERL_OPTS/PERL/" "${S}"/configure  || die
+}
+
+src_configure() {
+	econf \
+		--with-apache2-apxs=${APXS} \
+		$(use_enable perl perl-glue)
+}
+
+src_install() {
+	APACHE_MODULESDIR="/usr/$(get_libdir)/apache2/modules"
+	apache-module_src_install
+
+	make DESTDIR="${D}" INSTALLDIRS=vendor install || die "make install failed"
+	doman docs/man/man3/*.3
+
+	perl_delete_localpod
+
+	for i in $(find "${D}" -type f -not -name '*.so'); do
+		if file ${i} | grep -i " text"; then
+			sed -i -e "s:${D}:/:g" ${i} || die
+		fi
+	done
+}
diff --git a/www-apache/mod_qos/Manifest b/www-apache/mod_qos/Manifest
index ac300e6f9d42..62df6bfab4b1 100644
--- a/www-apache/mod_qos/Manifest
+++ b/www-apache/mod_qos/Manifest
@@ -1,6 +1,8 @@
 AUX 10_mod_qos.conf 97 BLAKE2B d3dfe5296b89ef35b09e6b9a0d272c3fcfd66ceb54e2405c31d67a703a68f7362f5bd5340d3634d8f2c09cc8b825a8ef715c0b99430df5b9b98355c2ff4e516b SHA512 eafdbc3ae2f33a7e2bb55e59c311e79688c3ecabdd12247a5f68a9c00c46b84c709139f124cdccc5fd7b3d792b23a94ce37a8d27835d70c521ad6212d4e761c2
 DIST mod_qos-11.61.tar.gz 1242978 BLAKE2B d784538e516abda338230ae9f2580217e3727f8aa22e5d1e881d605ade06444753c9f393a16ef8c683422bb989434b1152aa06955c3f5ba5b38e486d3cc4571b SHA512 c34a970e869238a1340a4bf32f3b21ac3e19cfb65a809989c45100aa1c3559ce0a5f5c30e6366f6d65ef04ad6fc1be73f80a9fc18b7a6a164912618cce6383a8
 DIST mod_qos-11.65.tar.gz 1247087 BLAKE2B 145af39814f974855520415c3bf114aa11ac9002784feace877c9777311fb77fa798fe5f61c7b63201ab5dd6d9582a1d141f421c7215ba3271a29cece13d02b0 SHA512 7a4363b7b5e31968188f2668003d88538134456c3e6eeaff7d200ebf46064139561da6adf9b96678f349bd296f2c502a2d2c9bfb8ae12f7c78e3edbe5c13de3b
+DIST mod_qos-11.66.tar.gz 1247819 BLAKE2B a835722363a816637411b434eba60bc91f04fe48efd1dd5a3b63f046feb2fb60d776a64d0a4e889c8f827f6a3002fa731743d079b5f3ebd3bde3edf2023c983c SHA512 19541c72d72cd9c4f055f6c0908e1ddbfa0b27f33e13edbecf9abcf61c2fe334ef797e3ad44c7d8343d5d2df714744b4f1a3f0f96a6de02ff7d7999385393db6
 EBUILD mod_qos-11.61.ebuild 1016 BLAKE2B 66b80b9c56cf82ec6c01b73ad660ecf95363b2450513868c07c36868cb6327731401e88edeb010bf51516ce78e59eb2919ceaea3957fc9d2bcfaa5612c6ae9bb SHA512 c647eec700392c45827bc859a7c04d15ff7f6af7d93bc9ab77947d0b5e5170aa278d224d150596d864d3bd2cc7ea7120e3752a3be5e2a173775632483dc612e3
 EBUILD mod_qos-11.65.ebuild 1163 BLAKE2B 3937f41aed391c7b15467f61014332da33aa513136a2435d8de4985fccb4f0b4dd829ce1983fcec4068d986a46e629dfece57541f91003a8caa2460429617b0f SHA512 0ab9aea2e74a785701a6dcd77d1a15ff02188249a11a8c7f4ef671e14d9fbda9cc72f85cb7ddbbde5ebab14ea61ed749a8a6e737a9ef1b6e49950424a7d3bc16
-MISC metadata.xml 244 BLAKE2B e543aaf02e6b5efa49dbd6e952f6d824548558cb94f91e489f81b70c2f13cd0f54c3388b3b540b50e54e9e78be5f8084f331ee720b8b49fa8aeeb1179a2384ca SHA512 8757fe5e361f5e4214eaf304d5d9d57bc542f1eba248fe4dfc44310d95af160e8c04ad72723b3bf7afd3075ed2f6d58e4bd28643fff37fcd8d6e0134dc147dc7
+EBUILD mod_qos-11.66.ebuild 1207 BLAKE2B 1b777dc59bba7c9c156a78aebada139cc7c0e4533696212e9a88139b0da343da98356b3696c9237d74d4b1e020f569a498465c07cda8b7dfb8ba5cb10d349a93 SHA512 9674a4f4b3da30fdcbc5a531842a71717eaf66d5ae8e26b83b77410062896ec33aec1b62a15167680784c505071e60310fb6821d8f0eb468fb117cedc5fa054e
+MISC metadata.xml 325 BLAKE2B 322d2ee01e15bccbfc982530d0d51a66646a30d3c937d514dd5967ad5501325ecb6d2ead18b63f6255532fbcd80208b29fa325d90cfe8d65414fa7013c2af7e0 SHA512 392b5e28cca1b7b253349524117b22242a465f5413ed06ad844f51873f0c8b2c1d90d6b6b79c7dd6ebc2004be5d0b1757cd24ddcfb56ee12d0e1be325a460be5
diff --git a/www-apache/mod_qos/metadata.xml b/www-apache/mod_qos/metadata.xml
index 232c098fae32..d74f243bf5d8 100644
--- a/www-apache/mod_qos/metadata.xml
+++ b/www-apache/mod_qos/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>candrews@gentoo.org</email>
+		<name>Craig Andrews</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mod-qos</remote-id>
 	</upstream>
diff --git a/www-apache/mod_qos/mod_qos-11.66.ebuild b/www-apache/mod_qos/mod_qos-11.66.ebuild
new file mode 100644
index 000000000000..9659eec93ecb
--- /dev/null
+++ b/www-apache/mod_qos/mod_qos-11.66.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools apache-module
+
+DESCRIPTION="A QOS module for the apache webserver"
+HOMEPAGE="http://mod-qos.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mod-qos/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
+
+RDEPEND="
+	dev-libs/libpcre:3
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	media-libs/libpng:0=
+	sys-libs/zlib:0=
+"
+DEPEND="${DEPEND}"
+
+APXS2_S="${S}/apache2"
+APACHE2_MOD_CONF="10_${PN}"
+APACHE2_MOD_DEFINE="QOS"
+DOCFILES="${S}/doc/*.txt ${S}/README.TXT"
+
+need_apache2
+
+pkg_setup() {
+	_init_apache2
+	_init_apache2_late
+}
+src_prepare() {
+	default
+
+	pushd "${S}"/tools &>/dev/null || die
+	eautoreconf
+	popd &>/dev/null || die
+}
+
+src_configure() {
+	pushd "${S}"/tools &>/dev/null || die
+	econf
+	popd &>/dev/null || die
+}
+
+src_compile() {
+	apache-module_src_compile
+	emake -C "${S}"/tools
+}
+
+src_install() {
+	einfo "Installing Apache module ..."
+	pushd "${S}"/tools &>/dev/null || die
+	apache-module_src_install
+	popd &>/dev/null || die
+
+	einfo "Installing module utilities ..."
+	emake -C "${S}"/tools install DESTDIR="${D}"
+}
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index ad5e6657a881..3074490e7c86 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -1,7 +1,7 @@
 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.1.tar.gz 4261212 BLAKE2B c47c7934d8da870e629c5733cc8c37452e4d90351269a14b99483188e8e3161891bd63bfd70e0723648c8daf51f1c33d900bd90ab0157332f826eab772f09f62 SHA512 374733cbfc26e53d95b78c8f268a4e465d838163e9893fc24e33a9d272b114f1b287147bab6d0289575074cbbd94f48983e23fa59832cbcb32950046cea59269
 DIST modsecurity-2.9.3.tar.gz 4307670 BLAKE2B 337ea15cc8805af7ab43aed8aecf4c72ccc586d0d7e9d9b91f036a61baa70d1ac8b4ad8045a2bb7a13515912a15fba7d3cdb9670ae6730de43b1e44ee90ded6d SHA512 4e1ea5dd8edadf8f630e4fe92a200d3a8e78963fce3128b5975a1e1ecd0e8bf9ceecd9905c95f8c508932ccd837f1d8ae8bb2ba423307718c3c6a4ae9b783ddd
-EBUILD mod_security-2.9.1-r1.ebuild 2770 BLAKE2B 6366d2b03e9feea20b55629ea0ae5a9febe8e766b252c9a9b65249b34ed15de9787fa56a65164652493b6669cd2e9700aadeade2312965aac4d6130eb86a942c SHA512 802861ffc99eab081221e4d379ed46c53c93ad110dd8c3a62582fb15df51744377c87be0eeb9a373c8a15090ac9528e77720b4565d807bdac2076c76d605efa1
-EBUILD mod_security-2.9.3.ebuild 2618 BLAKE2B fa9fe5da3353e89e3083c705908d020fd7e3ea47fba9731e4a58bf232ad11e7e0604b5b7f4e3ee57df1cb4686d9f536c6b1eab3345530eb436079bac3c3c27ff SHA512 fce129f6138269782b1cd2523c81657bfb9d7332cc2566e22314fdc6c9188a8b0eef4a714e6c388b9d6a274eb204b484e29ad9de0869c66e2f3168a378bacc2a
+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
 MISC metadata.xml 1009 BLAKE2B a3a9f32a3cebe4447b0ec621c62292f77bb988a3860f6eae63974b794a028f763a5603f35673d9cb82d3836ed24168c12e24ede6109db65dc9521617b293cec9 SHA512 98f9e6ded7565d6d0dbb50804de7fbf9079bc7f8ed2cfe1fe640d09a23fb88e9ef3242557b2418e3c12af747b7b647b29cc950702bbef57050d56d5e5012852d
diff --git a/www-apache/mod_security/files/mod_security-2.9.3-autoconf_lua_package_name.patch b/www-apache/mod_security/files/mod_security-2.9.3-autoconf_lua_package_name.patch
new file mode 100644
index 000000000000..733524ebbc9d
--- /dev/null
+++ b/www-apache/mod_security/files/mod_security-2.9.3-autoconf_lua_package_name.patch
@@ -0,0 +1,11 @@
+--- a/build/find_lua.m4
++++ b/build/find_lua.m4
+@@ -16,7 +16,7 @@
+ LUA_LDADD=""
+ LUA_LDFLAGS=""
+ LUA_CONFIG=${PKG_CONFIG}
+-LUA_PKGNAMES="lua5.1 lua-5.1 lua_5.1 lua-51 lua_51 lua51 lua5 lua lua5.2 lua-5.2 lua_5.2 lua-52 lua_52 lua52 lua5.3 lua-5.3 lua_5.3 lua-53 lua_53 lua53 "
++LUA_PKGNAMES="lua "
+ LUA_SONAMES="so la sl dll dylib a"
+ 
+ AC_ARG_WITH(
diff --git a/www-apache/mod_security/mod_security-2.9.1-r1.ebuild b/www-apache/mod_security/mod_security-2.9.3-r100.ebuild
index eb214cbee1c6..270824b6cb66 100644
--- a/www-apache/mod_security/mod_security-2.9.1-r1.ebuild
+++ b/www-apache/mod_security/mod_security-2.9.3-r100.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit apache-module
+LUA_COMPAT=( lua5-{1..3} )
+
+inherit autotools apache-module lua-single
 
 MY_PN=modsecurity
 MY_P=${MY_PN}-${PV}
@@ -14,20 +16,22 @@ 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} )"
+
 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 )
+	lua? ( ${LUA_DEPS} )
 	mlogc? ( net-misc/curl )
 	www-servers/apache[apache2_modules_unique_id]"
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )"
+BDEPEND="doc? ( app-doc/doxygen )"
+DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
 	geoip? ( dev-libs/geoip )
 	mlogc? ( dev-lang/perl )"
@@ -42,36 +46,48 @@ 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
+	lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
-	econf --enable-shared \
-		  --disable-static \
-		  --with-apxs="${APXS}" \
-		  --enable-request-early \
-		  --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)
+	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
-
-	# Building the docs is broken at the moment, see e.g.
-	# https://github.com/SpiderLabs/ModSecurity/issues/1322
-	if use doc; then
-		doxygen doc/doxygen-apache.conf || die 'failed to build documentation'
-	fi
 }
 
 src_install() {
 	apache-module_src_install
 
-	dodoc CHANGES README.TXT modsecurity.conf-recommended
+	dodoc CHANGES README.md modsecurity.conf-recommended
 
 	if use doc; then
 		dodoc -r doc/apache/html
diff --git a/www-apache/mod_security/mod_security-2.9.3.ebuild b/www-apache/mod_security/mod_security-2.9.3.ebuild
index 9d48ddc8d7f8..c7a7974d2d08 100644
--- a/www-apache/mod_security/mod_security-2.9.3.ebuild
+++ b/www-apache/mod_security/mod_security-2.9.3.ebuild
@@ -14,7 +14,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"
 
 COMMON_DEPEND="dev-libs/apr
diff --git a/www-apache/modsecurity-crs/Manifest b/www-apache/modsecurity-crs/Manifest
index 933efed73a78..f4c1aecd33d4 100644
--- a/www-apache/modsecurity-crs/Manifest
+++ b/www-apache/modsecurity-crs/Manifest
@@ -1,6 +1,8 @@
 AUX 80_mod_security-crs.conf 289 BLAKE2B 441b2f4d46e62ff24886b94dc933b08de8693ad7198cc855a8b0c322ba045e6409b7d3b7b2e2fdc0bd412ee9fdd3761987d59f405de5a84d5e8c96d2dd14ab76 SHA512 e5b86164a68e15d67a294688c993799fca10928c1265cee04555becfb17fb516314471d8c4eaea1205ac1703890cedb4647d93ce75b0a2a1ab9a401a495465dc
 DIST modsecurity-crs-3.0.2.tar.gz 156751 BLAKE2B 111a330b6081d476899be321e15d74379b3c3db23f429a4a4ef1900c87e4b29229638acf3bb367745446ef97ccba4679db91b0d84bae93f2c127bbb6e8031851 SHA512 ae8fe9a0f00a57708c8680cb76882214e4f5ff647e13087aaf1bfc7382cefb38d2f3a88eb1f210031b553f56d3e44c12dbdc68f8b0d09fb4a9e2f15a70d885aa
 DIST modsecurity-crs-3.1.0.tar.gz 250617 BLAKE2B 6081d09e90f3c18435e046264ff8c0b700fd0c8c2b6377f44517fce3ad74dcf1d6a8cf7eaf055b85040b21196b603bcb762f5a7ed237d14b6a05f1febd623cda SHA512 d613d2af8248424ac5d4d006a9f221b07c714fb47f84e6ec237b1389379b50dce984f51121cc22b69d148910169b5257b11558656640bc8349d0b09d9e70bb11
+DIST modsecurity-crs-3.3.0.tar.gz 290379 BLAKE2B 557a41e937564698809ecca40d4e76e5c1d3617b62189b7ca230ac7533cba14fdf619bef81c1e40a996dd260d2eb52c27563437dd795c2412bf38715f026f300 SHA512 12043aae12b5e01455e229136411e1fdef3a14318aff191d190b567463b63efb72630a695449b56f1d654ed1cfc0b4eb452a64502c35337d37cce920d5fa4ea4
 EBUILD modsecurity-crs-3.0.2.ebuild 1557 BLAKE2B 975e0ecabdfc9d9158a8f6f8284175a096cfe6c8666da074466d48a9c7d81d467fa08ed7b449bf232712e3cc4c6830b66fc15fb62f9b04189a6af5da7f6ba23f SHA512 6d50e03a2cd5a616a90e4c0a2814c4d58bfc68109ca1341a4da189463626922a6fbc7db7892f9184b147a896d585817fd778eea84fcab7ca62a95c1ec3beded2
 EBUILD modsecurity-crs-3.1.0.ebuild 986 BLAKE2B 793c4d63573b131adbde573fce00cc6c5febb50afcb54f254c0aad22dcfc80741f23c3cb0b4f7a51b060820f1e421e0ccde9169686f0b54cb269dacd9672d045 SHA512 043f688d07a21ee803fbabd4e1429ee88b3cbb2d66573ab557b9c2dbaacb3f8ac5f2346b79c6eb7b21791baaf64887d717cd622abe5d50e6e01328b484bfb5bb
-MISC metadata.xml 267 BLAKE2B a7b08b4655447c304005df31741a28e9b6ca84de6dc464489a01b50b721ea3579228676cf1cad162caff90684791f98ae54853e2fb22503c0cebbf6c1b8a61ef SHA512 e6d84a0c46866637d9918115c6ac4ae342b48a7b060d2924788fb05181452a4d0b88769868f1bf3af60634abd7fa203e3fdb7d8b121db99b0384b846c7860da8
+EBUILD modsecurity-crs-3.3.0.ebuild 864 BLAKE2B 769a64d8e35dee1c0296ad34a60b06382ca765f6ef98fc615a7f476174833c372e1dc3cc09371b231bac4c136af256b0c3fffe491be3dfd64349a6e738a019cd SHA512 ff94015763f77eb7e28d817af420548693ead124c960d97dae1a02cfeed8714b607430364823de0beb0c1d4ce1b81e081368fff8ed6a27f2282bf3305b4ff134
+MISC metadata.xml 258 BLAKE2B ccb4061e467d01526bf0a751983d67745c80a59d427f964d52460d16d325a318e30bd453eb398bec6fe7f6e5a434ec0b0da313519e303dfb94c117489be2b706 SHA512 5b9b093cf1089ee3f2f46aa2275c11a5d2e4ef3b75e2a922e09fc3618ca803cd35a3991b3a59d34b26aba41e6a51efd615d98ff90f81525cefcf64c1ac778b6e
diff --git a/www-apache/modsecurity-crs/metadata.xml b/www-apache/modsecurity-crs/metadata.xml
index 3947bbf17bea..64361f081f7d 100644
--- a/www-apache/modsecurity-crs/metadata.xml
+++ b/www-apache/modsecurity-crs/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
   <!--maintainer-needed-->
   <upstream>
-    <remote-id type="github">SpiderLabs/owasp-modsecurity-crs</remote-id>
+    <remote-id type="github">coreruleset/coreruleset</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/www-apache/modsecurity-crs/modsecurity-crs-3.3.0.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-3.3.0.ebuild
new file mode 100644
index 000000000000..3e3e7bfcfc79
--- /dev/null
+++ b/www-apache/modsecurity-crs/modsecurity-crs-3.3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+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/passenger/Manifest b/www-apache/passenger/Manifest
index 92702edfd7ea..3fc87d9c3667 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -4,7 +4,9 @@ AUX passenger-5.1.11-gentoo.patch 1068 BLAKE2B 635bc4c4a2313dc00a038cb9c871b5b2f
 DIST passenger-6.0.4.tar.gz 7347803 BLAKE2B 2e367b8dd0ace6a2773de92b3237821625190f2ae52fd11a1a3c47230d24affe1f9d161ef0346210cc91a21ae3a58f40f796063796399da0d133d6b0a261f52c SHA512 dd3398bece50c9da6029a5a9d98de2bed2e33a92f49fc776fe2b8f80f4a47e36d8a716c12f2f74d9611de5aa04981ddf680fc29a37f5b1860731a6f6e8390c81
 DIST passenger-6.0.5.tar.gz 7347149 BLAKE2B c2a1cb74a0c5d9ea7ea245b1c55413b8d212dc091bc7ad8727ca4cc4249cbc60e92c5313a5a1f8daf5dcea64485b27fbeeae9fada18727aed20dc38779d112ea SHA512 a6c174a52947f3985a0bbed20996e8386efdac6100a6c7ce9994bb6be7617bf810ac04821fae122e569e1883e8a8b1350cdccfa2b02053e5a4fbd13f891716e4
 DIST passenger-6.0.6.tar.gz 7347506 BLAKE2B 16332ca5c299c366c891eef0267889d024417bacafafb9b6faed94434f16a3823fd21e9251eeefe190a682e8530b49cde4af22008b1537466ee3d685554dcbac SHA512 57a013dbbddab13862c2d5445d048aafdc5a56297c56d3d642a39fe7757d3bcbd7e9e21aca36ebeb0f54a03d26e0886031a947cb098026a516900cc5bff42f0c
+DIST passenger-6.0.7.tar.gz 7352163 BLAKE2B e002f03f761cfd1b2a79f3d518fe25fb1ead4f0431042b6bfe2ecf1b9900e6405abb4d67f9750302149f1d99990d2b42bc0fb1c855168b7003ac37eec3297b8f SHA512 6019a93ac500333098cee772b5240f6cbf3a75a8d7cdd2bccac58c28369dddca574dc7e1c239a8f21b863df4825e758bb5eae84b316842168dc875116a07bfca
 EBUILD passenger-6.0.4.ebuild 3977 BLAKE2B 136797a63538618616ce49f3b2a1082f7155b88934b38d3c9118216ee43490f4a336164def33741ac072612fff9b96bc3bb897e2d76080e7eb030a2c180159e2 SHA512 584b578239cbe18ea1866d91231f92c5b1892d9481e3c52dbf768ab81396dfb17e5b861f956e33de81ba8c3365f61e06bd1ba785f966bc74e226a453478d3c54
 EBUILD passenger-6.0.5.ebuild 4078 BLAKE2B 72fffd8164aef7e98dd776ee3cc88b36e0434a540724346f6648f5960482fd4622facb310426715f12af3d1cfe7b98defd2302613d733e1542405896c8780e8b SHA512 6f2788c530920b8d8fdff8c96735de909b5bcc230cc579c0777352f23bb8a50486a982375ff70a4b68d8b903d7ed1af5fb413c0a66933490b9e2f080199a22a9
 EBUILD passenger-6.0.6.ebuild 4069 BLAKE2B f644fe935ff16ea908a7f6580d5fd12740b82ccfa26fae074d94df6f4ea46dec16ffab107ce9ef113e210f7eb90d5c9af4a92491f787271088b5c12a6811edbb SHA512 17357f9f346368021aca4acd3cb7516e7d1b340b5838c62fc7b43c3f7125d6fd2cfb5e116b3ca3ab7070c8203f6790a5c23beeea42fff0255337dab42b6df483
+EBUILD passenger-6.0.7.ebuild 4071 BLAKE2B 88556cba75e710275d64a50df6b2c9bc2721736240a0c6f2f611255093ce02d9b902fe14f33da152eba4069152c26d52b04b3962ed191fbc1bda82405c2d66f8 SHA512 e9e03814a511829b317f6c3c26ee6429f1dff106b80d4f1a088dfcc7ebdb615b93410ce1f8b7b5ed034956d2347bdb6e7582939c43de1168351e4f0fa5887dcf
 MISC metadata.xml 330 BLAKE2B 80067f262ce3e04098eaab92ec2420a879014d624fa6c230f57daf871ac33b77fcd786868ec508236c62623f2c81dc86573875a42993604896745524d7220fc7 SHA512 5ea7e5026084dedcd363bb79076763cca7d66bb08411d5e2dc56ade23bfdbd522a8db13db9c0b8f50163f130f28c784b622d9639cb3dd33aa810dda3d2577db8
diff --git a/www-apache/passenger/passenger-6.0.7.ebuild b/www-apache/passenger/passenger-6.0.7.ebuild
new file mode 100644
index 000000000000..70b997581603
--- /dev/null
+++ b/www-apache/passenger/passenger-6.0.7.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby25 ruby26 ruby27"
+
+inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
+
+DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
+HOMEPAGE="https://www.phusionpassenger.com/"
+SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="apache2 debug"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+ruby_add_rdepend "
+	>=dev-ruby/rack-1.0.0:*
+	>=dev-ruby/rake-0.8.1"
+
+# libev is bundled but with adapations that do not seem to be accepted
+# upstream, so we must use the bundled version :-(
+CDEPEND="
+	>=dev-libs/libuv-1.8.0
+	net-misc/curl[ssl]
+	apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"
+
+RDEPEND="${RDEPEND} ${CDEPEND}"
+DEPEND="${DEPEND} ${CDEPEND}"
+
+APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
+APACHE2_MOD_DEFINE="PASSENGER"
+
+want_apache2
+
+pkg_setup() {
+	use debug && append-flags -DPASSENGER_DEBUG
+	depend.apache_pkg_setup
+}
+
+all_ruby_prepare() {
+	eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
+	eapply "${FILESDIR}"/${PN}-5.1.1-isnan.patch
+
+	# Change these with sed instead of a patch so that we can easily use
+	# the toolchain-funcs methods.
+	sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
+		-e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
+		-e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
+
+	# Avoid fixed debugging CFLAGs.
+	sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
+
+	# Use sed here so that we can dynamically set the documentation directory.
+	sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
+		-e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
+		src/ruby_supportlib/phusion_passenger.rb || die
+	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
+
+	# Don't install a tool that won't work in our setup.
+	sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
+	rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
+
+	# Make sure we use the system-provided version where possible
+	rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
+
+	# Avoid building documentation to avoid a dependency on mizuho.
+	#sed -i -e 's/, :doc//' build/packaging.rb || die
+	touch doc/*.html || die
+
+	# Fix hard-coded use of AR
+	sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
+
+	# Make sure apache support is not attempted with -apache2
+	if ! use apache2 ; then
+		sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die
+	fi
+}
+
+all_ruby_compile() {
+	if use apache2 ; then
+		V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+		 APXS2="${APXS}" \
+		 HTTPD="${APACHE_BIN}" \
+		 FS_LIBDIR='/usr/'$(get_libdir) \
+		 USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+		 RANLIB=$(tc-getRANLIB) \
+		 ruby -S rake apache2 || die "rake failed"
+	fi
+}
+
+each_ruby_compile() {
+	append-flags -fno-strict-aliasing
+
+	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_LIBDIR='/usr/'$(get_libdir) \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	RANLIB=$(tc-getRANLIB) \
+	${RUBY} -S rake native_support || die "rake failed"
+}
+
+all_ruby_install() {
+	if use apache2 ; then
+		APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
+		apache-module_src_install
+
+		# Patch in the correct libdir
+		sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
+	fi
+
+	dodoc CHANGELOG README.md
+}
+
+each_ruby_install() {
+	DISTDIR="${D}" \
+	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
+	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_LIBDIR='/usr/'$(get_libdir) \
+	EXTRA_LDFLAGS="${LDFLAGS}" \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	RANLIB=$(tc-getRANLIB) \
+	${RUBY} -S rake fakeroot || die "rake failed"
+}