diff options
author | wiz <wiz> | 2012-02-22 15:27:13 +0000 |
---|---|---|
committer | wiz <wiz> | 2012-02-22 15:27:13 +0000 |
commit | 542953f964f376abeb2bc74fbef063757d3f125b (patch) | |
tree | 0a8b52fdbc315db0b66a3d081ca6c80571123688 /security/putty/patches | |
parent | 536b6a8064f0f9d806f47e333c23f781a3ca1a57 (diff) | |
download | pkgsrc-542953f964f376abeb2bc74fbef063757d3f125b.tar.gz |
Update to 0.62, keeping all pkgsrc patches which have not been fed upstream (hi roy! hi rillig!)
2011-12-10 PuTTY 0.62 released
PuTTY 0.62 is out, containing only bug fixes from 0.61, in particular a security fix preventing passwords from being accidentally
retained in memory.
2011-11-27 PuTTY 0.62 pre-release builds available
PuTTY 0.61 had a few noticeable bugs in it (but nothing security-related), so we are planning to make a 0.62 release containing just bug
fixes. The Wishlist page lists the bugs that will be fixed by the 0.62 release. The Download page now contains pre-release snapshots of
0.62, which contain those bug fixes and should be otherwise stable. (The usual development snapshots, containing other development since
0.61, are also still available.)
2011-07-12 PuTTY 0.61 is released
PuTTY 0.61 is out, after over four years (sorry!), with new features, bug fixes, and compatibility updates for Windows 7 and various SSH
server software.
Diffstat (limited to 'security/putty/patches')
-rw-r--r-- | security/putty/patches/patch-aa | 21 | ||||
-rw-r--r-- | security/putty/patches/patch-ac | 13 | ||||
-rw-r--r-- | security/putty/patches/patch-ad | 33 | ||||
-rw-r--r-- | security/putty/patches/patch-ae | 13 | ||||
-rw-r--r-- | security/putty/patches/patch-af | 13 | ||||
-rw-r--r-- | security/putty/patches/patch-ag | 13 | ||||
-rw-r--r-- | security/putty/patches/patch-ai | 13 | ||||
-rw-r--r-- | security/putty/patches/patch-aj | 13 | ||||
-rw-r--r-- | security/putty/patches/patch-import.c (renamed from security/putty/patches/patch-ak) | 10 | ||||
-rw-r--r-- | security/putty/patches/patch-terminal.c (renamed from security/putty/patches/patch-am) | 16 | ||||
-rw-r--r-- | security/putty/patches/patch-unix_Makefile.gtk | 35 | ||||
-rw-r--r-- | security/putty/patches/patch-unix_gtkwin.c (renamed from security/putty/patches/patch-an) | 12 | ||||
-rw-r--r-- | security/putty/patches/patch-unix_uxnet.c | 17 | ||||
-rw-r--r-- | security/putty/patches/patch-windows_window.c (renamed from security/putty/patches/patch-al) | 16 |
14 files changed, 76 insertions, 162 deletions
diff --git a/security/putty/patches/patch-aa b/security/putty/patches/patch-aa deleted file mode 100644 index 8d76cd07599..00000000000 --- a/security/putty/patches/patch-aa +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2007/10/13 09:14:16 obache Exp $ - ---- unix/Makefile.gtk.orig 2007-04-29 13:41:48.000000000 +0200 -+++ unix/Makefile.gtk 2007-10-03 09:26:39.000000000 +0200 -@@ -99,14 +99,14 @@ - # TOOLPATH = /opt/gcc/bin - CC = $(TOOLPATH)cc - --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../mac/ -I../macosx/ `gtk-config --cflags` -D _FILE_OFFSET_BITS=64 - XLDFLAGS = $(LDFLAGS) `gtk-config --libs` - ULDFLAGS = $(LDFLAGS) - INSTALL=install - INSTALL_PROGRAM=$(INSTALL) - INSTALL_DATA=$(INSTALL) --prefix=/usr/local -+prefix= ${PREFIX} - exec_prefix=$(prefix) - bindir=$(exec_prefix)/bin - mandir=$(prefix)/man diff --git a/security/putty/patches/patch-ac b/security/putty/patches/patch-ac deleted file mode 100644 index 963221e915d..00000000000 --- a/security/putty/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2005/04/13 16:45:46 rillig Exp $ - ---- logging.c.orig 2005-04-06 23:11:53.000000000 +0200 -+++ logging.c 2005-04-06 23:12:15.000000000 +0200 -@@ -361,7 +361,7 @@ - char c; - s++; - size = 0; -- if (*s) switch (c = *s++, tolower(c)) { -+ if (*s) switch (c = *s++, tolower((unsigned char)c)) { - case 'y': - size = strftime(buf, sizeof(buf), "%Y", tm); - break; diff --git a/security/putty/patches/patch-ad b/security/putty/patches/patch-ad deleted file mode 100644 index 86fc24f932b..00000000000 --- a/security/putty/patches/patch-ad +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2011/12/10 20:50:51 cheusov Exp $ - ---- unix/uxnet.c.orig 2006-12-09 15:44:31.000000000 +0000 -+++ unix/uxnet.c -@@ -17,6 +17,15 @@ - #include <netdb.h> - #include <sys/un.h> - -+/* This is a hack for solaris, it keeps SIOCATMARK here. */ -+#ifndef SIOCATMARK -+#include <sys/sockio.h> -+#endif -+/* For Unix flavors that don't define INADDR_NONE */ -+#ifndef INADDR_NONE -+#define INADDR_NONE 0xffffffff -+#endif -+ - #define DEFINE_PLUG_METHOD_MACROS - #include "putty.h" - #include "network.h" -@@ -448,10 +457,10 @@ static int try_connect(Actual_Socket soc - #endif - struct sockaddr_in a; - struct sockaddr_un au; -- const struct sockaddr *sa; -+ const struct sockaddr *sa = NULL; - int err = 0; - short localport; -- int fl, salen; -+ int fl, salen = 0; - - if (sock->s >= 0) - close(sock->s); diff --git a/security/putty/patches/patch-ae b/security/putty/patches/patch-ae deleted file mode 100644 index ef6b31fc645..00000000000 --- a/security/putty/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.2 2005/04/13 16:45:46 rillig Exp $ - ---- charset/localenc.c.orig Tue Apr 5 21:37:48 2005 -+++ charset/localenc.c Tue Apr 12 10:29:00 2005 -@@ -101,7 +101,7 @@ int charset_from_localenc(const char *na - p = name; - q = localencs[i].name; - while (*p || *q) { -- if (tolower(*p) != tolower(*q)) -+ if (tolower((unsigned char)*p) != tolower((unsigned char)*q)) - break; - p++; q++; - } diff --git a/security/putty/patches/patch-af b/security/putty/patches/patch-af deleted file mode 100644 index 5103591a951..00000000000 --- a/security/putty/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.2 2005/04/13 16:45:46 rillig Exp $ - ---- charset/mimeenc.c.orig 2005-04-06 23:14:37.000000000 +0200 -+++ charset/mimeenc.c 2005-04-06 23:14:57.000000000 +0200 -@@ -197,7 +197,7 @@ - p = name; - q = mimeencs[i].name; - while (*p || *q) { -- if (tolower(*p) != tolower(*q)) -+ if (tolower((unsigned char)*p) != tolower((unsigned char)*q)) - break; - p++; q++; - } diff --git a/security/putty/patches/patch-ag b/security/putty/patches/patch-ag deleted file mode 100644 index a3804667267..00000000000 --- a/security/putty/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2005/04/13 16:45:46 rillig Exp $ - ---- terminal.c.orig 2005-04-06 23:15:37.000000000 +0200 -+++ terminal.c 2005-04-06 23:15:48.000000000 +0200 -@@ -5818,7 +5818,7 @@ - if (modifiers & PKM_CONTROL) - c &= 0x1f; - else if (modifiers & PKM_SHIFT) -- c = toupper(c); -+ c = toupper((unsigned char)c); - } - *p++ = c; - goto done; diff --git a/security/putty/patches/patch-ai b/security/putty/patches/patch-ai deleted file mode 100644 index eedfd7fc4ad..00000000000 --- a/security/putty/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ai,v 1.2 2005/04/13 16:45:46 rillig Exp $ - ---- charset/xenc.c.orig 2005-04-06 23:29:15.000000000 +0200 -+++ charset/xenc.c 2005-04-06 23:29:31.000000000 +0200 -@@ -80,7 +80,7 @@ - p = name; - q = xencs[i].name; - while (*p || *q) { -- if (tolower(*p) != tolower(*q)) -+ if (tolower((unsigned char)*p) != tolower((unsigned char)*q)) - break; - p++; q++; - } diff --git a/security/putty/patches/patch-aj b/security/putty/patches/patch-aj deleted file mode 100644 index a564dd211bb..00000000000 --- a/security/putty/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.2 2005/04/13 16:45:46 rillig Exp $ - ---- cmdgen.c.orig 2005-04-06 23:30:02.000000000 +0200 -+++ cmdgen.c 2005-04-06 23:30:15.000000000 +0200 -@@ -114,7 +114,7 @@ - void showversion(void) - { - char *verstr = dupstr(ver); -- verstr[0] = tolower(verstr[0]); -+ verstr[0] = tolower((unsigned char)verstr[0]); - printf("PuTTYgen %s\n", verstr); - sfree(verstr); - } diff --git a/security/putty/patches/patch-ak b/security/putty/patches/patch-import.c index 13c7b5049b3..aa74a4e69ff 100644 --- a/security/putty/patches/patch-ak +++ b/security/putty/patches/patch-import.c @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.2 2005/04/13 16:45:46 rillig Exp $ +$NetBSD: patch-import.c,v 1.1 2012/02/22 15:27:16 wiz Exp $ ---- import.c.orig Tue Apr 5 21:37:51 2005 -+++ import.c Tue Apr 12 10:27:13 2005 -@@ -680,8 +680,8 @@ int openssh_write(const Filename *filena +--- import.c.orig 2010-04-12 11:02:06.000000000 +0000 ++++ import.c +@@ -717,8 +717,8 @@ int openssh_write(const Filename *filena unsigned char *outblob; int outlen; struct mpint_pos numbers[9]; @@ -13,7 +13,7 @@ $NetBSD: patch-ak,v 1.2 2005/04/13 16:45:46 rillig Exp $ char zero[1]; unsigned char iv[8]; int ret = 0; -@@ -1441,8 +1441,8 @@ int sshcom_write(const Filename *filenam +@@ -1513,8 +1513,8 @@ int sshcom_write(const Filename *filenam unsigned char *outblob; int outlen; struct mpint_pos numbers[6]; diff --git a/security/putty/patches/patch-am b/security/putty/patches/patch-terminal.c index e3f20caa757..ee2213050f0 100644 --- a/security/putty/patches/patch-am +++ b/security/putty/patches/patch-terminal.c @@ -1,12 +1,10 @@ -$NetBSD: patch-am,v 1.1 2009/02/25 18:08:01 roy Exp $ +$NetBSD: patch-terminal.c,v 1.1 2012/02/22 15:27:16 wiz Exp $ Make the home/end keys work on BSD servers as well as Linux ones -Index: terminal.c -=================================================================== ---- terminal.c (revision 8466) -+++ terminal.c (working copy) -@@ -6131,13 +6131,6 @@ +--- terminal.c.orig 2011-07-16 11:27:05.000000000 +0000 ++++ terminal.c +@@ -6202,13 +6202,6 @@ void term_key(Terminal *term, Key_Sym ke } } @@ -20,7 +18,7 @@ Index: terminal.c if (term->vt52_mode) { int xkey; -@@ -6158,11 +6151,23 @@ +@@ -6229,11 +6222,23 @@ void term_key(Terminal *term, Key_Sym ke goto done; } @@ -31,9 +29,9 @@ Index: terminal.c + * but those are Linux console */ + const char *he; + if (term->cfg.rxvt_homeend) -+ he = keysym == PK_HOME ? "\x1B[7~" : "\x1B[8~"; ++ he = keysym == PK_HOME ? "\x1B[7~" : "\x1B[8~"; + else -+ he = keysym == PK_HOME ? "\x1BOH" : "\x1BOF"; ++ he = keysym == PK_HOME ? "\x1BOH" : "\x1BOF"; + p += sprintf((char *) p, he); + goto done; + } diff --git a/security/putty/patches/patch-unix_Makefile.gtk b/security/putty/patches/patch-unix_Makefile.gtk new file mode 100644 index 00000000000..8e5031cf43e --- /dev/null +++ b/security/putty/patches/patch-unix_Makefile.gtk @@ -0,0 +1,35 @@ +$NetBSD: patch-unix_Makefile.gtk,v 1.1 2012/02/22 15:27:16 wiz 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 +@@ -119,14 +119,14 @@ GTK_CONFIG = sh -c 'pkg-config gtk+-2.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 + XLDFLAGS = $(LDFLAGS) $(shell $(GTK_CONFIG) --libs) + ULDFLAGS = $(LDFLAGS) + ifeq (,$(findstring NO_GSSAPI,$(COMPAT))) + ifeq (,$(findstring STATIC_GSSAPI,$(COMPAT))) +-XLDFLAGS+= -ldl +-ULDFLAGS+= -ldl ++XLDFLAGS+= ${DL_LIBS} ++ULDFLAGS+= ${DL_LIBS} + else + CFLAGS+= -DNO_LIBDL $(shell $(KRB5CONFIG) --cflags gssapi) + XLDFLAGS+= $(shell $(KRB5CONFIG) --libs gssapi) +@@ -136,7 +136,7 @@ endif + INSTALL=install + INSTALL_PROGRAM=$(INSTALL) + INSTALL_DATA=$(INSTALL) +-prefix=/usr/local ++prefix=${PREFIX} + exec_prefix=$(prefix) + bindir=$(exec_prefix)/bin + mandir=$(prefix)/man diff --git a/security/putty/patches/patch-an b/security/putty/patches/patch-unix_gtkwin.c index 398024755b1..544410063e3 100644 --- a/security/putty/patches/patch-an +++ b/security/putty/patches/patch-unix_gtkwin.c @@ -1,12 +1,10 @@ -$NetBSD: patch-an,v 1.1 2009/02/25 18:08:01 roy Exp $ +$NetBSD: patch-unix_gtkwin.c,v 1.1 2012/02/22 15:27:17 wiz Exp $ Make the home/end keys work on BSD servers as well as Linux ones -Index: unix/gtkwin.c -=================================================================== ---- unix/gtkwin.c (revision 8466) -+++ unix/gtkwin.c (working copy) -@@ -979,9 +979,17 @@ +--- unix/gtkwin.c.orig 2011-05-07 10:57:19.000000000 +0000 ++++ unix/gtkwin.c +@@ -1033,9 +1033,17 @@ gint key_event(GtkWidget *widget, GdkEve use_ucsoutput = FALSE; goto done; } @@ -15,7 +13,7 @@ Index: unix/gtkwin.c - use_ucsoutput = FALSE; + /* Home/End */ + if (code == 1 || code == 4) { -+ /* Send the correct XTerm or rxvt codes for home/end ++ /* Send the correct XTerm or rxvt codes for home/end + * We used to send ^[1~ and [4~ for Xterm, + * but those are Linux console */ + const char *he; diff --git a/security/putty/patches/patch-unix_uxnet.c b/security/putty/patches/patch-unix_uxnet.c new file mode 100644 index 00000000000..7268e372779 --- /dev/null +++ b/security/putty/patches/patch-unix_uxnet.c @@ -0,0 +1,17 @@ +$NetBSD: patch-unix_uxnet.c,v 1.1 2012/02/22 15:27:17 wiz Exp $ + +--- unix/uxnet.c.orig 2009-08-06 22:55:15.000000000 +0000 ++++ unix/uxnet.c +@@ -526,10 +526,10 @@ static int try_connect(Actual_Socket soc + { + int s; + union sockaddr_union u; +- const union sockaddr_union *sa; ++ const union sockaddr_union *sa = NULL; + int err = 0; + short localport; +- int fl, salen, family; ++ int fl, salen = 0, family; + + /* + * Remove the socket from the tree before we overwrite its diff --git a/security/putty/patches/patch-al b/security/putty/patches/patch-windows_window.c index 98c81f4d8fd..c7087749845 100644 --- a/security/putty/patches/patch-al +++ b/security/putty/patches/patch-windows_window.c @@ -1,12 +1,10 @@ -$NetBSD: patch-al,v 1.1 2009/02/25 18:08:01 roy Exp $ +$NetBSD: patch-windows_window.c,v 1.1 2012/02/22 15:27:17 wiz Exp $ Make the home/end keys work on BSD servers as well as Linux ones -Index: windows/window.c -=================================================================== ---- windows/window.c (revision 8466) -+++ windows/window.c (working copy) -@@ -4189,8 +4189,17 @@ +--- windows/window.c.orig 2011-07-16 11:26:19.000000000 +0000 ++++ windows/window.c +@@ -4302,8 +4302,17 @@ static int TranslateKey(UINT message, WP p += sprintf((char *) p, "\x1BO%c", code + 'P' - 11); return p - output; } @@ -16,12 +14,12 @@ Index: windows/window.c + 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 */ ++ * but those are Linux console */ + const char *he; + if (cfg.rxvt_homeend) -+ he = code == 1 ? "\x1B[7~" : "\x1B[8~"; ++ he = code == 1 ? "\x1B[7~" : "\x1B[8~"; + else -+ he = code == 1 ? "\x1BOH" : "\x1BOF"; ++ he = code == 1 ? "\x1BOH" : "\x1BOF"; + p += sprintf((char *) p, he); return p - output; } |