Date: Sat, 10 May 2008 19:15:16 +0200 (CEST) From: Thomas-Martin Seck <tmseck@web.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/123573: [Maintainer] www/squid: correct handling of the default cachemgr.cgi configuration file Message-ID: <200805101715.m4AHFG74009663@hardy.tmseck.homedns.org> Resent-Message-ID: <200805101720.m4AHK0Ss005489@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 123573 >Category: ports >Synopsis: [Maintainer] www/squid: correct handling of the default cachemgr.cgi configuration file >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: Sat May 10 17:20:00 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Thomas-Martin Seck >Release: FreeBSD 7.0-STABLE i386 >Organization: a private site in Germany >Environment: FreeBSD ports collection as of May 10, 2008. >Description: - Fix a mistake I (the maintainer) had introduced regarding the installation of the cachemgr.conf.default file: instead of explicitly installing it I thought it would be enough to change an automake variable that served an entirely different purpose, namely hardcoding the path to the configuration in the cachemgr.cgi binary. - While at it: remove a no longer needed .sh reference from files/pkg-message.in. - Set PORTREVISION to 1 because the hardcoded name of the default configuration file has changed within cachemgr.cgi. >How-To-Repeat: Install www/squid, look at the installation message and run 'grep -a cachemgr.conf' on libexec/squid/cachemgr.cgi. <code/input/activities to reproduce the problem (multiple lines)> >Fix: Apply this patch: Index: Makefile =================================================================== --- Makefile (.../www/squid) (revision 1370) +++ Makefile (.../local/squid) (revision 1370) @@ -76,6 +76,7 @@ PORTNAME= squid PORTVERSION= 2.6.20 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \ Index: files/patch-tools-Makefile.in =================================================================== --- files/patch-tools-Makefile.in (.../www/squid) (revision 1370) +++ files/patch-tools-Makefile.in (.../local/squid) (revision 1370) @@ -1,11 +1,11 @@ ---- tools/Makefile.in.orig Sun May 14 18:30:04 2006 -+++ tools/Makefile.in Sun May 14 18:31:02 2006 -@@ -297,7 +297,7 @@ - EXTRA_DIST = \ - cachemgr.conf +--- tools/Makefile.in.orig 2008-05-10 18:39:20.000000000 +0200 ++++ tools/Makefile.in 2008-05-10 18:40:02.000000000 +0200 +@@ -791,6 +791,8 @@ + $(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h --DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf -+DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf.default - - # Don't automatically uninstall config files - # @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \ + install-data-local: ++ @echo "$(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG).default"; \ ++ $(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG).default; + @if test -f $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG) ; then \ + echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG)" ; \ + else \ Index: files/pkg-message.in =================================================================== --- files/pkg-message.in (.../www/squid) (revision 1370) +++ files/pkg-message.in (.../local/squid) (revision 1370) @@ -20,7 +20,7 @@ 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. + Please see %%PREFIX%%/etc/rc.d/squid for further details. Note: If you just updated your Squid installation from 2.5 or earlier, >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200805101715.m4AHFG74009663>