From 49fc257b45c68ddc8496a9087fe57cc371bd8f86 Mon Sep 17 00:00:00 2001
From: krant <aleksey.vasilenko@gmail.com>
Date: Sun, 2 Jun 2024 13:16:24 +0300
Subject: [PATCH] curl: update to 8.8.0

- Switch source to .xz according to CONTRIBUTING.md
- Switch project URL to  HTTPS
- Drop upstreamed patch
- Refresh remaining patch
- Adopt the package

Signed-off-by: krant <aleksey.vasilenko@gmail.com>
---
 net/curl/Makefile                             | 12 ++---
 ...dtls_ssl_setup-after-RNG-callback-is.patch | 45 -------------------
 net/curl/patches/200-no_docs_tests.patch      |  4 +-
 3 files changed, 8 insertions(+), 53 deletions(-)
 delete mode 100644 net/curl/patches/100-mbedtls-call-mbedtls_ssl_setup-after-RNG-callback-is.patch

diff --git a/net/curl/Makefile b/net/curl/Makefile
index 5174e6c44e..d62712a2c3 100644
--- a/net/curl/Makefile
+++ b/net/curl/Makefile
@@ -9,15 +9,15 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/nls.mk
 
 PKG_NAME:=curl
-PKG_VERSION:=8.7.1
-PKG_RELEASE:=2
+PKG_VERSION:=8.8.0
+PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/curl/curl/releases/download/curl-$(subst .,_,$(PKG_VERSION))/ \
 	https://dl.uxnr.de/mirror/curl/ \
 	https://curl.askapache.com/download/ \
 	https://curl.se/download/
-PKG_HASH:=05bbd2b698e9cfbab477c33aa5e99b4975501835a41b7ca6ca71de03d8849e76
+PKG_HASH:=0f58bb95fc330c8a46eeb3df5701b0d90c9d9bfcc42bd1cd08791d12551d4400
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=COPYING
@@ -80,8 +80,8 @@ include $(INCLUDE_DIR)/package.mk
 define Package/curl/Default
   SECTION:=net
   CATEGORY:=Network
-  URL:=http://curl.se/
-  MAINTAINER:=
+  URL:=https://curl.se/
+  MAINTAINER:=Aleksey Vasilenko <aleksey.vasilenko@gmail.com>
 endef
 
 define Package/curl
diff --git a/net/curl/patches/100-mbedtls-call-mbedtls_ssl_setup-after-RNG-callback-is.patch b/net/curl/patches/100-mbedtls-call-mbedtls_ssl_setup-after-RNG-callback-is.patch
deleted file mode 100644
index 5f8dd940f3..0000000000
--- a/net/curl/patches/100-mbedtls-call-mbedtls_ssl_setup-after-RNG-callback-is.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Kailun Qin <kailun.qin@intel.com>
-Date: Mon, 8 Apr 2024 05:13:56 -0400
-Subject: [PATCH] mbedtls: call mbedtls_ssl_setup() after RNG callback is set
-
-Since mbedTLS v3.6.0, the RNG check added in ssl_conf_check() will fail
-if no RNG is provided when calling mbedtls_ssl_setup().
-
-Therefore, mbedtls_ssl_conf_rng() needs to be called before the SSL
-context is passed to mbedtls_ssl_setup().
-
-Ref: https://github.com/Mbed-TLS/mbedtls/commit/b422cab052b51ec84758638d6783d6ba4fc60613
-
-Signed-off-by: Kailun Qin <kailun.qin@intel.com>
-Closes #13314
----
-
---- a/lib/vtls/mbedtls.c
-+++ b/lib/vtls/mbedtls.c
-@@ -602,10 +602,6 @@ mbed_connect_step1(struct Curl_cfilter *
-   }
- 
-   mbedtls_ssl_init(&backend->ssl);
--  if(mbedtls_ssl_setup(&backend->ssl, &backend->config)) {
--    failf(data, "mbedTLS: ssl_init failed");
--    return CURLE_SSL_CONNECT_ERROR;
--  }
- 
-   /* new profile with RSA min key len = 1024 ... */
-   mbedtls_ssl_conf_cert_profile(&backend->config,
-@@ -639,6 +635,15 @@ mbed_connect_step1(struct Curl_cfilter *
- 
-   mbedtls_ssl_conf_rng(&backend->config, mbedtls_ctr_drbg_random,
-                        &backend->ctr_drbg);
-+
-+  ret = mbedtls_ssl_setup(&backend->ssl, &backend->config);
-+  if(ret) {
-+    mbedtls_strerror(ret, errorbuf, sizeof(errorbuf));
-+    failf(data, "ssl_setup failed - mbedTLS: (-0x%04X) %s",
-+          -ret, errorbuf);
-+    return CURLE_SSL_CONNECT_ERROR;
-+  }
-+
-   mbedtls_ssl_set_bio(&backend->ssl, cf,
-                       mbedtls_bio_cf_write,
-                       mbedtls_bio_cf_read,
diff --git a/net/curl/patches/200-no_docs_tests.patch b/net/curl/patches/200-no_docs_tests.patch
index 9284b67e5f..58a2a832e5 100644
--- a/net/curl/patches/200-no_docs_tests.patch
+++ b/net/curl/patches/200-no_docs_tests.patch
@@ -1,6 +1,6 @@
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -135,7 +135,7 @@ CLEANFILES = $(VC14_LIBVCXPROJ) $(VC14_S
+@@ -87,7 +87,7 @@ CLEANFILES = $(VC14_LIBVCXPROJ) $(VC14_S
  bin_SCRIPTS = curl-config
  
  SUBDIRS = lib docs src scripts
@@ -9,7 +9,7 @@
  
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = libcurl.pc
-@@ -244,12 +244,9 @@ cygwinbin:
+@@ -196,12 +196,9 @@ cygwinbin:
  if BUILD_DOCS
  install-data-hook:
  	(cd include && $(MAKE) install)
-- 
2.30.2