bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] curl: update to v7.19.6

Browse Source 
- CVE-2009-2417


git-svn-id: svn://svn.openwrt.org/openwrt/packages@17310 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2009-08-19 13:20:27 +00:00
parent c9168678c5
commit 693fd253f2
4 changed files with 26 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/curl/Makefile
View File

@ -8,8 +8,8 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=curl PKG_NAME:=curl
PKG_VERSION:=7.19.5 PKG_VERSION:=7.19.6
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://curl.haxx.se/download/ \ PKG_SOURCE_URL:=http://curl.haxx.se/download/ \
@ -19,7 +19,7 @@ PKG_SOURCE_URL:=http://curl.haxx.se/download/ \
ftp://ftp.planetmirror.com/pub/curl/ \ ftp://ftp.planetmirror.com/pub/curl/ \
http://www.mirrormonster.com/curl/download/ \ http://www.mirrormonster.com/curl/download/ \
http://curl.mirrors.cyberservers.net/download/ http://curl.mirrors.cyberservers.net/download/
PKG_MD5SUM:=426d161661dce70c8ea9ad8f553363a3 PKG_MD5SUM:=8402c1f654c51ad7287aad57c3aa79be
PKG_FIXUP = libtool PKG_FIXUP = libtool

20
libs/curl/patches/100-cross_compile.patch
View File

@ -1,8 +1,6 @@
Index: curl-7.19.5/configure --- a/configure
=================================================================== +++ b/configure
--- curl-7.19.5.orig/configure 2009-05-25 10:09:06.000000000 +0400 @@ -25479,16 +25479,6 @@ fi
+++ curl-7.19.5/configure 2009-05-25 10:09:06.000000000 +0400
@@ -25173,16 +25173,6 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi fi
@ -19,7 +17,7 @@ Index: curl-7.19.5/configure
fi fi
@@ -26177,19 +26167,6 @@ @@ -26486,19 +26476,6 @@ else
fi fi
@ -39,11 +37,9 @@ Index: curl-7.19.5/configure
fi fi
fi fi
Index: curl-7.19.5/configure.ac --- a/configure.ac
=================================================================== +++ b/configure.ac
--- curl-7.19.5.orig/configure.ac 2009-05-25 10:40:49.000000000 +0400 @@ -1332,18 +1332,6 @@ if test X"$OPT_SSL" != Xno; then
+++ curl-7.19.5/configure.ac 2009-05-25 10:40:49.000000000 +0400
@@ -1340,18 +1340,6 @@
]) ])
fi fi
@ -62,7 +58,7 @@ Index: curl-7.19.5/configure.ac
fi fi
dnl ********************************************************************** dnl **********************************************************************
@@ -1615,21 +1603,6 @@ @@ -1617,21 +1605,6 @@ if test "$OPENSSL_ENABLED" != "1"; then
CPPFLAGS="$CLEANCPPFLAGS" CPPFLAGS="$CLEANCPPFLAGS"
]) ])

14
libs/curl/patches/200-no_docs_tests.patch
View File

@ -1,7 +1,6 @@
diff -urN curl-7.17.1/Makefile.am curl-7.17.1.new/Makefile.am --- a/Makefile.am
--- curl-7.17.1/Makefile.am 2007-07-12 22:41:22.000000000 +0200 +++ b/Makefile.am
+++ curl-7.17.1.new/Makefile.am 2008-07-29 12:18:00.000000000 +0200 @@ -38,7 +38,7 @@ EXTRA_DIST = CHANGES COPYING maketgz Mak
@@ -29,7 +29,7 @@
bin_SCRIPTS = curl-config bin_SCRIPTS = curl-config
SUBDIRS = lib src SUBDIRS = lib src
@ -10,10 +9,9 @@ diff -urN curl-7.17.1/Makefile.am curl-7.17.1.new/Makefile.am
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libcurl.pc pkgconfig_DATA = libcurl.pc
diff -urN curl-7.17.1/Makefile.in curl-7.17.1.new/Makefile.in --- a/Makefile.in
--- curl-7.17.1/Makefile.in 2007-10-29 15:49:45.000000000 +0100 +++ b/Makefile.in
+++ curl-7.17.1.new/Makefile.in 2008-07-29 12:17:49.000000000 +0200 @@ -298,7 +298,7 @@ EXTRA_DIST = CHANGES COPYING maketgz Mak
@@ -260,7 +260,7 @@
bin_SCRIPTS = curl-config bin_SCRIPTS = curl-config
SUBDIRS = lib src SUBDIRS = lib src

19
libs/curl/patches/510-no_sslv2.patch
View File

@ -1,22 +1,21 @@
diff -ruN curl-7.14.0-old/lib/ssluse.c curl-7.14.0-new/lib/ssluse.c --- a/lib/ssluse.c
--- curl-7.14.0-old/lib/ssluse.c 2005-04-15 00:52:57.000000000 +0200 +++ b/lib/ssluse.c
+++ curl-7.14.0-new/lib/ssluse.c 2006-12-18 10:48:20.000000000 +0100 @@ -1384,10 +1384,12 @@ ossl_connect_step1(struct connectdata *c
@@ -1144,9 +1144,11 @@
case CURL_SSLVERSION_TLSv1: case CURL_SSLVERSION_TLSv1:
req_method = TLSv1_client_method(); req_method = TLSv1_client_method();
break; break;
+#ifndef OPENSSL_NO_SSL2 +#ifndef OPENSSL_NO_SSL2
case CURL_SSLVERSION_SSLv2: case CURL_SSLVERSION_SSLv2:
req_method = SSLv2_client_method(); req_method = SSLv2_client_method();
sni = FALSE;
break; break;
+#endif +#endif
case CURL_SSLVERSION_SSLv3: case CURL_SSLVERSION_SSLv3:
req_method = SSLv3_client_method(); req_method = SSLv3_client_method();
break; sni = FALSE;
diff -ruN curl-7.14.0-old/src/main.c curl-7.14.0-new/src/main.c --- a/src/main.c
--- curl-7.14.0-old/src/main.c 2005-05-12 09:28:03.000000000 +0200 +++ b/src/main.c
+++ curl-7.14.0-new/src/main.c 2006-12-18 10:47:48.000000000 +0100 @@ -824,7 +824,9 @@ static void help(void)
@@ -819,7 +819,9 @@
#endif #endif
" -Y/--speed-limit Stop transfer if below speed-limit for 'speed-time' secs", " -Y/--speed-limit Stop transfer if below speed-limit for 'speed-time' secs",
" -y/--speed-time Time needed to trig speed-limit abort. Defaults to 30", " -y/--speed-time Time needed to trig speed-limit abort. Defaults to 30",
@ -26,7 +25,7 @@ diff -ruN curl-7.14.0-old/src/main.c curl-7.14.0-new/src/main.c
" -3/--sslv3 Use SSLv3 (SSL)", " -3/--sslv3 Use SSLv3 (SSL)",
" --stderr <file> Where to redirect stderr. - means stdout", " --stderr <file> Where to redirect stderr. - means stdout",
" --tcp-nodelay Use the TCP_NODELAY option", " --tcp-nodelay Use the TCP_NODELAY option",
@@ -1671,10 +1673,12 @@ @@ -2228,10 +2230,12 @@ static ParameterError getparameter(char
/* TLS version 1 */ /* TLS version 1 */
config->ssl_version = CURL_SSLVERSION_TLSv1; config->ssl_version = CURL_SSLVERSION_TLSv1;
break; break;