commit: 21268dc63ea4e4c494373f3bee8118d33ca0e699 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> AuthorDate: Thu Aug 6 22:59:01 2015 +0000 Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> CommitDate: Thu Aug 6 22:59:01 2015 +0000 URL: https://gitweb.gentoo.org/dev/jmbsvicetto.git/commit/?id=21268dc6
More updates to 2.0.8-r1 and fixes to 2.0.9 so it builds. Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org> www-apache/mod_perl/Manifest | 1 + .../mod_perl/files/mod_perl-2.0.4-inline.patch | 22 ++++ .../mod_perl-2.0.9-Test-ModPerl-Registry-fix.patch | 14 +++ .../files/mod_perl-2.0.9-bundled-Apache-Test.patch | 123 +++++++++++++++++++++ www-apache/mod_perl/mod_perl-2.0.8-r1.ebuild | 1 - www-apache/mod_perl/mod_perl-2.0.9.ebuild | 5 +- 6 files changed, 161 insertions(+), 5 deletions(-) diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest index ced8fba..db3af68 100644 --- a/www-apache/mod_perl/Manifest +++ b/www-apache/mod_perl/Manifest @@ -1 +1,2 @@ DIST libapache2-mod-perl2_2.0.8+httpd24-r1449661.orig.tar.gz 3803732 SHA256 47c8f079fac7b2fa0f15096607a8ad0eff293d01527b65c1e8cbe4ed5e7b69ad SHA512 7b5a29b243366914007aedaf20096b14522f1305d88f5a8b5f3268e6063c19927055694ebd353bb20c08520a418d61484e2220c00078f05bc88bd8a0fc9e2712 WHIRLPOOL dc97a073618b0a1efc4b11b2f456014877784c1f5560eed321446f57c9e92b85d1d44b9f7bfdb581bd2b53b3c8fd5a48e60af6cf2a42bfe3967bd3a60daff95d +DIST mod_perl-2.0.9.tar.gz 3846584 SHA256 0260f26ab771c1c95fadc67544b3400e420bb30b8a77565d2d02ad05498ef52b SHA512 421d385f0d5d04cbe8c1e9559960eea86a017fa1bed88e614009143550baf852e2345001faff1fb849d9b3e6383786e0011f45ebc3e7d26ad57651fbad4e2f2c WHIRLPOOL 6b461666d380482f4f5816cbf74e100c741ce970fc19b8032d4f6a32cace9497c724631fb72c293723a5e9d67671eb4278204705089984ab2e224364ae6e0bef diff --git a/www-apache/mod_perl/files/mod_perl-2.0.4-inline.patch b/www-apache/mod_perl/files/mod_perl-2.0.4-inline.patch new file mode 100644 index 0000000..5c51a80 --- /dev/null +++ b/www-apache/mod_perl/files/mod_perl-2.0.4-inline.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/550244 + +taken from Fedora: +http://pkgs.fedoraproject.org/cgit/mod_perl.git/tree/mod_perl-2.0.4-inline.patch?h=f22 + +fixes building with gcc-5: +apache2: Syntax error on line 148 of /etc/apache2/httpd.conf: +Syntax error on line 2 of /etc/apache2/modules.d/75_mod_perl.conf: +Cannot load modules/mod_perl.so into server: +/usr/lib64/apache2/modules/mod_perl.so: undefined symbol: modperl_handler_name + +--- mod_perl-2.0.4/src/modules/perl/modperl_common_util.h.inline ++++ mod_perl-2.0.4/src/modules/perl/modperl_common_util.h +@@ -22,7 +22,7 @@ + #ifdef MP_DEBUG + #define MP_INLINE + #else +-#define MP_INLINE APR_INLINE ++#define MP_INLINE + #endif + + #ifdef CYGWIN diff --git a/www-apache/mod_perl/files/mod_perl-2.0.9-Test-ModPerl-Registry-fix.patch b/www-apache/mod_perl/files/mod_perl-2.0.9-Test-ModPerl-Registry-fix.patch new file mode 100644 index 0000000..bf2a067 --- /dev/null +++ b/www-apache/mod_perl/files/mod_perl-2.0.9-Test-ModPerl-Registry-fix.patch @@ -0,0 +1,14 @@ +diff -ur mod_perl-2.0.9-orig/ModPerl-Registry/t/conf/extra.conf.in mod_perl-2.0.9/ModPerl-Registry/t/conf/extra.conf.in +--- mod_perl-2.0.9-orig/ModPerl-Registry/t/conf/extra.conf.in 2015-08-06 22:06:49.738009495 +0000 ++++ mod_perl-2.0.9/ModPerl-Registry/t/conf/extra.conf.in 2015-08-06 22:10:35.377297791 +0000 +@@ -219,8 +219,8 @@ + + RewriteEngine On + <IfVersion < 2.4.0> +- RewriteLogLevel 9 +- RewriteLog @ServerRoot@/logs/rewrite_log ++ LogLevel rewrite:trace8 ++ ErrorLog @ServerRoot@/logs/rewrite_log + </IfVersion> + RewriteRule /rewritetest /rewrite_env/env_val.pl?REWRITE_TEST [E=REWRITE_TEST:GOTCHA,PT,NS,L] + diff --git a/www-apache/mod_perl/files/mod_perl-2.0.9-bundled-Apache-Test.patch b/www-apache/mod_perl/files/mod_perl-2.0.9-bundled-Apache-Test.patch new file mode 100644 index 0000000..d647fe0 --- /dev/null +++ b/www-apache/mod_perl/files/mod_perl-2.0.9-bundled-Apache-Test.patch @@ -0,0 +1,123 @@ +diff -ur mod_perl-2.0.9-orig/lib/ModPerl/BuildMM.pm mod_perl-2.0.9/lib/ModPerl/BuildMM.pm +--- mod_perl-2.0.9-orig/lib/ModPerl/BuildMM.pm 2015-08-06 21:39:21.933134749 +0000 ++++ mod_perl-2.0.9/lib/ModPerl/BuildMM.pm 2015-08-06 21:41:49.552679551 +0000 +@@ -39,12 +39,10 @@ + 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"; + } + +@@ -271,7 +269,7 @@ + + 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 -ur mod_perl-2.0.9-orig/lib/ModPerl/Manifest.pm mod_perl-2.0.9/lib/ModPerl/Manifest.pm +--- mod_perl-2.0.9-orig/lib/ModPerl/Manifest.pm 2015-08-06 21:39:21.933134749 +0000 ++++ mod_perl-2.0.9/lib/ModPerl/Manifest.pm 2015-08-06 21:43:04.812443268 +0000 +@@ -34,7 +34,6 @@ + my @add_files = qw{ + MANIFEST + mod_perl.spec +- Apache-Test/META.yml + }; + + sub get_svn_files { +diff -ur mod_perl-2.0.9-orig/Makefile.PL mod_perl-2.0.9/Makefile.PL +--- mod_perl-2.0.9-orig/Makefile.PL 2015-08-06 21:39:21.933134749 +0000 ++++ mod_perl-2.0.9/Makefile.PL 2015-08-06 21:47:56.001531014 +0000 +@@ -25,7 +25,7 @@ + + } + +-use lib qw(lib Apache-Test/lib); ++use lib qw(lib); + + use Config; + use File::Spec::Functions; +@@ -122,15 +122,6 @@ + + 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) { +@@ -853,14 +844,9 @@ + 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 + +@@ -871,42 +857,6 @@ + return $preamble; + } + +-sub MY::postamble { +- my $self = shift; +- +- my $string = $self->ModPerl::BuildMM::MY::postamble; +- +- if (!WIN32) { +- $string .= <<'EOF'; +-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/*/ +- +-EOF +- } +- +- $string .= <<'EOF'; +-mydist : Apache-Test/META.yml mod_perl.spec manifest tardist +- +-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 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 index bf772bf..e1601a8 100644 --- a/www-apache/mod_perl/mod_perl-2.0.8-r1.ebuild +++ b/www-apache/mod_perl/mod_perl-2.0.8-r1.ebuild @@ -189,6 +189,5 @@ src_install() { } pkg_postinst() { - perl-module_pkg_postinst apache-module_pkg_postinst } diff --git a/www-apache/mod_perl/mod_perl-2.0.9.ebuild b/www-apache/mod_perl/mod_perl-2.0.9.ebuild index 02538be..8e7108a 100644 --- a/www-apache/mod_perl/mod_perl-2.0.9.ebuild +++ b/www-apache/mod_perl/mod_perl-2.0.9.ebuild @@ -34,8 +34,6 @@ PDEPEND=" >=dev-perl/Apache-SizeLimit-0.95 " -S="${WORKDIR}/httpd24" - APACHE2_MOD_FILE="${S}/src/modules/perl/mod_perl.so" APACHE2_MOD_CONF="2.0.8/75_${PN}" APACHE2_MOD_DEFINE="PERL" @@ -112,7 +110,7 @@ src_prepare() { # Fix auth* module references on tests # epatch "${FILESDIR}/${P}-auth-fixes.patch" - epatch "${FILESDIR}/${P}-auth-modules-fix.patch" +# epatch "${FILESDIR}/${PN}-2.0.8-auth-modules-fix.patch" # epatch "${FILESDIR}/ #260_fix_pipelined_response_deadlock.patch @@ -189,6 +187,5 @@ src_install() { } pkg_postinst() { - perl-module_pkg_postinst apache-module_pkg_postinst }
