head	1.23;
access;
symbols
	pkgsrc-2013Q2:1.23.0.16
	pkgsrc-2013Q2-base:1.23
	pkgsrc-2012Q4:1.23.0.14
	pkgsrc-2012Q4-base:1.23
	pkgsrc-2011Q4:1.23.0.12
	pkgsrc-2011Q4-base:1.23
	pkgsrc-2011Q2:1.23.0.10
	pkgsrc-2011Q2-base:1.23
	pkgsrc-2009Q4:1.23.0.8
	pkgsrc-2009Q4-base:1.23
	pkgsrc-2008Q4:1.23.0.6
	pkgsrc-2008Q4-base:1.23
	pkgsrc-2008Q3:1.23.0.4
	pkgsrc-2008Q3-base:1.23
	cube-native-xorg:1.23.0.2
	cube-native-xorg-base:1.23
	pkgsrc-2008Q2:1.22.0.10
	pkgsrc-2008Q2-base:1.22
	cwrapper:1.22.0.8
	pkgsrc-2008Q1:1.22.0.6
	pkgsrc-2008Q1-base:1.22
	pkgsrc-2007Q4:1.22.0.4
	pkgsrc-2007Q4-base:1.22
	pkgsrc-2007Q3:1.22.0.2
	pkgsrc-2007Q3-base:1.22
	pkgsrc-2007Q2:1.20.0.2
	pkgsrc-2007Q2-base:1.20
	pkgsrc-2007Q1:1.19.0.6
	pkgsrc-2007Q1-base:1.19
	pkgsrc-2006Q4:1.19.0.4
	pkgsrc-2006Q4-base:1.19
	pkgsrc-2006Q3:1.19.0.2
	pkgsrc-2006Q3-base:1.19
	pkgsrc-2006Q2:1.18.0.4
	pkgsrc-2006Q2-base:1.18
	pkgsrc-2006Q1:1.18.0.2
	pkgsrc-2006Q1-base:1.18
	pkgsrc-2005Q4:1.17.0.4
	pkgsrc-2005Q4-base:1.17
	pkgsrc-2005Q3:1.17.0.2
	pkgsrc-2005Q3-base:1.17
	pkgsrc-2005Q2:1.16.0.2
	pkgsrc-2005Q2-base:1.16
	pkgsrc-2005Q1:1.15.0.4
	pkgsrc-2005Q1-base:1.15
	pkgsrc-2004Q4:1.15.0.2
	pkgsrc-2004Q4-base:1.15
	pkgsrc-2004Q3:1.13.0.2
	pkgsrc-2004Q3-base:1.13
	pkgsrc-2004Q2:1.12.0.6
	pkgsrc-2004Q2-base:1.12
	pkgsrc-2004Q1:1.12.0.4
	pkgsrc-2004Q1-base:1.12
	pkgsrc-2003Q4:1.12.0.2
	pkgsrc-2003Q4-base:1.12
	netbsd-1-6-1:1.11.0.2
	netbsd-1-6-1-base:1.11
	netbsd-1-6:1.9.0.8
	netbsd-1-6-RELEASE-base:1.9
	pkgviews:1.9.0.4
	pkgviews-base:1.9
	buildlink2:1.9.0.2
	buildlink2-base:1.9
	netbsd-1-5-PATCH003:1.9
	netbsd-1-5-PATCH001:1.5
	netbsd-1-5-RELEASE:1.4
	netbsd-1-4-PATCH003:1.4
	netbsd-1-4-PATCH002:1.4
	comdex-fall-1999:1.4
	netbsd-1-4-PATCH001:1.4
	netbsd-1-4-RELEASE:1.4
	netbsd-1-3-PATCH003:1.3;
locks; strict;
comment	@# @;


1.23
date	2008.09.12.14.59.52;	author taca;	state dead;
branches;
next	1.22;

1.22
date	2007.09.07.10.39.35;	author taca;	state Exp;
branches;
next	1.21;

1.21
date	2007.08.02.15.45.10;	author taca;	state Exp;
branches;
next	1.20;

1.20
date	2007.05.13.16.45.44;	author taca;	state Exp;
branches;
next	1.19;

1.19
date	2006.09.13.14.41.58;	author taca;	state Exp;
branches;
next	1.18;

1.18
date	2006.03.12.12.12.19;	author taca;	state Exp;
branches;
next	1.17;

1.17
date	2005.08.09.15.48.30;	author taca;	state Exp;
branches;
next	1.16;

1.16
date	2005.04.25.15.39.14;	author taca;	state Exp;
branches
	1.16.2.1;
next	1.15;

1.15
date	2004.12.14.14.27.07;	author taca;	state Exp;
branches
	1.15.4.1;
next	1.14;

1.14
date	2004.10.03.16.06.18;	author taca;	state Exp;
branches;
next	1.13;

1.13
date	2004.08.22.15.11.09;	author taca;	state Exp;
branches
	1.13.2.1;
next	1.12;

1.12
date	2003.03.25.17.44.23;	author taca;	state Exp;
branches;
next	1.11;

1.11
date	2002.10.25.02.13.37;	author taca;	state Exp;
branches;
next	1.10;

1.10
date	2002.10.13.16.43.21;	author taca;	state Exp;
branches;
next	1.9;

1.9
date	2002.03.23.17.16.50;	author kim;	state Exp;
branches;
next	1.8;

1.8
date	2002.03.22.14.59.02;	author tron;	state Exp;
branches;
next	1.7;

1.7
date	2001.11.23.10.22.54;	author tron;	state Exp;
branches;
next	1.6;

1.6
date	2001.07.29.16.41.19;	author tron;	state Exp;
branches;
next	1.5;

1.5
date	2001.04.14.10.05.01;	author tron;	state Exp;
branches;
next	1.4;

1.4
date	98.12.06.12.42.00;	author tron;	state Exp;
branches;
next	1.3;

1.3
date	98.08.07.11.14.26;	author agc;	state Exp;
branches;
next	1.2;

1.2
date	98.05.24.19.03.05;	author tron;	state Exp;
branches;
next	1.1;

1.1
date	98.05.23.21.27.21;	author tron;	state Exp;
branches;
next	;

1.16.2.1
date	2005.09.10.11.16.41;	author salo;	state Exp;
branches;
next	;

1.15.4.1
date	2005.04.30.05.35.57;	author salo;	state Exp;
branches;
next	;

1.13.2.1
date	2004.10.25.18.55.59;	author agc;	state Exp;
branches;
next	;


desc
@@


1.23
log
@Restructuring Squid package:

* Now www/squid directory is common directory for squid packages.
* package options clean up and all options are described.
* LDAP helper support. (PR pkg/39386)
* DESTDIR support.
* Move some MESSAGE to documation directory.

Next, I'll import squid26, squid27 and squid30 packages.
@
text
@$NetBSD: patch-aa,v 1.22 2007/09/07 10:39:35 taca Exp $

--- src/Makefile.in.orig	2007-08-12 21:41:07.000000000 +0900
+++ src/Makefile.in
@@@@ -628,14 +628,14 @@@@ 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 = $(VARBASE)/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-daemon | 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
 DEFAULT_HOSTS = @@OPT_DEFAULT_HOSTS@@
 
 # Don't automatically uninstall config files
@@@@ -883,20 +883,20 @@@@ distclean-compile:
 uninstall-info-am:
 install-dataDATA: $(data_DATA)
 	@@$(NORMAL_INSTALL)
-	test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)"
+	test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)/squid"
 	@@list='$(data_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \
-	  $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
+	  echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/squid/$$f'"; \
+	  $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/squid/$$f"; \
 	done
 
 uninstall-dataDATA:
 	@@$(NORMAL_UNINSTALL)
 	@@list='$(data_DATA)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
-	  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)
@@@@ -1149,8 +1149,7 @@@@ info-am:
 
 install-data-am: install-data-local install-dataDATA
 
-install-exec-am: install-libexecPROGRAMS install-sbinPROGRAMS \
-	install-sysconfDATA
+install-exec-am: install-libexecPROGRAMS install-sbinPROGRAMS
 
 install-info: install-info-recursive
 
@@@@ -1177,7 +1176,7 @@@@ ps-am:
 
 uninstall-am: uninstall-dataDATA uninstall-info-am \
 	uninstall-libexecPROGRAMS uninstall-local \
-	uninstall-sbinPROGRAMS uninstall-sysconfDATA
+	uninstall-sbinPROGRAMS
 
 uninstall-info: uninstall-info-recursive
 
@@@@ -1261,20 +1260,7 @@@@ 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
 
 uninstall-local:
 	@@if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \
@


1.22
log
@Update squid to 2.6.16 (2.6.STABLE16).


