From 639e24094d8d9528567a5ab9bc21949643f205a9 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Tue, 6 Feb 2007 20:22:14 +0000
Subject: Allow transparent proxy support for PF on DragonFly.

---
 www/squid/distinfo         |  3 ++-
 www/squid/options.mk       |  4 ++--
 www/squid/patches/patch-at | 17 +++++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 www/squid/patches/patch-at

(limited to 'www/squid')

diff --git a/www/squid/distinfo b/www/squid/distinfo
index 1252b296585..3efd06625bd 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.126 2007/01/28 05:39:23 taca Exp $
+$NetBSD: distinfo,v 1.127 2007/02/06 20:22:14 joerg Exp $
 
 SHA1 (squid-2.6.STABLE9.tar.bz2) = d3ada8a02b2a9fe5bf50c4caa33e2f051262fa7d
 RMD160 (squid-2.6.STABLE9.tar.bz2) = 3e591107daf6d6f0dd32a2909c598b41f2e5e89f
@@ -17,5 +17,6 @@ SHA1 (patch-an) = 32aa94784f7f6e30d820ed56fc3725eae2a8856e
 SHA1 (patch-ap) = bf2223ea0ab660b2fdb6043845cedac5907bd1f0
 SHA1 (patch-ar) = a80477b24d02688f1f55ba1d4967bf340b5c04cb
 SHA1 (patch-as) = 87cfb6190bbdaa17ffbe3a877cf6f67fde3af1f1
+SHA1 (patch-at) = 9b0860543e3a122afdd21ff75ca7e22b2aa64458
 SHA1 (patch-bb) = 6711186c3e3e7992f9874eb47df7c0d3690649c2
 SHA1 (patch-bc) = 87d67c6d00c0734eebc1d7c6a9bcd1e3331400d9
diff --git a/www/squid/options.mk b/www/squid/options.mk
index 5b06bc7459f..afa4144c336 100644
--- a/www/squid/options.mk
+++ b/www/squid/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2006/12/04 21:50:54 jdolecek Exp $
+# $NetBSD: options.mk,v 1.11 2007/02/06 20:22:15 joerg Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.squid
 PKG_SUPPORTED_OPTIONS=	aufs carp icmp pam-helper snmp ssl unlinkd
@@ -16,7 +16,7 @@ PKG_SUPPORTED_OPTIONS+=	linux-netfilter
 PKG_SUPPORTED_OPTIONS+=	ipf-transparent
 .endif
 
-.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
+.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "DragonFly"
 PKG_SUPPORTED_OPTIONS+=	pf-transparent
 .endif
 
diff --git a/www/squid/patches/patch-at b/www/squid/patches/patch-at
new file mode 100644
index 00000000000..ba1c6609987
--- /dev/null
+++ b/www/squid/patches/patch-at
@@ -0,0 +1,17 @@
+$NetBSD: patch-at,v 1.1 2007/02/06 20:22:15 joerg 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>
-- 
cgit v1.2.3