upgrade to 20030711 snapshot. (compiles at least on 1.6.1, not tested on 1.5)

bunch of stability fixes

5 files changed, 103 insertions, 6 deletions

diff --git a/security/racoon/Makefile b/security/racoon/Makefile
index 697a75f5841..be04c310a5f 100644
--- a/security/racoon/Makefile
+++ b/security/racoon/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2003/03/22 11:00:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.58 2003/07/12 10:01:44 itojun Exp $
 #
 
-DISTNAME=	racoon-20021120a
-PKGREVISION=	1
+DISTNAME=	racoon-20030711a
 WRKSRC=		${WRKDIR}/${DISTNAME}/racoon
 CATEGORIES=	security net
 MASTER_SITES=	ftp://ftp.kame.net/pub/kame/misc/
diff --git a/security/racoon/distinfo b/security/racoon/distinfo
index 04921df1cec..7f3bcf3317f 100644
--- a/security/racoon/distinfo
+++ b/security/racoon/distinfo
@@ -1,10 +1,13 @@
-$NetBSD: distinfo,v 1.18 2002/11/20 03:26:26 itojun Exp $
+$NetBSD: distinfo,v 1.19 2003/07/12 10:01:45 itojun Exp $
 
-SHA1 (racoon-20021120a.tar.gz) = 07b9919a265d778171689a591d71cd2a25e82d98
-Size (racoon-20021120a.tar.gz) = 620362 bytes
+SHA1 (racoon-20030711a.tar.gz) = 1223dc8a9b72a6c50da66733f5b791d01b785a43
+Size (racoon-20030711a.tar.gz) = 621492 bytes
 SHA1 (patch-aa) = 586f7bd5129f3be88cb104244fba2b7b13a7b044
 SHA1 (patch-ab) = 28118a57be0eb2b630fe128d25cdd11261687c62
 SHA1 (patch-ac) = 29ff53ca5a23785253321a9629c32065da56ca9f
 SHA1 (patch-ad) = d4718088c04c72ccfe34c4b53ec4a2f830600877
 SHA1 (patch-ae) = 3b5dcbd2398e95e9bdb0cb69a11d49eecc981a08
 SHA1 (patch-af) = 0d0fb78ae6f3a10be95ff6160dc85140ea09455a
