ports/156737: [patch] squid.in startup script fixes to always adhere to squid_conf setting

[Martin Birgmeier]

>Number:         156737
>Category:       ports
>Synopsis:       [patch] squid.in startup script fixes to always adhere to squid_conf setting
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 30 15:50:07 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Martin Birgmeier
>Release:        7.4, 8.2
>Organization:
MBi at home
>Environment:
FreeBSD gandalf.xyzzy 7.4-RELEASE FreeBSD 7.4-RELEASE #1: Sun Feb 20 18:37:59 CET 2011     root at v901.xyzzy:/.../hal/z/OBJ/FreeBSD/i386/RELENG_7_4_0_RELEASE/src/sys/XYZZY  i386
>Description:
Some (explicit) calls to squid in /usr/local/etc/rc.d/squid do not pass the -f configfile parameter which is set in /etc/rc.conf as squid_conf.
>How-To-Repeat:
Try "/usr/local/etc/rc.d/squid restart" and see that it fails.
>Fix:
See the attached patch (for www/squid31).

Probably the same patch should also be applied to the other squid ports.

I suspect that this will also fix http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/151876

Patch attached with submission follows:

--- www/squid31/files/squid.in.ORIG	2011-01-06 15:32:21.829065928 +0100
+++ www/squid31/files/squid.in	2011-04-30 17:29:25.073592142 +0200
@@ -41,7 +41,7 @@
 #
 
 squid_checkrunning() {
-	${command} ${squid_flags} -k check 2>/dev/null
+	${command} ${command_args} ${squid_flags} -k check 2>/dev/null
 }
 
 squid_setfib() {
@@ -55,7 +55,7 @@
 
 squid_stop() {
 	echo "Stopping ${name}."
-	${command} ${squid_flags} -k shutdown
+	${command} ${command_args} ${squid_flags} -k shutdown
 	run_rc_command poll
 }
 
@@ -66,7 +66,7 @@
 
 command=%%PREFIX%%/sbin/squid
 extra_commands=reload
-reload_cmd="${command} ${squid_flags} -k reconfigure"
+reload_cmd="${command} ${command_args} ${squid_flags} -k reconfigure"
 start_precmd="squid_setfib"
 stop_precmd="squid_checkrunning"
 stop_cmd="squid_stop"


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