Date: Sat, 29 Nov 2003 03:43:58 +0900 From: Hajimu UMEMOTO <ume@mahoroba.org> To: Bruce M Simpson <bms@spc.org> Cc: Hajimu UMEMOTO <ume@mahoroba.org> Subject: Re: cvs commit: src/etc/rc.d ike src/etc/defaults rc.conf Message-ID: <yge3cc8tjtd.wl%ume@mahoroba.org> In-Reply-To: <20031128181018.GE81432@saboteur.dek.spc.org> References: <200311281728.hASHSgxc031148@repoman.freebsd.org> <yge4qwotm2f.wl%ume@mahoroba.org> <20031128181018.GE81432@saboteur.dek.spc.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi,
>>>>> On Fri, 28 Nov 2003 18:10:18 +0000
>>>>> Bruce M Simpson <bms@spc.org> said:
bms> I don't have a problem with backing this out if such an RCng script exists,
bms> and if there's sufficient strength of feeling about the issue. However,
bms> isakmpd doesn't ship with an rc script at this time.
How about this?
Index: isakmpd/Makefile
diff -u isakmpd/Makefile.orig isakmpd/Makefile
--- isakmpd/Makefile.orig Sat Oct 18 01:08:03 2003
+++ isakmpd/Makefile Sat Nov 29 03:26:37 2003
@@ -27,6 +27,7 @@
BUILD_DEPENDS+= keynote:${PORTSDIR}/security/keynote
.endif
+USE_RC_SUBR= yes
USE_OPENSSL= yes
USE_REINPLACE= yes
WRKSRC= ${WRKDIR}/isakmpd
@@ -36,9 +37,17 @@
MAN8= certpatch.8 isakmpd.8
MANCOMPRESSED= yes
+RC_SCRIPTS_SUB= PREFIX=${PREFIX} \
+ RC_SUBR=${RC_SUBR}
+
post-patch:
.for f in conf.h ike_auth.c isakmpd.8 isakmpd.conf.5 isakmpd.policy.5 policy.h
${REINPLACE_CMD} -e "s!/etc/!${PREFIX}/etc/!" ${WRKSRC}/${f}
.endfor
+
+post-install:
+ @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+ ${FILESDIR}/isakmpd.sh > ${PREFIX}/etc/rc.d/isakmpd.sh
+ @${CHMOD} 755 ${PREFIX}/etc/rc.d/isakmpd.sh
.include <bsd.port.mk>
Index: isakmpd/files/isakmpd.sh
diff -u /dev/null isakmpd/files/isakmpd.sh
--- /dev/null Sat Nov 29 03:36:29 2003
+++ isakmpd/files/isakmpd.sh Sat Nov 29 03:34:07 2003
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+# Start or stop isakmpd
+# $FreeBSD$
+
+# PROVIDE: isakmpd
+# REQUIRE: root beforenetlkm mountcritlocal
+# BEFORE: DAEMON
+# KEYWORD: FreeBSD shutdown
+#
+# NOTE for FreeBSD 5.0+:
+# If you want this script to start with the base rc scripts
+# move isakmpd.sh to /etc/rc.d/isakmpd
+
+prefix=%%PREFIX%%
+
+# Define these isakmpd_* variables in one of these files:
+# /etc/rc.conf
+# /etc/rc.conf.local
+# /etc/rc.conf.d/isakmpd
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+[ -z "$isakmpd_enable" ] && isakmpd_enable="NO" # Enable isakmpd
+#isakmpd_program="${prefix}/sbin/isakmpd" # Location of isakmpd
+#isakmpd_flags="" # Flags to isakmpd program
+
+. %%RC_SUBR%%
+
+name="isakmpd"
+rcvar=`set_rcvar`
+command="${prefix}/sbin/isakmpd"
+pidfile="/var/run/isakmpd.pid"
+extra_commands="reload"
+
+load_rc_config $name
+run_rc_command "$1"
Index: isakmpd/pkg-plist
diff -u isakmpd/pkg-plist.orig isakmpd/pkg-plist
--- isakmpd/pkg-plist.orig Thu Sep 11 03:51:14 2003
+++ isakmpd/pkg-plist Sat Nov 29 03:27:31 2003
@@ -1,3 +1,4 @@
+etc/rc.d/isakmpd.sh
sbin/certpatch
sbin/isakmpd
share/examples/isakmpd/VPN-3way-template.conf
Sincerely,
--
Hajimu UMEMOTO @ Internet Mutual Aid Society Yokohama, Japan
ume@mahoroba.org ume@bisd.hitachi.co.jp ume@{,jp.}FreeBSD.org
http://www.imasy.org/~ume/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?yge3cc8tjtd.wl%ume>