[gentoo-commits] gentoo-x86 commit in net-firewall/shorewall/files/4.6: shorewall-init-01_remove-ipset-functionality-r1.patch

[Michal Gorny (mgorny)]

mgorny      15/06/15 11:47:22

  Added:               
                        shorewall-init-01_remove-ipset-functionality-r1.patch
  Log:
  Version bump. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/151 
by Whissi.
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 
EFB4464E!)

Revision  Changes    Path
1.1                  
net-firewall/shorewall/files/4.6/shorewall-init-01_remove-ipset-functionality-r1.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall-init-01_remove-ipset-functionality-r1.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall-init-01_remove-ipset-functionality-r1.patch?rev=1.1&content-type=text/plain

Index: shorewall-init-01_remove-ipset-functionality-r1.patch
===================================================================
diff -rupN old/shorewall-init-4.6.10.1/shorewall-init 
new/shorewall-init-4.6.10.1/shorewall-init
--- old/shorewall-init-4.6.10.1/shorewall-init  2015-06-09 20:02:00.000000000 
+0200
+++ new/shorewall-init-4.6.10.1/shorewall-init  2015-06-14 17:16:17.396424059 
+0200
@@ -78,10 +78,6 @@ shorewall_start () {
        fi
     done
 
-    if [ -n "$SAVE_IPSETS" -a -f "$SAVE_IPSETS" ]; then
-       ipset -R < "$SAVE_IPSETS"
-    fi
-
     return 0
 }
 
@@ -99,13 +95,6 @@ shorewall_stop () {
        fi
     done
 
-    if [ -n "$SAVE_IPSETS" ]; then
-       mkdir -p $(dirname "$SAVE_IPSETS")
-       if ipset -S > "${SAVE_IPSETS}.tmp"; then
-           grep -qE -- '^(-N|create )' "${SAVE_IPSETS}.tmp" && mv -f 
"${SAVE_IPSETS}.tmp" "$SAVE_IPSETS"
-       fi
-    fi
-
     return 0
 }