diff options
| author | taca <taca> | 2012-02-20 15:24:03 +0000 |
|---|---|---|
| committer | taca <taca> | 2012-02-20 15:24:03 +0000 |
| commit | 79520c106f48415ce1b1e37180dd22fe966977e1 (patch) | |
| tree | b483a26ec899c464db672714cf05492ef573a946 /www | |
| parent | af54ecc0cdc378b3759bc95b084ef47d28596ea9 (diff) | |
| download | pkgsrc-79520c106f48415ce1b1e37180dd22fe966977e1.tar.gz | |
Fix build problem with squid-ipf PKG_OPTIONS with some dirty patch.
* IP Filter declar function debug(...) visible to user land.
* Squid defines is own cpp(1) macro debug() before include system's
header files.a
Build problem noted by pettai@ via private mail.
Diffstat (limited to 'www')
| -rw-r--r-- | www/squid27/distinfo | 4 | ||||
| -rw-r--r-- | www/squid27/patches/patch-ak | 28 |
2 files changed, 27 insertions, 5 deletions
diff --git a/www/squid27/distinfo b/www/squid27/distinfo index 9feb8aeff3e..0c9ab705264 100644 --- a/www/squid27/distinfo +++ b/www/squid27/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2011/11/28 15:26:26 drochner Exp $ +$NetBSD: distinfo,v 1.11 2012/02/20 15:24:03 taca Exp $ SHA1 (squid-2.7.STABLE9.tar.bz2) = bd389da9b74fd338e358f6b3f83bd3a1ed4d4f6f RMD160 (squid-2.7.STABLE9.tar.bz2) = bfa7c3dc3ede68646603f3379de35f44d7d8e97d @@ -13,6 +13,6 @@ SHA1 (patch-ag) = b375ecb8eefb4059642450fd25a0ec8e0d74efd7 SHA1 (patch-ah) = c1c22c57e5e63d0d0756202224d156e47413a4d8 SHA1 (patch-ai) = a227e6fc622f1bda3fa49406b4d588c1f1f78430 SHA1 (patch-aj) = c5c7cd10a63a5066eee63988775f71758ed5463e -SHA1 (patch-ak) = 6863cac0fe9100f4b8c3c05cb321324a4abf0a4c +SHA1 (patch-ak) = 5862e9f92a4929bc37d2fb2c75a7b6d37f5511ea SHA1 (patch-al) = a9e957a90dc6956e59668c297dd8566642baecff SHA1 (patch-am) = c31f27816578a05a909c4e64a646919d35e04c42 diff --git a/www/squid27/patches/patch-ak b/www/squid27/patches/patch-ak index 244a72d8ebc..b35ab5d966d 100644 --- a/www/squid27/patches/patch-ak +++ b/www/squid27/patches/patch-ak @@ -1,8 +1,30 @@ -$NetBSD: patch-ak,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $ +$NetBSD: patch-ak,v 1.2 2012/02/20 15:24:03 taca Exp $ ---- src/client_side.c.orig 2008-06-25 07:54:47.000000000 +0900 +* 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 -@@ -88,7 +88,12 @@ +@@ -36,6 +36,7 @@ + #include "squid.h" + + #if IPF_TRANSPARENT ++#undef debug /* XXX: IP filter may declar debug(). */ + #if HAVE_SYS_IOCTL_H + #include <sys/ioctl.h> + #endif +@@ -79,6 +80,10 @@ + #elif HAVE_NETINET_IP_NAT_H + #include <netinet/ip_nat.h> + #endif ++ ++/* stolen from defines.h */ ++#define debug(SECTION, LEVEL) \ ++ !do_debug(SECTION, LEVEL) ? (void) 0 : _db_print + #endif + + #if PF_TRANSPARENT +@@ -88,7 +93,12 @@ #include <sys/fcntl.h> #include <net/if.h> #include <netinet/in.h> |