From f3ee9e7e12d858b5f677978580342857b9b9a18c Mon Sep 17 00:00:00 2001
From: dmcmahill <dmcmahill>
Date: Sat, 12 May 2001 00:04:44 +0000
Subject: fix types on 64-bit systems.

---
 security/isakmpd/distinfo         |  4 ++--
 security/isakmpd/patches/patch-ba | 21 ++++++++++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

(limited to 'security/isakmpd')

diff --git a/security/isakmpd/distinfo b/security/isakmpd/distinfo
index 976f8c61b68..05e4601bd59 100644
--- a/security/isakmpd/distinfo
+++ b/security/isakmpd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:40:31 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/05/12 00:04:44 dmcmahill Exp $
 
 SHA1 (isakmpd-20010403.tar.gz) = 136b6fa148d546d43f01f8b5e7e78aa94ca33550
 Size (isakmpd-20010403.tar.gz) = 291712 bytes
@@ -7,4 +7,4 @@ SHA1 (patch-ab) = f30c790f42d72866e95092848e102e4c3728365c
 SHA1 (patch-ac) = 3f36a2bfff793f55c79f67affe142a8807082e70
 SHA1 (patch-ad) = 8c477b99fd3d82ccb52b01374450295cc25244c0
 SHA1 (patch-ae) = f289972d8b22c8253667e655db95ad0952c4a2e1
-SHA1 (patch-ba) = fe9f9eed9955eeb691fb48497cd303203d6ea5d2
+SHA1 (patch-ba) = 8e033d23fe34194fa09b3cbb72e7c3b74971b7cc
diff --git a/security/isakmpd/patches/patch-ba b/security/isakmpd/patches/patch-ba
index df1999ede55..e065512f51b 100644
--- a/security/isakmpd/patches/patch-ba
+++ b/security/isakmpd/patches/patch-ba
@@ -1,4 +1,6 @@
-$NetBSD: patch-ba,v 1.1 2001/04/04 03:45:15 itojun Exp $
+$NetBSD: patch-ba,v 1.2 2001/05/12 00:04:44 dmcmahill Exp $
+
+The first change (the free line) had the following patch comment:
 
 Index: x509.c
 ===================================================================
@@ -6,13 +8,22 @@ RCS file: /cvs/src/sbin/isakmpd/x509.c,v
 retrieving revision 1.46
 retrieving revision 1.47
 diff -u -r1.46 -r1.47
---- x509.c	2001/03/27 16:50:35	1.46
-+++ x509.c	2001/04/03 13:59:12	1.47
-@@ -545,7 +545,6 @@
- 	      return 0;
+
+the second (size_t -> u_int32_t) is to make the types match on 
+64-bit machines
+
+--- work.alpha/isakmpd/x509.c.orig	Tue Mar 27 11:50:35 2001
++++ work.alpha/isakmpd/x509.c	Thu May 10 17:02:00 2001
+@@ -546,5 +546,4 @@
  	    }
  
 -	  free (x509_policy_asserts);
  	  x509_policy_asserts = new_asserts;
  	}
+@@ -626,5 +625,5 @@
+   struct x509_hash *cert;
+   u_int8_t **cid;
+-  size_t *clen;
++  u_int32_t *clen;
+   int n, i, id_found;
  
-- 
cgit v1.2.3