gentoo resync : 10.11.2019

4 files changed, 72 insertions, 2 deletions

diff --git a/dev-perl/WWW-Curl/Manifest b/dev-perl/WWW-Curl/Manifest
index 87cf80b71a6d..d6595052e949 100644
--- a/dev-perl/WWW-Curl/Manifest
+++ b/dev-perl/WWW-Curl/Manifest
@@ -1,7 +1,9 @@
 AUX WWW-Curl-4.150.0-curl-7.50.2.patch 1233 BLAKE2B 9f5b17b559191481b688f525a6d51f7d8dbea778f7fd5e9a1dfca4db48b4d56ef2e0a1c04d66f6d41cf21d5255efbe7870bcb12196b47274d75ca95f0b982c64 SHA512 9a65b26ec3d3121c526b3d06ac33ce4b6dd6bd30e19799b8e0601b972712739f03b40584466fa0e32d91d226077152f5f469efd6f810052768fa52e1a5c7e719
+AUX WWW-Curl-4.17-RT117793.patch 777 BLAKE2B 5e45e64d65065741eb5217f67774add974f8a74b6e9f95d0c910df9771a2c74a6badf87dfc0a08a18d53b1af55af3396f3bb5a0b75faf11379f317f3a543ae68 SHA512 d92cb37435d66867578818776f3ef64f4f6295515639d9bf860907ad28ca4109435c45174b49bdeb594a0cddafcc3f833c41d15d641eadfbbec598b77a1e90df
+AUX WWW-Curl-4.17-RT130591.patch 1155 BLAKE2B b585b32b80ed983f3602b1fedb0fbb9deaa58d65bbb4ab70eba52c7fe53c1f4d86f87811943fa80e10b5b11d3a03634138029103c0cf755c5c77ae509041cfc9 SHA512 75db6b4b241a97c75f6456d25951ea8a1d369b20d8562090f0585a797db4213a17c3e6119ec3cb63320d0631cd60441e1ddbbbb4609ca641389836daf3462da1
 AUX WWW-Curl-4.17-dotinc.patch 695 BLAKE2B fe6aeb27706b1f6dec9db500ce527a980a1d4048a2798bb2e7e8f690ad42b19b92f31e64f60c03d12450f3652d74462f40e03bb447b47eb5dc018f6c8d7700c3 SHA512 c81ea9d16269f60a260401731552b875e94b83840fd8914371cff74022114110e8c99deb2e94aadce61942e33988165a025e5f2524d219e989f8c26e2db7d199
 AUX WWW-Curl-4.17-networktests.patch 3938 BLAKE2B 7f2af37af8c1cf619c9c444cc64969f60083e798fc7f25c107a2fd2ace565004b104d5499c7a958b8e995d51de3d193b0aec67554810441af221ecd0ca0bf1ee SHA512 126e5592e299dea7feeeddd6d68e9d880106c5f55fabab00f2629a45080f0473d0b0cca8edc62d25fb84facfd7b800ab104b83abd4399d3e5dae82b80f11aa4a
 DIST WWW-Curl-4.17.tar.gz 50917 BLAKE2B 6f07570fb0db535b506b8e4a879a05f1901d4c1a2c0fb8c775ae330fb3ea44c523d921494d30f9e02b8eb84e4a006eb53e8594bbce6615ad162090b0d422edfb SHA512 bc7a75d0e23f5a77578fd7244b56a1e1b81d814993b90ac7132926f0d571232c4c95875bc615cb6239e424ae1d5481d27796efc5376bb0845d1da0ff1137c0d6
-EBUILD WWW-Curl-4.170.0-r1.ebuild 559 BLAKE2B e58fc7b148484d1d652785a74dbd4724e5086b0c8fbd3e2b359f67dde4de9100892b3257e9c7bffe1b074dae3bc678e0c4918ad3512b619afc9c1e4d164b1cbf SHA512 50942a406730bc4e99ec6d64e233653fcb7e230630a73499e2d86ba9092be8977f8b477b26d72cbca12a318d7d61b8386b1c44f9a744a3a79af22578db64d3ea
+EBUILD WWW-Curl-4.170.0-r1.ebuild 638 BLAKE2B ff95299871aa375d843fb94e52dd9e890a9e8976f5e47bbe493af71d89c1f9cde46306cc9b6b0321bcd36bbd0ac0d936d27c5b3f6badb3c76cc197295cd953a9 SHA512 f34a84d1dfeaebd48acdd20b2d1143d63fd107abb970edc585fab30902cd2185c97c5f0fb1ba46349180096acd5f36c0333a3256f821cf74e337d41558971a6d
 EBUILD WWW-Curl-4.170.0.ebuild 630 BLAKE2B 3790e3d7520b2c52d68f6c285f4631d434f16f696e94f9e0982cc88a3e65aec251cdf9960c066bb817c3d8990dd80b9cb3e9c322bd4036690da3bb2a22812950 SHA512 a3470fafed67d177874d0348058f3bee2a0d34184cdfb619018092f72bf0f7368cafd323558ebfd1faf39643b8d22d1a4a61284362c57431243865dd80d2b3f8
 MISC metadata.xml 638 BLAKE2B 7bb65ae85c64c8602486d0a1d279abe7ce30e89c9ef9705b5fffe7e890fc72f16a95aefeae5f91a8fdb634e842e311980bc001ef1a53998b057c024710745a06 SHA512 3836ea633a8e613b67fad2aee01058fb3c67f7a625f98d8da5d0c72a23b643abebc0378d1933320b64cc7a171b80818a611e8362ad8be56548785c1e6300086b
diff --git a/dev-perl/WWW-Curl/WWW-Curl-4.170.0-r1.ebuild b/dev-perl/WWW-Curl/WWW-Curl-4.170.0-r1.ebuild
index f2ce9d9aeaf2..d9eb8c504aba 100644
--- a/dev-perl/WWW-Curl/WWW-Curl-4.170.0-r1.ebuild
+++ b/dev-perl/WWW-Curl/WWW-Curl-4.170.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,5 +21,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.150.0-curl-7.50.2.patch
 	"${FILESDIR}"/${PN}-4.17-dotinc.patch
 	"${FILESDIR}"/${PN}-4.17-networktests.patch
+	"${FILESDIR}"/${PN}-4.17-RT117793.patch
+	"${FILESDIR}"/${PN}-4.17-RT130591.patch
 )
 PERL_RM_FILES=("t/meta.t" "t/pod-coverage.t" "t/pod.t")
diff --git a/dev-perl/WWW-Curl/files/WWW-Curl-4.17-RT117793.patch b/dev-perl/WWW-Curl/files/WWW-Curl-4.17-RT117793.patch
new file mode 100644
index 000000000000..e89d237ea235
--- /dev/null
+++ b/dev-perl/WWW-Curl/files/WWW-Curl-4.17-RT117793.patch
@@ -0,0 +1,25 @@
+From 292c05a8aa9c18bd27d0aaff0b4ee601d9b87b92 Mon Sep 17 00:00:00 2001
+From: Slaven Rezic <cpansand@cvrsnica-freebsd-101.herceg.de>
+Date: Sun, 16 Apr 2017 22:17:00 +0200
+Subject: [PATCH] compilation fixes for curl 7.50.2 and newer (RT #117793)
+
+---
+ Makefile.PL | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index f9170bb..bb852e4 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -127,7 +127,7 @@ if (!defined($curl_h)) {
+     close H;
+ 
+     for my $e (sort @syms) {
+-       if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z)/) {
++       if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z)/) {
+           next;
+        }
+        my ($group) = $e =~ m/^([^_]+_)/;
+-- 
+2.1.2
+
diff --git a/dev-perl/WWW-Curl/files/WWW-Curl-4.17-RT130591.patch b/dev-perl/WWW-Curl/files/WWW-Curl-4.17-RT130591.patch
new file mode 100644
index 000000000000..753b3edb4cf6
--- /dev/null
+++ b/dev-perl/WWW-Curl/files/WWW-Curl-4.17-RT130591.patch
@@ -0,0 +1,41 @@
+From 0ef6ea22479b4696a0d62cd44aac8f4fe866db2f Mon Sep 17 00:00:00 2001
+From: Slaven Rezic <cpansand@cloud1.bbbike.org>
+Date: Sun, 29 Sep 2019 16:19:57 +0000
+Subject: [PATCH] compat for libcurl 7.66.0 (fix for RT #130591)
+
+---
+ Curl.xs     | 4 ++++
+ Makefile.PL | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/Curl.xs b/Curl.xs
+index ea9f870..e81c415 100644
+--- a/Curl.xs
++++ b/Curl.xs
+@@ -18,6 +18,10 @@
+ #include <curl/easy.h>
+ #include <curl/multi.h>
+ 
++#ifdef CURLINC_MULTI_H
++#define __CURL_MULTI_H
++#endif
++
+ #define header_callback_func writeheader_callback_func
+ 
+ /* Do a favor for older perl versions */
+diff --git a/Makefile.PL b/Makefile.PL
+index bb852e4..713656a 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -127,7 +127,7 @@ if (!defined($curl_h)) {
+     close H;
+ 
+     for my $e (sort @syms) {
+-       if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z)/) {
++       if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z|^CURLINC_)/) {
+           next;
+        }
+        my ($group) = $e =~ m/^([^_]+_)/;
+-- 
+2.1.4
+