fix arg to plogv().

5 files changed, 55 insertions, 5 deletions

diff --git a/security/racoon/distinfo b/security/racoon/distinfo
index 85aa3ad4d5e..b488d016e09 100644
--- a/security/racoon/distinfo
+++ b/security/racoon/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2002/04/26 00:08:22 itojun Exp $
+$NetBSD: distinfo,v 1.14 2002/05/07 09:03:57 itojun Exp $
 
 SHA1 (racoon-20020426a.tar.gz) = cf9432aa29e590dfb599e2132132d98beaf5af47
 Size (racoon-20020426a.tar.gz) = 620763 bytes
@@ -6,5 +6,7 @@ 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-ae) = 3b5dcbd2398e95e9bdb0cb69a11d49eecc981a08
+SHA1 (patch-af) = 0d0fb78ae6f3a10be95ff6160dc85140ea09455a
+SHA1 (patch-ag) = 43c2236de9fd47bdbbaced86e1f9670cbbb4b242
+SHA1 (patch-ah) = a69c6cea3f60ac0c65df647afcdf35444045bd43
diff --git a/security/racoon/patches/patch-ae b/security/racoon/patches/patch-ae
index 66fed09eb1c..3193af424ad 100644
--- a/security/racoon/patches/patch-ae
+++ b/security/racoon/patches/patch-ae
@@ -1,4 +1,6 @@
-$NetBSD: patch-ae,v 1.9 2001/08/02 12:44:18 itojun Exp $
+$NetBSD: patch-ae,v 1.10 2002/05/07 09:03:57 itojun Exp $
+
+make it compile on 1.5.x
 
 --- ../libipsec/key_debug.c-	Thu Aug  2 21:38:17 2001
 +++ ../libipsec/key_debug.c	Thu Aug  2 21:38:44 2001
diff --git a/security/racoon/patches/patch-af b/security/racoon/patches/patch-af
index d4563bc11a4..7e769e20795 100644
--- a/security/racoon/patches/patch-af
+++ b/security/racoon/patches/patch-af
@@ -1,4 +1,6 @@
-$NetBSD: patch-af,v 1.1 2001/08/02 12:44:18 itojun Exp $
+$NetBSD: patch-af,v 1.2 2002/05/07 09:03:57 itojun Exp $
+
+make it compile on 1.5.x
 
 --- ../libipsec/pfkey_dump.c-	Thu Aug  2 21:38:21 2001
 +++ ../libipsec/pfkey_dump.c	Thu Aug  2 21:38:34 2001
diff --git a/security/racoon/patches/patch-ag b/security/racoon/patches/patch-ag
new file mode 100644
index 00000000000..3712b6af82c
--- /dev/null
+++ b/security/racoon/patches/patch-ag
@@ -0,0 +1,31 @@
+$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
new file mode 100644
index 00000000000..98fa0c98021
--- /dev/null
+++ b/security/racoon/patches/patch-ah
@@ -0,0 +1,13 @@
+$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));