From 0b19b9c42333fdafbec51a50c31b7e0e1bc654e7 Mon Sep 17 00:00:00 2001
From: Florian Schilling <flosch.devel@gmail.com>
Date: Mon, 24 Aug 2020 19:33:28 +0200
Subject: [PATCH] curl: bump version to 7.72.0 Changelog:
 https://curl.haxx.se/changes.html#7_72_0

---
 CHANGELOG                                               | 2 +-
 make/curl/Config.in                                     | 2 +-
 make/curl/curl.mk                                       | 4 ++--
 make/curl/patches/100-makefile_no_docs.patch            | 4 ++--
 make/curl/patches/101-cross_compile_writable_argv.patch | 2 +-
 make/curl/patches/102-binary_static.patch               | 2 +-
 make/curl/patches/110-gnu_source__reentrant.patch       | 2 +-
 make/curl/patches/130-CPPFLAGS_as_CFLAGS.patch          | 4 ++--
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ed64791f53..1f8cd2eaed 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -102,7 +102,7 @@ Latest changes:
     * CCID 1.4.18
     * cifs-utils 6.6
     * cryptsetup 1.7.0
-    * curl 7.71.1
+    * curl 7.72.0
     * davfs2 1.5.2
     * dbus 1.8.20
     * dnsmasq 2.81
diff --git a/make/curl/Config.in b/make/curl/Config.in
index fe3f4cd303..1d2836785b 100644
--- a/make/curl/Config.in
+++ b/make/curl/Config.in
@@ -1,5 +1,5 @@
 config FREETZ_PACKAGE_CURL
-	bool "Curl 7.71.1 (binary only)"
+	bool "Curl 7.72.0 (binary only)"
 	default n
 	select FREETZ_LIB_libcurl if ! FREETZ_PACKAGE_CURL_STATIC
 	help
diff --git a/make/curl/curl.mk b/make/curl/curl.mk
index a175d8ecf1..e4c90d7138 100644
--- a/make/curl/curl.mk
+++ b/make/curl/curl.mk
@@ -1,7 +1,7 @@
-$(call PKG_INIT_BIN, 7.71.1)
+$(call PKG_INIT_BIN, 7.72.0)
 $(PKG)_LIB_VERSION:=4.6.0
 $(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.xz
-$(PKG)_SOURCE_SHA256:=40f83eda27cdbeb25cd4da48cefb639af1b9395d6026d2da1825bf059239658c
+$(PKG)_SOURCE_SHA256:=0ded0808c4d85f2ee0db86980ae610cc9d165e9ca9da466196cc73c346513713
 $(PKG)_SITE:=http://curl.haxx.se/download
 
 $(PKG)_BINARY:=$($(PKG)_DIR)/src$(if $(FREETZ_PACKAGE_CURL_STATIC),,/.libs)/curl
diff --git a/make/curl/patches/100-makefile_no_docs.patch b/make/curl/patches/100-makefile_no_docs.patch
index a5af30ce7f..cdd74064f8 100644
--- a/make/curl/patches/100-makefile_no_docs.patch
+++ b/make/curl/patches/100-makefile_no_docs.patch
@@ -30,7 +30,7 @@
  	@echo "generating a fresh ca-bundle.crt"
 --- Makefile.in
 +++ Makefile.in
-@@ -691,7 +691,7 @@
+@@ -692,7 +692,7 @@
  
  bin_SCRIPTS = curl-config
  SUBDIRS = lib src
@@ -39,7 +39,7 @@
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = libcurl.pc
  LIB_VAUTH_CFILES = vauth/cleartext.c vauth/cram.c vauth/digest.c             \
-@@ -1512,14 +1512,14 @@
+@@ -1516,14 +1516,14 @@
  # We extend the standard install with a custom hook:
  install-data-hook:
  	(cd include && $(MAKE) install)
diff --git a/make/curl/patches/101-cross_compile_writable_argv.patch b/make/curl/patches/101-cross_compile_writable_argv.patch
index 71a8d36dc7..a0c6ebdbed 100644
--- a/make/curl/patches/101-cross_compile_writable_argv.patch
+++ b/make/curl/patches/101-cross_compile_writable_argv.patch
@@ -1,6 +1,6 @@
 --- configure
 +++ configure
-@@ -21902,7 +21902,9 @@
+@@ -23101,7 +23101,9 @@
     LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old
     export LD_LIBRARY_PATH
     if test "$cross_compiling" = yes; then :
diff --git a/make/curl/patches/102-binary_static.patch b/make/curl/patches/102-binary_static.patch
index 39eca80426..1d1be53e90 100644
--- a/make/curl/patches/102-binary_static.patch
+++ b/make/curl/patches/102-binary_static.patch
@@ -1,6 +1,6 @@
 --- src/Makefile.in
 +++ src/Makefile.in
-@@ -253,7 +253,7 @@
+@@ -256,7 +256,7 @@
  @USE_EXPLICIT_LIB_DEPS_TRUE@	$(top_builddir)/lib/libcurl.la
  curl_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
diff --git a/make/curl/patches/110-gnu_source__reentrant.patch b/make/curl/patches/110-gnu_source__reentrant.patch
index 2e7a13d33c..ec256c8822 100644
--- a/make/curl/patches/110-gnu_source__reentrant.patch
+++ b/make/curl/patches/110-gnu_source__reentrant.patch
@@ -1,6 +1,6 @@
 --- configure
 +++ configure
-@@ -3034,6 +3034,24 @@
+@@ -3041,6 +3041,24 @@
  ## Main body of script. ##
  ## -------------------- ##
  
diff --git a/make/curl/patches/130-CPPFLAGS_as_CFLAGS.patch b/make/curl/patches/130-CPPFLAGS_as_CFLAGS.patch
index 3d44711443..b330f37fce 100644
--- a/make/curl/patches/130-CPPFLAGS_as_CFLAGS.patch
+++ b/make/curl/patches/130-CPPFLAGS_as_CFLAGS.patch
@@ -1,6 +1,6 @@
 --- configure
 +++ configure
-@@ -3812,13 +3812,16 @@
+@@ -3819,13 +3819,16 @@
    for xc_word in $CFLAGS; do
      case "$xc_word" in
        -D*)
@@ -20,7 +20,7 @@
          ;;
        -rpath*)
          xc_bad_var_cflags=yes
-@@ -43727,13 +43730,16 @@
+@@ -44938,13 +44941,16 @@
    for xc_word in $CFLAGS; do
      case "$xc_word" in
        -D*)