diff options
author | Christian Ruppert <idl0r@gentoo.org> | 2013-12-22 20:03:30 +0000 |
---|---|---|
committer | Christian Ruppert <idl0r@gentoo.org> | 2013-12-22 20:03:30 +0000 |
commit | 8a16eb211459df351362d9696d69bda2376977a8 (patch) | |
tree | 1689ff53a369062a0486867aa2ee7f6dcb6ce9b4 /www-apache | |
parent | Cleanup old. (diff) | |
download | gentoo-2-8a16eb211459df351362d9696d69bda2376977a8.tar.gz gentoo-2-8a16eb211459df351362d9696d69bda2376977a8.tar.bz2 gentoo-2-8a16eb211459df351362d9696d69bda2376977a8.zip |
Version bump, bug 484038, thanks to Martin von Gagern <Martin.vGagern@gmx.net>
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B427ABC8)
Diffstat (limited to 'www-apache')
-rw-r--r-- | www-apache/mod_perl/ChangeLog | 11 | ||||
-rw-r--r-- | www-apache/mod_perl/files/mod_perl-2.0.8-bundled-Apache-Test.patch | 127 | ||||
-rw-r--r-- | www-apache/mod_perl/mod_perl-2.0.8.ebuild | 158 |
3 files changed, 294 insertions, 2 deletions
diff --git a/www-apache/mod_perl/ChangeLog b/www-apache/mod_perl/ChangeLog index 0a12748f7240..0e761b08cedb 100644 --- a/www-apache/mod_perl/ChangeLog +++ b/www-apache/mod_perl/ChangeLog @@ -1,6 +1,13 @@ # 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.105 2012/11/27 19:27:09 pacho Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.106 2013/12/22 20:03:30 idl0r Exp $ + +*mod_perl-2.0.8 (22 Dec 2013) + + 22 Dec 2013; Christian Ruppert <idl0r@gentoo.org> +mod_perl-2.0.8.ebuild, + +files/mod_perl-2.0.8-bundled-Apache-Test.patch: + Version bump, bug 484038, thanks to Martin von Gagern + <Martin.vGagern@gmx.net> 27 Nov 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml: Drop apache herd as discussed in http://www.gossamer- diff --git a/www-apache/mod_perl/files/mod_perl-2.0.8-bundled-Apache-Test.patch b/www-apache/mod_perl/files/mod_perl-2.0.8-bundled-Apache-Test.patch new file mode 100644 index 000000000000..2e4da922aeaf --- /dev/null +++ b/www-apache/mod_perl/files/mod_perl-2.0.8-bundled-Apache-Test.patch @@ -0,0 +1,127 @@ +--- 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,37 +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/trunk https://svn.apache.org/repos/asf/perl/modperl/branches/release/$(VERSION_SYM) +- 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 +--- 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); +--- a/lib/ModPerl/BuildMM.pm ++++ b/lib/ModPerl/BuildMM.pm +@@ -38,12 +38,10 @@ my @methods = grep *{$stash->{$_}}{CODE} + 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 +--- 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.ebuild b/www-apache/mod_perl/mod_perl-2.0.8.ebuild new file mode 100644 index 000000000000..6f3571596674 --- /dev/null +++ b/www-apache/mod_perl/mod_perl-2.0.8.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2013 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.8.ebuild,v 1.1 2013/12/22 20:03:30 idl0r Exp $ + +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="<www-servers/apache-2.4 + >=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 <rac@gentoo.org> 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 +} |