From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 28 May 2009 23:04:13 +0000 (+0200)
Subject: Updated curl to work with libssh2.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a019a1d1b36918f216fed514daf9cd02e48daf62;p=ipfire-3.x.git

Updated curl to work with libssh2.
---

diff --git a/lfs/curl b/lfs/curl
index 1dc7ecba2..28c34c1aa 100644
--- a/lfs/curl
+++ b/lfs/curl
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = curl
-PKG_VER    = 7.16.3
+PKG_VER    = 7.19.5
 PKG_REL    = 0
 
 THISAPP    = $(PKG_NAME)-$(PKG_VER)
@@ -81,10 +81,22 @@ $(OBJECT): $(objects)
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && \
+		CPPFLAGS="-DHAVE_PK11_CREATEGENERICOBJECT" \
 		./configure \
 			$(CONFIGURE_ARCH) \
 			--prefix=/usr \
-			--disable-static
+			--disable-static \
+			--with-ca-bundle=/etc/pki/tls/certs/ca-bundle.crt \
+			--with-libidn \
+			--with-libssh2 \
+			--enable-ldaps \
+			--enable-ipv6
+
+	# Remove bogus rpath
+	cd $(DIR_APP) && sed -i \
+		-e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
+		-e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 	cd $(DIR_APP) && make $(PARALLELISMFLAGS)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)