diff --git a/net/curl/Makefile b/net/curl/Makefile index 2b1853641..6ebf4e500 100644 --- a/net/curl/Makefile +++ b/net/curl/Makefile @@ -1,7 +1,7 @@ COMMENT= transfer files with FTP, HTTP, HTTPS, etc. -DISTNAME= curl-8.7.1 -SHARED_LIBS= curl 26.25 # 12.0 +DISTNAME= curl-8.8.0 +SHARED_LIBS= curl 26.26 # 12.0 CATEGORIES= net HOMEPAGE= https://curl.se/ @@ -20,7 +20,8 @@ WANTLIB+= ssl z AUTOCONF_VERSION=2.71 CONFIGURE_STYLE=autoconf # Beware of circular dependency curl -> brotli -> cmake -> curl -CONFIGURE_ARGS= --with-openssl \ +CONFIGURE_ARGS= --disable-ldap \ + --with-openssl \ --with-ca-bundle=/etc/ssl/cert.pem \ --without-brotli \ --without-hyper \ diff --git a/net/curl/distinfo b/net/curl/distinfo index 7d6fce79e..dce823ac9 100644 --- a/net/curl/distinfo +++ b/net/curl/distinfo @@ -1,2 +1,2 @@ -SHA256 (curl-8.7.1.tar.xz) = b+oqrGpGEPvQQAr7C83b5yWKZMY/H2jlhV68DGWXEM0= -SIZE (curl-8.7.1.tar.xz) = 2707016 +SHA256 (curl-8.8.0.tar.xz) = D1i7lfwzDIpG7rPfVwGw2Qydm/zEK9HNCHkdElUdRAA= +SIZE (curl-8.8.0.tar.xz) = 2748860 diff --git a/net/curl/patches/patch-configure b/net/curl/patches/patch-configure index 612253501..14b367cd3 100644 --- a/net/curl/patches/patch-configure +++ b/net/curl/patches/patch-configure @@ -1,26 +1,66 @@ Index: configure --- configure.orig +++ configure -@@ -17738,7 +17738,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 +@@ -9232,7 +9232,7 @@ else $as_nop + lt_cv_sys_max_cmd_len=8192; + ;; -@@ -18777,7 +18777,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" || -@@ -49111,4 +49111,3 @@ if test -n "$experimental"; then - WARNING: $experimental enabled but marked EXPERIMENTAL. Use with caution! - _EOF - fi -- +- bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) ++ bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd* | secbsd*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` +@@ -9768,7 +9768,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|DragonFly|SecBSD)/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.*` + ;; +@@ -9838,7 +9838,7 @@ newos6*) + lt_cv_deplibs_check_method=pass_all + ;; + +-openbsd* | bitrig*) ++openbsd* | bitrig* | secbsd*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' + else +@@ -10512,7 +10512,7 @@ old_postuninstall_cmds= + + if test -n "$RANLIB"; then + case $host_os in +- bitrig* | openbsd*) ++ bitrig* | openbsd* | secbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" + ;; + *) +@@ -13813,7 +13813,7 @@ printf %s "checking whether the $compiler linker ($LD) + # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) + with_gnu_ld=yes + ;; +- openbsd* | bitrig*) ++ openbsd* | bitrig* | secbsd*) + with_gnu_ld=no + ;; + linux* | k*bsd*-gnu | gnu*) +@@ -14795,7 +14795,7 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } + *nto* | *qnx*) + ;; + +- openbsd* | bitrig*) ++ openbsd* | bitrig* | secbsd*) + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes + hardcode_shlibpath_var=no +@@ -15941,7 +15941,7 @@ newsos6) + dynamic_linker='ldqnx.so' + ;; + +-openbsd* | bitrig*) ++openbsd* | bitrig* | secbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec=/usr/lib + need_lib_prefix=no diff --git a/net/curl/patches/patch-ltmain_sh b/net/curl/patches/patch-ltmain_sh deleted file mode 100644 index 9c974a966..000000000 --- a/net/curl/patches/patch-ltmain_sh +++ /dev/null @@ -1,30 +0,0 @@ -Index: ltmain.sh ---- ltmain.sh.orig -+++ ltmain.sh -@@ -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* | *-*-secbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*) - # Do not include libc due to us having libc/libc_r. - test X-lc = "X$arg" && continue - ;; -@@ -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* | *-*-secbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -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* | *-*-secbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd*) - # Do not include libc due to us having libc/libc_r. - ;; - *-*-sco3.2v5* | *-*-sco5v6*) diff --git a/net/curl/patches/patch-m4_curl-compilers_m4 b/net/curl/patches/patch-m4_curl-compilers_m4 index 79acc4730..cc3c42630 100644 --- a/net/curl/patches/patch-m4_curl-compilers_m4 +++ b/net/curl/patches/patch-m4_curl-compilers_m4 @@ -9,7 +9,7 @@ Do not override optimization flags in CFLAGS. Index: m4/curl-compilers.m4 --- m4/curl-compilers.m4.orig +++ m4/curl-compilers.m4 -@@ -694,7 +694,7 @@ AC_DEFUN([CURL_SET_COMPILER_OPTIMIZE_OPTS], [ +@@ -698,7 +698,7 @@ AC_DEFUN([CURL_SET_COMPILER_OPTIMIZE_OPTS], [ tmp_options="" tmp_CFLAGS="$CFLAGS" tmp_CPPFLAGS="$CPPFLAGS" diff --git a/net/curl/patches/patch-m4_libtool_m4 b/net/curl/patches/patch-m4_libtool_m4 index 929413d49..2b009288e 100644 --- a/net/curl/patches/patch-m4_libtool_m4 +++ b/net/curl/patches/patch-m4_libtool_m4 @@ -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|DragonFly|SecBSD)/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 ;; diff --git a/net/curl/pkg/PLIST b/net/curl/pkg/PLIST index d0004d636..c1cd5701c 100644 --- a/net/curl/pkg/PLIST +++ b/net/curl/pkg/PLIST @@ -18,7 +18,6 @@ include/curl/websockets.h lib/libcurl.la @lib lib/libcurl.so.${LIBcurl_VERSION} lib/pkgconfig/libcurl.pc -@man man/man1/curl-config.1 @man man/man1/curl.1 @man man/man1/mk-ca-bundle.1 @man man/man3/CURLINFO_ACTIVESOCKET.3 @@ -163,6 +162,7 @@ lib/pkgconfig/libcurl.pc @man man/man3/CURLOPT_DOH_SSL_VERIFYPEER.3 @man man/man3/CURLOPT_DOH_SSL_VERIFYSTATUS.3 @man man/man3/CURLOPT_DOH_URL.3 +@man man/man3/CURLOPT_ECH.3 @man man/man3/CURLOPT_EGDSOCKET.3 @man man/man3/CURLOPT_ERRORBUFFER.3 @man man/man3/CURLOPT_EXPECT_100_TIMEOUT_MS.3 @@ -481,6 +481,7 @@ lib/pkgconfig/libcurl.pc @man man/man3/curl_multi_strerror.3 @man man/man3/curl_multi_timeout.3 @man man/man3/curl_multi_wait.3 +@man man/man3/curl_multi_waitfds.3 @man man/man3/curl_multi_wakeup.3 @man man/man3/curl_pushheader_byname.3 @man man/man3/curl_pushheader_bynum.3