Add some necessary casts for LP64 platforms in the hash functions.

Merge patch-cb into patch-bd. Fix ctype casts.

5 files changed, 50 insertions, 34 deletions

diff --git a/security/lasso/distinfo b/security/lasso/distinfo
index efa38e68170..65ede2f8854 100644
--- a/security/lasso/distinfo
+++ b/security/lasso/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.3 2009/05/26 05:26:00 manu Exp $
+$NetBSD: distinfo,v 1.4 2009/07/06 22:01:34 joerg Exp $
 
 SHA1 (lasso-2.2.2.tar.gz) = 32651fa71b16da01a94db234425846729a510623
 RMD160 (lasso-2.2.2.tar.gz) = a4faae605726202db33d36a2b520b0ab8f17aa76
 Size (lasso-2.2.2.tar.gz) = 1802749 bytes
+SHA1 (patch-aa) = 965365d3aff5e1014dbe5bc7036e12837ccfc185
 SHA1 (patch-ba) = 4ebb013f1c264e5b0008faeebdecc7bdb49be63a
 SHA1 (patch-bb) = 0867b8ae4036620084b73d28546ac089b57d3fb9
-SHA1 (patch-bc) = 0104fc8a9d3acac47130e52f3e5aa2af78337170
-SHA1 (patch-bd) = 1a43558472ff5a1f24bb5b1228335894a77f875e
+SHA1 (patch-bc) = 1633e47d0b4db574183bc3798a2dd839c98d11cb
+SHA1 (patch-bd) = ae3475ed7dbc79fd48ef72f072274cae1f1b41ba
 SHA1 (patch-ca) = c803ef9032744263f0fc434eda2c3b729fc96225
-SHA1 (patch-cb) = d6804551a3738d57cca71e018203f07c3736af99
diff --git a/security/lasso/patches/patch-aa b/security/lasso/patches/patch-aa
new file mode 100644
index 00000000000..f7dd6012743
--- /dev/null
+++ b/security/lasso/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.3 2009/07/06 22:01:34 joerg Exp $
+
+--- lasso/registry.c.orig	2010-05-31 15:45:21.000000000 +0200
++++ lasso/registry.c
+@@ -116,7 +116,7 @@ guint lasso_registry_direct_mapping_hash
+ {
+ 	return g_direct_hash((void*)(record->from_namespace
+ 		^ record->from_name
+-		^ record->to_namespace));
++		^ (size_t)record->to_namespace));
+ }
+ 
+ /**
+@@ -129,7 +129,7 @@ guint lasso_registry_direct_mapping_hash
+  */
+ guint lasso_registry_functional_mapping_hash(LassoRegistryFunctionalMappingRecord *record)
+ {
+-	return g_direct_hash((void*)(record->from_namespace ^ record->to_namespace));
++	return g_direct_hash((void*)(record->from_namespace ^ (size_t)record->to_namespace));
+ }
+ 
+ /**
diff --git a/security/lasso/patches/patch-bc b/security/lasso/patches/patch-bc
index af3d825d95f..45b1ac7cc80 100644
--- a/security/lasso/patches/patch-bc
+++ b/security/lasso/patches/patch-bc
@@ -1,14 +1,13 @@
-$NetBSD: patch-bc,v 1.2 2009/05/26 05:26:00 manu Exp $
---- lasso/xml/tools.c.orig	2009-04-05 11:24:03.000000000 +0200
-+++ lasso/xml/tools.c	2009-04-05 11:24:47.000000000 +0200
-@@ -1209,9 +1209,9 @@
- {
+$NetBSD: patch-bc,v 1.3 2009/07/06 22:01:34 joerg Exp $
+
+--- lasso/xml/tools.c.orig	2009-03-27 17:12:48.000000000 +0100
++++ lasso/xml/tools.c
+@@ -1210,7 +1210,7 @@ is_base64(const char *message)
  	const char *c;
  
  	c = message;
 -	while (*c != 0 && (isalnum(*c) || *c == '+' || *c == '/' || *c == '\n' || *c == '\r')) c++;
-+	while (*c != 0 && (isalnum((int)*c) || *c == '+' || *c == '/' || *c == '\n' || *c == '\r')) c++;
++	while (*c != 0 && (isalnum((unsigned char)*c) || *c == '+' || *c == '/' || *c == '\n' || *c == '\r')) c++;
  	while (*c == '=' || *c == '\n' || *c == '\r') c++; /* trailing = */
  
  	if (*c == 0)
- 		return TRUE;
diff --git a/security/lasso/patches/patch-bd b/security/lasso/patches/patch-bd
index 4782ba37ceb..ce3d6879426 100644
--- a/security/lasso/patches/patch-bd
+++ b/security/lasso/patches/patch-bd
@@ -1,14 +1,25 @@
-$NetBSD: patch-bd,v 1.2 2009/05/26 05:26:00 manu Exp $
---- lasso/xml/xml.c.orig	2009-04-05 11:25:55.000000000 +0200
-+++ lasso/xml/xml.c	2009-04-05 11:26:27.000000000 +0200
-@@ -1591,9 +1591,9 @@
- {
+$NetBSD: patch-bd,v 1.3 2009/07/06 22:01:34 joerg Exp $
+
+--- lasso/xml/xml.c.orig	2009-03-27 17:12:48.000000000 +0100
++++ lasso/xml/xml.c
+@@ -1554,8 +1554,9 @@ lasso_node_new_from_xmlNode(xmlNode *xml
+ 			}
+ 		}
+ 	}
+-
+-	node = lasso_node_new_from_xmlNode_with_type(xmlnode, typename);
++	if (typename) {
++		node = lasso_node_new_from_xmlNode_with_type(xmlnode, typename);
++	}
+ 	lasso_release(typename);
+ 
+ 	return node;
+@@ -1592,7 +1593,7 @@ is_base64(const char *message)
  	const char *c;
  
  	c = message;
 -	while (*c != 0 && (isalnum(*c) || *c == '+' || *c == '/' || *c == '\n' || *c == '\r')) c++;
-+	while (*c != 0 && (isalnum((int)*c) || *c == '+' || *c == '/' || *c == '\n' || *c == '\r')) c++;
++	while (*c != 0 && (isalnum((unsigned char)*c) || *c == '+' || *c == '/' || *c == '\n' || *c == '\r')) c++;
  	while (*c == '=' || *c == '\n' || *c == '\r') c++; /* trailing = */
  
  	if (*c == 0)
- 		return TRUE;
diff --git a/security/lasso/patches/patch-cb b/security/lasso/patches/patch-cb
deleted file mode 100644
index f8909d1b5f6..00000000000
--- a/security/lasso/patches/patch-cb
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: lasso/xml/xml.c
-===================================================================
---- lasso/xml/xml.c	(revision 4193)
-+++ lasso/xml/xml.c	(revision 4194)
-@@ -1554,8 +1554,9 @@
- 			}
- 		}
- 	}
--
--	node = lasso_node_new_from_xmlNode_with_type(xmlnode, typename);
-+	if (typename) {
-+		node = lasso_node_new_from_xmlNode_with_type(xmlnode, typename);
-+	}
- 	lasso_release(typename);
- 
- 	return node;