[pkgsrc/trunk]: pkgsrc/security/putty putty: update to 0.68

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d009d62dcb9f
branches:  trunk
changeset: 359734:d009d62dcb9f
user:      maya <maya%pkgsrc.org@localhost>
date:      Fri Mar 17 00:11:48 2017 +0000

description:
putty: update to 0.68

PuTTY 0.68, released today, supports elliptic-curve cryptography for host
keys, user authentication keys, and key exchange. Also, for the first time,
it comes in a 64-bit Windows version.

This update may create a build issue for non-BSD due to ancient functions
being different on BSD and SYSV. there's always macros if this fails.

diffstat:

 security/putty/Makefile                        |   5 ++---
 security/putty/distinfo                        |  17 ++++++++---------
 security/putty/patches/patch-import.c          |  26 --------------------------
 security/putty/patches/patch-unix_Makefile.gtk |  11 +++++------
 security/putty/patches/patch-unix_gtkwin.c     |  14 +++++++++-----
 security/putty/patches/patch-unix_uxpgnt.c     |  19 +++++++++++++++++++
 security/putty/patches/patch-x11fwd.c          |  21 ---------------------
 7 files changed, 43 insertions(+), 70 deletions(-)

diffs (194 lines):

diff -r fd336a0c193f -r d009d62dcb9f security/putty/Makefile
--- a/security/putty/Makefile   Thu Mar 16 23:39:05 2017 +0000
+++ b/security/putty/Makefile   Fri Mar 17 00:11:48 2017 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2017/02/12 06:25:57 ryoon Exp $
+# $NetBSD: Makefile,v 1.47 2017/03/17 00:11:48 maya Exp $
 #
 
-DISTNAME=      putty-0.67
-PKGREVISION=   3
+DISTNAME=      putty-0.68
 CATEGORIES=    security
 MASTER_SITES=  http://the.earth.li/~sgtatham/putty/${PKGVERSION_NOREV}/
 
diff -r fd336a0c193f -r d009d62dcb9f security/putty/distinfo
--- a/security/putty/distinfo   Thu Mar 16 23:39:05 2017 +0000
+++ b/security/putty/distinfo   Fri Mar 17 00:11:48 2017 +0000
@@ -1,16 +1,15 @@
-$NetBSD: distinfo,v 1.20 2016/03/14 14:07:30 ryoon Exp $
+$NetBSD: distinfo,v 1.21 2017/03/17 00:11:48 maya Exp $
 
-SHA1 (putty-0.67.tar.gz) = 132ff74266e590a007f86cbb4bea5642db7bdd76
-RMD160 (putty-0.67.tar.gz) = 910dc2257337eefcbe656d2d05bbf4ecc4fda22c
-SHA512 (putty-0.67.tar.gz) = c2b17da46b8db3fe3837a10cb9cf5dd4b3ef6bfa15cadab83f3b87cf1479ed31fced90b774297ae53bdcbbdf230fc80d5c73d5ff3be6916fb591fd7ce3d35eca
-Size (putty-0.67.tar.gz) = 1955547 bytes
-SHA1 (patch-import.c) = da6a34ec3412985858babb28821296c40e30d96b
+SHA1 (putty-0.68.tar.gz) = e6acf0285e0718516cfa1fe775b1a92765387d70
+RMD160 (putty-0.68.tar.gz) = c5a07a3250f857cdcce619ef35953ed46c260788
+SHA512 (putty-0.68.tar.gz) = e3a6e4f45e1fce70d4cbb6d4769ab72b23c10920e48a88bba95b3f4c225b0193ddc1444e69d572bdec5e505d2c56fed365f07d990c156b35f272b56f978ef5d3
+Size (putty-0.68.tar.gz) = 2114499 bytes
 SHA1 (patch-ldisc.c) = e4dd89bfb2ddcb47aad46cc7c311f424aa6ab6be
 SHA1 (patch-misc.c) = fb7ba23f3c3301181d2ca7666a037f7bb3ac3f7b
 SHA1 (patch-timing.c) = 9dd79fde390878960e97c456628bbd5dcbcd07f9
-SHA1 (patch-unix_Makefile.gtk) = 0ad8226e2ad8e6e40d3eb9ddef4b22e7d07b7895
-SHA1 (patch-unix_gtkwin.c) = ccabdde03fda8bbc24d659a440fe48f96ab5d867
+SHA1 (patch-unix_Makefile.gtk) = 399636a9b6d445fa0cdd55c7a887efa8f03bdc94
+SHA1 (patch-unix_gtkwin.c) = 110079a07a802f93705c6526a14069491f1c313e
 SHA1 (patch-unix_uxnet.c) = 2d1c2939721993fe5616c2fe3f1935c03a31bb35
