SecBSD/ports
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UPDATE: net/curl 8.4.0 -> 8.6.0

Browse source
This commit is contained in:
purplerain 2024-02-12 00:08:55 +00:00
parent 9882bc916b
commit baf5c78941
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
8 changed files with 37 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

4
net/curl/Makefile
View file

@ -1,7 +1,7 @@
COMMENT= transfer files with FTP, HTTP, HTTPS, etc.
DISTNAME= curl-8.4.0
SHARED_LIBS= curl 26.23 # 12.0
DISTNAME= curl-8.6.0
SHARED_LIBS= curl 26.24 # 12.0
CATEGORIES= net
HOMEPAGE= https://curl.se/

4
net/curl/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (curl-8.4.0.tar.xz) = FsYqnErw9wPSi9pte783ukcFWtNBTXDexj4uYzbyqC0=
SIZE (curl-8.4.0.tar.xz) = 2658376
SHA256 (curl-8.6.0.tar.xz) = PM1V2Rr5UWU534BiX4GMc03G8uz5utozx2dl6ZEh2xU=
SIZE (curl-8.6.0.tar.xz) = 2630108

176
net/curl/patches/patch-configure
View file

@ -1,176 +0,0 @@
Index: configure
--- configure.orig
+++ configure
@@ -933,7 +933,7 @@ USE_QUICHE
USE_NGHTTP3
USE_NGTCP2_CRYPTO_WOLFSSL
USE_NGTCP2_CRYPTO_GNUTLS
-USE_NGTCP2_CRYPTO_QUICTLS
+USE_NGTCP2_CRYPTO_OPENSSL
USE_NGTCP2
USE_NGHTTP2
IDN_ENABLED
@@ -17734,7 +17734,7 @@ then :
"$GREP" CURL_DEF_TOKEN 2>/dev/null | \
"$SED" 's/.*CURL_DEF_TOKEN[ ][ ]*//' 2>/dev/null | \
"$SED" 's/["][ ]*["]//g' 2>/dev/null`
- if test -z "$tmp_exp" || test "$tmp_exp" = ""; then
+ if test -z "$tmp_exp" || test "$tmp_exp" = "__unix__"; then
tmp_exp=""
fi
@@ -18801,7 +18801,7 @@ printf %s "checking if compiler accepts debug enabling
tmp_options=""
tmp_CFLAGS="$CFLAGS"
tmp_CPPFLAGS="$CPPFLAGS"
- honor_optimize_option="yes"
+ honor_optimize_option="no"
#
#
if test "$want_optimize" = "assume_no" ||
@@ -31657,14 +31657,14 @@ fi
fi
if test "x$PKGCONFIG" != "xno"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libngtcp2_crypto_quictls options with pkg-config" >&5
-printf %s "checking for libngtcp2_crypto_quictls options with pkg-config... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libngtcp2_crypto_openssl options with pkg-config" >&5
+printf %s "checking for libngtcp2_crypto_openssl options with pkg-config... " >&6; }
itexists=`
if test -n "$want_tcp2_path"; then
PKG_CONFIG_LIBDIR="$want_tcp2_path"
export PKG_CONFIG_LIBDIR
fi
- $PKGCONFIG --exists libngtcp2_crypto_quictls >/dev/null 2>&1 && echo 1`
+ $PKGCONFIG --exists libngtcp2_crypto_openssl >/dev/null 2>&1 && echo 1`
if test -z "$itexists"; then
PKGCONFIG="no"
@@ -31678,50 +31678,50 @@ printf "%s\n" "found" >&6; }
if test "$PKGCONFIG" != "no" ; then
- LIB_NGTCP2_CRYPTO_QUICTLS=`
+ LIB_NGTCP2_CRYPTO_OPENSSL=`
if test -n "$want_tcp2_path"; then
PKG_CONFIG_LIBDIR="$want_tcp2_path"
export PKG_CONFIG_LIBDIR
fi
- $PKGCONFIG --libs-only-l libngtcp2_crypto_quictls`
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -l is $LIB_NGTCP2_CRYPTO_QUICTLS" >&5
-printf "%s\n" "$as_me: -l is $LIB_NGTCP2_CRYPTO_QUICTLS" >&6;}
+ $PKGCONFIG --libs-only-l libngtcp2_crypto_openssl`
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -l is $LIB_NGTCP2_CRYPTO_OPENSSL" >&5
+printf "%s\n" "$as_me: -l is $LIB_NGTCP2_CRYPTO_OPENSSL" >&6;}
- CPP_NGTCP2_CRYPTO_QUICTLS=`
+ CPP_NGTCP2_CRYPTO_OPENSSL=`
if test -n "$want_tcp2_path"; then
PKG_CONFIG_LIBDIR="$want_tcp2_path"
export PKG_CONFIG_LIBDIR
fi
- $PKGCONFIG --cflags-only-I libngtcp2_crypto_quictls`
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -I is $CPP_NGTCP2_CRYPTO_QUICTLS" >&5
-printf "%s\n" "$as_me: -I is $CPP_NGTCP2_CRYPTO_QUICTLS" >&6;}
+ $PKGCONFIG --cflags-only-I libngtcp2_crypto_openssl`
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -I is $CPP_NGTCP2_CRYPTO_OPENSSL" >&5
+printf "%s\n" "$as_me: -I is $CPP_NGTCP2_CRYPTO_OPENSSL" >&6;}
- LD_NGTCP2_CRYPTO_QUICTLS=`
+ LD_NGTCP2_CRYPTO_OPENSSL=`
if test -n "$want_tcp2_path"; then
PKG_CONFIG_LIBDIR="$want_tcp2_path"
export PKG_CONFIG_LIBDIR
fi
- $PKGCONFIG --libs-only-L libngtcp2_crypto_quictls`
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -L is $LD_NGTCP2_CRYPTO_QUICTLS" >&5
-printf "%s\n" "$as_me: -L is $LD_NGTCP2_CRYPTO_QUICTLS" >&6;}
+ $PKGCONFIG --libs-only-L libngtcp2_crypto_openssl`
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -L is $LD_NGTCP2_CRYPTO_OPENSSL" >&5
+printf "%s\n" "$as_me: -L is $LD_NGTCP2_CRYPTO_OPENSSL" >&6;}
- LDFLAGS="$LDFLAGS $LD_NGTCP2_CRYPTO_QUICTLS"
- CPPFLAGS="$CPPFLAGS $CPP_NGTCP2_CRYPTO_QUICTLS"
- LIBS="$LIB_NGTCP2_CRYPTO_QUICTLS $LIBS"
+ LDFLAGS="$LDFLAGS $LD_NGTCP2_CRYPTO_OPENSSL"
+ CPPFLAGS="$CPPFLAGS $CPP_NGTCP2_CRYPTO_OPENSSL"
+ LIBS="$LIB_NGTCP2_CRYPTO_OPENSSL $LIBS"
if test "x$cross_compiling" != "xyes"; then
- DIR_NGTCP2_CRYPTO_QUICTLS=`echo $LD_NGTCP2_CRYPTO_QUICTLS | $SED -e 's/^-L//'`
+ DIR_NGTCP2_CRYPTO_OPENSSL=`echo $LD_NGTCP2_CRYPTO_OPENSSL | $SED -e 's/^-L//'`
fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ngtcp2_crypto_recv_client_initial_cb in -lngtcp2_crypto_quictls" >&5
-printf %s "checking for ngtcp2_crypto_recv_client_initial_cb in -lngtcp2_crypto_quictls... " >&6; }
-if test ${ac_cv_lib_ngtcp2_crypto_quictls_ngtcp2_crypto_recv_client_initial_cb+y}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ngtcp2_crypto_recv_client_initial_cb in -lngtcp2_crypto_openssl" >&5
+printf %s "checking for ngtcp2_crypto_recv_client_initial_cb in -lngtcp2_crypto_openssl... " >&6; }
+if test ${ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_recv_client_initial_cb+y}
then :
printf %s "(cached) " >&6
else $as_nop
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lngtcp2_crypto_quictls $LIBS"
+LIBS="-lngtcp2_crypto_openssl $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -31739,17 +31739,17 @@ return ngtcp2_crypto_recv_client_initial_cb ();
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_lib_ngtcp2_crypto_quictls_ngtcp2_crypto_recv_client_initial_cb=yes
+ ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_recv_client_initial_cb=yes
else $as_nop
- ac_cv_lib_ngtcp2_crypto_quictls_ngtcp2_crypto_recv_client_initial_cb=no
+ ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_recv_client_initial_cb=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ngtcp2_crypto_quictls_ngtcp2_crypto_recv_client_initial_cb" >&5
-printf "%s\n" "$ac_cv_lib_ngtcp2_crypto_quictls_ngtcp2_crypto_recv_client_initial_cb" >&6; }
-if test "x$ac_cv_lib_ngtcp2_crypto_quictls_ngtcp2_crypto_recv_client_initial_cb" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_recv_client_initial_cb" >&5
+printf "%s\n" "$ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_recv_client_initial_cb" >&6; }
+if test "x$ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_recv_client_initial_cb" = xyes
then :
for ac_header in ngtcp2/ngtcp2_crypto.h
@@ -31760,14 +31760,14 @@ then :
printf "%s\n" "#define HAVE_NGTCP2_NGTCP2_CRYPTO_H 1" >>confdefs.h
NGTCP2_ENABLED=1
-printf "%s\n" "#define USE_NGTCP2_CRYPTO_QUICTLS 1" >>confdefs.h
+printf "%s\n" "#define USE_NGTCP2_CRYPTO_OPENSSL 1" >>confdefs.h
- USE_NGTCP2_CRYPTO_QUICTLS=1
+ USE_NGTCP2_CRYPTO_OPENSSL=1
- CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_NGTCP2_CRYPTO_QUICTLS"
+ CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_NGTCP2_CRYPTO_OPENSSL"
export CURL_LIBRARY_PATH
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Added $DIR_NGTCP2_CRYPTO_QUICTLS to CURL_LIBRARY_PATH" >&5
-printf "%s\n" "$as_me: Added $DIR_NGTCP2_CRYPTO_QUICTLS to CURL_LIBRARY_PATH" >&6;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Added $DIR_NGTCP2_CRYPTO_OPENSSL to CURL_LIBRARY_PATH" >&5
+printf "%s\n" "$as_me: Added $DIR_NGTCP2_CRYPTO_OPENSSL to CURL_LIBRARY_PATH" >&6;}
fi
@@ -31783,7 +31783,7 @@ fi
else
if test X"$want_tcp2" != Xdefault; then
- as_fn_error $? "--with-ngtcp2 was specified but could not find ngtcp2_crypto_quictls pkg-config file." "$LINENO" 5
+ as_fn_error $? "--with-ngtcp2 was specified but could not find ngtcp2_crypto_openssl pkg-config file." "$LINENO" 5
fi
fi
fi
@@ -48861,4 +48861,3 @@ if test -n "$experimental"; then
WARNING: $experimental enabled but marked EXPERIMENTAL. Use with caution!
_EOF
fi
-

15
net/curl/patches/patch-lib_curl_ntlm_wb_c Normal file
View file

@ -0,0 +1,15 @@
ntml_wb: fix buffer type typo
https://github.com/curl/curl/commit/e75a48d2c32d92b0321fbb09c25885a706077201
Index: lib/curl_ntlm_wb.c
--- lib/curl_ntlm_wb.c.orig
+++ lib/curl_ntlm_wb.c
@@ -266,7 +266,7 @@ static CURLcode ntlm_wb_response(struct Curl_easy *dat
size_t len_in = strlen(input), len_out = 0;
struct dynbuf b;
char *ptr = NULL;
- usigned char buf[1024]
+ unsigned char buf[1024];
Curl_dyn_init(&b, MAX_NTLM_WB_RESPONSE);
while(len_in > 0) {

12
net/curl/patches/patch-ltmain_sh
View file

@ -1,30 +1,30 @@
Index: ltmain.sh
--- ltmain.sh.orig
+++ ltmain.sh
@@ -7287,7 +7287,7 @@ func_mode_link ()
@@ -7275,7 +7275,7 @@ func_mode_link ()
# These systems don't actually have a C library (as such)
test X-lc = "X$arg" && continue
;;
- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd* | *-*-secbsd*)
+ *-*-openbsd* | *-*-secbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*)
# Do not include libc due to us having libc/libc_r.
test X-lc = "X$arg" && continue
;;
@@ -7307,7 +7307,7 @@ func_mode_link ()
@@ -7295,7 +7295,7 @@ func_mode_link ()
esac
elif test X-lc_r = "X$arg"; then
case $host in
- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd* | *-*-secbsd*)
+ *-*-openbsd* | *-*-secbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*)
# Do not include libc_r directly, use -pthread flag.
continue
;;
@@ -9420,7 +9420,7 @@ func_mode_link ()
@@ -9408,7 +9408,7 @@ func_mode_link ()
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
;;
- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd* | *-*-secbsd*)
+ *-*-openbsd* | *-*-secbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd*)
# Do not include libc due to us having libc/libc_r.
;;
*-*-sco3.2v5* | *-*-sco5v6*)

