From d48f0483d5d427bd74185098799fe8f454b104d1 Mon Sep 17 00:00:00 2001
From: Peter Nixon <listuser@peternixon.net>
Date: Fri, 28 Dec 2007 18:12:32 +0000
Subject: [PATCH] Update to 7.17.1 and add tftp support

SVN-Revision: 10004
---
 libs/curl/Makefile                          |  7 ++-
 libs/curl/patches/500-configure_cross.patch | 64 ---------------------
 2 files changed, 5 insertions(+), 66 deletions(-)
 delete mode 100644 libs/curl/patches/500-configure_cross.patch

diff --git a/libs/curl/Makefile b/libs/curl/Makefile
index b79b372e0..1bf08cf2a 100644
--- a/libs/curl/Makefile
+++ b/libs/curl/Makefile
@@ -9,7 +9,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=curl
-PKG_VERSION:=7.14.0
+PKG_VERSION:=7.17.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -20,7 +20,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:=46ce665e47d37fce1a0bad935cce58a9
+PKG_MD5SUM:=1fa635d1dfde8337c98c82749d75c1de
 
 PKG_FIXUP = libtool
 
@@ -65,12 +65,15 @@ CONFIGURE_ARGS += \
 	--disable-manual \
 	--disable-sspi \
 	--disable-telnet \
+	--enable-tftp \
 	--disable-verbose \
 	--with-random="/dev/urandom" \
 	--with-ssl="$(STAGING_DIR)/usr" \
 	--without-ca-bundle \
 	--without-gnutls \
+	--without-krb4 \
 	--without-libidn \
+	--without-nss \
 	--with-zlib="$(STAGING_DIR)/usr" \
 	--disable-gssapi
 
diff --git a/libs/curl/patches/500-configure_cross.patch b/libs/curl/patches/500-configure_cross.patch
deleted file mode 100644
index 7fa921c98..000000000
--- a/libs/curl/patches/500-configure_cross.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -ruN curl-7.14.0-old/configure curl-7.14.0-new/configure
---- curl-7.14.0-old/configure	2005-05-14 00:23:47.000000000 +0200
-+++ curl-7.14.0-new/configure	2005-09-02 02:03:38.000000000 +0200
-@@ -26132,10 +26132,10 @@
- 
-   fi
- 
--  if test "$OPENSSL_ENABLED" = "1"; then
--                LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$EXTRA_SSL/lib$libsuff"
--    export LD_LIBRARY_PATH
--  fi
-+#  if test "$OPENSSL_ENABLED" = "1"; then
-+#                LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$EXTRA_SSL/lib$libsuff"
-+#    export LD_LIBRARY_PATH
-+#  fi
- 
- fi
- 
-@@ -26325,8 +26325,8 @@
- echo "$as_me: detected GnuTLS version $version" >&6;}
- 
- 
--        LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlsprefix/lib$libsuff"
--        export LD_LIBRARY_PATH
-+#        LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlsprefix/lib$libsuff"
-+#        export LD_LIBRARY_PATH
-       fi
- 
-     fi
-diff -ruN curl-7.14.0-old/configure.ac curl-7.14.0-new/configure.ac
---- curl-7.14.0-old/configure.ac	2005-05-13 23:19:21.000000000 +0200
-+++ curl-7.14.0-new/configure.ac	2005-09-02 02:03:45.000000000 +0200
-@@ -917,13 +917,13 @@
- 
-   fi
- 
--  if test "$OPENSSL_ENABLED" = "1"; then
--    dnl when the ssl shared libs were found in a path that the run-time linker
--    dnl doesn't search through, we need to add it to LD_LIBRARY_PATH to
--    dnl prevent further configure tests to fail due to this
--    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$EXTRA_SSL/lib$libsuff"
--    export LD_LIBRARY_PATH
--  fi
-+#  if test "$OPENSSL_ENABLED" = "1"; then
-+#    dnl when the ssl shared libs were found in a path that the run-time linker
-+#    dnl doesn't search through, we need to add it to LD_LIBRARY_PATH to
-+#    dnl prevent further configure tests to fail due to this
-+#    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$EXTRA_SSL/lib$libsuff"
-+#    export LD_LIBRARY_PATH
-+#  fi
- 
- fi
- 
-@@ -1021,8 +1021,8 @@
-         dnl LD_LIBRARY_PATH to prevent further configure tests to fail
-         dnl due to this
- 
--        LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlsprefix/lib$libsuff"
--        export LD_LIBRARY_PATH
-+#        LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlsprefix/lib$libsuff"
-+#        export LD_LIBRARY_PATH
-       fi
- 
-     fi
-- 
2.30.2