ftp/curl: sync with upstream

Taken from: FreeBSD
This commit is contained in:
Franco Fichtner 2025-01-07 13:50:55 +01:00
parent a18b814c44
commit de773ef686
5 changed files with 33 additions and 14 deletions

View file

@ -1,5 +1,5 @@
PORTNAME= curl
PORTVERSION= 8.11.0
PORTVERSION= 8.11.1
PORTREVISION= 1
CATEGORIES= ftp net www
MASTER_SITES= https://curl.se/download/ \
@ -24,6 +24,7 @@ CONFIGURE_ARGS= --disable-test-bundles \
--enable-headers-api \
--enable-hsts \
--enable-http-auth \
--enable-manual \
--enable-mime \
--enable-netrc \
--enable-openssl-auto-load-config \

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1731679162
SHA256 (curl-8.11.0.tar.xz) = db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb
SIZE (curl-8.11.0.tar.xz) = 2750684
TIMESTAMP = 1734871121
SHA256 (curl-8.11.1.tar.xz) = c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56
SIZE (curl-8.11.1.tar.xz) = 2751236

View file

@ -1,11 +1,11 @@
--- configure.orig 2024-11-06 07:09:19 UTC
--- configure.orig 2024-12-11 07:08:12 UTC
+++ configure
@@ -26192,7 +26197,7 @@ printf "%s\n" "found" >&6; }
if test -n "$gnu_gss"; then
LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE gss"
elif test "x$not_mit" = "x1"; then
- LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE heimdal-gssapi"
+ LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE"
else
LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE mit-krb5-gssapi"
fi
@@ -26210,7 +26210,7 @@ printf "%s\n" "found" >&6; }
if test -n "$gnu_gss"; then
LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE gss"
elif test "x$not_mit" = "x1"; then
- LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE heimdal-gssapi"
+ LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE"
else
LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE mit-krb5-gssapi"
fi

View file

@ -0,0 +1,16 @@
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));
}

View file

@ -18,6 +18,7 @@ lib/libcurl.so.4
lib/libcurl.so.4.8.0
libdata/pkgconfig/libcurl.pc
share/aclocal/libcurl.m4
%%PORTDOCS%%%%DOCSDIR%%/ALTSVC.md
%%PORTDOCS%%%%DOCSDIR%%/BINDINGS.md
%%PORTDOCS%%%%DOCSDIR%%/BUG-BOUNTY.md
%%PORTDOCS%%%%DOCSDIR%%/BUGS.md
@ -38,6 +39,7 @@ share/aclocal/libcurl.m4
%%PORTDOCS%%%%DOCSDIR%%/GOVERNANCE.md
%%PORTDOCS%%%%DOCSDIR%%/HELP-US.md
%%PORTDOCS%%%%DOCSDIR%%/HISTORY.md
%%PORTDOCS%%%%DOCSDIR%%/HSTS.md
%%PORTDOCS%%%%DOCSDIR%%/HTTP-COOKIES.md
%%PORTDOCS%%%%DOCSDIR%%/HTTP3.md
%%PORTDOCS%%%%DOCSDIR%%/INSTALL