From owner-freebsd-ports-bugs@FreeBSD.ORG Sat May 10 17:10:01 2008
Return-Path: <owner-freebsd-ports-bugs@FreeBSD.ORG>
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 AD6B4106566B
for <freebsd-ports-bugs@hub.freebsd.org>;
Sat, 10 May 2008 17:10:01 +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 808188FC1A
for <freebsd-ports-bugs@hub.freebsd.org>;
Sat, 10 May 2008 17:10:01 +0000 (UTC)
(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m4AHA1Fr003536
for <freebsd-ports-bugs@freefall.freebsd.org>;
Sat, 10 May 2008 17:10:01 GMT
(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m4AHA1Tp003535;
Sat, 10 May 2008 17:10:01 GMT (envelope-from gnats)
Resent-Date: Sat, 10 May 2008 17:10:01 GMT
Resent-Message-Id: <200805101710.m4AHA1Tp003535@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 <tmseck@web.de>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id D470D1065674
for <FreeBSD-gnats-submit@freebsd.org>;
Sat, 10 May 2008 17:05:25 +0000 (UTC)
(envelope-from tmseck@netcologne.de)
Received: from smtp3.netcologne.de (smtp3.netcologne.de [194.8.194.66])
by mx1.freebsd.org (Postfix) with ESMTP id 52ED08FC20
for <FreeBSD-gnats-submit@freebsd.org>;
Sat, 10 May 2008 17:05:25 +0000 (UTC)
(envelope-from tmseck@netcologne.de)
Received: from laurel.tmseck.homedns.org (xdsl-84-44-231-211.netcologne.de
[84.44.231.211])
by smtp3.netcologne.de (Postfix) with SMTP id 0CD0C6736C
for <FreeBSD-gnats-submit@freebsd.org>;
Sat, 10 May 2008 19:05:24 +0200 (CEST)
Received: (qmail 697 invoked from network); 10 May 2008 17:05:23 -0000
Received: from unknown (HELO hardy.tmseck.homedns.org) (192.168.1.2)
by 0 with SMTP; 10 May 2008 17:05:23 -0000
Received: from hardy.tmseck.homedns.org (localhost [127.0.0.1])
by hardy.tmseck.homedns.org (8.14.2/8.14.2) with ESMTP id
m4AH5Muf009580; Sat, 10 May 2008 19:05:22 +0200 (CEST)
(envelope-from tmseck@netcologne.de)
Received: (from thomas@localhost)
by hardy.tmseck.homedns.org (8.14.2/8.14.2/Submit) id m4AH5MgY009579;
Sat, 10 May 2008 19:05:22 +0200 (CEST)
(envelope-from tmseck@netcologne.de)
Message-Id: <200805101705.m4AH5MgY009579@hardy.tmseck.homedns.org>
Date: Sat, 10 May 2008 19:05:22 +0200 (CEST)
From: Thomas-Martin Seck <tmseck@web.de>
To: FreeBSD-gnats-submit@FreeBSD.org
X-Send-Pr-Version: 3.113
Cc:
Subject: ports/123572: [Maintainer] www/squid30: correct problems regarding
cachemgr.conf
X-BeenThere: freebsd-ports-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Thomas-Martin Seck <tmseck@web.de>
List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>,
<mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs>
List-Post: <mailto:freebsd-ports-bugs@freebsd.org>
List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>,
<mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 May 2008 17:10:01 -0000
>Number: 123572
>Category: ports
>Synopsis: [Maintainer] www/squid30: correct problems regarding cachemgr.conf
>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:10:01 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:
- Correct an issue that prevented the definition of the default cachemgr.cgi
configuration file to be passed to the C++ preprocessor (Squid bug #2346).
Thanks to Laurent Levier for reporting this issue to the maintainer.
- Fix a mistake I (the maintainer) 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. This is also a bug in www/squid which
will be addressed in a separate PR.
- Portrevision bumped because the content of the package changed
(the cachemgr.cgi binary now has the correct path to cachemgr.conf
hardcoded).
>How-To-Repeat:
Install squid30 and run 'grep -a cachemgr.conf' on
libexec/squid/cachemgr.cgi.
>Fix:
Apply this patch:
Index: Makefile
===================================================================
--- Makefile (.../www/squid30) (revision 1368)
+++ Makefile (.../local/squid30) (revision 1368)
@@ -63,6 +63,7 @@
PORTNAME= squid
PORTVERSION= 3.0.5
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
@@ -425,10 +426,6 @@
${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
-# Create cachemgr.conf.default manually since Squid-3's install routine
-# unfortunately fails to do so (as it did in the old 2.5 days...):
- ${INSTALL_DATA} ${WRKSRC}/tools/cachemgr.conf \
- ${PREFIX}/etc/squid/cachemgr.conf.default
.if !defined(NOPORTEXAMPLES)
@${MKDIR} ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql ${EXAMPLESDIR}
Index: files/patch-tools-Makefile.in
===================================================================
--- files/patch-tools-Makefile.in (.../www/squid30) (revision 1368)
+++ files/patch-tools-Makefile.in (.../local/squid30) (revision 1368)
@@ -1,11 +1,63 @@
---- 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 @@
+This patch is mostly a patch for Squid bug #2346; the default location of the
+cachemgr.cgi configuration file was not correctly passed to the preprocessor
+during compilation.
+
+--- tools/Makefile.in.orig 2008-05-10 16:54:15.000000000 +0200
++++ tools/Makefile.in 2008-05-10 16:56:22.000000000 +0200
+@@ -61,7 +61,7 @@
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS)
+-am_cachemgr__CGIEXT__OBJECTS = cachemgr.$(OBJEXT)
++am_cachemgr__CGIEXT__OBJECTS = cachemgr__CGIEXT_-cachemgr.$(OBJEXT)
+ cachemgr__CGIEXT__OBJECTS = $(am_cachemgr__CGIEXT__OBJECTS)
+ cachemgr__CGIEXT__LDADD = $(LDADD)
+ am__DEPENDENCIES_1 =
+@@ -318,7 +318,7 @@
+ SUBDIRS =
+ squidclient_SOURCES = squidclient.cc
+ cachemgr__CGIEXT__SOURCES = cachemgr.cc
+-cachemgr__CGIEXT__CFLAGS = -DDEFAULT_CACHEMGR_CONFIG=\"$(DEFAULT_CACHEMGR_CONFIG)\" $(AM_CFLAGS)
++cachemgr__CGIEXT__CXXFLAGS = -DDEFAULT_CACHEMGR_CONFIG=\"$(DEFAULT_CACHEMGR_CONFIG)\" $(AM_CFLAGS)
+ LDADD = -L../lib -lmiscutil $(XTRA_LIBS)
EXTRA_DIST = \
cachemgr.conf
+@@ -440,7 +440,7 @@
+ distclean-compile:
+ -rm -f *.tab.c
--DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf
-+DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf.default
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cachemgr.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/squidclient.Po@am__quote@
- # Don't automatically uninstall config files
- # @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
+ .cc.o:
+@@ -467,6 +467,20 @@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
++cachemgr__CGIEXT_-cachemgr.o: cachemgr.cc
++@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -MT cachemgr__CGIEXT_-cachemgr.o -MD -MP -MF "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo" -c -o cachemgr__CGIEXT_-cachemgr.o `test -f 'cachemgr.cc' || echo '$(srcdir)/'`cachemgr.cc; \
++@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo" "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Po"; else rm -f "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='cachemgr.cc' object='cachemgr__CGIEXT_-cachemgr.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -c -o cachemgr__CGIEXT_-cachemgr.o `test -f 'cachemgr.cc' || echo '$(srcdir)/'`cachemgr.cc
++
++cachemgr__CGIEXT_-cachemgr.obj: cachemgr.cc
++@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -MT cachemgr__CGIEXT_-cachemgr.obj -MD -MP -MF "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo" -c -o cachemgr__CGIEXT_-cachemgr.obj `if test -f 'cachemgr.cc'; then $(CYGPATH_W) 'cachemgr.cc'; else $(CYGPATH_W) '$(srcdir)/cachemgr.cc'; fi`; \
++@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo" "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Po"; else rm -f "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='cachemgr.cc' object='cachemgr__CGIEXT_-cachemgr.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -c -o cachemgr__CGIEXT_-cachemgr.obj `if test -f 'cachemgr.cc'; then $(CYGPATH_W) 'cachemgr.cc'; else $(CYGPATH_W) '$(srcdir)/cachemgr.cc'; fi`
++
+ mostlyclean-libtool:
+ -rm -f *.lo
+
+@@ -835,6 +849,8 @@
+ $(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h
+
+ 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 \
>Release-Note:
>Audit-Trail:
>Unformatted: