diff options
| author | Derek Jennings <djennings@mageia.org> | 2013-07-10 07:29:11 +0000 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2013-08-24 18:29:43 +0100 |
| commit | 8fde8b635f6ff53f282b3dde0f0c0ba4522a7a1b (patch) | |
| tree | 8f1e4d2edc0212ec8a9fe441dadfa613dab63421 | |
| parent | 78b533dcec34cb48a40bc9be7d01a16f91b4fa09 (diff) | |
| download | drakguard-8fde8b635f6ff53f282b3dde0f0c0ba4522a7a1b.tar drakguard-8fde8b635f6ff53f282b3dde0f0c0ba4522a7a1b.tar.gz drakguard-8fde8b635f6ff53f282b3dde0f0c0ba4522a7a1b.tar.bz2 drakguard-8fde8b635f6ff53f282b3dde0f0c0ba4522a7a1b.tar.xz drakguard-8fde8b635f6ff53f282b3dde0f0c0ba4522a7a1b.zip | |
only use transparent proxy with squid <3.2 (mga#10513)
| -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 |