Upgrade to 20090327c.

This commit is contained in:
Munechika SUMIKAWA 2009-03-30 04:47:37 +00:00
parent d0c42f2f98
commit a339efba1e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=231284
7 changed files with 7 additions and 66 deletions

View file

@ -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

View file

@ -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

View file

@ -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"

View file

@ -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:

View file

@ -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));

View file

@ -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

View file

@ -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)