ports/51330: update-port: ftp/gftp

[Oliver Lehmann]

>Number:         51330
>Category:       ports
>Synopsis:       update-port: ftp/gftp
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 23 14:10:10 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Oliver Lehmann
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
>Environment:
System: FreeBSD kartoffel.salatschuessel.net 4.8-STABLE FreeBSD 4.8-STABLE #0: Sun Apr 6 02:53:58 CEST 2003 olivleh1 at kartoffel.salatschuessel.net:/usr/obj/usr/src/sys/KARTOFFEL i386


>Description:
	make ssh2 support working for FreeBSD
	new files:	files/patch-lib::sshv2.c
			files/patch-lib::options.h

>How-To-Repeat:
>Fix:

	

--- gftp.patch begins here ---
diff -ruN gftp.old/Makefile gftp/Makefile
--- gftp.old/Makefile	Wed Apr 23 22:32:05 2003
+++ gftp/Makefile	Wed Apr 23 23:03:16 2003
@@ -41,6 +41,10 @@
 CONFIGURE_ENV+=	_GTHREAD_LIBS="-lgthread12"
 .endif
 .endif
+.if defined(WITH_SSH)
+RUN_DEPENDS+=	ssh-askpass:${PORTSDIR}/security/openssh-askpass
+CFLAGS+=	-DWITH_SSH
+.endif
 
 .include <bsd.port.pre.mk>
 
@@ -67,6 +71,7 @@
 	@${ECHO} ""
 	@${ECHO} "	WITHOUT_X11=yes		Only build the text frontend."
 	@${ECHO} "	WITH_GTK2=yes		Use gtk 2.x instead of 1.x"
+	@${ECHO} "	WITH_SSH=yes		To enable SSH2 support"
 	@${ECHO} ""
 
 post-patch:
diff -ruN gftp.old/files/patch-lib::options.h gftp/files/patch-lib::options.h
--- gftp.old/files/patch-lib::options.h	Thu Jan  1 01:00:00 1970
+++ gftp/files/patch-lib::options.h	Wed Apr 23 22:51:39 2003
@@ -0,0 +1,16 @@
+--- lib/options.h.orig	Wed Apr 23 22:50:37 2003
++++ lib/options.h	Wed Apr 23 22:51:13 2003
+@@ -26,9 +26,13 @@
+   {"FTP", 	rfc959_init, 	"ftp",		1},
+   {"HTTP", 	rfc2068_init, 	"http",		1},
+   {"Local", 	local_init, 	"file",		1},
++#ifdef WITH_SSH
+   {"SSH2",	sshv2_init,	"ssh2", 	1},
++#endif
+   {"Bookmark", 	bookmark_init, 	"bookmark", 	0},
++#ifdef WITH_SSH
+   {"SSH", 	ssh_init, 	"ssh", 		1},
++#endif
+   {NULL, 	NULL, 		NULL,		0}
+ };
+ 
diff -ruN gftp.old/files/patch-lib::sshv2.c gftp/files/patch-lib::sshv2.c
--- gftp.old/files/patch-lib::sshv2.c	Thu Jan  1 01:00:00 1970
+++ gftp/files/patch-lib::sshv2.c	Wed Apr 23 22:46:32 2003
@@ -0,0 +1,27 @@
+--- lib/sshv2.c.orig	Wed Apr 23 22:45:50 2003
++++ lib/sshv2.c	Wed Apr 23 22:41:59 2003
+@@ -523,7 +523,9 @@
+   int version, fdm, fds, s[2];
+   sshv2_message message;
+   pid_t child;
+-
++#ifdef __FreeBSD__
++  ssh_use_askpass=TRUE;
++#endif
+   g_return_val_if_fail (request != NULL, -2);
+   g_return_val_if_fail (request->protonum == GFTP_SSHV2_NUM, -2);
+   g_return_val_if_fail (request->hostname != NULL, -2);
+@@ -543,8 +545,13 @@
+   if (request->sftpserv_path == NULL ||
+       *request->sftpserv_path == '\0')
+     {
++#ifdef __FreeBSD__
++      p1 = "/usr/libexec";
++      p2 = '/';
++#else
+       p1 = "";
+       p2 = ' ';
++#endif
+     }
+   else
+     {
--- gftp.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: