Added revision -r3 with a fix for downloading files over ssh2 that are read-only (non-writable). See bug #91269 and the upstream link.

(Portage version: 2.0.53_rc7)

5 files changed, 92 insertions, 5 deletions

diff --git a/net-ftp/gftp/ChangeLog b/net-ftp/gftp/ChangeLog
index 998b161870ff..31272a210c9c 100644
--- a/net-ftp/gftp/ChangeLog
+++ b/net-ftp/gftp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/gftp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/ChangeLog,v 1.46 2005/10/14 23:05:57 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/ChangeLog,v 1.47 2005/11/06 05:57:10 obz Exp $
+
+*gftp-2.0.18-r3 (06 Nov 2005)
+
+  06 Nov 2005; Mike Gardiner <obz@gentoo.org>
+  +files/gftp-2.0.18-ssh2-read.patch, +gftp-2.0.18-r3.ebuild:
+  Added revision -r3 with a fix for downloading files over ssh2 that are
+  read-only (non-writable). See bug #91269 and the upstream link.
 
 *gftp-2.0.18-r2 (14 Oct 2005)
 
diff --git a/net-ftp/gftp/Manifest b/net-ftp/gftp/Manifest
index 1762eb707f64..b9ffd891417c 100644
--- a/net-ftp/gftp/Manifest
+++ b/net-ftp/gftp/Manifest
@@ -1,9 +1,13 @@
-MD5 3a75b54355e3e9dab04a8612c5044c27 gftp-2.0.18-r1.ebuild 1468
-MD5 54961e8083c43a825eeb545ad2b43d4c gftp-2.0.18-r2.ebuild 1137
+MD5 3f0571e833e46e7bdd42d17773bab26e .gftp-2.0.18-r3.ebuild.swp 12288
 MD5 4a15b0a0db52959cc475a7f9e1619ea9 ChangeLog 6110
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 429ea419b557eb768b0be6daa3c8b7e7 files/digest-gftp-2.0.18-r1 65
 MD5 429ea419b557eb768b0be6daa3c8b7e7 files/digest-gftp-2.0.18-r2 65
+MD5 429ea419b557eb768b0be6daa3c8b7e7 files/digest-gftp-2.0.18-r3 65
 MD5 ce3187f3e4f80bfb35cf8bef798eb40d files/gftp-2.0.15-64bit_fixes.patch 16360
-MD5 81d77310a3638462af932e435590ab5d files/gftp-2.0.18-fix_gtk1.patch 1095
 MD5 23e7696a3f6f2c368d11ca9aaadb7797 files/gftp-2.0.16-ipv6_fix.patch 3279
+MD5 81d77310a3638462af932e435590ab5d files/gftp-2.0.18-fix_gtk1.patch 1095
+MD5 327a4df792013f011340fe5f90dbb6c1 files/gftp-2.0.18-ssh2-read.patch 326
+MD5 3a75b54355e3e9dab04a8612c5044c27 gftp-2.0.18-r1.ebuild 1468
+MD5 54961e8083c43a825eeb545ad2b43d4c gftp-2.0.18-r2.ebuild 1137
+MD5 5ae32603348dbdf99d54ed24089efb6f gftp-2.0.18-r3.ebuild 1179
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
diff --git a/net-ftp/gftp/files/digest-gftp-2.0.18-r3 b/net-ftp/gftp/files/digest-gftp-2.0.18-r3
new file mode 100644
index 000000000000..c99f186437a4
--- /dev/null
+++ b/net-ftp/gftp/files/digest-gftp-2.0.18-r3
@@ -0,0 +1 @@
+MD5 44b19442d06f6dc68c7211d66029d826 gftp-2.0.18.tar.bz2 1374850
diff --git a/net-ftp/gftp/files/gftp-2.0.18-ssh2-read.patch b/net-ftp/gftp/files/gftp-2.0.18-ssh2-read.patch
new file mode 100644
index 000000000000..765741be7b02
--- /dev/null
+++ b/net-ftp/gftp/files/gftp-2.0.18-ssh2-read.patch
@@ -0,0 +1,13 @@
+--- gftp-2.0.18.orig/lib/sshv2.c
++++ gftp-2.0.18/lib/sshv2.c
+@@ -1841,7 +1841,7 @@
+ {
+   int ret;
+ 
+-  if ((ret = sshv2_open_file (request, file, startsize, SSH_FXP_OPEN)) < 0)
++  if ((ret = sshv2_open_file (request, file, startsize, SSH_FXF_READ)) < 0)
+     return (ret);
+ 
+   return (sshv2_get_file_size (request, file));
+
+
diff --git a/net-ftp/gftp/gftp-2.0.18-r3.ebuild b/net-ftp/gftp/gftp-2.0.18-r3.ebuild
new file mode 100644
index 000000000000..f141e6704f6c
--- /dev/null
+++ b/net-ftp/gftp/gftp-2.0.18-r3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-2.0.18-r3.ebuild,v 1.1 2005/11/06 05:57:10 obz Exp $
+
+inherit eutils
+
+DESCRIPTION="Gnome based FTP Client"
+SRC_URI="http://www.gftp.org/${P}.tar.bz2"
+HOMEPAGE="http://www.gftp.org"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="nls gtk ssl"
+
+DEPEND="virtual/x11
+	ssl? ( dev-libs/openssl )
+	gtk? ( >=x11-libs/gtk+-2 )
+	!gtk? ( sys-libs/readline
+		sys-libs/ncurses
+		=dev-libs/glib-1.2* )"
+
+#RDEPEND="nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# patch to allow fetching of ssh2 files
+	# that are read-only, see bug #91269 and upstream link.
+	epatch ${FILESDIR}/${P}-ssh2-read.patch
+
+}
+
+src_compile() {
+
+	local myconf
+
+	# do not use enable-{gtk20,gtkport} they are not recognized
+	# and will disable building the gtkport alltogether
+	if ! use gtk; then
+		einfo "gtk+ disabled"
+		myconf="${myconf} --disable-gtkport --disable-gtk20"
+	fi
+
+	econf \
+			$(use_enable nls) \
+			$(use_enable ssl) \
+			${myconf} \
+			|| die
+
+	emake || die
+
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dodoc COPYING ChangeLog README* THANKS \
+		TODO docs/USERS-GUIDE
+
+}