From 13d7005e514cdd2e2b9775b8e862094d3d010edb Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Wed, 22 Feb 2012 15:30:20 +0000
Subject: Add a patch from the putty-devel package (not needed on my -current
 though)

---
 security/putty/distinfo              |  3 ++-
 security/putty/patches/patch-ldisc.c | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 security/putty/patches/patch-ldisc.c

(limited to 'security')

diff --git a/security/putty/distinfo b/security/putty/distinfo
index 893c816d595..d314af0c739 100644
--- a/security/putty/distinfo
+++ b/security/putty/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.10 2012/02/22 15:27:13 wiz Exp $
+$NetBSD: distinfo,v 1.11 2012/02/22 15:30:20 wiz Exp $
 
 SHA1 (putty-0.62.tar.gz) = 5898438614117ee7e3704fc3f30a3c4bf2041380
 RMD160 (putty-0.62.tar.gz) = 48324416005eb4b14654fc9e0e14d39f20971507
 Size (putty-0.62.tar.gz) = 1783106 bytes
 SHA1 (patch-import.c) = c2dc26aa851a326ea89e782ef93ae7bfdc916366
+SHA1 (patch-ldisc.c) = e4dd89bfb2ddcb47aad46cc7c311f424aa6ab6be
 SHA1 (patch-terminal.c) = 48c3c928711bf7f461c0fd66490b0412f165f75b
 SHA1 (patch-unix_Makefile.gtk) = 0ad8226e2ad8e6e40d3eb9ddef4b22e7d07b7895
 SHA1 (patch-unix_gtkwin.c) = ead5e3dea292e6054afa3b9b1a9bc93fc1aff642
diff --git a/security/putty/patches/patch-ldisc.c b/security/putty/patches/patch-ldisc.c
new file mode 100644
index 00000000000..78f26423494
--- /dev/null
+++ b/security/putty/patches/patch-ldisc.c
@@ -0,0 +1,33 @@
+$NetBSD: patch-ldisc.c,v 1.1 2012/02/22 15:30:20 wiz Exp $
+
+pwrite is a standard system call
+
+--- ldisc.c.orig	2010-09-09 14:32:25.000000000 +0000
++++ ldisc.c
+@@ -41,7 +41,7 @@ static int plen(Ldisc ldisc, unsigned ch
+ 	return 4;		       /* <XY> hex representation */
+ }
+ 
+-static void pwrite(Ldisc ldisc, unsigned char c)
++static void pwrite_(Ldisc ldisc, unsigned char c)
+ {
+     if ((c >= 32 && c <= 126) ||
+ 	(!in_utf(ldisc->term) && c >= 0xA0) ||
+@@ -217,7 +217,7 @@ void ldisc_send(void *handle, char *buf,
+ 		    int i;
+ 		    c_write(ldisc, "^R\r\n", 4);
+ 		    for (i = 0; i < ldisc->buflen; i++)
+-			pwrite(ldisc, ldisc->buf[i]);
++			pwrite_(ldisc, ldisc->buf[i]);
+ 		}
+ 		break;
+ 	      case CTRL('V'):	       /* quote next char */
+@@ -284,7 +284,7 @@ void ldisc_send(void *handle, char *buf,
+ 		}
+ 		ldisc->buf[ldisc->buflen++] = c;
+ 		if (ECHOING)
+-		    pwrite(ldisc, (unsigned char) c);
++		    pwrite_(ldisc, (unsigned char) c);
+ 		ldisc->quotenext = FALSE;
+ 		break;
+ 	    }
-- 
cgit v1.2.3