gentoo Easter resync : 12.04.2020

6 files changed, 142 insertions, 51 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 6aca5a931a7b..f5d747343881 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index 9207edf01f4a..38e0fc76ba64 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -1,7 +1,5 @@
 AUX mod_http2.conf 154 BLAKE2B b7d38cff9c5b4248d43aa1be55ec4b90fa197213ddd2a8ac3409f69f8e31a7e0a8eb14aab4f2abe1d7ec833896d950d3878020e05100f83ae63a3823b0e91b9d SHA512 85b20350c8abb947c91e2cb462d4cd62f502e6eede3bddd5c10502b61a24396bec57c15d4419d31d4afc857053c1fb2606392023527b7eceea0b10978ce170e5
-DIST mod_http2-1.15.5.tar.gz 1041643 BLAKE2B 59591d919451a96595c8e75155f84e63876e95b13940af5473fe4cf0a29ac91f57d3df22911397de213482c5a81d093ce81ce3835136ace50de0d4f70f2a936a SHA512 6255a46a22e5df6f8fed9ce65079979a3c613cccf1a95559ff0832ab2efe5fb98d51abfe83c006b9a3c7452bb4e78e3e67e94d7c14618fa312c7236a34e6b280
-DIST mod_http2-1.15.6.tar.gz 1028795 BLAKE2B 4f323b00a133de13f547fd5b0402ce48d681289675cfd85dbef25b8432598772ddbb1fa78abd7905c2c4337a41340078efe903fc7cb4203cabdad10f71ef387a SHA512 2d27de99108d444e3095cf84d5ccf1b281bd09e2d2d4c4ba4ecc7b6519119d4d42e9379285bd68ce7f56349a9f27062b516df8b7612df7551a46e8a4b4b634ef
-EBUILD mod_h2-1.15.5.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
-EBUILD mod_h2-1.15.6.ebuild 888 BLAKE2B d4171c6dd0716f1abc2b1d8fb4cee3f122df146115712c406910b3a60718f6d7bed2a208785ce617d5f03173d6f07214df024a0a8fcdac832775a49688748d6f SHA512 ffe2aab1c735be9ccf6ab510c35c0e05218d495750e75f3c476dd79f160c296f87c1cc956b703c7535b009c2cd32e4c5637cefe45a0fda15174b124aeee71994
+DIST mod_http2-1.15.7.tar.gz 1042030 BLAKE2B 5252e15fbc71845db557d567daba63452df0693baad18f8b83f937adbd760f1fa931fbf663f1f5ec475760e75fc132fb0de63784e046092669b1d8fb44d96e9a SHA512 effe0a8f41603865a9dceea6fa109a924e6f2f904a2a02ebf10a20e0315f248cfaf91d4b2a0d6168ee94fb0f4af2680a6992c43cc91b0bf47a13d739b4cf9228
+EBUILD mod_h2-1.15.7.ebuild 888 BLAKE2B d4171c6dd0716f1abc2b1d8fb4cee3f122df146115712c406910b3a60718f6d7bed2a208785ce617d5f03173d6f07214df024a0a8fcdac832775a49688748d6f SHA512 ffe2aab1c735be9ccf6ab510c35c0e05218d495750e75f3c476dd79f160c296f87c1cc956b703c7535b009c2cd32e4c5637cefe45a0fda15174b124aeee71994
 EBUILD mod_h2-9999.ebuild 888 BLAKE2B cc260a4fdbe81d168096723f0e0d135350069cd9b2c9e853b0b7efe351ae96ddbaa9fa5dc219feec73671c496e2ecf2e5b26623e624850de8668088298f6313a SHA512 d0d0980cf07096df9ee3199d0e8aff6b5ce608c1c33348510cd201f8934d21c493f6a6a53884a90a064c852fb4641930c74f3b4493923cce74afbac9d184f9b5
 MISC metadata.xml 325 BLAKE2B 4154e88a0c1eb61e74e41ca0b86a2746d6fa8f0e573c5c8c36a9acc0306306804ce6c9b83834b67ae99476468f9143273f977bf868e06d1bc4b5022dd08b2722 SHA512 8dd16aa1fbf71b64c679cba7dc5759fb51410690fd6e6b77416d3604ea746a00516283510a0b24971aa0f5c08359eba6f5d96fab2f8eebdda7f2ebd8f428a04f
diff --git a/www-apache/mod_h2/mod_h2-1.15.5.ebuild b/www-apache/mod_h2/mod_h2-1.15.5.ebuild
deleted file mode 100644
index 3e6d435d3f82..000000000000
--- a/www-apache/mod_h2/mod_h2-1.15.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit apache-module autotools
-
-MY_P="${PN/h2/http2}-${PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
-	inherit git-r3
-else
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="HTTP/2 module for Apache"
-HOMEPAGE="https://github.com/icing/mod_h2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND=">=net-libs/nghttp2-1.0
-	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
-DEPEND="${RDEPEND}"
-
-need_apache2_4
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	APACHE2_MOD_DEFINE="HTTP2"
-	insinto "${APACHE_MODULES_CONFDIR}"
-	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
-}
diff --git a/www-apache/mod_h2/mod_h2-1.15.6.ebuild b/www-apache/mod_h2/mod_h2-1.15.7.ebuild
index b5be17b7ca7d..b5be17b7ca7d 100644
--- a/www-apache/mod_h2/mod_h2-1.15.6.ebuild
+++ b/www-apache/mod_h2/mod_h2-1.15.7.ebuild
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index ec8f12c3eca8..59bb6f78f607 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -8,5 +8,7 @@ AUX mod_perl-2.0.10_rc1-Gentoo-not-Unix.patch 1517 BLAKE2B 4546fd0ae82a99c335140
 AUX mod_perl-2.0.10_rc1-bundled-Apache-Test.patch 2777 BLAKE2B b59cb23545dfa26af1181b5c4fa7f2d2ca5e049d6ec4056f6cac68389cc9fe6cb7ab010b8aa6c210aeaab1e98afb65ab3051a341856823debbb2fded47c63320 SHA512 ebb583607d4a8587d340384bb5c8deb50a3001beaaf9a536f4731baa3664a6d2667de309d1549175bf721643ad3f107988de4d2c9e213429888044dd726447ee
 AUX mod_perl-2.0.4-inline.patch 678 BLAKE2B 67da89c49904537df88e09fb4a171c03096993439d56d6fdd9e12b83d4cbca2cc1a734357ae6ee93ca20fd9906e1a0e74743d6d826f80763fda9387b42151597 SHA512 5669230db6e70b31b087851fd792004c4a292975e507f248b8dc7ce195559ab9b0579db8bea84d823f7d53e351990ecda057d7fe63273d486b5f12204d7160a5
 DIST mod_perl-2.0.10.tar.gz 3846211 BLAKE2B de44c76d22cc90984be20193bb635f27d68fbc25cab39333be93ee15c4636025d9e6d8f7bfc661b50ac19cfeb5f697f957acb7fbbb38e1f3f712c81ac27737ab SHA512 0bf1a885cb32a3393e95f87e71983097613e263b9052dbf22494663b506e36a25d0256afed24285232276d9f43ebd3adaa18b91129bfb62116a8ccb023855bca
+DIST mod_perl-2.0.11.tar.gz 3848147 BLAKE2B 8eeef6d1fadbf9d2e3bcff33c5114e588f032c2497f5191b1edd30da8bce72eadf5ea62482ec8ece7d7fde308c8c41d6682d1a325760c627bee75c3ce8cf6272 SHA512 f232b215ccb9217f69ccced8a037470e5975900b9a6fcc5a2e4674e6559d21f026547c1b97c48109352043946dc22539dd38004759be16ad5cfcb3a96973dfdf
 EBUILD mod_perl-2.0.10.ebuild 3866 BLAKE2B 03d3ea695a2d23e8359589574e8c4c10687ee7bf03aacc0f56754da3f6275a3f2d54bed42bd35bbe6d1bcf88c8323f7db6645b671c0a611e044f84e63c2b8185 SHA512 96c8068193e849f625a1ee30021cca0e1ccdadce77e45c15da7d204005b263ae09deab376541926d97461382dec4b6e8701646e55719e1fbd57adf7b15734970
+EBUILD mod_perl-2.0.11.ebuild 3760 BLAKE2B 131af30c9e6a2a42b8124e4175ac26de126bc71d9c9b62be7c488a67b9e703a988fda6d27a26ca782e593dfbdff1780ee649edfe430d0ad5bf7c7bf5611633ff SHA512 4f70a5b4143cfb89fb09282bd237cea4048165d24b1d7b6915b19b42f29ebe0542ec70de30e15d558e362a05eec8b8604adc561bb6516fac6ecce0106bd2575b
 MISC metadata.xml 376 BLAKE2B 39fd46f3791673d4878a8214042d5eed8d2c55acd0d319e0d9b7a684e07ef2a629be902691c612aeca89bf60e752f3ac70bcb9033a19c7daf121810f7c095137 SHA512 1ef3ea88131d2ed82c59f91f80b96003bd664178a51a64364f871427992cb8570b4ef8d1e880305a841da52dc87bac06c92e8c0cf3982e93ff639a4f8fb3d7bc
