FreeBSD Bugzilla – Attachment 30561 Details for
Bug 51391
update-port: ftp/gftp
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
gftp.patch
gftp.patch (text/plain), 4.52 KB, created by
Oliver Lehmann
on 2003-04-24 21:10:12 UTC
(
hide
)
Description:
gftp.patch
Filename:
MIME Type:
Creator:
Oliver Lehmann
Created:
2003-04-24 21:10:12 UTC
Size:
4.52 KB
patch
obsolete
>diff -ruN gftp.old/Makefile gftp/Makefile >--- gftp.old/Makefile Thu Apr 24 21:44:18 2003 >+++ gftp/Makefile Thu Apr 24 21:59:19 2003 >@@ -7,6 +7,7 @@ > > PORTNAME= gftp > PORTVERSION= 2.0.14 >+PORTREVISION= 1 > CATEGORIES= ftp > MASTER_SITES= http://gftp.seul.org/ \ > ftp://gftp.seul.org/pub/gftp/ >@@ -41,10 +42,6 @@ > 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> > >@@ -71,7 +68,6 @@ > @${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-configure gftp/files/patch-configure >--- gftp.old/files/patch-configure Thu Apr 24 21:44:18 2003 >+++ gftp/files/patch-configure Thu Apr 24 22:00:05 2003 >@@ -1,5 +1,13 @@ > --- configure.orig Wed Nov 27 17:25:51 2002 > +++ configure Wed Nov 27 17:30:47 2002 >+@@ -3988,6 +3988,7 @@ >+ >+ GFTP_TEXT="" >+ EXTRA_LIBS="" >++EXTRA_LIBS="$EXTRA_LIBS -lutil" >+ USE_READLINE="yes" >+ READLINE_LIBS="" >+ if test "x$enable_textport" = "x1" ; then > @@ -4725,9 +4725,9 @@ > > rm -f conf.gtktest >diff -ruN gftp.old/files/patch-lib::misc.c gftp/files/patch-lib::misc.c >--- gftp.old/files/patch-lib::misc.c Thu Jan 1 01:00:00 1970 >+++ gftp/files/patch-lib::misc.c Thu Apr 24 21:44:38 2003 >@@ -0,0 +1,14 @@ >+--- lib/misc.c.orig Thu Apr 24 11:54:48 2003 >++++ lib/misc.c Thu Apr 24 11:53:00 2003 >+@@ -881,7 +881,11 @@ >+ diff += rd; >+ tempstr[diff] = '\0'; >+ >++#ifdef __FreeBSD__ >++ if (strcmp (tempstr, "Password:") == 0) >++#else >+ if (diff > 11 && strcmp (tempstr + diff - 10, "password: ") == 0) >++#endif >+ { >+ if (wrotepw) >+ { >diff -ruN gftp.old/files/patch-lib::options.h gftp/files/patch-lib::options.h >--- gftp.old/files/patch-lib::options.h Thu Apr 24 21:44:18 2003 >+++ gftp/files/patch-lib::options.h Thu Jan 1 01:00:00 1970 >@@ -1,16 +0,0 @@ >---- 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 Apr 24 21:44:18 2003 >+++ gftp/files/patch-lib::sshv2.c Thu Apr 24 21:57:32 2003 >@@ -1,17 +1,6 @@ >---- 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 @@ >+--- lib/sshv2.c.orig Sat Nov 23 15:34:25 2002 >++++ lib/sshv2.c Thu Apr 24 21:57:04 2003 >+@@ -543,8 +543,13 @@ > if (request->sftpserv_path == NULL || > *request->sftpserv_path == '\0') > { >@@ -25,3 +14,49 @@ > } > else > { >+@@ -570,6 +575,15 @@ >+ else >+ { >+ s[0] = s[1] = 0; >++#ifdef __FreeBSD__ >++ if( openpty( &fdm, &fds, &pts_name, NULL, NULL ) < 0 ) >++ { >++ request->logging_function (gftp_logging_error, request->user_data, >++ _("Cannot create a socket pair: %s\n"), >++ g_strerror (errno)); >++ return (-2); >++ } >++#else >+ if ((fdm = ptym_open (pts_name)) < 0) >+ { >+ request->logging_function (gftp_logging_error, request->user_data, >+@@ -577,6 +591,7 @@ >+ g_strerror (errno)); >+ return (-2); >+ } >++#endif >+ } >+ >+ if ((child = fork ()) == 0) >+@@ -589,6 +604,13 @@ >+ } >+ else >+ { >++#ifdef __FreeBSD__ >++ close (fdm); >++ if( ioctl( fds, TIOCSCTTY, NULL ) < 0 ) >++ { >++ return( -2 ); >++ } >++#else >+ if ((fds = ptys_open (fdm, pts_name)) < 0) >+ { >+ printf ("Cannot open slave pts %s: %s\n", pts_name, >+@@ -596,6 +618,7 @@ >+ return (-1); >+ } >+ close (fdm); >++#endif >+ } >+ >+ tty_raw (fds);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 51391
: 30561