Pullup ticket #4623 - requested by taca

www/squid3: security update

Revisions pulled up:
- www/squid3/Makefile                                           patch
- www/squid3/distinfo                                           patch
- www/squid3/patches/patch-compat_compat.h                      new file
- www/squid3/patches/patch-src_ip_Intercept.cc                  patch

---
Apply patch:
- Fix buidling when IPF is turned on
- Update to version 3.4.12

4 files changed, 22 insertions, 35 deletions

diff --git a/www/squid3/Makefile b/www/squid3/Makefile
index 46a8171c133..7f02161d16a 100644
--- a/www/squid3/Makefile
+++ b/www/squid3/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.39 2014/12/10 10:18:36 adam Exp $
+# $NetBSD: Makefile,v 1.39.2.1 2015/02/21 12:53:08 tron Exp $
 
-DISTNAME=	squid-3.4.10
+DISTNAME=	squid-3.4.12
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ \
 		ftp://ftp.squid-cache.org/pub/squid/ \
diff --git a/www/squid3/distinfo b/www/squid3/distinfo
index efcb771bfbe..827125faeb1 100644
--- a/www/squid3/distinfo
+++ b/www/squid3/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.26 2014/12/10 10:18:36 adam Exp $
+$NetBSD: distinfo,v 1.26.2.1 2015/02/21 12:53:08 tron Exp $
 
-SHA1 (squid-3.4.10.tar.xz) = 52fb374fd6293978f8002ae994353fbe75d28a98
-RMD160 (squid-3.4.10.tar.xz) = c021ecc35484ce042a7c480efa4fd1cc7ab99286
-Size (squid-3.4.10.tar.xz) = 2161192 bytes
+SHA1 (squid-3.4.12.tar.xz) = 545788ba781eb95d9111e233cee668b754081ccc
+RMD160 (squid-3.4.12.tar.xz) = 9a29c28722b42543ca7e03003cd3ebdb1a9d30a9
+Size (squid-3.4.12.tar.xz) = 2162096 bytes
+SHA1 (patch-compat_compat.h) = e2e0d16d5280d31ef342c58c1514f0b4bb6116d2
 SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289
 SHA1 (patch-helpers_basic_auth_MSNT_Makefile.in) = 74a0379d3ec0c2601dbb62b16df889bf4edcaedf
 SHA1 (patch-src_Makefile.in) = 130e223568a07c474b30a8fa3678c60f8b487c3e
 SHA1 (patch-src_SquidNew.cc) = eef6e72e168cf7f40518fab13dc2f55ed0268db9
 SHA1 (patch-src_base_TidyPointer.h) = 93428d26bb2479fc845764a324658eaacd26588e
-SHA1 (patch-src_ip_Intercept.cc) = 8a8640d5f7eef217b2536646513eb872c67a7ffc
 SHA1 (patch-src_store.cc) = 055d98a59103b02a51876a5c8ffed9514954beb4
 SHA1 (patch-tools_Makefile.in) = 3a7678c63a11a35fabef091a3b18e63859f0796f
diff --git a/www/squid3/patches/patch-compat_compat.h b/www/squid3/patches/patch-compat_compat.h
new file mode 100644
index 00000000000..76478894e01
--- /dev/null
+++ b/www/squid3/patches/patch-compat_compat.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-compat_compat.h,v 1.1.2.2 2015/02/21 12:53:08 tron Exp $
+
+Fix building.
+
+--- compat/compat.h.orig	2015-02-18 11:05:44.000000000 +0000
++++ compat/compat.h
+@@ -38,7 +38,7 @@
+  * We must pre-define before doing anything with OS headers so the OS
+  * do not. Then un-define it before using the IPFilter *_compat.h headers.
+  */
+-#if IPF_TRANSPARENT && USE_SOLARIS_IPFILTER_MINOR_T_HACK
++#if IPF_TRANSPARENT && defined(USE_SOLARIS_IPFILTER_MINOR_T_HACK)
+ /* But we only need do this nasty thing for src/ip/Intercept.cc */
+ #if BUILDING_SQUID_IP_INTERCEPT_CC
+ #define minor_t solaris_minor_t_fubar
diff --git a/www/squid3/patches/patch-src_ip_Intercept.cc b/www/squid3/patches/patch-src_ip_Intercept.cc
index 8439ab8ab4f..e69de29bb2d 100644
--- a/www/squid3/patches/patch-src_ip_Intercept.cc
+++ b/www/squid3/patches/patch-src_ip_Intercept.cc
@@ -1,28 +0,0 @@
-$NetBSD: patch-src_ip_Intercept.cc,v 1.2 2013/04/27 17:51:24 tron Exp $
-
-Avoid conflict with IP Fitler's debug().
-
---- src/ip/Intercept.cc.orig	2013-04-27 04:34:48.000000000 +0100
-+++ src/ip/Intercept.cc	2013-04-27 18:40:24.000000000 +0100
-@@ -38,6 +38,10 @@
- 
- #if IPF_TRANSPARENT
- 
-+#ifdef debug
-+#undef debug			// XXX: IP Filter might declare debug().
-+#endif
-+
- #if HAVE_SYS_IOCTL_H
- #include <sys/ioctl.h>
- #endif
-@@ -75,6 +79,10 @@
- #include <errno.h>
- #endif
- 
-+// Stolen from src/defines.h
-+#define debug(SECTION, LEVEL) \
-+        do_debug(SECTION, LEVEL) ? (void) 0 : _db_print
-+
- #endif /* IPF_TRANSPARENT required headers */
- 
- #if PF_TRANSPARENT