From e046463a26acd679271f0159da2bff080e84f4c7 Mon Sep 17 00:00:00 2001 From: Munechika SUMIKAWA Date: Tue, 26 Aug 2008 08:55:18 +0000 Subject: [PATCH] Fix hardcoded cofiguration path. Reported by: Goran Lowkrantz --- security/racoon2/Makefile | 2 +- security/racoon2/files/patch-kinkd-pathnames.h | 11 +++++++++++ security/racoon2/files/patch-lib-racoon.h | 11 +++++++++++ security/racoon2/files/patch-spmd-spmd_internal.h | 11 +++++++++++ 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 security/racoon2/files/patch-kinkd-pathnames.h create mode 100644 security/racoon2/files/patch-lib-racoon.h create mode 100644 security/racoon2/files/patch-spmd-spmd_internal.h diff --git a/security/racoon2/Makefile b/security/racoon2/Makefile index be8168d379cc..f462262fd268 100644 --- a/security/racoon2/Makefile +++ b/security/racoon2/Makefile @@ -7,7 +7,7 @@ PORTNAME= racoon2 PORTVERSION= 20071227e -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security net ipv6 MASTER_SITES= ftp://ftp.racoon2.wide.ad.jp/pub/racoon2/ EXTRACT_SUFX= .tgz diff --git a/security/racoon2/files/patch-kinkd-pathnames.h b/security/racoon2/files/patch-kinkd-pathnames.h new file mode 100644 index 000000000000..7fefb930aacf --- /dev/null +++ b/security/racoon2/files/patch-kinkd-pathnames.h @@ -0,0 +1,11 @@ +--- 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-racoon.h b/security/racoon2/files/patch-lib-racoon.h new file mode 100644 index 000000000000..8da52b24c7b4 --- /dev/null +++ b/security/racoon2/files/patch-lib-racoon.h @@ -0,0 +1,11 @@ +--- 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-spmd-spmd_internal.h b/security/racoon2/files/patch-spmd-spmd_internal.h new file mode 100644 index 000000000000..5bee3c7d87df --- /dev/null +++ b/security/racoon2/files/patch-spmd-spmd_internal.h @@ -0,0 +1,11 @@ +--- spmd/spmd_internal.h~ 2007-12-13 19:40:24.000000000 +0900 ++++ spmd/spmd_internal.h 2008-08-26 15:10:46.000000000 +0900 +@@ -35,7 +35,7 @@ + + extern int spmd_foreground; + +-#define RACOON2_CONFIG_FILE SYSCONFDIR"/racoon2/racoon2.conf" ++#define RACOON2_CONFIG_FILE RACOON_CONF + + #if defined(HAVE_NSSWITCH_CONF) + # define NSSWITCH_CONF_FILE "/etc/nsswitch.conf"