upgrade to 20020426a from kame.

file descriptor leak fix.
null encryption algorithm key length fix (should use 0).
couple of null-pointer reference fixes.
set port # to 500 in ID payload (possible interop issue - spec is unclear).
correctly match address pair on informational exchange.

4 files changed, 10 insertions, 45 deletions

diff --git a/security/racoon/Makefile b/security/racoon/Makefile
index 87cf10930fe..ddacde9232d 100644
--- a/security/racoon/Makefile
+++ b/security/racoon/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2002/04/16 02:34:34 itojun Exp $
+# $NetBSD: Makefile,v 1.48 2002/04/26 00:08:21 itojun Exp $
 #
 
-DISTNAME=	racoon-20011215a
-PKGREVISION=	1
+DISTNAME=	racoon-20020426a
 CATEGORIES=	security net
 MASTER_SITES=	ftp://ftp.kame.net/pub/kame/misc/
 
@@ -41,9 +40,9 @@ CONFIGURE_ARGS+=--disable-ipv6
 .endif
 CONFIGURE_ARGS+=--sysconfdir=/etc/racoon
 .if defined(PKGREVISION)
-CONFIGURE_ARGS+=--with-pkgversion=netbsd-pkgsrc-20011215anb${PKGREVISION}
+CONFIGURE_ARGS+=--with-pkgversion=netbsd-pkgsrc-20020426anb${PKGREVISION}
 .else
-CONFIGURE_ARGS+=--with-pkgversion=netbsd-pkgsrc-20011215a
+CONFIGURE_ARGS+=--with-pkgversion=netbsd-pkgsrc-20020426a
 .endif
 
 pre-configure:
@@ -51,7 +50,7 @@ pre-configure:
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/racoon
-	for i in FAQ README.certificate; do \
+	for i in FAQ README.certificate README.gssapi; do \
 		${INSTALL_DATA} ${WRKSRC}/doc/$$i ${PREFIX}/share/doc/racoon; \
 	done
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/racoon
diff --git a/security/racoon/PLIST b/security/racoon/PLIST
index 47c8001b025..f7a0f6b838e 100644
--- a/security/racoon/PLIST
+++ b/security/racoon/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:17:37 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/04/26 00:08:22 itojun Exp $
 sbin/racoon
 man/man8/racoon.8
 man/man5/racoon.conf.5
 share/doc/racoon/README.certificate
+share/doc/racoon/README.gssapi
 share/doc/racoon/FAQ
 @dirrm share/doc/racoon
 share/examples/racoon/racoon.conf.sample
diff --git a/security/racoon/distinfo b/security/racoon/distinfo
index 3ce0076943c..85aa3ad4d5e 100644
--- a/security/racoon/distinfo
+++ b/security/racoon/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.12 2002/04/15 02:00:03 itojun Exp $
+$NetBSD: distinfo,v 1.13 2002/04/26 00:08:22 itojun Exp $
 
-SHA1 (racoon-20011215a.tar.gz) = 7bd8e851c58cd67f97bec57fca06b49ab519b3c2
-Size (racoon-20011215a.tar.gz) = 620361 bytes
+SHA1 (racoon-20020426a.tar.gz) = cf9432aa29e590dfb599e2132132d98beaf5af47
+Size (racoon-20020426a.tar.gz) = 620763 bytes
 SHA1 (patch-aa) = 586f7bd5129f3be88cb104244fba2b7b13a7b044
 SHA1 (patch-ab) = 2f720e6214bd10064dba84cdfe5446d0e37a5de0
 SHA1 (patch-ac) = 29ff53ca5a23785253321a9629c32065da56ca9f
 SHA1 (patch-ad) = d4718088c04c72ccfe34c4b53ec4a2f830600877
 SHA1 (patch-ae) = 55daf1b5d19be76792e8eecb3f37eced594d184d
 SHA1 (patch-af) = 84263904d7018929aecf5df5b4173623505dc5f6
-SHA1 (patch-ag) = 55a08bc604d40c9d4871e389da083535326643f9
diff --git a/security/racoon/patches/patch-ag b/security/racoon/patches/patch-ag
deleted file mode 100644
index efd8dd91dbb..00000000000
--- a/security/racoon/patches/patch-ag
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2002/04/15 02:00:04 itojun Exp $
-
---- isakmp_inf.c.orig	Tue Dec 11 13:39:32 2001
-+++ isakmp_inf.c	Mon Apr 15 10:57:48 2002
-@@ -1058,10 +1058,13 @@
- 		 * racoon only deletes SA which is matched both the
- 		 * source address and the destination accress.
- 		 */
--		if ((cmpsaddrwop(iph1->local, src)
--		  && cmpsaddrwop(iph1->remote, dst))
--		 || (cmpsaddrwop(iph1->remote, src)
--		  && cmpsaddrwop(iph1->local, dst))) {
-+		if (cmpsaddrwop(iph1->local, src) == 0 &&
-+		    cmpsaddrwop(iph1->remote, dst) == 0)
-+			;
-+		else if (cmpsaddrwop(iph1->remote, src) == 0 &&
-+		    cmpsaddrwop(iph1->local, dst) == 0)
-+			;
-+		else {
- 			msg = next;
- 			continue;
- 		}
-@@ -1076,8 +1079,10 @@
- 			    msg->sadb_msg_satype)
- 				break;
- 		}
--		if (i == pfkey_nsatypes)
-+		if (i == pfkey_nsatypes) {
-+			msg = next;
- 			continue;
-+		}
- 
- 		plog(LLV_INFO, LOCATION, NULL,
- 			"purging spi=%u.\n", ntohl(sa->sadb_sa_spi));