aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/utils
diff options
context:
space:
mode:
authorHans Dedecker <dedeckeh@gmail.com>2018-05-16 14:09:48 +0200
committerHans Dedecker <dedeckeh@gmail.com>2018-05-16 14:36:22 +0200
commit0ed9281fda00322760f0cf95231b854cb273d802 (patch)
treeff011256b5eace415b0584ed422a6cbde77dc1aa /package/network/utils
parentafbb3d20f221aed7f927915c57f23b34345e152e (diff)
downloadupstream-0ed9281fda00322760f0cf95231b854cb273d802.tar.gz
upstream-0ed9281fda00322760f0cf95231b854cb273d802.tar.bz2
upstream-0ed9281fda00322760f0cf95231b854cb273d802.zip
curl: bump to 7.60.0
Refresh patches; remove 320-mbedtls_dont_use_deprecated_sha256_function patch as upstream fixed For changes in version 2.60 see https://curl.haxx.se/changes.html#7_60_0 Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
Diffstat (limited to 'package/network/utils')
-rw-r--r--package/network/utils/curl/Makefile6
-rw-r--r--package/network/utils/curl/patches/310-mbedtls-disable-runtime-version-check.patch2
-rw-r--r--package/network/utils/curl/patches/320-mbedtls_dont_use_deprecated_sha256_function.patch11
3 files changed, 4 insertions, 15 deletions
diff --git a/package/network/utils/curl/Makefile b/package/network/utils/curl/Makefile
index 307ca99957..d40b19803a 100644
--- a/package/network/utils/curl/Makefile
+++ b/package/network/utils/curl/Makefile
@@ -8,15 +8,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=curl
-PKG_VERSION:=7.59.0
-PKG_RELEASE:=2
+PKG_VERSION:=7.60.0
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://dl.uxnr.de/mirror/curl/ \
http://curl.mirror.anstey.ca/ \
http://curl.askapache.com/download/ \
https://curl.haxx.se/download/
-PKG_HASH:=e44eaabdf916407585bf5c7939ff1161e6242b6b015d3f2f5b758b2a330461fc
+PKG_HASH:=8736ff8ded89ddf7e926eec7b16f82597d029fc1469f3a551f1fafaac164e6a0
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=COPYING
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
index aabf274ac8..4d34426a36 100644
--- 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
@@ -6,6 +6,6 @@
{
- unsigned int version = mbedtls_version_get_number();
+ unsigned int version = MBEDTLS_VERSION_NUMBER;
- return snprintf(buffer, size, "mbedTLS/%d.%d.%d", version>>24,
+ return snprintf(buffer, size, "mbedTLS/%u.%u.%u", version>>24,
(version>>16)&0xff, (version>>8)&0xff);
}
diff --git a/package/network/utils/curl/patches/320-mbedtls_dont_use_deprecated_sha256_function.patch b/package/network/utils/curl/patches/320-mbedtls_dont_use_deprecated_sha256_function.patch
deleted file mode 100644
index 5c4c18c2a4..0000000000
--- a/package/network/utils/curl/patches/320-mbedtls_dont_use_deprecated_sha256_function.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/vtls/mbedtls.c
-+++ b/lib/vtls/mbedtls.c
-@@ -1029,7 +1029,7 @@ static void Curl_mbedtls_sha256sum(const
- size_t sha256len UNUSED_PARAM)
- {
- (void)sha256len;
-- mbedtls_sha256(input, inputlen, sha256sum, 0);
-+ mbedtls_sha256_ret(input, inputlen, sha256sum, 0);
- }
-
- static void *Curl_mbedtls_get_internals(struct ssl_connect_data *connssl,