7 files changed, 7 insertions, 66 deletions

diff --git a/security/racoon2/Makefile b/security/racoon2/Makefile
index 44661498e2dc..461fdb2a5850 100644
--- a/security/racoon2/Makefile
+++ b/security/racoon2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	racoon2
-PORTVERSION=	20071227e
-PORTREVISION=	3
+PORTVERSION=	20090327c
 CATEGORIES=	security net ipv6
 MASTER_SITES=	ftp://ftp.racoon2.wide.ad.jp/pub/racoon2/
 EXTRACT_SUFX=	.tgz
diff --git a/security/racoon2/distinfo b/security/racoon2/distinfo
index 8867833dcede..01f04f9ceda9 100644
--- a/security/racoon2/distinfo
+++ b/security/racoon2/distinfo
@@ -1,3 +1,3 @@
-MD5 (racoon2-20071227e.tgz) = 42cf9bfecb209e2291e6b962d6ce1724
-SHA256 (racoon2-20071227e.tgz) = 23712474c690578ccf7fbae6039a591f798d56623ebf00b67ed9c8e941a86614
-SIZE (racoon2-20071227e.tgz) = 1000722
+MD5 (racoon2-20090327c.tgz) = 5a1bad20b8b80ad96f9abe9bf203146c
+SHA256 (racoon2-20090327c.tgz) = 9f5fb6cb6180612dea7ab73cc53b4b31d60bd5a523c208e3a2ceb9b383e11dba
+SIZE (racoon2-20090327c.tgz) = 1015802
diff --git a/security/racoon2/files/patch-kinkd-pathnames.h b/security/racoon2/files/patch-kinkd-pathnames.h
deleted file mode 100644
index 7fefb930aacf..000000000000
--- a/security/racoon2/files/patch-kinkd-pathnames.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- kinkd/pathnames.h~	2005-08-04 01:14:54.000000000 +0900
-+++ kinkd/pathnames.h	2008-08-26 15:23:53.000000000 +0900
-@@ -30,7 +30,7 @@
- 
- #define PIDFILE_DIR "/var/run"
- #define CACHE_DIR "/var/run"		/* or "/var/db" */
--#define RACOON2_CONFIG_FILE	RACOON2_CONFIG_DIR "/racoon2.conf"
-+#define RACOON2_CONFIG_FILE	RACOON_CONF
- 
- #ifdef MAKE_KINK_LIST_FILE
- #define KINK_LIST_FILE		"/var/run/kink-handle.list"
diff --git a/security/racoon2/files/patch-lib-cfsetup.c b/security/racoon2/files/patch-lib-cfsetup.c
deleted file mode 100644
index e670f0c29d97..000000000000
--- a/security/racoon2/files/patch-lib-cfsetup.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- lib/cfsetup.c.orig	2007-12-05 16:26:10.000000000 +0900
-+++ lib/cfsetup.c	2009-02-23 12:10:53.000000000 +0900
-@@ -3636,15 +3636,15 @@
- 			    "invalid kmp type %s\n", rct2str(proto));
- 			return -1;
- 		}
--		if (!kmp || !kmp->peers_ipaddr)
--			return -1;
--		for (al = kmp->peers_ipaddr; al != 0; al = al->next) {
--			if (al->type != RCT_ADDR_INET)
--				continue;
--			if (rcs_cmpsa_wop(al->a.ipaddr, s) != 0)
--				continue;
--			src = n;
--			goto found;
-+		if (kmp && kmp->peers_ipaddr) {
-+			for (al = kmp->peers_ipaddr; al != 0; al = al->next) {
-+				if (al->type != RCT_ADDR_INET)
-+					continue;
-+				if (rcs_cmpsa_wop(al->a.ipaddr, s) != 0)
-+					continue;
-+				src = n;
-+				goto found;
-+			}
- 		}
- 	}
-   found:
diff --git a/security/racoon2/files/patch-lib-racoon.h b/security/racoon2/files/patch-lib-racoon.h
deleted file mode 100644
index 8da52b24c7b4..000000000000
--- a/security/racoon2/files/patch-lib-racoon.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/racoon.h~	2007-12-12 16:12:22.000000000 +0900
-+++ lib/racoon.h	2008-08-13 13:20:32.000000000 +0900
-@@ -42,7 +42,7 @@
- #include "script.h"
- #include "missing/missing.h"
- 
--#define RACOON_CONF	SYSCONFDIR "/racoon2/racoon2.conf"
-+#define RACOON_CONF	SYSCONFDIR "/racoon2.conf"
- 
- extern int rct2isakmp_exmode __P((int));
- extern int rct2app_action __P((int));
diff --git a/security/racoon2/files/patch-samples-Makefile.in b/security/racoon2/files/patch-samples-Makefile.in
index d72c97662390..471732166552 100644
--- a/security/racoon2/files/patch-samples-Makefile.in
+++ b/security/racoon2/files/patch-samples-Makefile.in
@@ -1,14 +1,5 @@
 --- samples/Makefile.in.orig	2007-12-27 10:08:52.000000000 +0900
 +++ samples/Makefile.in	2008-04-17 19:06:11.000000000 +0900
-@@ -2,7 +2,7 @@
- 
- srcdir=@srcdir@
- prefix=@prefix@
--sysconfdir=@sysconfdir@/racoon2
-+sysconfdir=@sysconfdir@
- INSTALL =@INSTALL@ @INSTALL_OPTS@
- INSTALL_PROGRAM=@INSTALL_PROGRAM@
- INSTALL_DATA=@INSTALL_DATA@
 @@ -29,11 +29,11 @@
  	$(INSTALL) -d -m 700 $(sysconfdir)/cert
  
diff --git a/security/racoon2/files/patch-spmd-spmd_internal.h b/security/racoon2/files/patch-spmd-spmd_internal.h
index 5bee3c7d87df..eae7442e9eb0 100644
--- a/security/racoon2/files/patch-spmd-spmd_internal.h
+++ b/security/racoon2/files/patch-spmd-spmd_internal.h
@@ -1,10 +1,10 @@
---- spmd/spmd_internal.h~	2007-12-13 19:40:24.000000000 +0900
-+++ spmd/spmd_internal.h	2008-08-26 15:10:46.000000000 +0900
+--- spmd/spmd_internal.h.orig	2008-07-06 11:41:36.000000000 +0900
++++ spmd/spmd_internal.h	2009-03-30 13:35:24.000000000 +0900
 @@ -35,7 +35,7 @@
  
  extern int spmd_foreground;
  
--#define RACOON2_CONFIG_FILE SYSCONFDIR"/racoon2/racoon2.conf"
+-#define RACOON2_CONFIG_FILE SYSCONFDIR"/racoon2.conf"
 +#define RACOON2_CONFIG_FILE RACOON_CONF
  
  #if defined(HAVE_NSSWITCH_CONF)