ports/81319: [Maintainer] www/squid: correct cachemgr.cgi configuration

[Thomas-Martin Seck]

>Number:         81319
>Category:       ports
>Synopsis:       [Maintainer] www/squid: correct cachemgr.cgi configuration
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 20 18:10:01 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Thomas-Martin Seck
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of May 20, 2005.

	
>Description:
- Remove a bogus patch that tried to address the issue that squid's install
  routine does not install a default configuration file that we can use as a
  reference.
  While the patched installation seemed to work as intended from a packaging
  point of view, the unfortunate side effect was, however, that cachemgr.cgi
  looked in cachemgr.conf.default for its configuration instead of
  cachemgr.conf...

  Thanks to Dmitry Pryanishnikov for alerting me about this problem.

- Add a missing %SUBDIR% in MASTER_SITES

- Bump PORTREVISON since the cachemgr.cgi binary changes

Note to committer:
please 'cvs rm' files/patch-src-Makefile.in (sorry for the churn :( )
	
>How-To-Repeat:
install squid and run
strings ${PREFIX}/libexec/squid/cachemgr.cgi|grep cachemgr.conf
	
>Fix:
Apply this patch:

Index: files/patch-src-Makefile.in
===================================================================
--- files/patch-src-Makefile.in	(.../www/squid)	(revision 487)
+++ files/patch-src-Makefile.in	(.../local/squid)	(revision 487)
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Tue May 17 22:06:43 2005
-+++ src/Makefile.in	Tue May 17 22:05:39 2005
-@@ -377,7 +377,7 @@
- 
- DEFAULT_PREFIX = $(prefix)
- DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
--DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf
-+DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf.default
- DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
- DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_LOG_PREFIX = $(localstatedir)/logs
Index: Makefile
===================================================================
--- Makefile	(.../www/squid)	(revision 487)
+++ Makefile	(.../local/squid)	(revision 487)
@@ -66,12 +66,13 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.10
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
 		ftp://ftp.unimelb.edu.au/pub/cwis/servers/unix/squid/%SUBDIR%/ \
 		ftp://sunsite.auc.dk/pub/infosystems/squid/%SUBDIR%/ \
-		ftp://ftp.mirrorservice.org/sites/ftp.squid-cache.org/pub/ \
+		ftp://ftp.mirrorservice.org/sites/ftp.squid-cache.org/pub/%SUBDIR% \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
 MASTER_SITE_SUBDIR=	squid-2/STABLE
 DISTNAME=	squid-2.5.STABLE10
@@ -373,6 +374,10 @@
 	    PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
+# Create cachemgr.conf.default manually since squid's install routine
+# unfortunately fails to do so:
+	${INSTALL_DATA} ${WRKSRC}/src/cachemgr.conf \
+	    ${PREFIX}/etc/squid/cachemgr.conf.default
 .if defined(WITH_SQUID_PINGER)
 	${CHMOD} 4510 ${PREFIX}/libexec/squid/pinger; \
 	${CHGRP} ${SQUID_GID} ${PREFIX}/libexec/squid/pinger
	


>Release-Note:
>Audit-Trail:
>Unformatted: