diff --git a/net/curl/Makefile b/net/curl/Makefile index 6ebf4e500..018cdb8d9 100644 --- a/net/curl/Makefile +++ b/net/curl/Makefile @@ -1,7 +1,7 @@ COMMENT= transfer files with FTP, HTTP, HTTPS, etc. -DISTNAME= curl-8.8.0 -SHARED_LIBS= curl 26.26 # 12.0 +DISTNAME= curl-8.9.1 +SHARED_LIBS= curl 26.27 # 12.0 CATEGORIES= net HOMEPAGE= https://curl.se/ diff --git a/net/curl/distinfo b/net/curl/distinfo index dce823ac9..f83bdd0c1 100644 --- a/net/curl/distinfo +++ b/net/curl/distinfo @@ -1,2 +1,2 @@ -SHA256 (curl-8.8.0.tar.xz) = D1i7lfwzDIpG7rPfVwGw2Qydm/zEK9HNCHkdElUdRAA= -SIZE (curl-8.8.0.tar.xz) = 2748860 +SHA256 (curl-8.9.1.tar.xz) = 8pL2zAUdW7q/cl74XUMt/qzIcR3XF+qXYSrlkGQ4AeU= +SIZE (curl-8.9.1.tar.xz) = 2782364 diff --git a/net/curl/patches/patch-configure b/net/curl/patches/patch-configure index 14b367cd3..fd7d05af1 100644 --- a/net/curl/patches/patch-configure +++ b/net/curl/patches/patch-configure @@ -1,7 +1,7 @@ Index: configure --- configure.orig +++ configure -@@ -9232,7 +9232,7 @@ else $as_nop +@@ -9240,7 +9240,7 @@ else $as_nop lt_cv_sys_max_cmd_len=8192; ;; @@ -10,7 +10,7 @@ Index: configure # 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*) +@@ -9776,7 +9776,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. @@ -19,7 +19,7 @@ Index: configure lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; -@@ -9838,7 +9838,7 @@ newos6*) +@@ -9846,7 +9846,7 @@ newos6*) lt_cv_deplibs_check_method=pass_all ;; @@ -28,7 +28,7 @@ Index: configure 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= +@@ -10520,7 +10520,7 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in @@ -37,7 +37,7 @@ Index: configure old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) -@@ -13813,7 +13813,7 @@ printf %s "checking whether the $compiler linker ($LD) +@@ -13821,7 +13821,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 ;; @@ -46,7 +46,7 @@ Index: configure with_gnu_ld=no ;; linux* | k*bsd*-gnu | gnu*) -@@ -14795,7 +14795,7 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } +@@ -14803,7 +14803,7 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } *nto* | *qnx*) ;; @@ -55,7 +55,7 @@ Index: configure if test -f /usr/libexec/ld.so; then hardcode_direct=yes hardcode_shlibpath_var=no -@@ -15941,7 +15941,7 @@ newsos6) +@@ -15949,7 +15949,7 @@ newsos6) dynamic_linker='ldqnx.so' ;; @@ -64,3 +64,17 @@ Index: configure version_type=sunos sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no +@@ -17746,7 +17746,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 + +@@ -49261,4 +49261,3 @@ if test -n "$experimental"; then + printf "%s\n" "$as_me: WARNING: $a is enabled but marked EXPERIMENTAL. Use with caution!" >&2;} + done + fi +- diff --git a/net/curl/patches/patch-ltmain_sh b/net/curl/patches/patch-ltmain_sh new file mode 100644 index 000000000..8536f1fde --- /dev/null +++ b/net/curl/patches/patch-ltmain_sh @@ -0,0 +1,30 @@ +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* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd* | *-*-secbsd*) + # 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* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd* | *-*-secbsd*) + # 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* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd* | *-*-secbsd*) + # 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 cc3c42630..a49edd131 100644 --- a/net/curl/patches/patch-m4_curl-compilers_m4 +++ b/net/curl/patches/patch-m4_curl-compilers_m4 @@ -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 -@@ -698,7 +698,7 @@ AC_DEFUN([CURL_SET_COMPILER_OPTIMIZE_OPTS], [ +@@ -699,7 +699,7 @@ AC_DEFUN([CURL_SET_COMPILER_OPTIMIZE_OPTS], [ tmp_options="" tmp_CFLAGS="$CFLAGS" tmp_CPPFLAGS="$CPPFLAGS" diff --git a/net/curl/pkg/PLIST b/net/curl/pkg/PLIST index c1cd5701c..fbe38b576 100644 --- a/net/curl/pkg/PLIST +++ b/net/curl/pkg/PLIST @@ -18,6 +18,7 @@ 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 @@ -378,6 +379,7 @@ lib/pkgconfig/libcurl.pc @man man/man3/CURLOPT_SUPPRESS_CONNECT_HEADERS.3 @man man/man3/CURLOPT_TCP_FASTOPEN.3 @man man/man3/CURLOPT_TCP_KEEPALIVE.3 +@man man/man3/CURLOPT_TCP_KEEPCNT.3 @man man/man3/CURLOPT_TCP_KEEPIDLE.3 @man man/man3/CURLOPT_TCP_KEEPINTVL.3 @man man/man3/CURLOPT_TCP_NODELAY.3