CVS commit: pkgsrc/security/putty

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Nov 24 15:38:36 UTC 2020

Modified Files:
        pkgsrc/security/putty: Makefile distinfo
Added Files:
        pkgsrc/security/putty/patches: patch-pscp.c

Log Message:
putty: Fix PuTTY wish pscp-port-0

https://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/pscp-port-0.html


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 pkgsrc/security/putty/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/security/putty/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/putty/patches/patch-pscp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/putty/Makefile
diff -u pkgsrc/security/putty/Makefile:1.65 pkgsrc/security/putty/Makefile:1.66
--- pkgsrc/security/putty/Makefile:1.65 Tue Aug 18 03:44:52 2020
+++ pkgsrc/security/putty/Makefile      Tue Nov 24 15:38:36 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.65 2020/08/18 03:44:52 tnn Exp $
+# $NetBSD: Makefile,v 1.66 2020/11/24 15:38:36 ryoon Exp $
 #
 
 DISTNAME=      putty-0.74
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security
 MASTER_SITES=  http://the.earth.li/~sgtatham/putty/${PKGVERSION_NOREV}/
 

Index: pkgsrc/security/putty/distinfo
diff -u pkgsrc/security/putty/distinfo:1.30 pkgsrc/security/putty/distinfo:1.31
--- pkgsrc/security/putty/distinfo:1.30 Thu Jul 30 13:32:33 2020
+++ pkgsrc/security/putty/distinfo      Tue Nov 24 15:38:36 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2020/07/30 13:32:33 tnn Exp $
+$NetBSD: distinfo,v 1.31 2020/11/24 15:38:36 ryoon Exp $
 
 SHA1 (putty-0.74.tar.gz) = 17b160e9720f67f9af9399d7d185b913b81f18fe
 RMD160 (putty-0.74.tar.gz) = 0bcc5b606f19379168d19de6f5b764a7c2753bf5
@@ -6,6 +6,7 @@ SHA512 (putty-0.74.tar.gz) = 0da86849ea7
 Size (putty-0.74.tar.gz) = 2476513 bytes
 SHA1 (patch-ldisc.c) = cf31a65f920a3ea9b4a70602e4b2fd4d5df8d3e8
 SHA1 (patch-misc.c) = fa1c2db8eb20ceaadb4b57b6aefa57f22d2ae26f
+SHA1 (patch-pscp.c) = f8ae20d5027e3a1c3bd53efd7df4480b1d004d78
 SHA1 (patch-terminal.c) = 30d6196e371b5369f9ea69e193662a47dbefaa10
 SHA1 (patch-timing.c) = a6a492fc8b22c58e2973c854bffa4c8bf71eb6a7
 SHA1 (patch-unix_Makefile.gtk) = 7fe7859ad91afb57ef3ba31194ffd2ef784f638d

Added files:

Index: pkgsrc/security/putty/patches/patch-pscp.c
diff -u /dev/null pkgsrc/security/putty/patches/patch-pscp.c:1.1
--- /dev/null   Tue Nov 24 15:38:36 2020
+++ pkgsrc/security/putty/patches/patch-pscp.c  Tue Nov 24 15:38:36 2020
@@ -0,0 +1,35 @@
+$NetBSD: patch-pscp.c,v 1.1 2020/11/24 15:38:36 ryoon Exp $
+
+* Fix https://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/pscp-port-0.html
+
+--- pscp.c.orig        2020-06-21 17:30:46.000000000 +0000
++++ pscp.c
+@@ -330,7 +330,7 @@ static void do_cmd(char *host, char *use
+      * Force use of SSH. (If they got the protocol wrong we assume the
+      * port is useless too.)
+      */
+-    if (conf_get_int(conf, CONF_protocol) != PROT_SSH) {
++    if (!backend_vt_from_proto(conf_get_int(conf, CONF_protocol))) {
+         conf_set_int(conf, CONF_protocol, PROT_SSH);
+         conf_set_int(conf, CONF_port, 22);
+     }
+@@ -454,7 +454,9 @@ static void do_cmd(char *host, char *use
+ 
+     platform_psftp_pre_conn_setup();
+ 
+-    err = backend_init(&ssh_backend, pscp_seat, &backend, logctx, conf,
++    err = backend_init(backend_vt_from_proto(
++                           conf_get_int(conf, CONF_protocol)),
++                       pscp_seat, &backend, logctx, conf,
+                        conf_get_str(conf, CONF_host),
+                        conf_get_int(conf, CONF_port),
+                        &realhost, 0,
+@@ -2240,8 +2242,6 @@ int psftp_main(int argc, char *argv[])
+     int i;
+     bool sanitise_stderr = true;
+ 
+-    default_protocol = PROT_SSH;
+-
+     flags = 0
+ #ifdef FLAG_SYNCAGENT
+         | FLAG_SYNCAGENT