[patch] squid-pf-patch.diff

squid-pf-patch.diff (text/plain), 2.89 KB, created by Javier Villavicencio (RETIRED) on 2006-05-29 14:14:12 UTC

--- squid-2.5.13.ebuild.orig	2006-05-29 18:18:17.110177336 -0300
+++ squid-2.5.13.ebuild	2006-05-29 18:10:09.420643640 -0300
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.5.13.ebuild,v 1.6 2006/05/25 16:03:49 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.5.13.ebuild,v 1.1 2006/03/25 08:39:31 mrness Exp $
 
 inherit eutils pam toolchain-funcs flag-o-matic
 
@@ -18,15 +18,17 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="pam ldap ssl sasl snmp debug selinux underscores logrotate customlog zero-penalty-hit follow-xff"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="pam ldap ssl sasl snmp debug selinux underscores logrotate customlog zero-penalty-hit follow-xff pf ipfilter"
 
 RDEPEND="pam? ( virtual/pam )
 	ldap? ( >=net-nds/openldap-2.1.26 )
 	ssl? ( >=dev-libs/openssl-0.9.6m )
 	sasl? ( >=dev-libs/cyrus-sasl-1.5.27 )
 	selinux? ( sec-policy/selinux-squid )
-	!mips? ( logrotate? ( app-admin/logrotate ) )"
+	!mips? ( logrotate? ( app-admin/logrotate ) )
+	!kernel_linux? ( kernel_freebsd? ( pf? ( sys-freebsd/freebsd-pf ) ) )"
+
 DEPEND="${RDEPEND} dev-lang/perl"
 
 S="${WORKDIR}/${S_PP}"
@@ -67,12 +69,19 @@
 	if use elibc_uclibc; then
 		local basic_modules="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM,winbind"
 	else
-		local basic_modules="getpwnam,YP,NCSA,SMB,MSNT,multi-domain-NTLM,winbind"
+		local basic_modules="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM,winbind"
 	fi
 
 	use ldap && basic_modules="LDAP,${basic_modules}"
 	use pam && basic_modules="PAM,${basic_modules}"
 	use sasl && basic_modules="SASL,${basic_modules}"
+	if use kernel_linux; then
+		basic_modules="YP,${basic_modules}"
+	elif use kernel_freebsd && built_with_use sys-freebsd/freebsd-lib nis; then
+		basic_modules="YP,${basic_modules}"
+	elif use kernel_openbsd && built_with_use sys-openbsd/openbsd-lib nis; then
+		basic_modules="YP,${basic_modules}"
+	fi
 	# SASL 1 / 2 Supported Natively
 
 	local ext_helpers="ip_user,unix_group,wbinfo_group,winbind_group"
@@ -96,7 +105,17 @@
 		myconf="${myconf} --enable-storeio='ufs,diskd,coss,aufs,null' "
 		myconf="${myconf} --enable-async-io "
 	fi
-
+	
+	# Support for BSD transparent proxying.
+	if use kernel_linux; then
+		myconf="${myconf} --enable-linux-netfilter"
+	else
+		if use pf; then
+			myconf="${myconf} --enable-pf-transparent"
+		elif use ipfilter; then
+			myconf="${myconf} --enable-ipf-transparent"
+		fi
+	fi
 	export CC=$(tc-getCC)
 
 	./configure \
@@ -114,7 +133,6 @@
 		--enable-basic-auth-helpers="${basic_modules}" \
 		--enable-external-acl-helpers="${ext_helpers}" \
 		--enable-ntlm-auth-helpers="SMB,fakeauth,no_check,winbind" \
-		--enable-linux-netfilter \
 		--enable-ident-lookups \
 		--enable-useragent-log \
 		--enable-cache-digests \