From a2b15e6c1d84bda852ad4309b1ce3d5939898e00 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 17 Apr 2016 12:51:19 +0000 Subject: [PATCH] curl: upstep to latest version 7.48.0 Signed-off-by: Dirk Feytons Signed-off-by: Hauke Mehrtens SVN-Revision: 49182 --- package/network/utils/curl/Makefile | 6 +++--- package/network/utils/curl/patches/200-no_docs_tests.patch | 4 ++-- .../utils/curl/patches/300-fix-disable-crypto-auth.patch | 2 +- .../310-polarssl-disable-runtime-version-check.patch | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/network/utils/curl/Makefile b/package/network/utils/curl/Makefile index bc85da3a0a..eada1aa596 100644 --- a/package/network/utils/curl/Makefile +++ b/package/network/utils/curl/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2015 OpenWrt.org +# Copyright (C) 2007-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=curl -PKG_VERSION:=7.47.0 +PKG_VERSION:=7.48.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -18,7 +18,7 @@ PKG_SOURCE_URL:=http://curl.haxx.se/download/ \ ftp://ftp.planetmirror.com/pub/curl/ \ http://www.mirrormonster.com/curl/download/ \ http://curl.mirrors.cyberservers.net/download/ -PKG_MD5SUM:=85c58a00412476993050cb242a3f365d +PKG_MD5SUM:=d42e0fc34a5cace5739631cc040974fe PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING 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 5db39258d0..4ac5badf60 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 -@@ -141,7 +141,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) +@@ -150,7 +150,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) bin_SCRIPTS = curl-config SUBDIRS = lib src include scripts @@ -11,7 +11,7 @@ pkgconfig_DATA = libcurl.pc --- a/Makefile.in +++ b/Makefile.in -@@ -601,7 +601,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) +@@ -611,7 +611,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) bin_SCRIPTS = curl-config SUBDIRS = lib src include scripts diff --git a/package/network/utils/curl/patches/300-fix-disable-crypto-auth.patch b/package/network/utils/curl/patches/300-fix-disable-crypto-auth.patch index abec7ad912..5c0a37e760 100644 --- a/package/network/utils/curl/patches/300-fix-disable-crypto-auth.patch +++ b/package/network/utils/curl/patches/300-fix-disable-crypto-auth.patch @@ -1,6 +1,6 @@ --- a/lib/curl_ntlm_msgs.c +++ b/lib/curl_ntlm_msgs.c -@@ -569,7 +569,7 @@ CURLcode Curl_sasl_create_ntlm_type3_mes +@@ -573,7 +573,7 @@ CURLcode Curl_sasl_create_ntlm_type3_mes else #endif diff --git a/package/network/utils/curl/patches/310-polarssl-disable-runtime-version-check.patch b/package/network/utils/curl/patches/310-polarssl-disable-runtime-version-check.patch index 6f9cf2e998..7f7937b950 100644 --- a/package/network/utils/curl/patches/310-polarssl-disable-runtime-version-check.patch +++ b/package/network/utils/curl/patches/310-polarssl-disable-runtime-version-check.patch @@ -11,7 +11,7 @@ version>>24, (version>>16)&0xff, (version>>8)&0xff); --- a/lib/vtls/mbedtls.c +++ b/lib/vtls/mbedtls.c -@@ -686,7 +686,7 @@ void Curl_mbedtls_session_free(void *ptr +@@ -712,7 +712,7 @@ void Curl_mbedtls_session_free(void *ptr size_t Curl_mbedtls_version(char *buffer, size_t size) {