gentoo auto-resync : 05:07:2023 - 04:10:14

6 files changed, 199 insertions, 1 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 75ea654518aa..6462c638b64e 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index aedb804d7eeb..6dfc9606f874 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -6,7 +6,11 @@ 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.11-perl534.patch 621 BLAKE2B 44def80ff70bd7a2416df46c8dd84429d4452fea6ac72b5f51a7e5935db38bb90cdef41904ce6828bc1942f1be602f1d63c1922acf5f29e867797f9047e51c1b SHA512 1cc1b79ddd258d37463e80f52bbf2a9414cc57b5b38e491085f2600e5ddd15d5941450d5990d7a50964c26e9e35890b724f48353f5e54dead7427a6899952f29
 AUX mod_perl-2.0.11-ranlib.patch 341 BLAKE2B 72cd8bab80a2c435c54311c41f1433f462647a8bf2fe68dd41ea7ce73571b45a57627ca575d75af48f22559ea132d0e22af24bb204df8e317366f665fddf4157 SHA512 7fbdc274780033b704758d3e303d05c1d05e059f79eea72797201027610f9f7218ba13b398c0d885dda86b1f88a192b3dff06059b93c89a6c4de4a5089b64bc5
+AUX mod_perl-2.0.12-avoid-pch.patch 851 BLAKE2B bfbb4faf05e502fd2023bf4d62e86f9462c6c9af1fd2ea76103e0313d47a79f48deca698788d4c44da6e42afa2e70001101aa5e81e98cf7dfa4e285a928157c7 SHA512 21a9733ad681f2600e407579e2716645bd90b57939bfa198a87f45bdc8a03f6b5be7e169cf752b3f9c62c272a3c81c0de657c7fc22091ab483e5fc11727f2814
+AUX mod_perl-2.0.12-perl538.patch 1220 BLAKE2B 13f1ff8121b4837e2a0f778b31e64d0d471d3e33f74ae66efae2935292d5a3a922a96b1375628a804291957c0dbe43b4148cf52c40f198c2e463c451cc8c1c3c SHA512 f218f4ab22160b9a8478e54331c5aeea7684c9727147f1cf5c739e3a784c8aa31c1085cf31068a102c49071546ce6965876b89bc413600433b076e289be1411a
 AUX mod_perl-2.0.4-inline.patch 678 BLAKE2B 67da89c49904537df88e09fb4a171c03096993439d56d6fdd9e12b83d4cbca2cc1a734357ae6ee93ca20fd9906e1a0e74743d6d826f80763fda9387b42151597 SHA512 5669230db6e70b31b087851fd792004c4a292975e507f248b8dc7ce195559ab9b0579db8bea84d823f7d53e351990ecda057d7fe63273d486b5f12204d7160a5
 DIST mod_perl-2.0.11.tar.gz 3848147 BLAKE2B 8eeef6d1fadbf9d2e3bcff33c5114e588f032c2497f5191b1edd30da8bce72eadf5ea62482ec8ece7d7fde308c8c41d6682d1a325760c627bee75c3ce8cf6272 SHA512 f232b215ccb9217f69ccced8a037470e5975900b9a6fcc5a2e4674e6559d21f026547c1b97c48109352043946dc22539dd38004759be16ad5cfcb3a96973dfdf
+DIST mod_perl-2.0.12.tar.gz 3848030 BLAKE2B fe4e57d76f7e7a79f171a96d2bab65743eeae45528c0bc3a8bc8ef6d91bb875d3857799f7d65cbf590994c30699a8646dbc905d76551fb97151d0827222a9ba2 SHA512 890dca0950847e32180485cabbeffbf236af2c92c7df957a233c210022b5172957eddb1db3e9281b87cd438d2fa404a05ae99c7eda098267c68d5e9262b400b0
 EBUILD mod_perl-2.0.11-r1.ebuild 3904 BLAKE2B 95e43d8bbe677e26a7d535e0a409b83e5f4363eabb6ba16b1f11092f44b6c6d9e1e130f440b022c165208f2c6030e10f571afa0f88bb9274ed035b62ee6d62aa SHA512 23f83907bc48f9fa3caf3c5dad5c90be2bd25746079b4ea9577d8b023d587adf11baef02e08bc9954321103de997d1b7dff32ba8d04aad41d5865613da59a69a
