diff options
author | tron <tron@pkgsrc.org> | 2015-02-21 12:53:08 +0000 |
---|---|---|
committer | tron <tron@pkgsrc.org> | 2015-02-21 12:53:08 +0000 |
commit | 55d0b8666212fe3bf2132b63178b212e58b36afb (patch) | |
tree | 19f82e38a391748398df4a78ab57896ef541fe2f /www/squid3/patches/patch-src_ip_Intercept.cc | |
parent | 73b973bd4f04766627b7de6a62d0e9ae20981b0e (diff) | |
download | pkgsrc-55d0b8666212fe3bf2132b63178b212e58b36afb.tar.gz |
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
Diffstat (limited to 'www/squid3/patches/patch-src_ip_Intercept.cc')
-rw-r--r-- | www/squid3/patches/patch-src_ip_Intercept.cc | 28 |
1 files changed, 0 insertions, 28 deletions
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 |