Use inline patch from Fedora to fix build w/gcc-5 #550244.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 210 insertions, 7 deletions

diff --git a/www-apache/mod_perl/ChangeLog b/www-apache/mod_perl/ChangeLog
index 7931ea6eee58..d1c9b80e16c6 100644
--- a/www-apache/mod_perl/ChangeLog
+++ b/www-apache/mod_perl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/mod_perl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.121 2015/05/24 02:44:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.122 2015/05/24 02:45:01 vapier Exp $
+
+*mod_perl-2.0.8-r2 (24 May 2015)
+
+  24 May 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/mod_perl-2.0.4-inline.patch, +mod_perl-2.0.8-r2.ebuild:
+  Use inline patch from Fedora to fix build w/gcc-5 #550244.
 
   24 May 2015; Mike Frysinger <vapier@gentoo.org> mod_perl-2.0.8.ebuild,
   files/2.0.3/75_mod_perl.conf, +files/2.0.3/75_mod_perl.conf.2.2:
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index 7f8f95d968f1..baeb1fc94828 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -1,22 +1,35 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 2.0.3/75_mod_perl.conf 1221 SHA256 e7c2f4b84e9c9fc73e421740736f67674ebc7e7f13f8b2f71c9360f746fd441a SHA512 caaf66604e385f24ddebf282c42b880362fa19f9195fca105171b3d3edfa5b995d7bda9899be60f78341e20e2fad75fbb097740ea43781a44a60a4a5b7f650b7 WHIRLPOOL 8601fb27162befa58c94009e4e726cbd6fec7f2014a23b68b93b88f18d0b44cbebeee3ebdb0970600aa9785b5cff6f86eb6edb33d59f874622dfb828b22b5d0b
+AUX 2.0.3/75_mod_perl.conf 1295 SHA256 b26ede61b2e03fd14432725ee6e5180dc3f289a123567073ee0dc9e7679b41f2 SHA512 f6842055bf41b457e77f25de4fccb4981456669e269a01faf606f5de31050fe41c2741c2591bc89a46914c876bfebb914e7d3a07108db8220ec0b8218781c22e WHIRLPOOL 12be8c9fe44f02b50140b87d0f68b5444f3df5e6eb0bf1d51da9f01f7c4101ebeba5c0803ce8656c2be157619e2f74f5713401ebd827895738ac4d5434d48930
+AUX 2.0.3/75_mod_perl.conf.2.2 1221 SHA256 e7c2f4b84e9c9fc73e421740736f67674ebc7e7f13f8b2f71c9360f746fd441a SHA512 caaf66604e385f24ddebf282c42b880362fa19f9195fca105171b3d3edfa5b995d7bda9899be60f78341e20e2fad75fbb097740ea43781a44a60a4a5b7f650b7 WHIRLPOOL 8601fb27162befa58c94009e4e726cbd6fec7f2014a23b68b93b88f18d0b44cbebeee3ebdb0970600aa9785b5cff6f86eb6edb33d59f874622dfb828b22b5d0b
 AUX 2.0.3/apache2-mod_perl-startup.pl 478 SHA256 f77741fb3bb18928fb15f95c6908a17d8f06d7efbb6785e0732f201347e26544 SHA512 3af399b3aa0bf5421ddef581b1042cbd71fa3fc9d27aa87feafb4754cc8e7bf9659eb70082f0c73f0022b31e8870ff68021af692e41b391dec6c5e7608589e29 WHIRLPOOL 78518f0d5952246700424af8d85dae73a17061e009b7d89aa55c7c93fed877addc8550524ebf6fb5f353ee50210a3773dadac9e1c8f84f2b2bc32c4ab2df2981
 AUX mod_perl-2.0.1-sneak-tmpdir.patch 337 SHA256 1f319a15e3d12a349c46c0783c7ad840d81d01ed41adda55c47d4ac31595615d SHA512 8e41d94db8cdd181393be8b4922a9e9760576cb051f93d652cf3f324671a464bfc2741bf18661ac4509db257cb5975b408f33799aea76a2e46ad15af08a68792 WHIRLPOOL a24853b0ada357b2a53d5ffe34969f792305a674388d6dc385912167a7ce45d376035a0810f75a1740872bac452187e7172f11afe06f8553f25560476a5fa1da
