<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/079a22c359367b9bebe6c29b0e4e2cb89f1c92b1">https://github.com/macports/macports-ports/commit/079a22c359367b9bebe6c29b0e4e2cb89f1c92b1</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 079a22c3593 curl: Update to 8.11.1
</span>079a22c3593 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 079a22c359367b9bebe6c29b0e4e2cb89f1c92b1
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Thu Dec 12 17:43:42 2024 -0600
<span style='display:block; white-space:pre;color:#404040;'> curl: Update to 8.11.1
</span>---
net/curl/Portfile | 15 ++++++++-------
net/curl/files/async-thread.patch | 23 +++++++++++++++++++++++
net/curl/files/curl-config.in.patch | 14 --------------
net/curl/files/sectransp.patch | 28 ++++++++++++++++++++++++++++
4 files changed, 59 insertions(+), 21 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 21ba40b87c2..6e480969ed6 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.10.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ddd20616891b01574bbc1c187affd78a19b7d54a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2726748
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 8.11.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f5270a96f2ead387fff0f97fba1843fa5c563996 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2751236
</span>
categories net www
platforms darwin freebsd
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,13 +35,14 @@ 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 path:bin/pkg-config:pkgconfig
depends_lib port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append curl-config.in.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append async-thread.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sectransp.patch
</span>
configure.args --disable-silent-rules \
--enable-ipv6 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -276,7 +277,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/async-thread.patch b/net/curl/files/async-thread.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f9a756d0709
</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/async-thread.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+async-thread: avoid closing eventfd twice
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+When employing eventfd for socketpair, there is only one file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+descriptor. Closing that fd twice might result in fd corruption.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Thus, we should avoid closing the eventfd twice, following the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pattern in lib/multi.c.
</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/15725
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/curl/curl/commit/ff5091aa9f73802e894b1cbdf24ab84e103200e2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/asyn-thread.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/asyn-thread.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -195,9 +195,11 @@ void destroy_thread_sync_data(struct thread_sync_data *tsd)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * close one end of the socket pair (may be done in resolver thread);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * the other end (for reading) is always closed in the parent thread.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef USE_EVENTFD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(tsd->sock_pair[1] != CURL_SOCKET_BAD) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wakeup_close(tsd->sock_pair[1]);
</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;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memset(tsd, 0, sizeof(*tsd));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/curl/files/curl-config.in.patch b/net/curl/files/curl-config.in.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 26ef1197735..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/curl/files/curl-config.in.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-curl-config.in: Don't surround CA path with quotes
</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/15041
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- curl-config.in.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ curl-config.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -71,7 +71,7 @@ while test "$#" -gt 0; do
</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;'>- --ca)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo '@CURL_CA_BUNDLE@'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo @CURL_CA_BUNDLE@
</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;'>- --cc)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/curl/files/sectransp.patch b/net/curl/files/sectransp.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..abc31acd494
</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/sectransp.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;'>+sectransp: free certificate on error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Otherwise the certificate memory was leaked.
</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/commit/df1d08ec0daf06b0bf2fdebe2411631e08967a98
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/vtls/sectransp.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/vtls/sectransp.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1504,9 +1504,11 @@ static CURLcode append_cert_to_array(struct Curl_easy *data,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case CURLE_OK:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case CURLE_PEER_FAILED_VERIFICATION:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFRelease(cacert);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return CURLE_SSL_CACERT_BADFILE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case CURLE_OUT_OF_MEMORY:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFRelease(cacert);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(certp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2424,7 +2426,7 @@ static CURLcode sectransp_shutdown(struct Curl_cfilter *cf,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct st_ssl_backend_data *backend =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (struct st_ssl_backend_data *)connssl->backend;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CURLcode result = CURLE_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ssize_t nread;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ssize_t nread = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char buf[1024];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>