Bug #132197 for WWW-Curl: WWW-Curl-4.17 fails to build against curl 7.69.0

Sun Mar 22 06:33:13 2020 http://eseyman.id.fedoraproject.org/ - Ticket created

Subject:

WWW-Curl-4.17 fails to build against curl 7.69.0

After upgrading curl to 7.69.0, WWW-Curl no longer buils. gcc -c -I/usr/include -D_REENTRANT -D_GNU_SOURCE -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -fasynchronous-unwind-tables -fstack-clash-protection -fwrapv -fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -fasynchronous-unwind-tables -fstack-clash-protection -DVERSION=\"4.17\" -DXS_VERSION=\"4.17\" -fPIC "-I/usr/lib64/perl5/CORE" Curl.c [...] curlopt-constants.c:185:46: error: 'CURL_WIN32' undeclared (first use in this function); did you mean 'CURLINFO'? 185 | if (strEQ(name, "WIN32")) return CURL_WIN32; | ^~~~~~~~~~ | CURLINFO Upgrading to 7.69.1 fails to solve the issue.

Thu Apr 09 09:18:58 2020 ppisar [...] redhat.com - Correspondence added

Dne Ne 22.bře.2020 06:33:13, http://eseyman.id.fedoraproject.org/ napsal(a): Show quoted text

> After upgrading curl to 7.69.0, WWW-Curl no longer buils. >

An attached patch fixes it.

Subject:

WWW-Curl-4.17-Adapt-to-changes-in-cURL-7.69.0.patch

From ee910449bf764d9f582e612c9b8b61b1d18e3a7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> Date: Thu, 9 Apr 2020 14:31:05 +0200 Subject: [PATCH] Adapt to changes in cURL 7.69.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit WIN32 macro was removed (1adebe7886ddf20b0733bf9ccbae4ed4866dcfb6) and then added under a CURL_WIN32 name (8bd863f97b6c79f561bc063e634cecdf4badf776). This a C preprocessor macro for driving the C compiler, not a cURL option. Thus this fix ignores it. CURLOPT(na,t,nu) macro was added (920deff8618a19ae80bd319851722f1b05751f69) as replacement for CINIT() macro. It's not a cURL option. This fix also ignores it. CPAN RT#132197 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 ad2bd3d..b9e6a46 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|_LAST\z|_LASTENTRY\z)/) { + if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_WIN32\z|^CURLOPT\z|_LAST\z|_LASTENTRY\z)/) { next; } my ($group) = $e =~ m/^([^_]+_)/; -- 2.21.1

Thu Apr 09 09:18:59 2020 The RT System itself - Status changed from 'new' to 'open'

Mon Apr 20 16:52:08 2020 glebius [...] FreeBSD.org - Correspondence added

On Thu Apr 09 09:18:58 2020, ppisar wrote: Show quoted text

> Dne Ne 22.bře.2020 06:33:13, http://eseyman.id.fedoraproject.org/ napsal(a):

> > After upgrading curl to 7.69.0, WWW-Curl no longer buils. > >

> An attached patch fixes it.

Thanks. This fixes the build, but creates Easy.pm missing all CURLOPT constants. I'll followup with a fix soon.

Mon Apr 20 18:46:16 2020 glebius [...] FreeBSD.org - Correspondence added

On Mon Apr 20 16:52:08 2020, glebius@FreeBSD.org wrote: Show quoted text

> On Thu Apr 09 09:18:58 2020, ppisar wrote:

> > Dne Ne 22.bře.2020 06:33:13, http://eseyman.id.fedoraproject.org/ > > napsal(a):

> > > After upgrading curl to 7.69.0, WWW-Curl no longer buils. > > >

> > An attached patch fixes it.

> > Thanks. This fixes the build, but creates Easy.pm missing all CURLOPT > constants. I'll followup with a fix soon.

Sorry, this actually is a correct fix since CURLOPT has \z at the end.