Thu May 23 20:21:28 2013 UTC ()
Changes 3.3.5:
* Allocate ClientInfo::hash.key using malloc() instead of new char[]
* Bug 3851: Delay Pool class 5 tag:levels displayed incorrectly in cache manager
* Use case-insensitive comparison for HTTP header names in *_header_access
* Bug 3744: squid terminated: FATAL: Bungled (null) line 3: sslproxy_cert_sign signTrusted all
* Bug 3759: OpenSSL compilation error on stock Fedora17, RHEL, CentOS 6 systems
* Bug 3816: SSL_get_certificate call inside Ssl::verifySslCertificate crashes squid, part2
* Port from 2.6: external acl %ACL and %DATA tags
* Log an ERROR instead of halting on unknown cache_dir types
* Add missing piece omitted from rev.9677
* Remove origin_tries limiter on forwarding
* Fixed leaking configurable SSL error details.
* Fix memory error with Kerberos authentication
* Avoid !closing assertions when helpers call comm_read [during reconfigure].
* Avoid Comm::Connection leaks when helpers are reconfigured or otherwise closed.
* find-alive.pl: Replaced HttpReq entry (already covered by the guessing code) with HttpHeaderEntry entry
* Docs: Polish [http::]>h and [http::]>ha descriptions to emphasize their pre-cache scope
* Polish: show file path on Bungled lines


