From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Dec 23 18:00:06 2009 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 0E8CA106566B for ; Wed, 23 Dec 2009 18:00:06 +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 B87E78FC17 for ; Wed, 23 Dec 2009 18:00:05 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id nBNI05J0098036 for ; Wed, 23 Dec 2009 18:00:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id nBNI05wU098035; Wed, 23 Dec 2009 18:00:05 GMT (envelope-from gnats) Resent-Date: Wed, 23 Dec 2009 18:00:05 GMT Resent-Message-Id: <200912231800.nBNI05wU098035@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, Thomas-Martin Seck Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 80D1E1065670 for ; Wed, 23 Dec 2009 17:58:55 +0000 (UTC) (envelope-from tmseck@netcologne.de) Received: from smtp5.netcologne.de (smtp5.netcologne.de [194.8.194.25]) by mx1.freebsd.org (Postfix) with ESMTP id 0DEDA8FC0A for ; Wed, 23 Dec 2009 17:58:54 +0000 (UTC) Received: from wcfields.tmseck.homedns.org (xdsl-89-0-141-58.netcologne.de [89.0.141.58]) by smtp5.netcologne.de (Postfix) with SMTP id 3101531C565 for ; Wed, 23 Dec 2009 18:58:53 +0100 (CET) Received: (qmail 33042 invoked by uid 1001); 23 Dec 2009 17:58:53 -0000 Message-Id: <20091223175853.33041.qmail@wcfields.tmseck.homedns.org> Date: 23 Dec 2009 17:58:53 -0000 From: Thomas-Martin Seck To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/141922: [Maintainer] www/squid30: update to 3.0.STABLE21 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Thomas-Martin Seck List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Dec 2009 18:00:06 -0000 >Number: 141922 >Category: ports >Synopsis: [Maintainer] www/squid30: update to 3.0.STABLE21 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Dec 23 18:00:05 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Thomas-Martin Seck >Release: FreeBSD 7.2-RELEASE i386 >Organization: a private site in Germany >Environment: FreeBSD ports collection as of December 23, 2009. >Description: - update to 3.0.STABLE21 - add a CONFLICT with lusca-head - merge squid rc script changes from www/squid and www/squid31: - implement squid_fib and squid_conf - document user settable variables - make the squid configuration directory world-readable on new installations to ease use of cachemgr.cgi >How-To-Repeat: >Fix: Apply this patch: Index: Makefile =================================================================== --- Makefile (.../www/squid30) (Revision 1708) +++ Makefile (.../local/squid30) (Revision 1708) @@ -99,9 +99,9 @@ LATEST_LINK= squid30 -SQUID_STABLE_VER= 20 +SQUID_STABLE_VER= 21 -CONFLICTS= squid-2.[0-9].* squid-3.[^0].* cacheboy-[0-9]* +CONFLICTS= squid-2.[0-9].* squid-3.[^0].* cacheboy-[0-9]* lusca-head-[0-9]* GNU_CONFIGURE= yes USE_BZIP2= yes USE_PERL5= yes Index: distinfo =================================================================== --- distinfo (.../www/squid30) (Revision 1708) +++ distinfo (.../local/squid30) (Revision 1708) @@ -1,3 +1,3 @@ -MD5 (squid3.0/squid-3.0.STABLE20.tar.bz2) = 9efcbdda8045d2a9eb5d9915449ef175 -SHA256 (squid3.0/squid-3.0.STABLE20.tar.bz2) = 7163b208855540e3a94e19f9e03fb6cee8cbc208515fc8e7d6b94419a7ccdf69 -SIZE (squid3.0/squid-3.0.STABLE20.tar.bz2) = 1801899 +MD5 (squid3.0/squid-3.0.STABLE21.tar.bz2) = 279168fe1fe5b38bbf6eee12babbc4ad +SHA256 (squid3.0/squid-3.0.STABLE21.tar.bz2) = 07114935b7aed9df42524e84f6a634849d4bcafd513bf118881aa5cc58911f7b +SIZE (squid3.0/squid-3.0.STABLE21.tar.bz2) = 1802875 Index: files/pkg-install.in =================================================================== --- files/pkg-install.in (.../www/squid30) (Revision 1708) +++ files/pkg-install.in (.../local/squid30) (Revision 1708) @@ -60,7 +60,7 @@ if [ ! -d ${squid_confdir} ]; then echo "Creating ${squid_confdir}..." install -d -o root -g ${squid_group} \ - -m 0750 ${squid_confdir} + -m 0755 ${squid_confdir} fi ;; POST-INSTALL) Index: files/squid.in =================================================================== --- files/squid.in (.../www/squid30) (Revision 1708) +++ files/squid.in (.../local/squid30) (Revision 1708) @@ -8,16 +8,51 @@ # # 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_pidfile, squid_user, and squid_flags. +# /etc/rc.conf.d/squid to activate Squid. # -# Please see squid(8), rc.conf(5) and rc(8) for further details. +# Additional variables you can define in one of these files: # +# squid_chdir: the directory into which the rc system moves into before +# starting Squid. Default: %%PREFIX%%/squid +# +# squid_conf: The configuration file that Squid should use. +# Default: %%PREFIX%%/etc/squid/squid.conf +# +# squid_fib: The alternative routing table id that Squid should use. +# Default: none +# See setfib(1) for further details. Note that the setfib(2) +# system call is not available in FreeBSD versions prior to 7.1. +# +# squid_user: The user id that should be used to run the Squid master +# process. Default: %%SQUID_UID%%. +# Note that you probably need to define "squid_user=root" if +# you want to run Squid in reverse proxy setups or if you want +# Squid to listen on a "privileged" port < 1024. +# +# squid_pidfile: +# The name (including the full path) of the Squid +# master process' PID file. +# Default: %%PREFIX%%/squid/squid.pid. +# You only need to change this if you changed the +# corresponding entry in your Squid configuration. +# +# squid_flags: Additional commandline arguments for Squid you might want to +# use. See squid(8) for further details. +# squid_checkrunning() { ${command} ${squid_flags} -k check 2>/dev/null } +squid_setfib() { + sysctl net.fibs >/dev/null 2>&1 || return 0 + if [ "x${squid_fib}" != "xNONE" ]; then + command="setfib -F ${squid_fib} ${command}" + else + return 0 + fi +} + squid_stop() { echo "Stopping ${name}." ${command} ${squid_flags} -k shutdown @@ -32,29 +67,27 @@ command=%%PREFIX%%/sbin/squid extra_commands=reload reload_cmd="${command} ${squid_flags} -k reconfigure" +start_precmd="squid_setfib" stop_precmd="squid_checkrunning" stop_cmd="squid_stop" load_rc_config ${name} squid_chdir=${squid_chdir:-"%%PREFIX%%/squid/logs"} +squid_conf=${squid_conf:-"%%PREFIX%%/etc/squid/squid.conf"} squid_enable=${squid_enable:-"NO"} +squid_fib=${squid_fib:-"NONE"} squid_flags=${squid_flags-"-D"} squid_pidfile=${squid_pidfile:-"%%PREFIX%%/squid/logs/squid.pid"} squid_user=${squid_user:-%%SQUID_UID%%} -default_config=%%PREFIX%%/etc/squid/squid.conf pidfile=${squid_pidfile} required_dirs=${squid_chdir} -# squid(8) will not start if ${default_config} is not present so try +# squid(8) will not start if ${squid_conf} is not present so try # to catch that beforehand via ${required_files} rather than make # squid(8) crash. -# If you remove the default configuration file make sure to add -# '-f /path/to/your/squid.conf' to squid_flags -if [ -z "${squid_flags}" ]; then - required_files=${default_config} -fi +required_files=${squid_conf} run_rc_command "$1" >Release-Note: >Audit-Trail: >Unformatted: