upgrade to 20010611.

key changes since 20010403:
- be more picky about isakmpd.policy permission
- debug: dump decoded IKE packets in pcap(3) format
- cert improvements
- RFC2367 compliance
- bug fixes: correct SA refcnt, memory alloc and doc fixes

4 files changed, 5 insertions, 49 deletions

diff --git a/security/isakmpd/Makefile b/security/isakmpd/Makefile
index 04b7a668ae0..cf5e1c2d681 100644
--- a/security/isakmpd/Makefile
+++ b/security/isakmpd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2001/04/03 13:06:27 itojun Exp $
+# $NetBSD: Makefile,v 1.15 2001/06/11 11:23:20 itojun Exp $
 #
 
-DISTNAME=		isakmpd-20010403
+DISTNAME=		isakmpd-20010611
 CATEGORIES=		security net
 MASTER_SITES=		ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/LOCAL_PORTS/
 
diff --git a/security/isakmpd/distinfo b/security/isakmpd/distinfo
index 05e4601bd59..9688c7e9bf6 100644
--- a/security/isakmpd/distinfo
+++ b/security/isakmpd/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/05/12 00:04:44 dmcmahill Exp $
+$NetBSD: distinfo,v 1.4 2001/06/11 11:23:20 itojun Exp $
 
-SHA1 (isakmpd-20010403.tar.gz) = 136b6fa148d546d43f01f8b5e7e78aa94ca33550
-Size (isakmpd-20010403.tar.gz) = 291712 bytes
+SHA1 (isakmpd-20010611.tar.gz) = e370eec7eb56f1a797edb3f6a8eaf71d793ff7e8
+Size (isakmpd-20010611.tar.gz) = 324329 bytes
 SHA1 (patch-aa) = d1616a16251ccd770c392e60057b357b7224d38a
 SHA1 (patch-ab) = f30c790f42d72866e95092848e102e4c3728365c
-SHA1 (patch-ac) = 3f36a2bfff793f55c79f67affe142a8807082e70
 SHA1 (patch-ad) = 8c477b99fd3d82ccb52b01374450295cc25244c0
 SHA1 (patch-ae) = f289972d8b22c8253667e655db95ad0952c4a2e1
-SHA1 (patch-ba) = 8e033d23fe34194fa09b3cbb72e7c3b74971b7cc
diff --git a/security/isakmpd/patches/patch-ac b/security/isakmpd/patches/patch-ac
deleted file mode 100644
index 4c71f220be5..00000000000
--- a/security/isakmpd/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2001/02/24 00:34:30 itojun Exp $
-
---- apps/certpatch/Makefile-	Wed Feb 14 22:24:29 2001
-+++ apps/certpatch/Makefile	Wed Feb 14 22:24:41 2001
-@@ -37,7 +37,7 @@
- 
- PROG=		certpatch
- SRCS=		certpatch.c
--BINDIR=		/usr/sbin
-+BINDIR?=		/usr/sbin
- TOPSRC=		${.CURDIR}/../..
- TOPOBJ!=	cd ${TOPSRC}; printf "all:\n\t@pwd\n" |${MAKE} -f-
- OS!=		awk '/^OS=/ { print $$2 }' ${.CURDIR}/../../Makefile
diff --git a/security/isakmpd/patches/patch-ba b/security/isakmpd/patches/patch-ba
deleted file mode 100644
index e065512f51b..00000000000
--- a/security/isakmpd/patches/patch-ba
+++ /dev/null
@@ -1,29 +0,0 @@
-$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
-===================================================================
-RCS file: /cvs/src/sbin/isakmpd/x509.c,v
-retrieving revision 1.46
-retrieving revision 1.47
-diff -u -r1.46 -r1.47
-
-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;
-