summaryrefslogtreecommitdiff
path: root/www/squid27/patches/patch-ak
diff options
context:
space:
mode:
Diffstat (limited to 'www/squid27/patches/patch-ak')
-rw-r--r--www/squid27/patches/patch-ak10
1 files changed, 6 insertions, 4 deletions
diff --git a/www/squid27/patches/patch-ak b/www/squid27/patches/patch-ak
index b35ab5d966d..e93f08b85fd 100644
--- a/www/squid27/patches/patch-ak
+++ b/www/squid27/patches/patch-ak
@@ -1,19 +1,21 @@
-$NetBSD: patch-ak,v 1.2 2012/02/20 15:24:03 taca Exp $
+$NetBSD: patch-ak,v 1.3 2012/02/20 15:31:04 taca Exp $
* Dirty work around for some version of IP filter.
* Portability with pf(4)'s header.
--- src/client_side.c.orig 2010-02-14 00:46:25.000000000 +0000
+++ src/client_side.c
-@@ -36,6 +36,7 @@
+@@ -36,6 +36,9 @@
#include "squid.h"
#if IPF_TRANSPARENT
++#ifdef debug
+#undef debug /* XXX: IP filter may declar debug(). */
++#endif
#if HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
#endif
-@@ -79,6 +80,10 @@
+@@ -79,6 +82,10 @@
#elif HAVE_NETINET_IP_NAT_H
#include <netinet/ip_nat.h>
#endif
@@ -24,7 +26,7 @@ $NetBSD: patch-ak,v 1.2 2012/02/20 15:24:03 taca Exp $
#endif
#if PF_TRANSPARENT
-@@ -88,7 +93,12 @@
+@@ -88,7 +95,12 @@
#include <sys/fcntl.h>
#include <net/if.h>
#include <netinet/in.h>