From 1fc5e412db46b63e1a0e5f4dfc50e89b9e7d50c2 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 4 Feb 2012 18:25:41 +0000
Subject: [PATCH] curl: merge r29771, r29775, r29787, r29841

SVN-Revision: 30039
---
 libs/curl/Makefile                        |  6 +++---
 libs/curl/patches/100-cross-compile.patch | 20 ++++++++----------
 libs/curl/patches/510-no_sslv2.patch      | 25 -----------------------
 3 files changed, 12 insertions(+), 39 deletions(-)
 delete mode 100644 libs/curl/patches/510-no_sslv2.patch

diff --git a/libs/curl/Makefile b/libs/curl/Makefile
index 806192d0f..ea1dcdec2 100644
--- a/libs/curl/Makefile
+++ b/libs/curl/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=curl
-PKG_VERSION:=7.21.7
+PKG_VERSION:=7.23.1
 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:=5f6d50c4d4ee38c57fe37e3cff75adbd
+PKG_MD5SUM:=0296d3196b4bf82c896a869b38dbc5f2
 
 PKG_FIXUP:=libtool
 PKG_BUILD_PARALLEL:=1
@@ -98,7 +98,7 @@ define Build/InstallDev
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.{a,so*} $(1)/usr/lib/
 	$(CP) $(PKG_BUILD_DIR)/libcurl.pc $(1)/usr/lib/pkgconfig/
 	$(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/curl-config
-	$(SED) 's#$(TARGET_LDFLAGS)##g' $(1)/usr/lib/pkgconfig/libcurl.pc
+	[ -n "$(TARGET_LDFLAGS)" ] && $(SED) 's#$(TARGET_LDFLAGS)##g' $(1)/usr/lib/pkgconfig/libcurl.pc || true
 	ln -sf $(STAGING_DIR)/usr/bin/curl-config $(2)/bin/
 endef
 
diff --git a/libs/curl/patches/100-cross-compile.patch b/libs/curl/patches/100-cross-compile.patch
index 91109409e..9dd39e4f6 100644
--- a/libs/curl/patches/100-cross-compile.patch
+++ b/libs/curl/patches/100-cross-compile.patch
@@ -1,8 +1,6 @@
-Index: curl-7.21.7/configure.ac
-===================================================================
---- curl-7.21.7.orig/configure.ac
-+++ curl-7.21.7/configure.ac
-@@ -1522,15 +1522,6 @@ if test X"$OPT_SSL" != Xno; then
+--- a/configure.ac
++++ b/configure.ac
+@@ -1542,15 +1542,6 @@ if test X"$OPT_SSL" != Xno; then
    fi
  
    if test "$OPENSSL_ENABLED" = "1"; then
@@ -18,7 +16,7 @@ Index: curl-7.21.7/configure.ac
      CURL_CHECK_OPENSSL_API
    fi
  
-@@ -1759,17 +1750,6 @@ if test "$OPENSSL_ENABLED" != "1"; then
+@@ -1779,17 +1770,6 @@ if test "$OPENSSL_ENABLED" != "1"; then
  
        if test "x$USE_GNUTLS" = "xyes"; then
          AC_MSG_NOTICE([detected GnuTLS version $version])
@@ -36,7 +34,7 @@ Index: curl-7.21.7/configure.ac
        fi
  
      fi
-@@ -1869,18 +1849,6 @@ if test "$OPENSSL_ENABLED" != "1"; then
+@@ -1889,18 +1869,6 @@ if test "$OPENSSL_ENABLED" != "1"; then
  
        CURL_LIBS="$CURL_LIBS -lpolarssl"
        LIBS="$LIBS -lpolarssl"
@@ -55,7 +53,7 @@ Index: curl-7.21.7/configure.ac
      fi
  
    fi dnl PolarSSL not disabled
-@@ -1958,18 +1926,6 @@ if test "$OPENSSL_ENABLED" != "1"; then
+@@ -1978,18 +1946,6 @@ if test "$OPENSSL_ENABLED" != "1"; then
  
        CURL_LIBS="$CURL_LIBS -lcyassl -lm"
        LIBS="$LIBS -lcyassl -lm"
@@ -74,7 +72,7 @@ Index: curl-7.21.7/configure.ac
      fi
  
    fi dnl CyaSSL not disabled
-@@ -2053,19 +2009,6 @@ if test "$OPENSSL_ENABLED" != "1" -a "$G
+@@ -2073,19 +2029,6 @@ if test "$OPENSSL_ENABLED" != "1" -a "$G
           CPPFLAGS="$CLEANCPPFLAGS"
         ])
  
@@ -94,7 +92,7 @@ Index: curl-7.21.7/configure.ac
      fi
  
    fi dnl NSS not disabled
-@@ -2114,11 +2057,6 @@ if test "$curl_ssl_msg" = "$init_ssl_msg
+@@ -2134,11 +2077,6 @@ if test "$curl_ssl_msg" = "$init_ssl_msg
        AXTLS_ENABLED=1
        USE_AXTLS="yes"
        curl_ssl_msg="enabled (axTLS)"
@@ -106,7 +104,7 @@ Index: curl-7.21.7/configure.ac
        ],[
        LDFLAGS="$CLEANLDFLAGS"
        CPPFLAGS="$CLEANCPPFLAGS"
-@@ -2220,10 +2158,6 @@ if test X"$OPT_LIBSSH2" != Xno; then
+@@ -2240,10 +2178,6 @@ if test X"$OPT_LIBSSH2" != Xno; then
         dnl libssh2_session_handshake was added in 1.2.8
         AC_CHECK_FUNCS( libssh2_version libssh2_init libssh2_exit \
                         libssh2_scp_send64 libssh2_session_handshake)
diff --git a/libs/curl/patches/510-no_sslv2.patch b/libs/curl/patches/510-no_sslv2.patch
deleted file mode 100644
index 4866b37c6..000000000
--- a/libs/curl/patches/510-no_sslv2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/src/main.c
-+++ b/src/main.c
-@@ -936,7 +936,9 @@ static void help(void)
-     "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)",
-+#ifndef OPENSSL_NO_SSL2
-     " -2/--sslv2         Use SSLv2 (SSL)",
-+#endif
-     " -3/--sslv3         Use SSLv3 (SSL)",
-     "    --stderr <file> Where to redirect stderr. - means stdout",
-     "    --tcp-nodelay   Use the TCP_NODELAY option",
-@@ -2535,10 +2537,12 @@ static ParameterError getparameter(char 
-       /* TLS version 1 */
-       config->ssl_version = CURL_SSLVERSION_TLSv1;
-       break;
-+#ifndef OPENSSL_NO_SSL2
-     case '2':
-       /* SSL version 2 */
-       config->ssl_version = CURL_SSLVERSION_SSLv2;
-       break;
-+#endif
-     case '3':
-       /* SSL version 3 */
-       config->ssl_version = CURL_SSLVERSION_SSLv3;
-- 
2.30.2