10
net/curl/patches/patch-m4_curl-compilers_m4
View file

@ -1,15 +1,7 @@
The curl configure script wants to take control of the compiler
flags for optimization. The actual interactions are more complex,
but the gist is that the flags are stripped from CFLAGS, and if
--enable-optimize is specified, an approved optimization flag is
added.
Do not override optimization flags in CFLAGS.
Index: m4/curl-compilers.m4
--- m4/curl-compilers.m4.orig
+++ m4/curl-compilers.m4
@@ -692,7 +692,7 @@ AC_DEFUN([CURL_SET_COMPILER_OPTIMIZE_OPTS], [
@@ -694,7 +694,7 @@ AC_DEFUN([CURL_SET_COMPILER_OPTIMIZE_OPTS], [
tmp_options=""
tmp_CFLAGS="$CFLAGS"
tmp_CPPFLAGS="$CPPFLAGS"

9
net/curl/patches/patch-m4_libtool_m4
View file

@ -28,6 +28,15 @@ Index: m4/libtool.m4
version_type=sunos
sys_lib_dlsearch_path_spec=/usr/lib
need_lib_prefix=no
@@ -3525,7 +3525,7 @@ freebsd* | dragonfly* | midnightbsd*)
i*86 )
# Not sure whether the presence of OpenBSD here was a mistake.
# Let's accept both of them until this is cleared up.
- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|SecBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
lt_cv_file_magic_cmd=$FILECMD
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
@@ -3595,7 +3595,7 @@ newos6*)
lt_cv_deplibs_check_method=pass_all
;;

2
net/curl/pkg/PLIST
View file

@ -62,6 +62,7 @@ lib/pkgconfig/libcurl.pc
@man man/man3/CURLINFO_PROXYAUTH_AVAIL.3
@man man/man3/CURLINFO_PROXY_ERROR.3
@man man/man3/CURLINFO_PROXY_SSL_VERIFYRESULT.3
@man man/man3/CURLINFO_QUEUE_TIME_T.3
@man man/man3/CURLINFO_REDIRECT_COUNT.3
@man man/man3/CURLINFO_REDIRECT_TIME.3
@man man/man3/CURLINFO_REDIRECT_TIME_T.3
@ -329,6 +330,7 @@ lib/pkgconfig/libcurl.pc
@man man/man3/CURLOPT_SEEKDATA.3
@man man/man3/CURLOPT_SEEKFUNCTION.3
@man man/man3/CURLOPT_SERVER_RESPONSE_TIMEOUT.3
@man man/man3/CURLOPT_SERVER_RESPONSE_TIMEOUT_MS.3
@man man/man3/CURLOPT_SERVICE_NAME.3
@man man/man3/CURLOPT_SHARE.3
@man man/man3/CURLOPT_SOCKOPTDATA.3