Wed Apr 2 01:30:37 2008 UTC ()
Update squid package to 2.6.19 (2.6.STABLE19).

Changes to squid-2.6.STABLE19 (19 Mar 2008)

	- Fix tcp_outgoing_address example config to match its description
	- Bug #2198: assertion failed sc != NULL when using peer monitor
	  function
	- Fix missing default disk store type into QUICKSTART example.
	- Bugzilla #761 : Handle recursive completion operations in diskd.
	- documentation bugfix for tcp_outgoing_tos directive
	- Sort cache list in wccpv2 to ensure a consistent hash allocation
	  across all services
	- Updated Ukrainan error pages
	- Compile error in squid_kerb_auth under Mac OS X 10.5.2
	- squid_radius_auth failed ro process more than 256 requests
	- Clarified description of 'cache_vary' directive
	- Make range_offset_limit 0 disable local range processing as
	  documented, even if the first range starts at 0


(taca)
diff -r1.204 -r1.205 pkgsrc/www/squid/Makefile
diff -r1.136 -r1.137 pkgsrc/www/squid/distinfo
cvs diff -r1.204 -r1.205 pkgsrc/www/squid/Attic/Makefile (switch to unified diff)

--- pkgsrc/www/squid/Attic/Makefile 2008/03/22 04:30:53 1.204
+++ pkgsrc/www/squid/Attic/Makefile 2008/04/02 01:30:37 1.205
@@ -1,123 +1,122 @@ @@ -1,123 +1,122 @@
1# $NetBSD: Makefile,v 1.204 2008/03/22 04:30:53 taca Exp $ 1# $NetBSD: Makefile,v 1.205 2008/04/02 01:30:37 taca Exp $
2 2
3DISTNAME= squid-2.6.STABLE18 3DISTNAME= squid-2.6.STABLE19
4PKGNAME= ${DISTNAME:S/STABLE//} 4PKGNAME= ${DISTNAME:S/STABLE//}
5PKGREVISION= 2 
6CATEGORIES= www 5CATEGORIES= www
7MASTER_SITES= http://www.squid-cache.org/Versions/v2/2.6/ 6MASTER_SITES= http://www.squid-cache.org/Versions/v2/2.6/
8EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
9 8
10MAINTAINER= taca@NetBSD.org 9MAINTAINER= taca@NetBSD.org
11HOMEPAGE= http://www.squid-cache.org/ 10HOMEPAGE= http://www.squid-cache.org/
12COMMENT= Post-Harvest_cached WWW proxy cache and accelerator 11COMMENT= Post-Harvest_cached WWW proxy cache and accelerator
13 12
14WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} 13WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
15 14
16DOCDIR= ${PREFIX}/share/doc/squid 15DOCDIR= ${PREFIX}/share/doc/squid
17EXAMPLESDIR= ${PREFIX}/share/examples/squid 16EXAMPLESDIR= ${PREFIX}/share/examples/squid
18 17
19DOCFILES= ChangeLog RELEASENOTES.html doc/debug-sections.txt 18DOCFILES= ChangeLog RELEASENOTES.html doc/debug-sections.txt
20 19
21USE_TOOLS+= perl 20USE_TOOLS+= perl
22GNU_CONFIGURE= yes 21GNU_CONFIGURE= yes
23CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} \ 22CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} \
24 --localstatedir=${SQUID_DATADIR:Q} 23 --localstatedir=${SQUID_DATADIR:Q}
25 24
26MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} 25MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
27MAKE_ENV+= PKG_PREFIX=${PREFIX:Q} VARBASE=${VARBASE:Q} 26MAKE_ENV+= PKG_PREFIX=${PREFIX:Q} VARBASE=${VARBASE:Q}
28PLIST_SRC= ${WRKDIR}/PLIST 27PLIST_SRC= ${WRKDIR}/PLIST
29RCD_SCRIPTS= squid 28RCD_SCRIPTS= squid
30 29
31CONF_FILES+= ${EXAMPLESDIR}/cachemgr.conf ${PKG_SYSCONFDIR}/cachemgr.conf 30CONF_FILES+= ${EXAMPLESDIR}/cachemgr.conf ${PKG_SYSCONFDIR}/cachemgr.conf
32CONF_FILES+= ${EXAMPLESDIR}/mime.conf ${PKG_SYSCONFDIR}/mime.conf 31CONF_FILES+= ${EXAMPLESDIR}/mime.conf ${PKG_SYSCONFDIR}/mime.conf
33CONF_FILES+= ${EXAMPLESDIR}/squid.conf ${PKG_SYSCONFDIR}/squid.conf 32CONF_FILES+= ${EXAMPLESDIR}/squid.conf ${PKG_SYSCONFDIR}/squid.conf
34CONF_FILES+= ${EXAMPLESDIR}/msntauth.conf ${PKG_SYSCONFDIR}/msntauth.conf 33CONF_FILES+= ${EXAMPLESDIR}/msntauth.conf ${PKG_SYSCONFDIR}/msntauth.conf
35OWN_DIRS= ${SQUID_DATADIR} 34OWN_DIRS= ${SQUID_DATADIR}
36OWN_DIRS_PERMS+= ${SQUID_DATADIR}/cache ${SQUID_USER} ${SQUID_GROUP} 0750 \ 35OWN_DIRS_PERMS+= ${SQUID_DATADIR}/cache ${SQUID_USER} ${SQUID_GROUP} 0750 \
37 ${SQUID_DATADIR}/logs ${SQUID_USER} ${SQUID_GROUP} 0750 36 ${SQUID_DATADIR}/logs ${SQUID_USER} ${SQUID_GROUP} 0750
38EXAMPLES_FILES= src/mime.conf.default src/squid.conf.default \ 37EXAMPLES_FILES= src/mime.conf.default src/squid.conf.default \
39 helpers/basic_auth/MSNT/msntauth.conf.default \ 38 helpers/basic_auth/MSNT/msntauth.conf.default \
40 tools/cachemgr.conf 39 tools/cachemgr.conf
41 40
42.include "../../mk/bsd.prefs.mk" 41.include "../../mk/bsd.prefs.mk"
43.include "Makefile.common" 42.include "Makefile.common"
44 43
45BUILD_DEFS+= LOGDIR VARBASE 44BUILD_DEFS+= LOGDIR VARBASE
46 45
47CONFIGURE_ARGS+= --enable-auth=basic,digest,ntlm \ 46CONFIGURE_ARGS+= --enable-auth=basic,digest,ntlm \
48 --enable-cachemgr-hostname=localhost \ 47 --enable-cachemgr-hostname=localhost \
49 --enable-delay-pools \ 48 --enable-delay-pools \
50 --enable-removal-policies=lru,heap \ 49 --enable-removal-policies=lru,heap \
51 --enable-poll \ 50 --enable-poll \
52 --enable-underscores \ 51 --enable-underscores \
53 --enable-storeio=${SQUID_BACKENDS:Q} \ 52 --enable-storeio=${SQUID_BACKENDS:Q} \
54 --with-aio 53 --with-aio
55 54
56# 55#
57# generic helpers 56# generic helpers
58# 57#
59OPTIONAL_FILES+= bin/cossdump libexec/diskd-daemon libexec/dnsserver 58OPTIONAL_FILES+= bin/cossdump libexec/diskd-daemon libexec/dnsserver
60OPTIONAL_FILES+= libexec/pinger libexec/unlinkd 59OPTIONAL_FILES+= libexec/pinger libexec/unlinkd
61# 60#
62# basic auth helpers (except LDAP, multi-domain-NTLM and SASL) 61# basic auth helpers (except LDAP, multi-domain-NTLM and SASL)
63# 62#
64OPTIONAL_FILES+= libexec/getpwname_auth libexec/msnt_auth libexec/ncsa_auth 63OPTIONAL_FILES+= libexec/getpwname_auth libexec/msnt_auth libexec/ncsa_auth
65OPTIONAL_FILES+= libexec/pam_auth ${PKGMANDIR}/man8/ncsa_auth.8 64OPTIONAL_FILES+= libexec/pam_auth ${PKGMANDIR}/man8/ncsa_auth.8
66OPTIONAL_FILES+= ${PKGMANDIR}/man8/pam_auth.8 65OPTIONAL_FILES+= ${PKGMANDIR}/man8/pam_auth.8
67OPTIONAL_FILES+= libexec/smb_auth libexec/yp_auth libexec/wb_auth 66OPTIONAL_FILES+= libexec/smb_auth libexec/yp_auth libexec/wb_auth
68# 67#
69# digest auth helpers 68# digest auth helpers
70# 69#
71OPTIONAL_FILES+= libexec/digest_pw_auth 70OPTIONAL_FILES+= libexec/digest_pw_auth
72# 71#
73# ntlm auth helpers (except no_check and winbind) 72# ntlm auth helpers (except no_check and winbind)
74# 73#
75OPTIONAL_FILES+= libexec/fakeauth_auth libexec/ntlm_auth 74OPTIONAL_FILES+= libexec/fakeauth_auth libexec/ntlm_auth
76OPTIONAL_FILES+= libexec/wb_ntlmauth ${PKGMANDIR}/man8/squid_unix_group.8 75OPTIONAL_FILES+= libexec/wb_ntlmauth ${PKGMANDIR}/man8/squid_unix_group.8
77# 76#
78# external acl helpers (except ldap_group, wbinfo_group and winbind_group) 77# external acl helpers (except ldap_group, wbinfo_group and winbind_group)
79# 78#
80OPTIONAL_FILES+= libexec/ip_user_check libexec/squid_unix_group 79OPTIONAL_FILES+= libexec/ip_user_check libexec/squid_unix_group
81 80
82SUBST_CLASSES+= confs 81SUBST_CLASSES+= confs
83SUBST_STAGE.confs= pre-configure 82SUBST_STAGE.confs= pre-configure
84SUBST_FILES.confs= src/cf.data.pre 83SUBST_FILES.confs= src/cf.data.pre
85SUBST_SED.confs= -e "s/@USER@/${SQUID_USER}/" 84SUBST_SED.confs= -e "s/@USER@/${SQUID_USER}/"
86SUBST_MESSAGE.confs= Fixing configuration files. 85SUBST_MESSAGE.confs= Fixing configuration files.
87 86
88CHECK_PORTABILITY_SKIP+= icons/icons.shar 87CHECK_PORTABILITY_SKIP+= icons/icons.shar
89 88
90INSTALLATION_DIRS= bin libexec ${PKGMANDIR}/man8 sbin ${DOCDIR} \ 89INSTALLATION_DIRS= bin libexec ${PKGMANDIR}/man8 sbin ${DOCDIR} \
91 ${EXAMPLESDIR} share/squid/errors share/squid/icons 90 ${EXAMPLESDIR} share/squid/errors share/squid/icons
92 91
93post-install: 92post-install:
94.for f in ${EXAMPLES_FILES} 93.for f in ${EXAMPLES_FILES}
95 ${INSTALL_DATA} ${WRKSRC}/${f} ${EXAMPLESDIR}/`basename ${f} .default` 94 ${INSTALL_DATA} ${WRKSRC}/${f} ${EXAMPLESDIR}/`basename ${f} .default`
96.endfor 95.endfor
97 ${CP} ${PKGDIR}/PLIST ${PLIST_SRC} 96 ${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
98 cd ${WRKSRC}; \ 97 cd ${WRKSRC}; \
99 for i in ${DOCFILES}; do \ 98 for i in ${DOCFILES}; do \
100 ${INSTALL_DATA} $$i ${DOCDIR}; \ 99 ${INSTALL_DATA} $$i ${DOCDIR}; \
101 done 100 done
102 ( \ 101 ( \
103 for i in ${OPTIONAL_FILES}; do \ 102 for i in ${OPTIONAL_FILES}; do \
104 ${TEST} ! -r ${PREFIX}/$$i || ${ECHO} $$i; \ 103 ${TEST} ! -r ${PREFIX}/$$i || ${ECHO} $$i; \
105 done; \ 104 done; \
106 cd ${WRKSRC}/errors; \ 105 cd ${WRKSRC}/errors; \
107 for i in *; do \ 106 for i in *; do \
108 ${TEST} -d $$i && \ 107 ${TEST} -d $$i && \
109 (${LS} $$i/ERR_* | \ 108 (${LS} $$i/ERR_* | \
110 ${SED} -e 's@^@share/squid/errors/@'; \ 109 ${SED} -e 's@^@share/squid/errors/@'; \
111 ${ECHO} "@dirrm share/squid/errors/$$i"); \ 110 ${ECHO} "@dirrm share/squid/errors/$$i"); \
112 done; \ 111 done; \
113 ${ECHO} "@dirrm share/squid/errors"; \ 112 ${ECHO} "@dirrm share/squid/errors"; \
114 cd ${WRKSRC}/icons; \ 113 cd ${WRKSRC}/icons; \
115 ${LS} anthony-*.gif | \ 114 ${LS} anthony-*.gif | \
116 ${SED} -e 's@^@share/squid/icons/@'; \ 115 ${SED} -e 's@^@share/squid/icons/@'; \
117 ${ECHO} "@dirrm share/squid/icons"; \ 116 ${ECHO} "@dirrm share/squid/icons"; \
118 ${ECHO} "share/squid/mib.txt"; \ 117 ${ECHO} "share/squid/mib.txt"; \
119 ${ECHO} "@dirrm share/squid" \ 118 ${ECHO} "@dirrm share/squid" \
120 ) >>${PLIST_SRC} 119 ) >>${PLIST_SRC}
121 120
122.include "options.mk" 121.include "options.mk"
123.include "../../mk/bsd.pkg.mk" 122.include "../../mk/bsd.pkg.mk"
cvs diff -r1.136 -r1.137 pkgsrc/www/squid/Attic/distinfo (switch to unified diff)

--- pkgsrc/www/squid/Attic/distinfo 2008/01/12 06:20:45 1.136
+++ pkgsrc/www/squid/Attic/distinfo 2008/04/02 01:30:37 1.137
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: distinfo,v 1.136 2008/01/12 06:20:45 taca Exp $ 1$NetBSD: distinfo,v 1.137 2008/04/02 01:30:37 taca Exp $
2 2
3SHA1 (squid-2.6.STABLE18.tar.bz2) = 9b3a46d5b004405cb958a95e34460ba4bfb503c8 3SHA1 (squid-2.6.STABLE19.tar.bz2) = cd031a3ba672a53054b512bbe43bbe6a58a13d53
4RMD160 (squid-2.6.STABLE18.tar.bz2) = cdebdd38060996a07534403441c7bf2d60eeb4b2 4RMD160 (squid-2.6.STABLE19.tar.bz2) = 6888f5a7bfdb4eda5b9b5e2d41ed9ad520186130
5Size (squid-2.6.STABLE18.tar.bz2) = 1304685 bytes 5Size (squid-2.6.STABLE19.tar.bz2) = 1324732 bytes
6SHA1 (patch-aa) = 06712292968ae808494007a722da5710660d0fec 6SHA1 (patch-aa) = 06712292968ae808494007a722da5710660d0fec
7SHA1 (patch-ab) = 42c3f2daa2294d346358c199a0c53d849d8b1c74 7SHA1 (patch-ab) = 42c3f2daa2294d346358c199a0c53d849d8b1c74
8SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0 8SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0
9SHA1 (patch-ad) = 8975f707dd46832011d618b5a1f623df88171f36 9SHA1 (patch-ad) = 8975f707dd46832011d618b5a1f623df88171f36
10SHA1 (patch-ae) = fb32c403e3613595931abf7f7a8ce7cfd86d72a7 10SHA1 (patch-ae) = fb32c403e3613595931abf7f7a8ce7cfd86d72a7
11SHA1 (patch-af) = a78e762c1ad928eef66b12395d48bc69542e32d9 11SHA1 (patch-af) = a78e762c1ad928eef66b12395d48bc69542e32d9
12SHA1 (patch-aj) = fab8076c24a4e134b193fcdacc5240dfe7aa5504 12SHA1 (patch-aj) = fab8076c24a4e134b193fcdacc5240dfe7aa5504
13SHA1 (patch-ak) = 6df607714a7a043997ece1a56e43b326876f3d22 13SHA1 (patch-ak) = 6df607714a7a043997ece1a56e43b326876f3d22
14SHA1 (patch-al) = d0a3b639147842ca5d07114b561d2431d8800971 14SHA1 (patch-al) = d0a3b639147842ca5d07114b561d2431d8800971
15SHA1 (patch-an) = 2027360a5ae2e24802719d4fe8801b0eeeb8a681 15SHA1 (patch-an) = 2027360a5ae2e24802719d4fe8801b0eeeb8a681
16SHA1 (patch-ap) = 20eec1bcc0a12e3ea47fda7a6ff14d781c0334c5 16SHA1 (patch-ap) = 20eec1bcc0a12e3ea47fda7a6ff14d781c0334c5
17SHA1 (patch-ar) = 985c192662d41264012a76248e9bea0662cec8f5 17SHA1 (patch-ar) = 985c192662d41264012a76248e9bea0662cec8f5
18SHA1 (patch-as) = e09a5703cdc7343259c07e599c933a613172a9b3 18SHA1 (patch-as) = e09a5703cdc7343259c07e599c933a613172a9b3
19SHA1 (patch-at) = 7ce72c964345203876d56d003353a5213c327252 19SHA1 (patch-at) = 7ce72c964345203876d56d003353a5213c327252
20SHA1 (patch-au) = 25f6c7e366e7dca2aeb55312bd2ccf51d7a7b725 20SHA1 (patch-au) = 25f6c7e366e7dca2aeb55312bd2ccf51d7a7b725
21SHA1 (patch-bb) = 6711186c3e3e7992f9874eb47df7c0d3690649c2 21SHA1 (patch-bb) = 6711186c3e3e7992f9874eb47df7c0d3690649c2
22SHA1 (patch-bc) = 0b87eb5f4ccc06a0e59ed298fc3203b1b2641969 22SHA1 (patch-bc) = 0b87eb5f4ccc06a0e59ed298fc3203b1b2641969