From f52ad49bb68816cd8b8577d8ed8cb4f18be37664 Mon Sep 17 00:00:00 2001
From: manu <manu>
Date: Wed, 10 Nov 2004 16:53:51 +0000
Subject: Fix minor  LP64 problems

---
 security/ipsec-tools/patches/patch-aa | 25 +++++++++++++++++++++++++
 security/ipsec-tools/patches/patch-ab | 14 ++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 security/ipsec-tools/patches/patch-aa
 create mode 100644 security/ipsec-tools/patches/patch-ab

(limited to 'security/ipsec-tools')

diff --git a/security/ipsec-tools/patches/patch-aa b/security/ipsec-tools/patches/patch-aa
new file mode 100644
index 00000000000..e0bde15ffab
--- /dev/null
+++ b/security/ipsec-tools/patches/patch-aa
@@ -0,0 +1,25 @@
+$NetBSD: patch-aa,v 1.1 2004/11/10 16:53:51 manu Exp $
+--- src/racoon/ipsec_doi.c.orig	2004-11-10 19:03:38.000000000 +0100
++++ src/racoon/ipsec_doi.c	2004-11-10 19:03:39.000000000 +0100
+@@ -350,9 +350,9 @@
+ 		authmethod = s->authmethod;
+ #endif
+ 		plog(LLV_DEBUG, LOCATION, NULL, "Compared: DB:Peer\n");
+ 		plog(LLV_DEBUG, LOCATION, NULL, "(lifetime = %ld:%ld)\n",
+-			s->lifetime, tsap->lifetime);
++			(long)s->lifetime, (long)tsap->lifetime);
+ 		plog(LLV_DEBUG, LOCATION, NULL, "(lifebyte = %zu:%zu)\n",
+ 			s->lifebyte, tsap->lifebyte);
+ 		plog(LLV_DEBUG, LOCATION, NULL, "enctype = %s:%s\n",
+ 			s_oakley_attr_v(OAKLEY_ATTR_ENC_ALG,
+@@ -3820,9 +3820,9 @@
+ 					plog(LLV_ERROR, LOCATION, NULL,
+ 						"lifetime mismatched "
+ 						"in a proposal, "
+ 						"prev:%ld curr:%u.\n",
+-						pp->lifetime, t);
++						(long)pp->lifetime, t);
+ 					goto end;
+ 				}
+ 				break;
+ 			case IPSECDOI_ATTR_SA_LD_TYPE_KB:
diff --git a/security/ipsec-tools/patches/patch-ab b/security/ipsec-tools/patches/patch-ab
new file mode 100644
index 00000000000..87a9649856b
--- /dev/null
+++ b/security/ipsec-tools/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1 2004/11/10 16:53:51 manu Exp $
+--- src/racoon/remoteconf.c.orig	2004-11-10 19:04:19.000000000 +0100
++++ src/racoon/remoteconf.c	2004-11-10 19:04:26.000000000 +0100
+@@ -544,9 +544,9 @@
+ 			prop->prop_no, prop->trns_no,
+ 			saddr2str(prop->rmconf->remote));
+ 		plog(LLV_INFO, LOCATION, NULL, "\tproposal {\n");
+ 		plog(LLV_INFO, LOCATION, NULL, "\t\tlifetime time %lu sec;\n",
+-			prop->lifetime);
++			(long)prop->lifetime);
+ 		plog(LLV_INFO, LOCATION, NULL, "\t\tlifetime bytes %zd;\n",
+ 			prop->lifebyte);
+ 		plog(LLV_INFO, LOCATION, NULL, "\t\tdh_group %s;\n",
+ 			alg_oakley_dhdef_name(prop->dh_group));
-- 
cgit v1.2.3