From 8823aae73b70a9edf3722ebbdfd6423d113c2d0c Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Wed, 14 Oct 2015 20:50:46 -0400 Subject: [PATCH] www-apache/mod_perl: commit junk mod_perl ebuild (that at least installs). --- www-apache/mod_perl/Manifest | 12 +- .../mod_perl-2.0.7-bundled-Apache-Test.patch | 134 --------------- www-apache/mod_perl/mod_perl-2.0.8-r1.ebuild | 162 ------------------ www-apache/mod_perl/mod_perl-2.0.8.ebuild | 157 ----------------- ...-2.0.8-r2.ebuild => mod_perl-2.0.9.ebuild} | 26 +-- 5 files changed, 15 insertions(+), 476 deletions(-) delete mode 100644 www-apache/mod_perl/files/mod_perl-2.0.7-bundled-Apache-Test.patch delete mode 100644 www-apache/mod_perl/mod_perl-2.0.8-r1.ebuild delete mode 100644 www-apache/mod_perl/mod_perl-2.0.8.ebuild rename www-apache/mod_perl/{mod_perl-2.0.8-r2.ebuild => mod_perl-2.0.9.ebuild} (85%) diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest index 74557b1..7a88b1f 100644 --- a/www-apache/mod_perl/Manifest +++ b/www-apache/mod_perl/Manifest @@ -1 +1,11 @@ -DIST mod_perl-2.0.8.tar.gz 3790026 SHA256 35dc1b7a40a90a395ce88bba2df84f22289975f34d1757de6d715560c20a20e6 SHA512 d5090651699c4436fe8d0a525226543c971aa05db337dc1b1e89023183df1c7dd8b8775f3a0f7d3b9ec40e8c058ac23bd24141cf15a5fe5806226d634dfb4c87 WHIRLPOOL d22e1c353339b08ad752e9f9c7fc0ec4d6a173c4cd3004380b14098e1028737e0eb69d2f56dbe0da3cbfb01b31232c5073d7edb28bf4fed6b2ccd67b09ad7080 +AUX 2.0.3/75_mod_perl.2.2.conf 1221 SHA256 e7c2f4b84e9c9fc73e421740736f67674ebc7e7f13f8b2f71c9360f746fd441a SHA512 caaf66604e385f24ddebf282c42b880362fa19f9195fca105171b3d3edfa5b995d7bda9899be60f78341e20e2fad75fbb097740ea43781a44a60a4a5b7f650b7 WHIRLPOOL 8601fb27162befa58c94009e4e726cbd6fec7f2014a23b68b93b88f18d0b44cbebeee3ebdb0970600aa9785b5cff6f86eb6edb33d59f874622dfb828b22b5d0b +AUX 2.0.3/75_mod_perl.conf 1295 SHA256 b26ede61b2e03fd14432725ee6e5180dc3f289a123567073ee0dc9e7679b41f2 SHA512 f6842055bf41b457e77f25de4fccb4981456669e269a01faf606f5de31050fe41c2741c2591bc89a46914c876bfebb914e7d3a07108db8220ec0b8218781c22e WHIRLPOOL 12be8c9fe44f02b50140b87d0f68b5444f3df5e6eb0bf1d51da9f01f7c4101ebeba5c0803ce8656c2be157619e2f74f5713401ebd827895738ac4d5434d48930 +AUX 2.0.3/apache2-mod_perl-startup.pl 478 SHA256 f77741fb3bb18928fb15f95c6908a17d8f06d7efbb6785e0732f201347e26544 SHA512 3af399b3aa0bf5421ddef581b1042cbd71fa3fc9d27aa87feafb4754cc8e7bf9659eb70082f0c73f0022b31e8870ff68021af692e41b391dec6c5e7608589e29 WHIRLPOOL 78518f0d5952246700424af8d85dae73a17061e009b7d89aa55c7c93fed877addc8550524ebf6fb5f353ee50210a3773dadac9e1c8f84f2b2bc32c4ab2df2981 +AUX mod_perl-2.0.1-sneak-tmpdir.patch 337 SHA256 1f319a15e3d12a349c46c0783c7ad840d81d01ed41adda55c47d4ac31595615d SHA512 8e41d94db8cdd181393be8b4922a9e9760576cb051f93d652cf3f324671a464bfc2741bf18661ac4509db257cb5975b408f33799aea76a2e46ad15af08a68792 WHIRLPOOL a24853b0ada357b2a53d5ffe34969f792305a674388d6dc385912167a7ce45d376035a0810f75a1740872bac452187e7172f11afe06f8553f25560476a5fa1da +AUX mod_perl-2.0.4-inline.patch 678 SHA256 4438195d61e62d39cf2c6d8427238426cd98bd8778d25c0086c2093e8ab55f29 SHA512 5669230db6e70b31b087851fd792004c4a292975e507f248b8dc7ce195559ab9b0579db8bea84d823f7d53e351990ecda057d7fe63273d486b5f12204d7160a5 WHIRLPOOL 6c9b1a8262b7caaf803e6f1246eacb83fe9e677a973d02bd0d2e39aa2718e424f59ac15aeea073057dd68268e5fd066b653abd7ad418c326f34e027de5227566 +AUX mod_perl-2.0.8-bundled-Apache-Test.patch 3701 SHA256 d59d1596afcf77630482588fb4df07886912cbd8726811c0629c2a4912c6c123 SHA512 7e8e84b68533eeb6defb181972dd35f2610c65b162eaf8eec8d74132ff930f017a770504951e1a5989b0c73727b71e189a81c2ec135db5395a58eee9e20da086 WHIRLPOOL 5772ed34ec32846fe9b5025810d45b2690dd1c8335403b8c0b277df38a1357049fb31f9e36820ad783922c95174c0c28e86834b514e814421253887d93ddc609 +AUX use-client_ip-client_add-instead-of-remote_ip-remote.patch 1402 SHA256 2d2869156acefd9dadc13cec791c7f4535cb0f99846aef3823e758bb07ba6429 SHA512 f45e9c6097ef1a0ca1638e90f5574ecfd421a3c7ad605d9a82c968181bb97dec8a42c968c459cbc0e41a8ab6611244e04def66566b8e41df2e9108100f95388e WHIRLPOOL d0b1e6a136ba2af0da286114bf3282c81c958dedf44ea304dc84cab8b42beab59c248e72286daf773affd301cb85c9f96dc1bb64d8cb44a3afbbef498c44941b +AUX use-log.level-instead-of-loglevel.patch 870 SHA256 3a1669e7a855784b402e7c509fbc4ebbc4c52088195972d47dce38bc4d23da74 SHA512 56e3597a0edcb4ff8f4ff77c7d40021eb3c6be8b44fa3c1943d87da53e0f3c1430c29c89cc4730f8c6fed1166bc860ae6d90a90711ffb8931861daa6d7b05c29 WHIRLPOOL 67b9f2c7bdb9a0d5c8f52d5ebc5242703ae26893550a09418ea1789b115a56a7017bdaf593cf8b237850b5d3611ddedd06ea2504a7c77dd2864def19406a3395 +DIST mod_perl-2.0.9.tar.gz 3846584 SHA256 0260f26ab771c1c95fadc67544b3400e420bb30b8a77565d2d02ad05498ef52b SHA512 421d385f0d5d04cbe8c1e9559960eea86a017fa1bed88e614009143550baf852e2345001faff1fb849d9b3e6383786e0011f45ebc3e7d26ad57651fbad4e2f2c WHIRLPOOL 6b461666d380482f4f5816cbf74e100c741ce970fc19b8032d4f6a32cace9497c724631fb72c293723a5e9d67671eb4278204705089984ab2e224364ae6e0bef +EBUILD mod_perl-2.0.9.ebuild 4570 SHA256 221e993a69dd2520a42cc7f4233ac16ea0b60dcdd9e45a561cb5defdfb80b121 SHA512 9a58815f34c68d6782e21b21b3d3604c8c48fdd02f74f3957482da4e388317bc5904179eff113897e4922944f91342a623a49ae526fa81f38ae4fe720f732121 WHIRLPOOL 25775bf54682ca91a8754fba87173c2e7cd90adcc0acd4d4fd2f548bb82844ca915df10cba51d81faedc82c77c71cdce5e5f64b74e6148a6dbac8b4399ecf0fb +MISC metadata.xml 254 SHA256 1f8ca2c8daaa36830720f986bda3a86f23e57f6fbba12cd92a2283bb84733889 SHA512 6e56dcfb66b408c6101c70b1efeebcc8effd67106cbb9ab4cf66165addaf5ce868a9b29072ce97cb0d6adab356ce060fa99d8569e982a56f6c80195e073af96f WHIRLPOOL b69bf46e1399f220cfbb51d43c64e6f84951e4aa8c43c4aef627f4fbee4b9da2370e4eed17151e46bfb2b55cbc64ffdc56f8cec2fb85925f4ea803334736ffd8 diff --git a/www-apache/mod_perl/files/mod_perl-2.0.7-bundled-Apache-Test.patch b/www-apache/mod_perl/files/mod_perl-2.0.7-bundled-Apache-Test.patch deleted file mode 100644 index 478495e..0000000 --- a/www-apache/mod_perl/files/mod_perl-2.0.7-bundled-Apache-Test.patch +++ /dev/null @@ -1,134 +0,0 @@ -diff --git a/Makefile.PL b/Makefile.PL -index c4a0430..e85cf01 100644 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -24,7 +24,7 @@ BEGIN { - - } - --use lib qw(lib Apache-Test/lib); -+use lib qw(lib); - - use Config; - use File::Spec::Functions; -@@ -117,16 +117,6 @@ sub get_DEFINE { - } - - sub configure { -- -- # mod_perl test suite relies on having Apache-Test bundled with -- # the mod_perl source, since any pre-installed version may not do -- # the right thing -- unless (-d "Apache-Test") { -- error "Can't find a sub-directory Apache-Test. " . -- "Make sure that you are using a complete source distribution"; -- exit 1; -- } -- - set_modperl_version(); - - if ($old_modperl_version) { -@@ -798,14 +788,9 @@ run_tests : test_clean - run_subtests :: - cd ModPerl-Registry && $(MAKE) test - --run_subtests :: -- cd Apache-Reload && $(MAKE) test -- - EOF - - $preamble .= <<'EOF' unless $build->mpm_is_threaded(); --run_subtests :: -- cd Apache-SizeLimit && $(MAKE) test - - EOF - -@@ -816,36 +801,6 @@ EOF - return $preamble; - } - --sub MY::postamble { -- my $self = shift; -- -- my $string = $self->ModPerl::BuildMM::MY::postamble; -- -- $string .= <<'EOF'; --mydist : Apache-Test/META.yml mod_perl.spec manifest tardist -- --rpm: dist -- @[ -d $(PWD)/rpm ] || mkdir $(PWD)/rpm -- rpmbuild -ta --define "_rpmdir $(PWD)/rpm" \ -- --define "_srcrpmdir $(PWD)/rpm" \ -- $(DISTVNAME).tar.gz -- @mv $(PWD)/rpm/*/*.rpm $(PWD)/rpm/ -- @rm -rf $(PWD)/rpm/*/ -- --mod_perl.spec: build/make_rpm_spec -- $(PERL) build/make_rpm_spec -- --Apache-Test/META.yml: -- cd Apache-Test && make metafile -- --tag : -- svn copy https://svn.apache.org/repos/asf/perl/modperl/branches/release/$(VERSION_SYM) https://svn.apache.org/repos/asf/perl/modperl/tags/$(VERSION_SYM) -- svn copy https://svn.apache.org/repos/asf/perl/modperl/docs/trunk https://svn.apache.org/repos/asf/perl/modperl/docs/tags/$(VERSION_SYM) --EOF -- -- return $string; --} -- - # this is a workaround so that ModPerl::MM will move MY::constants - # away, and Apache-Test/Makefile.PL which has its own MY::constants - # won't get complaints on MY::constants redefined -diff --git a/ModPerl-Registry/Makefile.PL b/ModPerl-Registry/Makefile.PL -index e72e65c..8610935 100644 ---- a/ModPerl-Registry/Makefile.PL -+++ b/ModPerl-Registry/Makefile.PL -@@ -14,7 +14,7 @@ use Apache::TestMM qw(test clean); - - # prerequisites - my %require = ( -- "Apache::Test" => "", # any version will do? -+ "Apache::Test" => 0, # any version will do? - ); - - my @scripts = qw(t/TEST t/SMOKE); -diff --git a/lib/ModPerl/BuildMM.pm b/lib/ModPerl/BuildMM.pm -index 1c729e2..8651999 100644 ---- a/lib/ModPerl/BuildMM.pm -+++ b/lib/ModPerl/BuildMM.pm -@@ -38,12 +38,10 @@ my @methods = grep *{$stash->{$_}}{CODE}, keys %$stash; - ModPerl::MM::override_eu_mm_mv_all_methods(@methods); - use strict 'refs'; - --my $apache_test_dir = catdir Cwd::getcwd(), "Apache-Test", "lib"; -- - #to override MakeMaker MOD_INSTALL macro - sub mod_install { - q{$(PERL) -I$(INST_LIB) -I$(PERL_LIB) \\}."\n" . -- qq{-I$apache_test_dir -MModPerl::BuildMM \\}."\n" . -+ qq{-MModPerl::BuildMM \\}."\n" . - q{-e "ExtUtils::Install::install({@ARGV},'$(VERBINST)',0,'$(UNINST)');"}."\n"; - } - -@@ -269,7 +267,7 @@ sub ModPerl::BuildMM::MY::postamble { - - push @target, - '$(FULLPERL) -I$(INST_LIB) ' . -- "-I$apache_test_dir -MModPerl::BuildMM " . -+ "-MModPerl::BuildMM " . - "-e ModPerl::BuildMM::glue_pod $pm $podpath $blib"; - - # Win32 doesn't normally install man pages -diff --git a/lib/ModPerl/Manifest.pm b/lib/ModPerl/Manifest.pm -index 1e856bc..9f1833c 100644 ---- a/lib/ModPerl/Manifest.pm -+++ b/lib/ModPerl/Manifest.pm -@@ -33,7 +33,6 @@ our @EXPORT_OK = qw(mkmanifest); - my @add_files = qw{ - MANIFEST - mod_perl.spec -- Apache-Test/META.yml - }; - - sub get_svn_files { diff --git a/www-apache/mod_perl/mod_perl-2.0.8-r1.ebuild b/www-apache/mod_perl/mod_perl-2.0.8-r1.ebuild deleted file mode 100644 index 0520b8c..0000000 --- a/www-apache/mod_perl/mod_perl-2.0.8-r1.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit depend.apache apache-module perl-module eutils - -DESCRIPTION="An embedded Perl interpreter for Apache2" -SRC_URI="mirror://apache/perl/${P}.tar.gz" -HOMEPAGE="https://projects.apache.org/projects/mod_perl.html" - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug" -SLOT="1" - -# Make sure we always use the latest Apache-Test version or even check the -# version of the bundled Apache-Test! -# -# We need both, apache and perl but either apache without threads or perl with -# ithreads, bug 373943 -DEPEND=" - >=dev-perl/Apache-Test-1.360 - >=dev-perl/CGI-3.08 - dev-lang/perl[ithreads] - www-servers/apache -" -RDEPEND="${DEPEND}" -PDEPEND=">=dev-perl/Apache-Reload-0.11 - >=dev-perl/Apache-SizeLimit-0.95" - -APACHE2_MOD_FILE="${S}/src/modules/perl/mod_perl.so" -APACHE2_MOD_CONF="2.0.3/75_${PN}" -APACHE2_MOD_DEFINE="PERL" - -SRC_TEST="do" - -DOCFILES="Changes INSTALL README STATUS" - -need_apache2_4 - -src_prepare() { - perl-module_src_prepare - - # I am not entirely happy with this solution, but here's what's - # going on here if someone wants to take a stab at another - # approach. When userpriv compilation is off, then the make - # process drops to user "nobody" to run the test servers. This - # server is closed, and then the socket is rebound using - # SO_REUSEADDR. If the same user does this, there is no problem, - # and the socket may be rebound immediately. If a different user - # (yes, in my testing, even root) attempts to rebind, it fails. - # Since the "is the socket available yet" code and the - # second-batch bind call both run as root, this will fail. - - # The upstream settings on my test machine cause the second batch - # of tests to fail, believing the socket to still be in use. I - # tried patching various parts to make them run as the user - # specified in $config->{vars}{user} using getpwnam, but found - # this patch to be fairly intrusive, because the userid must be - # restored and the patch must be applied to multiple places. - - # For now, we will simply extend the timeout in hopes that in the - # non-userpriv case, the socket will clear from the kernel tables - # normally, and the tests will proceed. - - # If anybody is still having problems, then commenting out "make - # test" below should allow the software to build properly. - - # Robert Coie 2003.05.06 -# sed -i -e "s/sleep \$_/sleep \$_ << 2/" \ -# "${S}"/Apache-Test/lib/Apache/TestServer.pm \ -# || die "problem editing TestServer.pm" - - # rendhalver - this got redone for 2.0.1 and seems to fix the make test problems - epatch "${FILESDIR}"/mod_perl-2.0.1-sneak-tmpdir.patch - - # bug 352724 - epatch "${FILESDIR}/${P}-bundled-Apache-Test.patch" - rm -rf Apache-{Test,Reload,SizeLimit}/ lib/Bundle/ - sed -i -e 's:^Apache-\(Reload\|SizeLimit\|Test\).*::' \ - -e 's:^lib/Bundle/Apache2.pm::' MANIFEST || die - - # 410453 - epatch "${FILESDIR}/use-client_ip-client_add-instead-of-remote_ip-remote.patch" - epatch "${FILESDIR}/use-log.level-instead-of-loglevel.patch" -} - -src_configure() { - local myargs= - - if use debug; then - myargs="MP_TRACE=1 MP_DEBUG=1" - else - myargs="MP_TRACE=0 MP_DEBUG=0" - fi - - perl Makefile.PL \ - PREFIX="${EPREFIX}"/usr \ - INSTALLDIRS=vendor \ - MP_USE_DSO=1 \ - MP_APXS=${APXS} \ - MP_APR_CONFIG=/usr/bin/apr-1-config \ - ${myargs} || die -} - -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}" - chown nobody:nobody "${T}" - fi - - # this does not || die because of bug 21325. kudos to smark for - # the idea of setting HOME. - TMPDIR="${T}" HOME="${T}/" perl-module_src_test -} - -src_install() { - apache-module_src_install - - emake DESTDIR="${D}" install || die - - # TODO: add some stuff from docs/ back? - - # rendhalver - fix the perllocal.pod that gets installed - # it seems to me that this has been getting installed for ages - perl_delete_localpod - # Remove empty .bs files as well - perl_delete_packlist - - insinto "${APACHE_MODULES_CONFDIR}" - doins "${FILESDIR}"/2.0.3/apache2-mod_perl-startup.pl || die - - # 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. - - # Sorry for this evil hack... - perl_set_version # just to be sure... - 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 - - 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} - done - # All the rest - perl_remove_temppath -} - -pkg_postinst() { - apache-module_pkg_postinst -} diff --git a/www-apache/mod_perl/mod_perl-2.0.8.ebuild b/www-apache/mod_perl/mod_perl-2.0.8.ebuild deleted file mode 100644 index c605774..0000000 --- a/www-apache/mod_perl/mod_perl-2.0.8.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit depend.apache apache-module perl-module eutils - -DESCRIPTION="An embedded Perl interpreter for Apache2" -SRC_URI="mirror://apache/perl/${P}.tar.gz" -HOMEPAGE="https://projects.apache.org/projects/mod_perl.html" - -LICENSE="GPL-2" -KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86" -IUSE="debug" -SLOT="1" - -# Make sure we always use the latest Apache-Test version or even check the -# version of the bundled Apache-Test! -# -# We need both, apache and perl but either apache without threads or perl with -# ithreads, bug 373943 -DEPEND="=dev-perl/Apache-Test-1.360 - >=dev-perl/CGI-3.08 - dev-lang/perl - www-servers/apache - || ( www-servers/apache[-threads] dev-lang/perl[ithreads] )" -RDEPEND="${DEPEND}" -PDEPEND=">=dev-perl/Apache-Reload-0.11 - >=dev-perl/Apache-SizeLimit-0.95" - -APACHE2_MOD_FILE="${S}/src/modules/perl/mod_perl.so" -APACHE2_MOD_CONF="2.0.3/75_${PN}.2.2" -APACHE2_MOD_DEFINE="PERL" - -SRC_TEST="do" - -DOCFILES="Changes INSTALL README STATUS" - -need_apache2 - -src_prepare() { - perl-module_src_prepare - - # I am not entirely happy with this solution, but here's what's - # going on here if someone wants to take a stab at another - # approach. When userpriv compilation is off, then the make - # process drops to user "nobody" to run the test servers. This - # server is closed, and then the socket is rebound using - # SO_REUSEADDR. If the same user does this, there is no problem, - # and the socket may be rebound immediately. If a different user - # (yes, in my testing, even root) attempts to rebind, it fails. - # Since the "is the socket available yet" code and the - # second-batch bind call both run as root, this will fail. - - # The upstream settings on my test machine cause the second batch - # of tests to fail, believing the socket to still be in use. I - # tried patching various parts to make them run as the user - # specified in $config->{vars}{user} using getpwnam, but found - # this patch to be fairly intrusive, because the userid must be - # restored and the patch must be applied to multiple places. - - # For now, we will simply extend the timeout in hopes that in the - # non-userpriv case, the socket will clear from the kernel tables - # normally, and the tests will proceed. - - # If anybody is still having problems, then commenting out "make - # test" below should allow the software to build properly. - - # Robert Coie 2003.05.06 -# sed -i -e "s/sleep \$_/sleep \$_ << 2/" \ -# "${S}"/Apache-Test/lib/Apache/TestServer.pm \ -# || die "problem editing TestServer.pm" - - # rendhalver - this got redone for 2.0.1 and seems to fix the make test problems - epatch "${FILESDIR}"/mod_perl-2.0.1-sneak-tmpdir.patch - - # bug 352724 - epatch "${FILESDIR}/${P}-bundled-Apache-Test.patch" - rm -rf Apache-{Test,Reload,SizeLimit}/ lib/Bundle/ - sed -i -e 's:^Apache-\(Reload\|SizeLimit\|Test\).*::' \ - -e 's:^lib/Bundle/Apache2.pm::' MANIFEST || die -} - -src_configure() { - local myargs= - - if use debug; then - myargs="MP_TRACE=1 MP_DEBUG=1" - else - myargs="MP_TRACE=0 MP_DEBUG=0" - fi - - perl Makefile.PL \ - PREFIX="${EPREFIX}"/usr \ - INSTALLDIRS=vendor \ - MP_USE_DSO=1 \ - MP_APXS=${APXS} \ - ${myargs} || die -} - -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}" - chown nobody:nobody "${T}" - fi - - # this does not || die because of bug 21325. kudos to smark for - # the idea of setting HOME. - TMPDIR="${T}" HOME="${T}/" perl-module_src_test -} - -src_install() { - apache-module_src_install - - emake DESTDIR="${D}" install || die - - # TODO: add some stuff from docs/ back? - - # rendhalver - fix the perllocal.pod that gets installed - # it seems to me that this has been getting installed for ages - perl_delete_localpod - # Remove empty .bs files as well - perl_delete_packlist - - insinto "${APACHE_MODULES_CONFDIR}" - doins "${FILESDIR}"/2.0.3/apache2-mod_perl-startup.pl || die - - # 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. - - # Sorry for this evil hack... - perl_set_version # just to be sure... - 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 - - 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} - done - # All the rest - perl_remove_temppath -} - -pkg_postinst() { - apache-module_pkg_postinst -} diff --git a/www-apache/mod_perl/mod_perl-2.0.8-r2.ebuild b/www-apache/mod_perl/mod_perl-2.0.9.ebuild similarity index 85% rename from www-apache/mod_perl/mod_perl-2.0.8-r2.ebuild rename to www-apache/mod_perl/mod_perl-2.0.9.ebuild index b4b85c9..fa8aa3f 100644 --- a/www-apache/mod_perl/mod_perl-2.0.8-r2.ebuild +++ b/www-apache/mod_perl/mod_perl-2.0.9.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI=5 inherit depend.apache apache-module perl-module eutils @@ -21,7 +21,6 @@ IUSE="debug" # We need both, apache and perl but either apache without threads or perl with # ithreads, bug 373943 DEPEND=" - >=dev-perl/Apache-Test-1.360 >=dev-perl/CGI-3.08 dev-lang/perl[ithreads] www-servers/apache @@ -34,7 +33,7 @@ APACHE2_MOD_FILE="${S}/src/modules/perl/mod_perl.so" APACHE2_MOD_CONF="2.0.3/75_${PN}" APACHE2_MOD_DEFINE="PERL" -SRC_TEST="do" +RESTRICT=test DOCFILES="Changes INSTALL README STATUS" @@ -78,8 +77,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-2.0.4-inline.patch #550244 # bug 352724 - epatch "${FILESDIR}/${P}-bundled-Apache-Test.patch" - rm -rf Apache-{Test,Reload,SizeLimit}/ lib/Bundle/ + rm -rf Apache-{Reload,SizeLimit}/ lib/Bundle/ || die sed -i \ -e 's:^Apache-\(Reload\|SizeLimit\|Test\).*::' \ -e 's:^lib/Bundle/Apache2.pm::' \ @@ -103,21 +101,6 @@ src_configure() { || die } -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}" - fi - - # this does not || die because of bug 21325. kudos to smark for - # the idea of setting HOME. - TMPDIR="${T}" HOME="${T}/" perl-module_src_test -} - src_install() { apache-module_src_install @@ -150,8 +133,7 @@ src_install() { "${D}/${VENDOR_ARCH}/Apache2/BuildConfig.pm" || die 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} + sed -i -e "s:\(${D}\|${S}\):/:g" ${fname} || die done # All the rest perl_remove_temppath -- 2.43.2