Sun Jul 19 23:05:38 2009 UTC ()
Update "squid31" package to version 3.1.0.11.
Changes since version 3.1.0.9:
- Bug 2087: Support adaptation sets and chains
- Bug 2459: dns error message broken when error handling delayed
- Support ICAP Retry
- Support ICAP retries based on the ICAP responses status code
- Support logging ICAP
- Support logging total DNS wait time
- Support logging response times of adaptation transactions
- General logging enhancements
- Dynamically form chains based on ICAP X-Next-Services header
- Support cross-transactional ICAP header exchange
- Bug 2680: Regression Crash after rotate with no helpers running
- Bug 2695: Regression in WCCPv2 L2 mask assignment
- Bug 2707: Regression in FTP anonymous auth
- Bug 422, 2706: RFC 2616 Date header requirements
- Bug 1087: ESI processor not quoting attributes correctly.
- Bug 1338: File prefetches aborted despite range_offset
- Bug 2080: wbinfo_group.pl - false positive under certain conditions
- Bug 2092: select loop 32-bit call counter overflows
- Bug 2127: delay pools class 4 crashes with ntlm auth
- Bug 2611: document fast/slow acl types
- Bug 2614: Potential loss of adapted body data from eCAP adapters
- Bug 2658: Missing TextException copy constructor
- Bug 2659: String length overflows on append, leading to segfaults
- Bug 2699: Build failure NTLM smb_lm helper
- Bug 2709: TRANSLATIONS not installed
- Bug 2710: squid_kerb_auth non-terminated string
- Delay pools 64-bit buckets and IPv6-polish
- Break forwarding loops for "transparent" or "intercept" http_ports.
- Add --disable-translation option to detatch .po from error negotiation
- Add squidclient man(1) page
- Add localhost to default permitted networks
- http_port allow-direct option to allow direct forwarding in accelerator mode
- ... and many testing infrastructure updates
- ... and much adaptation polish and improvements


(tron)
diff -r1.1.1.1 -r1.2 pkgsrc/www/squid31/DESCR
diff -r1.10 -r1.11 pkgsrc/www/squid31/Makefile
diff -r1.2 -r1.3 pkgsrc/www/squid31/PLIST
diff -r1.6 -r1.7 pkgsrc/www/squid31/distinfo
diff -r1.3 -r1.4 pkgsrc/www/squid31/patches/patch-aa
diff -r1.4 -r1.5 pkgsrc/www/squid31/patches/patch-ad
diff -r1.2 -r1.3 pkgsrc/www/squid31/patches/patch-ae
cvs diff -r1.1.1.1 -r1.2 pkgsrc/www/squid31/Attic/DESCR (expand / switch to unified diff)

--- pkgsrc/www/squid31/Attic/DESCR 2009/04/20 21:27:40 1.1.1.1
+++ pkgsrc/www/squid31/Attic/DESCR 2009/07/19 23:05:38 1.2
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1Squid 3.1 represents a new feature release above 3.0. 1Squid 3.1 represents a new feature release above 3.0.
 2This version is however still in release candidate testing cycle.
