ports/89273: security/ipsec-tools has different default conf file than old racoon

[Angelo Turetta]

>Number:         89273
>Category:       ports
>Synopsis:       security/ipsec-tools has different default conf file than old racoon
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 19 11:00:42 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Angelo Turetta
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
Commit.it
>Environment:
System: FreeBSD stable.home.commit.it 6.0-STABLE FreeBSD 6.0-STABLE #0: Fri Nov 18 20:12:17 CET 2005 aturetta at stable.home.commit.it:/usr/obj/usr/src/sys/IPSEC i386


	
>Description:
	security/racoon has recently been removed in favor of the officially
	maintained security/ipsec-tools.
	The usual 'portupgrade -fo security/ipsec-tools racoon' fixed things
	for me, but I discovered that the new port has a different default
	location for the config file: /usr/local/etc/racoon.conf instead of
	/usr/local/etc/racoon/racoon.conf.
	The problem is that the racoon.sh startup script checks for presence
	of the file in the old location, while the program itself tries to
	read it from the new one. The problem is amplified by lack of a default
	config file, which would poit one in the right direction.
	An additional problem is that the error message is somewhat cryptic.
	Instead of a usual 'file not found <name>', it logs something like
	'glob found no matches' which is hardly significant
>How-To-Repeat:
	
>Fix:

	Move your racoon.conf over to directory /usr/local/etc, or add
	 "-f /usr/local/etc/racoon/racoon.conf" 
	to your /etc/rc.conf:racoon_flags variable.

	AND please fix the racoon.sh installed by the port

	I think this is worth an entry in /usr/ports/UPDATING

====================== begin patch ======================
Index: security/ipsec-tools/files/racoon.sh
===================================================================
RCS file: /home/ncvs/ports/security/ipsec-tools/files/racoon.sh,v
retrieving revision 1.1
diff -u -r1.1 racoon.sh
--- security/ipsec-tools/files/racoon.sh        5 Sep 2005 14:13:42 -0000       1.1
+++ security/ipsec-tools/files/racoon.sh        19 Nov 2005 10:53:52 -0000
@@ -31,7 +31,7 @@
 rcvar=`set_rcvar`
 command="${prefix}/sbin/racoon"
 pidfile="/var/run/racoon.pid"
-required_files="${prefix}/etc/racoon/racoon.conf"
+required_files="${prefix}/etc/racoon.conf"
 stop_postcmd="racoon_poststop"

 racoon_poststop() {
======================= end patch =======================

>Release-Note:
>Audit-Trail:
>Unformatted: