From 2efcdecd30b465862030f870eabb123e54e60d08 Mon Sep 17 00:00:00 2001
From: shannonjr <shannonjr>
Date: Mon, 22 Nov 2004 12:42:46 +0000
Subject: Fix compile problem with gcc34: char argument passed to functions
 requiring int arg cause compile to fail because -Werror is specified in
 compile flags. Fix was to add appropriate cast in several places.

---
 security/isakmpd/distinfo         |  3 ++-
 security/isakmpd/patches/patch-an | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 security/isakmpd/patches/patch-an

(limited to 'security/isakmpd')

diff --git a/security/isakmpd/distinfo b/security/isakmpd/distinfo
index 85d69418c6d..5244327f09b 100644
--- a/security/isakmpd/distinfo
+++ b/security/isakmpd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2003/12/30 15:57:53 bad Exp $
+$NetBSD: distinfo,v 1.16 2004/11/22 12:42:46 shannonjr Exp $
 
 SHA1 (isakmpd-20030903.tar.gz) = 3400947199759a69b878ea396a598d9df174c6e8
 Size (isakmpd-20030903.tar.gz) = 358314 bytes
@@ -11,3 +11,4 @@ SHA1 (patch-aj) = 16e592ec1666b70ba6726e4a20878333ca50d7c2
 SHA1 (patch-ak) = e168240460695a86533237856f3997b5c06d7805
 SHA1 (patch-al) = eb6c16bf8d98219ab5d70dc5378a47772ec4dc23
 SHA1 (patch-am) = 6220da76dcf0d2a150f8803ce5728469a4e66c31
+SHA1 (patch-an) = 4df8fdbaf5852c0177244e6ea62533b1c454ec94
diff --git a/security/isakmpd/patches/patch-an b/security/isakmpd/patches/patch-an
new file mode 100644
index 00000000000..db40b9aca1d
--- /dev/null
+++ b/security/isakmpd/patches/patch-an
@@ -0,0 +1,36 @@
+$NetBSD: patch-an,v 1.1 2004/11/22 12:42:46 shannonjr Exp $
+
+--- ./conf.c.orig	2003-09-02 12:15:55.000000000 -0600
++++ ./conf.c
+@@ -118,7 +118,7 @@ conf_hash (char *s)
+ 
+   while (*s)
+     {
+-      hash = ((hash << 1) | (hash >> 7)) ^ tolower (*s);
++      hash = ((hash << 1) | (hash >> 7)) ^ tolower ((int) *s);
+       s++;
+     }
+   return hash;
+@@ -271,7 +271,7 @@ conf_parse_line (int trans, char *line, 
+ 	line[strcspn (line, " \t=")] = '\0';
+ 	val = line + i + 1 + strspn (line + i + 1, " \t");
+ 	/* Skip trailing whitespace, if any */
+-	for (j = sz - (val - line) - 1; j > 0 && isspace (val[j]); j--)
++	for (j = sz - (val - line) - 1; j > 0 && isspace ((int)val[j]); j--)
+ 	  val[j] = '\0';
+ 	/* XXX Perhaps should we not ignore errors?  */
+ 	conf_set (trans, section, line, val, 0, 0);
+@@ -749,11 +749,11 @@ conf_get_list (char *section, char *tag)
+   while ((field = strsep (&p, ",")) != NULL)
+     {
+       /* Skip leading whitespace */
+-      while (isspace (*field))
++      while (isspace ((int)*field))
+ 	field++;
+       /* Skip trailing whitespace */
+       if (p)
+-	for (t = p - 1; t > field && isspace (*t); t--)
++	for (t = p - 1; t > field && isspace ((int)*t); t--)
+ 	  *t = '\0';
+       if (*field == '\0')
+ 	{
-- 
cgit v1.2.3