FreeBSD Bugzilla – Attachment 87028 Details for
Bug 123573
[Maintainer] www/squid: correct handling of the default cachemgr.cgi configuration file
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 2.12 KB, created by
Thomas-Martin Seck
on 2008-05-10 18:20:00 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Thomas-Martin Seck
Created:
2008-05-10 18:20:00 UTC
Size:
2.12 KB
patch
obsolete
>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,
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 123573
: 87028