<pre style='margin:0'>
ra1nb0w (ra1nb0w) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f4e33b098f4255f1fed14fb8dcc2b467cd30302b">https://github.com/macports/macports-ports/commit/f4e33b098f4255f1fed14fb8dcc2b467cd30302b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f4e33b098f4 p5-www-curl: Fix build failures with recent curl
</span>f4e33b098f4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f4e33b098f4255f1fed14fb8dcc2b467cd30302b
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Nov 23 11:14:44 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> p5-www-curl: Fix build failures with recent curl
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add patch to fix build failure with recent curl.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add patch to fix spurious error messages when using recent Xcode cpp.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/61622
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Increase revision to rebuild to pick up new curl symbols. Add comment to
</span><span style='display:block; white-space:pre;color:#404040;'> curl port reminding us to do this in the future when curl is updated.
</span>---
net/curl/Portfile | 2 ++
perl/p5-www-curl/Portfile | 8 ++++--
perl/p5-www-curl/files/cpp-rt131089.patch | 28 +++++++++++++++++++
perl/p5-www-curl/files/curl-7.69.0-rt132197.patch | 32 ++++++++++++++++++++++
.../files/patch-default-inc-excludes-dot.diff | 2 ++
5 files changed, 70 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/curl/Portfile b/net/curl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8b38f188d9b..8ae65570843 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/curl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/curl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,6 +3,8 @@
</span> PortSystem 1.0
PortGroup clang_dependency 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Increase the revision of p5-www-curl whenever the version of curl gets updated.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> name curl
version 7.80.0
categories net www
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-www-curl/Portfile b/perl/p5-www-curl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bddf2de733a..0e12db21dbe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-www-curl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-www-curl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup perl5 1.0
</span>
perl5.branches 5.28 5.30 5.32
perl5.setup WWW-Curl 4.17
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> license MIT
maintainers {alum.wpi.edu:arno+macports @fracai} openmaintainer
description Perl extension interface for libcurl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,11 @@ if {${perl5.major} != ""} {
</span> # https://github.com/szbalint/WWW--Curl/issues/16
# additional patch for compatiblity with curl 7.66.0+
# https://rt.cpan.org/Ticket/Display.html?id=130591
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# additional patch for compatiblity with curl 7.69.0+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://rt.cpan.org/Public/Bug/Display.html?id=132197
</span> patchfiles curl-7.50.2-invalid-symbols.patch \
curl-7.66.0-rt130591.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-default-inc-excludes-dot.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ curl-7.69.0-rt132197.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-default-inc-excludes-dot.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cpp-rt131089.patch
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-www-curl/files/cpp-rt131089.patch b/perl/p5-www-curl/files/cpp-rt131089.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8f40780dcb6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-www-curl/files/cpp-rt131089.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use $CC -E instead of cpp which can't parse system headers.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://rt.cpan.org/Public/Bug/Display.html?id=131089
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+TODO: If CC is specified on the command line (which it is in MacPorts)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use that instead of $Config{cc}.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.PL.orig 2021-11-23 11:09:49.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.PL 2021-11-23 11:09:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,6 +3,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use lib '.';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use inc::Module::Install;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++use Config;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name 'WWW-Curl';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ abstract 'Perl extension interface for libcurl';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -101,9 +102,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "Found curl.h in $curl_h\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my @syms;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $has_cpp = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- open(H_IN, "-|", "cpp", $curl_h) and $has_cpp++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ my $cc = $Config{cc};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ open(H_IN, "-|", $cc, "-E", $curl_h) and $has_cpp++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unless ($has_cpp) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- warn "No working cpp ($!). Parsing curl.h in Perl";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ warn "No working $cc -E ($!). Parsing curl.h in Perl";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ open(H_IN, "<", $curl_h) or die("Can't open curl.h at path $curl_h, because: ".$!);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while ( <H_IN> ) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-www-curl/files/curl-7.69.0-rt132197.patch b/perl/p5-www-curl/files/curl-7.69.0-rt132197.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b52a4ca3213
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-www-curl/files/curl-7.69.0-rt132197.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From ee910449bf764d9f582e612c9b8b61b1d18e3a7c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 9 Apr 2020 14:31:05 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Adapt to changes in cURL 7.69.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+WIN32 macro was removed (1adebe7886ddf20b0733bf9ccbae4ed4866dcfb6) and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+then added under a CURL_WIN32 name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(8bd863f97b6c79f561bc063e634cecdf4badf776). This a C preprocessor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+macro for driving the C compiler, not a cURL option. Thus this fix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ignores it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+CURLOPT(na,t,nu) macro was added
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(920deff8618a19ae80bd319851722f1b05751f69) as replacement for CINIT()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+macro. It's not a cURL option. This fix also ignores it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+CPAN RT#132197
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Petr Písař <ppisar@redhat.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.PL.orig 2021-11-23 09:56:23.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.PL 2021-11-23 10:13:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -127,7 +127,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close H;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for my $e (sort @syms) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z|^CURLINC_)/) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|^CURL_WIN32\z|^CURLOPT\z|_LAST\z|_LASTENTRY\z|^CURLINC_)/) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ next;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my ($group) = $e =~ m/^([^_]+_)/;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-www-curl/files/patch-default-inc-excludes-dot.diff b/perl/p5-www-curl/files/patch-default-inc-excludes-dot.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3a4945745bc..86ff67720e7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-www-curl/files/patch-default-inc-excludes-dot.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-www-curl/files/patch-default-inc-excludes-dot.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build with perl 5.25.11 and later.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://rt.cpan.org/Public/Bug/Display.html?id=122110
</span> --- Makefile.PL.orig 2017-07-03 05:27:58.000000000 -0700
+++ Makefile.PL 2017-07-03 05:28:33.000000000 -0700
@@ -1,6 +1,7 @@
</pre><pre style='margin:0'>
</pre>