Update init script to use restore functionality for bug 91343. Thanks to Christopher DeMarco <cmd at alephant dot net>.

(Portage version: 2.0.54 vanquish yourself edition)

5 files changed, 60 insertions, 23 deletions

diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index 0de0a61da7b5..ef83ea659ab9 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/shorewall
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.97 2006/02/17 20:04:19 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.98 2006/02/19 02:33:35 vanquirius Exp $
+
+*shorewall-3.0.5-r1 (19 Feb 2006)
+
+  19 Feb 2006; Marcelo Goes <vanquirius@gentoo.org> +files/shorewall-r1,
+  -shorewall-3.0.5.ebuild, +shorewall-3.0.5-r1.ebuild:
+  Update init script to use restore functionality for bug 91343. Thanks to
+  Christopher DeMarco <cmd at alephant dot net>.
 
   17 Feb 2006; Michael Hanselmann <hansmi@gentoo.org>
   shorewall-3.0.4.ebuild:
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 1a6c0bec629f..13ed177f2cac 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,27 +1,10 @@
 MD5 b4ad09a5d6a7dfdbe77440d2e2933281 ChangeLog 14049
-RMD160 405f2f1bcf82b57bf7b56509dc3050cebdeabb24 ChangeLog 14049
-SHA256 da50d7e9f3bc6fa4c365bda2b91618d11daa39115f61447ba25c7757a46d8d21 ChangeLog 14049
 MD5 e119bb212e45f53e1948e7a1ed93ef36 files/digest-shorewall-2.4.2 139
-RMD160 d7f7a1842e290411df83618289cc4820a208fa69 files/digest-shorewall-2.4.2 139
-SHA256 ec6e339f553caea768deec83c397921ecacf7ed9b9c1bb9381a1cdc575f43452 files/digest-shorewall-2.4.2 139
 MD5 7271403f189568f22d949752fc7773b3 files/digest-shorewall-3.0.4 139
-RMD160 0fe2b75c1ba198235d50e0f1076cbd8860d1c2dd files/digest-shorewall-3.0.4 139
-SHA256 b9abcd2a2c43c48ac2df8f25a4ea65fba75edf7f421985f6b27a038de0faccdd files/digest-shorewall-3.0.4 139
-MD5 06092daa018082fd77b0b38d62276869 files/digest-shorewall-3.0.5 139
-RMD160 64f37fe5db8bec2dde1f27e94a6e0bbee39c235e files/digest-shorewall-3.0.5 139
-SHA256 ee182718a259615e29f8b6034f7585cb7e57dae80a4781ed125567cd72b8a062 files/digest-shorewall-3.0.5 139
+MD5 06092daa018082fd77b0b38d62276869 files/digest-shorewall-3.0.5-r1 139
 MD5 874d62a846eefd6330b3bba8b8721cef files/shorewall 1057
-RMD160 53daaed6d46b975645a6bc894d670fa69dac9ad4 files/shorewall 1057
-SHA256 5ddf6f5156472bd31d5ad583b3bbca97451d4a31e37d3d853d6d3a0f7764541d files/shorewall 1057
+MD5 2899e8f7bb6cacecd60ab16b58373b45 files/shorewall-r1 1142
 MD5 9683bb7323c40d69b48d54ad0eb169ed metadata.xml 221
-RMD160 6a612dbdb85b7cbc15a4f4924fc62b435900bee4 metadata.xml 221
-SHA256 80bafe9d61de4580c061d796ca9c244633349b7a6da85aeae6e11bbaad597110 metadata.xml 221
 MD5 561cf6684de229fe37921356b62bb6c1 shorewall-2.4.2.ebuild 1488
-RMD160 5b7725a19f06c135db4994be1ac89270dc3f85a0 shorewall-2.4.2.ebuild 1488
-SHA256 5a3e06939cdf1b97c97be51bf9e7a70ab2f31247584c48b9d40df3f9f857653e shorewall-2.4.2.ebuild 1488
 MD5 785f6a0369b0039366af28329da9f5a0 shorewall-3.0.4.ebuild 1982
-RMD160 a6e54970a80f535be056cd784f357c480f1605e6 shorewall-3.0.4.ebuild 1982
-SHA256 7dcfdac5da93defe61c5d5a4791ba3e22af4d21aca1523fcdfb679e77d1b8c04 shorewall-3.0.4.ebuild 1982
-MD5 da4f21da4d8bc47dec1c1ca0dfcb45c9 shorewall-3.0.5.ebuild 1989
-RMD160 4b5d447f2270b68a3168a85d672adfc8b92e9c72 shorewall-3.0.5.ebuild 1989
-SHA256 786924ce9da09b0f945a1f3bb18eafafb59d03a74159e59e166f28c01f463e02 shorewall-3.0.5.ebuild 1989
+MD5 b4cab865196fa42005d7f9f97623dae5 shorewall-3.0.5-r1.ebuild 2003
diff --git a/net-firewall/shorewall/files/digest-shorewall-3.0.5 b/net-firewall/shorewall/files/digest-shorewall-3.0.5-r1
index 011c14bef521..011c14bef521 100644
--- a/net-firewall/shorewall/files/digest-shorewall-3.0.5
+++ b/net-firewall/shorewall/files/digest-shorewall-3.0.5-r1
diff --git a/net-firewall/shorewall/files/shorewall-r1 b/net-firewall/shorewall/files/shorewall-r1
new file mode 100644
index 000000000000..548b4d95c01d
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall-r1
@@ -0,0 +1,47 @@
+#!/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/shorewall/files/shorewall-r1,v 1.1 2006/02/19 02:33:35 vanquirius Exp $
+
+opts="start stop restart clear"
+
+depend() {
+	need net
+	provide firewall
+	after ulogd
+}
+
+start() {
+	ebegin "Starting firewall"
+	/sbin/shorewall -f start 1>/dev/null
+	eend $? 
+}
+
+stop() {
+	ebegin "Stopping firewall"
+	/sbin/shorewall stop 1>/dev/null
+	eend $?
+}
+
+restart() {
+	# shorewall comes with its own control script that includes a
+	# restart function, so refrain from calling svc_stop/svc_start
+	# here.  Note that this comment is required to fix bug 55576;
+	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
+	ebegin "Restarting firewall"
+	if [ -f /var/lib/shorewall/restore ] ; then
+		/sbin/shorewall restore
+	else
+		/sbin/shorewall restart 1>/dev/null
+	fi
+	eend $?
+}
+
+clear() {
+	# clear will remove all the rules and bring the system to an unfirewalled
+	# state. (21 Nov 2004 eldad)
+
+	ebegin "Clearing all firewall rules and setting policy to ACCEPT"
+	/sbin/shorewall clear
+	eend $?
+}
diff --git a/net-firewall/shorewall/shorewall-3.0.5.ebuild b/net-firewall/shorewall/shorewall-3.0.5-r1.ebuild
index 19c5602f6f02..a4838437ac0e 100644
--- a/net-firewall/shorewall/shorewall-3.0.5.ebuild
+++ b/net-firewall/shorewall/shorewall-3.0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-3.0.5.ebuild,v 1.1 2006/02/10 20:00:07 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-3.0.5-r1.ebuild,v 1.1 2006/02/19 02:33:35 vanquirius Exp $
 
 MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
 
@@ -26,7 +26,7 @@ src_install() {
 	keepdir /var/lib/shorewall
 
 	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	doinitd "${FILESDIR}"/shorewall || die "doinitd failed"
+	newinitd "${FILESDIR}"/shorewall-r1 shorewall || die "doinitd failed"
 
 	dodoc changelog.txt releasenotes.txt
 	if use doc; then