From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Wed, 22 Dec 2010 01:45:05 +0000 (+0000)
Subject: curl: update to version 7.21.3
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2af548fa95e3df935ad1bac7355a557d96fda17b;p=openwrt%2Fsvn-archive%2Farchive.git

curl: update to version 7.21.3


SVN-Revision: 24772
---

diff --git a/libs/curl/Makefile b/libs/curl/Makefile
index 1f678ba02f..db6617b5be 100644
--- a/libs/curl/Makefile
+++ b/libs/curl/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=curl
-PKG_VERSION:=7.21.2
+PKG_VERSION:=7.21.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -19,7 +19,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:=ca96df88e044c7c25d19692ec8b250b2
+PKG_MD5SUM:=5b57fee22090b5c43a6886fdd35af2ce
 
 PKG_FIXUP:=libtool
 PKG_BUILD_PARALLEL:=1
diff --git a/libs/curl/patches/100-cross_compile.patch b/libs/curl/patches/100-cross_compile.patch
index 58404c6f21..9cccf249df 100644
--- a/libs/curl/patches/100-cross_compile.patch
+++ b/libs/curl/patches/100-cross_compile.patch
@@ -1,6 +1,6 @@
 --- a/configure
 +++ b/configure
-@@ -19785,17 +19785,6 @@ $as_echo "no" >&6; }
+@@ -19786,17 +19786,6 @@ $as_echo "no" >&6; }
  fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    fi
@@ -18,7 +18,7 @@
  fi
  
  
-@@ -20251,21 +20240,6 @@ else
+@@ -20252,21 +20241,6 @@ else
           CPPFLAGS="$CLEANCPPFLAGS"
  
  fi
@@ -42,7 +42,7 @@
    fi
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1494,19 +1494,6 @@ if test X"$OPT_SSL" != Xno; then
+@@ -1497,19 +1497,6 @@ if test X"$OPT_SSL" != Xno; then
        AC_MSG_RESULT([no])
      ])
    fi
@@ -62,7 +62,7 @@
  fi
  
  dnl **********************************************************************
-@@ -1714,22 +1701,6 @@ if test "$OPENSSL_ENABLED" != "1"; then
+@@ -1717,22 +1704,6 @@ if test "$OPENSSL_ENABLED" != "1"; then
           LIBS="$CLEANLIBS"
           CPPFLAGS="$CLEANCPPFLAGS"
         ])
diff --git a/libs/curl/patches/510-no_sslv2.patch b/libs/curl/patches/510-no_sslv2.patch
index 3a7ef4d8a3..b1ac97f139 100644
--- a/libs/curl/patches/510-no_sslv2.patch
+++ b/libs/curl/patches/510-no_sslv2.patch
@@ -15,7 +15,7 @@
      use_sni(FALSE);
 --- a/src/main.c
 +++ b/src/main.c
-@@ -883,7 +883,9 @@ static void help(void)
+@@ -888,7 +888,9 @@ static void help(void)
      " -y/--speed-time    Time needed to trig speed-limit abort. Defaults to 30",
      "    --ssl           Try SSL/TLS (FTP, IMAP, POP3, SMTP)",
      "    --ssl-reqd      Require SSL/TLS (FTP, IMAP, POP3, SMTP)",
@@ -25,7 +25,7 @@
      " -3/--sslv3         Use SSLv3 (SSL)",
      "    --stderr <file> Where to redirect stderr. - means stdout",
      "    --tcp-nodelay   Use the TCP_NODELAY option",
-@@ -2445,10 +2447,12 @@ static ParameterError getparameter(char 
+@@ -2470,10 +2472,12 @@ static ParameterError getparameter(char
        /* TLS version 1 */
        config->ssl_version = CURL_SSLVERSION_TLSv1;
        break;