Support apache 2.4 (#410453)

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 100 insertions, 13 deletions

diff --git a/www-apache/mod_perl/ChangeLog b/www-apache/mod_perl/ChangeLog
index 44b3a26a7180..e4674397323a 100644
--- a/www-apache/mod_perl/ChangeLog
+++ b/www-apache/mod_perl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apache/mod_perl
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.118 2014/11/27 23:45:31 dilfridge Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.119 2015/05/08 18:58:57 pacho Exp $
+
+*mod_perl-2.0.8-r1 (08 May 2015)
+
+  08 May 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/use-client_ip-client_add-instead-of-remote_ip-remote.patch,
+  +files/use-log.level-instead-of-loglevel.patch, +mod_perl-2.0.8-r1.ebuild,
+  -mod_perl-2.0.7-r1.ebuild:
+  Support apache 2.4 (#410453)
 
   27 Nov 2014; Andreas K. Huettel <dilfridge@gentoo.org>
   mod_perl-2.0.7-r1.ebuild, mod_perl-2.0.8.ebuild:
diff --git a/www-apache/mod_perl/files/use-client_ip-client_add-instead-of-remote_ip-remote.patch b/www-apache/mod_perl/files/use-client_ip-client_add-instead-of-remote_ip-remote.patch
new file mode 100644
index 000000000000..1a695b85409c
--- /dev/null
+++ b/www-apache/mod_perl/files/use-client_ip-client_add-instead-of-remote_ip-remote.patch
@@ -0,0 +1,47 @@
+From 3fb7843aa2aa992be430068929f4e1cc7787a233 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Tue, 3 Apr 2012 19:25:41 +0200
+Subject: [PATCH] use client_ip/client_add instead of remote_ip/remote_addr
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ xs/maps/apache2_structures.map              |    4 ++--
+ xs/tables/current/Apache2/StructureTable.pm |    4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/xs/maps/apache2_structures.map b/xs/maps/apache2_structures.map
+index f86ec93..c0fcf78 100644
+--- a/xs/maps/apache2_structures.map
++++ b/xs/maps/apache2_structures.map
+@@ -106,8 +106,8 @@ $  limit_req_fields
+ <  local_addr
+ <  local_ip
+ <  local_host
+-<  remote_addr
+-   remote_ip
++<  client_addr
++   client_ip
+ <  remote_host
+ -  remote_logname
+ <  aborted
+diff --git a/xs/tables/current/Apache2/StructureTable.pm b/xs/tables/current/Apache2/StructureTable.pm
+index af50be1..0c0465a 100644
+--- a/xs/tables/current/Apache2/StructureTable.pm
++++ b/xs/tables/current/Apache2/StructureTable.pm
+@@ -2708,11 +2708,11 @@ $Apache2::StructureTable = [
+       },
+       {
+         'type' => 'apr_sockaddr_t *',
+-        'name' => 'remote_addr'
++        'name' => 'client_addr'
+       },
+       {
+         'type' => 'char *',
+-        'name' => 'remote_ip'
++        'name' => 'client_ip'
+       },
+       {
+         'type' => 'char *',
+-- 
+1.7.8.5
+
diff --git a/www-apache/mod_perl/files/use-log.level-instead-of-loglevel.patch b/www-apache/mod_perl/files/use-log.level-instead-of-loglevel.patch
new file mode 100644
index 000000000000..aeb8d98af79d
--- /dev/null
+++ b/www-apache/mod_perl/files/use-log.level-instead-of-loglevel.patch
@@ -0,0 +1,27 @@
+From 0d6ac25c1c7871be52e8399c6e8bc8509ed5f3d9 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Tue, 3 Apr 2012 19:30:33 +0200
+Subject: [PATCH] use log.level instead of loglevel
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ xs/maps/apache2_structures.map              |    2 +-
+ xs/tables/current/Apache2/StructureTable.pm |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xs/tables/current/Apache2/StructureTable.pm b/xs/tables/current/Apache2/StructureTable.pm
+index 0c0465a..439184e 100644
+--- a/xs/tables/current/Apache2/StructureTable.pm
++++ b/xs/tables/current/Apache2/StructureTable.pm
+@@ -3245,7 +3245,7 @@ $Apache2::StructureTable = [
+       },
+       {
+         'type' => 'int',
+-        'name' => 'loglevel'
++        'name' => 'log.level'
+       },
+       {
+         'type' => 'int',
+-- 
+1.7.8.5
+
diff --git a/www-apache/mod_perl/mod_perl-2.0.7-r1.ebuild b/www-apache/mod_perl/mod_perl-2.0.8-r1.ebuild
index f9125bd29ee0..96d861d9d794 100644
--- a/www-apache/mod_perl/mod_perl-2.0.7-r1.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.8-r1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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-r1.ebuild,v 1.4 2014/11/27 23:45:31 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.8-r1.ebuild,v 1.1 2015/05/08 18:58:57 pacho Exp $
 
-EAPI=5
+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="http://perl.apache.org/"
+HOMEPAGE="https://projects.apache.org/projects/mod_perl.html"
 
 LICENSE="GPL-2"
-KEYWORDS="~hppa"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug"
 SLOT="1"
 
@@ -20,12 +20,12 @@ 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
+DEPEND="
 	>=dev-perl/Apache-Test-1.360
 	>=virtual/perl-CGI-3.08
-	dev-lang/perl
+	dev-lang/perl[ithreads]
 	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"
@@ -81,6 +81,10 @@ src_prepare() {
 	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() {
@@ -97,6 +101,7 @@ src_configure() {
 		INSTALLDIRS=vendor \
 		MP_USE_DSO=1 \
 		MP_APXS=${APXS} \
+		MP_APR_CONFIG=/usr/bin/apr-1-config \
 		${myargs} || die
 }
 
@@ -119,7 +124,7 @@ src_test() {
 src_install() {
 	apache-module_src_install
 
-	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install || die
 
 	# TODO: add some stuff from docs/ back?
 
@@ -130,7 +135,7 @@ src_install() {
 	perl_delete_packlist
 
 	insinto "${APACHE_MODULES_CONFDIR}"
-	doins "${FILESDIR}"/2.0.3/apache2-mod_perl-startup.pl
+	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