cvs commit: ports/security/ipsec-tools Makefile ports/security/ipsec-tools/files racoon.sh.in

[Doug Barton]

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 <jhein at symmetricom.com>
>   Approved by:    maho (mentor) and vanhu at 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/

-------------- next part --------------
#!/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"