update to latest (7/31), to sync with /usr/include/netinet6/ipsec.h change.

- improvements in multiple address case
- sync with improvements in INET2000 bakeoff

4 files changed, 17 insertions, 17 deletions

diff --git a/security/racoon/Makefile b/security/racoon/Makefile
index eb2f64fe57c..ad52da3e2f1 100644
--- a/security/racoon/Makefile
+++ b/security/racoon/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2000/07/25 00:25:11 hubertf Exp $
+# $NetBSD: Makefile,v 1.16 2000/07/30 16:56:36 itojun Exp $
 #
 
-DISTNAME=	racoon-20000719a
+DISTNAME=	racoon-20000731a
 CATEGORIES=	security net
 MASTER_SITES=	ftp://ftp.kame.net/pub/kame/misc/
 
diff --git a/security/racoon/files/md5 b/security/racoon/files/md5
index 7d50632b013..d8727523d4c 100644
--- a/security/racoon/files/md5
+++ b/security/racoon/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.6 2000/07/18 15:31:48 itojun Exp $
+$NetBSD: md5,v 1.7 2000/07/30 16:56:37 itojun Exp $
 
-MD5 (racoon-20000719a.tar.gz) = 9b859010376e3749bd9a06771e169d05
+MD5 (racoon-20000731a.tar.gz) = b4234014916c9d655d44fae5319aca5c
diff --git a/security/racoon/files/patch-sum b/security/racoon/files/patch-sum
index c859ab0afea..f001d2487ed 100644
--- a/security/racoon/files/patch-sum
+++ b/security/racoon/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.2 2000/06/12 10:45:52 itojun Exp $
+$NetBSD: patch-sum,v 1.3 2000/07/30 16:56:37 itojun Exp $
 
 MD5 (patch-aa) = 09219a5e174dfd1af277d60c01e84a1d
 MD5 (patch-ab) = 1a2944fbce4cee174eade2cc0726c0ef
-MD5 (patch-ac) = 120b688d163c46659fecb0163def13a0
+MD5 (patch-ac) = 148e0972689931384d1c55d4f99d3f66
 MD5 (patch-ad) = 4a68eee8591dd85c8b17ba154b75c642
diff --git a/security/racoon/patches/patch-ac b/security/racoon/patches/patch-ac
index 5281d72ed83..d8f98724994 100644
--- a/security/racoon/patches/patch-ac
+++ b/security/racoon/patches/patch-ac
@@ -1,22 +1,22 @@
-$NetBSD: patch-ac,v 1.1 2000/06/12 10:45:53 itojun Exp $
---- samples/racoon.conf.sample-	Mon Jun 12 00:27:22 2000
-+++ samples/racoon.conf.sample	Mon Jun 12 00:27:58 2000
-@@ -2,15 +2,15 @@
- 
- # "path" must be placed before it should be used.
- # You can overwrite which you defined, but it should not use due to confusing.
+$NetBSD: patch-ac,v 1.2 2000/07/30 16:56:38 itojun Exp $
+--- samples/racoon.conf.sample.orig	Mon Jul 31 01:48:04 2000
++++ samples/racoon.conf.sample	Mon Jul 31 01:50:29 2000
+@@ -4,15 +4,15 @@
+ # "include" directive with relative file path.
+ # you can overwrite "path" directive afterwards, however, doing so may add
+ # more confusion.
 -#path include "/usr/local/v6/etc" ;
 +#path include "/etc/racoon" ;
  #include "remote.conf" ;
  
- # search this file for pre_shared_key with various ID key.
+ # the file should contain key ID/key pairs, for pre-shared key authentication.
 -path pre_shared_key "/usr/local/v6/etc/psk.txt" ;
 +path pre_shared_key "/etc/racoon/psk.txt" ;
  
- # racoon will search this directory if the certificate or certificate request
- # is received.
+ # racoon will look for certificate file in the directory,
+ # if the certificate/certificate request payload is received.
 -#path certificate "/usr/local/openssl/certs" ;
 +#path certificate "/usr/pkg/certs" ;
  
- # personal information.
+ # identification for our side.
  identifier user_fqdn "foo@kame.net";