diff options
Diffstat (limited to 'www/squid/patches')
-rw-r--r-- | www/squid/patches/patch-ag | 21 | ||||
-rw-r--r-- | www/squid/patches/patch-at | 17 | ||||
-rw-r--r-- | www/squid/patches/patch-bc | 11 |
3 files changed, 39 insertions, 10 deletions
diff --git a/www/squid/patches/patch-ag b/www/squid/patches/patch-ag index cf5778e32f7..eb380fddd18 100644 --- a/www/squid/patches/patch-ag +++ b/www/squid/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.25 2006/11/09 15:16:21 taca Exp $ +$NetBSD: patch-ag,v 1.25.2.1 2007/03/22 08:36:18 ghen Exp $ ---- configure.orig 2006-11-03 22:20:14.000000000 +0900 +--- configure.orig 2007-01-24 02:07:43.000000000 +0000 +++ configure -@@ -7321,6 +7321,7 @@ for ac_header in sys/types.h \ +@@ -7323,6 +7323,7 @@ for ac_header in sys/types.h \ linux/netfilter_ipv4.h \ linux/netfilter_ipv4/ip_tproxy.h \ malloc.h \ @@ -10,7 +10,7 @@ $NetBSD: patch-ag,v 1.25 2006/11/09 15:16:21 taca Exp $ math.h \ memory.h \ mount.h \ -@@ -13789,9 +13790,9 @@ _ACEOF +@@ -13791,9 +13792,9 @@ _ACEOF fi @@ -23,7 +23,7 @@ $NetBSD: patch-ag,v 1.25 2006/11/09 15:16:21 taca Exp $ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -@@ -13820,26 +13821,63 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -13822,26 +13823,63 @@ cat >>conftest.$ac_ext <<_ACEOF #include <sys/bitypes.h> #endif @@ -100,7 +100,7 @@ $NetBSD: patch-ag,v 1.25 2006/11/09 15:16:21 taca Exp $ echo "$as_me:$LINENO: checking size of off_t" >&5 echo $ECHO_N "checking size of off_t... $ECHO_C" >&6 -@@ -15807,8 +15845,8 @@ if test "$GCC" = "yes"; then +@@ -15809,8 +15847,8 @@ if test "$GCC" = "yes"; then GCCVER=`$CC -v 2>&1 | awk '$2 == "version" {print $3}'` case "$GCCVER" in 2.95.[123]) @@ -111,3 +111,12 @@ $NetBSD: patch-ag,v 1.25 2006/11/09 15:16:21 taca Exp $ ;; esac fi +@@ -16743,7 +16781,7 @@ if test "$PF_TRANSPARENT" ; then + echo "$as_me:$LINENO: checking if PF header file is installed" >&5 + echo $ECHO_N "checking if PF header file is installed... $ECHO_C" >&6 + # hold on to your hats... +- if test "$ac_cv_header_net_pfvar_h" = "yes"; then ++ if test "$ac_cv_header_net_pfvar_h" = "yes" || test -f /usr/include/net/pf/pfvar.h; then + PF_TRANSPARENT="yes" + + cat >>confdefs.h <<\_ACEOF diff --git a/www/squid/patches/patch-at b/www/squid/patches/patch-at new file mode 100644 index 00000000000..f01874c8242 --- /dev/null +++ b/www/squid/patches/patch-at @@ -0,0 +1,17 @@ +$NetBSD: patch-at,v 1.1.2.2 2007/03/22 08:36:19 ghen Exp $ + +--- src/client_side.c.orig 2007-02-06 20:17:33.000000000 +0000 ++++ src/client_side.c +@@ -88,8 +88,12 @@ + #include <sys/fcntl.h> + #include <net/if.h> + #include <netinet/in.h> ++#ifdef __DragonFly__ ++#include <net/pf/pfvar.h> ++#else + #include <net/pfvar.h> + #endif ++#endif + + #if LINUX_NETFILTER + #include <linux/netfilter_ipv4.h> diff --git a/www/squid/patches/patch-bc b/www/squid/patches/patch-bc index 472f5f423c7..8e889fcb3d1 100644 --- a/www/squid/patches/patch-bc +++ b/www/squid/patches/patch-bc @@ -1,18 +1,21 @@ -$NetBSD: patch-bc,v 1.2 2006/09/13 14:41:58 taca Exp $ +$NetBSD: patch-bc,v 1.2.4.1 2007/03/22 08:36:19 ghen Exp $ ---- include/ntlmauth.h.orig 2005-05-18 01:56:35.000000000 +0900 +--- include/ntlmauth.h.orig 2007-03-13 11:12:39.000000000 +0900 +++ include/ntlmauth.h -@@ -70,10 +70,14 @@ +@@ -70,6 +70,9 @@ #define bswap16(x) bswap_16(x) #define bswap32(x) bswap_32(x) #else /* HAVE_BISTWAP_H */ +#ifdef HAVE_MACHINE_BYTE_SWAP_H +#include <machine/byte_swap.h> +#else /* HAVE_MACHINE_BYTE_SWAP_H */ + #ifndef bswap16 #define bswap16(x) (((((u_int16_t)x) >> 8) & 0xff) | ((((u_int16_t)x) & 0xff) << 8)) - #define bswap32(x) \ + #endif +@@ -78,6 +81,7 @@ (((((u_int32_t)x) & 0xff000000) >> 24) | ((((u_int32_t)x) & 0x00ff0000) >> 8) | \ ((((u_int32_t)x) & 0x0000ff00) << 8) | ((((u_int32_t)x) & 0x000000ff) << 24)) + #endif +#endif /* HAVE_MACHINE_BYTE_SWAP_H */ #endif /* HAVE_BITSWAP_H */ |