2 3
3The most important of these new features are: 4The most important of these new features are:
4* New Version Numbering System 5* New Version Numbering System
5* Minimal squid.conf improvements 6* Minimal squid.conf improvements
6* Native IPv6 Support 7* Native IPv6 Support
7* Error Page Localization 8* Error Page Localization
8* Connection Pinning (for NTLM Auth Passthrough) 9* Connection Pinning (for NTLM Auth Passthrough)
9* Quality of Service (QoS) Flow support 10* Quality of Service (QoS) Flow support
10* SSL Bump (for HTTPS Filtering and Adaptation) 11* SSL Bump (for HTTPS Filtering and Adaptation)
11* eCAP Adaptation Module support 12* eCAP Adaptation Module support
cvs diff -r1.10 -r1.11 pkgsrc/www/squid31/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/squid31/Attic/Makefile 2009/07/12 09:45:02 1.10
+++ pkgsrc/www/squid31/Attic/Makefile 2009/07/19 23:05:38 1.11
@@ -1,52 +1,36 @@ @@ -1,52 +1,36 @@
1# $NetBSD: Makefile,v 1.10 2009/07/12 09:45:02 tron Exp $ 1# $NetBSD: Makefile,v 1.11 2009/07/19 23:05:38 tron Exp $
2 2
3DISTNAME= squid-3.1.0.9 3DISTNAME= squid-3.1.0.11
4PKGREVISION= 1 
5PKGNAME= ${DISTNAME} # Necessary for "pkgsrc/www/squid/options.mk" 4PKGNAME= ${DISTNAME} # Necessary for "pkgsrc/www/squid/options.mk"
6CATEGORIES= www 5CATEGORIES= www
7MASTER_SITES= ${SQUID_MASTER_SITES} \ 6MASTER_SITES= http://www.squid-cache.org/Versions/v3/3.1/ \
8 http://www.squid-cache.org/Versions/v3/3.1/ 7 ${SQUID_MASTER_SITES}
9EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
10 9
11MAINTAINER= tron@NetBSD.org 10MAINTAINER= tron@NetBSD.org
12HOMEPAGE= http://www.squid-cache.org/ 11HOMEPAGE= http://www.squid-cache.org/
13COMMENT= Post-Harvest_cached WWW proxy cache and accelerator 12COMMENT= Post-Harvest_cached WWW proxy cache and accelerator
14LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
15 14
16USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
17USE_TOOLS+= perl gmake 16USE_TOOLS+= perl gmake
18GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
19PKG_DESTDIR_SUPPORT= destdir 18PKG_DESTDIR_SUPPORT= destdir
20 19
21POST_INSTALL_EXTRA= install-error-pages 
22 
23.include "../../www/squid/Makefile.squid" 20.include "../../www/squid/Makefile.squid"
24 21
25CONFIGURE_ARGS+= --with-default-user=${SQUID_USER} 22CONFIGURE_ARGS+= --with-default-user=${SQUID_USER}
26CONFIGURE_ARGS+= --with-pidfile=${VARBASE}/run/squid.pid 23CONFIGURE_ARGS+= --with-pidfile=${VARBASE}/run/squid.pid
27 24
28EGFILES+= errors/errorpage.css 25EGFILES+= errors/errorpage.css
29CONF_FILES+= ${PREFIX}/${EGDIR}/errorpage.css ${PKG_SYSCONFDIR}/errorpage.css 26CONF_FILES+= ${PREFIX}/${EGDIR}/errorpage.css ${PKG_SYSCONFDIR}/errorpage.css
30 27
31SQUID_BACKENDS?= ufs 28SQUID_BACKENDS?= ufs
32SQUID_NTLM_AUTH_HELPERS?= fakeauth 29SQUID_NTLM_AUTH_HELPERS?= fakeauth
33.include "../../www/squid/options.mk" 30.include "../../www/squid/options.mk"
34 31
35post-build: 32post-build:
36 ${CP} -pf ${WRKSRC}/src/squid.conf.documented \ 33 ${CP} -pf ${WRKSRC}/src/squid.conf.documented \
37 ${WRKSRC}/src/squid.conf.default 34 ${WRKSRC}/src/squid.conf.default
38 35
39install-error-pages: 
40 cd ${WRKSRC}/errors && \ 
41 for DIR in *; do \ 
42 if [ -d $$DIR ]; then \ 
43 ERROR_DIR=${DESTDIR}${PREFIX}/share/squid/errors/$$DIR; \ 
44 ${INSTALL_DATA_DIR} $$ERROR_DIR; \ 
45 for FILE in $$DIR/ERR_*; do \ 
46 ${INSTALL_DATA} $$FILE $$ERROR_DIR; \ 
47 done; \ 
48 fi; \ 
49 done 
50 ${LN} -s en ${PREFIX}/share/squid/errors/templates 
51 
52.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/www/squid31/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/www/squid31/Attic/PLIST 2009/05/04 22:29:41 1.2
+++ pkgsrc/www/squid31/Attic/PLIST 2009/07/19 23:05:38 1.3
@@ -1,32 +1,33 @@ @@ -1,32 +1,33 @@
1@comment $NetBSD: PLIST,v 1.2 2009/05/04 22:29:41 tron Exp $ 1@comment $NetBSD: PLIST,v 1.3 2009/07/19 23:05:38 tron Exp $
2bin/squidclient 2bin/squidclient
3libexec/cachemgr.cgi 3libexec/cachemgr.cgi
4${PLIST.da_ldap}libexec/digest_ldap_auth 4${PLIST.da_ldap}libexec/digest_ldap_auth
5${PLIST.da_password}libexec/digest_pw_auth 5${PLIST.da_password}libexec/digest_pw_auth
6${PLIST.diskd}libexec/diskd 6${PLIST.diskd}libexec/diskd
7${PLIST.na_fakeauth}libexec/fakeauth_auth 7${PLIST.na_fakeauth}libexec/fakeauth_auth
8${PLIST.ba_getpwnam}libexec/getpwname_auth 8${PLIST.ba_getpwnam}libexec/getpwname_auth
9${PLIST.eacl_ip_user}libexec/ip_user_check 9${PLIST.eacl_ip_user}libexec/ip_user_check
10${PLIST.ba_MSNT}libexec/msnt_auth 10${PLIST.ba_MSNT}libexec/msnt_auth
11${PLIST.ba_NCSA}libexec/ncsa_auth 11${PLIST.ba_NCSA}libexec/ncsa_auth
12${PLIST.na_SMB}libexec/ntlm_auth 12${PLIST.na_SMB}libexec/ntlm_auth
13${PLIST.ba_PAM}libexec/pam_auth 13${PLIST.ba_PAM}libexec/pam_auth
14libexec/pinger 14libexec/pinger
15${PLIST.ba_LDAP}libexec/squid_ldap_auth 15${PLIST.ba_LDAP}libexec/squid_ldap_auth
16${PLIST.eacl_ldap_group}libexec/squid_ldap_group 16${PLIST.eacl_ldap_group}libexec/squid_ldap_group
17${PLIST.eacl_unix_group}libexec/squid_unix_group 17${PLIST.eacl_unix_group}libexec/squid_unix_group
18${PLIST.unlinkd}libexec/unlinkd 18${PLIST.unlinkd}libexec/unlinkd
19${PLIST.ba_YP}libexec/yp_auth 19${PLIST.ba_YP}libexec/yp_auth
 20man/man1/squidclient.1
