| 1 |
commit: 29c5c5c901eba0bd11a86c9f0c7174ae43b4c189 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 7 21:10:28 2019 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 7 21:11:04 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29c5c5c9 |
| 7 |
|
| 8 |
dev-perl/WWW-Curl: Add patches by Slaven Rezic, bug 694466 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/694466 |
| 11 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
| 12 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-perl/WWW-Curl/WWW-Curl-4.170.0-r1.ebuild | 4 ++- |
| 15 |
.../WWW-Curl/files/WWW-Curl-4.17-RT117793.patch | 25 +++++++++++++ |
| 16 |
.../WWW-Curl/files/WWW-Curl-4.17-RT130591.patch | 41 ++++++++++++++++++++++ |
| 17 |
3 files changed, 69 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
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 |
| 20 |
index f2ce9d9aeaf..d9eb8c504ab 100644 |
| 21 |
--- a/dev-perl/WWW-Curl/WWW-Curl-4.170.0-r1.ebuild |
| 22 |
+++ b/dev-perl/WWW-Curl/WWW-Curl-4.170.0-r1.ebuild |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-# Copyright 1999-2018 Gentoo Foundation |
| 25 |
+# Copyright 1999-2019 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
EAPI=6 |
| 29 |
@@ -21,5 +21,7 @@ PATCHES=( |
| 30 |
"${FILESDIR}"/${PN}-4.150.0-curl-7.50.2.patch |
| 31 |
"${FILESDIR}"/${PN}-4.17-dotinc.patch |
| 32 |
"${FILESDIR}"/${PN}-4.17-networktests.patch |
| 33 |
+ "${FILESDIR}"/${PN}-4.17-RT117793.patch |
| 34 |
+ "${FILESDIR}"/${PN}-4.17-RT130591.patch |
| 35 |
) |
| 36 |
PERL_RM_FILES=("t/meta.t" "t/pod-coverage.t" "t/pod.t") |
| 37 |
|
| 38 |
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 |
| 39 |
new file mode 100644 |
| 40 |
index 00000000000..e89d237ea23 |
| 41 |
--- /dev/null |
| 42 |
+++ b/dev-perl/WWW-Curl/files/WWW-Curl-4.17-RT117793.patch |
| 43 |
@@ -0,0 +1,25 @@ |
| 44 |
+From 292c05a8aa9c18bd27d0aaff0b4ee601d9b87b92 Mon Sep 17 00:00:00 2001 |
| 45 |
+From: Slaven Rezic <cpansand@×××××××××××××××××××××××××××.de> |
| 46 |
+Date: Sun, 16 Apr 2017 22:17:00 +0200 |
| 47 |
+Subject: [PATCH] compilation fixes for curl 7.50.2 and newer (RT #117793) |
| 48 |
+ |
| 49 |
+--- |
| 50 |
+ Makefile.PL | 2 +- |
| 51 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 52 |
+ |
| 53 |
+diff --git a/Makefile.PL b/Makefile.PL |
| 54 |
+index f9170bb..bb852e4 100644 |
| 55 |
+--- a/Makefile.PL |
| 56 |
++++ b/Makefile.PL |
| 57 |
+@@ -127,7 +127,7 @@ if (!defined($curl_h)) { |
| 58 |
+ close H; |
| 59 |
+ |
| 60 |
+ for my $e (sort @syms) { |
| 61 |
+- if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z)/) { |
| 62 |
++ if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z)/) { |
| 63 |
+ next; |
| 64 |
+ } |
| 65 |
+ my ($group) = $e =~ m/^([^_]+_)/; |
| 66 |
+-- |
| 67 |
+2.1.2 |
| 68 |
+ |
| 69 |
|
| 70 |
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 |
| 71 |
new file mode 100644 |
| 72 |
index 00000000000..753b3edb4cf |
| 73 |
--- /dev/null |
| 74 |
+++ b/dev-perl/WWW-Curl/files/WWW-Curl-4.17-RT130591.patch |
| 75 |
@@ -0,0 +1,41 @@ |
| 76 |
+From 0ef6ea22479b4696a0d62cd44aac8f4fe866db2f Mon Sep 17 00:00:00 2001 |
| 77 |
+From: Slaven Rezic <cpansand@×××××××××××××.org> |
| 78 |
+Date: Sun, 29 Sep 2019 16:19:57 +0000 |
| 79 |
+Subject: [PATCH] compat for libcurl 7.66.0 (fix for RT #130591) |
| 80 |
+ |
| 81 |
+--- |
| 82 |
+ Curl.xs | 4 ++++ |
| 83 |
+ Makefile.PL | 2 +- |
| 84 |
+ 2 files changed, 5 insertions(+), 1 deletion(-) |
| 85 |
+ |
| 86 |
+diff --git a/Curl.xs b/Curl.xs |
| 87 |
+index ea9f870..e81c415 100644 |
| 88 |
+--- a/Curl.xs |
| 89 |
++++ b/Curl.xs |
| 90 |
+@@ -18,6 +18,10 @@ |
| 91 |
+ #include <curl/easy.h> |
| 92 |
+ #include <curl/multi.h> |
| 93 |
+ |
| 94 |
++#ifdef CURLINC_MULTI_H |
| 95 |
++#define __CURL_MULTI_H |
| 96 |
++#endif |
| 97 |
++ |
| 98 |
+ #define header_callback_func writeheader_callback_func |
| 99 |
+ |
| 100 |
+ /* Do a favor for older perl versions */ |
| 101 |
+diff --git a/Makefile.PL b/Makefile.PL |
| 102 |
+index bb852e4..713656a 100644 |
| 103 |
+--- a/Makefile.PL |
| 104 |
++++ b/Makefile.PL |
| 105 |
+@@ -127,7 +127,7 @@ if (!defined($curl_h)) { |
| 106 |
+ close H; |
| 107 |
+ |
| 108 |
+ for my $e (sort @syms) { |
| 109 |
+- if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z)/) { |
| 110 |
++ if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z|^CURLINC_)/) { |
| 111 |
+ next; |
| 112 |
+ } |
| 113 |
+ my ($group) = $e =~ m/^([^_]+_)/; |
| 114 |
+-- |
| 115 |
+2.1.4 |
| 116 |
+ |
Archives