Fri Jan 16 11:41:11 2015 UTC ()
Changes 3.4.11:
* cachemgr.cgi: memory leak in request parser
* Fix typo on commStartSslClose
* Fix SQUID_CC_REQUIRE_ARGUMENT autoconf macro
* Bug 3760: squidclient ignores --disable-ipv6
* Bug 3664: ssl_crtd fails to build on OpenSolaris/OpenIndiana/Solaris 11
* Bug 3754: configure doesnt detect IPFilter 5.1.2 system headers
* Bug 4164: SEGFAULT when %W formating code used in errorpages
* Deleting first fs left psstate->servers pointing to uninitialized memory
* Maintenance: check release notes on packaging
* Bug 4057: Avoid on-exit crashes when adaptation is enabled.


(adam)
diff -r1.39 -r1.40 pkgsrc/www/squid3/Makefile
diff -r1.26 -r1.27 pkgsrc/www/squid3/distinfo
diff -r1.2 -r1.3 pkgsrc/www/squid3/patches/patch-src_ip_Intercept.cc
cvs diff -r1.39 -r1.40 pkgsrc/www/squid3/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/squid3/Attic/Makefile 2014/12/10 10:18:36 1.39
+++ pkgsrc/www/squid3/Attic/Makefile 2015/01/16 11:41:11 1.40
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.39 2014/12/10 10:18:36 adam Exp $ 1# $NetBSD: Makefile,v 1.40 2015/01/16 11:41:11 adam Exp $
2 2
3DISTNAME= squid-3.4.10 3DISTNAME= squid-3.4.11
4CATEGORIES= www 4CATEGORIES= www
5MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ \ 5MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ \
6 ftp://ftp.squid-cache.org/pub/squid/ \ 6 ftp://ftp.squid-cache.org/pub/squid/ \
7 http://ftp.nluug.nl/internet/squid/ 7 http://ftp.nluug.nl/internet/squid/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.squid-cache.org/ 11HOMEPAGE= http://www.squid-cache.org/
12COMMENT= Post-Harvest_cached WWW proxy cache and accelerator 12COMMENT= Post-Harvest_cached WWW proxy cache and accelerator
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16USE_TOOLS+= perl:run gmake 16USE_TOOLS+= perl:run gmake
cvs diff -r1.26 -r1.27 pkgsrc/www/squid3/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/www/squid3/Attic/distinfo 2014/12/10 10:18:36 1.26
+++ pkgsrc/www/squid3/Attic/distinfo 2015/01/16 11:41:11 1.27
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.26 2014/12/10 10:18:36 adam Exp $ 1$NetBSD: distinfo,v 1.27 2015/01/16 11:41:11 adam Exp $
2 2
3SHA1 (squid-3.4.10.tar.xz) = 52fb374fd6293978f8002ae994353fbe75d28a98 3SHA1 (squid-3.4.11.tar.xz) = 7de0949714cda4d3f19073aa846f00768a6f841b
4RMD160 (squid-3.4.10.tar.xz) = c021ecc35484ce042a7c480efa4fd1cc7ab99286 4RMD160 (squid-3.4.11.tar.xz) = f8d643d4cecdee382d90152afd50cf0db121328c
5Size (squid-3.4.10.tar.xz) = 2161192 bytes 5Size (squid-3.4.11.tar.xz) = 2162148 bytes
6SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289 6SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289
7SHA1 (patch-helpers_basic_auth_MSNT_Makefile.in) = 74a0379d3ec0c2601dbb62b16df889bf4edcaedf 7SHA1 (patch-helpers_basic_auth_MSNT_Makefile.in) = 74a0379d3ec0c2601dbb62b16df889bf4edcaedf
8SHA1 (patch-src_Makefile.in) = 130e223568a07c474b30a8fa3678c60f8b487c3e 8SHA1 (patch-src_Makefile.in) = 130e223568a07c474b30a8fa3678c60f8b487c3e
9SHA1 (patch-src_SquidNew.cc) = eef6e72e168cf7f40518fab13dc2f55ed0268db9 9SHA1 (patch-src_SquidNew.cc) = eef6e72e168cf7f40518fab13dc2f55ed0268db9
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) = 75dcd6ffc36ab7cd165469fe5f679ce56187cf4f
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.2 -r1.3 pkgsrc/www/squid3/patches/Attic/patch-src_ip_Intercept.cc (expand / switch to unified diff)

--- pkgsrc/www/squid3/patches/Attic/patch-src_ip_Intercept.cc 2013/04/27 17:51:24 1.2
+++ pkgsrc/www/squid3/patches/Attic/patch-src_ip_Intercept.cc 2015/01/16 11:41:11 1.3
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1$NetBSD: patch-src_ip_Intercept.cc,v 1.2 2013/04/27 17:51:24 tron Exp $ 1$NetBSD: patch-src_ip_Intercept.cc,v 1.3 2015/01/16 11:41:11 adam Exp $
2 2
3Avoid conflict with IP Fitler's debug(). 3Avoid conflict with IP Fitler's debug().
4 4
5--- src/ip/Intercept.cc.orig 2013-04-27 04:34:48.000000000 +0100 5--- src/ip/Intercept.cc.orig 2015-01-13 11:53:17.000000000 +0000
6+++ src/ip/Intercept.cc 2013-04-27 18:40:24.000000000 +0100 6+++ src/ip/Intercept.cc
7@@ -38,6 +38,10 @@ 7@@ -42,6 +42,10 @@
8  8
9 #if IPF_TRANSPARENT 9 #if IPF_TRANSPARENT
10  10
11+#ifdef debug 11+#ifdef debug
12+#undef debug // XXX: IP Filter might declare debug(). 12+#undef debug // XXX: IP Filter might declare debug().
13+#endif 13+#endif
14+ 14+
15 #if HAVE_SYS_IOCTL_H 15 #if !defined(IPFILTER_VERSION)
16 #include <sys/ioctl.h> 16 #define IPFILTER_VERSION 5000004
17 #endif 17 #endif
18@@ -75,6 +79,10 @@ 18@@ -92,6 +96,10 @@
19 #include <errno.h> 19 #include <errno.h>
20 #endif 20 #endif
21  21
22+// Stolen from src/defines.h 22+// Stolen from src/defines.h
23+#define debug(SECTION, LEVEL) \ 23+#define debug(SECTION, LEVEL) \
24+ do_debug(SECTION, LEVEL) ? (void) 0 : _db_print 24+ do_debug(SECTION, LEVEL) ? (void) 0 : _db_print
25+ 25+
26 #endif /* IPF_TRANSPARENT required headers */ 26 #endif /* IPF_TRANSPARENT required headers */
27  27
28 #if PF_TRANSPARENT 28 #if PF_TRANSPARENT