Fixed the patched to use the <ctype.h> functions correctly, that is:

isalpha((unsigned char)*s) instead of isalpha((int)*s). Also replaced
WRKSRC with BUILD_DIRS, which is more appropriate. Approved by jlam.

12 files changed, 60 insertions, 59 deletions

diff --git a/security/putty/Makefile b/security/putty/Makefile
index a290f07fe55..d54d2849f3e 100644
--- a/security/putty/Makefile
+++ b/security/putty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:18 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/13 16:45:46 rillig Exp $
 #
 
 DISTNAME=	putty-0.58
@@ -11,7 +11,7 @@ COMMENT=	Free implementation of Telnet and SSH for Win32 and Unix platforms
 
 USE_GNU_TOOLS+=	make
 USE_X11=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME}/unix
+BUILD_DIRS=	${WRKSRC}/unix
 
 MAKEFILE=	Makefile.gtk
 
diff --git a/security/putty/distinfo b/security/putty/distinfo
index da724ca2ab0..7c809fc1ac4 100644
--- a/security/putty/distinfo
+++ b/security/putty/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.4 2005/04/06 21:51:13 xtraeme Exp $
+$NetBSD: distinfo,v 1.5 2005/04/13 16:45:46 rillig Exp $
 
 SHA1 (putty-0.58.tar.gz) = 25504ca4fe4e3b1a8d96d9c50be5eb6cd370f018
 RMD160 (putty-0.58.tar.gz) = 3a01b629d9646d2c328881d3011a9f2da08702dd
 Size (putty-0.58.tar.gz) = 1567268 bytes
-SHA1 (patch-aa) = a03ab13bddca16aef6f8b2c5a2ceb4ae10ee972a
-SHA1 (patch-ac) = 58c3928a0903ce9028fa47d1caa42b8502c29f56
-SHA1 (patch-ad) = a5ff354431f4f21309dc697d7a355708789eee9d
-SHA1 (patch-ae) = e54b92ea6b4030ee9ac342fcc0d3edb98c8d1c45
-SHA1 (patch-af) = f479153cfe14d93ba5d538f48268bbce2ebdf17d
-SHA1 (patch-ag) = c38cde511ab5730d13451628d0763460ca37e759
-SHA1 (patch-ah) = c01fc3bd3527d784685d4eda2f07a2e0bd22b46d
-SHA1 (patch-ai) = eacb4a3ecb97e5e636baf65aa9a3d721137369ad
-SHA1 (patch-aj) = 48f2d8581110c79767f4af1393a619db3271c7f3
-SHA1 (patch-ak) = a9aaa2c3c7945559f802b2a7a6c628ad7fa0cece
+SHA1 (patch-aa) = 8d8cb757bc3faeb8ab7fbfd00e96162c9cdfc7bc
+SHA1 (patch-ac) = 61cc8640417931a04152d4f4a1d6daa420d85496
+SHA1 (patch-ad) = b90f5fc8ebd7bb1227dc18ed93afe104e5e40490
+SHA1 (patch-ae) = 82bd150f0dfb59eda57e4d9bca7abfc8093090a9
+SHA1 (patch-af) = 549688da80048f57530f23d59799c04f09ddbdca
+SHA1 (patch-ag) = 2012609deff68e4931538b1a987c02b532bf04be
+SHA1 (patch-ah) = 38f64084ff1618d751a8f51871b3e95f84e6afc9
+SHA1 (patch-ai) = 3965e71c222d7db61d5d852dedf8fb3ec082c9a1
+SHA1 (patch-aj) = 7c22c5cb2c41445fa70dfff9e6d756af444daf06
+SHA1 (patch-ak) = 2ca42d1ea913505d7d265a3fde71e09aa292d75f
diff --git a/security/putty/patches/patch-aa b/security/putty/patches/patch-aa
index 31166bede51..79a261dfd45 100644
--- a/security/putty/patches/patch-aa
+++ b/security/putty/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2005/04/06 21:51:13 xtraeme Exp $
+$NetBSD: patch-aa,v 1.3 2005/04/13 16:45:46 rillig Exp $
 
---- Makefile.gtk.orig	2005-04-06 23:00:44.000000000 +0200
-+++ Makefile.gtk	2005-04-06 23:04:54.000000000 +0200
+--- unix/Makefile.gtk.orig	2005-04-06 23:00:44.000000000 +0200
++++ unix/Makefile.gtk	2005-04-06 23:04:54.000000000 +0200
 @@ -80,16 +80,13 @@
  
  # You can define this path to point at your tools if you need to
