Add (unsigned char) cast to ctype functions; taken from the NetBSD trunk.

6 files changed, 117 insertions, 1 deletions

diff --git a/security/ipsec-tools/distinfo b/security/ipsec-tools/distinfo
index e1985b9f646..70d1c058485 100644
--- a/security/ipsec-tools/distinfo
+++ b/security/ipsec-tools/distinfo
@@ -1,7 +1,12 @@
-$NetBSD: distinfo,v 1.3 2004/11/11 11:50:20 grant Exp $
+$NetBSD: distinfo,v 1.4 2004/12/12 23:51:10 kleink Exp $
 
 SHA1 (ipsec-tools-0.5.pre20041109.tar.bz2) = 2e91a2b1adea46facdbdfe70dfcc4aca3cc01913
 Size (ipsec-tools-0.5.pre20041109.tar.bz2) = 618629 bytes
 SHA1 (patch-aa) = fadc2685847af19288782a0fd911dc5accee0fc9
 SHA1 (patch-ab) = dd5293512228a02ce8f37f8d1a10fb865cc79aa5
 SHA1 (patch-ac) = 28cbaa97ab1853bb03202c46718c0c72bc4b8fb6
+SHA1 (patch-ad) = 091a41782511f40c2ee1bd64502dc2073675ed84
+SHA1 (patch-ae) = 4059050714af8acbf7bc8fc242cc09a6890b5687
+SHA1 (patch-af) = bffe225378e211baf1e0b0a7afb85dae6c41e89c
+SHA1 (patch-ag) = 77bcd3a9a90eca65a9fe270f4cfb6db4f6d7eb97
+SHA1 (patch-ah) = 97e84d26fe9fa895294722172d457e37e6d9ad53
diff --git a/security/ipsec-tools/patches/patch-ad b/security/ipsec-tools/patches/patch-ad
new file mode 100644
index 00000000000..d7021b54692
--- /dev/null
+++ b/security/ipsec-tools/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2004/12/12 23:51:10 kleink Exp $
+
+--- src/libipsec/key_debug.c.orig	2004-09-21 16:23:10.000000000 +0200
++++ src/libipsec/key_debug.c	2004-12-13 00:33:44.000000000 +0100
+@@ -274,7 +274,7 @@
+ 			p = (char *)(id + 1);
+ 			ep = p + len;
+ 			for (/*nothing*/; *p && p < ep; p++) {
+-				if (isprint(*p))
++				if (isprint((unsigned char)*p))
+ 					printf("%c", *p & 0xff);
+ 				else
+ 					printf("\\%03o", *p & 0xff);
diff --git a/security/ipsec-tools/patches/patch-ae b/security/ipsec-tools/patches/patch-ae
new file mode 100644
index 00000000000..dd79090ed75
--- /dev/null
+++ b/security/ipsec-tools/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2004/12/12 23:51:10 kleink Exp $
+
+--- src/setkey/parse.y.orig	2004-10-20 17:25:29.000000000 +0200
++++ src/setkey/parse.y	2004-12-13 00:39:15.000000000 +0100
+@@ -65,7 +65,7 @@
+ #endif
+ 
+ #define ATOX(c) \
+-  (isdigit(c) ? (c - '0') : (isupper(c) ? (c - 'A' + 10) : (c - 'a' + 10)))
++  (isdigit((unsigned char)c) ? c - '0' : toupper((unsigned char)c) - 'A' + 10)
+ 
+ u_int32_t p_spi;
+ u_int p_ext, p_alg_enc, p_alg_auth, p_replay, p_mode;
diff --git a/security/ipsec-tools/patches/patch-af b/security/ipsec-tools/patches/patch-af
new file mode 100644
index 00000000000..86a879f053b
--- /dev/null
+++ b/security/ipsec-tools/patches/patch-af
@@ -0,0 +1,25 @@
+$NetBSD: patch-af,v 1.1 2004/12/12 23:51:10 kleink Exp $
+
+--- src/racoon/str2val.c.orig	2004-09-21 16:23:22.000000000 +0200
++++ src/racoon/str2val.c	2004-12-13 00:41:21.000000000 +0100
+@@ -87,9 +87,9 @@
+ 
+ 	i = 0;
+ 	for (p = str; *p != '\0'; p++) {
+-		if (isxdigit(*p))
++		if (isxdigit((unsigned char)*p))
+ 			i++;
+-		else if (isspace(*p))
++		else if (isspace((unsigned char)*p))
+ 			;
+ 		else
+ 			return NULL;
+@@ -104,7 +104,7 @@
+ 	i = 0;
+ 	f = 0;
+ 	for (rp = dst, p = str; *p != '\0'; p++) {
+-		if (isxdigit(*p)) {
++		if (isxdigit((unsigned char)*p)) {
+ 			if (!f) {
+ 				b[0] = *p;
+ 				f = 1;
diff --git a/security/ipsec-tools/patches/patch-ag b/security/ipsec-tools/patches/patch-ag
new file mode 100644
index 00000000000..c70f27e4c35
--- /dev/null
+++ b/security/ipsec-tools/patches/patch-ag
@@ -0,0 +1,20 @@
+$NetBSD: patch-ag,v 1.1 2004/12/12 23:51:10 kleink Exp $
+
+--- src/racoon/localconf.c.orig	2004-09-21 16:23:20.000000000 +0200
++++ src/racoon/localconf.c	2004-12-13 00:43:08.000000000 +0100
+@@ -193,13 +193,13 @@
+ 			continue;
+ 
+ 		/* search the end of 1st string. */
+-		for (p = buf; *p != '\0' && !isspace(*p); p++)
++		for (p = buf; *p != '\0' && !isspace((unsigned char)*p); p++)
+ 			;
+ 		if (*p == '\0')
+ 			continue;	/* no 2nd parameter */
+ 		*p = '\0';
+ 		/* search the 1st of 2nd string. */
+-		while (isspace(*++p))
++		while (isspace((unsigned char)*++p))
+ 			;
+ 		if (*p == '\0')
+ 			continue;	/* no 2nd parameter */
diff --git a/security/ipsec-tools/patches/patch-ah b/security/ipsec-tools/patches/patch-ah
new file mode 100644
index 00000000000..07b10d2f7c3
--- /dev/null
+++ b/security/ipsec-tools/patches/patch-ah
@@ -0,0 +1,40 @@
+$NetBSD: patch-ah,v 1.1 2004/12/12 23:51:10 kleink Exp $
+
+--- src/racoon/backupsa.c.orig	2004-09-21 16:23:11.000000000 +0200
++++ src/racoon/backupsa.c	2004-12-13 00:45:11.000000000 +0100
+@@ -250,7 +250,7 @@
+ 		created = mktime(&tm);
+ 		p++;
+ 
+-		for (q = p; *q != '\0' && !isspace(*q); q++)
++		for (q = p; *q != '\0' && !isspace((unsigned char)*q); q++)
+ 			;
+ 		*q = '\0';
+ 		src = str2saddr(p, NULL);
+@@ -258,7 +258,7 @@
+ 			goto err;
+ 		p = q + 1;
+ 
+-		for (q = p; *q != '\0' && !isspace(*q); q++)
++		for (q = p; *q != '\0' && !isspace((unsigned char)*q); q++)
+ 			;
+ 		*q = '\0';
+ 		dst = str2saddr(p, NULL);
+@@ -271,7 +271,7 @@
+ #define GETNEXTNUM(value, function) \
+ do { \
+ 	char *y; \
+-	for (q = p; *q != '\0' && !isspace(*q); q++) \
++	for (q = p; *q != '\0' && !isspace((unsigned char)*q); q++) \
+ 		; \
+ 	*q = '\0'; \
+ 	(value) = function(p, &y, 10); \
+@@ -453,7 +453,7 @@
+ 
+ 	res = 0;
+         for (i = len; i > 0; i--) {
+-		if (!isdigit(*p))
++		if (!isdigit((unsigned char)*p))
+ 			return -1;
+ 		res *= 10;
+ 		res += *p - '0';