diff options
| author | joerg <joerg@pkgsrc.org> | 2014-03-06 15:45:09 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2014-03-06 15:45:09 +0000 |
| commit | 00e572defa84973b4b309b4a49b5b703bff11fe4 (patch) | |
| tree | c48929aa6f7aa1dc91ea06e85b16110faac398b6 /security/putty | |
| parent | 4756842d37fdde8de656470fdf89faf80120b63c (diff) | |
| download | pkgsrc-00e572defa84973b4b309b4a49b5b703bff11fe4.tar.gz | |
Fix 64bit time_t use. Bump revision.
Diffstat (limited to 'security/putty')
| -rw-r--r-- | security/putty/Makefile | 4 | ||||
| -rw-r--r-- | security/putty/distinfo | 3 | ||||
| -rw-r--r-- | security/putty/patches/patch-x11fwd.c | 21 |
3 files changed, 25 insertions, 3 deletions
diff --git a/security/putty/Makefile b/security/putty/Makefile index 514b36be021..3dde0788a0b 100644 --- a/security/putty/Makefile +++ b/security/putty/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.37 2013/10/10 14:42:31 ryoon Exp $ +# $NetBSD: Makefile,v 1.38 2014/03/06 15:45:09 joerg Exp $ # DISTNAME= putty-0.63 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= security MASTER_SITES= http://the.earth.li/~sgtatham/putty/0.63/ diff --git a/security/putty/distinfo b/security/putty/distinfo index cb4f88ba950..ffedd9b1d97 100644 --- a/security/putty/distinfo +++ b/security/putty/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2013/08/07 11:06:39 drochner 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 diff --git a/security/putty/patches/patch-x11fwd.c b/security/putty/patches/patch-x11fwd.c new file mode 100644 index 00000000000..2094a7e15be --- /dev/null +++ b/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; |