Re: git: ba085fb147e8 - main - ftp/curl: Update to 8.12.0
- In reply to: Po-Chuan Hsieh : "git: ba085fb147e8 - main - ftp/curl: Update to 8.12.0"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 08 Feb 2025 18:56:21 UTC
Hi,
Please back this out, this release contains multiple regressions and is
documented upstream (multiple PRs, Issue reports etc).
https://github.com/curl/curl/discussions/16259
Best regards,
Daniel
On 2025-02-08 18:10, Po-Chuan Hsieh wrote:
> The branch main has been updated by sunpoet:
>
> URL: https://cgit.FreeBSD.org/ports/commit/?id=ba085fb147e84dc489c46720ddfb7b7d16e022e6
>
> commit ba085fb147e84dc489c46720ddfb7b7d16e022e6
> Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
> AuthorDate: 2025-02-08 16:58:49 +0000
> Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
> CommitDate: 2025-02-08 16:58:49 +0000
>
> ftp/curl: Update to 8.12.0
>
> Changes: https://curl.se/changes.html
> ---
> ftp/curl/Makefile | 8 ++++----
> ftp/curl/distinfo | 6 +++---
> ftp/curl/files/patch-lib-asyn-thread.c | 16 ----------------
> ftp/curl/pkg-plist | 11 +++++++++--
> 4 files changed, 16 insertions(+), 25 deletions(-)
>
> diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
> index a50a8fc289ad..ba43de68c80d 100644
> --- a/ftp/curl/Makefile
> +++ b/ftp/curl/Makefile
> @@ -1,6 +1,5 @@
> PORTNAME= curl
> -PORTVERSION= 8.11.1
> -PORTREVISION= 1
> +PORTVERSION= 8.12.0
> CATEGORIES= ftp net www
> MASTER_SITES= https://curl.se/download/ \
> https://github.com/curl/curl/releases/download/curl-${PORTVERSION:S|.|_|g}/
> @@ -29,6 +28,7 @@ CONFIGURE_ARGS= --disable-test-bundles \
> --enable-netrc \
> --enable-openssl-auto-load-config \
> --enable-progress-meter \
> + --enable-ssls-export \
> --with-zsh-functions-dir=${LOCALBASE}/share/zsh/site-functions \
> --without-ca-bundle \
> --without-ca-path \
> @@ -151,7 +151,7 @@ SMTP_CONFIGURE_ENABLE= smtp
> STATIC_CONFIGURE_ENABLE=static
> TELNET_CONFIGURE_ENABLE=telnet
> TFTP_CONFIGURE_ENABLE= tftp
> -THREADED_RESOLVER_CONFIGURE_ENABLE= pthreads threaded-resolver
> +THREADED_RESOLVER_CONFIGURE_ENABLE= threaded-resolver
> TLS_SRP_CONFIGURE_ENABLE= tls-srp
> WEBSOCKET_CONFIGURE_ENABLE= websockets
> WOLFSSL_CONFIGURE_WITH= wolfssl
> @@ -180,6 +180,6 @@ post-install-DOCS-on:
>
> post-install-EXAMPLES-on:
> ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
> - cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} Makefile.example Makefile.mk README.md *.c *.cpp ${STAGEDIR}${EXAMPLESDIR}/
> + cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} Makefile.example README.md *.c *.cpp ${STAGEDIR}${EXAMPLESDIR}/
>
> .include <bsd.port.post.mk>
> diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo
> index 4383b3edb1d0..cec475d73abc 100644
> --- a/ftp/curl/distinfo
> +++ b/ftp/curl/distinfo
> @@ -1,3 +1,3 @@
> -TIMESTAMP = 1734871121
> -SHA256 (curl-8.11.1.tar.xz) = c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56
> -SIZE (curl-8.11.1.tar.xz) = 2751236
> +TIMESTAMP = 1738982802
> +SHA256 (curl-8.12.0.tar.xz) = 9a4628c764be6b1a9909567c13e8e771041609df43b2158fcac4e05ea7097e5d
> +SIZE (curl-8.12.0.tar.xz) = 2777552
> diff --git a/ftp/curl/files/patch-lib-asyn-thread.c b/ftp/curl/files/patch-lib-asyn-thread.c
> deleted file mode 100644
> index 1c74a41daa42..000000000000
> --- a/ftp/curl/files/patch-lib-asyn-thread.c
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -Obtained from: https://github.com/curl/curl/commit/ff5091aa9f73802e894b1cbdf24ab84e103200e2
> -
> ---- lib/asyn-thread.c.orig 2024-12-11 07:08:12 UTC
> -+++ lib/asyn-thread.c
> -@@ -195,9 +195,11 @@ void destroy_thread_sync_data(struct thread_sync_data
> - * close one end of the socket pair (may be done in resolver thread);
> - * the other end (for reading) is always closed in the parent thread.
> - */
> -+#ifndef USE_EVENTFD
> - if(tsd->sock_pair[1] != CURL_SOCKET_BAD) {
> - wakeup_close(tsd->sock_pair[1]);
> - }
> -+#endif
> - #endif
> - memset(tsd, 0, sizeof(*tsd));
> - }
> diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist
> index a940df55cbf3..4876eb89063c 100644
> --- a/ftp/curl/pkg-plist
> +++ b/ftp/curl/pkg-plist
> @@ -42,6 +42,8 @@ share/aclocal/libcurl.m4
> %%PORTDOCS%%%%DOCSDIR%%/HSTS.md
> %%PORTDOCS%%%%DOCSDIR%%/HTTP-COOKIES.md
> %%PORTDOCS%%%%DOCSDIR%%/HTTP3.md
> +%%PORTDOCS%%%%DOCSDIR%%/HTTPSRR.md
> +%%PORTDOCS%%%%DOCSDIR%%/INFRASTRUCTURE.md
> %%PORTDOCS%%%%DOCSDIR%%/INSTALL
> %%PORTDOCS%%%%DOCSDIR%%/INSTALL-CMAKE.md
> %%PORTDOCS%%%%DOCSDIR%%/INSTALL.md
> @@ -75,12 +77,13 @@ share/aclocal/libcurl.m4
> %%PORTDOCS%%%%DOCSDIR%%/internals/CONNECTION-FILTERS.md
> %%PORTDOCS%%%%DOCSDIR%%/internals/DYNBUF.md
> %%PORTDOCS%%%%DOCSDIR%%/internals/HASH.md
> -%%PORTDOCS%%%%DOCSDIR%%/internals/HYPER.md
> %%PORTDOCS%%%%DOCSDIR%%/internals/LLIST.md
> %%PORTDOCS%%%%DOCSDIR%%/internals/MQTT.md
> %%PORTDOCS%%%%DOCSDIR%%/internals/NEW-PROTOCOL.md
> %%PORTDOCS%%%%DOCSDIR%%/internals/README.md
> %%PORTDOCS%%%%DOCSDIR%%/internals/SPLAY.md
> +%%PORTDOCS%%%%DOCSDIR%%/internals/STRPARSE.md
> +%%PORTDOCS%%%%DOCSDIR%%/internals/TLS-SESSIONS.md
> %%PORTDOCS%%%%DOCSDIR%%/internals/WEBSOCKET.md
> %%PORTDOCS%%%%DOCSDIR%%/libcurl/ABI.md
> %%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.m4
> @@ -91,11 +94,11 @@ share/aclocal/libcurl.m4
> %%PORTDOCS%%%%DOCSDIR%%/options-in-versions
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/10-at-a-time.c
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.example
> -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.mk
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.md
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/address-scope.c
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/altsvc.c
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/anyauthput.c
> +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/block_ip.c
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cacertinmem.c
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/certinfo.c
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chkspeed.c
> @@ -246,6 +249,7 @@ share/man/man3/CURLINFO_FILETIME_T.3.gz
> share/man/man3/CURLINFO_FTP_ENTRY_PATH.3.gz
> share/man/man3/CURLINFO_HEADER_SIZE.3.gz
> share/man/man3/CURLINFO_HTTPAUTH_AVAIL.3.gz
> +share/man/man3/CURLINFO_HTTPAUTH_USED.3.gz
> share/man/man3/CURLINFO_HTTP_CONNECTCODE.3.gz
> share/man/man3/CURLINFO_HTTP_VERSION.3.gz
> share/man/man3/CURLINFO_LASTSOCKET.3.gz
> @@ -263,6 +267,7 @@ share/man/man3/CURLINFO_PRIMARY_PORT.3.gz
> share/man/man3/CURLINFO_PRIVATE.3.gz
> share/man/man3/CURLINFO_PROTOCOL.3.gz
> share/man/man3/CURLINFO_PROXYAUTH_AVAIL.3.gz
> +share/man/man3/CURLINFO_PROXYAUTH_USED.3.gz
> share/man/man3/CURLINFO_PROXY_ERROR.3.gz
> share/man/man3/CURLINFO_PROXY_SSL_VERIFYRESULT.3.gz
> share/man/man3/CURLINFO_QUEUE_TIME_T.3.gz
> @@ -641,6 +646,8 @@ share/man/man3/curl_easy_recv.3.gz
> share/man/man3/curl_easy_reset.3.gz
> share/man/man3/curl_easy_send.3.gz
> share/man/man3/curl_easy_setopt.3.gz
> +share/man/man3/curl_easy_ssls_export.3.gz
> +share/man/man3/curl_easy_ssls_import.3.gz
> share/man/man3/curl_easy_strerror.3.gz
> share/man/man3/curl_easy_unescape.3.gz
> share/man/man3/curl_easy_upkeep.3.gz