Changes to squid-2.6.STABLE16 (5 Sep 2007)

	- Test for sys/capability.h linux include file to avoid failing on
	  linux systems missing libcap
	- Release private objects on cache rebuild
	- Segfault in clientBuildReplyHeader when http->entry == NULL
	- Bug #2072: digest_pw_auth fails when using plaintext passwords
	- Bug #2073: assertion failed: client_side.c:4175: "buf != NULL ||
	  !conn->body.request on POST
	- Adjust default pconn timeouts to avoid shutting down connection while
	  child sends request
	- Bug #1980: cache_peer monitortimeout not working
	- Bug #1882: Parent responses are not cached if sibling returns 504
	- More squid.conf reordering to get the dependencies between options
	  sorted proper

Changes to squid-2.6.STABLE15 (31 Aug 2007)

	- The select() I/O loop got broken by the /dev/poll addition
	  (2.6.STABLE14)
	- Bug #2017: Fails to work around broken servers sending just the HTTP
	  headers
	- Bug #2023: Compile error with old GCC 2.x or other ANSI-C compilers
	  before C99
	- squid.conf.default updated and reorganised in more sensible groups
	- correct and document the syslog access_log format
	- Armenian error pages translation
	- digest_ldap_helper usage help updated
	- Bug #1560: ftpSendPasv: getsockname(-1,..): (9) Bad file descriptor
	- Improve delay pools in low traffic environment by checking timeouts
	  at a steady 1 second interval even when there is not much activity
	- Don't request authentication on transparently intercepted
	  connections
	- Cleanup linux capabilities for tproxy
	- Bug #2003: 'via' config directive doesn't affect response headers
	- Bug #1902: Adds Numeric Hit and invalid request counters to IP Cache
	- Add missing $|=1 to squid_db_auth
	- Bug #2050: Persistent connection dropped if cache has no
	  Content-Length
	- Verify the URL on memory cache hits
	- Bug #2057: NTLM stop work in messengers after upgrade to 2.6.STABLE14
	- Bug #1972: Squid sets peers to down state when they are in fact
	  working.
	- potential segmentation fault in storeLocateVary()
	- Bug #2066: chdir after chroot
	- Windows port: Fix compiler warnings when building Squid as
	  application (not Windows service mode)
	- Spelling correction of received
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.21 2007/08/02 15:45:10 taca Exp $
@


1.21
log
@Update squid pacakge to 2.6.14 (2.6.STABLE14).

pkgsrc chagnes

  o Add "coss" option which enable COSS (Cyclic Object storage system).
    Noted by Chris Ross on pkgsrc-users.

Changes to squid-2.6.STABLE14 (15 Jul 2007)

	- squid.conf.default cleanup to have options in their proper sections.
	- documentation correction in the refresh_pattern ignore-auth option
	- URI-escaping not uses the recommended upper-case hex codes
	- refresh_pattern min-age 0 correted to really mean 0, and not 1 second
	- Always use xisxxxx() Squid defined macros instead of ctype
	  functions.
	- Kerberos SPNEGO/Negotiate helper for the negotiate scheme
	- Database basic auth helper using Perl DBI to connect to most SQL DBs
	- Solaris /dev/poll network I/O support
	- configure fixes to make cross compilation somewhat easier
	- Removed incorrect -a reference from http_port documentation
	- Bug #1900: Double "squid -k shutdown" makes Squid restart again
	- Bug #1968: Squid hangs occasionally when using DNS search paths
	- Novell eDirectory digest auth helper (digest_edir_auth)
	- Bug #1130: min-size option for cache_dir
	- POP3 basic auth helper querying a POP3 server
	- Cosmetic squid_ldap_auth fixes from Squid-3
	- Bug #1085: Add no-wrap to cache manager HTML tables
	- Automatically restart if number of available filedescriptors becomes
	  alarmingly low, preventing a situation where Squid would otherwise
	  permanently stop processing requests.
	- Bug #2010: snmp_core.cc:828: warning: array subscript is above
	  array bounds
	- Deal better with forwarding loops
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.20 2007/05/13 16:45:44 taca Exp $
d3 1
a3 1
--- src/Makefile.in.orig	2007-06-23 09:14:56.000000000 +0900
d5 1
a5 1
@@@@ -622,14 +622,14 @@@@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
d24 1
a24 1
@@@@ -877,20 +877,20 @@@@ distclean-compile:
d50 1
a50 1
@@@@ -1143,8 +1143,7 @@@@ info-am:
d60 1
a60 1
@@@@ -1171,7 +1170,7 @@@@ ps-am:
d69 1
a69 1
@@@@ -1255,20 +1254,7 @@@@ repl_modules.c: repl_modules.sh Makefile
@


1.20
log
@Update squid pacakge to 2.6.13 (2.6.STABLE13).


Changes to squid-2.6.STABLE13 (11 May 2007)

	- Make sure reply headers gets sent even if there is no body available
	  yet, fixing RealMedia streaming over HTTP issues.
	- Undo an accidental name change of storeUnregisterAbort.
	- Kill an ancient malplaced storeUnregisterAbort call from ftp.c
	- Bug #1814: SSL memory leak on persistent SSL connections
	- Don't log ECONNREFUSED/ECONNABORTED accept failures in cache.log
	- Cosmetic fix: added missing newline in WCCPv2 configuration dump.
	- Ukrainan error messages
	- Convert various error pages from DOS to UNIX text format
	- Bug #1820: COSS assertion failure t->length == MD5_DIGEST_CHARS
	- Clarify the max-conn=n cache_peer option syntax slightly
	- Bug #1892: COSS segfault on shutdown
	- Windows port: fix undefined ECONNABORTED
	- Make refreshIsCachable handle ETag as a cache validator, not
	  only last-modified
	- in_port_t is not portable, use unsigned short instead
	- Fix fs / auth / snmp dependencies
	- Portability: statfs() may reqire #include <sys/statfs.h>
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.19 2006/09/13 14:41:58 taca Exp $
d3 1
a3 1
--- src/Makefile.in.orig	2007-05-06 07:06:55.000000000 +0900
d5 1
a5 1
@@@@ -617,14 +617,14 @@@@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
d24 1
a24 1
@@@@ -871,20 +871,20 @@@@ distclean-compile:
d50 1
a50 1
@@@@ -1137,8 +1137,7 @@@@ info-am:
d60 1
a60 1
@@@@ -1165,7 +1164,7 @@@@ ps-am:
d69 1
a69 1
@@@@ -1249,20 +1248,7 @@@@ repl_modules.c: repl_modules.sh Makefile
@


1.19
log
@Update www/squid pacakge to 2.6.3 (squid 2.6.STABLE3).

Too may changes to mention here.
Please refer ${PREFIX}/share/doc/squid/RELEASENOTES.html.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.18 2006/03/12 12:12:19 taca Exp $
d3 1
a3 1
--- src/Makefile.in.orig	2006-07-30 17:56:18.000000000 +0900
d5 1
a5 1
@@@@ -590,14 +590,14 @@@@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
d24 1
a24 1
@@@@ -842,20 +842,20 @@@@ distclean-compile:
d50 1
a50 1
@@@@ -1108,8 +1108,7 @@@@ info-am:
d60 1
a60 1
@@@@ -1136,7 +1135,7 @@@@ ps-am:
d69 1
a69 1
@@@@ -1220,20 +1219,7 @@@@ repl_modules.c: repl_modules.sh Makefile
@


1.18
log
@Update squid package to 2.5.13 (2.5.STABLE13).  Most of changes are
already in our previous package.  Here is changes from 2.5.12 (2.5.STABLE12):

