Import of pkgsrc-2014Q1

security/putty/Makefile

@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.33.2.1 2013/08/21 19:40:13 tron Exp $
+# $NetBSD: Makefile,v 1.38 2014/03/06 15:45:09 joerg Exp $
 #
 
 DISTNAME=	putty-0.63
+PKGREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	http://the.earth.li/~sgtatham/putty/0.63/
 

security/putty/distinfo

@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13.6.1 2013/08/21 19:40:13 tron Exp $
+$NetBSD: distinfo,v 1.16 2014/03/06 15:45:09 joerg Exp $
 
 SHA1 (putty-0.63.tar.gz) = 195c0603ef61082b91276faa8d4246ea472bba3b
 RMD160 (putty-0.63.tar.gz) = cf28d88a5f0e1db6c21bb0308bd59ed4d6399e5f
@@ -11,3 +11,4 @@ SHA1 (patch-unix_gtkwin.c) = ccabdde03fda8bbc24d659a440fe48f96ab5d867
 SHA1 (patch-unix_uxnet.c) = 2d1c2939721993fe5616c2fe3f1935c03a31bb35
 SHA1 (patch-unix_uxucs.c) = a2a5021b515c3bade1126ed062bdc1eece1ca0f9
 SHA1 (patch-windows_window.c) = e851bad963967429131286c18e39d1ac4add4ae7
+SHA1 (patch-x11fwd.c) = 119ac9d5b3eda83f01616490aea42a4e8fe2814a

security/putty/patches/patch-import.c

@@ -1,4 +1,4 @@
-$NetBSD: patch-import.c,v 1.1.14.1 2013/08/21 19:40:13 tron Exp $
+$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

security/putty/patches/patch-timing.c

@@ -1,4 +1,4 @@
-$NetBSD: patch-timing.c,v 1.1.6.1 2013/08/21 19:40:13 tron Exp $
+$NetBSD: patch-timing.c,v 1.2 2013/08/07 11:06:39 drochner Exp $
 
 --- timing.c.orig	2012-09-19 22:12:00.000000000 +0000
 +++ timing.c

security/putty/patches/patch-unix_gtkwin.c

@@ -1,4 +1,4 @@
-$NetBSD: patch-unix_gtkwin.c,v 1.2.6.1 2013/08/21 19:40:13 tron Exp $
+$NetBSD: patch-unix_gtkwin.c,v 1.3 2013/08/07 11:06:39 drochner Exp $
 
 Make the home/end keys work on BSD servers as well as Linux ones
 

security/putty/patches/patch-unix_uxnet.c

@@ -1,4 +1,4 @@
-$NetBSD: patch-unix_uxnet.c,v 1.1.14.1 2013/08/21 19:40:13 tron Exp $
+$NetBSD: patch-unix_uxnet.c,v 1.2 2013/08/07 11:06:39 drochner Exp $
 
 --- unix/uxnet.c.orig	2013-07-27 18:35:48.000000000 +0000
 +++ unix/uxnet.c

security/putty/patches/patch-unix_uxucs.c

@@ -1,4 +1,4 @@
-$NetBSD: patch-unix_uxucs.c,v 1.1.6.1 2013/08/21 19:40:13 tron Exp $
+$NetBSD: patch-unix_uxucs.c,v 1.2 2013/08/07 11:06:39 drochner Exp $
 
 --- unix/uxucs.c.orig	2013-07-22 07:12:05.000000000 +0000
 +++ unix/uxucs.c

security/putty/patches/patch-windows_window.c

@@ -1,4 +1,4 @@
-$NetBSD: patch-windows_window.c,v 1.1.14.1 2013/08/21 19:40:13 tron Exp $
+$NetBSD: patch-windows_window.c,v 1.2 2013/08/07 11:06:39 drochner Exp $
 
 Make the home/end keys work on BSD servers as well as Linux ones
 

security/putty/patches/patch-x11fwd.c

@@ -0,0 +1,21 @@
+$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;