net-firewall/iptables: pass -w to ip*tables-restore in systemd units

Otherwise one restore rule will prevent the other from working, and
nothing will get restored.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

diff --git a/net-firewall/iptables/files/systemd/ip6tables-restore.service b/net-firewall/iptables/files/systemd/ip6tables-restore.service
index c149e92ba900ab97bf6bb0694ff6c1b98424545b..921b691296d83f2743512134d47335dec3a57f06 100644 (file)
--- a/net-firewall/iptables/files/systemd/ip6tables-restore.service
+++ b/net-firewall/iptables/files/systemd/ip6tables-restore.service
@@ -8,7 +8,7 @@ Wants=network-pre.target
 
 [Service]
 Type=oneshot
-ExecStart=/sbin/ip6tables-restore /var/lib/ip6tables/rules-save
+ExecStart=/sbin/ip6tables-restore -w -- /var/lib/ip6tables/rules-save
 
 [Install]
 WantedBy=basic.target

diff --git a/net-firewall/iptables/files/systemd/iptables-restore.service b/net-firewall/iptables/files/systemd/iptables-restore.service
index 2474ee3ec419cf314e2cfe042153062bfb712753..a9e56793548cdad68e59409e36f8092bcbb7c865 100644 (file)
--- a/net-firewall/iptables/files/systemd/iptables-restore.service
+++ b/net-firewall/iptables/files/systemd/iptables-restore.service
@@ -8,7 +8,7 @@ Wants=network-pre.target
 
 [Service]
 Type=oneshot
-ExecStart=/sbin/iptables-restore /var/lib/iptables/rules-save
+ExecStart=/sbin/iptables-restore -w -- /var/lib/iptables/rules-save
 
 [Install]
 WantedBy=basic.target

diff --git a/net-firewall/iptables/iptables-1.4.21-r4.ebuild b/net-firewall/iptables/iptables-1.4.21-r5.ebuild
similarity index 98%
rename from net-firewall/iptables/iptables-1.4.21-r4.ebuild
rename to net-firewall/iptables/iptables-1.4.21-r5.ebuild
index b873bc7ffcfada21a5e2cdc7ea7b539f78b9b69f..7861dad2a4f334dde986e7d1ff0b07eaf273191b 100644 (file)
--- a/net-firewall/iptables/iptables-1.4.21-r4.ebuild
+++ b/net-firewall/iptables/iptables-1.4.21-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"

diff --git a/net-firewall/iptables/iptables-1.6.1-r2.ebuild b/net-firewall/iptables/iptables-1.6.1-r3.ebuild
similarity index 100%
rename from net-firewall/iptables/iptables-1.6.1-r2.ebuild
rename to net-firewall/iptables/iptables-1.6.1-r3.ebuild

diff --git a/net-firewall/iptables/iptables-1.6.2.ebuild b/net-firewall/iptables/iptables-1.6.2-r1.ebuild
similarity index 100%
rename from net-firewall/iptables/iptables-1.6.2.ebuild
rename to net-firewall/iptables/iptables-1.6.2-r1.ebuild