CVS commit: pkgsrc/security/putty

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Thu Dec 19 22:22:33 UTC 2019

Modified Files:
        pkgsrc/security/putty: distinfo
        pkgsrc/security/putty/patches: patch-terminal.c

Log Message:
Avoid using a non-literal string as format string.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/security/putty/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/putty/patches/patch-terminal.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/distinfo
diff -u pkgsrc/security/putty/distinfo:1.27 pkgsrc/security/putty/distinfo:1.28
--- pkgsrc/security/putty/distinfo:1.27 Tue Oct  1 15:22:41 2019
+++ pkgsrc/security/putty/distinfo      Thu Dec 19 22:22:33 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2019/10/01 15:22:41 ryoon Exp $
+$NetBSD: distinfo,v 1.28 2019/12/19 22:22:33 joerg Exp $
 
 SHA1 (putty-0.73.tar.gz) = 17daebb82e476adfd578f6934c28f4d2c209b7d8
 RMD160 (putty-0.73.tar.gz) = 9e7c0084464963581bc47ce1b87e25ba51d27743
@@ -6,7 +6,7 @@ SHA512 (putty-0.73.tar.gz) = 4ada4b8c6d6
 Size (putty-0.73.tar.gz) = 2459115 bytes
 SHA1 (patch-ldisc.c) = cf31a65f920a3ea9b4a70602e4b2fd4d5df8d3e8
 SHA1 (patch-misc.c) = fa1c2db8eb20ceaadb4b57b6aefa57f22d2ae26f
-SHA1 (patch-terminal.c) = 9e57f754bb2071c8c6b6a92ae63772eb10790121
+SHA1 (patch-terminal.c) = 30d6196e371b5369f9ea69e193662a47dbefaa10
 SHA1 (patch-timing.c) = a6a492fc8b22c58e2973c854bffa4c8bf71eb6a7
 SHA1 (patch-unix_Makefile.gtk) = 7fe7859ad91afb57ef3ba31194ffd2ef784f638d
 SHA1 (patch-unix_uxnet.c) = 2d1c2939721993fe5616c2fe3f1935c03a31bb35

Index: pkgsrc/security/putty/patches/patch-terminal.c
diff -u pkgsrc/security/putty/patches/patch-terminal.c:1.4 pkgsrc/security/putty/patches/patch-terminal.c:1.5
--- pkgsrc/security/putty/patches/patch-terminal.c:1.4  Mon Apr  1 12:10:43 2019
+++ pkgsrc/security/putty/patches/patch-terminal.c      Thu Dec 19 22:22:33 2019
@@ -1,10 +1,10 @@
-$NetBSD: patch-terminal.c,v 1.4 2019/04/01 12:10:43 ryoon Exp $
+$NetBSD: patch-terminal.c,v 1.5 2019/12/19 22:22:33 joerg Exp $
 
 Make the home/end keys work on BSD servers as well as Linux ones
 
---- terminal.c.orig    2019-03-31 15:56:54.023245872 +0000
+--- terminal.c.orig    2019-09-22 09:14:51.000000000 +0000
 +++ terminal.c
-@@ -6746,8 +6746,17 @@ int format_small_keypad_key(char *buf, T
+@@ -6892,8 +6892,17 @@ int format_small_keypad_key(char *buf, T
          } else {
              p += sprintf(p, "\x1B[%c", codes[code-1]);
          }
@@ -20,7 +20,7 @@ Make the home/end keys work on BSD serve
 +          he = code == 1 ? "\x1B[7~" : "\x1B[8~";
 +      else
 +          he = code == 1 ? "\x1BOH" : "\x1BOF";
-+      p += sprintf((char *) p, he);
++      p += sprintf((char *) p, "%s", he);
      } else {
          p += sprintf(p, "\x1B[%d~", code);
      }