diff options
| author | taca <taca@pkgsrc.org> | 2012-02-23 05:26:52 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2012-02-23 05:26:52 +0000 |
| commit | bd2645793cf4f17dbd95b372d135d5eaf1da31b0 (patch) | |
| tree | 336b240c4a3d10c431a02a25554896d8188c4edd | |
| parent | b2c7f9ed7b751536095099f0c1c4283d2a073504 (diff) | |
| download | pkgsrc-bd2645793cf4f17dbd95b372d135d5eaf1da31b0.tar.gz | |
Similar fix as squid27; build problem with squid-ipf PKG_OPTIONS on
NetBSD 6.0_BETA.
| -rw-r--r-- | www/squid31/distinfo | 3 | ||||
| -rw-r--r-- | www/squid31/patches/patch-src_ip_IpIntercept.cc | 28 |
2 files changed, 30 insertions, 1 deletions
diff --git a/www/squid31/distinfo b/www/squid31/distinfo index 39c7ddad5a8..89c3cb8dca1 100644 --- a/www/squid31/distinfo +++ b/www/squid31/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.34 2012/02/11 11:42:50 adam Exp $ +$NetBSD: distinfo,v 1.35 2012/02/23 05:26:52 taca Exp $ SHA1 (squid-3.1.19.tar.bz2) = fae2ef3d8a994297efe62d504d09e4c79b34db04 RMD160 (squid-3.1.19.tar.bz2) = 47ec0fcf230f47ebc78c61a83721aa624e507a3b @@ -9,5 +9,6 @@ SHA1 (patch-aj) = b49b2549b125ec465e414445404ac759f3e54490 SHA1 (patch-al) = 6fec093f8969aed96cb8ffb115d96f9d21ac1f63 SHA1 (patch-am) = d6d52948f883d983b114c68cffb392cb8295f847 SHA1 (patch-src_base_TidyPointer.h) = d616bc21f7ab640622b7c34cf9da8222d2ddb5cf +SHA1 (patch-src_ip_IpIntercept.cc) = 68d8add9cfde8e8770f2c75de7eb9d04708eea1f SHA1 (patch-src_ssl_gadgets.cc) = c631940ffd3fc7f44bc1586169eb4fe13a79ab35 SHA1 (patch-src_store.cc) = 0f439a4440bb501459464916e7ab39472b95f0d4 diff --git a/www/squid31/patches/patch-src_ip_IpIntercept.cc b/www/squid31/patches/patch-src_ip_IpIntercept.cc new file mode 100644 index 00000000000..a91d2404d0c --- /dev/null +++ b/www/squid31/patches/patch-src_ip_IpIntercept.cc @@ -0,0 +1,28 @@ +$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 |