+AUX mod_perl-2.0.4-inline.patch 678 SHA256 4438195d61e62d39cf2c6d8427238426cd98bd8778d25c0086c2093e8ab55f29 SHA512 5669230db6e70b31b087851fd792004c4a292975e507f248b8dc7ce195559ab9b0579db8bea84d823f7d53e351990ecda057d7fe63273d486b5f12204d7160a5 WHIRLPOOL 6c9b1a8262b7caaf803e6f1246eacb83fe9e677a973d02bd0d2e39aa2718e424f59ac15aeea073057dd68268e5fd066b653abd7ad418c326f34e027de5227566
 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
 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.8-r1.ebuild 5333 SHA256 afefe634754c1fa30b3294f56130dc6b30b048600c320c5a8a8ba0b2a603a792 SHA512 ecc382a7c58bb39f76fd2c2dd011a5caa9091606cedb523ee04287157520847e91a3e810ee85ab171e200a5f0fd038a98b8d465aa0f4690402b953314dd36e46 WHIRLPOOL 516f86b7aba7c220c3ff94b294982f7b8b49e123680c1dd9909d6f2adad62ec88ebbef825bc9808195c7515db526d149ec2d1df108a1b8c4b0757a6fedc2b46d
-EBUILD mod_perl-2.0.8.ebuild 5205 SHA256 0cb14b61f33a594b5aef3b956aca53d2fb9da4aa09b52d66f8bc06ea6b87dc36 SHA512 75f44d4f7b144b14c393e8fde48b5cd6e212b1af4c7bd0f83b8160cd0403687f7aaf03abfefea825ca6e585b944a96b268470536367b6d59539af4ddae702d0c WHIRLPOOL fc390e0bc43d80fa0acc7c95ba8ace48fd10ccab74330dce8e97700adf2dda544e94ce149b62d4ea25156c8fb7a5d3e6c64acd37ce3598595766fd64ad2cc6ea
-MISC ChangeLog 26152 SHA256 25253176422d44cb3a4ebe4c5db0adb548ca87260e449f87ac9a918ca38844c0 SHA512 eae4b4dd906d990d295a38b2448b943467783087825d3c19ee39f572f7800bd5b7c549fc3bb28c0040403743f40717d4da0c3fd4dbafd9df772f1ab99d95a2ea WHIRLPOOL d8311f3e11e2d5affbd3740d6cad34077e66f67fdaa415ba4ba898d66f77fbc96a8ff11462b281e2ed30adfacb70c0bc9715f3dc184bbd4a5bb84145d0269413
+EBUILD mod_perl-2.0.8-r2.ebuild 5334 SHA256 7ad945aa04a63309878e8a5a2840368ef8a6cddd0ab3a06cf423341841bdc00e SHA512 de970ad5acbcc1ce75c97c99a3d02fc9e53df38ed4df489898a3bf59042ddc11bf3a3393b092e2cde34d07bcb6f4480f7a86c440664b43b798c93098bce95aec WHIRLPOOL 15ee0800b1233ce41e325bbc08c981f48e459ebebdd1a4cfee20a92b0d46b9716c8798ec4190903dd16363ac15534eb6053d97ae22bfc9dd49cae648e708b189
+EBUILD mod_perl-2.0.8.ebuild 5206 SHA256 ea91c12bbb8a26f059aec0cf2f8d50b112e6c7e8791c5833dc7311ccd6ca145d SHA512 b73cb5c3683c305e8d3d99abb177e804b8ccc550d6a7428db9fcac031b99344b84ca72d6644bb39432f57d0597b08ee464b2802dd99437fd793b783f440b4e4e WHIRLPOOL bbab90b56430d119c3e539afa81e3b5eacdcc9e430cd4db8c91ce91754367143b77803f4b826b3bc4afa552cb270737149517987e22905f34234aa1d4699b803
+MISC ChangeLog 26552 SHA256 5559fd8cfc567a338468bfe69f3647b8508a94ee18e19bc3791e241ee14f491a SHA512 fee930db2f7b6c39f530fc8a6594794893eed61c1fbd14971062b05b51c8b943a967120806232a4b86a15d608f12f939608ca9a3453dbd18fcc07392fab549ce WHIRLPOOL 3d73c73fda10c70eadf5bc07a37c71d57470b9478bd3f280f3547163cdb1d8f13ac6bcfc8f59967bc0bc6c64dafc212cc885503ffd48caa9bb729aab576cf4b6
 MISC metadata.xml 254 SHA256 1f8ca2c8daaa36830720f986bda3a86f23e57f6fbba12cd92a2283bb84733889 SHA512 6e56dcfb66b408c6101c70b1efeebcc8effd67106cbb9ab4cf66165addaf5ce868a9b29072ce97cb0d6adab356ce060fa99d8569e982a56f6c80195e073af96f WHIRLPOOL b69bf46e1399f220cfbb51d43c64e6f84951e4aa8c43c4aef627f4fbee4b9da2370e4eed17151e46bfb2b55cbc64ffdc56f8cec2fb85925f4ea803334736ffd8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVSNtgACgkQCaWpQKGI+9QEUwCeLYUBLO8C0L6luy24rry4E1tK
