From 82be9eb33cae26ba998c4e8a926f6fcff2ba0230 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Sat, 25 Jan 2014 15:09:00 +0000
Subject: shorewall: drop shorewall 2->3 upgrade support

---
 lib/network/shorewall.pm | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'lib/network/shorewall.pm')

diff --git a/lib/network/shorewall.pm b/lib/network/shorewall.pm
index 4532412..da7f304 100644
--- a/lib/network/shorewall.pm
+++ b/lib/network/shorewall.pm
@@ -140,18 +140,6 @@ sub ports_by_proto {
     \%ports_by_proto;
 }
 
-sub upgrade_to_shorewall3() {
-    #- the 'FW' option has been removed from shorewall.conf as of shorewall 3.0
-    my $ipsecfile_ok;
-    substInFile {
-        undef $_ if /^\s*FW=/;
-        if ((/^\s*IPSECFILE=/ || eof) && !$ipsecfile_ok) {
-            $ipsecfile_ok = 1;
-            $_ = "IPSECFILE=zones\n";
-        }
-    } "$::prefix${shorewall_root}/shorewall.conf";
-}
-
 sub write {
     my ($conf, $o_in) = @_;
     my $use_pptp = any { /^ppp/ && cat_("$::prefix/etc/ppp/peers/$_") =~ /pptp/ } @{$conf->{net_zone}};
@@ -221,8 +209,6 @@ What do you want to do?"),
     ));
     set_config_file('masq', if_(exists $conf->{masq}, [ $conf->{masq}{net_interface}, $conf->{masq}{subnet} ]));
 
-    upgrade_to_shorewall3();
-
     require services;
     if ($conf->{disabled}) {
         services::disable('shorewall', $::isInstall);
-- 
cgit v1.2.1