diff --git a/build/curl/build.sh b/build/curl/build.sh index 23bb7a8fb1..2332452086 100755 --- a/build/curl/build.sh +++ b/build/curl/build.sh @@ -18,7 +18,7 @@ . ../../lib/build.sh PROG=curl -VER=8.11.0 +VER=8.11.1 PKG=web/curl SUMMARY="Command line tool for transferring data with URL syntax" DESC="Curl is a command line tool for transferring data with URL syntax, " diff --git a/build/curl/patches/ldap.patch b/build/curl/patches/ldap.patch deleted file mode 100644 index fc0c36fdee..0000000000 --- a/build/curl/patches/ldap.patch +++ /dev/null @@ -1,28 +0,0 @@ - -OmniOS does not have an `ldap.pc` file for pkg-config to find so don't add it -to the private requirements list in `libcurl.pc` - -Reverts upstream https://github.com/curl/curl/pull/15163 - -diff -wpruN --no-dereference '--exclude=*.orig' a~/CMakeLists.txt a/CMakeLists.txt ---- a~/CMakeLists.txt 1970-01-01 00:00:00 -+++ a/CMakeLists.txt 1970-01-01 00:00:00 -@@ -1042,7 +1042,6 @@ if(NOT CURL_DISABLE_LDAP) - list(APPEND CMAKE_REQUIRED_DEFINITIONS "-DLDAP_DEPRECATED=1") - list(APPEND CMAKE_REQUIRED_LIBRARIES ${LDAP_LIBRARY}) - set(CURL_LIBS "${LDAP_LIBRARY};${CURL_LIBS}") -- set(LIBCURL_PC_REQUIRES_PRIVATE "ldap;${LIBCURL_PC_REQUIRES_PRIVATE}") - if(HAVE_LIBLBER) - list(APPEND CMAKE_REQUIRED_LIBRARIES ${LDAP_LBER_LIBRARY}) - set(CURL_LIBS "${LDAP_LBER_LIBRARY};${CURL_LIBS}") -diff -wpruN --no-dereference '--exclude=*.orig' a~/acinclude.m4 a/acinclude.m4 ---- a~/acinclude.m4 1970-01-01 00:00:00 -+++ a/acinclude.m4 1970-01-01 00:00:00 -@@ -565,7 +565,6 @@ AC_DEFUN([CURL_CHECK_LIBS_LDAP], [ - else - LIBS="$curl_cv_ldap_LIBS $curl_cv_save_LIBS" - fi -- LIBCURL_PC_REQUIRES_PRIVATE="ldap $LIBCURL_PC_REQUIRES_PRIVATE" - AC_MSG_RESULT([$curl_cv_ldap_LIBS]) - ;; - esac diff --git a/build/curl/patches/series b/build/curl/patches/series index 37cb3c13cc..6726658d8d 100644 --- a/build/curl/patches/series +++ b/build/curl/patches/series @@ -1,2 +1 @@ tests.patch -ldap.patch diff --git a/build/curl/testsuite.log b/build/curl/testsuite.log index a288d637a6..64f090e42e 100644 --- a/build/curl/testsuite.log +++ b/build/curl/testsuite.log @@ -1,3 +1,3 @@ -TESTDONE: 1739 tests were considered during 629 seconds. -TESTDONE: 1430 tests out of 1431 reported OK: 99% +TESTDONE: 1745 tests were considered during 576 seconds. +TESTDONE: 1437 tests out of 1438 reported OK: 99% TESTFAIL: These test cases failed: 1004 diff --git a/doc/packages.md b/doc/packages.md index b48502ba1d..d57d967709 100644 --- a/doc/packages.md +++ b/doc/packages.md @@ -117,7 +117,7 @@ | text/gnu-sed | 4.9 | https://ftp.gnu.org/gnu/sed/ https://savannah.gnu.org/news/?group=sed | text/groff | 1.23.0 | https://ftp.gnu.org/gnu/groff/ | text/less | 668 | http://www.greenwoodsoftware.com/less/download.html -| web/curl | 8.11.0 | https://curl.haxx.se/download.html +| web/curl | 8.11.1 | https://curl.haxx.se/download.html | web/wget | 1.25.0 | https://ftp.gnu.org/gnu/wget/ | web/wget2 | 2.2.0 | https://ftp.gnu.org/gnu/wget/ | library/glib2 | 2.82.2 | https://download.gnome.org/sources/glib/cache.json https://download.gnome.org/sources/glib/ | Odd minor versions are dev/unstable