diff --git a/www-apache/mod_perl/mod_perl-2.0.11.ebuild b/www-apache/mod_perl/mod_perl-2.0.11.ebuild
new file mode 100644
index 000000000000..891635df5c14
--- /dev/null
+++ b/www-apache/mod_perl/mod_perl-2.0.11.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit depend.apache apache-module perl-module eutils
+
+DESCRIPTION="An embedded Perl interpreter for Apache2"
+HOMEPAGE="https://perl.apache.org/ https://projects.apache.org/project.html?perl-mod_perl"
+SRC_URI="mirror://apache/perl/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="debug ithreads test"
+RESTRICT="!test? ( test )"
+
+SRC_TEST=do
+
+# Apache::Reload, Apache::SizeLimit, and Apache::Test are force-unbundled.
+# The minimum versions requested here are the bundled versions.
+
+# The test dependencies are from CPAN (Bundle::Apache2).
+
+# When all MPMs are disabled via useflags, the apache ebuild selects a
+# default one, which will likely need threading.
+
+RDEPEND="
+	dev-lang/perl[ithreads=]
+	>=dev-perl/Apache-Test-1.420.0
+	>=www-servers/apache-2.0.47
+	>=dev-libs/apr-util-1.4
+	!ithreads? ( www-servers/apache[-apache2_mpms_event,-apache2_mpms_worker,apache2_mpms_prefork] )
+"
+DEPEND="${RDEPEND}
+	dev-perl/Module-Build
+	test? (
+		>=dev-perl/CGI-3.110.0
+		dev-perl/Chatbot-Eliza
+		dev-perl/Devel-Symdump
+		dev-perl/HTML-Parser
+		dev-perl/IPC-Run3
+		dev-perl/libwww-perl
+		www-servers/apache[apache2_modules_version,-apache2_modules_unique_id]
+		!www-apache/mpm_itk
+	)
+"
+PDEPEND="
+	>=dev-perl/Apache-Reload-0.130.0
+	>=dev-perl/Apache-SizeLimit-0.970.0
+"
+
+APACHE2_MOD_FILE="${S}/src/modules/perl/mod_perl.so"
+APACHE2_MOD_CONF="2.0.3/75_${PN}"
+APACHE2_MOD_DEFINE="PERL"
+
+need_apache2
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-2.0.1-sneak-tmpdir.patch  # seems to fix the make test problem
+	"${FILESDIR}/${PN}"-2.0.4-inline.patch        # 550244
+	"${FILESDIR}/${PN}"-2.0.10_rc1-bundled-Apache-Test.patch # 352724
+	"${FILESDIR}/${PN}"-2.0.10_rc1-Gentoo-not-Unix.patch
+)
+
+src_prepare() {
+	perl-module_src_prepare
+
+	# chainsaw unbundling
+	rm -rf Apache-{Test,Reload,SizeLimit}/ lib/Bundle/ || die
+}
+
+src_configure() {
+	local debug=$(usex debug 1 0)
+	local nothreads=$(usex ithreads 0 1)
+	myconf=(
+		MP_USE_DSO=1
+		MP_APXS=${APXS}
+		MP_APR_CONFIG=/usr/bin/apr-1-config
+		MP_TRACE=${debug}
+		MP_DEBUG=${debug}
+		MP_NO_THREADS=${nothreads}
+	)
+
+	perl-module_src_configure
+}
+
+src_test() {
+	# make test notes whether it is running as root, and drops
+	# privileges all the way to "nobody" if so, so we must adjust
+	# write permissions accordingly in this case.
+
+	# IF YOU SUDO TO EMERGE AND HAVE !env_reset set testing will fail!
+	if [[ "$(id -u)" == "0" ]]; then
+		chown nobody:nobody "${WORKDIR}" "${T}" || die
+	fi
+
+	# We force verbose tests for now to get meaningful bug reports.
+	MAKEOPTS+=" -j1"
+	TMPDIR="${T}" HOME="${T}/" TEST_VERBOSE=1 LC_TIME=C perl-module_src_test
+}
+
+src_install() {
+	apache-module_src_install
+
+	default
+
+	perl_delete_localpod
+	perl_delete_packlist
+
+	insinto "${APACHE_MODULES_CONFDIR}"
+	doins "${FILESDIR}"/2.0.3/apache2-mod_perl-startup.pl
+
+	# this is an attempt to get @INC in line with /usr/bin/perl.
+	# there is blib garbage in the mainstream one that can only be
+	# useful during internal testing, so we wait until here and then
+	# just go with a clean slate.  should be much easier to see what's
+	# happening and revert if problematic.
+
+	perl_set_version
+	sed -i \
+		-e "s,-I${S}/[^[:space:]\"\']\+[[:space:]]\?,,g" \
+		-e "s,-typemap[[:space:]]${S}/[^[:space:]\"\']\+[[:space:]]\?,,g" \
+		-e "s,${S}\(/[^[:space:]\"\']\+\)\?,/,g" \
+		"${D}/${VENDOR_ARCH}/Apache2/BuildConfig.pm" || die
+
+	local fname
+	for fname in $(find "${D}" -type f -not -name '*.so'); do
+		grep -q "\(${D}\|${S}\)" "${fname}" && ewarn "QA: File contains a temporary path ${fname}"
+		sed -i -e "s:\(${D}\|${S}\):/:g" ${fname} || die
+	done
+
+	perl_remove_temppath
+}
+
+pkg_postinst() {
+	apache-module_pkg_postinst
+}