20man/man8/cachemgr.cgi.8 21man/man8/cachemgr.cgi.8
21${PLIST.ba_NCSA}man/man8/ncsa_auth.8 22${PLIST.ba_NCSA}man/man8/ncsa_auth.8
22${PLIST.ba_PAM}man/man8/pam_auth.8 23${PLIST.ba_PAM}man/man8/pam_auth.8
23man/man8/squid.8 24man/man8/squid.8
24${PLIST.ba_LDAP}man/man8/squid_ldap_auth.8 25${PLIST.ba_LDAP}man/man8/squid_ldap_auth.8
25${PLIST.eacl_ldap_group}man/man8/squid_ldap_group.8 26${PLIST.eacl_ldap_group}man/man8/squid_ldap_group.8
26${PLIST.eacl_unix_group}man/man8/squid_unix_group.8 27${PLIST.eacl_unix_group}man/man8/squid_unix_group.8
27sbin/squid 28sbin/squid
28share/doc/squid/ChangeLog 29share/doc/squid/ChangeLog
29share/doc/squid/README.FreeBSD 30share/doc/squid/README.FreeBSD
30share/doc/squid/README.NetBSD 31share/doc/squid/README.NetBSD
31share/doc/squid/README.OpenBSD 32share/doc/squid/README.OpenBSD
32share/doc/squid/README.Solaris 33share/doc/squid/README.Solaris
cvs diff -r1.6 -r1.7 pkgsrc/www/squid31/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/www/squid31/Attic/distinfo 2009/07/12 09:45:02 1.6
+++ pkgsrc/www/squid31/Attic/distinfo 2009/07/19 23:05:38 1.7
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.6 2009/07/12 09:45:02 tron Exp $ 1$NetBSD: distinfo,v 1.7 2009/07/19 23:05:38 tron Exp $
2 2
3SHA1 (squid-3.1.0.9.tar.bz2) = 221cc189c1c69e61819540ceb798ded728c2579a 3SHA1 (squid-3.1.0.11.tar.bz2) = 374c2a5d664320109d92405a44926fc93dce4526
4RMD160 (squid-3.1.0.9.tar.bz2) = 208ec13315ba73e16f3f4051e41aa7a539d7ba45 4RMD160 (squid-3.1.0.11.tar.bz2) = c654e229ed6c060798e290ef7f7491cae4fa0356
5Size (squid-3.1.0.9.tar.bz2) = 2360740 bytes 5Size (squid-3.1.0.11.tar.bz2) = 2381394 bytes
6SHA1 (patch-aa) = 58f69e9172a218cd79d43c09b9065aafe386e8c2 6SHA1 (patch-aa) = 6f9cb9debbe8066117e589c449c1d8f01c761b90
7SHA1 (patch-ad) = 031e5de714610917ac0c575b42add980c0933c72 7SHA1 (patch-ad) = cb2591bebcbcf22f6cb1858f243b0c808d3db589
8SHA1 (patch-ae) = a512f1d521f3019e2136b5d0ad2199182e2aaabb 8SHA1 (patch-ae) = a1f8a6bfa49a3e7c46fc6228b22ef374f3bd3964
9SHA1 (patch-ah) = e20f7b76d6d48041efbfe1a07dce756a818e6642 9SHA1 (patch-ah) = e20f7b76d6d48041efbfe1a07dce756a818e6642
10SHA1 (patch-aj) = 349b5d49dec49430cff2a170ad53d3a16f2a4c76 10SHA1 (patch-aj) = 349b5d49dec49430cff2a170ad53d3a16f2a4c76
11SHA1 (patch-al) = 6dd09cf75ed53a92616f4eed9f3e290232ff54a5 11SHA1 (patch-al) = 6dd09cf75ed53a92616f4eed9f3e290232ff54a5
12SHA1 (patch-am) = 9dcfc9431d4397b87a72e0205487d89f9fa67233 12SHA1 (patch-am) = 9dcfc9431d4397b87a72e0205487d89f9fa67233
cvs diff -r1.3 -r1.4 pkgsrc/www/squid31/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/www/squid31/patches/Attic/patch-aa 2009/07/12 09:45:02 1.3
+++ pkgsrc/www/squid31/patches/Attic/patch-aa 2009/07/19 23:05:38 1.4
@@ -1,62 +1,13 @@ @@ -1,62 +1,13 @@
1$NetBSD: patch-aa,v 1.3 2009/07/12 09:45:02 tron Exp $ 1$NetBSD: patch-aa,v 1.4 2009/07/19 23:05:38 tron Exp $
2 2
3Fix problems with anonymous FTP, see here: 3--- src/client_side.cc.orig 2009-07-19 06:11:13.000000000 +0100
4http://www.squid-cache.org/bugs/show_bug.cgi?id=2707 4+++ src/client_side.cc 2009-07-19 23:43:24.000000000 +0100
5 5@@ -2222,7 +2222,7 @@
6--- src/ftp.cc.orig 2009-06-26 11:35:38.000000000 +0100 6 // when we read chunked requests, the entire body is buffered
7+++ src/ftp.cc 2009-07-12 10:34:01.000000000 +0100 7 // XXX: this check ignores header size and its limits.
8@@ -93,13 +93,21 @@ 8 if (conn->in.dechunkingState == ConnStateData::chunkParsing)
9  9- return conn->in.notYetUsed < Config.maxChunkedRequestBodySize;
10 /// \ingroup ServerProtocolFTPInternal 10+ return (ssize_t)conn->in.notYetUsed < Config.maxChunkedRequestBodySize;
11 struct _ftp_flags { 
12+ 
13+ /* passive mode */ 
14+ bool pasv_supported; ///< PASV command is allowed 
15+ bool epsv_all_sent; ///< EPSV ALL has been used. Must abort on failures. 
16+ bool pasv_only; 
17+ 
18+ /* authentication */ 
19+ bool authenticated; ///< authentication success 
20+ bool tried_auth_anonymous; ///< auth has tried to use anonymous credentials already. 
21+ bool tried_auth_nopass; ///< auth tried username with no password already. 
22+ 
23+ /* other */ 
24 bool isdir; 
25- bool pasv_supported; 
26- bool epsv_all_sent; 
27 bool skip_whitespace; 
28 bool rest_supported; 
29- bool pasv_only; 
30- bool authenticated; 
31 bool http_header_sent; 
32 bool tried_nlst; 
33 bool need_base_href; 
34@@ -1432,6 +1440,9 @@ 
35 * 
36 * Special Case: A username-only may be provided in the URL and password in the HTTP headers. 
37 * 
38+ * TODO: we might be able to do something about locating username from other sources: 
39+ * ie, external ACL user=* tag or ident lookup 
40+ * 
41 \retval 1 if we have everything needed to complete this request. 
42 \retval 0 if something is missing. 
43 */ 
44@@ -1464,10 +1475,16 @@ 
45 /* Setup default FTP password settings */ 
46 /* this has to be done last so that we can have a no-password case above. */ 
47 if (!password[0]) { 
48- if (strcmp(user, "anonymous") == 0) 
49+ if (strcmp(user, "anonymous") == 0 && !flags.tried_auth_anonymous) { 
50 xstrncpy(password, Config.Ftp.anon_user, MAX_URL); 
51- else 
52+ flags.tried_auth_anonymous=1; 
53+ return 1; 
54+ } 
55+ else if (!flags.tried_auth_nopass) { 
56 xstrncpy(password, null_string, MAX_URL); 
57+ flags.tried_auth_nopass=1; 
58+ return 1; 
59+ } 
60 } 
61  11
62 return 0; /* different username */ 12 return conn->in.notYetUsed >= Config.maxRequestHeaderSize ? 0 : 1;
 13 }
