allow people to not flush firewall on stop #154269

Package-Manager: portage-2.1.2_rc1-r3

4 files changed, 30 insertions, 13 deletions

diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 2fd6d9dca741..c4f58e614bed 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.2.11-files/CAN-2004-0986.patch 1365 RMD160 a184a41e0b3ad611f271e22e35adf684213307a5 SHA1 a9b5e7ac2753dc55d776d16c9e2911d9c5574669 SHA256 15c98cb61c8a2787bb6e4f01f01fd29b0e6a2731e817349bd5fa4c4cd458bef3
 MD5 756f721b4c0c0646a174993befa199c4 files/1.2.11-files/CAN-2004-0986.patch 1365
 RMD160 a184a41e0b3ad611f271e22e35adf684213307a5 files/1.2.11-files/CAN-2004-0986.patch 1365
@@ -58,10 +61,10 @@ AUX ip6tables-1.2.9-r1.init 1792 RMD160 e28e8c86026aac7aa49bd8e5fe84153516ebb28d
 MD5 f74f2424c062e1b2f4b22e4e11db909b files/ip6tables-1.2.9-r1.init 1792
 RMD160 e28e8c86026aac7aa49bd8e5fe84153516ebb28d files/ip6tables-1.2.9-r1.init 1792
 SHA256 e30d2daeb23958482f6655f63267779d1f029f19e1365dddda0febe015ddb8c0 files/ip6tables-1.2.9-r1.init 1792
-AUX ip6tables-1.3.2.confd 293 RMD160 2e5399355a930ab3c804c9cc46fe37763555a97e SHA1 0e82dbe8538f9168bb97939a03b73dd291e82760 SHA256 c93827ac2b8fdd83e2c36788053ee7567ceb13b3cbc5fcf40d186500e05c8104
-MD5 dbef6253ff7e347e7fa35a02652ab684 files/ip6tables-1.3.2.confd 293
-RMD160 2e5399355a930ab3c804c9cc46fe37763555a97e files/ip6tables-1.3.2.confd 293
-SHA256 c93827ac2b8fdd83e2c36788053ee7567ceb13b3cbc5fcf40d186500e05c8104 files/ip6tables-1.3.2.confd 293
+AUX ip6tables-1.3.2.confd 367 RMD160 13883a6edd49c844155858bccc7cf95e32dc4d14 SHA1 fc9e631e946b83bfbec23e3bfee1f7da84f56746 SHA256 748111ccd94007d5854f8d108c2b66241c4a763db9f5ba676b9ad79d69f3f2e2
+MD5 b55536f30c709d78987bf9666ff7b05a files/ip6tables-1.3.2.confd 367
+RMD160 13883a6edd49c844155858bccc7cf95e32dc4d14 files/ip6tables-1.3.2.confd 367
+SHA256 748111ccd94007d5854f8d108c2b66241c4a763db9f5ba676b9ad79d69f3f2e2 files/ip6tables-1.3.2.confd 367
 AUX iptables-1.2.9-r1.confd 264 RMD160 9c78d094bbf5e3ee71e4f833f1bab0871bb767d4 SHA1 f44b21e8df73d2eb86f4c7a7277d2871d0c68abf SHA256 430d53a0c77cfd0b4d7760b68c36be0010c164cfa99aa0411775b6e88bbe7b74
 MD5 4e055c59114fd6abc5a27bdaa97d2946 files/iptables-1.2.9-r1.confd 264
 RMD160 9c78d094bbf5e3ee71e4f833f1bab0871bb767d4 files/iptables-1.2.9-r1.confd 264
@@ -70,14 +73,14 @@ AUX iptables-1.2.9-r1.init 1829 RMD160 82233608a26e8e19f7ac910350d80b90de24b1d3
 MD5 8ac77b3fbebfb5ceb9c6166823afe21d files/iptables-1.2.9-r1.init 1829
 RMD160 82233608a26e8e19f7ac910350d80b90de24b1d3 files/iptables-1.2.9-r1.init 1829
 SHA256 489caca55376fe49c613c87ec8e8577b654cf281a96ee94b9eedfafd0f310b22 files/iptables-1.2.9-r1.init 1829
