<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/7e0b5e5b3f37a4d63b9277a8a6b15644928f9b18">https://github.com/macports/macports-ports/commit/7e0b5e5b3f37a4d63b9277a8a6b15644928f9b18</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 7e0b5e5b3f3 curl: Update to 8.12.0
</span>7e0b5e5b3f3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7e0b5e5b3f37a4d63b9277a8a6b15644928f9b18
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Wed Feb 5 10:21:12 2025 -0600
<span style='display:block; white-space:pre;color:#404040;'> curl: Update to 8.12.0
</span>---
net/curl/Portfile | 21 ++++++++-------------
net/curl/files/async-thread.patch | 23 -----------------------
net/curl/files/patch-no-autodownload.diff | 11 -----------
net/curl/files/sectransp.patch | 28 ----------------------------
4 files changed, 8 insertions(+), 75 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 6e480969ed6..66d4294a7b4 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.11.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f5270a96f2ead387fff0f97fba1843fa5c563996 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2751236
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 8.12.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a5c5819cb487c809e43c4708d3bbc5d80d0aa170 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9a4628c764be6b1a9909567c13e8e771041609df43b2158fcac4e05ea7097e5d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2777552
</span>
categories net www
platforms darwin freebsd
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,9 +41,6 @@ if {${name} eq ${subport}} {
</span>
depends_lib port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append async-thread.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sectransp.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args --disable-silent-rules \
--enable-ipv6 \
--without-brotli \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -333,8 +330,7 @@ subport curl-ca-bundle {
</span> size 291100
extract.only ${curl_distfile}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- extract.post_args-append ${worksrcdir}/Makefile.dist \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcdir}/scripts/mk-ca-bundle.pl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract.post_args-append ${worksrcdir}/scripts/mk-ca-bundle.pl
</span>
post-extract {
system -W ${workpath} "unzip -q -a [shellescape ${distpath}/${certdata_distfile}]"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -342,12 +338,11 @@ subport curl-ca-bundle {
</span> file mkdir ${worksrcpath}/lib
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-no-autodownload.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args -f Makefile.dist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target ca-bundle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.cmd scripts/mk-ca-bundle.pl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args -n lib/ca-bundle.crt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target
</span>
destroot {
set ca_bundle_dir ${prefix}/share/curl
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f9a756d0709..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/curl/files/async-thread.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-async-thread: avoid closing eventfd twice
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-When employing eventfd for socketpair, there is only one file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-descriptor. Closing that fd twice might result in fd corruption.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Thus, we should avoid closing the eventfd twice, following the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pattern in lib/multi.c.
</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/15725
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/curl/curl/commit/ff5091aa9f73802e894b1cbdf24ab84e103200e2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/asyn-thread.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/asyn-thread.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -195,9 +195,11 @@ void destroy_thread_sync_data(struct thread_sync_data *tsd)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * close one end of the socket pair (may be done in resolver thread);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * the other end (for reading) is always closed in the parent thread.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef USE_EVENTFD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(tsd->sock_pair[1] != CURL_SOCKET_BAD) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wakeup_close(tsd->sock_pair[1]);
</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;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- memset(tsd, 0, sizeof(*tsd));
</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/patch-no-autodownload.diff b/net/curl/files/patch-no-autodownload.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e6559297ce5..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/curl/files/patch-no-autodownload.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.dist.orig 2024-09-18 00:56:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.dist 2024-09-22 13:57:59.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -64,7 +64,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ca-bundle: scripts/mk-ca-bundle.pl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "generate a fresh ca-bundle.crt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @perl $< -b -l -u lib/ca-bundle.crt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @perl $< -n lib/ca-bundle.crt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ca-firefox: scripts/firefox-db2pem.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "generate a fresh ca-bundle.crt"
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index abc31acd494..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/curl/files/sectransp.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-sectransp: free certificate on error
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Otherwise the certificate memory was leaked.
</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/commit/df1d08ec0daf06b0bf2fdebe2411631e08967a98
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/vtls/sectransp.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/vtls/sectransp.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1504,9 +1504,11 @@ static CURLcode append_cert_to_array(struct Curl_easy *data,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case CURLE_OK:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case CURLE_PEER_FAILED_VERIFICATION:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CFRelease(cacert);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return CURLE_SSL_CACERT_BADFILE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case CURLE_OUT_OF_MEMORY:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CFRelease(cacert);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return result;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- free(certp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2424,7 +2426,7 @@ static CURLcode sectransp_shutdown(struct Curl_cfilter *cf,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct st_ssl_backend_data *backend =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (struct st_ssl_backend_data *)connssl->backend;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CURLcode result = CURLE_OK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ssize_t nread;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ssize_t nread = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char buf[1024];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>