patch from upstream to prevent compile failure when USE=-ssl is selected

Package-Manager: portage-2.1_pre10-r2

4 files changed, 51 insertions, 13 deletions

diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index c120c038970d..93170d3adaea 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/lftp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.99 2006/04/25 22:24:48 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.100 2006/05/05 09:30:14 dragonheart Exp $
+
+  05 May 2006; Daniel Black <dragonheart@gentoo.org>
+  +files/lftp-3.4.6-nossl.patch, lftp-3.4.6.ebuild:
+  patch from upstream to prevent compile failure when USE=-ssl is selected
 
 *lftp-3.4.6 (25 Apr 2006)
 
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index a94c885de3fc..ffe6571a9389 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX lftp-3.4.6-nossl.patch 660 RMD160 f4c56f2fe7c491a9344e1b95785231957efb2711 SHA1 c70f57a5c8c1323d8a22d9f4c75a9d121d5ca43c SHA256 61f79d13b5c2f0cdb7abd300486396a39458192cd71b1a61c799afda1508d1fe size 660
+MD5 c0465a6e318d1a1a11c6c322288df990 files/lftp-3.4.6-nossl.patch 660
+RMD160 f4c56f2fe7c491a9344e1b95785231957efb2711 files/lftp-3.4.6-nossl.patch 660
+SHA256 61f79d13b5c2f0cdb7abd300486396a39458192cd71b1a61c799afda1508d1fe files/lftp-3.4.6-nossl.patch 660
 DIST lftp-3.0.13.tar.bz2 1223604 RMD160 a634945e0f621d4d85d10dab6ff435ee39beeab0 SHA256 ec2560dc739f7f202c6c0a4111bbc66cc60c3c550cc931a5c8ddb80b39952e98 size 1223604
 DIST lftp-3.4.4.tar.gz 1733453 RMD160 a8fc4037ab783f3203da2acd1f824d209e60737d SHA256 f6a668f1e8814534e8d7949ae75a3cf1c2fed8de112272c97e81c32aa0204ea2 size 1733453
 DIST lftp-3.4.6.tar.gz 1735847 RMD160 801b1c0f8b68e3f5917fd59ba6d80f3f64c38a8f SHA256 6731d4b40ca694a8505d16004575ff74205e83d7456c828915cf94e7b73aa8d3 size 1735847
@@ -12,14 +16,14 @@ EBUILD lftp-3.4.4.ebuild 1785 RMD160 652821a0ce0d34de5355c0e878b38a7ed7c49b99 SH
 MD5 94670a4a11b56d490842293738854712 lftp-3.4.4.ebuild 1785
 RMD160 652821a0ce0d34de5355c0e878b38a7ed7c49b99 lftp-3.4.4.ebuild 1785
 SHA256 fe690ccc128af40d192fee959fc511ec6a9c31a6577a0475eb8a2deb69d06e41 lftp-3.4.4.ebuild 1785
