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 400cda5368ef20be2628b05a4db602f03f70f6d3..77d4c93ff2d8c2aa4b91a337139cfc67fed8f566 100644 (file)
--- 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 a3c8d5518f6785ff4cc774d94c50b1112f96b5a7..91b2cdb581f510c7b743de400de97cc9b5bfed31 100644 (file)
--- 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.\r
         </p>\r
 \r
-       <tag>--enable-linux-tproxy2</tag>\r
-       <p>New option to enable TPROXY version 2 support in squid (previously known as --enable-linux-tproxy).\r
-       Linux Kernel patches from Balabit are required before building squid with this option.\r
-       </p>\r
-\r
 </descrip>\r
 </p>\r
 \r