From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Nov 1 16:10:48 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 61AFB16A403 for ; Wed, 1 Nov 2006 16:10:48 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C70E43D76 for ; Wed, 1 Nov 2006 16:10:37 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kA1GAbRP017092 for ; Wed, 1 Nov 2006 16:10:37 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kA1GAbVq017091; Wed, 1 Nov 2006 16:10:37 GMT (envelope-from gnats) Resent-Date: Wed, 1 Nov 2006 16:10:37 GMT Resent-Message-Id: <200611011610.kA1GAbVq017091@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 [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2FAB916A53B for ; Wed, 1 Nov 2006 16:01:15 +0000 (UTC) (envelope-from thomas@hardy.tmseck.homedns.org) Received: from smtp2.netcologne.de (smtp2.netcologne.de [194.8.194.112]) by mx1.FreeBSD.org (Postfix) with ESMTP id D253F43D67 for ; Wed, 1 Nov 2006 16:00:38 +0000 (GMT) (envelope-from thomas@hardy.tmseck.homedns.org) Received: from laurel.tmseck.homedns.org (xdsl-213-196-243-240.netcologne.de [213.196.243.240]) by smtp2.netcologne.de (Postfix) with SMTP id 691C94C65 for ; Wed, 1 Nov 2006 17:00:37 +0100 (MET) Received: (qmail 14053 invoked from network); 1 Nov 2006 16:00:37 -0000 Received: from unknown (HELO hardy.tmseck.homedns.org) (192.168.1.2) by 0 with SMTP; 1 Nov 2006 16:00:37 -0000 Received: from hardy.tmseck.homedns.org (localhost [127.0.0.1]) by hardy.tmseck.homedns.org (8.13.8/8.13.8) with ESMTP id kA1G0aot054584; Wed, 1 Nov 2006 17:00:36 +0100 (CET) (envelope-from thomas@hardy.tmseck.homedns.org) Received: (from thomas@localhost) by hardy.tmseck.homedns.org (8.13.8/8.13.8/Submit) id kA1G0agj054583; Wed, 1 Nov 2006 17:00:36 +0100 (CET) (envelope-from thomas) Message-Id: <200611011600.kA1G0agj054583@hardy.tmseck.homedns.org> Date: Wed, 1 Nov 2006 17:00:36 +0100 (CET) From: Thomas-Martin Seck To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/105023: [Maintainer] www/squid: minor cleanups and fixes 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, 01 Nov 2006 16:10:48 -0000 >Number: 105023 >Category: ports >Synopsis: [Maintainer] www/squid: minor cleanups and fixes >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 Nov 01 16:10:36 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Thomas-Martin Seck >Release: FreeBSD 6.2-PRERELEASE i386 >Organization: a private site in Germany >Environment: FreeBSD ports collection as of November 1, 2006. >Description: Some minor updates to the Squid 2.5 port, mostly synchronisation with www/squid26 where applicable: - update pkg-descr and remove some cruft - consistently use "Squid" when referring to the software's name - define COMMENT a bit less chatty - replace the progeny.com mirror with the one hosted by Vistech - fix a wrong path in pkg-message.in (thanks to "Tuc at the Beach House") - pass ${squid_flags} when stopping or reconfiguring Squid (ports/100510) >How-To-Repeat: >Fix: Apply this patch: Index: Makefile =================================================================== --- Makefile (.../www/squid) (revision 1020) +++ Makefile (.../local/squid) (revision 1020) @@ -6,7 +6,7 @@ # # Tunables not (yet) configurable via 'make config': # SQUID_{U,G}ID -# Which user/group squid should run as (default: squid/squid). +# Which user/group Squid should run as (default: squid/squid). # The user and group will be created if they do not already exist using # a uid:gid of 100:100. # NOTE: before version 2.5.4_6, these settings defaulted to @@ -68,16 +68,16 @@ # of filedescriptors the resulting binary is expected to support. # --enable-ntlm-fail-open # Enable NTLM fail open, where a helper that fails one of the -# Authentication steps can allow squid to still authenticate the user +# Authentication steps can allow Squid to still authenticate the user # PORTNAME= squid PORTVERSION= 2.5.14 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ - ftp://archive.progeny.com/squid/%SUBDIR%/ \ + ftp://ftp.vistech.net/pub/squid/%SUBDIR%/ \ ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \ ftp://sunsite.auc.dk/pub/infosystems/squid/%SUBDIR%/ \ ftp://ftp.nl.uu.net/pub/unix/www/squid/%SUBDIR%/ \ @@ -105,7 +105,7 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= tmseck@netcologne.de -COMMENT= The successful WWW proxy cache and accelerator +COMMENT= HTTP Caching Proxy CONFLICTS= squid-2.[^5]* GNU_CONFIGURE= yes Index: pkg-descr =================================================================== --- pkg-descr (.../www/squid) (revision 1020) +++ pkg-descr (.../local/squid) (revision 1020) @@ -1,15 +1,10 @@ -This is the Squid Internet Object Cache developed by the National -Laboratory for Applied Networking Research (NLANR) and Internet -volunteers. This software is freely available for anyone to use. +Squid is a high-performance proxy caching server for web clients, +supporting FTP, gopher, and HTTP data objects. Unlike traditional +caching software, Squid handles all requests in a single, non-blocking, +I/O-driven process. -This software is based on the Harvest Object Cache developed by -the University of Colorado and the University of Southern California. -The Harvest home page is http://harvest.cs.colorado.edu/. +Squid supports SSL, extensive access controls, and full request logging. +By using the lightweight Internet Cache Protocol, Squid caches can be +arranged in a hierarchy or mesh for additional bandwidth savings. -ARPA funding for the Harvest project has ended, the squid project has -continued development of the cache where Harvest finished. - -This port provides many configuration options, most of which are -available via 'make config'. - WWW: http://www.squid-cache.org/ Index: files/pkg-deinstall.in =================================================================== --- files/pkg-deinstall.in (.../www/squid) (revision 1020) +++ files/pkg-deinstall.in (.../local/squid) (revision 1020) @@ -16,7 +16,7 @@ echo "===> post-deinstallation information for $1:" echo "" echo " Note:" - echo " squid related user accounts and groups were not removed." + echo " Squid related user accounts and groups were not removed." echo "" echo " To remove the '%%SQUID_UID%%' user and the '%%SQUID_GID%%' group which were" echo " created by a default installation of this package, run" @@ -29,7 +29,7 @@ echo " all configuration files modified by you were preserved." echo "" echo " Please remove them manually if you do not want to use" - echo " squid any longer." + echo " Squid any longer." fi echo "" ;; Index: files/squid.sh.in =================================================================== --- files/squid.sh.in (.../www/squid) (revision 1020) +++ files/squid.sh.in (.../local/squid) (revision 1020) @@ -20,7 +20,7 @@ command=%%PREFIX%%/sbin/squid # --begin rcng extra_commands=reload -reload_cmd="${command} -k reconfigure" +reload_cmd="${command} ${squid_flags} -k reconfigure" # --end rcng stop_cmd="squid_stop" squid_chdir=${squid_chdir:-%%PREFIX%%/squid/logs} @@ -44,7 +44,7 @@ # --begin rcng squid_stop() { echo "Stopping ${name}." - ${command} -k shutdown + ${command} ${squid_flags} -k shutdown run_rc_command poll } Index: files/pkg-message.in =================================================================== --- files/pkg-message.in (.../www/squid) (revision 1020) +++ files/pkg-message.in (.../local/squid) (revision 1020) @@ -6,19 +6,19 @@ Note: You must initialize new cache directories before you can start - squid. Do this by running "squid -z" as 'root' or '%%SQUID_UID%%'. + Squid. Do this by running "squid -z" as 'root' or '%%SQUID_UID%%'. If your cache directories are already initialized (e.g. after an - upgrade of squid) you do not need to initialize them again. + upgrade of Squid) you do not need to initialize them again. o The default configuration will deny everyone access to the proxy service. Edit the "http_access" directives in - %%PREFIX%%/etc/squid.conf to suit your needs. + %%PREFIX%%/etc/squid/squid.conf to suit your needs. --begin rcng - Please note that the squid start script is an rc.d style script. - This means that squid will not start automatically at boot time. + Please note that the Squid start script is an rc.d style script. + This means that Squid will not start automatically at boot time. - To enable squid, set squid_enable=yes in either + To enable Squid, set squid_enable=yes in either /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/squid Please see %%PREFIX%%/etc/rc.d/squid(.sh) for further details. --end rcng Index: files/pkg-install.in =================================================================== --- files/pkg-install.in (.../www/squid) (revision 1020) +++ files/pkg-install.in (.../local/squid) (revision 1020) @@ -49,7 +49,7 @@ echo "There is no account '${squid_user}' on this system, so I will try to create it:" if ! pw useradd -q -n ${squid_user} \ -u ${squid_uid} -g ${squid_group} \ - -c "squid caching-proxy pseudo user" \ + -c "Squid caching-proxy pseudo user" \ -d "${squid_base}" -s "${nologin}" \ -h - ; then echo "Failed to create user '${squid_user}'!" >&2 @@ -72,19 +72,19 @@ echo "" echo " * NOTICE *" echo "" - echo "The squid pseudo-user's uid and/or gid have been found" + echo "The Squid pseudo-user's uid and/or gid have been found" echo "to be greater than or equal 3128." echo "" echo "This is not a problem as such, but violates the FreeBSD" echo "ports' principle that a ports must not claim a uid greater" echo "than 999." echo "" - echo "Since version 2.5.4_11, the squid user is thus created" + echo "Since version 2.5.4_11, the Squid user is thus created" echo "with an id of ${squid_uid}:${squid_gid} while earlier versions of this" echo "port used the first unused uid/gid greater than or" echo "equal 3128." echo "" - echo "If you want to change the existing squid user's id, run" + echo "If you want to change the existing Squid user's id, run" echo "'make changeuser' after the installation has completed." echo "If you installed this port via a package, issue the" echo "following commands as root:" @@ -92,13 +92,13 @@ echo "pw userdel -u ${current_uid}" echo "pw groupadd -n ${squid_group} -g ${squid_gid}" echo "pw useradd -n ${squid_user} -u ${squid_uid} \\" - echo " -c \"squid caching-proxy pseudo user\" \\" + echo " -c \"Squid caching-proxy pseudo user\" \\" echo " -g ${squid_group} -d ${squid_base} -s /sbin/nologin \\" echo " -h -" echo "find -H ${PKG_PREFIX} -user ${current_uid} -exec chown ${squid_user} {} \\;" echo "find -H ${PKG_PREFIX} -group ${current_gid} -exec chgrp ${squid_group} {} \\;" echo "" - echo "In case you have installed third party software for squid" + echo "In case you have installed third party software for Squid" echo "like squidGuard, you should additionally run:" echo "find -H /var -user ${current_uid} -exec chown ${squid_user} {} \\;" echo "find -H /var -group ${current_gid} -exec chgrp ${squid_group} {} \\;" >Release-Note: >Audit-Trail: >Unformatted: