[rpms/perl-WWW-Curl] epel10: Adapt to changes in cURL 7.87.0

A new commit has been pushed.

Repo   : rpms/perl-WWW-Curl
Branch : epel10
Commit : 5788fc379a8f847a5579e494654c372c8909cc89
Author : Petr Písař <ppisar@redhat.com>
Date   : 2023-01-20T16:54:29+01:00
Stats  : +93/-1 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/perl-WWW-Curl/c/5788fc379a8f847a5579e494654c372c8909cc89?branch=epel10

Log:
Adapt to changes in cURL 7.87.0

---
diff --git a/WWW-Curl-4.17-Adapt-to-curl-7.87.0.patch b/WWW-Curl-4.17-Adapt-to-curl-7.87.0.patch
new file mode 100644
index 0000000..54eb52a
--- /dev/null
+++ b/WWW-Curl-4.17-Adapt-to-curl-7.87.0.patch
@@ -0,0 +1,40 @@
+From 4d8ca056c900cdb08556bbae2470ebb858369576 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Fri, 20 Jan 2023 14:26:50 +0100
+Subject: [PATCH] Adapt to curl-7.87.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+curl-7.87.0 added CURLOPTDEPRECATED and some other helping macros for
+hinting a compiler to produce deprecation warnings. Those are not
+constants for libcurl and clobbered generated curlopt-constants.c
+file:
+
+curlopt-constants.c:19:51: error: 'CURL_DEPRECATED' undeclared (first use in this function)
+   19 |             if (strEQ(name, "DEPRECATED")) return CURL_DEPRECATED;
+      |                                                   ^~~~~~~~~~~~~~~
+
+This patch adjusts curl.h parser in Makefile.PL to skip them.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ Makefile.PL | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index b9e6a46..311b03a 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_WIN32\z|^CURLOPT\z|_LAST\z|_LASTENTRY\z)/) {
++       if($e =~ /(OBSOLETE|^CURL_DEPRECATED\z|^CURL_EXTERN|^CURL_IGNORE_DEPRECATION\z|^CURL_STRICTER\z|^CURL_WIN32\z|^CURLOPT\z|^CURLOPTDEPRECATED\z|_LAST\z|_LASTENTRY\z)/) {
+           next;
+        }
+        my ($group) = $e =~ m/^([^_]+_)/;
+-- 
+2.39.1
+

diff --git a/WWW-Curl-4.17-Work-around-a-macro-bug-in-curl-7.87.0.patch b/WWW-Curl-4.17-Work-around-a-macro-bug-in-curl-7.87.0.patch
new file mode 100644
index 0000000..4a9d8ea
--- /dev/null
+++ b/WWW-Curl-4.17-Work-around-a-macro-bug-in-curl-7.87.0.patch
@@ -0,0 +1,43 @@
+From 426744bbcbe0842f6d8c0cee08b03179b191738e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Fri, 20 Jan 2023 16:35:11 +0100
+Subject: [PATCH] Work around a macro bug in curl-7.87.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Compiling against curl-7.87.0 failed with:
+
+    In file included from /usr/include/curl/curl.h:3195:
+    Curl.xs:688:25: error: void value not ignored as it ought to be
+      688 |                         curl_easy_setopt(clone->curl, 10000 +
+    i, clone->strings[i]);
+	  |                         ^
+
+This was a bug in curl-7.87.0. It will be fixed in next curl release. This
+patch provides a workaround on WWW-Curl side.
+
+<https://github.com/curl/curl/pull/10149>
+CPAN RT#145992
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ Curl.xs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Curl.xs b/Curl.xs
+index a4f3afb..87180a9 100644
+--- a/Curl.xs
++++ b/Curl.xs
+@@ -685,7 +685,7 @@ curl_easy_duphandle(self)
+ 	for (i=0;i<=self->strings_index;i++) {
+ 		if (self->strings[i] != NULL) {
+ 			clone->strings[i] = savepv(self->strings[i]);
+-			curl_easy_setopt(clone->curl, 10000 + i, clone->strings[i]);
++			curl_easy_setopt(clone->curl, (10000 + i), clone->strings[i]);
+ 		}
+ 	}
+ 	clone->strings_index = self->strings_index;
+-- 
+2.39.1
+

diff --git a/perl-WWW-Curl.spec b/perl-WWW-Curl.spec
index a1ca092..72b6c9d 100644
--- a/perl-WWW-Curl.spec
+++ b/perl-WWW-Curl.spec
@@ -1,6 +1,6 @@
 Name:           perl-WWW-Curl
 Version:        4.17
-Release:        32%{?dist}
+Release:        33%{?dist}
 Summary:        Perl extension interface for libcurl
 License:        MIT
 URL:            https://metacpan.org/release/WWW-Curl
@@ -10,6 +10,10 @@ Patch0:         WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch
 Patch1:         WWW-Curl-4.17-define-CURL-as-void.patch
 # Adapt to changes in cURL 7.69.0, bug #1812910, CPAN RT#132197
 Patch2:         WWW-Curl-4.17-Adapt-to-changes-in-cURL-7.69.0.patch
+# Adapt to changes in cURL 7.87.0, bug #2160057, CPAN RT#145992
+Patch3:         WWW-Curl-4.17-Adapt-to-curl-7.87.0.patch
+# Workound a bug in cURL 7.87.0, bug #2160057, CPAN RT#145992
+Patch4:         WWW-Curl-4.17-Work-around-a-macro-bug-in-curl-7.87.0.patch
 BuildRequires:  findutils
 BuildRequires:  make
 BuildRequires:  perl-interpreter
@@ -38,6 +42,8 @@ WWW::Curl is a Perl extension interface for libcurl.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 rm -rf inc && sed -i -e '/^inc\//d' MANIFEST
 
 %build
@@ -71,6 +77,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Fri Jan 20 2023 Petr Pisar <ppisar@redhat.com> - 4.17-33
+- Adapt to changes in cURL 7.87.0 (bug #2160057)
+
 * Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.17-32
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild