diff options
| -rw-r--r-- | package/curl/Makefile | 4 | ||||
| -rw-r--r-- | package/curl/patches/patch-lib_vtls_openssl_c | 52 | ||||
| -rw-r--r-- | package/curl/patches/patch-src_tool_operate_c | 13 |
3 files changed, 2 insertions, 67 deletions
diff --git a/package/curl/Makefile b/package/curl/Makefile index 013600ccd..a537893ab 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= curl -PKG_VERSION:= 7.59.0 +PKG_VERSION:= 7.60.0 PKG_RELEASE:= 1 -PKG_HASH:= e44eaabdf916407585bf5c7939ff1161e6242b6b015d3f2f5b758b2a330461fc +PKG_HASH:= 8736ff8ded89ddf7e926eec7b16f82597d029fc1469f3a551f1fafaac164e6a0 PKG_DESCR:= client-side url transfer tool PKG_SECTION:= net/http PKG_DEPENDS:= libcurl diff --git a/package/curl/patches/patch-lib_vtls_openssl_c b/package/curl/patches/patch-lib_vtls_openssl_c deleted file mode 100644 index 1182df47d..000000000 --- a/package/curl/patches/patch-lib_vtls_openssl_c +++ /dev/null @@ -1,52 +0,0 @@ ---- curl-7.59.0.orig/lib/vtls/openssl.c 2018-03-12 08:18:59.000000000 +0100 -+++ curl-7.59.0/lib/vtls/openssl.c 2018-04-10 03:38:32.766247842 +0100 -@@ -104,7 +104,8 @@ - #endif - - #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && /* OpenSSL 1.1.0+ */ \ -- !defined(LIBRESSL_VERSION_NUMBER) -+ !(defined(LIBRESSL_VERSION_NUMBER) && \ -+ LIBRESSL_VERSION_NUMBER < 0x20700000L) - #define SSLEAY_VERSION_NUMBER OPENSSL_VERSION_NUMBER - #define HAVE_X509_GET0_EXTENSIONS 1 /* added in 1.1.0 -pre1 */ - #define HAVE_OPAQUE_EVP_PKEY 1 /* since 1.1.0 -pre3 */ -@@ -128,7 +129,8 @@ static unsigned long OpenSSL_version_num - #endif - - #if (OPENSSL_VERSION_NUMBER >= 0x1000200fL) && /* 1.0.2 or later */ \ -- !defined(LIBRESSL_VERSION_NUMBER) -+ !(defined(LIBRESSL_VERSION_NUMBER) && \ -+ LIBRESSL_VERSION_NUMBER < 0x20700000L) - #define HAVE_X509_GET0_SIGNATURE 1 - #endif - -@@ -147,7 +149,7 @@ static unsigned long OpenSSL_version_num - * Whether SSL_CTX_set_keylog_callback is available. - * OpenSSL: supported since 1.1.1 https://github.com/openssl/openssl/pull/2287 - * BoringSSL: supported since d28f59c27bac (committed 2015-11-19) -- * LibreSSL: unsupported in at least 2.5.1 (explicitly check for it since it -+ * LibreSSL: unsupported in at least 2.7.2 (explicitly check for it since it - * lies and pretends to be OpenSSL 2.0.0). - */ - #if (OPENSSL_VERSION_NUMBER >= 0x10101000L && \ -@@ -259,7 +261,9 @@ static void tap_ssl_key(const SSL *ssl, - if(!session || !keylog_file_fp) - return; - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ -+ !(defined(LIBRESSL_VERSION_NUMBER) && \ -+ LIBRESSL_VERSION_NUMBER < 0x20700000L) - /* ssl->s3 is not checked in openssl 1.1.0-pre6, but let's assume that - * we have a valid SSL context if we have a non-NULL session. */ - SSL_get_client_random(ssl, client_random, SSL3_RANDOM_SIZE); -@@ -2082,8 +2086,7 @@ static CURLcode ossl_connect_step1(struc - case CURL_SSLVERSION_TLSv1_2: - case CURL_SSLVERSION_TLSv1_3: - /* it will be handled later with the context options */ --#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ -- !defined(LIBRESSL_VERSION_NUMBER) -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) - req_method = TLS_client_method(); - #else - req_method = SSLv23_client_method(); diff --git a/package/curl/patches/patch-src_tool_operate_c b/package/curl/patches/patch-src_tool_operate_c deleted file mode 100644 index d26db3561..000000000 --- a/package/curl/patches/patch-src_tool_operate_c +++ /dev/null @@ -1,13 +0,0 @@ ---- curl-7.59.0.orig/src/tool_operate.c 2018-03-12 08:18:59.000000000 +0100 -+++ curl-7.59.0/src/tool_operate.c 2018-04-04 21:25:59.972439422 +0100 -@@ -1947,8 +1947,10 @@ CURLcode operate(struct GlobalConfig *co - if(res == PARAM_HELP_REQUESTED) - tool_help(); - /* Check if we were asked for the manual */ -+#ifdef USE_MANUAL - else if(res == PARAM_MANUAL_REQUESTED) - hugehelp(); -+#endif - /* Check if we were asked for the version information */ - else if(res == PARAM_VERSION_INFO_REQUESTED) - tool_version_info(); |