<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/63dfaf39a8766685422de49453c36131cda80cda">https://github.com/macports/macports-ports/commit/63dfaf39a8766685422de49453c36131cda80cda</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 63dfaf39a87 curl: Update to 8.2.1
</span>63dfaf39a87 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 63dfaf39a8766685422de49453c36131cda80cda
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Jul 27 01:07:05 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> curl: Update to 8.2.1
</span>---
net/curl/Portfile | 14 ++++----
net/curl/files/SCDynamicStoreCopyProxies.patch | 50 +++++++++++++++++++-------
net/curl/files/configure.patch | 8 +++--
perl/p5-www-curl/Portfile | 4 +--
4 files changed, 50 insertions(+), 26 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 1e88d6bbc00..76ee022c9ec 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;'>@@ -6,10 +6,10 @@ PortGroup clang_dependency 1.0
</span> # Increase the revision of p5-www-curl whenever the version of curl gets updated.
name curl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 8.2.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9ed42b1e75c9e4b5e03ed2f840972a86e2e99a84 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2859ec79e2cd96e976a99493547359b8001af1d1e21f3a3a3b846544ef54500f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2637208
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 8.2.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b8486b2903708f892bdff05a4f9a593c776a3ec6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2631932
</span>
categories net www
platforms darwin freebsd
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@ checksums-prepend ${curl_distfile}
</span> if {${name} eq ${subport}} {
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,8 +45,6 @@ if {${name} eq ${subport}} {
</span> port:zlib \
port:zstd
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Prevent curl-config from telling curl's dependents that they have to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # link with all of curl's dependencies as well.
</span> patchfiles configure.patch
patchfiles-append SCDynamicStoreCopyProxies.patch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -254,7 +252,7 @@ if {${name} eq ${subport}} {
</span>
subport curl-ca-bundle {
# Also increase the revision of privoxy-pki-bundle whenever curl-ca-bundle contents change.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> categories net
license {MPL-2 LGPL-2.1+}
supported_archs noarch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/curl/files/SCDynamicStoreCopyProxies.patch b/net/curl/files/SCDynamicStoreCopyProxies.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index fb5e107c398..f01af6320a1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/curl/files/SCDynamicStoreCopyProxies.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/curl/files/SCDynamicStoreCopyProxies.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,12 +5,13 @@ dyld: lazy symbol binding failed: Symbol not found: _SCDynamicStoreCopyProxies
</span> Expected in: flat namespace
due to failure to properly identify macOS when using the macOS 10.11 SDK or
<span style='display:block; white-space:pre;background:#ffe0e0;'>-earlier. This patch is only tested on macOS so far. The upstream fix, which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+earlier. This patch is only tested on macOS and iOS. The upstream fix, which
</span> needs to accommodate iOS, tvOS, watchOS, and every other OS may be different.
https://github.com/curl/curl/issues/11502
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2023-07-18 04:55:46.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2023-07-24 15:22:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/curl/curl/pull/11516
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2023-07-23 16:00:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2023-07-27 00:57:35.000000000 -0500
</span> @@ -21707,7 +21707,7 @@
int main (void)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,36 +21,59 @@ https://github.com/curl/curl/issues/11502
</span> return 0;
#else
#error Not a macOS
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/curl_setup.h.orig 2023-07-18 06:46:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/curl_setup.h 2023-07-24 15:22:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -258,7 +258,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/curl_setup.h.orig 2023-07-23 10:14:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/curl_setup.h 2023-07-27 00:53:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -258,8 +258,9 @@
</span> #if defined(__APPLE__) && !defined(USE_ARES)
#include <TargetConditionals.h>
#define USE_RESOLVE_ON_IPS 1
-# if !defined(TARGET_OS_OSX) || TARGET_OS_OSX
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define CURL_OSX_CALL_COPYPROXIES 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define CURL_OSX_CALL_COPYPROXIES 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ defined(ENABLE_IPV6)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define CURL_MACOS_CALL_COPYPROXIES 1
</span> # endif
#endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> --- lib/macos.c.orig 2023-07-18 04:46:48.000000000 -0500
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/macos.c 2023-07-24 15:23:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,7 +26,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/macos.c 2023-07-27 00:55:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,19 +26,16 @@
</span>
#if defined(__APPLE__)
-#if !defined(TARGET_OS_OSX) || TARGET_OS_OSX
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef CURL_MACOS_CALL_COPYPROXIES
</span>
#include <curl/curl.h>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "macos.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(ENABLE_IPV6) && defined(CURL_OSX_CALL_COPYPROXIES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <SystemConfiguration/SCDynamicStoreCopySpecific.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CURLcode Curl_macos_init(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(ENABLE_IPV6) && defined(CURL_OSX_CALL_COPYPROXIES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * The automagic conversion from IPv4 literals to IPv6 literals only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,7 +50,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(dict)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFRelease(dict);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return CURLE_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> --- lib/macos.h.orig 2023-07-18 04:46:48.000000000 -0500
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/macos.h 2023-07-24 15:23:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/macos.h 2023-07-27 00:56:07.000000000 -0500
</span> @@ -25,7 +25,7 @@
***************************************************************************/
#include "curl_setup.h"
-#if defined(__APPLE__) && (!defined(TARGET_OS_OSX) || TARGET_OS_OSX)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__) && TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef CURL_MACOS_CALL_COPYPROXIES
</span>
CURLcode Curl_macos_init(void);
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/curl/files/configure.patch b/net/curl/files/configure.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 2c6f4b99a5c..03887d25a24 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/curl/files/configure.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/curl/files/configure.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2023-05-29 09:53:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2023-05-30 20:38:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14493,7 +14493,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Prevent curl-config from telling curl's dependents that they have to link with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+all of curl's dependencies as well.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2023-07-23 16:00:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2023-07-27 00:52:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14497,7 +14497,7 @@
</span> else
whole_archive_flag_spec=''
fi
<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 07e80266636..eae0ca602ec 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 5.34
perl5.setup WWW-Curl 4.17
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 9
</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;'>@@ -13,7 +13,7 @@ description Perl extension interface for libcurl
</span> long_description Python module interface to the cURL library which is a \
tool for transferring files with URL syntax, supporting \
many protocols.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> checksums rmd160 786b6e0461051eae67bdcded046095895ea2a6a2 \
sha256 52ffab110e32348d775f241c973eb56f96b08eedbc110d77d257cdb0a24ab7ba \
size 50917
</pre><pre style='margin:0'>
</pre>