diff --git a/security/putty/patches/patch-ac b/security/putty/patches/patch-ac
index 9bedb727f5b..963221e915d 100644
--- a/security/putty/patches/patch-ac
+++ b/security/putty/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2005/04/06 21:51:13 xtraeme Exp $
+$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
+--- 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((int)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
index 4861e62ebc4..f3ecb7f6164 100644
--- a/security/putty/patches/patch-ad
+++ b/security/putty/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1 2005/04/06 21:51:13 xtraeme Exp $
+$NetBSD: patch-ad,v 1.2 2005/04/13 16:45:46 rillig Exp $
 
---- uxnet.c.orig	2005-04-06 23:12:47.000000000 +0200
-+++ uxnet.c	2005-04-06 23:13:06.000000000 +0200
+--- unix/uxnet.c.orig	2005-04-06 23:12:47.000000000 +0200
++++ unix/uxnet.c	2005-04-06 23:13:06.000000000 +0200
 @@ -443,10 +443,10 @@
  #endif
      struct sockaddr_in a;
diff --git a/security/putty/patches/patch-ae b/security/putty/patches/patch-ae
index 7716574b556..ef6b31fc645 100644
--- a/security/putty/patches/patch-ae
+++ b/security/putty/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2005/04/06 21:51:13 xtraeme Exp $
+$NetBSD: patch-ae,v 1.2 2005/04/13 16:45:46 rillig Exp $
 
---- ../charset/localenc.c.orig	2005-04-06 23:13:39.000000000 +0200
-+++ ../charset/localenc.c	2005-04-06 23:13:57.000000000 +0200
-@@ -101,7 +101,7 @@
+--- 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((int)*p) != tolower((int)*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
index ae68d6189c4..5103591a951 100644
--- a/security/putty/patches/patch-af
+++ b/security/putty/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.1 2005/04/06 21:51:13 xtraeme Exp $
+$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
+--- 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((int)*p) != tolower((int)*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
index 61ecc5e000a..a3804667267 100644
--- a/security/putty/patches/patch-ag
+++ b/security/putty/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.1 2005/04/06 21:51:13 xtraeme Exp $
+$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
+--- 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((int)c);
++		    c = toupper((unsigned char)c);
  	    }
  	    *p++ = c;
  	    goto done;
diff --git a/security/putty/patches/patch-ah b/security/putty/patches/patch-ah
index 6ffaeb06e49..030692c561e 100644
--- a/security/putty/patches/patch-ah
+++ b/security/putty/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.1 2005/04/06 21:51:13 xtraeme Exp $
+$NetBSD: patch-ah,v 1.2 2005/04/13 16:45:46 rillig Exp $
 
---- uxpty.c.orig	2005-04-06 23:16:28.000000000 +0200
-+++ uxpty.c	2005-04-06 23:28:38.000000000 +0200
+--- unix/uxpty.c.orig	2005-04-06 23:16:28.000000000 +0200
++++ unix/uxpty.c	2005-04-06 23:28:38.000000000 +0200
 @@ -2,8 +2,10 @@
   * Pseudo-tty backend for pterm.
   */
diff --git a/security/putty/patches/patch-ai b/security/putty/patches/patch-ai
index 16d8c38bc9a..eedfd7fc4ad 100644
--- a/security/putty/patches/patch-ai
+++ b/security/putty/patches/patch-ai
@@ -1,13 +1,13 @@
-$NetBSD: patch-ai,v 1.1 2005/04/06 21:51:13 xtraeme Exp $
+$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
+--- 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((int)*p) != tolower((int)*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
index 4a39e45e50e..a564dd211bb 100644
--- a/security/putty/patches/patch-aj
+++ b/security/putty/patches/patch-aj
@@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.1 2005/04/06 21:51:13 xtraeme Exp $
+$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
+--- 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((int)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-ak
index 043f2b37f1c..13c7b5049b3 100644
--- a/security/putty/patches/patch-ak
+++ b/security/putty/patches/patch-ak
@@ -1,24 +1,25 @@
-$NetBSD: patch-ak,v 1.1 2005/04/06 21:51:13 xtraeme Exp $
+$NetBSD: patch-ak,v 1.2 2005/04/13 16:45:46 rillig Exp $
 
---- ../import.c.orig	2005-04-05 21:37:51.000000000 +0200
-+++ ../import.c	2005-04-06 23:39:12.000000000 +0200
-@@ -681,7 +681,10 @@
+--- 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
+     unsigned char *outblob;
      int outlen;
      struct mpint_pos numbers[9];
-     int nnumbers, pos, len, seqlen, i;
-+    nnumbers = pos = len = seqlen = i = 0;
-     char *header, *footer;
-+    footer = header = NULL;
-+
+-    int nnumbers, pos, len, seqlen, i;
+-    char *header, *footer;
++    int nnumbers = 0, pos = 0, len = 0, seqlen = 0, i = 0;
++    char *header = NULL, *footer = NULL;
      char zero[1];
      unsigned char iv[8];
      int ret = 0;
-@@ -1442,7 +1445,8 @@
+@@ -1441,8 +1441,8 @@ int sshcom_write(const Filename *filenam
+     unsigned char *outblob;
      int outlen;
      struct mpint_pos numbers[6];
-     int nnumbers, initial_zero, pos, lenpos, i;
+-    int nnumbers, initial_zero, pos, lenpos, i;
 -    char *type;
-+    nnumbers = initial_zero = pos = lenpos = i = 0;
++    int nnumbers = 0, initial_zero = 0, pos = 0, lenpos = 0, i = 0;
 +    char *type = NULL;
      char *ciphertext;
      int cipherlen;