upgrade to 20020507a. logging issue is fixed. phase 2 negotiation w/

unique policy is corrected.

4 files changed, 7 insertions, 53 deletions

diff --git a/security/racoon/Makefile b/security/racoon/Makefile
index ddacde9232d..10a1d02574d 100644
--- a/security/racoon/Makefile
+++ b/security/racoon/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2002/04/26 00:08:21 itojun Exp $
+# $NetBSD: Makefile,v 1.49 2002/05/13 02:13:48 itojun Exp $
 #
 
-DISTNAME=	racoon-20020426a
+DISTNAME=	racoon-20020507a
 CATEGORIES=	security net
 MASTER_SITES=	ftp://ftp.kame.net/pub/kame/misc/
 
@@ -40,9 +40,9 @@ CONFIGURE_ARGS+=--disable-ipv6
 .endif
 CONFIGURE_ARGS+=--sysconfdir=/etc/racoon
 .if defined(PKGREVISION)
-CONFIGURE_ARGS+=--with-pkgversion=netbsd-pkgsrc-20020426anb${PKGREVISION}
+CONFIGURE_ARGS+=--with-pkgversion=netbsd-pkgsrc-20020507anb${PKGREVISION}
 .else
-CONFIGURE_ARGS+=--with-pkgversion=netbsd-pkgsrc-20020426a
+CONFIGURE_ARGS+=--with-pkgversion=netbsd-pkgsrc-20020507a
 .endif
 
 pre-configure:
diff --git a/security/racoon/distinfo b/security/racoon/distinfo
index b488d016e09..e62d985f6f7 100644
--- a/security/racoon/distinfo
+++ b/security/racoon/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.14 2002/05/07 09:03:57 itojun Exp $
+$NetBSD: distinfo,v 1.15 2002/05/13 02:13:48 itojun Exp $
 
-SHA1 (racoon-20020426a.tar.gz) = cf9432aa29e590dfb599e2132132d98beaf5af47
-Size (racoon-20020426a.tar.gz) = 620763 bytes
+SHA1 (racoon-20020507a.tar.gz) = 9ecf5fa5660362a967bf6e48499e834eab3a7181
+Size (racoon-20020507a.tar.gz) = 620752 bytes
 SHA1 (patch-aa) = 586f7bd5129f3be88cb104244fba2b7b13a7b044
 SHA1 (patch-ab) = 2f720e6214bd10064dba84cdfe5446d0e37a5de0
 SHA1 (patch-ac) = 29ff53ca5a23785253321a9629c32065da56ca9f
 SHA1 (patch-ad) = d4718088c04c72ccfe34c4b53ec4a2f830600877
 SHA1 (patch-ae) = 3b5dcbd2398e95e9bdb0cb69a11d49eecc981a08
 SHA1 (patch-af) = 0d0fb78ae6f3a10be95ff6160dc85140ea09455a
-SHA1 (patch-ag) = 43c2236de9fd47bdbbaced86e1f9670cbbb4b242
-SHA1 (patch-ah) = a69c6cea3f60ac0c65df647afcdf35444045bd43
diff --git a/security/racoon/patches/patch-ag b/security/racoon/patches/patch-ag
deleted file mode 100644
index 3712b6af82c..00000000000
--- a/security/racoon/patches/patch-ag
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2002/05/07 09:03:57 itojun Exp $
-
---- plog.c	Fri Apr 26 09:00:10 2002
-+++ plog.c	Tue May  7 17:56:49 2002
-@@ -1,2 +1,2 @@
--/*	$KAME: plog.c,v 1.22 2002/04/26 00:00:10 itojun Exp $	*/
-+/*	$KAME: plog.c,v 1.23 2002/05/07 08:56:19 sakane Exp $	*/
- 
-@@ -133,6 +133,5 @@
- plogv(int pri, const char *func, struct sockaddr *sa,
--	const char *fmt, ...)
-+	const char *fmt, va_list ap)
- {
- 	char *newfmt;
--	va_list ap;
- 
-@@ -143,9 +142,5 @@
- 
--	if (f_foreground) {
--		va_start(ap, fmt);
-+	if (f_foreground)
- 		vprintf(newfmt, ap);
--		va_end(ap);
--	}
- 
--	va_start(ap, fmt);
- 	if (logfile)
-@@ -158,3 +153,2 @@
- 	}
--	va_end(ap);
- }
diff --git a/security/racoon/patches/patch-ah b/security/racoon/patches/patch-ah
deleted file mode 100644
index 98fa0c98021..00000000000
--- a/security/racoon/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2002/05/07 09:03:57 itojun Exp $
-
---- plog.h	Fri Apr 26 09:00:10 2002
-+++ plog.h	Tue May  7 17:56:49 2002
-@@ -1,2 +1,2 @@
--/*	$KAME: plog.h,v 1.9 2002/04/26 00:00:10 itojun Exp $	*/
-+/*	$KAME: plog.h,v 1.10 2002/05/07 08:56:19 sakane Exp $	*/
- 
-@@ -64,3 +64,3 @@
- extern void plogv __P((int, const char *, struct sockaddr *,
--	const char *, ...));
-+	const char *, va_list));
- extern void plogdump __P((int, void *, size_t));