[gentoo-commits] dev/jmbsvicetto:master commit in: www-apache/mod_perl/files/, www-apache/mod_perl/
commit: 21268dc63ea4e4c494373f3bee8118d33ca0e699
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo
org>
AuthorDate: Thu Aug 6 22:59:01 2015 +
Commit: Jorge Manuel B. S. Vicetto gentoo org>
CommitDate: Thu Aug 6 22:59:01 2015 +
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)
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 000..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 000..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 +
mod_perl-2.0.9/ModPerl-Registry/t/conf/extra.conf.in 2015-08-06
22:10:35.377297791 +
+@@ -219,8 +219,8 @@
+
+ RewriteEngine On
+
+-RewriteLogLevel 9
+-RewriteLog @ServerRoot@/logs/rewrite_log
++LogLevel rewrite:trace8
++ErrorLog @ServerRoot@/logs/rewrite_log
+
+ 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 000..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
+
mod_perl-2.0.9/lib/ModPerl/BuildMM.pm 2015-08-06 21:41:49.552679551
+
+@@ -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) ' .
+-
[gentoo-commits] dev/jmbsvicetto:master commit in: www-apache/mod_perl/
commit: 577137113bf1d48b1378bcefa4b55b43b2c935ac
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo
org>
AuthorDate: Thu Aug 6 20:09:09 2015 +
Commit: Jorge Manuel B. S. Vicetto gentoo org>
CommitDate: Thu Aug 6 20:09:09 2015 +
URL:https://gitweb.gentoo.org/dev/jmbsvicetto.git/commit/?id=57713711
Sync ebuild with tree ebuilds and add experimental ebuild for 2.0.9 release.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto)
gentoo.org>
www-apache/mod_perl/mod_perl-2.0.8-r1.ebuild | 47 ++---
..._perl-2.0.8-r1.ebuild => mod_perl-2.0.9.ebuild} | 49 ++
2 files changed, 43 insertions(+), 53 deletions(-)
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 6bcd37f..bf772bf 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
@@ -1,17 +1,14 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
-inherit apache-module perl-module eutils
+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";
SRC_URI="mirror://debian//pool/main/liba/libapache2-mod-perl2/libapache2-mod-perl2_2.0.8+httpd24-r1449661.orig.tar.gz"
-#
mirror://debian/pool/main/liba/libapache2-mod-perl2/libapache2-mod-perl2_2.0.8+httpd24-r1449661-5.debian.tar.gz
-
-HOMEPAGE="http://perl.apache.org/";
LICENSE="GPL-2"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
@@ -47,7 +44,7 @@ SRC_TEST="do"
DOCFILES="Changes INSTALL README STATUS"
-need_apache2
+need_apache2_4
src_prepare() {
perl-module_src_prepare
@@ -83,8 +80,9 @@ src_prepare() {
# || 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
-
+ epatch "${FILESDIR}"/${PN}-2.0.1-sneak-tmpdir.patch
+ # bug 550244
+ epatch "${FILESDIR}"/${PN}-2.0.4-inline.patch
# bug 352724
epatch "${FILESDIR}/${P}-bundled-Apache-Test.patch"
rm -rf Apache-{Test,Reload,SizeLimit}/ lib/Bundle/
@@ -124,21 +122,17 @@ src_prepare() {
}
src_configure() {
- local myargs=
-
- if use debug; then
- myargs="MP_TRACE=1 MP_DEBUG=1"
- else
- myargs="MP_TRACE=0 MP_DEBUG=0"
- fi
+ local debug=$(usex debug 1 0)
perl Makefile.PL \
PREFIX="${EPREFIX}"/usr \
INSTALLDIRS=vendor \
MP_USE_DSO=1 \
MP_APXS=${APXS} \
- MP_APR_CONFIG="/usr/bin/apu-1-config" \
- ${myargs} || die
+ MP_APR_CONFIG=/usr/bin/apr-1-config \
+ MP_TRACE=${debug} \
+ MP_DEBUG=${debug} \
+ || die
}
src_test() {
@@ -148,8 +142,7 @@ src_test() {
# 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}"
+ chown nobody:nobody "${WORKDIR}" "${T}"
fi
# this does not || die because of bug 21325. kudos to smark for
@@ -160,18 +153,18 @@ src_test() {
src_install() {
apache-module_src_install
- emake DESTDIR="${D}" install || die
+ default
# 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
+ 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
+ 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
@@ -180,10 +173,12 @@ src_install() {
# happening and revert if problematic.
# Sorry for this evil hack...
- perlinfo # just to be sure...
- sed -i -e "s,-I${S}/[^[:space:]\"\']\+[[:space:]]\?,,g" \
+ 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
+ -e "s,${S}\(/[^[:space:]\"\']\+\)\?,/,g" \
+ "${D}/${VENDOR_ARCH}/Apache2/BuildConfig.pm" || die
for fname
[gentoo-commits] dev/jmbsvicetto:master commit in: www-apache/mod_perl/
commit: 9ef442dc249835627f32be99947458b9c0c86a88
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo
org>
AuthorDate: Thu Aug 6 19:37:30 2015 +
Commit: Jorge Manuel B. S. Vicetto gentoo org>
CommitDate: Thu Aug 6 19:37:30 2015 +
URL:https://gitweb.gentoo.org/dev/jmbsvicetto.git/commit/?id=9ef442dc
Fix virtual/perl-CGI dependency and sort deps alphabetically.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto)
gentoo.org>
.../mod_perl/{mod_perl-2.0.8.ebuild => mod_perl-2.0.8-r1.ebuild} | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/www-apache/mod_perl/mod_perl-2.0.8.ebuild
b/www-apache/mod_perl/mod_perl-2.0.8-r1.ebuild
similarity index 99%
rename from www-apache/mod_perl/mod_perl-2.0.8.ebuild
rename to www-apache/mod_perl/mod_perl-2.0.8-r1.ebuild
index de7966b..6bcd37f 100644
--- a/www-apache/mod_perl/mod_perl-2.0.8.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.8-r1.ebuild
@@ -24,11 +24,10 @@ SLOT="1"
# 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
+ >=dev-perl/Apache-Test-1.360
+ >=dev-perl/CGI-3.08
+ >=www-servers/apache-2.4
|| ( www-servers/apache[-threads] dev-lang/perl[ithreads] )
test? ( dev-perl/HTML-Parser )
"