cvs diff -r1.4 -r1.5 pkgsrc/www/squid31/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/www/squid31/patches/Attic/patch-ad 2009/06/07 08:36:36 1.4
+++ pkgsrc/www/squid31/patches/Attic/patch-ad 2009/07/19 23:05:38 1.5
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ad,v 1.4 2009/06/07 08:36:36 tron Exp $ 1$NetBSD: patch-ad,v 1.5 2009/07/19 23:05:38 tron Exp $
2 2
3--- tools/Makefile.in.orig 2009-05-23 13:31:26.000000000 +0100 3--- tools/Makefile.in.orig 2009-07-19 06:11:36.000000000 +0100
4+++ tools/Makefile.in 2009-06-06 17:34:58.000000000 +0100 4+++ tools/Makefile.in 2009-07-19 15:20:43.000000000 +0100
5@@ -752,7 +752,7 @@ 5@@ -805,7 +805,7 @@
6  6
7 info-am: 7 info-am:
8  8
9-install-data-am: install-data-local 9-install-data-am: install-data-local install-man
10+install-data-am: 10+install-data-am: install-man
11  11
12 install-dvi: install-dvi-recursive 12 install-dvi: install-dvi-recursive
13  13
cvs diff -r1.2 -r1.3 pkgsrc/www/squid31/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/www/squid31/patches/Attic/patch-ae 2009/07/07 18:25:13 1.2
+++ pkgsrc/www/squid31/patches/Attic/patch-ae 2009/07/19 23:05:38 1.3
@@ -1,26 +1,24 @@ @@ -1,26 +1,24 @@
1$NetBSD: patch-ae,v 1.2 2009/07/07 18:25:13 tron Exp $ 1$NetBSD: patch-ae,v 1.3 2009/07/19 23:05:38 tron Exp $
2 2
3--- errors/Makefile.in.orig 2009-06-26 11:35:52.000000000 +0100 3--- errors/Makefile.in.orig 2009-07-19 06:11:27.000000000 +0100
4+++ errors/Makefile.in 2009-06-30 18:58:13.000000000 +0100 4+++ errors/Makefile.in 2009-07-19 15:21:48.000000000 +0100
5@@ -408,13 +408,13 @@ 5@@ -418,13 +418,13 @@
6 done; \ 
7 fi \ 6 fi \
8 done; \ 7 done; \
 8 $(INSTALL_DATA) $(srcdir)/TRANSLATORS $(DESTDIR)TRANSLATORS; \
