aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/utils/curl/patches
diff options
context:
space:
mode:
authorHans Dedecker <dedeckeh@gmail.com>2017-10-29 10:32:42 +0100
committerHans Dedecker <dedeckeh@gmail.com>2017-10-29 23:07:43 +0100
commitb00cf0e58e701821a1117afbad76718d898ea21d (patch)
treee6a6f480f1e2ca5f0fbaff6532d9257af1644a53 /package/network/utils/curl/patches
parentf6c01306cbef3cbbaef9aadce2c631d8bf5757fe (diff)
downloadupstream-b00cf0e58e701821a1117afbad76718d898ea21d.tar.gz
upstream-b00cf0e58e701821a1117afbad76718d898ea21d.tar.bz2
upstream-b00cf0e58e701821a1117afbad76718d898ea21d.zip
curl: bump to 7.56.1
Refresh patches Remove 320-curl-confopts.m4-fix-disable-threaded-resolver.patch as integrated upstream See https://curl.haxx.se/changes.html for the bugfixes in 7.56.0 and 7.56.1 Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
Diffstat (limited to 'package/network/utils/curl/patches')
-rw-r--r--package/network/utils/curl/patches/310-mbedtls-disable-runtime-version-check.patch4
-rw-r--r--package/network/utils/curl/patches/320-curl-confopts.m4-fix-disable-threaded-resolver.patch36
2 files changed, 2 insertions, 38 deletions
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 52b017c9bf..aabf274ac8 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
@@ -1,8 +1,8 @@
--- a/lib/vtls/mbedtls.c
+++ b/lib/vtls/mbedtls.c
-@@ -796,7 +796,7 @@ void Curl_mbedtls_session_free(void *ptr
+@@ -814,7 +814,7 @@ static void Curl_mbedtls_session_free(vo
- size_t Curl_mbedtls_version(char *buffer, size_t size)
+ static size_t Curl_mbedtls_version(char *buffer, size_t size)
{
- unsigned int version = mbedtls_version_get_number();
+ unsigned int version = MBEDTLS_VERSION_NUMBER;
diff --git a/package/network/utils/curl/patches/320-curl-confopts.m4-fix-disable-threaded-resolver.patch b/package/network/utils/curl/patches/320-curl-confopts.m4-fix-disable-threaded-resolver.patch
deleted file mode 100644
index b08d765308..0000000000
--- a/package/network/utils/curl/patches/320-curl-confopts.m4-fix-disable-threaded-resolver.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 3cb4bb6b5fb8a936cb69e2e9ea6a4e692122abb9 Mon Sep 17 00:00:00 2001
-From: Jakub Zakrzewski <slither.jz@gmail.com>
-Date: Tue, 15 Aug 2017 13:21:33 -0400
-Subject: [PATCH] curl-confopts.m4: fix --disable-threaded-resolver
-
-Closes https://github.com/curl/curl/issues/1784
----
- m4/curl-confopts.m4 | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/m4/curl-confopts.m4 b/m4/curl-confopts.m4
-index d77a884..6dcd0f1 100644
---- a/m4/curl-confopts.m4
-+++ b/m4/curl-confopts.m4
-@@ -37,14 +37,14 @@ AC_HELP_STRING([--enable-threaded-resolver],[Enable threaded resolver])
- AC_HELP_STRING([--disable-threaded-resolver],[Disable threaded resolver]),
- OPT_THRES=$enableval)
- case "$OPT_THRES" in
-- *)
-- dnl configure option not specified
-- want_thres="yes"
-- ;;
- no)
- dnl --disable-threaded-resolver option used
- want_thres="no"
- ;;
-+ *)
-+ dnl configure option not specified
-+ want_thres="yes"
-+ ;;
- esac
- AC_MSG_RESULT([$want_thres])
- ])
---
-1.9.1
-