From c97fdcff976ecb674eaf382204291da3f3b6119e Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Sun, 27 Oct 2019 01:21:36 -0700 Subject: [PATCH] curl: bump version --- package/network/utils/curl/Makefile | 5 +++-- .../utils/curl/patches/200-no_docs_tests.patch | 4 ++-- .../310-mbedtls-disable-runtime-version-check.patch | 11 ----------- 3 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 package/network/utils/curl/patches/310-mbedtls-disable-runtime-version-check.patch diff --git a/package/network/utils/curl/Makefile b/package/network/utils/curl/Makefile index 65ece7764..d4fcf1814 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.63.0 +PKG_VERSION:=7.66.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:=9600234c794bfb8a0d3f138e9294d60a20e7a5f10e35ece8cf518e2112d968c4 +PKG_HASH:=dbb48088193016d079b97c5c3efde8efa56ada2ebf336e8a97d04eb8e2ed98c1 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING @@ -91,6 +91,7 @@ define Package/libcurl DEPENDS += +LIBCURL_SSH2:libssh2 +LIBCURL_NGHTTP2:libnghttp2 +ca-bundle TITLE:=A client-side URL transfer library MENU:=1 + ABI_VERSION:=4 endef define Package/libcurl/config 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 1aa86a7e4..e52694e2c 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 -@@ -168,7 +168,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) +@@ -179,7 +179,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) bin_SCRIPTS = curl-config SUBDIRS = lib src @@ -9,7 +9,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libcurl.pc -@@ -279,8 +279,8 @@ cygwinbin: +@@ -290,8 +290,8 @@ cygwinbin: # We extend the standard install with a custom hook: install-data-hook: cd include && $(MAKE) install diff --git a/package/network/utils/curl/patches/310-mbedtls-disable-runtime-version-check.patch b/package/network/utils/curl/patches/310-mbedtls-disable-runtime-version-check.patch deleted file mode 100644 index 87b6492a9..000000000 --- a/package/network/utils/curl/patches/310-mbedtls-disable-runtime-version-check.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/lib/vtls/mbedtls.c -+++ b/lib/vtls/mbedtls.c -@@ -811,7 +811,7 @@ static void Curl_mbedtls_session_free(vo - - static size_t Curl_mbedtls_version(char *buffer, size_t size) - { -- unsigned int version = mbedtls_version_get_number(); -+ unsigned int version = MBEDTLS_VERSION_NUMBER; - return msnprintf(buffer, size, "mbedTLS/%u.%u.%u", version>>24, - (version>>16)&0xff, (version>>8)&0xff); - }