Closing #60680 and unmasking

6 files changed, 23 insertions, 5 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index a0e79ed64005..17d09ddf324d 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.40 2004/07/14 23:30:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.41 2004/08/18 22:08:21 aliz Exp $
+
+  18 Aug 2004; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.11-r2.ebuild,
+  files/ip6tables-1.2.9-r1.confd, files/ip6tables-1.2.9-r1.init,
+  files/iptables-1.2.9-r1.confd, files/iptables-1.2.9-r1.init:
+  Enable saving state when stopping service, closing #60680.
+  Unmasking on x86 and amd64.
 
   10 Jul 2004; Daniel Ahlberg <aliz@gentoo.org> files/ip6tables.init:
   Fix typo in init file, closing #56537.
diff --git a/net-firewall/iptables/files/ip6tables-1.2.9-r1.confd b/net-firewall/iptables/files/ip6tables-1.2.9-r1.confd
index b5177e9942aa..ef8e61552dd6 100644
--- a/net-firewall/iptables/files/ip6tables-1.2.9-r1.confd
+++ b/net-firewall/iptables/files/ip6tables-1.2.9-r1.confd
@@ -4,3 +4,6 @@ IP6TABLES_SAVE="/var/lib/ip6tables/rules-save"
 
 #Options to pass to iptables-save and iptables-restore 
 SAVE_RESTORE_OPTIONS="-c"
+
+#Save state on stopping iptables
+SAVE_ON_STOP="yes"
diff --git a/net-firewall/iptables/files/ip6tables-1.2.9-r1.init b/net-firewall/iptables/files/ip6tables-1.2.9-r1.init
index afb4d1e1d5f5..dbf0c94cc19e 100644
--- a/net-firewall/iptables/files/ip6tables-1.2.9-r1.init
+++ b/net-firewall/iptables/files/ip6tables-1.2.9-r1.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/ip6tables-1.2.9-r1.init,v 1.2 2004/07/14 23:30:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/ip6tables-1.2.9-r1.init,v 1.3 2004/08/18 22:08:21 aliz Exp $
 
 opts="start stop save reload"
 
@@ -28,6 +28,9 @@ start() {
 }
 
 stop() {
+        if [ "${SAVE_ON_STOP}" = "yes" ]; then
+                save || return 1
+        fi
 	ebegin "Stopping firewall"
 		for a in `cat /proc/net/ip6_tables_names`; do
 			ip6tables -F -t $a
diff --git a/net-firewall/iptables/files/iptables-1.2.9-r1.confd b/net-firewall/iptables/files/iptables-1.2.9-r1.confd
index e0e2c7a6137d..a2d070fc48e3 100644
--- a/net-firewall/iptables/files/iptables-1.2.9-r1.confd
+++ b/net-firewall/iptables/files/iptables-1.2.9-r1.confd
@@ -4,3 +4,6 @@ IPTABLES_SAVE="/var/lib/iptables/rules-save"
 
 #Options to pass to iptables-save and iptables-restore 
 SAVE_RESTORE_OPTIONS="-c"
+
+#Save state on stopping iptables
+SAVE_ON_STOP="yes"
diff --git a/net-firewall/iptables/files/iptables-1.2.9-r1.init b/net-firewall/iptables/files/iptables-1.2.9-r1.init
index 48cfe76dcfc4..80662f176858 100644
--- a/net-firewall/iptables/files/iptables-1.2.9-r1.init
+++ b/net-firewall/iptables/files/iptables-1.2.9-r1.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.2.9-r1.init,v 1.2 2004/07/14 23:30:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.2.9-r1.init,v 1.3 2004/08/18 22:08:21 aliz Exp $
 
 opts="start stop save reload"
 
@@ -28,6 +28,9 @@ start() {
 }
 
 stop() {
+	if [ "${SAVE_ON_STOP}" = "yes" ]; then
+		save || return 1
+	fi
 	ebegin "Stopping firewall"
 		for a in `cat /proc/net/ip_tables_names`; do
 			/sbin/iptables -F -t $a
diff --git a/net-firewall/iptables/iptables-1.2.11-r2.ebuild b/net-firewall/iptables/iptables-1.2.11-r2.ebuild
index 011b86d71997..c3de2b4d14f8 100644
--- a/net-firewall/iptables/iptables-1.2.11-r2.ebuild
+++ b/net-firewall/iptables/iptables-1.2.11-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.11-r2.ebuild,v 1.4 2004/07/05 18:11:34 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.11-r2.ebuild,v 1.5 2004/08/18 22:08:21 aliz Exp $
 
 inherit eutils flag-o-matic
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.iptables.org/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64"
+KEYWORDS="x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa amd64 ~ia64"
 IUSE="ipv6 static extensions"
 DEPEND="virtual/os-headers
 	extensions? ( virtual/linux-sources )"