diff options
author | wiz <wiz@pkgsrc.org> | 2005-10-13 16:44:59 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2005-10-13 16:44:59 +0000 |
commit | fecc204ef5d23f85217f5286646438eed67d1ffd (patch) | |
tree | 9a3bea61345ae1dde591ae58ae4f910d7dcb6197 | |
parent | 6758d7a7124cae92b7ffbf48de1ed3dbd2f3f1e4 (diff) | |
download | pkgsrc-fecc204ef5d23f85217f5286646438eed67d1ffd.tar.gz |
Add patch from PR 30667 by Geert Hendrickx, fixing sftp.
Bump PKGREVISION.
gftp: add glib2 bl3.mk file since verifypc complains.
-rw-r--r-- | net/gftp-gtk1/Makefile | 3 | ||||
-rw-r--r-- | net/gftp/Makefile | 4 | ||||
-rw-r--r-- | net/gftp/distinfo | 3 | ||||
-rw-r--r-- | net/gftp/patches/patch-af | 13 |
4 files changed, 20 insertions, 3 deletions
diff --git a/net/gftp-gtk1/Makefile b/net/gftp-gtk1/Makefile index e5d9047fcbc..beb1e37956d 100644 --- a/net/gftp-gtk1/Makefile +++ b/net/gftp-gtk1/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2005/03/02 20:43:21 tron Exp $ +# $NetBSD: Makefile,v 1.8 2005/10/13 16:44:59 wiz Exp $ .include "${.CURDIR}/../gftp/Makefile.common" PKGNAME= gftp-gtk1-${VERSION} +PKGREVISION= 1 COMMENT= Multithreaded GTK+ ftp client CONFLICTS= gftp-[0-9]* diff --git a/net/gftp/Makefile b/net/gftp/Makefile index f80cd8d2f47..b6fd3866f1e 100644 --- a/net/gftp/Makefile +++ b/net/gftp/Makefile @@ -1,13 +1,15 @@ -# $NetBSD: Makefile,v 1.20 2004/04/14 16:15:26 jmmv Exp $ +# $NetBSD: Makefile,v 1.21 2005/10/13 16:44:59 wiz Exp $ # .include "${.CURDIR}/Makefile.common" COMMENT= Multithreaded GTK2+ ftp client +PKGREVISION= 1 CONFLICTS= gftp-gtk1-[0-9]* USE_DIRS+= gnome2-1.5 +.include "../../devel/glib2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/gftp/distinfo b/net/gftp/distinfo index 1fbd36a37cb..f519acfd5ba 100644 --- a/net/gftp/distinfo +++ b/net/gftp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2005/09/04 20:00:09 tonio Exp $ +$NetBSD: distinfo,v 1.12 2005/10/13 16:44:59 wiz Exp $ SHA1 (gftp-2.0.18.tar.bz2) = c2468f1ff1fe978a5fab3a198e513558f3b48f5a RMD160 (gftp-2.0.18.tar.bz2) = 0e0daea8543ae822b25635647360193362a2648d @@ -8,3 +8,4 @@ SHA1 (patch-ab) = c95c215694e63f32924285b71c32a5b94a566864 SHA1 (patch-ac) = 862f2f5856da4f361f2cac660ffd489424a854d8 SHA1 (patch-ad) = 4024658780e23543b47901b802d0e8d7c469f7b6 SHA1 (patch-ae) = 54e5d9370b2bfd9c410823d3c2d4f522744fa88d +SHA1 (patch-af) = 99e1509d69b6e418cf383964ca71e4fef6010418 diff --git a/net/gftp/patches/patch-af b/net/gftp/patches/patch-af new file mode 100644 index 00000000000..b82f6ddd192 --- /dev/null +++ b/net/gftp/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2005/10/13 16:44:59 wiz Exp $ + +--- lib/sshv2.c.orig 2005-07-05 10:30:54.000000000 +0200 ++++ lib/sshv2.c 2005-07-05 10:31:04.000000000 +0200 +@@ -292,7 +292,7 @@ + " -p %d", request->port); + + sshv2_add_exec_args (&logstr, &logstr_len, &args, &args_len, &args_cur, +- " %s -s sftp", request->hostname); ++ " -s %s sftp", request->hostname); + + request->logging_function (gftp_logging_misc, request, + _("Running program %s\n"), logstr); |