From f125226833fc958d4bf0d263998fa8c50d8e48e2 Mon Sep 17 00:00:00 2001 From: Christian Ruppert Date: Wed, 6 Jun 2012 18:22:02 +0000 Subject: Version bump, bug 419839 Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64 --- www-apache/mod_perl/ChangeLog | 8 +- www-apache/mod_perl/Manifest | 19 +-- .../files/mod_perl-2.0.7-bundled-Apache-Test.patch | 134 ++++++++++++++++++ www-apache/mod_perl/mod_perl-2.0.7.ebuild | 157 +++++++++++++++++++++ 4 files changed, 309 insertions(+), 9 deletions(-) create mode 100644 www-apache/mod_perl/files/mod_perl-2.0.7-bundled-Apache-Test.patch create mode 100644 www-apache/mod_perl/mod_perl-2.0.7.ebuild (limited to 'www-apache') diff --git a/www-apache/mod_perl/ChangeLog b/www-apache/mod_perl/ChangeLog index acdfc3f2884c..bab3d3362071 100644 --- a/www-apache/mod_perl/ChangeLog +++ b/www-apache/mod_perl/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-apache/mod_perl # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.95 2012/04/03 20:23:27 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.96 2012/06/06 18:22:02 idl0r Exp $ + +*mod_perl-2.0.7 (06 Jun 2012) + + 06 Jun 2012; Christian Ruppert +mod_perl-2.0.7.ebuild, + +files/mod_perl-2.0.7-bundled-Apache-Test.patch: + Version bump, bug 419839 03 Apr 2012; Christian Ruppert mod_perl-2.0.4-r1.ebuild, mod_perl-2.0.5.ebuild: diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest index 8f0ddd5e3fa4..0cf0fd8ebdbf 100644 --- a/www-apache/mod_perl/Manifest +++ b/www-apache/mod_perl/Manifest @@ -6,20 +6,23 @@ AUX 2.0.3/apache2-mod_perl-startup.pl 478 RMD160 ef12070dd5e5707286e3c714ec3aeae AUX CVE-2009-0796.patch 1284 RMD160 b46e62380f82f7a05d62e9b65ae4c7d72a03aa8a SHA1 b4d79f705d6148b4cae34f05a4e01248839f8e72 SHA256 2ef34be0541cf9866d0af551e54d062c9c62d0e0f155d206bc710a3d125004d5 AUX mod_perl-2.0.1-sneak-tmpdir.patch 337 RMD160 56c6023dc46bb5531fa44730f52b68b8333155f0 SHA1 96b2a385e5934d99222de545836329ea359b8115 SHA256 1f319a15e3d12a349c46c0783c7ad840d81d01ed41adda55c47d4ac31595615d AUX mod_perl-2.0.5-bundled-Apache-Test.patch 2075 RMD160 bf3664f1f000b6cb8d1b0068043d41032d2562e5 SHA1 eb5db1b682f5de9e101012b5d5334ae49df5ae7b SHA256 c02e8f270393854d7453adfe737f0802441630ed8e3a733e134fb2bccf3a31ae +AUX mod_perl-2.0.7-bundled-Apache-Test.patch 3929 RMD160 04d873e8f1826e22660496fbfe556b021d3a4b49 SHA1 397c5e9e707a6323ba9d6191f4cd710216b8ea58 SHA256 49ab69351e442e26d2d4ddcb5a41c702a2ce2e149fd70132b35b04017c85748d DIST mod_perl-2.0.4.tar.gz 3727717 RMD160 111b8f33e2dcc43ef7a0a7d557ceb467f0c55c6d SHA1 65299a16ec414a690a48a2bbe63acaa3c6bb897b SHA256 7da2046aa65dbef64ff5b71400bed4b6b82441e6313c8ca4becb85fb4a89a0f0 DIST mod_perl-2.0.5.tar.gz 3778910 RMD160 d659db1c64200ed9c8863c6e283360dfdd0c8384 SHA1 e749e2d7236273217f33cbe7fcd704a662e532d1 SHA256 fa95be3d6d00f083afaea4b17fd594b505998e396feb71260857604566aa8afa +DIST mod_perl-2.0.7.tar.gz 3784950 RMD160 14505fd08f6915c8a260c9068608bde6ebcbac24 SHA1 364143b2aef3c6dae69a8a2ea5d8ea2462882cd3 SHA256 53414be9db843054b927f23a35edb7b82d99e32e031b3cd81d5ff2473f51e3c6 EBUILD mod_perl-2.0.4-r1.ebuild 4339 RMD160 267e8ee68b878047ceb33a3c03027d9e54a49a21 SHA1 9d9e549c4f2280d88849b98142d941392848cf42 SHA256 552c810199cdad956b4eeea451a006a44889fcb509a8b50418b9e93bf354bcfc EBUILD mod_perl-2.0.5.ebuild 5068 RMD160 b2b5f9b8c3266274d8683d1572ebd1fd5923b4d9 SHA1 55c099d8af4a7efc7f3b0ec0348095a17c6dfda6 SHA256 421ab6e1953f8076c90bc3d603bcd82062bac8c17815e22dfb81d380891814b7 -MISC ChangeLog 22659 RMD160 5293a5afba951290ce6605101e23d292987e452e SHA1 7e748ed1ca8481f3e38a6adb4e97619dc587272f SHA256 88ee5e3b6e0807d1b4e28f5d2b8134d84eef82e92bf8fa4c09589fb9168a2a3b +EBUILD mod_perl-2.0.7.ebuild 5150 RMD160 6428b40373e8361339ef88a59bf15c17020688a9 SHA1 5d1afd4f462bf23f50e90ba920b228ab6af60d3c SHA256 ef62ab9b4a6c964865eb60b98a1b9025211ced5fb9bc30d61ca38f31064f468b +MISC ChangeLog 22845 RMD160 c26a3ed7f60e163252be631f1398e0d3d805dd5e SHA1 4cbba256b11807380d67569dbc0445e7395bd22a SHA256 3866453486f5e69c34de617257b8972444aac301b1fd8b59f7d4ec189a2feddd MISC metadata.xml 275 RMD160 4ee9e0a9afbd2a8e5817202cd2c14bb35cd5c729 SHA1 342b1eb74f37b19a3c5f9300f4814bb8e42a62a4 SHA256 031d7de6b452dfe25c20e59c8a3da81e54a59cd2c4bb80524e4905b180eb66ab -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQEcBAEBCAAGBQJPe1xJAAoJEMOx0zmdw4Z1R3cIAMFpzzAd8mrxmAnw9ffcUgql -pPgRgrfxaFt3RyzKCOnYRPiK5uCtMOOFuaPDv3pJTG1ZvMC6aDkJMvBEVkkXoqeU -4qJ97+pTCgiekBYKqEt+qPS6XDjBZunH0TlTJbHXzKOcEwYciAcNaQUDTHADVdWM -d3Xi5y3szBjrHn6wo+7K4geR2myeI+KYp7WJNbL0L0uDXY5BeoWT4lzow52KeJNu -wY78wGMHnMve3Up2W2imzB5aVST0PtioNo9fBpd2zB2JHtBlmHh6DhGfCwWyKOM5 -M7PdEF8i0gD7+ka+zgrsXPzp+03Kl4grCss3Kzxy4x2HHlfGjx6KHOl0GkIqJJE= -=mJ6j +iQEcBAEBCAAGBQJPz5/UAAoJEMOx0zmdw4Z1NdYH/03PR+g7d/JGYewYgdyJESEa +Id8zAVP/IE5cTT+akL6Atbca9vEMi/XgGJHGZQrrnaHJRoAbNySXWjk0v2Ignmld +h+fGtOCRFuzisQqGEFbtu7IeY5anD4Ep8LmTwc/NUGR00nCH/e/Rrv1GAK2IDyar +CGUNpCsgT1I3iFVh1sFPsJqByfZRgiRHXhw6H6Yzn9AvX4slFBrG68CraPlCyVfg +3MvNwYgv3GzThDThMnl1c6c1htOOMq8fp52lR72TK1nR0P96Dv0WAVcQ/Oz6toET +EwWroWSJIPx73HTEna02vdt05IOJ0cSp230oxoazGV/4pc1Z6R3Iov087rLKQ4A= +=oZSm -----END PGP SIGNATURE----- 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 new file mode 100644 index 000000000000..478495e5d769 --- /dev/null +++ b/www-apache/mod_perl/files/mod_perl-2.0.7-bundled-Apache-Test.patch @@ -0,0 +1,134 @@ +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.7.ebuild b/www-apache/mod_perl/mod_perl-2.0.7.ebuild new file mode 100644 index 000000000000..5993615cbb28 --- /dev/null +++ b/www-apache/mod_perl/mod_perl-2.0.7.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.7.ebuild,v 1.1 2012/06/06 18:22:02 idl0r Exp $ + +EAPI="3" + +inherit apache-module perl-module eutils + +DESCRIPTION="An embedded Perl interpreter for Apache2" +SRC_URI="mirror://apache/perl/${P}.tar.gz" +HOMEPAGE="http://perl.apache.org/" + +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 + >=virtual/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}" +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 + fixlocalpod + # 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... + perlinfo # 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() { + perl-module_pkg_postinst + apache-module_pkg_postinst +} -- cgit v1.2.3-65-gdbad