From: Josef Schlehofer <pepe.schlehofer@gmail.com>
Date: Sat, 2 May 2020 13:03:47 +0000 (+0200)
Subject: curl: update to version 7.70.0
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0e522d5f4a31182312bd115c26c7edb654769724;p=oweals%2Fopenwrt.git

curl: update to version 7.70.0

- Release notes:
https://curl.haxx.se/changes.html#7_70_0

- Refreshed patch

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
---

diff --git a/package/network/utils/curl/Makefile b/package/network/utils/curl/Makefile
index c483ec1186..f2a7406164 100644
--- a/package/network/utils/curl/Makefile
+++ b/package/network/utils/curl/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=curl
-PKG_VERSION:=7.69.1
+PKG_VERSION:=7.70.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
@@ -16,7 +16,7 @@ PKG_SOURCE_URL:=https://dl.uxnr.de/mirror/curl/ \
 	https://curl.mirror.anstey.ca/ \
 	https://curl.askapache.com/download/ \
 	https://curl.haxx.se/download/
-PKG_HASH:=03c7d5e6697f7b7e40ada1b2256e565a555657398e6c1fcfa4cb251ccd819d4f
+PKG_HASH:=032f43f2674008c761af19bf536374128c16241fb234699a55f9fb603fcfbae7
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=COPYING
diff --git a/package/network/utils/curl/patches/200-no_docs_tests.patch b/package/network/utils/curl/patches/200-no_docs_tests.patch
index e52694e2c9..53f8c6c3f6 100644
--- a/package/network/utils/curl/patches/200-no_docs_tests.patch
+++ b/package/network/utils/curl/patches/200-no_docs_tests.patch
@@ -1,6 +1,6 @@
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -179,7 +179,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP)
+@@ -189,7 +189,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP)
  bin_SCRIPTS = curl-config
  
  SUBDIRS = lib src
@@ -9,14 +9,14 @@
  
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = libcurl.pc
-@@ -290,8 +290,8 @@ cygwinbin:
+@@ -300,8 +300,8 @@ cygwinbin:
  # We extend the standard install with a custom hook:
  install-data-hook:
- 	cd include && $(MAKE) install
--	cd docs && $(MAKE) install
--	cd docs/libcurl && $(MAKE) install
-+	#cd docs && $(MAKE) install
-+	#cd docs/libcurl && $(MAKE) install
+	(cd include && $(MAKE) install)
+-	(cd docs && $(MAKE) install)
+-	(cd docs/libcurl && $(MAKE) install)
++	#(cd docs && $(MAKE) install)
++	#(cd docs/libcurl && $(MAKE) install)
  
  # We extend the standard uninstall with a custom hook:
  uninstall-hook: