From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Apr 30 15:50:08 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0AA251065674 for ; Sat, 30 Apr 2011 15:50:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id D33438FC17 for ; Sat, 30 Apr 2011 15:50:07 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p3UFo7Xq034894 for ; Sat, 30 Apr 2011 15:50:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p3UFo7qv034893; Sat, 30 Apr 2011 15:50:07 GMT (envelope-from gnats) Resent-Date: Sat, 30 Apr 2011 15:50:07 GMT Resent-Message-Id: <201104301550.p3UFo7qv034893@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Martin Birgmeier Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BB924106566B for ; Sat, 30 Apr 2011 15:40:13 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id A961F8FC14 for ; Sat, 30 Apr 2011 15:40:13 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p3UFeDfb040910 for ; Sat, 30 Apr 2011 15:40:13 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p3UFeCth040909; Sat, 30 Apr 2011 15:40:12 GMT (envelope-from nobody) Message-Id: <201104301540.p3UFeCth040909@red.freebsd.org> Date: Sat, 30 Apr 2011 15:40:12 GMT From: Martin Birgmeier To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/156737: [patch] squid.in startup script fixes to always adhere to squid_conf setting X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Apr 2011 15:50:08 -0000 >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@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: