From: Stan Grishin <stangri@melmac.ca>
Date: Thu, 15 Sep 2022 20:40:00 +0000 (+0000)
Subject: Revert "curl: update to 7.85.0"
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b814eec3b59beec0e5610c3f0eda4429ba23132c;p=feed%2Fpackages.git

Revert "curl: update to 7.85.0"

This reverts commit 312ab68be498f0d895d8d4dc5b2f0fc857e45eb9.

Signed-off-by: Stan Grishin <stangri@melmac.ca>
---

diff --git a/net/curl/Config.in b/net/curl/Config.in
index afb7f81519..5e7e554d7b 100644
--- a/net/curl/Config.in
+++ b/net/curl/Config.in
@@ -4,7 +4,7 @@ comment "SSL support"
 
 choice
 	prompt "Selected SSL library"
-	default LIBCURL_WOLFSSL
+	default LIBCURL_MBEDTLS
 
 	config LIBCURL_MBEDTLS
 		bool "mbed TLS"
diff --git a/net/curl/Makefile b/net/curl/Makefile
index 8459ece611..827af43d22 100644
--- a/net/curl/Makefile
+++ b/net/curl/Makefile
@@ -8,13 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=curl
-PKG_VERSION:=7.85.0
+PKG_VERSION:=7.83.1
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=https://github.com/curl/curl/releases/download/curl-$(PKG_VERSION:.=_)/ \
+PKG_SOURCE_URL:=https://dl.uxnr.de/mirror/curl/ \
+	https://curl.askapache.com/download/ \
 	https://curl.se/download/
-PKG_HASH:=88b54a6d4b9a48cb4d873c7056dcba997ddd5b7be5a2d537a4acb55c20b04be6
+PKG_HASH:=2cb9c2356e7263a1272fd1435ef7cdebf2cd21400ec287b068396deb705c22c4
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=COPYING
diff --git a/net/curl/patches/100-wolfssl.patch b/net/curl/patches/100-wolfssl.patch
new file mode 100644
index 0000000000..d395a07c47
--- /dev/null
+++ b/net/curl/patches/100-wolfssl.patch
@@ -0,0 +1,10 @@
+--- a/m4/curl-wolfssl.m4
++++ b/m4/curl-wolfssl.m4
+@@ -93,6 +93,7 @@ if test "x$OPT_WOLFSSL" != xno; then
+    They are set up properly later if it is detected.  */
+ #undef SIZEOF_LONG
+ #undef SIZEOF_LONG_LONG
++#include <wolfssl/options.h>
+ #include <wolfssl/ssl.h>
+ 	]],[[
+ 	  return wolfSSL_Init();
diff --git a/net/curl/patches/200-no_docs_tests.patch b/net/curl/patches/200-no_docs_tests.patch
index 863c82801d..463aeac0b0 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
-@@ -158,7 +158,7 @@ CLEANFILES = $(VC10_LIBVCXPROJ) $(VC10_S
+@@ -155,7 +155,7 @@ CLEANFILES = $(VC10_LIBVCXPROJ) $(VC10_S
  bin_SCRIPTS = curl-config
  
  SUBDIRS = lib src
@@ -9,7 +9,7 @@
  
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = libcurl.pc
-@@ -272,8 +272,6 @@ cygwinbin:
+@@ -269,8 +269,6 @@ cygwinbin:
  # We extend the standard install with a custom hook:
  install-data-hook:
  	(cd include && $(MAKE) install)