diff options
| author | taca <taca> | 2012-02-20 15:31:04 +0000 |
|---|---|---|
| committer | taca <taca> | 2012-02-20 15:31:04 +0000 |
| commit | 7969f44b031d2299b047eee9cfa52584aa6be499 (patch) | |
| tree | d6262470c25145618acbd18d399e1f54127cf377 | |
| parent | dab26a38ad6586733e98419c7c889336c4a775dc (diff) | |
| download | pkgsrc-7969f44b031d2299b047eee9cfa52584aa6be499.tar.gz | |
Make previous patch in a little careful way.
| -rw-r--r-- | www/squid27/distinfo | 4 | ||||
| -rw-r--r-- | www/squid27/patches/patch-ak | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/www/squid27/distinfo b/www/squid27/distinfo index 0c9ab705264..e5b421c55a9 100644 --- a/www/squid27/distinfo +++ b/www/squid27/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2012/02/20 15:24:03 taca Exp $ +$NetBSD: distinfo,v 1.12 2012/02/20 15:31:04 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) = 5862e9f92a4929bc37d2fb2c75a7b6d37f5511ea +SHA1 (patch-ak) = 73cde276e08f0e1257280b4603f6bd028c9a2234 SHA1 (patch-al) = a9e957a90dc6956e59668c297dd8566642baecff SHA1 (patch-am) = c31f27816578a05a909c4e64a646919d35e04c42 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> |