Thu Feb 23 05:26:52 2012 UTC ()
Similar fix as squid27; build problem with squid-ipf PKG_OPTIONS on
NetBSD 6.0_BETA.


(taca)
diff -r1.34 -r1.35 pkgsrc/www/squid31/distinfo
diff -r0 -r1.1 pkgsrc/www/squid31/patches/patch-src_ip_IpIntercept.cc
cvs diff -r1.34 -r1.35 pkgsrc/www/squid31/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/www/squid31/Attic/distinfo 2012/02/11 11:42:50 1.34
+++ pkgsrc/www/squid31/Attic/distinfo 2012/02/23 05:26:52 1.35
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: distinfo,v 1.34 2012/02/11 11:42:50 adam Exp $ 1$NetBSD: distinfo,v 1.35 2012/02/23 05:26:52 taca Exp $
2 2
3SHA1 (squid-3.1.19.tar.bz2) = fae2ef3d8a994297efe62d504d09e4c79b34db04 3SHA1 (squid-3.1.19.tar.bz2) = fae2ef3d8a994297efe62d504d09e4c79b34db04
4RMD160 (squid-3.1.19.tar.bz2) = 47ec0fcf230f47ebc78c61a83721aa624e507a3b 4RMD160 (squid-3.1.19.tar.bz2) = 47ec0fcf230f47ebc78c61a83721aa624e507a3b
5Size (squid-3.1.19.tar.bz2) = 2509837 bytes 5Size (squid-3.1.19.tar.bz2) = 2509837 bytes
6SHA1 (patch-ad) = 2e8c05f220374240e5681efdd46379851c6bb50e 6SHA1 (patch-ad) = 2e8c05f220374240e5681efdd46379851c6bb50e
7SHA1 (patch-ae) = 944c24b28cf11f7a876150f8f0e131af5f3e354d 7SHA1 (patch-ae) = 944c24b28cf11f7a876150f8f0e131af5f3e354d
8SHA1 (patch-aj) = b49b2549b125ec465e414445404ac759f3e54490 8SHA1 (patch-aj) = b49b2549b125ec465e414445404ac759f3e54490
9SHA1 (patch-al) = 6fec093f8969aed96cb8ffb115d96f9d21ac1f63 9SHA1 (patch-al) = 6fec093f8969aed96cb8ffb115d96f9d21ac1f63
10SHA1 (patch-am) = d6d52948f883d983b114c68cffb392cb8295f847 10SHA1 (patch-am) = d6d52948f883d983b114c68cffb392cb8295f847
11SHA1 (patch-src_base_TidyPointer.h) = d616bc21f7ab640622b7c34cf9da8222d2ddb5cf 11SHA1 (patch-src_base_TidyPointer.h) = d616bc21f7ab640622b7c34cf9da8222d2ddb5cf
 12SHA1 (patch-src_ip_IpIntercept.cc) = 68d8add9cfde8e8770f2c75de7eb9d04708eea1f
12SHA1 (patch-src_ssl_gadgets.cc) = c631940ffd3fc7f44bc1586169eb4fe13a79ab35 13SHA1 (patch-src_ssl_gadgets.cc) = c631940ffd3fc7f44bc1586169eb4fe13a79ab35
13SHA1 (patch-src_store.cc) = 0f439a4440bb501459464916e7ab39472b95f0d4 14SHA1 (patch-src_store.cc) = 0f439a4440bb501459464916e7ab39472b95f0d4
File Added: pkgsrc/www/squid31/patches/Attic/patch-src_ip_IpIntercept.cc
$NetBSD: patch-src_ip_IpIntercept.cc,v 1.1 2012/02/23 05:26:52 taca Exp $

Avoid conflict with IP Fitler's debug().

--- src/ip/IpIntercept.cc.orig	2012-02-05 11:51:32.000000000 +0000
+++ src/ip/IpIntercept.cc
@@ -36,6 +36,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
@@ -70,6 +74,10 @@
 #include <netinet/ip_nat.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