-AUX iptables-1.3.2.confd 290 RMD160 cb180068f86a608b16d850635ae909ea7b9cc059 SHA1 cb56dba4799eb3998b28e492c61265574c37d522 SHA256 351e123ba9e0ec7db2bcff42849aa627d29a3b2e77a47b82386f5e3a7e21bd30
-MD5 956ebf5ab69e5a1e1d3983541eab643b files/iptables-1.3.2.confd 290
-RMD160 cb180068f86a608b16d850635ae909ea7b9cc059 files/iptables-1.3.2.confd 290
-SHA256 351e123ba9e0ec7db2bcff42849aa627d29a3b2e77a47b82386f5e3a7e21bd30 files/iptables-1.3.2.confd 290
-AUX iptables-1.3.2.init 2548 RMD160 fef1e2c096171e32eb3e62e79eb7043033153ef6 SHA1 c70faad624a6a70db4c102f4cd043facfa2ccc6f SHA256 3ededc7a04ed94ac847d438e7980e1d4a53bfac830eb73c9d420b24b76358e44
-MD5 be57c10dd117e845d0367ac4abfdc6d2 files/iptables-1.3.2.init 2548
-RMD160 fef1e2c096171e32eb3e62e79eb7043033153ef6 files/iptables-1.3.2.init 2548
-SHA256 3ededc7a04ed94ac847d438e7980e1d4a53bfac830eb73c9d420b24b76358e44 files/iptables-1.3.2.init 2548
+AUX iptables-1.3.2.confd 364 RMD160 882ab7a777fa9892085561b633952da468fe3365 SHA1 0d297fd36eadee2c630871427ee2cc1fca949ff1 SHA256 d6f6594de108e9252b8fd8d940c60a19a82c101e292878beca00ac73f77ae2da
+MD5 e609f404a78a9ee2cb7e443214da4fff files/iptables-1.3.2.confd 364
+RMD160 882ab7a777fa9892085561b633952da468fe3365 files/iptables-1.3.2.confd 364
+SHA256 d6f6594de108e9252b8fd8d940c60a19a82c101e292878beca00ac73f77ae2da files/iptables-1.3.2.confd 364
+AUX iptables-1.3.2.init 2593 RMD160 36e2f9d47de23d0259f726d0f199524009cd65d2 SHA1 9b9e669f47548b567c77ef938253d08e97646387 SHA256 0198648e69c78c7703c02732458d2e6c6af7051e1ffe49556930bf8fbb812346
+MD5 49989419807df230e222886a5a70f305 files/iptables-1.3.2.init 2593
+RMD160 36e2f9d47de23d0259f726d0f199524009cd65d2 files/iptables-1.3.2.init 2593
+SHA256 0198648e69c78c7703c02732458d2e6c6af7051e1ffe49556930bf8fbb812346 files/iptables-1.3.2.init 2593
 DIST iptables-1.2.11.tar.bz2 156988 RMD160 66e0fa391444a1e169feaf2fc67b5f8622ec1d89 SHA1 1a2236e2705b02834aaa506632c08cf8a647efa2 SHA256 be7bd67232fddbe3ce81f40f5b79123380a2e67cd166ec06e650842f8acb373d
 DIST iptables-1.3.0-imq1.diff 5369 RMD160 8ca1fa3bfea02d27232d8d8cb0a12586dd4537b5 SHA1 bdf665cacc985fceaadf119ae7a756caca1589ad SHA256 0f9d36e48b3f1e83ef9e1d39c19e7271a889a31c65c396c416200eb143f1795b
 DIST iptables-1.3.5.tar.bz2 191820 RMD160 3364e0f37f67ba4aa9ac9caa6f11adb67887e528 SHA1 6dbeeee13517fa02852960b6f6e51115c7548a09 SHA256 1d8ee8634d167b0f1a8872b6547910c11bae676699faf2b4bc2c84a128449c3c
@@ -143,3 +146,10 @@ SHA256 65f1e644901e9411fbb3f8a2787a839d3fbd941134d8b25314976a495a9a0938 files/di
 MD5 0f737b6bda361096558683003e58e97d files/digest-iptables-1.3.6-r1 759
 RMD160 9ac216fda9f8372cfc4a7feb3ced6586eaacf2d6 files/digest-iptables-1.3.6-r1 759
 SHA256 b6cdf0da6f3681548aea7cd05500b00660b64d95f4d6d6196267c2535dc190d0 files/digest-iptables-1.3.6-r1 759
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFT5rbamhnQswr0vIRArTUAJ9qAdmlUkspUew+pKg6xXavNZdmtgCbB76y
+lms5/dKQ+TXDAHmJNH2CakQ=
+=XYue
+-----END PGP SIGNATURE-----
diff --git a/net-firewall/iptables/files/ip6tables-1.3.2.confd b/net-firewall/iptables/files/ip6tables-1.3.2.confd
index 93c0bc89b38a..7cd37285a209 100644
--- a/net-firewall/iptables/files/ip6tables-1.3.2.confd
+++ b/net-firewall/iptables/files/ip6tables-1.3.2.confd
@@ -9,3 +9,6 @@ SAVE_RESTORE_OPTIONS="-c"
 
 # Save state on stopping iptables
 SAVE_ON_STOP="yes"
+
+# Flush all rules and delete all chains on shutdown?
+CLEAR_ON_STOP="yes"
diff --git a/net-firewall/iptables/files/iptables-1.3.2.confd b/net-firewall/iptables/files/iptables-1.3.2.confd
index 91287debdbcf..83dd4c4fc2d6 100644
--- a/net-firewall/iptables/files/iptables-1.3.2.confd
+++ b/net-firewall/iptables/files/iptables-1.3.2.confd
@@ -9,3 +9,6 @@ SAVE_RESTORE_OPTIONS="-c"
 
 # Save state on stopping iptables
 SAVE_ON_STOP="yes"
+
+# Flush all rules and delete all chains on shutdown?
+CLEAR_ON_STOP="yes"
diff --git a/net-firewall/iptables/files/iptables-1.3.2.init b/net-firewall/iptables/files/iptables-1.3.2.init
index c8bf8da2a007..a21072f41454 100755
--- a/net-firewall/iptables/files/iptables-1.3.2.init
+++ b/net-firewall/iptables/files/iptables-1.3.2.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.3.2.init,v 1.2 2005/08/10 23:11:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.3.2.init,v 1.3 2006/11/06 20:27:33 vapier Exp $
 
 opts="save reload panic"
 
@@ -65,6 +65,7 @@ stop() {
 	if [[ ${SAVE_ON_STOP} == "yes" ]] ; then
 		save || return 1
 	fi
+	[[ ${CLEAR_ON_STOP} != "yes" ]] && return 0
 	checkkernel || return 1
 	ebegin "Stopping firewall"
 	for a in $(<${iptables_proc}) ; do