(adam)
diff -r1.9 -r1.10 pkgsrc/www/squid3/Makefile
diff -r1.6 -r1.7 pkgsrc/www/squid3/distinfo
diff -r1.1 -r1.2 pkgsrc/www/squid3/patches/patch-configure
diff -r1.2 -r1.3 pkgsrc/www/squid3/patches/patch-src_Makefile.in
cvs diff -r1.9 -r1.10 pkgsrc/www/squid3/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/squid3/Attic/Makefile 2013/05/23 15:28:45 1.9
+++ pkgsrc/www/squid3/Attic/Makefile 2013/05/23 20:21:28 1.10
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.9 2013/05/23 15:28:45 tron Exp $ 1# $NetBSD: Makefile,v 1.10 2013/05/23 20:21:28 adam Exp $
2 2
3DISTNAME= squid-3.3.4 3DISTNAME= squid-3.3.5
4PKGREVISION= 1 
5CATEGORIES= www 4CATEGORIES= www
6MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ \ 5MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ \
7 ${SQUID_MASTER_SITES} 6 ${SQUID_MASTER_SITES}
8EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@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
13LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
14 13
15USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
16USE_TOOLS+= perl gmake 15USE_TOOLS+= perl gmake
17GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
cvs diff -r1.6 -r1.7 pkgsrc/www/squid3/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/www/squid3/Attic/distinfo 2013/04/27 17:51:24 1.6
+++ pkgsrc/www/squid3/Attic/distinfo 2013/05/23 20:21:28 1.7
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.6 2013/04/27 17:51:24 tron Exp $ 1$NetBSD: distinfo,v 1.7 2013/05/23 20:21:28 adam Exp $
2 2
3SHA1 (squid-3.3.4.tar.xz) = 2b9b0e91568599ded93f90dda6197aa8744fc5b5 3SHA1 (squid-3.3.5.tar.xz) = 60b1b46683cccd3d845f324dbedb9f289d375115
4RMD160 (squid-3.3.4.tar.xz) = 9a3c09867bdce77e800d247780594ccded89488a 4RMD160 (squid-3.3.5.tar.xz) = 400fe3a362a127e90ea0ece556e48ac414644f31
5Size (squid-3.3.4.tar.xz) = 2178260 bytes 5Size (squid-3.3.5.tar.xz) = 2180668 bytes
6SHA1 (patch-configure) = 8e5eb49a8d04c77f3cf9de9390a8992268421cb6 6SHA1 (patch-configure) = 86400fd701a84eb174395755eec7b13cbfce55ec
7SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289 7SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289
8SHA1 (patch-helpers_basic_auth_MSNT_Makefile.in) = 74a0379d3ec0c2601dbb62b16df889bf4edcaedf 8SHA1 (patch-helpers_basic_auth_MSNT_Makefile.in) = 74a0379d3ec0c2601dbb62b16df889bf4edcaedf
9SHA1 (patch-src_Makefile.in) = 32bc968a7680414d87acf1a4c96822a3d80c2030 9SHA1 (patch-src_Makefile.in) = 130e223568a07c474b30a8fa3678c60f8b487c3e
10SHA1 (patch-src_base_TidyPointer.h) = 93428d26bb2479fc845764a324658eaacd26588e 10SHA1 (patch-src_base_TidyPointer.h) = 93428d26bb2479fc845764a324658eaacd26588e
11SHA1 (patch-src_ip_Intercept.cc) = 8a8640d5f7eef217b2536646513eb872c67a7ffc 11SHA1 (patch-src_ip_Intercept.cc) = 8a8640d5f7eef217b2536646513eb872c67a7ffc
12SHA1 (patch-src_store.cc) = 055d98a59103b02a51876a5c8ffed9514954beb4 12SHA1 (patch-src_store.cc) = 055d98a59103b02a51876a5c8ffed9514954beb4
13SHA1 (patch-tools_Makefile.in) = 3a7678c63a11a35fabef091a3b18e63859f0796f 13SHA1 (patch-tools_Makefile.in) = 3a7678c63a11a35fabef091a3b18e63859f0796f
cvs diff -r1.1 -r1.2 pkgsrc/www/squid3/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/www/squid3/patches/Attic/patch-configure 2013/02/10 18:16:53 1.1
+++ pkgsrc/www/squid3/patches/Attic/patch-configure 2013/05/23 20:21:28 1.2
@@ -1,51 +1,51 @@ @@ -1,51 +1,51 @@
1$NetBSD: patch-configure,v 1.1 2013/02/10 18:16:53 adam Exp $ 1$NetBSD: patch-configure,v 1.2 2013/05/23 20:21:28 adam Exp $
2 2
3Compatibility problems. 3Compatibility problems.
4 4
5--- configure.orig 2013-02-09 07:30:57.000000000 +0000 5--- configure.orig 2013-05-20 11:50:55.000000000 +0000
6+++ configure 6+++ configure
7@@ -22437,7 +22437,7 @@ fi 7@@ -22798,7 +22798,7 @@ fi
8  8
9 done 9 done
10  10
11- if test "x$ac_heimdal" == "x" ; then 11- if test "x$ac_heimdal" == "x" ; then
12+ if test "x$ac_heimdal" = "x" ; then 12+ if test "x$ac_heimdal" = "x" ; then
13 for ac_header in gssapi/gssapi_generic.h 13 for ac_header in gssapi/gssapi_generic.h
14 do : 14 do :
15 ac_fn_cxx_check_header_mongrel "$LINENO" "gssapi/gssapi_generic.h" "ac_cv_header_gssapi_gssapi_generic_h" "$ac_includes_default" 15 ac_fn_cxx_check_header_mongrel "$LINENO" "gssapi/gssapi_generic.h" "ac_cv_header_gssapi_gssapi_generic_h" "$ac_includes_default"
16@@ -22634,7 +22634,7 @@ done 16@@ -22995,7 +22995,7 @@ done
17  17
18  18
19 ac_com_error_message=no 19 ac_com_error_message=no
20- if test "x$ac_cv_header_com_err_h" == "xyes" ; then 20- if test "x$ac_cv_header_com_err_h" == "xyes" ; then
21+ if test "x$ac_cv_header_com_err_h" = "xyes" ; then 21+ if test "x$ac_cv_header_com_err_h" = "xyes" ; then
22 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 22 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
23 /* end confdefs.h. */ 23 /* end confdefs.h. */
24 #include <com_err.h> 24 #include <com_err.h>
25@@ -22646,7 +22646,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>& 25@@ -23007,7 +23007,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
26 fi 26 fi
27 rm -f conftest* 27 rm -f conftest*
28  28
29- elif test "x$ac_cv_header_et_com_err_h" == "xyes" ; then 29- elif test "x$ac_cv_header_et_com_err_h" == "xyes" ; then
30+ elif test "x$ac_cv_header_et_com_err_h" = "xyes" ; then 30+ elif test "x$ac_cv_header_et_com_err_h" = "xyes" ; then
31 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 31 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
32 /* end confdefs.h. */ 32 /* end confdefs.h. */
33 #include <et/com_err.h> 33 #include <et/com_err.h>
34@@ -22707,7 +22707,7 @@ $as_echo "#define HAVE_MAX_SKEW_IN_KRB5_ 34@@ -23068,7 +23068,7 @@ $as_echo "#define HAVE_MAX_SKEW_IN_KRB5_
35  35
36 fi 36 fi
37  37
38- if test `echo $KRB5LIBS | grep -c com_err` -ne 0 -a "x$ac_com_error_message" == "xyes" ; then 38- if test `echo $KRB5LIBS | grep -c com_err` -ne 0 -a "x$ac_com_error_message" == "xyes" ; then
39+ if test `echo $KRB5LIBS | grep -c com_err` -ne 0 -a "x$ac_com_error_message" = "xyes" ; then 39+ if test `echo $KRB5LIBS | grep -c com_err` -ne 0 -a "x$ac_com_error_message" = "xyes" ; then
40 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_message in -lcom_err" >&5 40 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_message in -lcom_err" >&5
41 $as_echo_n "checking for error_message in -lcom_err... " >&6; } 41 $as_echo_n "checking for error_message in -lcom_err... " >&6; }
42 if ${ac_cv_lib_com_err_error_message+:} false; then : 42 if ${ac_cv_lib_com_err_error_message+:} false; then :
43@@ -22750,7 +22750,7 @@ $as_echo "#define HAVE_ERROR_MESSAGE 1"  43@@ -23111,7 +23111,7 @@ $as_echo "#define HAVE_ERROR_MESSAGE 1"
44  44
45 fi 45 fi
46  46
47- elif test "x$ac_com_error_message" == "xyes" ; then 47- elif test "x$ac_com_error_message" == "xyes" ; then
48+ elif test "x$ac_com_error_message" = "xyes" ; then 48+ elif test "x$ac_com_error_message" = "xyes" ; then
49 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_message in -lkrb5" >&5 49 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_message in -lkrb5" >&5
50 $as_echo_n "checking for error_message in -lkrb5... " >&6; } 50 $as_echo_n "checking for error_message in -lkrb5... " >&6; }
51 if ${ac_cv_lib_krb5_error_message+:} false; then : 51 if ${ac_cv_lib_krb5_error_message+:} false; then :
cvs diff -r1.2 -r1.3 pkgsrc/www/squid3/patches/Attic/patch-src_Makefile.in (expand / switch to unified diff)

