<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/38fa232748522381ac0664faf92623366ab9ad71">https://github.com/macports/macports-ports/commit/38fa232748522381ac0664faf92623366ab9ad71</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 38fa232748522381ac0664faf92623366ab9ad71
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Jul 24 16:00:16 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> curl: Fix crash on OS X 10.11 and earlier
</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/67803
</span>---
net/curl/Portfile | 3 +-
net/curl/files/SCDynamicStoreCopyProxies.patch | 55 ++++++++++++++++++++++++++
2 files changed, 57 insertions(+), 1 deletion(-)
<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 4224eb98f89..3732866ae73 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;'>@@ -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 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,6 +48,7 @@ if {${name} eq ${subport}} {
</span> # Prevent curl-config from telling curl's dependents that they have to
# link with all of curl's dependencies as well.
patchfiles configure.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..fb5e107c398
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,55 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Temporary fix for:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dyld: lazy symbol binding failed: Symbol not found: _SCDynamicStoreCopyProxies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Referenced from: /opt/local/lib/libcurl.4.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Expected in: flat namespace
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+due to failure to properly identify macOS when using the macOS 10.11 SDK or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+earlier. This patch is only tested on macOS so far. The upstream fix, which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+needs to accommodate iOS, tvOS, watchOS, and every other OS may be different.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/curl/curl/issues/11502
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2023-07-18 04:55:46.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2023-07-24 15:22:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21707,7 +21707,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main (void)
</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;'>+-#if (TARGET_OS_OSX)
</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;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #error Not a macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/curl_setup.h.orig 2023-07-18 06:46:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/curl_setup.h 2023-07-24 15:22:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -258,7 +258,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(__APPLE__) && !defined(USE_ARES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <TargetConditionals.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define USE_RESOLVE_ON_IPS 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# if !defined(TARGET_OS_OSX) || TARGET_OS_OSX
</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;'>+ # define CURL_OSX_CALL_COPYPROXIES 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/macos.c.orig 2023-07-18 04:46:48.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/macos.c 2023-07-24 15:23:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,7 +26,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(TARGET_OS_OSX) || TARGET_OS_OSX
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <curl/curl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/macos.h.orig 2023-07-18 04:46:48.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/macos.h 2023-07-24 15:23:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,7 +25,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ***************************************************************************/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "curl_setup.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__APPLE__) && (!defined(TARGET_OS_OSX) || TARGET_OS_OSX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
</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></pre><pre style='margin:0'>
</pre>