- fix building with curl 7.66+

- rel 4

diff --git a/curl-7.66.0.patch b/curl-7.66.0.patch
new file mode 100644 (file)
index 0000000..83ee75b
--- /dev/null
+++ b/curl-7.66.0.patch
@@ -0,0 +1,39 @@
+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)
+Origin: CPAN RT #130591
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=130591
+Bug-Debian: https://bugs.debian.org/941915
+Reviewed-by: gregor herrmann <gregoa@debian.org>
+Last-Update: 2019-10-07
+
+---
+ Curl.xs     | 4 ++++
+ Makefile.PL | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+--- 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 */
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -132,7 +132,7 @@
+     close H;
+ 
+     for my $e (sort @syms) {
+-       if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\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/^([^_]+_)/;

diff --git a/perl-WWW-Curl.spec b/perl-WWW-Curl.spec
index bae565b8a5a3009d793be0a141200484faa7720c..7e7855d9f6bc11637173e22e6e87e84804d5670e 100644 (file)
--- a/perl-WWW-Curl.spec
+++ b/perl-WWW-Curl.spec
@@ -9,12 +9,13 @@ Summary:      WWW::Curl::easy - Perl extension interface for libcurl
 Summary(pl.UTF-8):     WWW::Curl::easy - interfejs perlowy do biblioteki libcurl
 Name:          perl-WWW-Curl
 Version:       4.17
-Release:       3
+Release:       4
 License:       MPL or MIT/X
 Group:         Development/Languages/Perl
 Source0:       http://www.cpan.org/modules/by-authors/id/S/SZ/SZBALINT/%{pdir}-%{pnam}-%{version}.tar.gz
 # Source0-md5: 997ac81cd6b03b30b36f7cd930474845
 Patch0:                WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch
+Patch1:                curl-7.66.0.patch
 URL:           http://curl.haxx.se/libcurl/perl/
 BuildRequires: curl-devel
 BuildRequires: perl-devel >= 1:5.8.0
@@ -41,6 +42,7 @@ nazewnictwa.
 %prep
 %setup -q -n %{pdir}-%{pnam}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__perl} Makefile.PL \