added patch to improve ssl compat, and cleanups

5 files changed, 66 insertions, 2 deletions

diff --git a/net-ftp/curl/ChangeLog b/net-ftp/curl/ChangeLog
index 23943ec1f7e1..332cfc3c4ab0 100644
--- a/net-ftp/curl/ChangeLog
+++ b/net-ftp/curl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/curl
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/curl/ChangeLog,v 1.14 2003/06/12 23:15:29 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/curl/ChangeLog,v 1.15 2003/06/13 22:07:21 liquidx Exp $
+
+*curl-7.10.5-r1 (13 Jun 2003)
+
+  13 Jun 2003; Alastair Tse <liquidx@gentoo.org> curl-7.10.5-r1.ebuild,
+  files/curl-7.10.5-badssl.patch:
+  backported one-liner patch from cvs to add compatibility with broken ssl
+  servers. (#22567) also some cleanups.
 
 *curl-7.10.5 (13 Jun 2003)
 
diff --git a/net-ftp/curl/Manifest b/net-ftp/curl/Manifest
index 30f1c019daec..b2b27874e452 100644
--- a/net-ftp/curl/Manifest
+++ b/net-ftp/curl/Manifest
@@ -1,9 +1,12 @@
-MD5 da432ed552336e3e5da9cb1b2cffe26f ChangeLog 2221
+MD5 852087449fb4d340c538bfac67cd56f1 ChangeLog 2474
 MD5 b452e75a33d624f30feacca81699a28a curl-7.10.2.ebuild 1023
+MD5 30ef78a42a1422d4a8f9c44adf911cfe curl-7.10.5-r1.ebuild 1069
 MD5 bf10fc40277f75c7ec208bfc8ccf7ade curl-7.10.3-r1.ebuild 1029
 MD5 a50d02c2cf4ee8dd988937e7ac37a29f curl-7.10.4.ebuild 1026
 MD5 5ebdcbb18cc08564203bce72d720790d curl-7.10.5.ebuild 1026
 MD5 a1805bbf77fb71c4485b6038e2fd6cb5 files/digest-curl-7.10.2 64
+MD5 e2795c792b9a04fd73ca556ce257f39f files/curl-7.10.5-badssl.patch 343
 MD5 fb70d6e30f7002a54234beb491b00831 files/digest-curl-7.10.3-r1 63
 MD5 90d83e5e2c287361a2190cf01d171a00 files/digest-curl-7.10.4 64
 MD5 046f849780318802575c450ed113fc9f files/digest-curl-7.10.5 64
+MD5 046f849780318802575c450ed113fc9f files/digest-curl-7.10.5-r1 64
diff --git a/net-ftp/curl/curl-7.10.5-r1.ebuild b/net-ftp/curl/curl-7.10.5-r1.ebuild
new file mode 100644
index 000000000000..a4a02456808e
--- /dev/null
+++ b/net-ftp/curl/curl-7.10.5-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2003 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.5-r1.ebuild,v 1.1 2003/06/13 22:07:22 liquidx Exp $
+
+DESCRIPTION="A Client that groks URLs"
+SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
+HOMEPAGE="http://curl.haxx.se/"
+
+SLOT="0"
+LICENSE="MIT X11"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+IUSE="ssl ipv6 ldap"
+
+DEPEND=">=sys-libs/pam-0.75 
+	ssl? ( >=dev-libs/openssl-0.9.6a )
+	ldap? ( net-nds/openldap )"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-badssl.patch	
+}
+
+src_compile() {
+	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
+		
+	emake || die
+}
+
+src_install() {
+	make install DESTDIR=${D} || die
+	dodoc LEGAL CHANGES README 
+	dodoc docs/FEATURES docs/INSTALL docs/INTERNALS docs/LIBCURL 
+	dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE
+}
diff --git a/net-ftp/curl/files/curl-7.10.5-badssl.patch b/net-ftp/curl/files/curl-7.10.5-badssl.patch
new file mode 100644
index 000000000000..eeb4ad90571f
--- /dev/null
+++ b/net-ftp/curl/files/curl-7.10.5-badssl.patch
@@ -0,0 +1,11 @@
+--- curl-7.10.5/lib/ssluse.c	2003-05-01 14:37:36.000000000 +0100
++++ curl-7.10.5/lib/ssluse.c.new	2003-06-13 22:43:31.000000000 +0100
+@@ -786,6 +786,8 @@
+     return CURLE_OUT_OF_MEMORY;
+   }
+     
++  SSL_CTX_set_options(conn->ssl.ctx, SSL_OP_ALL);
++    
+   if(data->set.cert) {
+     if (!cert_stuff(conn,
+                     data->set.cert,
diff --git a/net-ftp/curl/files/digest-curl-7.10.5-r1 b/net-ftp/curl/files/digest-curl-7.10.5-r1
new file mode 100644
index 000000000000..6b0f72cd4e59
--- /dev/null
+++ b/net-ftp/curl/files/digest-curl-7.10.5-r1
@@ -0,0 +1 @@
+MD5 cef8a0c26ca7f4ff6b844d9f69b533f1 curl-7.10.5.tar.bz2 943890