+SHA1 (patch-ag) = ddb56e379dba93ad977a512e550a16f594950e3e
+SHA1 (patch-ah) = ca4c25d70cf241a2b45773d711e1c0fc9562561d
+SHA1 (patch-ai) = d3432306b6ed90c9ef36986c67eb73488cc75528
diff --git a/security/racoon/patches/patch-ag b/security/racoon/patches/patch-ag
new file mode 100644
index 00000000000..53e90c18a86
--- /dev/null
+++ b/security/racoon/patches/patch-ag
@@ -0,0 +1,50 @@
+--- ../libipsec/key_debug.c-	Sat Jul 12 18:49:46 2003
++++ ../libipsec/key_debug.c	Sat Jul 12 18:50:25 2003
+@@ -80,7 +80,9 @@
+ static void kdebug_sadb_address __P((struct sadb_ext *));
+ static void kdebug_sadb_key __P((struct sadb_ext *));
+ static void kdebug_sadb_x_sa2 __P((struct sadb_ext *));
++#ifdef SADB_X_EXT_TAG
+ static void kdebug_sadb_x_tag __P((struct sadb_ext *));
++#endif
+ 
+ #ifdef _KERNEL
+ static void kdebug_secreplay __P((struct secreplay *));
+@@ -166,7 +168,9 @@
+ 		TYPESTR(X_EXT_KMPRIVATE),
+ 		TYPESTR(X_EXT_POLICY),
+ 		TYPESTR(X_EXT_SA2),
++#ifdef SADB_X_EXT_TAG
+ 		TYPESTR(X_EXT_TAG),
++#endif
+ 		{ NULL }
+ 	};
+ 
+@@ -252,9 +256,11 @@
+ 		case SADB_X_EXT_SA2:
+ 			kdebug_sadb_x_sa2(ext);
+ 			break;
++#ifdef SADB_X_EXT_TAG
+ 		case SADB_X_EXT_TAG:
+ 			kdebug_sadb_x_tag(ext);
+ 			break;
++#endif
+ 		default:
+ 			printf("kdebug_sadb: invalid ext_type %u was passed.\n",
+ 			    ext->sadb_ext_type);
+@@ -494,6 +500,7 @@
+ 	return;
+ }
+ 
++#ifdef SADB_X_EXT_TAG
+ static void
+ kdebug_sadb_x_tag(ext)
+ 	struct sadb_ext *ext;
+@@ -508,6 +515,7 @@
+ 
+ 	return;
+ }
++#endif
+ 
+ void
+ kdebug_sadb_x_policy(ext)
diff --git a/security/racoon/patches/patch-ah b/security/racoon/patches/patch-ah
new file mode 100644
index 00000000000..b998a750a27
--- /dev/null
+++ b/security/racoon/patches/patch-ah
@@ -0,0 +1,12 @@
+--- ../libipsec/pfkey.c-	Sat Jul 12 18:56:08 2003
++++ ../libipsec/pfkey.c	Sat Jul 12 18:56:18 2003
+@@ -1762,7 +1762,9 @@
+ 		case SADB_EXT_SPIRANGE:
+ 		case SADB_X_EXT_POLICY:
+ 		case SADB_X_EXT_SA2:
++#ifdef SADB_X_EXT_TAG
+ 		case SADB_X_EXT_TAG:
++#endif
+ 			mhp[ext->sadb_ext_type] = (caddr_t)ext;
+ 			break;
+ 		default:
diff --git a/security/racoon/patches/patch-ai b/security/racoon/patches/patch-ai
new file mode 100644
index 00000000000..b0db8be952f
--- /dev/null
+++ b/security/racoon/patches/patch-ai
@@ -0,0 +1,33 @@
+--- ../libipsec/pfkey_dump.c-	Sat Jul 12 18:56:47 2003
++++ ../libipsec/pfkey_dump.c	Sat Jul 12 18:57:15 2003
+@@ -352,7 +352,9 @@
+ 	char pbuf[NI_MAXSERV];
+ 	caddr_t mhp[SADB_EXT_MAX + 1];
+ 	struct sadb_address *m_saddr, *m_daddr;
++#ifdef SADB_X_EXT_TAG
+ 	struct sadb_x_tag *m_tag;
++#endif
+ 	struct sadb_x_policy *m_xpl;
+ 	struct sadb_lifetime *m_lftc = NULL, *m_lfth = NULL;
+ 	struct sockaddr *sa;
+@@ -370,7 +372,9 @@
+ 
+ 	m_saddr = (struct sadb_address *)mhp[SADB_EXT_ADDRESS_SRC];
+ 	m_daddr = (struct sadb_address *)mhp[SADB_EXT_ADDRESS_DST];
++#ifdef SADB_X_EXT_TAG
+ 	m_tag = (struct sadb_x_tag *)mhp[SADB_X_EXT_TAG];
++#endif
+ 	m_xpl = (struct sadb_x_policy *)mhp[SADB_X_EXT_POLICY];
+ 	m_lftc = (struct sadb_lifetime *)mhp[SADB_EXT_LIFETIME_CURRENT];
+ 	m_lfth = (struct sadb_lifetime *)mhp[SADB_EXT_LIFETIME_HARD];
+@@ -425,8 +429,10 @@
+ 		str_upperspec(m_saddr->sadb_address_proto, sport, dport);
+ 	}
+ 
++#ifdef SADB_X_EXT_TAG
+ 	if (m_tag)
+ 		printf("tagged \"%s\" ", m_tag->sadb_x_tag_name);
++#endif
+ 
+ 	/* policy */
+     {