gentoo resync : 24.12.2018

4 files changed, 63 insertions, 3 deletions

diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index ee16ab65463a..6eb5931fcd8d 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -2,9 +2,11 @@ AUX 2.0.3/75_mod_perl.2.2.conf 1221 BLAKE2B 6887e97fe210b9656e4a0b50ff3f536df1cc
 AUX 2.0.3/75_mod_perl.conf 1295 BLAKE2B be75ef503b400660aa24f72d7c8aa0592a7e1cfe277b508ebd158c9c3d6d4adea676fd4b0934929f05ea4613f3a871ca28bd6435203a913501bc4fdfd99686b7 SHA512 f6842055bf41b457e77f25de4fccb4981456669e269a01faf606f5de31050fe41c2741c2591bc89a46914c876bfebb914e7d3a07108db8220ec0b8218781c22e
 AUX 2.0.3/apache2-mod_perl-startup.pl 478 BLAKE2B ec1bf3eb1119561396756706e501b904a2910f6ffec2db62aa08c10af0a79bc8dacc1455524818a46c54906096efd26f89f6114d932aeac30c036f9dd7ab6823 SHA512 3af399b3aa0bf5421ddef581b1042cbd71fa3fc9d27aa87feafb4754cc8e7bf9659eb70082f0c73f0022b31e8870ff68021af692e41b391dec6c5e7608589e29
 AUX mod_perl-2.0.1-sneak-tmpdir.patch 337 BLAKE2B 029f4be8c295b83031454dc53511293d7e034947ae9f591008235a8a16dc322df9c144c106d0392709aeaeb2080ba2534e4f34aa571c7e78bd726823b8f7d6da SHA512 8e41d94db8cdd181393be8b4922a9e9760576cb051f93d652cf3f324671a464bfc2741bf18661ac4509db257cb5975b408f33799aea76a2e46ad15af08a68792
+AUX mod_perl-2.0.10-apache24-tests-1.patch 993 BLAKE2B c1cb9d2f469bce1b99a19f09a86d657a1a7a8bdf99a06cea336e47be35195e04ebe81b75c43354d22caa50333ccc761a86e92ef81a09efebebad0fd133c7f33a SHA512 0b024d3622454391a38bed82d1ff868bf0a92ecb2328786c10c0c133bd1e7425a330f60a9600a8ec31a2b94268a34ee9f49dff8a76699e45b16da8a1051cbebf
+AUX mod_perl-2.0.10-apache24-tests-2.patch 1129 BLAKE2B 39eb2b92ac89d11dcbe287af515a24ff068ea74930c2f2b08dd06ce83697e49e2a334dc0bb427c867beb835c7e1cd8d590bde24b02fe1d84f0bfa3a3ef932f8e SHA512 42da7893f2d0d98207d299977d3943773d7b38b75566a0da1dd0ff0b2552409310eef0ba7211cf28a90ccdd5927c5ffd417bfe12d4a6bd441947731cafbd3875
 AUX mod_perl-2.0.10_rc1-Gentoo-not-Unix.patch 1517 BLAKE2B 4546fd0ae82a99c335140c223b830321dd340393700e74d18130063b952d8249e0b1610b86ba93782d5798dcb66689cc2d30247a5f3e3866c34387dba4b0f6dc SHA512 4ac22d4e8942d2fb4d07f10897c7670acd77d28a7b47049e95dffe026d335c26681a0fa4a43c67b53fafa8c5bdba7991bad150e3bc00a8e3c40a7d7e59938c63
 AUX mod_perl-2.0.10_rc1-bundled-Apache-Test.patch 2777 BLAKE2B b59cb23545dfa26af1181b5c4fa7f2d2ca5e049d6ec4056f6cac68389cc9fe6cb7ab010b8aa6c210aeaab1e98afb65ab3051a341856823debbb2fded47c63320 SHA512 ebb583607d4a8587d340384bb5c8deb50a3001beaaf9a536f4731baa3664a6d2667de309d1549175bf721643ad3f107988de4d2c9e213429888044dd726447ee
 AUX mod_perl-2.0.4-inline.patch 678 BLAKE2B 67da89c49904537df88e09fb4a171c03096993439d56d6fdd9e12b83d4cbca2cc1a734357ae6ee93ca20fd9906e1a0e74743d6d826f80763fda9387b42151597 SHA512 5669230db6e70b31b087851fd792004c4a292975e507f248b8dc7ce195559ab9b0579db8bea84d823f7d53e351990ecda057d7fe63273d486b5f12204d7160a5
 DIST mod_perl-2.0.10.tar.gz 3846211 BLAKE2B de44c76d22cc90984be20193bb635f27d68fbc25cab39333be93ee15c4636025d9e6d8f7bfc661b50ac19cfeb5f697f957acb7fbbb38e1f3f712c81ac27737ab SHA512 0bf1a885cb32a3393e95f87e71983097613e263b9052dbf22494663b506e36a25d0256afed24285232276d9f43ebd3adaa18b91129bfb62116a8ccb023855bca
