Pullup ticket #4216 - requested by drochner

security/putty: security update

Revisions pulled up:
- security/putty/Makefile                                       1.34-1.35
- security/putty/distinfo                                       1.14-1.15
- security/putty/patches/patch-CVE-2013-4852-1                  deleted
- security/putty/patches/patch-CVE-2013-4852-2                  deleted
- security/putty/patches/patch-import.c                         1.2-1.3
- security/putty/patches/patch-terminal.c                       deleted
- security/putty/patches/patch-timing.c                         1.2
- security/putty/patches/patch-unix_gtkfont_c                   deleted
- security/putty/patches/patch-unix_gtkwin.c                    1.3
- security/putty/patches/patch-unix_uxnet.c                     1.2
- security/putty/patches/patch-unix_uxucs.c                     1.2
- security/putty/patches/patch-windows_window.c                 1.2

---
   Module Name:    pkgsrc
   Committed By:   drochner
   Date:           Tue Aug  6 12:23:37 UTC 2013

   Modified Files:
           pkgsrc/security/putty: Makefile distinfo
           pkgsrc/security/putty/patches: patch-import.c
   Added Files:
           pkgsrc/security/putty/patches: patch-CVE-2013-4852-1
               patch-CVE-2013-4852-2

   Log Message:
   add patch from upstream to fix possible heap overflow in SSH handshake
   due to integer overflow (CVE-2013-4852)
   bump PKGREV

---
   Module Name:    pkgsrc
   Committed By:   drochner
   Date:           Wed Aug  7 11:06:39 UTC 2013

   Modified Files:
           pkgsrc/security/putty: Makefile distinfo
           pkgsrc/security/putty/patches: patch-import.c patch-timing.c
               patch-unix_gtkwin.c patch-unix_uxnet.c patch-unix_uxucs.c
               patch-windows_window.c
   Removed Files:
           pkgsrc/security/putty/patches: patch-CVE-2013-4852-1
               patch-CVE-2013-4852-2 patch-terminal.c patch-unix_gtkfont_c

   Log Message:
   update to 0.63
   This fixes a buffer overflow which was patched in pkgsrc
   (CVE-2013-4852), two other buffer overflows (CVE-2013-4206,
   CVE-2013-4207), and it clears private keys after use now
   (CVE-2013-4208). Other than that, there are mostly bug fixes from 0.62
   and a few small features.

1 files changed, 6 insertions, 5 deletions

diff --git a/security/putty/patches/patch-windows_window.c b/security/putty/patches/patch-windows_window.c
index c7087749845..3df3c07df72 100644
--- a/security/putty/patches/patch-windows_window.c
+++ b/security/putty/patches/patch-windows_window.c
@@ -1,14 +1,15 @@
-$NetBSD: patch-windows_window.c,v 1.1 2012/02/22 15:27:17 wiz Exp $
+$NetBSD: patch-windows_window.c,v 1.1.14.1 2013/08/21 19:40:13 tron Exp $
 
 Make the home/end keys work on BSD servers as well as Linux ones
 
---- windows/window.c.orig	2011-07-16 11:26:19.000000000 +0000
+--- windows/window.c.orig	2013-08-04 19:32:10.000000000 +0000
 +++ windows/window.c
-@@ -4302,8 +4302,17 @@ static int TranslateKey(UINT message, WP
+@@ -4520,9 +4520,17 @@ static int TranslateKey(UINT message, WP
  		p += sprintf((char *) p, "\x1BO%c", code + 'P' - 11);
  	    return p - output;
  	}
--	if (cfg.rxvt_homeend && (code == 1 || code == 4)) {
+-	if ((code == 1 || code == 4) &&
+-	    conf_get_int(conf, CONF_rxvt_homeend)) {
 -	    p += sprintf((char *) p, code == 1 ? "\x1B[H" : "\x1BOw");
 +	/* Home/End */
 +	if (code == 1 || code == 4) {
@@ -16,7 +17,7 @@ Make the home/end keys work on BSD servers as well as Linux ones
 +	     * We used to send ^[1~ and [4~ for Xterm,
 +             * but those are Linux console */
 +	    const char *he;
-+	    if (cfg.rxvt_homeend)
++	    if (conf_get_int(conf, CONF_rxvt_homeend))
 +		he = code == 1 ? "\x1B[7~" : "\x1B[8~";
 +	    else
 +		he = code == 1 ? "\x1BOH" : "\x1BOF";