backported fix for segfault for libcurl. Submitted by Gustavo Felisberto <gustavo felisberto.net>

6 files changed, 49 insertions, 11 deletions

diff --git a/net-ftp/curl/ChangeLog b/net-ftp/curl/ChangeLog
index aed54a866d94..0e0e4c88c7c4 100644
--- a/net-ftp/curl/ChangeLog
+++ b/net-ftp/curl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/curl
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/curl/ChangeLog,v 1.24 2004/01/09 20:54:25 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/curl/ChangeLog,v 1.25 2004/01/16 09:53:05 liquidx Exp $
+
+*curl-7.10.8-r1 (16 Jan 2004)
+
+  16 Jan 2004; Alastair Tse <liquidx@gentoo.org> curl-7.10.8-r1.ebuild,
+  files/curl-7.10.8-transfer-segv.patch:
+  backported fix for segfault for libcurl. Submitted by Gustavo Felisberto
+  <gustavo felisberto.net>. (#37959)
 
   09 Jan 2004; Jason Wever <weeve@gentoo.org> curl-7.10.7.ebuild:
   Marked stable on sparc.
diff --git a/net-ftp/curl/Manifest b/net-ftp/curl/Manifest
index 7bf2794d671d..2cbeddcfbd78 100644
--- a/net-ftp/curl/Manifest
+++ b/net-ftp/curl/Manifest
@@ -3,11 +3,14 @@ MD5 8bb90517693a237a3699589bb25bf6dc curl-7.10.2.ebuild 1032
 MD5 89382ea8f13d9e546e296e7ee9f1e0a8 curl-7.10.3-r1.ebuild 1035
 MD5 de807d12b9927938d9720c9d7048a22b curl-7.10.5-r1.ebuild 1048
 MD5 3c65da54a0fe2157b12156645364b82e curl-7.10.7.ebuild 975
+MD5 47e26ed77373833603ed3f5909dbadf7 curl-7.10.8-r1.ebuild 1081
 MD5 36ecf67270ff56ce0080b13900b34409 curl-7.10.8.ebuild 980
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
 MD5 e2795c792b9a04fd73ca556ce257f39f files/curl-7.10.5-badssl.patch 343
+MD5 05e37478314d224f2ce5840f2e1f31c9 files/curl-7.10.8-transfer-segv.patch 744
 MD5 a1805bbf77fb71c4485b6038e2fd6cb5 files/digest-curl-7.10.2 64
 MD5 fb70d6e30f7002a54234beb491b00831 files/digest-curl-7.10.3-r1 63
 MD5 046f849780318802575c450ed113fc9f files/digest-curl-7.10.5-r1 64
 MD5 93b049be221be3a9ce4a61ebd645c6ef files/digest-curl-7.10.7 64
 MD5 4bc4b19a5cd9b1bb8be92330189dbecb files/digest-curl-7.10.8 65
+MD5 4bc4b19a5cd9b1bb8be92330189dbecb files/digest-curl-7.10.8-r1 65
diff --git a/net-ftp/curl/curl-7.10.2.ebuild b/net-ftp/curl/curl-7.10.8-r1.ebuild
index 7c242fbd9f09..a1bcda7059cd 100644
--- a/net-ftp/curl/curl-7.10.2.ebuild
+++ b/net-ftp/curl/curl-7.10.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/curl/curl-7.10.2.ebuild,v 1.11 2003/12/09 23:38:56 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/curl/curl-7.10.8-r1.ebuild,v 1.1 2004/01/16 09:53:05 liquidx Exp $
 
 DESCRIPTION="A Client that groks URLs"
 SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
@@ -8,20 +8,29 @@ HOMEPAGE="http://curl.haxx.se/"
 
 SLOT="0"
 LICENSE="MIT X11"
-KEYWORDS="x86 ppc sparc alpha hppa"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
 IUSE="ssl ipv6 ldap"
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6a )
 	ldap? ( net-nds/openldap )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}/lib
+	epatch ${FILESDIR}/${P}-transfer-segv.patch
+}
+
 src_compile() {
-	local myconf="--with-gnu-ld --enable-http --enable-ftp --enable-gopher --enable-file \
-			--enable-dict --enable-telnet --enable-nonblocking"
-	use ipv6	&& myconf="${myconf} --enable-ipv6"
-	use ldap	&& myconf="${myconf} --enable-ldap"
-	use ssl		&& myconf="${myconf} --with-ssl"
+	local myconf="--with-gnu-ld	--enable-http
+		--enable-ftp --enable-gopher
+		--enable-file --enable-dict
+		--enable-telnet --enable-nonblocking"
+
+	econf ${myconf} \
+		`use_enable ipv6` \
+		`use_enable ldap` \
+		`use_with ssl` || die
 
-	econf ${myconf}
 	emake || die
 }
 
diff --git a/net-ftp/curl/files/curl-7.10.8-transfer-segv.patch b/net-ftp/curl/files/curl-7.10.8-transfer-segv.patch
new file mode 100644
index 000000000000..6fa07062e869
--- /dev/null
+++ b/net-ftp/curl/files/curl-7.10.8-transfer-segv.patch
@@ -0,0 +1,19 @@
+===================================================================
+RCS file: /repository/curl/lib/transfer.c,v
+retrieving revision 1.182
+retrieving revision 1.183
+diff -p --unified=3 -r1.182 -r1.183
+--- transfer.c	2003/10/24 21:54:34	1.182
++++ transfer.c	2003/11/06 07:55:45	1.183
+@@ -1854,10 +1854,9 @@ CURLcode Curl_perform(struct SessionHand
+          to the new URL */
+       urlchanged = data->change.url_changed;
+       if ((CURLE_OK == res) && urlchanged) {
+-        char *gotourl;
+         res = Curl_done(conn);
+         if(CURLE_OK == res) {
+-          newurl = strdup(data->change.url);
++          char *gotourl = strdup(data->change.url);
+           res = Curl_follow(data, gotourl);
+           if(res)
+             free(gotourl);
diff --git a/net-ftp/curl/files/digest-curl-7.10.2 b/net-ftp/curl/files/digest-curl-7.10.2
deleted file mode 100644
index bf1aaf3e4f8d..000000000000
--- a/net-ftp/curl/files/digest-curl-7.10.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9f6a911b5ee5432128f67d4d8df09279 curl-7.10.2.tar.bz2 833884
diff --git a/net-ftp/curl/files/digest-curl-7.10.8-r1 b/net-ftp/curl/files/digest-curl-7.10.8-r1
new file mode 100644
index 000000000000..981fdda009c5
--- /dev/null
+++ b/net-ftp/curl/files/digest-curl-7.10.8-r1
@@ -0,0 +1 @@
+MD5 8309cdffe4a111333b4309914bce1758 curl-7.10.8.tar.bz2 1019159