From owner-cvs-all@FreeBSD.ORG Fri Nov 28 10:44:15 2003 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9F67516A4CE; Fri, 28 Nov 2003 10:44:15 -0800 (PST) Received: from cheer.mahoroba.org (flets20-170.kamome.or.jp [218.45.20.170]) by mx1.FreeBSD.org (Postfix) with ESMTP id C5B1543FBF; Fri, 28 Nov 2003 10:44:13 -0800 (PST) (envelope-from ume@mahoroba.org) Received: from lyrics.mahoroba.org (IDENT:y11IR1nd5VmZrAekrQTELXJotc5ixb7iZP11jhld3Sa1wsnAkS20JPRwqtDsQjid@lyrics.mahoroba.org [IPv6:3ffe:501:185b:8010:280:88ff:fe03:4841]) (user=ume mech=CRAM-MD5 bits=0)hASIgVaj008928 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 29 Nov 2003 03:42:31 +0900 (JST) (envelope-from ume@mahoroba.org) Date: Sat, 29 Nov 2003 03:43:58 +0900 Message-ID: From: Hajimu UMEMOTO To: Bruce M Simpson In-Reply-To: <20031128181018.GE81432@saboteur.dek.spc.org> References: <200311281728.hASHSgxc031148@repoman.freebsd.org> <20031128181018.GE81432@saboteur.dek.spc.org> User-Agent: xcite1.38> Wanderlust/2.11.3 (Wonderwall) SEMI/1.14.5 (Awara-Onsen) FLIM/1.14.5 (Demachiyanagi) APEL/10.6 Emacs/21.3 (i386--freebsd) MULE/5.0 (=?ISO-2022-JP?B?GyRCOC1MWhsoQg==?=) X-Operating-System: FreeBSD 5.2-BETA MIME-Version: 1.0 (generated by SEMI 1.14.5 - "Awara-Onsen") Content-Type: text/plain; charset=US-ASCII X-Virus-Scanned: by amavisd-new X-Spam-Status: No, hits=0.0 required=5.0 tests=none autolearn=no version=2.60 X-Spam-Checker-Version: SpamAssassin 2.60 (1.212-2003-09-23-exp) on cheer.mahoroba.org cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org cc: Hajimu UMEMOTO Subject: Re: cvs commit: src/etc/rc.d ike src/etc/defaults rc.conf X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Nov 2003 18:44:15 -0000 Hi, >>>>> On Fri, 28 Nov 2003 18:10:18 +0000 >>>>> Bruce M Simpson 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 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/