commit: f242a6eae3c71407b2c27afba431a9877a53bc60
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 3 16:19:43 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 4 03:28:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f242a6ea
net-proxy/squid: remove kernel_FreeBSD
Signed-off-by: David Seifert <soap <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-proxy/squid/metadata.xml | 4 ----
net-proxy/squid/squid-4.15-r2.ebuild | 12 +-----------
net-proxy/squid/squid-4.17.ebuild | 12 +-----------
3 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/net-proxy/squid/metadata.xml b/net-proxy/squid/metadata.xml
index 6252c436660b..28c43b5d5bfa 100644
--- a/net-proxy/squid/metadata.xml
+++ b/net-proxy/squid/metadata.xml
@@ -11,13 +11,9 @@
<flag name="esi">Enable ESI for accelerators, will cause squid reverse
proxies
to be capable of the Edge Acceleration Specification (www.esi.org)</flag>
<flag name="htcp">Enable HTCP protocol</flag>
- <flag name="ipf-transparent">Adds transparent proxy support for systems
- using IP-Filter (only for *bsd)</flag>
<flag name="logrotate">Use <pkg>app-admin/logrotate</pkg> for rotating
logs</flag>
<flag name="kqueue">Enables *BSD kqueue() support</flag>
- <flag name="pf-transparent">Adds transparent proxy support for systems
using
- PF (only for *bsd)</flag>
<flag name="qos">Adds support for Quality of Service using netfilter
conntrack
- see qos_flow directive for more info</flag>
<flag name="ssl-crtd">Adds support for dynamic SSL certificate generation
in
diff --git a/net-proxy/squid/squid-4.15-r2.ebuild
b/net-proxy/squid/squid-4.15-r2.ebuild
index af49050da0f0..1d96fc4eb4c5 100644
--- a/net-proxy/squid/squid-4.15-r2.ebuild
+++ b/net-proxy/squid/squid-4.15-r2.ebuild
@@ -26,8 +26,7 @@ IUSE="caps gnutls ipv6 pam ldap samba sasl kerberos nis
radius ssl snmp selinux
mysql postgres sqlite systemd \
perl qos tproxy \
+htcp +wccp +wccpv2 \
- pf-transparent ipf-transparent kqueue \
- kernel_linux"
+ kqueue kernel_linux"
RESTRICT="!test? ( test )"
@@ -160,15 +159,6 @@ src_configure() {
use qos && transparent+=" --enable-zph-qos
--with-netfilter-conntrack"
fi
- if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
- transparent+=" $(use_enable kqueue)"
- if use pf-transparent; then
- transparent+=" --enable-pf-transparent"
- elif use ipf-transparent; then
- transparent+=" --enable-ipf-transparent"
- fi
- fi
-
tc-export_build_env BUILD_CXX
export BUILDCXX=${BUILD_CXX}
export BUILDCXXFLAGS=${BUILD_CXXFLAGS}
diff --git a/net-proxy/squid/squid-4.17.ebuild
b/net-proxy/squid/squid-4.17.ebuild
index ab6503cc44ac..a17b50cbd03c 100644
--- a/net-proxy/squid/squid-4.17.ebuild
+++ b/net-proxy/squid/squid-4.17.ebuild
@@ -26,8 +26,7 @@ IUSE="caps gnutls ipv6 pam ldap samba sasl kerberos nis
radius ssl snmp selinux
mysql postgres sqlite systemd \
perl qos tproxy \
+htcp +wccp +wccpv2 \
- pf-transparent ipf-transparent kqueue \
- kernel_linux"
+ kqueue kernel_linux"
RESTRICT="!test? ( test )"
@@ -160,15 +159,6 @@ src_configure() {
use qos && transparent+=" --enable-zph-qos
--with-netfilter-conntrack"
fi
- if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
- transparent+=" $(use_enable kqueue)"
- if use pf-transparent; then
- transparent+=" --enable-pf-transparent"
- elif use ipf-transparent; then
- transparent+=" --enable-ipf-transparent"
- fi
- fi
-
tc-export_build_env BUILD_CXX
export BUILDCXX=${BUILD_CXX}
export BUILDCXXFLAGS=${BUILD_CXXFLAGS}