Changes to squid-2.5.STABLE12 (12 Mar 2006)
	- [Minor] Fails to compile on Solaris and some other platforms
	  with undefined reference to setenv (Bug #1435)
	- [Cosmetic] Added WebDAV REPORT method to know HTTP methods list
	- [Minor] Squid ntlm_auth (not the Samba provided one) giving
	  odd results if --enable-ntlm-fail-open is used (Bug #1022)
	- [Minor] wbinfo_group.pl doesn't work with Samba 3.0.21 and later
	  (Bug #1472)
	- [Minor] Squid crash when asyncio function counters url accessed
	  from Cachemgr CGI (Bug #1464)
	- [Cosmetic] Linix compile warning about prctl called with too few
 	  arguments (Bug #1483)
	- [Minor] Wrong timezone declaration for 64 bit Irix (Bug #1479)
	- [Minor] Some 206 responses logged incorrectly (Bug #1511)
	- [Minor] Issues in processing ranges on objects &gt;2GB (Bug #437)
	- [Cosmetic] Segmentation fault on empty proxy_auth ACLs (Bug #1414)
	- [Minor] Ident access lists don't work in delay_access statements
	  (Bug #1428)
	- [Minor] Some clients support NTLM even if not initially negotiating
	  persistent connections (Bug #1447)
	- [Medium] 504 Gateway Time-out on FTP uploads (Bug #1459)
	- [Medium] delay pools given too much bandwidht after "-k reconfigure"
	  (Bug #1481)
	- [Cosmetic] New persistent_connection_after_error configuration
	  directive (Bug #1482)
	- [Cosmetic] Hangs at 100% CPU if /dev/null is not accessible (Bug
	  #1484)
	- [Minor] Fails to compile on Fedora Core 5 test 2 x86_64 (Bug #1492)
	- [Cosmetic] Typo in ftp.c (Bug #1507)
	- [Cosmetic] Error in FTP listings of files with -> in their name
	  (Bug #1508)
	- [Cosmetic] With Squid-2.5 there is no more the DUPLICATE IP logging
 	  in cache.log (Bug #779)
	- [Minor] Fails to process long host names (Bug #1434)
	- [Cosmetic] Azerbaijani errors translation (Bug #1454)
	- [Cosmetic] misleading error message message for bad/unresolveable
	  cache_peer name (Bug #1504)
	- [Cosmetic] confusing statistics on stateful helpers (NTLM auth)
	  (Bug #1506)
	- [Major] connstate memory leak (Bug #1522)
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.17 2005/08/09 15:48:30 taca Exp $
d3 1
a3 1
--- src/Makefile.in.orig	2005-09-29 05:57:21.000000000 +0900
d5 1
a5 1
@@@@ -388,14 +388,14 @@@@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
d14 1
a14 1
 DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
d21 1
d23 2
a24 3
 DEFS = @@DEFS@@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
 
@@@@ -860,20 +860,20 @@@@ CCDEPMODE = @@CCDEPMODE@@
d28 2
a29 2
-	$(mkinstalldirs) $(DESTDIR)$(datadir)
+	$(mkinstalldirs) $(DESTDIR)$(datadir)/squid
d32 5
a36 5
 	  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; \
d42 5
a46 5
 	  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; \
d50 2
a51 1
@@@@ -1072,7 +1072,7 @@@@ info-am:
d54 3
a56 3
 install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \
-	install-sbinPROGRAMS install-sysconfDATA
+	install-sbinPROGRAMS
d60 1
a60 1
@@@@ -1090,7 +1090,7 @@@@ mostlyclean-am: mostlyclean-compile most
d62 1
a62 1
 uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA uninstall-info-am \
d69 1
a69 1
@@@@ -1175,26 +1175,7 @@@@ repl_modules.c: repl_modules.sh Makefile
a85 6
-	@@if test -f $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG) ; then \
-	        echo "$@@ will not overwrite existing $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG)" ; \
-	else \
-	        echo "$(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG)"; \
-	        $(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG); \
-	fi
@


1.17
log
@- Add missing optional installed files.
- Slightly simplify installation of example configurations.
- Add official patches.

* 2005-07-11 00:46 (Cosmetic) The new --with-build-environment=...
				option doesn't work
* 2005-07-09 08:58 (Cosmetic) Allow wb_ntlm_auth to run more silent
* 2005-07-03 08:24 (Cosmetic) "make all" gives many warnings
* 2005-06-29 20:36 (Minor) wbinfo_group.pl only looks into the first
				group specified
* 2005-06-21 22:28 (Minor) FTP listings uses "BASE HREF" much more than
				it needs to,
* 2005-06-22 10:46 (Cosmetic) Title in FTP listings somewhat messed up
* 2005-06-19 21:03 (Minor) SNMP GETNEXT fails if the given OID is
				outside the Squid MIB
* 2005-06-19 09:39 (Minor) squid -k reconfigure internal corruption
				if the type of a cache_dir is changed
* 2005-06-13 22:55 (Minor) httpd_accel_signle_host incompatible
				with redireection
* 2005-06-30 08:49 (Minor) Core dump with --enable-ipf-transparent
				if access to NAT device not granted
* 2005-06-27 21:24 (Minor) squid -k fails in combination with chroot
				after patch for bug 1157
* 2005-06-09 08:01 (Minor) Squid internal icons served up with slightly
				incorrect HTTP headers
* 2005-06-06 21:38 (Cosmetic) Updated Spanish error messages

Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.16 2005/04/25 15:39:14 taca Exp $
d3 1
a3 1
--- src/Makefile.in.orig	2005-04-24 09:12:08.000000000 +0900
d5 1
a5 1
@@@@ -384,14 +384,14 @@@@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
d24 1
a24 1
@@@@ -856,20 +856,20 @@@@ CCDEPMODE = @@CCDEPMODE@@
d50 1
a50 1
@@@@ -1068,7 +1068,7 @@@@ info-am:
d59 1
a59 1
@@@@ -1086,7 +1086,7 @@@@ mostlyclean-am: mostlyclean-compile most
d68 1
a68 1
@@@@ -1169,26 +1169,7 @@@@ repl_modules.c: repl_modules.sh Makefile
@


1.16
log
@Add new four official patches.

o 2005-04-23 01:38 (Minor Security)
	Fix for CVE-1999-0710: cachemgr malicouse use
o 2005-04-22 20:48 (Cosmetic) PID file check fails when chrooting
o 2005-04-24 16:35 (Minor)
	Make the use of the %m error page to return auth info messages
o 2005-04-22 20:21 (Minor)
	Unrecognized cache-control directives are silently dropped

pkgsrc change.

- remove aufs from store I/O backend until it controlled by options.mk
  frame work.
- remove patch-cd; it is covered by squid-2.5.STABLE9-transparent_port.patch.

Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.15 2004/12/14 14:27:07 taca Exp $
d3 1
a3 1
--- src/Makefile.in.orig	2005-04-25 23:25:05.000000000 +0900
d5 1
a5 1
@@@@ -383,14 +383,15 @@@@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
a20 1
+EXAMPLES_DIR = $(datadir)/examples/squid
d24 1
a24 1
@@@@ -855,20 +856,20 @@@@ CCDEPMODE = @@CCDEPMODE@@
d50 1
a50 1
@@@@ -1067,7 +1068,7 @@@@ info-am:
d59 1
a59 1
@@@@ -1085,7 +1086,7 @@@@ mostlyclean-am: mostlyclean-compile most
d68 1
a68 1
@@@@ -1168,26 +1169,12 @@@@ repl_modules.c: repl_modules.sh Makefile
a92 5
+	@@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
@


1.16.2.1
log
@Pullup ticket 738 - requested by Takahiro Kambe
security fix for squid

Revisions pulled up:
- pkgsrc/www/squid/Makefile		1.155, 1.157
- pkgsrc/www/squid/PLIST		1.19
- pkgsrc/www/squid/distinfo		1.100, 1.101
- pkgsrc/www/squid/patches/patch-aa	1.17
- pkgsrc/www/squid/patches/patch-ag	1.20
- pkgsrc/www/squid/patches/patch-an	1.8
- pkgsrc/www/squid/patches/patch-ap	1.1
- pkgsrc/www/squid/patches/patch-bb	1.7
- pkgsrc/www/squid/patches/patch-cd	1.10, 1.11

   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Aug  9 15:48:30 UTC 2005

   Modified Files:
   	pkgsrc/www/squid: Makefile PLIST distinfo
   	pkgsrc/www/squid/patches: patch-aa patch-cd
   Added Files:
   	pkgsrc/www/squid/patches: patch-ap

   Log Message:
   - Add missing optional installed files.
   - Slightly simplify installation of example configurations.
   - Add official patches.

   * 2005-07-11 00:46 (Cosmetic) The new --with-build-environment=...
   				option doesn't work
   * 2005-07-09 08:58 (Cosmetic) Allow wb_ntlm_auth to run more silent
   * 2005-07-03 08:24 (Cosmetic) "make all" gives many warnings
   * 2005-06-29 20:36 (Minor) wbinfo_group.pl only looks into the first
   				group specified
   * 2005-06-21 22:28 (Minor) FTP listings uses "BASE HREF" much more than
   				it needs to,
   * 2005-06-22 10:46 (Cosmetic) Title in FTP listings somewhat messed up
   * 2005-06-19 21:03 (Minor) SNMP GETNEXT fails if the given OID is
   				outside the Squid MIB
   * 2005-06-19 09:39 (Minor) squid -k reconfigure internal corruption
   				if the type of a cache_dir is changed
   * 2005-06-13 22:55 (Minor) httpd_accel_signle_host incompatible
   				with redireection
   * 2005-06-30 08:49 (Minor) Core dump with --enable-ipf-transparent
   				if access to NAT device not granted
   * 2005-06-27 21:24 (Minor) squid -k fails in combination with chroot
   				after patch for bug 1157
   * 2005-06-09 08:01 (Minor) Squid internal icons served up with slightly
   				CVSincorrect HTTP headers
   * 2005-06-06 21:38 (Cosmetic) Updated Spanish error messages

   Bump PKGREVISION.
---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sun Sep  4 05:07:05 UTC 2005

   Modified Files:
   	pkgsrc/www/squid: Makefile distinfo
   	pkgsrc/www/squid/patches: patch-ag patch-an patch-bb patch-cd

   Log Message:
   Update squid package to 2.5.10nb2.

   - pkgsrc changes: check IP filter's header file <ipl.h> as well as
   		  <netinet/ipl.h>.

   - Apply recent official patches including a security fix for DoS noted by
     http://secunia.com/advisories/16674/

   * 2005-09-03 09:41 (Minor) E-mail sent when cache dies is blocked from
   			   many antispam rules
   * 2005-09-03 09:41 (Minor) Solaris 10 SPARC transparent proxy build problem
   			   with ipfilter
   * 2005-09-01 22:57 (Minor) snmo cacheClientTable fails on "long" IP
   			   addresses
   * 2005-09-01 22:49 (Minor) squid_ldap_auth -U does not work
   * 2005-09-01 22:44 (Major) assertion failed:
   			   store.c:523: "e->store_status == STORE_PENDING"
   * 2005-09-01 22:39 (Cosmetic) Greek translation of error messages
   * 2005-09-01 22:31 (Minor) Some odd FTP servers respond with 250
   			   where 226 is expected
   * 2005-09-01 22:26 (Cosmetic) Fails to compile with glibc -D_FORTIFY_SOURCE=2
   * 2005-09-01 22:18 (Cosmetic) Odd URLs when failing to forward request via
   			      parent and several error messages inconsistent
   			      in reported request details
   * 2005-09-01 22:09 (Minor) More chroot_dir and squid -k reconfigure issues
   * 2005-09-01 21:56 (Medium) assertion failed:
   	StatHist.c:93: ((int) floor (0.99L + statHistVal(H, 0) - min)) == 0
   * 2005-09-01 20:27 (Major) Segmentation fault in sslConnectTimeout
   * 2005-08-19 09:31 (Minor) sync redeclarations when support for ARP acls
   * 2005-08-14 17:05 (Cosmetic) New 'mail_program' configuration option in
   			      squid.conf
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.17 2005/08/09 15:48:30 taca Exp $
d3 1
a3 1
--- src/Makefile.in.orig	2005-04-24 09:12:08.000000000 +0900
d5 1
a5 1
@@@@ -384,14 +384,14 @@@@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
d21 1
d25 1
a25 1
@@@@ -856,20 +856,20 @@@@ CCDEPMODE = @@CCDEPMODE@@
d51 1
a51 1
@@@@ -1068,7 +1068,7 @@@@ info-am:
d60 1
a60 1
@@@@ -1086,7 +1086,7 @@@@ mostlyclean-am: mostlyclean-compile most
d69 1
a69 1
@@@@ -1169,26 +1169,7 @@@@ repl_modules.c: repl_modules.sh Makefile
d94 5
@


1.15
log
@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.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.14 2004/10/03 16:06:18 taca Exp $
d3 1
a3 1
--- src/Makefile.in.orig	2004-09-26 06:37:59.000000000 +0900
d5 1
a5 1
@@@@ -380,14 +380,15 @@@@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
d10 1
a10 1
+DEFAULT_PID_FILE = /var/run/squid.pid
d25 1
a25 1
@@@@ -838,20 +839,20 @@@@ CCDEPMODE = @@CCDEPMODE@@
d51 1
a51 1
@@@@ -1050,7 +1051,7 @@@@ info-am:
d60 1
a60 1
@@@@ -1068,7 +1069,7 @@@@ mostlyclean-am: mostlyclean-compile most
d69 1
a69 1
@@@@ -1151,20 +1152,12 @@@@ repl_modules.c: repl_modules.sh Makefile
d86 6
@


1.15.4.1
log
@Pullup ticket 468 - requested by Takahiro Kambe
security and build fixes for squid

Revisions pulled up:
- pkgsrc/www/squid/Makefile		1.147-1.148
- pkgsrc/www/squid/distinfo		1.94-1.95
- pkgsrc/www/squid/files/squid.sh	1.18
- pkgsrc/www/squid/patches/patch-aa	1.16
- pkgsrc/www/squid/patches/patch-ao	1.1
- pkgsrc/www/squid/patches/patch-cd	removed

   Module Name:		pkgsrc
   Committed By:	taca
   Date:		Mon Apr 25 15:39:14 UTC 2005

   Modified Files:
   	pkgsrc/www/squid: Makefile distinfo
   	pkgsrc/www/squid/files: squid.sh
   	pkgsrc/www/squid/patches: patch-aa
   Removed Files:
   	pkgsrc/www/squid/patches: patch-cd

   Log Message:
   Add new four official patches.

   o 2005-04-23 01:38 (Minor Security)
   	Fix for CVE-1999-0710: cachemgr malicouse use
   o 2005-04-22 20:48 (Cosmetic) PID file check fails when chrooting
   o 2005-04-24 16:35 (Minor)
   	Make the use of the %m error page to return auth info messages
   o 2005-04-22 20:21 (Minor)
   	Unrecognized cache-control directives are silently dropped

   pkgsrc change.

   - remove aufs from store I/O backend until it controlled by options.mk
     frame work.
   - remove patch-cd; it is covered by
     squid-2.5.STABLE9-transparent_port.patch.

   Bump PKGREVISION.
---
   Module Name:		pkgsrc
   Committed By:	taca
   Date:		Tue Apr 26 16:19:43 UTC 2005

   Modified Files:
   	pkgsrc/www/squid: Makefile distinfo
   Added Files:
   	pkgsrc/www/squid/patches: patch-ao

   Log Message:
   squid package maintainous.

   - Fix bad PID directory of squid binary introduced by previous pkgsrc.
   - Update DIST_SUBDIR through DIST_STAMP since some of patch files
     are updated.
   - Fix error in doc/Makefile with nbmake.
   - Newer patch (aufs improvement) aren't included now.

   Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.16 2005/04/25 15:39:14 taca Exp $
d3 1
a3 1
--- src/Makefile.in.orig	2005-04-25 23:25:05.000000000 +0900
d5 1
a5 1
@@@@ -383,14 +383,15 @@@@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
d10 1
a10 1
+DEFAULT_PID_FILE = $(VARBASE)/run/squid.pid
d25 1
a25 1
@@@@ -855,20 +856,20 @@@@ CCDEPMODE = @@CCDEPMODE@@
d51 1
a51 1
@@@@ -1067,7 +1068,7 @@@@ info-am:
d60 1
a60 1
@@@@ -1085,7 +1086,7 @@@@ mostlyclean-am: mostlyclean-compile most
d69 1
a69 1
@@@@ -1168,26 +1169,12 @@@@ repl_modules.c: repl_modules.sh Makefile
a85 6
-	@@if test -f $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG) ; then \
-	        echo "$@@ will not overwrite existing $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG)" ; \
-	else \
-	        echo "$(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG)"; \
-	        $(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG); \
-	fi
@


1.14
log
@- Enable --enable-arp-acl configure option on FreeBSD, Linux and SunOS.
- Add 9 official patches.

Bump package revision, squid-2.5.6nb3.

* 2004-09-30 09:28 (Minor) CARP ignores cache_peer_domain/cache_peer_access
* 2004-09-27 18:23 (Minor) balance_on_multiple_ip squid.conf directive
* 2004-09-27 18:10 (Minor) Race window and poor responsiveness to aborted
  CONNECT requests
* 2004-09-25 21:42 (Cosmetic) Support the --program-prefix and other program
  name transforms
* 2004-09-25 21:08 (Cosmetic) Document the caseinsensitive basic auth option
* 2004-09-25 20:57 (Cosmetic) ncsa_auth is sensitive on line ending format
* 2004-09-25 12:00 (Medium) Add support for arbitrary headers acess controls
* 2004-09-26 21:22 (Minor) Limit internal send/receive buffers
* 2004-09-25 09:55 (Cosmetic) arp acls is supported on FreeBSD these days..
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.13 2004/08/22 15:11:09 taca Exp $
d3 1
a3 1
--- src/Makefile.in.orig	2004-10-01 18:30:32.000000000 +0900
d69 1
a69 1
@@@@ -1151,19 +1152,12 @@@@ repl_modules.c: repl_modules.sh Makefile
d86 1
a92 1
 	$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
d95 1
@


1.13
log
@Update squid package to 2.5.6 (squid 2.5.STALBE6 + official patches).


Squid 2.5.STABLE5 to 2.5.STABLE6:

* Several "Assertion error" bugs fixed
* Several "Segmentation fault" bugs fixes
* Corrects a security issue in the old ntlm_auth NTLM helper used in transparent NTLM authentication to a NT domain without using samba.
* Processing of Vary: * and Vary on error messages corrected
* a large number of minor and cosmetic bugfixes. See the list of squid-2.5.STABLE5 patches and the ChangeLog file for details.


2.5.STABLE56 official patches:

* 2004-08-20 08:18 (Major) NTLM authentication denial of service
* 2004-08-14 21:07 (Minor) external_acl does not handle newlines
* 2004-08-09 14:03 (Minor) Supplementary group memberships not set
* 2004-08-05 20:33 (Medium) Segfaults and other strange crashes when using heap policies
* 2004-08-06 11:05 (Cosmetic) Unknown %X errorpage codes incorrectly quoted
* 2004-08-17 12:22 (Cosmetic) Grammatical corrections in squid.conf.default
* 2004-07-27 21:52 (Minor) NTLM authentication truncated
* 2004-07-17 22:43 (Minor) Memory leak in client_db
* 2004-07-17 20:11 (Cosmetic) Add delay pools information to active_requests
* 2004-07-17 19:57 (Minor) case insensitive authentication
* 2004-07-17 19:48 (Cosmetic) Warn if cache_dir ufs can not create files
* 2004-07-17 16:33 (Cosmetic) HEAD requests may return stale information
* 2004-07-17 16:33 (Minor) Partial hit results in TCP_HIT, not TCP_MISS
* 2004-07-17 16:33 (Cosmetic) request_header_max_size configuration option doesn't work correctly
* 2004-07-29 13:29 (Minor) A large number of queued DNS lookups for the same domain
* 2004-08-10 09:40 (Minor) LDAP helpers update
* 2004-07-14 16:29 (Medium) storeCreate: no valid swapdirs for this object
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.12 2003/03/25 17:44:23 taca Exp $
d3 1
a3 1
--- src/Makefile.in.orig	2004-06-08 20:37:22.000000000 +0900
d12 3
a14 3
 DEFAULT_PINGER = $(libexecdir)/pinger$(EXEEXT)
 DEFAULT_UNLINKD = $(libexecdir)/unlinkd$(EXEEXT)
 DEFAULT_DISKD = $(libexecdir)/diskd$(EXEEXT)
@


1.13.2.1
log
@Pull-up patch-aa from the HEAD, and re-generate its checksum.

Fixes build on pkgsrc-2004Q3 branch.

Thanks to Soren Jacobsen for pointing this one out.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.14 2004/10/03 16:06:18 taca Exp $
d3 1
a3 1
--- src/Makefile.in.orig	2004-10-01 18:30:32.000000000 +0900
d12 3
a14 3
 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)/'`
@


1.12
log
@Update squid package to 2.5.2.

pkgsrc change: install some supplemental documents.

Changes to squid-2.5.STABLE2 (Mars 17, 2003):

	- Contrib files added back to the distribution
	- Several compiler warnings fixed when using --disable-ident or
	  --disable-http-violations
	- authentication can now be used in most access controls, but
	  must in most cases first be enforced in http_access to force
	  the user to authenticate.
	- cleanups in the developer bootstrap.sh process when preparing
	  the sources.
	- several squid.conf.default documentation updated to correctly
	  refer to the current names when refering to other directives
	- authenticate_ip_ttl documentation updates
	- several assertion faults and segmentation violations corrected
	- the RunCache/RunAccel and squid.rc scripts updated to refer to
	  the squid binary in sbin rather than the old bin location.
	- squid_ldap_auth command line processing fixes when specifying
	  the LDAP server last on the line instead of -h option
	- aufs data corruption bugfix
	- aufs performance improvement for low traffic systems
	- aufs stability improvements
	- external_acl corrected to properly deal with quoted strings
	- WCCPv1 bugfix to make sure the router accepts the hash assignments
	- "Total accounted memory" now correctly reported in cachemgr
	- several small memory leaks (mostly reconfigure related)
	- new squid.conf option to allow GET/HEAD requests with a request
	  entity
	- "make uninstall" no longer removes squid.conf
	- cachemgr.cgi now uses POST to avoid having the cachemgr password
	  logged in the web server logs
	- authentication schemes which are known to not be proxyable are now
	  filtered out from forwarded server replies to avoid that the clients
	  tries to use such schemes when we know for a fact it won't work
	- spelling corrections in various error messages
	- now possible to define acl values with spaces in them
	  by using the "include file" feature
	- squid_ldap_group updated to 2.10 to fix compilation issues with
	  recent (and older) OpenLDAP libraries and to make the helper deal
	  correctly with true LDAP groups by first looking up the user DN.
	- Some internal code cleanups
	- now verifies that programs etc exists iside the chroot directory
	  when using chroot_dir. No longer neccesary to set up a split view
	  environment where the same paths works both inside the chroot and
	  outside just to convince Squid that the files is actually there..
	- improved memory usage reporting
	- --disable-hostname-checks configure option
	- no longer ignores double dots in host names. Any hostname with
	  double dots is now rejected as invalid.
	- log_mime_hdrs no longer logs garbage if very long headers
	  are seen.
	- 'select_fds_hist' object added to cachemgr 'histogram' output
	- pid file now unlinked when squid has really shut down, not
	  immediately when the shutdown request is received. This allows
	  the pid file to be monitored to determine when Squid has shut down
	  properly
	- correct authentication scheme setups on some platforms or compilers
	- several squid.conf.default documentation updates to remove references
	  to renamed or replaced directives by changing them to their current
	  names.
	- the SSL reverse proxy support updated to allow building with
	  OpenSSL 0.9.7 and and later.
	- Corrected a minor performance problem while processing HEAD replies
	  from various broken web servers not sending a correct HTTP reply
	- time acls can now specify multiple times in the same acl name, like
	  most other acl types.
	- winbind helpers updated to match Samba-2.2.7a and should
	  work with Samba-2.2.6 or later (required). For compability with
	  older Samba versions A new configure option --with-samba-sources=...
	  has been added to allow you to specify which Samba version the
	  helpers should be built for if different than the above versions.
	- Squid MIB definition syntax correction to work better with newer
	  (and older) SNMP tools.
	- Fixed access.log format when logging "error:invalid-HTTP-ident" on
	  requests where parsing the HTTP identifier (HTTP/1.0) failed.
	- "make distclean" no longer removes the icons, this avoids the
	  dependency on "uudecode" to rebuild Squid after "make distclean"
	- User name returned by external acl lookups (external_acl_type)
	  is now available as "ident" in later acl checks in addition to
	  the logging in access.log.
	- Incorrect behaviour of Digest authentication partly corrected - it
	  will not handle sessions, but will always enforce password
	  correctness.. (patch submitted by Sean Burford).
	- Issue with persistent connections and PUT/POST request corrected
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.11 2002/10/25 02:13:37 taca Exp $
d3 1
a3 1
--- src/Makefile.in.orig	2003-02-12 11:03:14.000000000 +0900
d5 1
a5 1
@@@@ -378,14 +378,15 @@@@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
d25 1
a25 1
@@@@ -836,20 +837,20 @@@@ CCDEPMODE = @@CCDEPMODE@@
d51 1
a51 1
@@@@ -1048,7 +1049,7 @@@@ info-am:
d60 1
a60 1
@@@@ -1066,7 +1067,7 @@@@ mostlyclean-am: mostlyclean-compile most
d69 1
a69 1
@@@@ -1149,19 +1150,12 @@@@ repl_modules.c: repl_modules.sh Makefile
@


1.11
log
@Fix error in make install; extra "; \" were exists.

It cause error on Solaris.  (Why NetBSD's make was OK?)
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.10 2002/10/13 16:43:21 taca Exp $
d3 1
a3 1
--- src/Makefile.in.orig	Sat Jul 13 00:10:04 2002
d5 1
a5 1
@@@@ -380,14 +380,15 @@@@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
d12 3
a14 3
 DEFAULT_PINGER = $(libexecdir)/@@OPT_PINGER_EXE@@
 DEFAULT_UNLINKD = $(libexecdir)/$(UNLINKD_EXE)
 DEFAULT_DISKD = $(libexecdir)/@@OPT_DISKD_EXE@@
d25 1
a25 1
@@@@ -819,20 +820,20 @@@@ CCDEPMODE = @@CCDEPMODE@@
d51 1
a51 1
@@@@ -1031,7 +1032,7 @@@@ info-am:
d60 1
a60 1
@@@@ -1049,7 +1050,7 @@@@ mostlyclean-am: mostlyclean-compile most
d69 1
a69 1
@@@@ -1132,19 +1133,13 @@@@ repl_modules.c: repl_modules.sh Makefile
a91 1
+
@


1.10
log
@Update squid to 2.5.1 with several patches from
http://www.squid-cache.org/Versions/v2/2.5/bugs/.

Now try to install more authentication modules, but those modules
should be handled by proper frame work (Curretly, SASL modules
aren't handled).

Changes to squid-2.5 ():

	- Major rewrite of proxy authentication to support other schemes
	  than basic. First in the line is NTLM support but others can
	  easily be added (minimal digest is present). See Programmers Guide.
	  (Robert Collins & Francesco Chemolli)
	- Reworked how request bodies are passed down to the protocols.
	  Now all client side processing is inside client_side.c, and
	  the pass and pump modules is no longer used.
	- Optimized searching in proxy_auth and ident ACL types. Squid should
	  now handle large access lists a lot more efficiently.
	  (Francesco Chemolli)
	- Fixed forwarding/peer loop detection code (Brian Degenhardt) -
	  now a peer is ignored if it turns out to be us, rather than
	  committing suicide
	- Changed the internal URL code to obey appendDomain for internal
	  objects if it needs appending. This fixes weirdnesses where
	  a machine can think it is "foo.bar.com", and "foo" is requested.
	  (Brian Degenhardt)
	- Added the use of Automake to create the Makefile.in's in the squid
	  source tree. This will allow libtool in the future, and immediately
	  allows better dependency tracking - with or without gcc - as well
	  as the dist-all and distcheck targets for developers which respectively
	  build a tar.gz and a tar.bz2 distribution, and check that what will be
	  distributed builds.
	- Added TOS and source address selection based on ACLs,
	  written by Roger Venning. This allows administrators to set
	  the TOS precedence bits and/or the source IP from a set of
	  available IPs based upon some ACLs, generally to map different
	  users to different outgoing links and traffic profiles.
	- Added 'max-conn' option to 'cache_peer'
	- Added SSL gatewaying support, allowing Squid to act as a SSL server
	  in accelerator setups.
	- SASL authentication helper by Ian Castle
	- msntauth updated to v2.0.3
	- no_cache now applies to cache hits as well as cache misses
	- the Gopher client in Squid has been significantly improved
	- Squid now sanity checks FTP data connections to ensure the
	  connection is from the requested server. Can be disabled if
	  needed by turning off the ftp_sanitycheck option.
	- external acl support. A mechanism where flexible ACL checks
	  can be driven by external helpers. See the external_acl_type
	  and acl external directives.
	- Countless other small things and fixes
	- HTML pages generated by Squid or CacheMgr as well as the
	  ERR documents now contain a doctype declaration so that
	  browsers know which HTML specification the document uses.
	  In addition to that they have a new look (background-color, font)
	  and are valid according to the HTML standards at www.w3.org.
	  (Clemens Löser)
	- Login and password send to Basic auth helpers is now URL escaped
	  to allow for spaces and other "odd" characters in logins and
	  passwords
	- Proxy Authentication is no longer blindly forwarded to peer
	  caches if not used locally. If forwarding of proxy authentication
	  is desired then it must now be configured with the login=PASS
	  cache_peer option.
	- Responses with Vary: in the header are now cached by squid.
	  (Henrik Nordstrom).
	- Removed unused 'siteselect_timeout' directive.
@
text
@d1 1
a1 1
$NetBSD$
d89 1
a89 1
+	        $(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(EXAMPLES_DIR)/mime.conf; \
d91 1
a91 1
+	        $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(EXAMPLES_DIR)/squid.conf; \
@


1.9
log
@Fix for PKG_SYSCONFDIR -- the compiled-in paths should now be correct.
@
text
@d3 35
a37 68
--- src/Makefile.in.orig	Wed Apr  4 03:01:12 2001
+++ src/Makefile.in	Sat Mar 23 12:10:02 2002
@@@@ -12,6 +12,8 @@@@
 cgi_suffix	= @@cgi_suffix@@
 top_srcdir	= @@top_srcdir@@
 bindir		= @@bindir@@
+sbindir		= @@sbindir@@
+datadir		= @@datadir@@
 libexecdir      = @@libexecdir@@
 sysconfdir	= @@sysconfdir@@
 localstatedir   = @@localstatedir@@
@@@@ -40,14 +42,14 @@@@
 DEFAULT_CACHE_LOG       = $(localstatedir)/logs/cache.log
 DEFAULT_ACCESS_LOG      = $(localstatedir)/logs/access.log
 DEFAULT_STORE_LOG       = $(localstatedir)/logs/store.log
-DEFAULT_PID_FILE        = $(localstatedir)/logs/squid.pid
+DEFAULT_PID_FILE        = /var/run/squid.pid
 DEFAULT_SWAP_DIR        = $(localstatedir)/cache
 DEFAULT_PINGER		= $(libexecdir)/$(PINGER_EXE)
 DEFAULT_UNLINKD		= $(libexecdir)/$(UNLINKD_EXE)
 DEFAULT_DISKD		= $(libexecdir)/$(DISKD_EXE)
-DEFAULT_ICON_DIR	= $(sysconfdir)/icons
-DEFAULT_ERROR_DIR	= $(sysconfdir)/errors
-DEFAULT_MIB_PATH	= $(sysconfdir)/mib.txt
+DEFAULT_ICON_DIR	= $(datadir)/squid/icons
+DEFAULT_ERROR_DIR	= $(datadir)/squid/errors
+DEFAULT_MIB_PATH	= $(datadir)/squid/mib.txt
 
 CC		= @@CC@@
 MAKEDEPEND	= @@MAKEDEPEND@@
@@@@ -310,9 +312,9 @@@@
 		echo "mkdir $(exec_prefix)"; \
 		mkdir -p $(exec_prefix); \
 	fi
-	-@@if test ! -d $(bindir); then \
-		echo "mkdir $(bindir)"; \
-		mkdir -p $(bindir); \
+	-@@if test ! -d $(sbindir); then \
+		echo "mkdir $(sbindir)"; \
+		mkdir -p $(sbindir); \
 	fi
 	-@@if test ! -d $(libexecdir); then \
 		echo "mkdir $(libexecdir)"; \
@@@@ -322,14 +324,14 @@@@
 		echo "mkdir $(sysconfdir)"; \
 		mkdir -p $(sysconfdir); \
 	fi
-	-@@if test ! -d $(localstatedir); then \
-		echo "mkdir $(localstatedir)"; \
-		mkdir -p $(localstatedir); \
-	fi
-	-@@if test ! -d $(localstatedir)/logs; then \
-		echo "mkdir $(localstatedir)/logs"; \
-		mkdir -p $(localstatedir)/logs; \
-	fi
+#	-@@if test ! -d $(localstatedir); then \
+#		echo "mkdir $(localstatedir)"; \
+#		mkdir -p $(localstatedir); \
+#	fi
+#	-@@if test ! -d $(localstatedir)/logs; then \
+#		echo "mkdir $(localstatedir)/logs"; \
+#		mkdir -p $(localstatedir)/logs; \
+#	fi
 
 # Michael Lupp <mike@@nemesis.saar.de> wants to know about additions
 # to the install target.
@@@@ -339,15 +341,15 @@@@
 		(cd $$dir ; $(MAKE) $(MFLAGS) prefix="$(prefix)" $@@) || exit 1; \
d39 9
a47 19
 	@@for f in $(PROGS); do \
-		if test -f $(bindir)/$$f; then \
-			echo $(MV) $(bindir)/$$f $(bindir)/-$$f; \
-			$(MV) $(bindir)/$$f $(bindir)/-$$f; \
+		if test -f $(sbindir)/$$f; then \
+			echo $(MV) $(sbindir)/$$f $(sbindir)/-$$f; \
+			$(MV) $(sbindir)/$$f $(sbindir)/-$$f; \
 		fi; \
-		echo $(INSTALL_BIN) $$f $(bindir); \
-		$(INSTALL_BIN) $$f $(bindir); \
-		if test -f $(bindir)/-$$f; then \
-			echo $(RM) -f $(bindir)/-$$f; \
-			$(RM) -f $(bindir)/-$$f; \
+		echo $(INSTALL_BIN) $$f $(sbindir); \
+		$(INSTALL_BIN) $$f $(sbindir); \
+		if test -f $(sbindir)/-$$f; then \
+			echo $(RM) -f $(sbindir)/-$$f; \
+			$(RM) -f $(sbindir)/-$$f; \
 		fi; \
d49 27
a75 8
 	@@if test -n "$(UTILS)"; then \
@@@@ -377,21 +379,21 @@@@
 		fi; \
 	done
 	$(INSTALL_FILE) $(srcdir)/mib.txt $(DEFAULT_MIB_PATH)
-	$(INSTALL_FILE) squid.conf $(sysconfdir)/squid.conf.default
-	@@if test -f $(sysconfdir)/squid.conf ; then \
-		echo "$@@ will not overwrite existing $(sysconfdir)/squid.conf" ; \
d77 2
a78 2
-		echo "$(INSTALL_FILE) squid.conf $(sysconfdir)"; \
-		$(INSTALL_FILE) squid.conf $(sysconfdir); \
d80 2
a81 4
-
-	$(INSTALL_FILE) $(srcdir)/mime.conf $(sysconfdir)/mime.conf.default
-	@@if test -f $(sysconfdir)/mime.conf ; then \
-		echo "$@@ will not overwrite existing $(sysconfdir)/mime.conf" ; \
d83 2
a84 2
-		echo "$(INSTALL_FILE) $(srcdir)/mime.conf $(sysconfdir)"; \
-		$(INSTALL_FILE) $(srcdir)/mime.conf $(sysconfdir); \
d86 6
a91 7
+	$(INSTALL_FILE) squid.conf $(prefix)/share/examples/squid
+#	@@if test -f $(DEFAULT_CONFIG_FILE) ; then \
+#		echo "$@@ will not overwrite existing $(DEFAULT_CONFIG_FILE)" ; \
+#	else \
+#		echo "$(INSTALL_FILE) squid.conf $(DEFAULT_CONFIG_FILE)"; \
+#		$(INSTALL_FILE) squid.conf $(DEFAULT_CONFIG_FILE); \
+#	fi
d93 1
a93 7
+	$(INSTALL_FILE) $(srcdir)/mime.conf $(prefix)/share/examples/squid
+#	@@if test -f $(DEFAULT_MIME_TABLE) ; then \
+#		echo "$@@ will not overwrite existing $(DEFAULT_MIME_TABLE)" ; \
+#	else \
+#		echo "$(INSTALL_FILE) $(srcdir)/mime.conf $(DEFAULT_MIME_TABLE)"; \
+#		$(INSTALL_FILE) $(srcdir)/mime.conf $(DEFAULT_MIME_TABLE); \
+#	fi
d95 1
a95 2
 install-pinger:
 	@@f=$(PINGER_EXE); \
@


1.8
log
@Change "squid" package to honor "PKG_SYSCONFDIR" completely. This fixes
PR pkg/15775 by Kimmo Suominen.
@
text
@d3 2
a4 2
--- src/Makefile.in.orig	Wed Apr  4 09:01:12 2001
+++ src/Makefile.in	Fri Mar 22 15:47:06 2002
d14 1
a14 9
@@@@ -34,20 +36,20 @@@@
 DISKD_EXE	= diskd$(exec_suffix)
 
 DEFAULT_PREFIX		= $(prefix)
-DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
-DEFAULT_MIME_TABLE	= $(sysconfdir)/mime.conf
+DEFAULT_CONFIG_FILE     = $(prefix)/etc/squid/squid.conf
+DEFAULT_MIME_TABLE	= $(prefix)/etc/squid/mime.conf
 DEFAULT_DNSSERVER       = $(libexecdir)/$(DNSSERVER_EXE)
@


1.7
log
@Fix problems caused by recent changes: the example configuration files get
installed into "etc/squid" (and are not moved arround after installation).
The message of the install script matches the actual layout again and is
adapted to changes to "SQUID_SYSCONFDIR".
@
text
@d4 1
a4 1
+++ src/Makefile.in	Fri Nov 23 10:56:52 2001
d120 1
a120 1
+	$(INSTALL_FILE) squid.conf $(DEFAULT_CONFIG_FILE).default
d128 1
a128 1
+	$(INSTALL_FILE) $(srcdir)/mime.conf $(DEFAULT_MIME_TABLE).default
@


1.6
log
@- Apply some of the changes suggested by Greg A. Woods in PR 13427 and
  include his improved "rc.d" script.
- Use the same directory structure as in the Apache package. The
  configuration files are now in "${PREFIX}/etc/squid" and won't be
  removed during deinstallation.
- Remove unnecessary configuration variables "SQUID_HTTP_PORT" and
  "SQUID_ICP_PORT". These values can perfectly be adjusted by editing
  the configuration file and supporting all these variables would make
  the package too complex.
- Bump the version number to 2.4.1nb1.
@
text
@d3 2
a4 2
--- src/Makefile.in.orig	Sun Jul 29 18:14:54 2001
+++ src/Makefile.in	Sun Jul 29 18:20:14 2001
d14 9
a22 1
@@@@ -40,14 +42,14 @@@@
@


1.5
log
@Update "squid" package to version 2.4STABLE1. Changes since 2.3STABLE4:
- Fixed a bug in and cleaned up class 2/3 delay pools incrementing.
- Fixed a coredump bug when using external dnsservers that become overloaded.
- Fixed some NULL pointer bugs for NULL storage system when reconfiguring.
- Fixed a bug with useragent logging that caused Squid to think the logfile
  never got opened.
- Fixed a compiling bug with --disable-unlinkd.
- Changed src/squid.h to always use O_NONBLOCK on Solaris if it is defined.
- Fixed a bug with signed/unsigned bitfield flag variables that caused
  problems on Solaris.
- Fixed a bug in clientBuildReplyHeader() that could add an Age: header with
  a negative value, causing an assertion later.
- Fixed an SNMP reporting bug.   cacheCurrentResFileDescrCnt was returning
  the number of FDs in use, rather than the number of reserved FDs.
- Added the 'pipeline_prefetch' configuration option.
- cache_dir syntax changed to use options instead of many arguments. This
  means that the max_objsize argument now is an optional option, and that
  the syntax for how to specify the diskd magics is slightly different.
- Various fixes for CYGWIN
- Upgraded MSNT auth module to version 2.0.
- Fixed potential problems with HTML by making sure all HTML output is
  properly encoded.
- Fixed a memory initialization problem with resource records in
  lib/rfc1035.c.
- Rewrote date parsing in lib/rfc1123.c and made it a little more lenient.
- Added Cache-control: max-stale support.
- Fixed 'range_offset_limit' again.  The problem this time is that
  client_side.c wouldn't set the we_dont_do_ranges flag for normal cache
  misses.  It was only being set for requests that might have been hits,
  but we decided to change to a miss.
- Added the Authenticate-Info and Proxy-Authenticate-Info headers from
  RFC 2617.
- HTTP header lines longer than 64K could cause an assertion.
  Now they get ignored.
- Fixed an IP address scanning bug that caused "123.foo.com" to be
  interpreted as an IP address.
- Converted many structure allocations to use mem pools.
- Changed proxy authentication to strip leading whitespace from usernames
  after decoding.
- Prevented NULL pointer access in aclMatchAcl(). Some ACL types require
  checklist->request_t, but it won't be available in some cases (like
  snmp_access).  Warn the admin that the ACL can't be checked and that
  we're denying it.
- Allow zero-size disk caches.
- The actual filesystem blocksize is now used to account
  for space overheads when calculating on-disk cache size.
- Made the maximum memory cache object size configurable.
- Added 'minimum_direct_rtt' configuration option.
- Added 'ie_refresh' configuration option, which is a hack
  to turn IMS requests into no-cache requests.
- Added Linux netfilter support for intercepted connections.
- Fixed a bug with clientAccessCheck() that allowed proxy
  requests in accel mode.
- Fixed a bug with 301/302 replies from redirectors.  Now
  we force them to be cache misses.
- Accommodated changes to the IP-Filter ioctl() interface
  for intercepted connections.
- Fixed handling of client lifetime timeouts.
- Fixed a buffer overflow bug with internal DNS replies
  by truncating received packets to 512 bytes, as per
  RFC 1035.
- Added "forward.log" support, but its work in progress.
- Rewrote much of the IP and FQDN cache implementation.
  This change gets rid of pending hits.
- Changed peerWouldBePinged() to return false if our
  ICP/HTCP port is zero (i.e. disabled).
- Changed src/net_db.c to use src/logfile.c routines,
  rather than stdio, because of solaris stdio filedescriptor
  limits.
- Made netdbReloadState() more robust in case of corrupted
  data.
- Rewrote some freshness/staleness functions in src/refresh.c,
  partially inspired to support cache-control max-stale.
- Fixed status code logging for SSL/CONNECT requests.
- Added a hack to subtract cache digest network traffic
  from statistics so that byte hit ratio stays positive
  and more closely reflects what people expect it to be.
- Fixed a bug with storeCheckTooSmall() that caused
  internal icons and cache digests to always be released.
- Added statfs(2) support for displaying actual filesystem
  usage in the cache manager 'storedir' output.
- Changed status reporting for storage rebuilding.  Now it
  prints percentage complete instead of number of entries
  parsed.
- Use mkstemp() rather than problem-prone tempnam().
- Changed urlParse() to condense multiple dots in hostnames.
- Major rewrite of async-io (src/fs/aufs) to make it behave
  a bit more sane with substantially less overhead.  Some
  tuning work still remains to make it perform optimal.
  See the start of store_asyncufs.h for all the knobs.
- Fixed storage FS modules to use individual swap space
  high/low values rather than the global ones.
- Fixed storage FS bugs with calling file_map_bit_reset()
  before checking the bit value.  Calling with an invalid
  value caused memory corruption in random places.
- Prevent NULL pointer access in store_repl_lru.c for
  entries that exist in the hash but not the LRU list.
- Added --enable-auth-modules=... configure option
- Improved ICP dead peer detection to also work when the workload
  is low
- Improved TCP dead peer detection and recovery
- Squid is now a bit more persistent in trying to find a alive
  parent when never_direct is used.
- nonhierarchical_direct squid.conf directive to make non-ICP
  peer selection behave a bit more like ICP selection with respect
  to hierarchy.
- Bugfix where netdb selection could override never_direct
- ICP timeout selection now prefers to use parents only when
  calculating the dynamic timeout to compensate for common RTT
  differences between parents and siblings.
- No longer starts to swap out objects which are known to be above
  the maximum allowed size.
- allow-miss cache_peer option disabling the use of "only-if-cached".
  Meant to be used in conjunction with icp_hit_stale.
- Delay pools tuned to allow large initial pool values
- cachemgr filesystem space information changed to show useable space
  rather than raw space, and platform support somewhat extended.
- Logs destination IP in the hierarchy log tag when going direct.
  (can be disabled by turning log_ip_on_direct off)
- Async-IO on linux now makes proper use of mutexes. This fixes some
  odd pthread segfaults on SMP Linux machines, at a slight performance
  penalty.
- %s can now be used in cache_swap_log and will be substituded with
  the last path component of cache_dir.
- no_cache is now a full ACL check without, allowing most ACL types
  to be used.
- The CONNECT method now obeys miss_access requirements
- proxy_auth_regex and ident_regex ACL types
- Fixed a StoreEntry memory leak during "dirty" rebuild
- Helper processes no longer hold unrelated filedescriptors open
- Helpers are now restarted when the logs are rotated
- Negatively cached DNS entries are now purged on "reload".
- PURGE now also purges the DNS cache
- HEAD on FTP objects no longer retreives the whole object
- More cleanups of the dstdomain ACL type
- Squid no longer tries to do Range internally if it is not supported
  by the origin server. Doing so could cause bandwidth spikes and/or
  negative hit ratio.
- httpd_accel_single_host squid.conf directive
- "round-robin" cache_peer counters are reset every 5 minutes to
  compensate previously dead peers
- DNS retransmit parameters
- Show all FTP server messages
- squid.conf.default now indicates if a directive isn't enabled in
  the installed binary, and what configure option to use for enabling it
- Fixed a temporary memory leak on persistent POSTs
- Fixed a temporary memory leak when the server response headers
  includes NULL characters
- authenticate_ip_ttl_is_strict squid.conf option
- req_mime_type ACL type
- A reworked storage system that supports storage directories in
  a more modular fashion. The object replacement and IO is now
  responsibility of the storage directory, and not of the storage
  manager.
- Fixed a bogous MD5 mismatch warning sometimes seen when using
  aufs or diskd stores
- Added --enable-stacktraces configure option to set PRINT_STACK_TRACE,
  and extended support for this to Linux/GNU libc.
- Disabled the "request timeout" error message sent if the user agent
  did not provide a request in a timely manner after opening the
  connection. Now the connection is silently closed. The error message
  was confusing user agents utilizing persistent connections.
- Fixed configure --enable descriptions to match the arg names.
- Eliminated compile warnings from auth_modules/MSNT code.
- Require first character of hostnames to be alphanumeric.
- Made ARP ACL work for Solaris.
- Removed storeClientListSearch().
- Added counters to track diskd operation success and
  failures.
- Fixed range_offset_limit.
- Added code to retry ServFail replies for internal DNS
  lookups.
- Added referer header logging (Jens-S. Voeckler).
- Added "multi-domain-NTLM" authentication module, a Perl
  script from Thomas Jarosch.
- Added configurable warning messages for high memory usage,
  high response time, and high page faults.
- Made store dir selection algorithm configurable.
- Added support for admin-definable extension methods,
  up to 20.
- Added 'maximum_object_size_in_memory' as a configuration option -
  this defines the watermark where objects transit from being true
  hot objects to being in-transit objects in memory. It currently
  defaults to 8 KB.
- Change to the fqdn code which changes how pending DNS requests
  are treated as private and only become public once they are
  completed. This can add extra load on DNS servers but prevents
  all the pending clients blocking if one of the queries got
  stuck. (Duane Wessels)
- Converted more code to use MemPools, from Andres Kroonmaa.
- Added more CYGWIN patches from Robert Collins.
- Added Logfile module.
- Added DISKD stats via cachemgr.
- Added squid.conf options for DISKD magic constants.
@
text
@d3 2
a4 2
--- src/Makefile.in.orig	Sat Apr 14 11:38:49 2001
+++ src/Makefile.in	Sat Apr 14 11:42:36 2001
d14 1
a14 7
@@@@ -35,19 +37,19 @@@@
 
 DEFAULT_PREFIX		= $(prefix)
 DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
-DEFAULT_MIME_TABLE	= $(sysconfdir)/mime.conf
+DEFAULT_MIME_TABLE	= $(datadir)/squid/mime.conf
 DEFAULT_DNSSERVER       = $(libexecdir)/$(DNSSERVER_EXE)
d93 1
a93 1
@@@@ -377,20 +379,20 @@@@
d108 5
a112 1
+	$(INSTALL_FILE) squid.conf $(datadir)/squid/squid.conf.default
d121 6
a126 8
+	@@if test -f $(DEFAULT_MIME_TABLE) ; then \
+		echo "$@@ will not overwrite existing $(DEFAULT_MIME_TABLE)" ; \
 	else \
-		echo "$(INSTALL_FILE) $(srcdir)/mime.conf $(sysconfdir)"; \
-		$(INSTALL_FILE) $(srcdir)/mime.conf $(sysconfdir); \
+		echo "$(INSTALL_FILE) $(srcdir)/mime.conf $(DEFAULT_MIME_TABLE)"; \
+		$(INSTALL_FILE) $(srcdir)/mime.conf $(DEFAULT_MIME_TABLE); \
 	fi
d129 1
@


1.4
log
@Sync with "squid-current" package.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.1.1.1 1998/10/09 17:49:20 kim Exp $
d3 2
a4 2
--- src/Makefile.in.orig	Mon Aug 17 19:27:15 1998
+++ src/Makefile.in	Thu Oct  1 17:00:53 1998
d14 1
a14 1
@@@@ -29,18 +31,18 @@@@
d29 1
d39 1
a39 1
@@@@ -264,9 +266,9 @@@@
d41 1
a41 1
 		mkdir $(exec_prefix); \
d45 1
a45 1
-		mkdir $(bindir); \
d48 1
a48 1
+		mkdir $(sbindir); \
d52 1
a52 1
@@@@ -276,28 +278,28 @@@@
d54 1
a54 1
 		mkdir $(sysconfdir); \
d58 1
a58 1
-		mkdir $(localstatedir); \
d62 1
a62 1
-		mkdir $(localstatedir)/logs; \
d66 1
a66 1
+#		mkdir $(localstatedir); \
d70 1
a70 1
+#		mkdir $(localstatedir)/logs; \
d75 3
a77 1
 install: all install-mkdirs
d98 2
a99 2
 	@@for f in $(UTILS); do \
@@@@ -325,20 +327,20 @@@@
@


1.3
log
@Add NetBSD RCS Ids.
@
text
@d1 1
a1 1
$NetBSD$
d3 12
a14 31
--- src/Makefile.in.orig	Fri Oct 24 19:57:11 1997
+++ src/Makefile.in	Sun May 24 12:01:18 1998
@@@@ -5,19 +5,19 @@@@
 #
 #  Uncomment and customize the following to suit your needs:
 #
-HOST_OPT	= # -DCACHEMGR_HOSTNAME="getfullhostname()"
-AUTH_OPT	= # -DUSE_PROXY_AUTH=1
-LOG_HDRS_OPT	= # -DLOG_FULL_HEADERS=1
-ICMP_OPT	= # -DUSE_ICMP=1
-DELAY_HACK      = # -DDELAY_HACK=1
-USERAGENT_OPT	= # -DUSE_USERAGENT_LOG=1
-KILL_PARENT_OPT	= # -DKILL_PARENT_OPT
-USE_POLL_OPT    = # -DUSE_POLL
+#HOST_OPT	= # -DCACHEMGR_HOSTNAME="getfullhostname()"
+#AUTH_OPT	= # -DUSE_PROXY_AUTH=1
+#LOG_HDRS_OPT	= # -DLOG_FULL_HEADERS=1
+#ICMP_OPT	= # -DUSE_ICMP=1
+#DELAY_HACK      = # -DDELAY_HACK=1
+#USERAGENT_OPT	= # -DUSE_USERAGENT_LOG=1
+#KILL_PARENT_OPT	= # -DKILL_PARENT_OPT
+#USE_POLL_OPT    = # -DUSE_POLL
 # do NOT define both USE_SPLAY_TREE and USE_BIN_TREE at the same time!
-USE_SPLAY_TREE  = # -DUSE_SPLAY_TREE
-USE_BIN_TREE    = # -DUSE_BIN_TREE
-RELOAD_INTO_IMS	= # -DRELOAD_INTO_IMS
-UNDERSCORES_OPT = # -DALLOW_HOSTNAME_UNDERSCORES
+#USE_SPLAY_TREE  = # -DUSE_SPLAY_TREE
+#USE_BIN_TREE    = # -DUSE_BIN_TREE
+#RELOAD_INTO_IMS	= # -DRELOAD_INTO_IMS
+#UNDERSCORES_OPT = # -DALLOW_HOSTNAME_UNDERSCORES
d16 5
a20 3
 DEFINES         = $(HOST_OPT) $(AUTH_OPT) $(LOG_HDRS_OPT) \
                   $(ICMP_OPT) $(DELAY_HACK) $(USERAGENT_OPT) \
@@@@ -41,7 +41,7 @@@@
d27 25
a51 3
 DEFAULT_PINGER		= $(libexecdir)/pinger
 DEFAULT_UNLINKD		= $(libexecdir)/unlinkd
@@@@ -199,14 +199,14 @@@@
d74 56
@


1.2
log
@pidfile belongs to "/var/run".
@
text
@d1 2
@


1.1
log
@New "squid-1.1.21" package based on FreeBSD port adapted by Rene Hexel
in PR pkg/5314.
@
text
@d2 1
a2 1
+++ src/Makefile.in	Sat May 23 22:31:58 1998
d35 9
@