diff options
Diffstat (limited to 'www-apache')
-rw-r--r-- | www-apache/Manifest.gz | bin | 5912 -> 5915 bytes | |||
-rw-r--r-- | www-apache/mod_perl/Manifest | 7 | ||||
-rw-r--r-- | www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch | 17 | ||||
-rw-r--r-- | www-apache/mod_perl/files/mod_perl-2.0.12-avoid-pch.patch | 22 | ||||
-rw-r--r-- | www-apache/mod_perl/files/mod_perl-2.0.12-perl538.patch | 25 | ||||
-rw-r--r-- | www-apache/mod_perl/mod_perl-2.0.11-r1.ebuild | 143 | ||||
-rw-r--r-- | www-apache/mod_perl/mod_perl-2.0.12.ebuild | 144 |
7 files changed, 0 insertions, 358 deletions
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz Binary files differindex b6a430ff3cdc..dd2ad592b865 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 4277b1b57943..51b63c647969 100644 --- a/www-apache/mod_perl/Manifest +++ b/www-apache/mod_perl/Manifest @@ -4,15 +4,8 @@ AUX 2.0.3/apache2-mod_perl-startup.pl 478 BLAKE2B ec1bf3eb1119561396756706e501b9 AUX mod_perl-2.0.1-sneak-tmpdir.patch 264 BLAKE2B 2ed1802516d3ce68f43154e63c9a222e10e53bf4c90e87ea6a4c9c5a7df902d4ed9c9df3b39070e0c618281b245c47b81fecd40a37c2d2397feb03bf4d6645c9 SHA512 523aa45c616473062841b0bbf11c43a4dcb0729a9a5e380a1da1857409169fc2a6036ece1a33e52762eed6853cb068264802701d7b89be2d247948a65ef4fc0c AUX mod_perl-2.0.10_rc1-Gentoo-not-Unix.patch 1517 BLAKE2B 4546fd0ae82a99c335140c223b830321dd340393700e74d18130063b952d8249e0b1610b86ba93782d5798dcb66689cc2d30247a5f3e3866c34387dba4b0f6dc SHA512 4ac22d4e8942d2fb4d07f10897c7670acd77d28a7b47049e95dffe026d335c26681a0fa4a43c67b53fafa8c5bdba7991bad150e3bc00a8e3c40a7d7e59938c63 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 DIST mod_perl-2.0.13.tar.gz 3848487 BLAKE2B 8fb640f6815dac7a93ceeca21c63d4c5d5f14c81d061b0fbfe5831afcb8682df509c367f113a7b1396fdd25ccebd66cf708f99b5e69c8393add0f7969c102249 SHA512 453c789743487e2d1167d005f21ef9780f36488db8830103e4ea0a0656f685bf5ec423cd1baa68ee30efc75d9e2b845c9656458203b9f48de81a315a91d587c9 -EBUILD mod_perl-2.0.11-r1.ebuild 3904 BLAKE2B 95e43d8bbe677e26a7d535e0a409b83e5f4363eabb6ba16b1f11092f44b6c6d9e1e130f440b022c165208f2c6030e10f571afa0f88bb9274ed035b62ee6d62aa SHA512 23f83907bc48f9fa3caf3c5dad5c90be2bd25746079b4ea9577d8b023d587adf11baef02e08bc9954321103de997d1b7dff32ba8d04aad41d5865613da59a69a -EBUILD mod_perl-2.0.12.ebuild 3944 BLAKE2B 6bbcc423f6e9b2f098acd9a4cf8330580c3521aba8f06257eefd14a2bfeec069810508fb396dd03126787c8794fb63826860c191be157d55f42a2249fdb8473e SHA512 628eb10a20ad491f4aabccde00d105c58f0cfbc4769f56213b4446a797aaa40a0e217da20d5310cf5672d410dc609148fc6b226e99ba080dc5d310ae202d3ddf EBUILD mod_perl-2.0.13.ebuild 3858 BLAKE2B 75dfa9c6ed8c5fdae61a16f26d2c1e76d4bd04daf427f7eee1687651ecdf7f2db613bf7c493653ebf3a0490d1bf5603a4cd22b582fb6a790d8f009634f893599 SHA512 d5df4fd27d6e46545005ced3566de9f3346493cfe2b3eff1e58042e69a85a31a2bd13dc0408bfe105cf662de2a62e03bdddebca7ea424d6952bda9d7db481ee3 MISC metadata.xml 468 BLAKE2B 89a2a9d8fdb7c3e0dc3022daf3937f67c59849c4a9d95cb97db1adee8f38e2d26a34706fbf23d8ba6da9fe9a09a68c3f0778f3c93f93b2fd965b4b79dc69d14c SHA512 a01e631256aa5d25219dcccc886601da90b9cfdf91bbcebfb1a4f193f8699ca0033e2899dac4a206149247874a7f0b9ce74965bf5098ff956470897c794d3aca diff --git a/www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch b/www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch deleted file mode 100644 index 77db5f65263d..000000000000 --- a/www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch +++ /dev/null @@ -1,17 +0,0 @@ - -Fix build for perl >= 5.33.7 - -Patch by Leon Timmermans <fawaka@gmail.com> from https://github.com/Perl/perl5/issues/18617 - - ---- a/src/modules/perl/modperl_perl.c -+++ b/src/modules/perl/modperl_perl.c -@@ -268,7 +268,7 @@ - #ifdef MP_NEED_HASH_SEED_FIXUP - if (MP_init_hash_seed_set) { - #if MP_PERL_VERSION_AT_LEAST(5, 17, 6) -- memcpy(&PL_hash_seed, &MP_init_hash_seed, -+ memcpy(PL_hash_seed, &MP_init_hash_seed, - sizeof(PL_hash_seed) > sizeof(MP_init_hash_seed) ? - sizeof(MP_init_hash_seed) : sizeof(PL_hash_seed)); - PL_hash_seed_set = MP_init_hash_seed_set; 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 deleted file mode 100644 index 989d472831f7..000000000000 --- a/www-apache/mod_perl/files/mod_perl-2.0.12-avoid-pch.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 deleted file mode 100644 index 3932dffe4a68..000000000000 --- a/www-apache/mod_perl/files/mod_perl-2.0.12-perl538.patch +++ /dev/null @@ -1,25 +0,0 @@ -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/mod_perl-2.0.11-r1.ebuild b/www-apache/mod_perl/mod_perl-2.0.11-r1.ebuild deleted file mode 100644 index 374329841fba..000000000000 --- a/www-apache/mod_perl/mod_perl-2.0.11-r1.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 )" - -DIST_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 - "${FILESDIR}/${PN}"-2.0.11-ranlib.patch # 728554 - "${FILESDIR}/${PN}"-2.0.11-perl534.patch # 791403 -) - -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 -} diff --git a/www-apache/mod_perl/mod_perl-2.0.12.ebuild b/www-apache/mod_perl/mod_perl-2.0.12.ebuild deleted file mode 100644 index 1ebaf1e19813..000000000000 --- a/www-apache/mod_perl/mod_perl-2.0.12.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# 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 -} |