a66be58fa2
* 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.
95 lines
4.1 KiB
Text
95 lines
4.1 KiB
Text
$NetBSD: patch-aa,v 1.15 2004/12/14 14:27:07 taca Exp $
|
|
|
|
--- 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
|
|
DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
|
|
DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
|
|
-DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid
|
|
+DEFAULT_PID_FILE = /var/run/squid.pid
|
|
DEFAULT_SWAP_DIR = $(localstatedir)/cache
|
|
DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
|
|
DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
|
|
DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
|
|
-DEFAULT_ICON_DIR = $(datadir)/icons
|
|
-DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@
|
|
-DEFAULT_MIB_PATH = $(datadir)/mib.txt
|
|
+DEFAULT_ICON_DIR = $(datadir)/squid/icons
|
|
+DEFAULT_ERROR_DIR = $(datadir)/squid/errors/@ERR_DEFAULT_LANGUAGE@
|
|
+DEFAULT_MIB_PATH = $(datadir)/squid/mib.txt
|
|
+EXAMPLES_DIR = $(datadir)/examples/squid
|
|
|
|
DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
|
|
|
|
@@ -838,20 +839,20 @@ CCDEPMODE = @CCDEPMODE@
|
|
uninstall-info-am:
|
|
install-dataDATA: $(data_DATA)
|
|
@$(NORMAL_INSTALL)
|
|
- $(mkinstalldirs) $(DESTDIR)$(datadir)
|
|
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/squid
|
|
@list='$(data_DATA)'; for p in $$list; do \
|
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
f="`echo $$p | sed -e 's|^.*/||'`"; \
|
|
- echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/$$f"; \
|
|
- $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/$$f; \
|
|
+ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/squid/$$f"; \
|
|
+ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/squid/$$f; \
|
|
done
|
|
|
|
uninstall-dataDATA:
|
|
@$(NORMAL_UNINSTALL)
|
|
@list='$(data_DATA)'; for p in $$list; do \
|
|
f="`echo $$p | sed -e 's|^.*/||'`"; \
|
|
- echo " rm -f $(DESTDIR)$(datadir)/$$f"; \
|
|
- rm -f $(DESTDIR)$(datadir)/$$f; \
|
|
+ echo " rm -f $(DESTDIR)$(datadir)/squid/$$f"; \
|
|
+ rm -f $(DESTDIR)$(datadir)/squid/$$f; \
|
|
done
|
|
install-sysconfDATA: $(sysconf_DATA)
|
|
@$(NORMAL_INSTALL)
|
|
@@ -1050,7 +1051,7 @@ info-am:
|
|
install-data-am: install-data-local install-dataDATA
|
|
|
|
install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \
|
|
- install-sbinPROGRAMS install-sysconfDATA
|
|
+ install-sbinPROGRAMS
|
|
|
|
install-info: install-info-recursive
|
|
|
|
@@ -1068,7 +1069,7 @@ mostlyclean-am: mostlyclean-compile most
|
|
|
|
uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA uninstall-info-am \
|
|
uninstall-libexecPROGRAMS uninstall-local \
|
|
- uninstall-sbinPROGRAMS uninstall-sysconfDATA
|
|
+ uninstall-sbinPROGRAMS
|
|
|
|
uninstall-info: uninstall-info-recursive
|
|
|
|
@@ -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
|
|
|
|
-install-data-local: install-sysconfDATA install-dataDATA
|
|
- @if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \
|
|
- echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIME_TABLE)" ; \
|
|
- else \
|
|
- echo "$(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(DEFAULT_MIME_TABLE)" ;\
|
|
- $(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(DEFAULT_MIME_TABLE); \
|
|
- fi
|
|
- @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
|
|
- echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \
|
|
- else \
|
|
- 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
|
|
|
|
uninstall-local:
|
|
@if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \
|