Update to be compatible with curl-7.71.0

4 files changed, 34 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6f7b2652856c..5411fecbe64b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = perl-www-curl
 	pkgdesc = Perl/CPAN Module WWW::Curl
 	pkgver = 4.17
-	pkgrel = 10
+	pkgrel = 11
 	url = https://search.cpan.org/dist/WWW-Curl/
 	arch = x86_64
 	license = GPL
@@ -9,9 +9,9 @@ pkgbase = perl-www-curl
 	depends = curl
 	options = !emptydirs
 	source = https://search.cpan.org/CPAN/authors/id/S/SZ/SZBALINT/WWW-Curl-4.17.tar.gz
-	source = curl-7.50.2.patch
-	md5sums = 997ac81cd6b03b30b36f7cd930474845
-	md5sums = 84916bb88dd596cf9ec1a0924cd97913
+	source = curl-7.71.0.patch
+	sha256sums = 52ffab110e32348d775f241c973eb56f96b08eedbc110d77d257cdb0a24ab7ba
+	sha256sums = da51d5f2a2993dd33f5a7baf358a61086440abb50e4dd3ca1f4939ea262d3cc2
 
 pkgname = perl-www-curl
 
diff --git a/PKGBUILD b/PKGBUILD
index fb122441d818..b1f55d9a97b9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Charles Mauch <cmauch@gmail.com>
+# Maintainer: Aaron Bishop <erroneous@gmail.com>
 
 pkgname=perl-www-curl
 pkgver=4.17
-pkgrel=10
+pkgrel=11
 pkgdesc="Perl/CPAN Module WWW::Curl"
 arch=('x86_64')
 url="https://search.cpan.org/dist/WWW-Curl/"
@@ -11,15 +12,14 @@ license=("GPL" "PerlArtistic")
 depends=("curl")
 options=('!emptydirs')
 source=("https://search.cpan.org/CPAN/authors/id/S/SZ/SZBALINT/WWW-Curl-${pkgver}.tar.gz"
-        'curl-7.50.2.patch')
-md5sums=('997ac81cd6b03b30b36f7cd930474845'
-         '84916bb88dd596cf9ec1a0924cd97913')
+        'curl-7.71.0.patch')
+sha256sums=('52ffab110e32348d775f241c973eb56f96b08eedbc110d77d257cdb0a24ab7ba'
+            'da51d5f2a2993dd33f5a7baf358a61086440abb50e4dd3ca1f4939ea262d3cc2')
 
 prepare() {
   cd WWW-Curl-${pkgver}
 
-  # https://rt.cpan.org/Public/Bug/Display.html?id=117793
-  patch -Np1 -i ../curl-7.50.2.patch
+  patch -Np1 -i ../curl-7.71.0.patch
 }
 
 build() {
diff --git a/curl-7.50.2.patch b/curl-7.50.2.patch
deleted file mode 100644
index e89d237ea235..000000000000
--- a/curl-7.50.2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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/curl-7.71.0.patch b/curl-7.71.0.patch
new file mode 100644
index 000000000000..7ab21ef659ee
--- /dev/null
+++ b/curl-7.71.0.patch
@@ -0,0 +1,24 @@
+--- a/Curl.xs	2014-02-21 11:08:30.000000000 -0500
++++ b/Curl.xs	2020-06-25 09:36:37.868826340 -0400
+@@ -18,6 +18,10 @@
+ #include <curl/easy.h>
+ #include <curl/multi.h>
+ 
++#if defined(CURLINC_MULTI_H) && !defined(__CURL_MULTI_H)
++#   define __CURL_MULTI_H
++#endif
++
+ #define header_callback_func writeheader_callback_func
+ 
+ /* Do a favor for older perl versions */
+--- a/Makefile.PL	2014-02-21 11:08:09.000000000 -0500
++++ b/Makefile.PL	2020-06-25 09:24:50.549812170 -0400
+@@ -127,7 +127,7 @@
+     close H;
+ 
+     for my $e (sort @syms) {
+-       if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z)/) {
++       if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_WIN32\z|^CURLOPT\z|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z)/) {
+           next;
+        }
+        my ($group) = $e =~ m/^([^_]+_)/;