From 1f5b7fb783a7dbf85fee610bea0eb4f43a18ae16 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 11 Feb 2024 15:54:46 +0100 Subject: [PATCH] package/libcurl: bump version to 8.6.0 Changelog: https://curl.se/changes.html#8_6_0 Removed patch which was included in upstream release. Updated license hash due to copyright year bump: https://github.com/curl/curl/commit/57cc70e559aa065426021e22e2af8166af6084f6 Added configure options for optional libpsl support due to upstream commit which throws an error during configure when libpsl is missing and --without-libpsl was not used: https://github.com/curl/curl/commit/2998874bb61ac6ef3b72d6a61467cd2aaf6e53ea Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 5cee6b6be6524e443012d130e09b0e6983b0ff90) Signed-off-by: Peter Korsgaard --- ...nutls-fix-build-with-disable-verbose.patch | 60 ------------------- package/libcurl/libcurl.hash | 6 +- package/libcurl/libcurl.mk | 9 ++- 3 files changed, 11 insertions(+), 64 deletions(-) delete mode 100644 package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch diff --git a/package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch b/package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch deleted file mode 100644 index 25e389c972..0000000000 --- a/package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 0d9f9c5ea8c15c70eb420242b60179d9083c70b7 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Mon, 11 Dec 2023 20:45:01 +0200 -Subject: [PATCH] gnutls: fix build with --disable-verbose - -infof() parameters must be defined event with --disable-verbose since -commit dac293cfb702 ("lib: apache style infof and trace -macros/functions"). - -Move also 'ptr' definition under !CURL_DISABLE_VERBOSE_STRINGS. - -Fixes the following build failure: - -In file included from ../lib/sendf.h:29, - from vtls/gtls.c:44: -vtls/gtls.c: In function 'Curl_gtls_verifyserver': -vtls/gtls.c:841:34: error: 'version' undeclared (first use in this function); did you mean 'session'? - 841 | gnutls_protocol_get_name(version), ptr); - | ^~~~~~~ - -Signed-off-by: Baruch Siach -Upstream: https://github.com/curl/curl/commit/af520ac9fec7d88e942f05fdcd90704adb9fa566 ---- - lib/vtls/gtls.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c -index f42b6d6691de..b95c5be3c5e5 100644 ---- a/lib/vtls/gtls.c -+++ b/lib/vtls/gtls.c -@@ -818,16 +818,17 @@ Curl_gtls_verifyserver(struct Curl_easy *data, - char certname[65] = ""; /* limited to 64 chars by ASN.1 */ - size_t size; - time_t certclock; -- const char *ptr; - int rc; - CURLcode result = CURLE_OK; - #ifndef CURL_DISABLE_VERBOSE_STRINGS -+ const char *ptr; - unsigned int algo; - unsigned int bits; - gnutls_protocol_t version = gnutls_protocol_get_version(session); - #endif - long * const certverifyresult = &ssl_config->certverifyresult; - -+#ifndef CURL_DISABLE_VERBOSE_STRINGS - /* the name of the cipher suite used, e.g. ECDHE_RSA_AES_256_GCM_SHA384. */ - ptr = gnutls_cipher_suite_get_name(gnutls_kx_get(session), - gnutls_cipher_get(session), -@@ -835,6 +836,7 @@ Curl_gtls_verifyserver(struct Curl_easy *data, - - infof(data, "SSL connection using %s / %s", - gnutls_protocol_get_name(version), ptr); -+#endif - - /* This function will return the peer's raw certificate (chain) as sent by - the peer. These certificates are in raw format (DER encoded for --- -2.43.0 - diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index d5c20d29d3..1f3dce0fd5 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-8.5.0.tar.xz.asc +# https://curl.se/download/curl-8.6.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 42ab8db9e20d8290a3b633e7fbb3cec15db34df65fd1015ef8ac1e4723750eeb curl-8.5.0.tar.xz -sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING +sha256 3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15 curl-8.6.0.tar.xz +sha256 adb1fc06547fd136244179809f7b7c2d2ae6c4534f160aa513af9b6a12866a32 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 0bac8656b8..712f1ecfb1 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.5.0 +LIBCURL_VERSION = 8.6.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ @@ -112,6 +112,13 @@ else LIBCURL_CONF_OPTS += --without-libidn2 endif +ifeq ($(BR2_PACKAGE_LIBPSL),y) +LIBCURL_DEPENDENCIES += libpsl +LIBCURL_CONF_OPTS += --with-libpsl +else +LIBCURL_CONF_OPTS += --without-libpsl +endif + # Configure curl to support libssh2 ifeq ($(BR2_PACKAGE_LIBSSH2),y) LIBCURL_DEPENDENCIES += libssh2