From ca24913a5327646b22b5091e509b6249b2967da9 Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Sun, 2 Feb 2014 13:15:15 +0000 Subject: [PATCH] [packages/libs/curl]: update to 7.35.0, fixes CVE-2014-0015 Spotted this on my twitter feed, so i guess it is good for something. http://curl.haxx.se/docs/adv_20140129.html Signed-off-by: Russell Senior SVN-Revision: 39446 --- libs/curl/Makefile | 8 ++++---- libs/curl/patches/100-check_long_long.patch | 2 +- libs/curl/patches/200-no_docs_tests.patch | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/curl/Makefile b/libs/curl/Makefile index d435ccdc24..4ec9fb4b73 100644 --- a/libs/curl/Makefile +++ b/libs/curl/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2013 OpenWrt.org +# Copyright (C) 2007-2014 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=curl -PKG_VERSION:=7.33.0 -PKG_RELEASE:=4 +PKG_VERSION:=7.35.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://curl.haxx.se/download/ \ @@ -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:=57409d6bf0bd97053b8378dbe0cadcef +PKG_MD5SUM:=c18fbdd031adb0529ae09fce399f2d10 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING diff --git a/libs/curl/patches/100-check_long_long.patch b/libs/curl/patches/100-check_long_long.patch index f9088d85ec..863a66a0ff 100644 --- a/libs/curl/patches/100-check_long_long.patch +++ b/libs/curl/patches/100-check_long_long.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -2889,6 +2889,7 @@ +@@ -2898,6 +2898,7 @@ CURL_VERIFY_RUNTIMELIBS AC_CHECK_SIZEOF(size_t) AC_CHECK_SIZEOF(long) diff --git a/libs/curl/patches/200-no_docs_tests.patch b/libs/curl/patches/200-no_docs_tests.patch index 43fd812160..2287215ed5 100644 --- a/libs/curl/patches/200-no_docs_tests.patch +++ b/libs/curl/patches/200-no_docs_tests.patch @@ -11,7 +11,7 @@ pkgconfig_DATA = libcurl.pc --- a/Makefile.in +++ b/Makefile.in -@@ -494,7 +494,7 @@ EXTRA_DIST = CHANGES COPYING maketgz Mak +@@ -506,7 +506,7 @@ EXTRA_DIST = CHANGES COPYING maketgz Mak CLEANFILES = $(VC6LIBDSP) $(VC8LIBPRJ) bin_SCRIPTS = curl-config SUBDIRS = lib src include @@ -19,4 +19,4 @@ +DIST_SUBDIRS = $(SUBDIRS) packages pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libcurl.pc - CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c \ + VSOURCES = vtls/openssl.c vtls/gtls.c vtls/vtls.c vtls/nss.c vtls/qssl.c \ -- 2.30.2