<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/74df29e385baaee57f5e74722b75c2fe0807b073">https://github.com/macports/macports-ports/commit/74df29e385baaee57f5e74722b75c2fe0807b073</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 74df29e385b curl: update to 8.3.0
</span>74df29e385b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 74df29e385baaee57f5e74722b75c2fe0807b073
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Wed Sep 13 08:50:19 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> curl: update to 8.3.0
</span>---
net/curl/Portfile | 9 ++-
net/curl/files/SCDynamicStoreCopyProxies.patch | 79 --------------------------
net/curl/files/configure.patch | 6 +-
3 files changed, 7 insertions(+), 87 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 76ee022c9ec..7cce268d032 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.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b8486b2903708f892bdff05a4f9a593c776a3ec6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2631932
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 8.3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f5f0aa07f0783cc331fb86c50249037d3524e33f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 376d627767d6c4f05105ab6d497b0d9aba7111770dd9d995225478209c37ea63 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2641764
</span>
categories net www
platforms darwin freebsd
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +46,6 @@ if {${name} eq ${subport}} {
</span> port:zstd
patchfiles configure.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append SCDynamicStoreCopyProxies.patch
</span>
configure.args --disable-silent-rules \
--enable-ipv6 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/curl/files/SCDynamicStoreCopyProxies.patch b/net/curl/files/SCDynamicStoreCopyProxies.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f01af6320a1..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,79 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Temporary fix for:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dyld: lazy symbol binding failed: Symbol not found: _SCDynamicStoreCopyProxies
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Referenced from: /opt/local/lib/libcurl.4.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Expected in: flat namespace
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-due to failure to properly identify macOS when using the macOS 10.11 SDK or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-earlier. This patch is only tested on macOS and iOS. The upstream fix, which
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-needs to accommodate iOS, tvOS, watchOS, and every other OS may be different.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/curl/curl/issues/11502
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/curl/curl/pull/11516
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2023-07-23 16:00:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2023-07-27 00:57:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21707,7 +21707,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int main (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if (TARGET_OS_OSX)
</span><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;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #error Not a macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/curl_setup.h.orig 2023-07-23 10:14:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/curl_setup.h 2023-07-27 00:53:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -258,8 +258,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(__APPLE__) && !defined(USE_ARES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <TargetConditionals.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define USE_RESOLVE_ON_IPS 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# if !defined(TARGET_OS_OSX) || TARGET_OS_OSX
</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:#ffe0e0;'>-+# if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ defined(ENABLE_IPV6)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define CURL_MACOS_CALL_COPYPROXIES 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/macos.c.orig 2023-07-18 04:46:48.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/macos.c 2023-07-27 00:55:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,19 +26,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if !defined(TARGET_OS_OSX) || TARGET_OS_OSX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef CURL_MACOS_CALL_COPYPROXIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <curl/curl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "macos.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(ENABLE_IPV6) && defined(CURL_OSX_CALL_COPYPROXIES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <SystemConfiguration/SCDynamicStoreCopySpecific.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CURLcode Curl_macos_init(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(ENABLE_IPV6) && defined(CURL_OSX_CALL_COPYPROXIES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * The automagic conversion from IPv4 literals to IPv6 literals only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,7 +50,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(dict)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFRelease(dict);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return CURLE_OK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/macos.h.orig 2023-07-18 04:46:48.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/macos.h 2023-07-27 00:56:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,7 +25,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ***************************************************************************/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "curl_setup.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__APPLE__) && (!defined(TARGET_OS_OSX) || TARGET_OS_OSX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef CURL_MACOS_CALL_COPYPROXIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CURLcode Curl_macos_init(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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 03887d25a24..53ce8a7d243 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,8 +1,8 @@
</span> Prevent curl-config from telling curl's dependents that they have to link with
all of curl's dependencies as well.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2023-07-23 16:00:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2023-07-27 00:52:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14497,7 +14497,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2023-09-13 08:41:45
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2023-09-13 08:42:48
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14479,7 +14479,7 @@
</span> else
whole_archive_flag_spec=''
fi
</pre><pre style='margin:0'>
</pre>