diff options
| author | joerg <joerg> | 2012-11-19 03:02:50 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2012-11-19 03:02:50 +0000 |
| commit | a571d2faf686ed4004f034af1e59d56f4ef5ed97 (patch) | |
| tree | 090ac3618e34e55283770857baf7572915a88e03 /www/squid27 | |
| parent | 6d4d62a0a262b8e1968f477ef5f6e68e3bd260a0 (diff) | |
| download | pkgsrc-a571d2faf686ed4004f034af1e59d56f4ef5ed97.tar.gz | |
Undef m_len defined by netinet/ip_compat.h on NetBSD to unbreak build.
Diffstat (limited to 'www/squid27')
| -rw-r--r-- | www/squid27/distinfo | 4 | ||||
| -rw-r--r-- | www/squid27/patches/patch-ak | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/www/squid27/distinfo b/www/squid27/distinfo index e5b421c55a9..bf9f371ad42 100644 --- a/www/squid27/distinfo +++ b/www/squid27/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2012/02/20 15:31:04 taca Exp $ +$NetBSD: distinfo,v 1.13 2012/11/19 03:02:50 joerg 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) = 73cde276e08f0e1257280b4603f6bd028c9a2234 +SHA1 (patch-ak) = 64c858cc1167ad4a62ed20948ce1c1d844ecae22 SHA1 (patch-al) = a9e957a90dc6956e59668c297dd8566642baecff SHA1 (patch-am) = c31f27816578a05a909c4e64a646919d35e04c42 diff --git a/www/squid27/patches/patch-ak b/www/squid27/patches/patch-ak index e93f08b85fd..c4dc705dcd6 100644 --- a/www/squid27/patches/patch-ak +++ b/www/squid27/patches/patch-ak @@ -1,4 +1,4 @@ -$NetBSD: patch-ak,v 1.3 2012/02/20 15:31:04 taca Exp $ +$NetBSD: patch-ak,v 1.4 2012/11/19 03:02:50 joerg Exp $ * Dirty work around for some version of IP filter. * Portability with pf(4)'s header. @@ -15,18 +15,20 @@ $NetBSD: patch-ak,v 1.3 2012/02/20 15:31:04 taca Exp $ #if HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif -@@ -79,6 +82,10 @@ +@@ -79,6 +82,12 @@ #elif HAVE_NETINET_IP_NAT_H #include <netinet/ip_nat.h> #endif + ++#undef m_len ++ +/* stolen from defines.h */ +#define debug(SECTION, LEVEL) \ + !do_debug(SECTION, LEVEL) ? (void) 0 : _db_print #endif #if PF_TRANSPARENT -@@ -88,7 +95,12 @@ +@@ -88,7 +97,12 @@ #include <sys/fcntl.h> #include <net/if.h> #include <netinet/in.h> |