Date: Fri, 25 May 2007 22:22:19 +0800 (CST) From: Tsung-Hsi Weng <chwong@cs.nctu.edu.tw> To: FreeBSD-gnats-submit@FreeBSD.org Cc: tmseck@netcologne.de Subject: ports/112995: [PATCH] www/squid: [SUMMARIZE CHANGES] Message-ID: <20070525142219.D10B43B4D4F@nabsd.cs.nctu.edu.tw> Resent-Message-ID: <200705251440.l4PEeEi8062488@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 112995 >Category: ports >Synopsis: [PATCH] www/squid: [SUMMARIZE CHANGES] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri May 25 14:40:14 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Tsung-Hsi Weng >Release: FreeBSD 6.2-RELEASE-p2 i386 >Organization: >Environment: System: FreeBSD nabsd 6.2-RELEASE-p2 FreeBSD 6.2-RELEASE-p2 #0: Thu Mar 15 13:10:34 CST 2007 >Description: [DESCRIBE CHANGES] Port maintainer (tmseck@netcologne.de) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- squid-2.6.12_2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/www/squid/Makefile /home/chwong/squid/Makefile --- /usr/ports/www/squid/Makefile Fri May 4 02:11:16 2007 +++ /home/chwong/squid/Makefile Fri May 25 22:06:30 2007 @@ -76,7 +76,7 @@ PORTNAME= squid PORTVERSION= 2.6.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ ftp://ftp.vistech.net/pub/squid/%SUBDIR%/ \ diff -ruN --exclude=CVS /usr/ports/www/squid/files/squid.in /home/chwong/squid/files/squid.in --- /usr/ports/www/squid/files/squid.in Thu Mar 8 13:54:21 2007 +++ /home/chwong/squid/files/squid.in Fri May 25 22:19:05 2007 @@ -9,7 +9,7 @@ # Note: # Set "squid_enable=yes" in either /etc/rc.conf, /etc/rc.conf.local or # /etc/rc.conf.d/squid to make this script actually do something. There -# you can also set squid_chdir, squid_user, and squid_flags. +# you can also set squid_chdir, squid_config, squid_user, and squid_flags. # # Please see squid(8), rc.conf(5) and rc(8) for further details. # @@ -30,18 +30,22 @@ rcvar=${name}_enable command=%%PREFIX%%/sbin/squid -extra_commands=reload -reload_cmd="${command} ${squid_flags} -k reconfigure" -stop_precmd="squid_checkrunning" -stop_cmd="squid_stop" +default_config=%%PREFIX%%/etc/squid/squid.conf load_rc_config ${name} squid_chdir=${squid_chdir:-%%PREFIX%%/squid/logs} squid_enable=${squid_enable:-"NO"} -squid_flags=${squid_flags-"-D"} +squid_config=${squid_config:-${default_config}} +squid_flags=${squid_flags:-"-D -f ${squid_config}"} squid_user=${squid_user:-%%SQUID_UID%%} -default_config=%%PREFIX%%/etc/squid/squid.conf + +extra_commands=reload +reload_cmd="${command} ${squid_flags} -k reconfigure" +stop_precmd="squid_checkrunning" +stop_cmd="squid_stop" +pidfile=`/usr/bin/grep ^pid_filename ${squid_config} | /usr/bin/cut -f 2 -d ' '` +pidfile=${pidfile:-%%PREFIX%%/squid/logs/squid.pid} required_dirs=${squid_chdir} --- squid-2.6.12_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070525142219.D10B43B4D4F>