-EBUILD lftp-3.4.6.ebuild 1768 RMD160 72ede8b1f122d90835e3b2bcc0cc40a42f4078a8 SHA1 294c7fdc390a351f214d5c906d2f58308cd63c40 SHA256 70b768e2b8874a0c543cc12849a62158ad99171184109ce7ba143227ed424f26 size 1768
-MD5 b7e70f09be930ad92d8778a5996a0ad9 lftp-3.4.6.ebuild 1768
-RMD160 72ede8b1f122d90835e3b2bcc0cc40a42f4078a8 lftp-3.4.6.ebuild 1768
-SHA256 70b768e2b8874a0c543cc12849a62158ad99171184109ce7ba143227ed424f26 lftp-3.4.6.ebuild 1768
-MISC ChangeLog 15361 RMD160 aeee996c8a64ee8739170c43626536fc85a87c82 SHA1 31fe43eb1a65ab6ba7437f2caa109f77f92d8f4e SHA256 3287c742330fcc81f58e202acf5707130550860a9abdb5db25fce4bf251d8ba2 size 15361
-MD5 23c308a427c212eab441ef1adf68f4bc ChangeLog 15361
-RMD160 aeee996c8a64ee8739170c43626536fc85a87c82 ChangeLog 15361
-SHA256 3287c742330fcc81f58e202acf5707130550860a9abdb5db25fce4bf251d8ba2 ChangeLog 15361
+EBUILD lftp-3.4.6.ebuild 1865 RMD160 a0f87169111135146c793fca8434cfc5b388fe70 SHA1 c7183e365c27cb7d89c32573c12f0f6026c6bc02 SHA256 69aa985ad1b594b06fc91282865c462edc5e53019979dc54dcd6887653ad89e0 size 1865
+MD5 af212e3d621f46dbcd0512069d9308a9 lftp-3.4.6.ebuild 1865
+RMD160 a0f87169111135146c793fca8434cfc5b388fe70 lftp-3.4.6.ebuild 1865
+SHA256 69aa985ad1b594b06fc91282865c462edc5e53019979dc54dcd6887653ad89e0 lftp-3.4.6.ebuild 1865
+MISC ChangeLog 15543 RMD160 c7fd0a8c044cc603bd10abfc6a8155ab9e197cfc SHA1 7724c0f803130990bbc0a73ac00f21e0a0b733f3 SHA256 4ffc2480630f7971da4dfdb2cc50734230ace8c7275e27f059c894cd3c85016c size 15543
+MD5 59c44845377f5174a5399c96feffd0b7 ChangeLog 15543
+RMD160 c7fd0a8c044cc603bd10abfc6a8155ab9e197cfc ChangeLog 15543
+SHA256 4ffc2480630f7971da4dfdb2cc50734230ace8c7275e27f059c894cd3c85016c ChangeLog 15543
 MISC metadata.xml 430 RMD160 e522bf2928ed5c97a1e41a3443c6c26ba64847cd SHA1 0c992ae070f385380005c35321070c3c5d318eb9 SHA256 bd840a8fc0f6882e2fc2fc80aa4b3ba5a7a1b22a296d998c368ed5628baf3b82 size 430
 MD5 bd30469259dd912781df916084edcacd metadata.xml 430
 RMD160 e522bf2928ed5c97a1e41a3443c6c26ba64847cd metadata.xml 430
@@ -36,7 +40,7 @@ SHA256 371a5c09ffb0e66d03379735df8c510e0dbbde4ea78072a093950f24bf8c3759 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFETqNOmdTrptrqvGERAvcBAJ4yvAaG60DJTQezIF3S12go11j9SACfRZXU
-y29SBxkN5blPVcrgRopPdKM=
-=1QXD
+iD8DBQFEWxvhmdTrptrqvGERApzVAJ9WJEc9hkuTPFTBgTejUF1Yz/1ukQCfTxnE
+YqG0MClKMRHTNlWj/nGtlak=
+=ZGmx
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/lftp/files/lftp-3.4.6-nossl.patch b/net-ftp/lftp/files/lftp-3.4.6-nossl.patch
new file mode 100644
index 000000000000..e92eee006a6c
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-3.4.6-nossl.patch
@@ -0,0 +1,22 @@
+Index: ftpclass.cc
+===================================================================
+RCS file: /home/lav/cvsroot/lftp/src/ftpclass.cc,v
+retrieving revision 1.380
+diff -u -p -r1.380 ftpclass.cc
+--- ftpclass.cc	24 Apr 2006 10:24:18 -0000	1.380
++++ ftpclass.cc	3 May 2006 07:48:47 -0000
+@@ -1326,12 +1326,14 @@ int   Ftp::Do()
+ 	 goto usual_return;
+ 
+    pre_CONNECTED_STATE:
++#if USE_SSL
+       if(ftps && (!proxy || conn->proxy_is_http))
+       {
+ 	 conn->MakeSSLBuffers(hostname);
+ 	 const char *initial_prot=ResMgr::Query("ftps:initial-prot",hostname);
+ 	 conn->prot=initial_prot[0];
+       }
++#endif
+       if(use_telnet_iac)
+ 	 conn->InitTelnetLayer();
+ 
diff --git a/net-ftp/lftp/lftp-3.4.6.ebuild b/net-ftp/lftp/lftp-3.4.6.ebuild
index 1f093b7b10ff..fead34127b33 100644
--- a/net-ftp/lftp/lftp-3.4.6.ebuild
+++ b/net-ftp/lftp/lftp-3.4.6.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.4.6.ebuild,v 1.1 2006/04/25 22:24:49 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.4.6.ebuild,v 1.2 2006/05/05 09:30:14 dragonheart Exp $
+
+inherit eutils
 
 DESCRIPTION="A sophisticated ftp/http client, file transfer program"
 HOMEPAGE="http://lftp.yar.ru/"
@@ -32,6 +34,12 @@ DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-devel/libtool"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}/src
+	epatch ${FILESDIR}/${P}-nossl.patch
+}
+
 src_compile() {
 	local myconf="$(use_enable nls)"