From 1d08d2b8de70e29319d5e6221cfea10d15c916e7 Mon Sep 17 00:00:00 2001
From: ryoon <ryoon>
Date: Wed, 8 Apr 2015 18:45:21 +0000
Subject: Update to 0.64

* Avoid compilation error on tolower and char type.

Changelog:
2015-02-28 PuTTY 0.64 released, fixing a SECURITY HOLE

PuTTY 0.64, released today, fixes a security hole in 0.63 and before:
private-key-not-wiped-2. Also diffie-hellman-range-check has been argued
to be a security hole. In addition to these and other less critical bug
fixes, 0.64 also supports the major new feature of sharing an SSH connection
between multiple instances of PuTTY and its tools, and a command-line and
config option to specify the expected host key(s).
---
 security/putty/Makefile             |  7 +++----
 security/putty/distinfo             |  9 +++++----
 security/putty/patches/patch-misc.c | 13 +++++++++++++
 3 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100644 security/putty/patches/patch-misc.c

(limited to 'security')

diff --git a/security/putty/Makefile b/security/putty/Makefile
index bbd317009f8..2a07b719c10 100644
--- a/security/putty/Makefile
+++ b/security/putty/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.39 2014/05/05 00:48:19 ryoon Exp $
+# $NetBSD: Makefile,v 1.40 2015/04/08 18:45:21 ryoon Exp $
 #
 
-DISTNAME=	putty-0.63
-PKGREVISION=	4
+DISTNAME=	putty-0.64
 CATEGORIES=	security
-MASTER_SITES=	http://the.earth.li/~sgtatham/putty/0.63/
+MASTER_SITES=	http://the.earth.li/~sgtatham/putty/0.64/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.chiark.greenend.org.uk/~sgtatham/putty/
diff --git a/security/putty/distinfo b/security/putty/distinfo
index ffedd9b1d97..af1ad7fc1d6 100644
--- a/security/putty/distinfo
+++ b/security/putty/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.16 2014/03/06 15:45:09 joerg Exp $
+$NetBSD: distinfo,v 1.17 2015/04/08 18:45:21 ryoon Exp $
 
-SHA1 (putty-0.63.tar.gz) = 195c0603ef61082b91276faa8d4246ea472bba3b
-RMD160 (putty-0.63.tar.gz) = cf28d88a5f0e1db6c21bb0308bd59ed4d6399e5f
-Size (putty-0.63.tar.gz) = 1887913 bytes
+SHA1 (putty-0.64.tar.gz) = 633fe0906a768f9843e328cafa3eed1ad1c02c59
+RMD160 (putty-0.64.tar.gz) = 7036a7b8f0e402524e884b946a007adadb2ba436
+Size (putty-0.64.tar.gz) = 1977448 bytes
 SHA1 (patch-import.c) = da6a34ec3412985858babb28821296c40e30d96b
 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
diff --git a/security/putty/patches/patch-misc.c b/security/putty/patches/patch-misc.c
new file mode 100644
index 00000000000..0d972369e46
--- /dev/null
+++ b/security/putty/patches/patch-misc.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-misc.c,v 1.1 2015/04/08 18:45:22 ryoon Exp $
+
+--- misc.c.orig	2015-02-28 15:33:27.000000000 +0000
++++ misc.c
+@@ -964,7 +964,7 @@ int validate_manual_hostkey(char *key)
+                 if (q[3*i+2] != ':')
+                     goto not_fingerprint; /* sorry */
+             for (i = 0; i < 16*3 - 1; i++)
+-                key[i] = tolower(q[i]);
++                key[i] = tolower((unsigned char)(q[i]));
+             key[16*3 - 1] = '\0';
+             return TRUE;
+         }
-- 
cgit v1.2.3