Support apache 2.4 (#410453)

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 108 insertions, 32 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/Manifest b/www-apache/mod_perl/Manifest
index 53765b18d393..1f5fc17b14a0 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -6,28 +6,17 @@ AUX 2.0.3/apache2-mod_perl-startup.pl 478 SHA256 f77741fb3bb18928fb15f95c6908a17
 AUX mod_perl-2.0.1-sneak-tmpdir.patch 337 SHA256 1f319a15e3d12a349c46c0783c7ad840d81d01ed41adda55c47d4ac31595615d SHA512 8e41d94db8cdd181393be8b4922a9e9760576cb051f93d652cf3f324671a464bfc2741bf18661ac4509db257cb5975b408f33799aea76a2e46ad15af08a68792 WHIRLPOOL a24853b0ada357b2a53d5ffe34969f792305a674388d6dc385912167a7ce45d376035a0810f75a1740872bac452187e7172f11afe06f8553f25560476a5fa1da
 AUX mod_perl-2.0.7-bundled-Apache-Test.patch 3929 SHA256 49ab69351e442e26d2d4ddcb5a41c702a2ce2e149fd70132b35b04017c85748d SHA512 113550c5dff0992d6289a1f6c990b2ded9800cdf285367ca677390a54e83e8628d78fdfe0697f7d1bda6fa43bfe079cae8654eb1640af89ff72e29a12fe64764 WHIRLPOOL 9e8de297c908548a77fe97fe804480dc98167138d982c2ced07abf11a4fa399f3f269f1583bd355689cee5b0687567935f4be7727f7c01de2ffa6df16998d6fb
 AUX mod_perl-2.0.8-bundled-Apache-Test.patch 3701 SHA256 d59d1596afcf77630482588fb4df07886912cbd8726811c0629c2a4912c6c123 SHA512 7e8e84b68533eeb6defb181972dd35f2610c65b162eaf8eec8d74132ff930f017a770504951e1a5989b0c73727b71e189a81c2ec135db5395a58eee9e20da086 WHIRLPOOL 5772ed34ec32846fe9b5025810d45b2690dd1c8335403b8c0b277df38a1357049fb31f9e36820ad783922c95174c0c28e86834b514e814421253887d93ddc609
-DIST mod_perl-2.0.7.tar.gz 3784950 SHA256 53414be9db843054b927f23a35edb7b82d99e32e031b3cd81d5ff2473f51e3c6 SHA512 b8ca808aebff35198b0a29e8ec98d10364cff15aab628697da135581675c254054e039e80afafc651743975a8795f40da450177be49bb5fd1934bcad7ebc4fed WHIRLPOOL 7b2a329f19d199426ae57ed5061adc2a38e42c4c0019f8fb372f41c1b36a3e809a41c1031c1c21346649980fccb54248d2888510604e77e7666a880d3957f663
+AUX use-client_ip-client_add-instead-of-remote_ip-remote.patch 1402 SHA256 2d2869156acefd9dadc13cec791c7f4535cb0f99846aef3823e758bb07ba6429 SHA512 f45e9c6097ef1a0ca1638e90f5574ecfd421a3c7ad605d9a82c968181bb97dec8a42c968c459cbc0e41a8ab6611244e04def66566b8e41df2e9108100f95388e WHIRLPOOL d0b1e6a136ba2af0da286114bf3282c81c958dedf44ea304dc84cab8b42beab59c248e72286daf773affd301cb85c9f96dc1bb64d8cb44a3afbbef498c44941b
+AUX use-log.level-instead-of-loglevel.patch 870 SHA256 3a1669e7a855784b402e7c509fbc4ebbc4c52088195972d47dce38bc4d23da74 SHA512 56e3597a0edcb4ff8f4ff77c7d40021eb3c6be8b44fa3c1943d87da53e0f3c1430c29c89cc4730f8c6fed1166bc860ae6d90a90711ffb8931861daa6d7b05c29 WHIRLPOOL 67b9f2c7bdb9a0d5c8f52d5ebc5242703ae26893550a09418ea1789b115a56a7017bdaf593cf8b237850b5d3611ddedd06ea2504a7c77dd2864def19406a3395
 DIST mod_perl-2.0.8.tar.gz 3790026 SHA256 35dc1b7a40a90a395ce88bba2df84f22289975f34d1757de6d715560c20a20e6 SHA512 d5090651699c4436fe8d0a525226543c971aa05db337dc1b1e89023183df1c7dd8b8775f3a0f7d3b9ec40e8c058ac23bd24141cf15a5fe5806226d634dfb4c87 WHIRLPOOL d22e1c353339b08ad752e9f9c7fc0ec4d6a173c4cd3004380b14098e1028737e0eb69d2f56dbe0da3cbfb01b31232c5073d7edb28bf4fed6b2ccd67b09ad7080
-EBUILD mod_perl-2.0.7-r1.ebuild 5113 SHA256 881cb05964184c58e9e3f841643f2d3f4e33704521b9a8cb4fc237393da5b7bb SHA512 aa556c6657d33ec35a82df9558b4d8b7abc435dd75f32250c17db0c86513d4a349ba9a457f69847928003bf3adba236b95c405312d121d63ce1bbe69b6163af4 WHIRLPOOL fd90f984f503e5620e87a66cd3db0494ae1b7387097daa55f596a2c89b46cc6ee10bf8f85f84918d411bfc943b1672e1f52e295c823e676a3f6880e9418fe976
+EBUILD mod_perl-2.0.8-r1.ebuild 5331 SHA256 9a28f28145d37b3453b10d192706683eb59f5d46d7b79f0fc19691eeffe3debc SHA512 8635c985892eb98f589abf1b271fea06d8ee4cabb682c449d59dcd665d3af8ee8f39c6bc48667a150e6f97330a1510b5fedb988c0077e24f8ac44190e6fff0ab WHIRLPOOL ee65dfc1bfe3370e80d88ec58c8242cc7889695220deb50372743031d1bea8247d9ea9c06cec1a127f0b1ed4702ab6b70fb6071dbe7ec3cc023b20261e97b687
 EBUILD mod_perl-2.0.8.ebuild 5205 SHA256 0cb14b61f33a594b5aef3b956aca53d2fb9da4aa09b52d66f8bc06ea6b87dc36 SHA512 75f44d4f7b144b14c393e8fde48b5cd6e212b1af4c7bd0f83b8160cd0403687f7aaf03abfefea825ca6e585b944a96b268470536367b6d59539af4ddae702d0c WHIRLPOOL fc390e0bc43d80fa0acc7c95ba8ace48fd10ccab74330dce8e97700adf2dda544e94ce149b62d4ea25156c8fb7a5d3e6c64acd37ce3598595766fd64ad2cc6ea
-MISC ChangeLog 25773 SHA256 f9b246e626adf154db8ec930cdad8e86a1ec6c616076ce1c77e5a941df715b93 SHA512 124f31ad1422b0cdfec436b09e50724bb245a9d0aa469756dc1bb3154d381a9cec660505e70578b59d2a3f47f97dd868dfd41804ba62321bf42b88398295abcc WHIRLPOOL ac072842d6f843e52875c161a82eec2a5ca4a0eec0f7757dc230c11621fcbd647b922ce68168afd95dfa4f84671f605ec0360cf6776624860741e8deb2f67802
+MISC ChangeLog 26056 SHA256 0399e8055ab90bd5bab65fdf318887da37d1fdb1912b2a75290d13c25c25f123 SHA512 b7d33b93b07d5e155cd06cd87ba71ac27b74835a63f27adcb4b46ee4a2e0cc2bfe859762e5fe29b93be5d8bc329c4cabb461c8dbab985e0768b0d5522bab3e5b WHIRLPOOL d4e14bc264d5e1eba5079e1d4667d57a1df73e572eec5195f8a3cd4e7515b04a3ceb9c03e27b6e8b4e243f2421cff453a028e1bb7bfc1288b73c34357cb8ac90
 MISC metadata.xml 254 SHA256 1f8ca2c8daaa36830720f986bda3a86f23e57f6fbba12cd92a2283bb84733889 SHA512 6e56dcfb66b408c6101c70b1efeebcc8effd67106cbb9ab4cf66165addaf5ce868a9b29072ce97cb0d6adab356ce060fa99d8569e982a56f6c80195e073af96f WHIRLPOOL b69bf46e1399f220cfbb51d43c64e6f84951e4aa8c43c4aef627f4fbee4b9da2370e4eed17151e46bfb2b55cbc64ffdc56f8cec2fb85925f4ea803334736ffd8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUd7ecXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcWsoQAJcVegamElp0fmPXPITSXpdA
-mnvnKhm51Lix6fP4rp2zV40H7vULiHllmrFydpaLPxov5oLnvb12tr5ebyYAdLL8
-lyE2XfUmM/Vho+VDlx2D65RIBRwMjYLIej3SkBoQBUrom3Cn/umKe9AA4WMMttXC
-Aj+6YRmo7QcIAOQybXzmKct/yQ18duva+tl0b+gcnqVh5mkDG+RLxAusp77HpO48
-iSpEDTzkzUbh1jzT3JxJ9DEZr/rWlZjAXrdKNkIZ9JjMUzjUierE37d7Vp66zClk
-mcCygD8wM5AYGtFa8Zh2oc30YVqJih8JKT8jP1DKuh7x3TlEPn9xaJPJDTRekEwW
-TITqJgxaBJ08WvlIPLskC8blGQzzjcyMIPN56HSXrBR4m/d9k0OkCHdQrkgQYi87
-x46SWARL4e8sX3xnstvfXSFqQnQONtdXco9rW8PCX1a80rgapt1a5GUjTJuJwt4n
-1cE37FxCUYKuSfmdEh5uVv6PeELVo0HEAN3+ypEKCBn4cIvP/kBRasRAofYeP9iM
-v8imhqpvv2r6Pff/3ycniNMArXngsm/fRi3bPMCcvTudf/LW2Z2xJIl8Ft5rbZm5
-3BPwcXrxUcn5IK4JyMtXvhTdITD8juaNO8tKf8oLeHRbShCXevdXCOxsb4RGDNzW
-O+3JvZBNAlVu+7GLzcVz
-=pd5E
+iEYEAREIAAYFAlVNB3IACgkQCaWpQKGI+9RO+QCfedl0TtV50qAsePUee1mxmjzR
+01AAn3kDJPa4S7M9YtzBHAIOD7TySUVB
+=VPk0
 -----END PGP SIGNATURE-----
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