| 1 |
commit: f242a6eae3c71407b2c27afba431a9877a53bc60 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 3 16:19:43 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 4 03:28:51 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f242a6ea |
| 7 |
|
| 8 |
net-proxy/squid: remove kernel_FreeBSD |
| 9 |
|
| 10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
net-proxy/squid/metadata.xml | 4 ---- |
| 14 |
net-proxy/squid/squid-4.15-r2.ebuild | 12 +----------- |
| 15 |
net-proxy/squid/squid-4.17.ebuild | 12 +----------- |
| 16 |
3 files changed, 2 insertions(+), 26 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-proxy/squid/metadata.xml b/net-proxy/squid/metadata.xml |
| 19 |
index 6252c436660b..28c43b5d5bfa 100644 |
| 20 |
--- a/net-proxy/squid/metadata.xml |
| 21 |
+++ b/net-proxy/squid/metadata.xml |
| 22 |
@@ -11,13 +11,9 @@ |
| 23 |
<flag name="esi">Enable ESI for accelerators, will cause squid reverse proxies |
| 24 |
to be capable of the Edge Acceleration Specification (www.esi.org)</flag> |
| 25 |
<flag name="htcp">Enable HTCP protocol</flag> |
| 26 |
- <flag name="ipf-transparent">Adds transparent proxy support for systems |
| 27 |
- using IP-Filter (only for *bsd)</flag> |
| 28 |
<flag name="logrotate">Use <pkg>app-admin/logrotate</pkg> for rotating |
| 29 |
logs</flag> |
| 30 |
<flag name="kqueue">Enables *BSD kqueue() support</flag> |
| 31 |
- <flag name="pf-transparent">Adds transparent proxy support for systems using |
| 32 |
- PF (only for *bsd)</flag> |
| 33 |
<flag name="qos">Adds support for Quality of Service using netfilter conntrack |
| 34 |
- see qos_flow directive for more info</flag> |
| 35 |
<flag name="ssl-crtd">Adds support for dynamic SSL certificate generation in |
| 36 |
|
| 37 |
diff --git a/net-proxy/squid/squid-4.15-r2.ebuild b/net-proxy/squid/squid-4.15-r2.ebuild |
| 38 |
index af49050da0f0..1d96fc4eb4c5 100644 |
| 39 |
--- a/net-proxy/squid/squid-4.15-r2.ebuild |
| 40 |
+++ b/net-proxy/squid/squid-4.15-r2.ebuild |
| 41 |
@@ -26,8 +26,7 @@ IUSE="caps gnutls ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux |
| 42 |
mysql postgres sqlite systemd \ |
| 43 |
perl qos tproxy \ |
| 44 |
+htcp +wccp +wccpv2 \ |
| 45 |
- pf-transparent ipf-transparent kqueue \ |
| 46 |
- kernel_linux" |
| 47 |
+ kqueue kernel_linux" |
| 48 |
|
| 49 |
RESTRICT="!test? ( test )" |
| 50 |
|
| 51 |
@@ -160,15 +159,6 @@ src_configure() { |
| 52 |
use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack" |
| 53 |
fi |
| 54 |
|
| 55 |
- if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then |
| 56 |
- transparent+=" $(use_enable kqueue)" |
| 57 |
- if use pf-transparent; then |
| 58 |
- transparent+=" --enable-pf-transparent" |
| 59 |
- elif use ipf-transparent; then |
| 60 |
- transparent+=" --enable-ipf-transparent" |
| 61 |
- fi |
| 62 |
- fi |
| 63 |
- |
| 64 |
tc-export_build_env BUILD_CXX |
| 65 |
export BUILDCXX=${BUILD_CXX} |
| 66 |
export BUILDCXXFLAGS=${BUILD_CXXFLAGS} |
| 67 |
|
| 68 |
diff --git a/net-proxy/squid/squid-4.17.ebuild b/net-proxy/squid/squid-4.17.ebuild |
| 69 |
index ab6503cc44ac..a17b50cbd03c 100644 |
| 70 |
--- a/net-proxy/squid/squid-4.17.ebuild |
| 71 |
+++ b/net-proxy/squid/squid-4.17.ebuild |
| 72 |
@@ -26,8 +26,7 @@ IUSE="caps gnutls ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux |
| 73 |
mysql postgres sqlite systemd \ |
| 74 |
perl qos tproxy \ |
| 75 |
+htcp +wccp +wccpv2 \ |
| 76 |
- pf-transparent ipf-transparent kqueue \ |
| 77 |
- kernel_linux" |
| 78 |
+ kqueue kernel_linux" |
| 79 |
|
| 80 |
RESTRICT="!test? ( test )" |
| 81 |
|
| 82 |
@@ -160,15 +159,6 @@ src_configure() { |
| 83 |
use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack" |
| 84 |
fi |
| 85 |
|
| 86 |
- if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then |
| 87 |
- transparent+=" $(use_enable kqueue)" |
| 88 |
- if use pf-transparent; then |
| 89 |
- transparent+=" --enable-pf-transparent" |
| 90 |
- elif use ipf-transparent; then |
| 91 |
- transparent+=" --enable-ipf-transparent" |
| 92 |
- fi |
| 93 |
- fi |
| 94 |
- |
| 95 |
tc-export_build_env BUILD_CXX |
| 96 |
export BUILDCXX=${BUILD_CXX} |
| 97 |
export BUILDCXXFLAGS=${BUILD_CXXFLAGS} |
Archives