-MISC metadata.xml 388 BLAKE2B 650d9de7d70a769016f8e833bc5ebf250786d249c81c1864816c820c34334b5e5a55b26cd59f10914b8a8b258b4678c851b91df4644642f1fe7d297a5b319aea SHA512 bbe7e073076d7f71c07abaaa9b5c93fc9d068cdf854f81378e6069aaee40c745da7199ecf29dfb50272bd04e9601a9f6b7cea562e8b751952c8c38079fb57401
+EBUILD mod_perl-2.0.12.ebuild 3948 BLAKE2B 9b5da0f07c3b7ba2510588b79db8eff8f51093fb168cc5edb5e2e58ddd353ffc52be859e6acf78c2fb96e9071ef3ccec1ba94a5621040668df21b577bd46a0cb SHA512 9c59b79183b83a3ce20c31abc918062144ad82f1468a817da31e0ce2282fe4d039d0f7ff0ca199e63ed8924ccd1b7bf9cedf491ada5af3c2b08241b4b60d11f1
+MISC metadata.xml 468 BLAKE2B 89a2a9d8fdb7c3e0dc3022daf3937f67c59849c4a9d95cb97db1adee8f38e2d26a34706fbf23d8ba6da9fe9a09a68c3f0778f3c93f93b2fd965b4b79dc69d14c SHA512 a01e631256aa5d25219dcccc886601da90b9cfdf91bbcebfb1a4f193f8699ca0033e2899dac4a206149247874a7f0b9ce74965bf5098ff956470897c794d3aca
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.12-avoid-pch.patch b/www-apache/mod_perl/files/mod_perl-2.0.12-avoid-pch.patch
new file mode 100644
index 000000000000..989d472831f7
--- /dev/null
+++ b/www-apache/mod_perl/files/mod_perl-2.0.12-avoid-pch.patch
@@ -0,0 +1,22 @@
+Avoid sandbox denial while attempting to generate PCH:
+```
+F: fopen_wr
+S: deny
+P: /usr/include/apr-1/apr.h.gch
+A: /usr/include/apr-1/apr.h.gch
+R: /usr/include/apr-1/apr.h.gch
+C: /usr/libexec/gcc/x86_64-pc-linux-gnu/13/cc1 -quiet /usr/include/apr-1/apr.h -quiet -dM -dumpdir a- -dumpbase apr.h -dumpbase-ext .h -mtune=generic -march=x86-64 -o /tmp/ccfl5N0L.s --output-pch /usr/include/apr-1/apr.h.gch
+```
+
+Sent upstream by email on 2023-07-05.
+--- a/lib/Apache2/Build.pm
++++ b/lib/Apache2/Build.pm
+@@ -1502,7 +1502,7 @@ sub get_apr_config {
+         };
+     }
+     else {
+-        my @command = ($self->perl_config('cpp'), '-dM', $header);
++        my @command = ($self->perl_config('cpp'), '-E', '-dM', $header);
+         open $fh, '-|', @command or do {
+             error "Unable to preprocess $header with @command: $!";
+             return undef;
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.12-perl538.patch b/www-apache/mod_perl/files/mod_perl-2.0.12-perl538.patch
new file mode 100644
index 000000000000..3932dffe4a68
--- /dev/null
+++ b/www-apache/mod_perl/files/mod_perl-2.0.12-perl538.patch
@@ -0,0 +1,25 @@
+https://github.com/apache/mod_perl/commit/991cfeca9bac185f191510e0064f174d45718e6a
+
+From 991cfeca9bac185f191510e0064f174d45718e6a Mon Sep 17 00:00:00 2001
+From: Steve Hay <stevehay@apache.org>
+Date: Tue, 27 Jun 2023 08:38:15 +0000
+Subject: [PATCH] Stop using do_open9() - this deprecated function was removed
+ in 5.37.1
+
+Patch by Jitka Plesnikova <jplesnik@redhat.com> from https://rt.cpan.org/Ticket/Display.html?id=148451
+
+git-svn-id: https://svn.apache.org/repos/asf/perl/modperl/trunk@1910623 13f79535-47bb-0310-9956-ffa450edef68
+--- a/src/modules/perl/modperl_io.c
++++ b/src/modules/perl/modperl_io.c
+@@ -116,8 +116,8 @@ modperl_io_perlio_override_stdhandle(pTHX_ request_rec *r, int mode)
+     save_gp(handle, 1);
+ 
+     sv_setref_pv(sv, "Apache2::RequestRec", (void*)r);
+-    status = do_open9(handle, mode == O_RDONLY ? "<:Apache2" : ">:Apache2",
+-                      9, FALSE, mode, 0, (PerlIO *)NULL, sv, 1);
++    status = do_openn(handle, mode == O_RDONLY ? "<:Apache2" : ">:Apache2",
++                      9, FALSE, mode, 0, (PerlIO *)NULL, &sv, 1);
+     if (status == 0) {
+         Perl_croak(aTHX_ "Failed to open STD%s: %" SVf,
+                    mode == O_RDONLY ? "IN" : "OUT", get_sv("!", TRUE));
+
diff --git a/www-apache/mod_perl/metadata.xml b/www-apache/mod_perl/metadata.xml
index 743975e53191..78a62be94e65 100644
--- a/www-apache/mod_perl/metadata.xml
+++ b/www-apache/mod_perl/metadata.xml
@@ -8,4 +8,7 @@
 	<use>
 		<flag name="ithreads">Build for use with thread-capable perl, needs same setting as in <pkg>dev-lang/perl</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="github">apache/mod_perl</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apache/mod_perl/mod_perl-2.0.12.ebuild b/www-apache/mod_perl/mod_perl-2.0.12.ebuild
new file mode 100644
index 000000000000..cf5c08e8fa9b
--- /dev/null
+++ b/www-apache/mod_perl/mod_perl-2.0.12.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_TEST=do
+inherit depend.apache apache-module perl-module
+
+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="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug ithreads test"
+RESTRICT="!test? ( test )"
+
+# 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}"
+BDEPEND="
+	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
+	"${FILESDIR}"/${PN}-2.0.11-ranlib.patch       # 728554
+	"${FILESDIR}"/${PN}-2.0.12-perl538.patch
+	"${FILESDIR}"/${PN}-2.0.12-avoid-pch.patch
+)
+
+src_prepare() {
+	perl-module_src_prepare
+
+	# chainsaw unbundling
+	rm -rf Apache-{Test,Reload,SizeLimit}/ lib/Bundle/ || die
+}
+
+src_configure() {
+	_init_apache2_late
+
+	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_fix_packlist
+	perl_delete_emptybsdir
+
+	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
+}