9- $(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET).default; \ 9- $(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET).default; \
10- if test -f $(DESTDIR)$(DEFAULT_STYLESHEET) ; then \ 10- if test -f $(DESTDIR)$(DEFAULT_STYLESHEET) ; then \
11- echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_STYLESHEET)" ; \ 11+# $(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET).default; \
 12+# if test -f $(DESTDIR)$(DEFAULT_STYLESHEET) ; then \
 13 echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_STYLESHEET)" ; \
12- else \ 14- else \
13- echo "$(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET)"; \ 15- echo "$(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET)"; \
14- $(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET); \ 16- $(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET); \
15- fi ; \ 17- fi ; \
16+# $(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET).default; \ 
17+# if test -f $(DESTDIR)$(DEFAULT_STYLESHEET) ; then \ 
18+# echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_STYLESHEET)" ; \ 
19+# else \ 18+# else \
20+# echo "$(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET)"; \ 19+# echo "$(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET)"; \
21+# $(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET); \ 20+# $(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET); \
22+# fi ; \ 21+# fi ; \
23 $(SHELL) $(srcdir)/alias-link.sh "$(LN)" "$(RM)" "$(DESTDIR)$(DEFAULT_ERROR_DIR)" "$(srcdir)/aliases" || exit 1 ; 22 $(SHELL) $(srcdir)/alias-link.sh "$(LN)" "$(RM)" "$(DESTDIR)$(DEFAULT_ERROR_DIR)" "$(srcdir)/aliases" || exit 1 ;
24  23
25 uninstall-local: 24 uninstall-local:
26 for l in $(TRANSLATIONS); do \