-2CwAnRKP482ZYAtvUasATcMZcwpTkZ+o
-=ta58
+iQIcBAEBCAAGBQJVYTsuAAoJEPGu1DbS6WIA9XIP/23U+voxYUMdoGup+OHHhKz+
+pb/p0T6n6a7qC/hzZqgUvAbGI4NhDqOLAh3uH5qixSJ68vt2CvQWZbbbax+//tgr
+6T9T0xgvcqpWi9K/ZdTLtraLrJTkrX4PHMo0xH0J3MP8mlyARZRbQKSEfN37NDgT
+sARUNkzbL7SjMrzEeGnw6y58CGFOkwCD0EFot5y6fbmpdn9eO3M/sGI7YJNIgaMQ
+P1fcvFxm+YS9NxI7IijXrJufbRYix8kB4AIgOPlaTq17ufJ+T+yl6aoCJ9Pyf/C/
+cVuXLVqZICSkIUSCLGVg25VJdPZ7VuXIEC1+Fbskbqkp+kifJvExKuS10suShEz3
+/9aibdDJ2vdxZMMBA3f+zqFtJ/F3Hgs+cnJiX6CoTCKWtvS1hEpSxoXl6Q3epHhX
+Lr/1wn9tfIr5zeXzPrsjYgmSEZeniY31a7sqxdwkQYlZybJzay5Mkl4kpNSV7Dwg
+uLGE2xFQPMTV/Txc/llLYfPIWijkmZwVsOrvhfFlvZGWBfrRfZ+m55lYRX4fYc29
+N2MOV3e0o8Apufdfgyzjd5WL5hCSDJQ+oHB/H2HnaRNoOX+fUjAuDNA7BOa1V0ep
+IaHQvDZWq5P6S3eqF5MJfLXcNIFV74Z3y59GlGsRJzBIue/HFlmG5ocIQw9Zhejr
+NhWD3O1RsWLb42o1N4ld
+=KVRL
 -----END PGP SIGNATURE-----
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 000000000000..5c51a803b816
--- /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/mod_perl-2.0.8-r2.ebuild b/www-apache/mod_perl/mod_perl-2.0.8-r2.ebuild
new file mode 100644
index 000000000000..dbd5ba41c091
--- /dev/null
+++ b/www-apache/mod_perl/mod_perl-2.0.8-r2.ebuild
@@ -0,0 +1,162 @@
+# 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.8-r2.ebuild,v 1.1 2015/05/24 02:45:01 vapier Exp $
+
+EAPI="5"
+
+inherit depend.apache apache-module perl-module eutils
+
+DESCRIPTION="An embedded Perl interpreter for Apache2"
+HOMEPAGE="https://projects.apache.org/projects/mod_perl.html"
+SRC_URI="mirror://apache/perl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+# 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="
+	>=dev-perl/Apache-Test-1.360
+	>=virtual/perl-CGI-3.08
+	dev-lang/perl[ithreads]
+	www-servers/apache
+"
+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_4
+
+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}"/${PN}-2.0.1-sneak-tmpdir.patch
+	epatch "${FILESDIR}"/${PN}-2.0.4-inline.patch #550244
+
+	# 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
+
+	# 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() {
+	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/apr-1-config \
+		MP_TRACE=${debug} \
+		MP_DEBUG=${debug} \
+		|| 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}" "${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
+
+	default
+#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
+	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
+
+	# 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...
+	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
+
+	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() {
+	apache-module_pkg_postinst
+}