diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | NEWS | 3 | ||||
| -rwxr-xr-x | bin/drakguard | 4 |
3 files changed, 7 insertions, 2 deletions
@@ -1,5 +1,5 @@ NAME = drakguard -VERSION = 0.7.13 +VERSION = 0.7.14 DESTDIR= sbindir=/usr/sbin @@ -1,3 +1,6 @@ +0.7.14 +- only use transparent proxy with squid <3.2 (mga#10513) + 0.7.13 - fix acl enabled test (mga#9195) diff --git a/bin/drakguard b/bin/drakguard index 42f8e90..5b34430 100755 --- a/bin/drakguard +++ b/bin/drakguard @@ -579,7 +579,9 @@ sub unblock_internet_dansguardian { sub enable_transparent_proxy { my ($port) = @_; #- FIXME: use network::squid once it is rewritten to be more gentle with the config file - subst_config_line($network::squid::squid_conf_file, "http_port $port transparent\n"); + # Only use transparent proxy if squid version < 3.2. Handle upgrades nicely + substr(`rpm -q squid`, 6, 3) < 3.2 ? subst_config_line($network::squid::squid_conf_file, "http_port $port transparent\n") : + subst_config_line($network::squid::squid_conf_file, "http_port $port\n"); } #- mostly duplicated for MDK::Common::System::getVarsFromSh |