From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 11 Apr 2008 02:17:14 +0000 (+1200)
Subject: Restore old tproxy enabling back to original option name.
X-Git-Tag: SQUID_3_1_0_1~49^2~276^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e8cca4acc1580e8595860c18dd09d88d4a186045;p=thirdparty%2Fsquid.git

Restore old tproxy enabling back to original option name.

version 4 now integrated with --enable-linux-netfilter seamlessly.
The old option --enable-linux-tproxy is now semi-oficcially deprecated,
as the version is obsolete but still supported by squid for legacy systems.
---

diff --git a/configure.in b/configure.in
index 400cda5368..77d4c93ff2 100644
--- a/configure.in
+++ b/configure.in
@@ -1219,8 +1219,8 @@ dnl "-64" from LDFLAGS
 fi
 
 dnl Enable Linux transparent proxy support for obsolete TPROXY
-AC_ARG_ENABLE(linux-tproxy2,
-[  --enable-linux-tproxy2
+AC_ARG_ENABLE(linux-tproxy,
+[  --enable-linux-tproxy
 			  Enable real Transparent Proxy support for Netfilter TPROXY (version 2).],
 [ if test "$enableval" = "yes" ; then
 	echo "Linux Netfilter/TPROXY v2 enabled"
diff --git a/doc/release-notes/release-3.1.sgml b/doc/release-notes/release-3.1.sgml
index a3c8d5518f..91b2cdb581 100644
--- a/doc/release-notes/release-3.1.sgml
+++ b/doc/release-notes/release-3.1.sgml
@@ -302,11 +302,6 @@ This section gives an account of those changes in three categories:
 	   but please report the bugs anyway.
         </p>
 
-	<tag>--enable-linux-tproxy2</tag>
-	<p>New option to enable TPROXY version 2 support in squid (previously known as --enable-linux-tproxy).
-	Linux Kernel patches from Balabit are required before building squid with this option.
-	</p>
-
 </descrip>
 </p>