--- pkgsrc/www/squid3/patches/Attic/patch-src_Makefile.in 2013/03/13 17:11:26 1.2
+++ pkgsrc/www/squid3/patches/Attic/patch-src_Makefile.in 2013/05/23 20:21:28 1.3
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1$NetBSD: patch-src_Makefile.in,v 1.2 2013/03/13 17:11:26 taca Exp $ 1$NetBSD: patch-src_Makefile.in,v 1.3 2013/05/23 20:21:28 adam Exp $
2 2
3Don't install squid.conf. 3Don't install squid.conf.
4 4
5--- src/Makefile.in.orig 2013-02-09 07:30:35.000000000 +0000 5--- src/Makefile.in.orig 2013-05-20 11:50:04.000000000 +0000
6+++ src/Makefile.in 6+++ src/Makefile.in
7@@ -7163,14 +7163,14 @@ info: info-recursive 7@@ -7175,14 +7175,14 @@ info: info-recursive
8  8
9 info-am: 9 info-am:
10  10
11-install-data-am: install-data-local install-dataDATA install-man 11-install-data-am: install-data-local install-dataDATA install-man
12+install-data-am: install-dataDATA install-man 12+install-data-am: install-dataDATA install-man
13  13
14 install-dvi: install-dvi-recursive 14 install-dvi: install-dvi-recursive
15  15
16 install-dvi-am: 16 install-dvi-am:
17  17
18 install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \ 18 install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \
19- install-sbinPROGRAMS install-sysconfDATA 19- install-sbinPROGRAMS install-sysconfDATA
20+ install-sbinPROGRAMS 20+ install-sbinPROGRAMS
21  21
22 install-html: install-html-recursive 22 install-html: install-html-recursive
23  23
24@@ -7283,7 +7283,7 @@ cache_cf.o: cf_parser.cci 24@@ -7295,7 +7295,7 @@ cache_cf.o: cf_parser.cci
25  25
26 # cf_gen builds the configuration files. 26 # cf_gen builds the configuration files.
27 cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) 27 cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci
28- $(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src 28- $(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
29+ $(HOSTCXX) $(CXXFLAGS) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src 29+ $(HOSTCXX) $(CXXFLAGS) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
30  30
31 # squid.conf.default is built by cf_gen when making cf_parser.cci 31 # squid.conf.default is built by cf_gen when making cf_parser.cci
32 squid.conf.default squid.conf.documented: cf_parser.cci 32 squid.conf.default squid.conf.documented: cf_parser.cci