+SHA1 (patch-unix_uxpgnt.c) = 2aa46f5ba17f436007d926abc529ee0cfb82ff52
 SHA1 (patch-unix_uxucs.c) = a2a5021b515c3bade1126ed062bdc1eece1ca0f9
 SHA1 (patch-windows_window.c) = e851bad963967429131286c18e39d1ac4add4ae7
-SHA1 (patch-x11fwd.c) = 119ac9d5b3eda83f01616490aea42a4e8fe2814a
diff -r fd336a0c193f -r d009d62dcb9f security/putty/patches/patch-import.c
--- a/security/putty/patches/patch-import.c     Thu Mar 16 23:39:05 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-import.c,v 1.3 2013/08/07 11:06:39 drochner Exp $
-
---- import.c.orig      2013-07-20 13:15:20.000000000 +0000
-+++ import.c
-@@ -725,8 +725,8 @@ int openssh_write(const Filename *filena
-     unsigned char *outblob;
-     int outlen;
-     struct mpint_pos numbers[9];
--    int nnumbers, pos, len, seqlen, i;
--    char *header, *footer;
-+    int nnumbers = 0, pos = 0, len = 0, seqlen = 0, i = 0;
-+    char *header = NULL, *footer = NULL;
-     char zero[1];
-     unsigned char iv[8];
-     int ret = 0;
-@@ -1547,8 +1547,8 @@ int sshcom_write(const Filename *filenam
-     unsigned char *outblob;
-     int outlen;
-     struct mpint_pos numbers[6];
--    int nnumbers, initial_zero, pos, lenpos, i;
--    char *type;
-+    int nnumbers = 0, initial_zero = 0, pos = 0, lenpos = 0, i = 0;
-+    char *type = NULL;
-     char *ciphertext;
-     int cipherlen;
-     int ret = 0;
diff -r fd336a0c193f -r d009d62dcb9f security/putty/patches/patch-unix_Makefile.gtk
--- a/security/putty/patches/patch-unix_Makefile.gtk    Thu Mar 16 23:39:05 2017 +0000
+++ b/security/putty/patches/patch-unix_Makefile.gtk    Fri Mar 17 00:11:48 2017 +0000
@@ -1,18 +1,17 @@
-$NetBSD: patch-unix_Makefile.gtk,v 1.1 2012/02/22 15:27:16 wiz Exp $
+$NetBSD: patch-unix_Makefile.gtk,v 1.2 2017/03/17 00:11:48 maya Exp $
 
 Allow adding CFLAGS from the pkgsrc environment.
 Use pkgsrc infrastructure for deciding on whether to link against libdl or not.
-Set prefix suitable for pkgsrc.
 
---- unix/Makefile.gtk.orig     2011-12-10 12:35:15.000000000 +0000
+--- unix/Makefile.gtk.orig     2017-02-18 17:10:17.000000000 +0000
 +++ unix/Makefile.gtk
-@@ -119,14 +119,14 @@ GTK_CONFIG = sh -c 'pkg-config gtk+-2.0 
+@@ -111,14 +111,14 @@ GTK_CONFIG = sh -c 'pkg-config gtk+-3.0 
  
  unexport CFLAGS # work around a weird issue with krb5-config
  
 -CFLAGS = -O2 -Wall -Werror -g -I.././ -I../charset/ -I../windows/ -I../unix/ \
 +CFLAGS += -O2 -Wall -Werror -g -I.././ -I../charset/ -I../windows/ -I../unix/ \
-               -I../macosx/ $(shell $(GTK_CONFIG) --cflags) -D _FILE_OFFSET_BITS=64
+               $(shell $(GTK_CONFIG) --cflags) -D _FILE_OFFSET_BITS=64
  XLDFLAGS = $(LDFLAGS) $(shell $(GTK_CONFIG) --libs)
  ULDFLAGS = $(LDFLAGS)
  ifeq (,$(findstring NO_GSSAPI,$(COMPAT)))
@@ -24,7 +23,7 @@
  else
  CFLAGS+= -DNO_LIBDL $(shell $(KRB5CONFIG) --cflags gssapi)
  XLDFLAGS+= $(shell $(KRB5CONFIG) --libs gssapi)
-@@ -136,7 +136,7 @@ endif
+@@ -128,7 +128,7 @@ endif
  INSTALL=install
  INSTALL_PROGRAM=$(INSTALL)
  INSTALL_DATA=$(INSTALL)
diff -r fd336a0c193f -r d009d62dcb9f security/putty/patches/patch-unix_gtkwin.c
--- a/security/putty/patches/patch-unix_gtkwin.c        Thu Mar 16 23:39:05 2017 +0000
+++ b/security/putty/patches/patch-unix_gtkwin.c        Fri Mar 17 00:11:48 2017 +0000
@@ -1,19 +1,22 @@
-$NetBSD: patch-unix_gtkwin.c,v 1.3 2013/08/07 11:06:39 drochner Exp $
+$NetBSD: patch-unix_gtkwin.c,v 1.4 2017/03/17 00:11:48 maya Exp $
 
 Make the home/end keys work on BSD servers as well as Linux ones
 
---- unix/gtkwin.c.orig 2013-07-20 13:15:10.000000000 +0000
+--- unix/gtkwin.c.orig 2017-02-18 17:10:15.000000000 +0000
 +++ unix/gtkwin.c
-@@ -1132,10 +1132,17 @@ gint key_event(GtkWidget *widget, GdkEve
+@@ -1586,13 +1586,21 @@ gint key_event(GtkWidget *widget, GdkEve
                use_ucsoutput = FALSE;
                goto done;
            }
 -          if ((code == 1 || code == 4) &&
 -              conf_get_int(inst->conf, CONF_rxvt_homeend)) {
++          /* Home/End */
++          if (code == 1 || code == 4) {
+ #ifdef KEY_EVENT_DIAGNOSTICS
+                 debug((" - rxvt style Home/End"));
+ #endif
 -              end = 1 + sprintf(output+1, code == 1 ? "\x1B[H" : "\x1BOw");
 -              use_ucsoutput = FALSE;
-+          /* Home/End */
-+          if (code == 1 || code == 4) {
 +              /* Send the correct XTerm or rxvt codes for home/end
 +               * We used to send ^[1~ and [4~ for Xterm,
 +               * but those are Linux console */
@@ -23,6 +26,7 @@
 +              else
 +                  he = code == 1 ? "\x1BOH" : "\x1BOF";
 +              end = 1 + sprintf(output+1, "%s", he);
++
                goto done;
            }
            if (code) {
diff -r fd336a0c193f -r d009d62dcb9f security/putty/patches/patch-unix_uxpgnt.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/putty/patches/patch-unix_uxpgnt.c        Fri Mar 17 00:11:48 2017 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-unix_uxpgnt.c,v 1.1 2017/03/17 00:11:48 maya Exp $
+
+BSD setpgrp has parameters. POSIX says it is undefined whether
+setpgrp(0,0) == setpgrp() and it should use setpgid.
+
+If this is a problem on glibc, it should support both based
+on defines.
+
+--- unix/uxpgnt.c.orig 2017-02-18 17:10:15.000000000 +0000
++++ unix/uxpgnt.c
+@@ -270,7 +270,7 @@ void pageant_fork_and_print_env(int reta
+         /* Get out of our previous process group, to avoid being
+          * blasted by passing signals. But keep our controlling tty,
+          * so we can keep checking to see if we still have one. */
+-        setpgrp();
++        setpgid(0, 0);
+     } else {
+         /* Do that, but also leave our entire session and detach from
+          * the controlling tty (if any). */
diff -r fd336a0c193f -r d009d62dcb9f security/putty/patches/patch-x11fwd.c
--- a/security/putty/patches/patch-x11fwd.c     Thu Mar 16 23:39:05 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-x11fwd.c,v 1.1 2014/03/06 15:45:09 joerg Exp $
-
---- x11fwd.c.orig      2014-03-02 19:24:55.000000000 +0000
-+++ x11fwd.c
-@@ -2,6 +2,7 @@
-  * Platform-independent bits of X11 forwarding.
-  */
- 
-+#include <inttypes.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <assert.h>
-@@ -312,7 +313,7 @@ static char *x11_verify(unsigned long pe
-           if (data[i] != 0)          /* zero padding wrong */
-               return "XDM-AUTHORIZATION-1 data failed check";
-       tim = time(NULL);
--      if (abs(t - tim) > XDM_MAXSKEW)
-+      if (imaxabs((intmax_t)t - tim) > XDM_MAXSKEW)
-           return "XDM-AUTHORIZATION-1 time stamp was too far out";
-       seen = snew(struct XDMSeen);
-       seen->time = t;