-EBUILD mod_perl-2.0.10.ebuild 3723 BLAKE2B 5cfe5344a2e5d9559a3da10ad2d1b434087feb72291968da4a42a3fac2a63d4e084da9557f517331ac48523ddc1426298891daf5d447d506a5cc2708c1b7c90c SHA512 61e4ad8cfdd7f61aec044c8a3315f4c7e37d0c6bb55fe50975a65b8a45609f7adf84c24374dc2e8a308ceecda6453b06159bc331fff4d727681d5e92463621b1
+EBUILD mod_perl-2.0.10.ebuild 3838 BLAKE2B ccef90b4f55e919987ae22b75c53486e0e2bb51db4df705546fd63de8651092414cbae80464938e7d6728d4cb83b0ae57bd0ac3c57fe339e43650162eac25296 SHA512 98c093d9e8f56a5db2d1bc615ddaad1f82e4adf1249403fb84267d7e740791b1d185a299fcff9d0655a233c225d559c9a11452fd269025886a2f9f21a624a7a2
 MISC metadata.xml 376 BLAKE2B 39fd46f3791673d4878a8214042d5eed8d2c55acd0d319e0d9b7a684e07ef2a629be902691c612aeca89bf60e752f3ac70bcb9033a19c7daf121810f7c095137 SHA512 1ef3ea88131d2ed82c59f91f80b96003bd664178a51a64364f871427992cb8570b4ef8d1e880305a841da52dc87bac06c92e8c0cf3982e93ff639a4f8fb3d7bc
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.10-apache24-tests-1.patch b/www-apache/mod_perl/files/mod_perl-2.0.10-apache24-tests-1.patch
new file mode 100644
index 000000000000..822fb4e87550
--- /dev/null
+++ b/www-apache/mod_perl/files/mod_perl-2.0.10-apache24-tests-1.patch
@@ -0,0 +1,33 @@
+From f4dd0394f0975892b51a889f023d0e207553a656 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Fri, 23 Dec 2016 18:27:23 +0200
+Subject: [PATCH 1/2] Fix t/apache/read.t HTTP syntax for Apache 2.4.25
+ compatibility
+
+HTTP/1.1 RFC 7230, section 2.6. "Protocol Versioning" says the HTTP name
+is case sensitive. Starting with Apache 2.4.25, using lower case will
+make the server issue a 400 Bad request response, causing a test failure.
+
+https://tools.ietf.org/html/rfc7230#section-2.6
+
+Bug-Debian: https://bugs.debian.org/849082
+---
+ t/apache/read.t | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/apache/read.t b/t/apache/read.t
+index 83670c9..9f7f504 100644
+--- a/t/apache/read.t
++++ b/t/apache/read.t
+@@ -24,7 +24,7 @@ close $fh;
+ 
+ my $size = length $data;
+ 
+-for my $string ("POST $location http/1.0",
++for my $string ("POST $location HTTP/1.0",
+                 "Content-length: $size",
+                 "") {
+     my $line = "$string\r\n";
+-- 
+2.11.0
+
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.10-apache24-tests-2.patch b/www-apache/mod_perl/files/mod_perl-2.0.10-apache24-tests-2.patch
new file mode 100644
index 000000000000..29e24cc770d6
--- /dev/null
+++ b/www-apache/mod_perl/files/mod_perl-2.0.10-apache24-tests-2.patch
@@ -0,0 +1,23 @@
+Author: Stefan Fritsch <sf@sfritsch.de>
+Source: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=849082
+
+--- ./t/filter/TestFilter/in_bbs_inject_header.pm.orig	2016-10-27 22:11:16.000000000 +0200
++++ ./t/filter/TestFilter/in_bbs_inject_header.pm	2016-12-24 06:55:19.049606491 +0100
+@@ -181,7 +181,7 @@
+ 
+         if ($data and $data =~ /^POST/) {
+             # demonstrate how to add a header while processing other headers
+-            my $header = "$header1_key: $header1_val\n";
++            my $header = "$header1_key: $header1_val\r\n";
+             push @{ $ctx->{buckets} }, APR::Bucket->new($c->bucket_alloc, $header);
+             debug "queued header [$header]";
+         }
+@@ -199,7 +199,7 @@
+             # we hit the headers and body separator, which is a good
+             # time to add extra headers:
+             for my $key (keys %headers) {
+-                my $header = "$key: $headers{$key}\n";
++                my $header = "$key: $headers{$key}\r\n";
+                 push @{ $ctx->{buckets} }, APR::Bucket->new($c->bucket_alloc, $header);
+                 debug "queued header [$header]";
+             }
diff --git a/www-apache/mod_perl/mod_perl-2.0.10.ebuild b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
index f83252b19f5f..ef5bb45f7cab 100644
--- a/www-apache/mod_perl/mod_perl-2.0.10.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,7 +22,7 @@ SRC_TEST=do
 # The test dependencies are from CPAN (Bundle::Apache2).
 
 # When all MPMs are disabled via useflags, the apache ebuild selects a
-# default one, which will likely need threading...
+# default one, which will likely need threading.
 
 RDEPEND="
 	dev-lang/perl[ithreads=]
@@ -60,6 +60,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}"-2.0.4-inline.patch        # 550244
 	"${FILESDIR}/${PN}"-2.0.10_rc1-bundled-Apache-Test.patch # 352724
 	"${FILESDIR}/${PN}"-2.0.10_rc1-Gentoo-not-Unix.patch
+	"${FILESDIR}/${PN}"-2.0.10-apache24-tests-1.patch # 614684
+	"${FILESDIR}/${PN}"-2.0.10-apache24-tests-2.patch # 614684
 )
 
 src_prepare() {