diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2016-05-25 22:38:32 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2016-05-25 22:38:32 +0200 |
| commit | 5b72eb817a71ddb886eea063c6833a47e9888b37 (patch) | |
| tree | 866c06afc623d863062c13e81e1d546dfd0ee996 | |
| parent | db551a0efa5305f5ce75fe8440ff52ed25473294 (diff) | |
curl: update to 7.49.0
| -rw-r--r-- | package/curl/Makefile | 6 | ||||
| -rw-r--r-- | package/curl/patches/patch-lib_vtls_openssl_c | 12 |
2 files changed, 3 insertions, 15 deletions
diff --git a/package/curl/Makefile b/package/curl/Makefile index c9a985d86..1ff6e5cc9 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= curl -PKG_VERSION:= 7.48.0 -PKG_RELEASE:= 2 -PKG_HASH:= d248f3f9288ae20b8a7e462cb1909a6e67ad5c585040bca64fa2a71d993f3b1b +PKG_VERSION:= 7.49.0 +PKG_RELEASE:= 1 +PKG_HASH:= 54b86804a4e4a703e58d069349e18a1314e50fce1f643e84b88a815f017189eb 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 7f76222e4..000000000 --- a/package/curl/patches/patch-lib_vtls_openssl_c +++ /dev/null @@ -1,12 +0,0 @@ ---- curl-7.48.0.orig/lib/vtls/openssl.c 2016-03-22 08:15:38.000000000 +0100 -+++ curl-7.48.0/lib/vtls/openssl.c 2016-04-10 10:45:18.637693023 +0200 -@@ -95,7 +95,8 @@ - - #if (OPENSSL_VERSION_NUMBER >= 0x10000000L) - #define HAVE_ERR_REMOVE_THREAD_STATE 1 --#if (OPENSSL_VERSION_NUMBER >= 0x10100004L) -+#if (OPENSSL_VERSION_NUMBER >= 0x10100004L) && \ -+ !defined(LIBRESSL_VERSION_NUMBER) - /* OpenSSL 1.1.0-pre4 removed the argument! */ - #define HAVE_ERR_REMOVE_THREAD_STATE_NOARG 1 - #endif |