summaryrefslogtreecommitdiff
path: root/www/squid/patches
diff options
context:
space:
mode:
authortaca <taca@pkgsrc.org>2004-12-14 14:27:07 +0000
committertaca <taca@pkgsrc.org>2004-12-14 14:27:07 +0000
commitd213affddc1c5d9da1299db44f90513876b2291d (patch)
treefbac982fa8d2467b9d48a92cf518ebfd7a4ff856 /www/squid/patches
parent5588c4754b803546c2536e08c22795c5086da69a (diff)
downloadpkgsrc-d213affddc1c5d9da1299db44f90513876b2291d.tar.gz
Update squid package to 2.5.7nb2.
* Apply official three patches. - 2004-12-08 01:03 (Minor) cachemgr vm_objects segfault - 2004-12-08 00:47 (Minor) httpd_accel_port 0 (virtual) not working correctly - 2004-12-07 23:45 (Cosmetic / Minor Security issue) Random error messages in response to malformed host name * use VARBASE for data directory. * better handling data directory and user and group for squid with bsd.pkg.install.mk.
Diffstat (limited to 'www/squid/patches')
-rw-r--r--www/squid/patches/patch-aa9
1 files changed, 5 insertions, 4 deletions
diff --git a/www/squid/patches/patch-aa b/www/squid/patches/patch-aa
index be869f4235a..4eff10d651a 100644
--- a/www/squid/patches/patch-aa
+++ b/www/squid/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.14 2004/10/03 16:06:18 taca Exp $
+$NetBSD: patch-aa,v 1.15 2004/12/14 14:27:07 taca Exp $
---- src/Makefile.in.orig 2004-10-01 18:30:32.000000000 +0900
+--- src/Makefile.in.orig 2004-09-26 06:37:59.000000000 +0900
+++ src/Makefile.in
@@ -380,14 +380,15 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
@@ -66,7 +66,7 @@ $NetBSD: patch-aa,v 1.14 2004/10/03 16:06:18 taca Exp $
uninstall-info: uninstall-info-recursive
-@@ -1151,19 +1152,12 @@ repl_modules.c: repl_modules.sh Makefile
+@@ -1151,20 +1152,12 @@ repl_modules.c: repl_modules.sh Makefile
auth_modules.c: auth_modules.sh Makefile
@$(SHELL) $(srcdir)/auth_modules.sh $(AUTH_MODULES) >auth_modules.c
@@ -83,12 +83,13 @@ $NetBSD: patch-aa,v 1.14 2004/10/03 16:06:18 taca Exp $
- echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
- $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
- fi
+- $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
+install-data-local: install-dataDATA
+ @mkdir -p $(DESTDIR)$(EXAMPLES_DIR)
+ @echo "$(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(EXAMPLES_DIR)/mime.conf" ;\
+ $(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(EXAMPLES_DIR)/mime.conf
+ @echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(EXAMPLES_DIR)/suqid.conf"; \
+ $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(EXAMPLES_DIR)/squid.conf
- $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
uninstall-local:
+ @if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \