From owner-cvs-ports@FreeBSD.ORG Tue Jul 19 08:39:23 2011 Return-Path: Delivered-To: cvs-ports@FreeBSD.org Received: from mx2.freebsd.org (mx2.freebsd.org [IPv6:2001:4f8:fff6::35]) by hub.freebsd.org (Postfix) with ESMTP id CE91E1065670; Tue, 19 Jul 2011 08:39:23 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from 65-241-43-4.globalsuite.net (hub.freebsd.org [IPv6:2001:4f8:fff6::36]) by mx2.freebsd.org (Postfix) with ESMTP id 31CE41500F9; Tue, 19 Jul 2011 08:39:23 +0000 (UTC) Message-ID: <4E2542BA.5040203@FreeBSD.org> Date: Tue, 19 Jul 2011 01:39:22 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:5.0) Gecko/20110706 Thunderbird/5.0 MIME-Version: 1.0 To: Stephen Montgomery-Smith References: <201107190333.p6J3XQVD050847@repoman.freebsd.org> In-Reply-To: <201107190333.p6J3XQVD050847@repoman.freebsd.org> X-Enigmail-Version: 1.2pre OpenPGP: id=1A1ABC84 Content-Type: multipart/mixed; boundary="------------040405040906080806060808" Cc: vanhu@netasq.com, cvs-all@FreeBSD.org, John Hein , maho@FreeBSD.org, cvs-ports@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/security/ipsec-tools Makefile ports/security/ipsec-tools/files racoon.sh.in X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Jul 2011 08:39:24 -0000 This is a multi-part message in MIME format. --------------040405040906080806060808 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit This change is an improvement, but it doesn't go far enough in a couple of directions. The 2 most important being that faststart is not the only possible prefix there, and we don't want that block to run unconditionally in any case. I've attached the full script I'm suggesting because the diff doesn't make much sense. One thing I didn't change because I'm not sure if it needs to be run early is changing the current require/before to just REQUIRE: LOGIN, which is what we prefer ports scripts to do. However if there is a good reason for this one to run earlier, that's fine. If you have any questions, let me know. Doug On 07/18/2011 20:33, Stephen Montgomery-Smith wrote: > stephen 2011-07-19 03:33:26 UTC > > FreeBSD ports repository > > Modified files: > security/ipsec-tools Makefile > security/ipsec-tools/files racoon.sh.in > Log: > - Fix startup script rc.d/racoon. > - Bump portrevision. > > PR: ports/148605 http://www.FreeBSD.org/cgi/query-pr.cgi?pr=148605 > Submitted by: John Hein > Approved by: maho (mentor) and vanhu@netasq.com (maintainer) > > Revision Changes Path > 1.29 +1 -0 ports/security/ipsec-tools/Makefile > 1.8 +3 -3 ports/security/ipsec-tools/files/racoon.sh.in > > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/security/ipsec-tools/Makefile.diff?&r1=1.28&r2=1.29&f=h > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/security/ipsec-tools/files/racoon.sh.in.diff?&r1=1.7&r2=1.8&f=h > -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ --------------040405040906080806060808 Content-Type: text/plain; name="racoon.sh.in" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="racoon.sh.in" #!/bin/sh # $FreeBSD$ # # PROVIDE: racoon # REQUIRE: DAEMON # BEFORE: LOGIN # KEYWORD: shutdown # # Define these racoon_* variables in one of these files: # /etc/rc.conf # /etc/rc.conf.local # /etc/rc.conf.d/racoon # # DO NOT CHANGE THESE DEFAULT VALUES HERE . /etc/rc.subr name="racoon" rcvar=`set_rcvar` load_rc_config $name racoon_enable=${racoon_enable:-"NO"} # Disable by default racoon_create_dirs=${racoon_create_dirs:-"NO"} # Create $required_dirs #racoon_flags="" # Flags to racoon program command="%%PREFIX%%/sbin/${name}" pidfile="/var/run/${name}.pid" start_precmd="${name}_prestart" stop_postcmd="racoon_cleanup" socketfile="%%STATEDIR%%/${name}.sock" required_files="%%PREFIX%%/etc/${name}/${name}.conf" required_dirs="%%STATEDIR%%" racoon_cleanup() { /bin/rm -f ${pidfile} /bin/rm -f ${socketfile} } raccoon_prestart() { raccon_cleanup if checkyesno "${name}_create_dirs"; then /bin/mkdir -p $required_dirs fi } run_rc_command "$1" --------------040405040906080806060808--