Simplify init script and depend on D-Bus being started. Add the network module that newer OpenRC's will ship with for older OpenRC support.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

5 files changed, 63 insertions, 20 deletions

diff --git a/net-firewall/firewalld/ChangeLog b/net-firewall/firewalld/ChangeLog
index a9c85733ae8e..312248ba6530 100644
--- a/net-firewall/firewalld/ChangeLog
+++ b/net-firewall/firewalld/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/firewalld
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/ChangeLog,v 1.3 2012/11/06 07:30:01 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/ChangeLog,v 1.4 2012/11/07 08:13:59 cardoe Exp $
+
+  07 Nov 2012; Doug Goldstein <cardoe@gentoo.org> firewalld-0.2.9.ebuild,
+  +files/firewalld.module, files/firewalld.init:
+  Simplify init script and depend on D-Bus being started. Add the network
+  module that newer OpenRC's will ship with for older OpenRC support.
 
   06 Nov 2012; Doug Goldstein <cardoe@gentoo.org> firewalld-0.2.9.ebuild:
   Fix GSettings schema not being installed.
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index b47e01658293..0c1ae3eaf678 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,6 +1,7 @@
-AUX firewalld.init 561 SHA256 98bca869042295061eb2e7e236cffbf55163a473206def9541bd6eac7a2241dc SHA512 6d9c6fcc3c67bcd7e5862cc015fbb62adfe2d42b75dfcdb17f74f31df51c6542092fc009b5fbe833c1b5355fec693f0c03dd23ee83ec3ea8859e884ddb3bd1cb WHIRLPOOL c33f79f790e5f9581ce829c0c2b5d3085f3c9db07e74772f99b3557958be720f427d796a807d76cfed89bcd2e7ab749e967308b79aec3c64917d6c518a6c76e1
+AUX firewalld.init 389 SHA256 17270614f049ad7662718720fa1c205b1859f9d5d7550b488fb6f35d070726ed SHA512 01213b8363eb25965f8432c9768cd351eed65994029734c20a0b86579c780dd734287ae5f038b73d85539ad21a38dcf5d63c26eb9d658dafa41e9891695bcb9a WHIRLPOOL 63a5cb71834064502806bb576dc629bdf5c7be2bc0bcc9ea7814f541bce8a0d8b296ce5d1077b5bb3236e2d476efa88ac6266375c08964062d5bd2ccea12b652
+AUX firewalld.module 686 SHA256 dcbff3ed6890820155cd97a354cbf6986404d427b6d3bee53526ae26cc671afe SHA512 fabeeb436a6f948f629d30dfa045471ea5bb86c061f9082006e200d79ba2608712df4a695766fd0e66b7817ac52709763e63dca1c961070f29877143c71b8f42 WHIRLPOOL 06a705212420273850f5c3720a9b8d52c435e06742093417d9a3698b6ca436761a0f07d7d35c5227dc42c43fd6f114ec1f2ef088b03e39fa4a749bd9f0edcf47
 DIST firewalld-0.2.9-3ab6b297.tar.xz 3776 SHA256 038b36d8d85af3aad5de087ba0612a57916c49b5aefcd4679f9d06d3aee533c8 SHA512 30f1b06b1f9b44ac163bc9bae744a2cf00f8bea03aa58f07ef452349880e24f43b809bab7b781500488991de99a9a879779a40651b5573a0802624ebb13c597e WHIRLPOOL 8019911c82c34f2e034c65fae30a50774e92edb8687af8264e466ce603d9319c21f1fa499fa3044d6280b58bd2e9792c0f98b86a0971819a217f5d168be6edde
 DIST firewalld-0.2.9.tar.bz2 280445 SHA256 106fd985074a74bbd84a3c866fa4023693b185d0e8b3e386d0aec9627b36bfd0 SHA512 1e1518ad2b7dd8e2c987bfa7b1efc72e7735444235a240350655801dc84a05fc1f9c524ea7ba71d5cc7d16735f2f54f3ed7d8bdd4b4770036a5756e379f7d656 WHIRLPOOL 849ccf8334f39333aa3c08e317d912528c4e69ebbb4db719ecf8428cc33c5f6e0d6a24eaef0f03ffbf912ce4619807904a3fd212cf6e63700c84dd1036291674
-EBUILD firewalld-0.2.9.ebuild 2041 SHA256 698c1fd38ef027e53b7aa954ff6201774a0c628d9a3cd7b9b28e98ad68c9835c SHA512 f920a862d3cf8fc7effff08ff208ba463a6fd4e70d83d3ed72c145a581e6e481401ac8ab6c65e743d60a177c5fc6a60d7d1f886a0f5eda81b6e57545876ab477 WHIRLPOOL b0d009c043da98f05872f5d31909c68af13e2a0fc8ad284d6967014167d7ce4d790feafa8ca2689a5941b40e40f380b9c1345d0bd30c7fa6a73da73f3673218c
-MISC ChangeLog 640 SHA256 9c8e6cbca91517ac5c9cc2857c2bddafd07d7266768feb0c937046e4878f16b4 SHA512 1b43203c8c4b02a18963c86673fb757f6482e528b9d38020201905572fcc2d90ee3f145fc165fe8d1cafb907a6a99644fd4ca4cb1e7bbe274fb0c1ff0eb9b1e9 WHIRLPOOL 35cb00d94ae4f2495a65d44c5d8136201dcc2bbb05dd1561fa61a5d2cd8d478bf3ffea3e26840dbc2a2efae75164a7a65f49de50a7c98959fa524b23ff734287
+EBUILD firewalld-0.2.9.ebuild 2284 SHA256 5c4176e18de818c21c1037f7e1f42dec1a47131779e8c9414534dc1603509fd3 SHA512 8bda6f2974df690c654b0b30bf6706d28a8b1e5a6ffda7c21671310372b17e74d795d00fff21ae16ac71c966f869bf50cf76a10a6fd91211b1341456ff9ee861 WHIRLPOOL 317d5a59cf30e0779634eee9b7d47d5161e48acdd43fc1322eb1eb3abb677b19fe8cb58874cfc370c9f2a9bae827f0a65c447a935a721eefb9cdfc0adb705a12
+MISC ChangeLog 908 SHA256 a98ea3f847a22b7b831fa6fed074a9068401fb4b2e43abb338a46b32abb618f6 SHA512 c09cfd25accbde62bc40d2ac01033fad6a0ec7fe0cdd5478d8774161bb38ac1f9964827afeb012b57b330af3f81cc263e5070a966e2eb35b628ed2959ad78d9c WHIRLPOOL e3629530b4eae3ecb5e442f7c303d7477b2db36f460015f4a2632aaa3cd038669d4bdb87c55a338404990b5041eb90a6a954b79a3c340e6ef80c70f00977eee5
 MISC metadata.xml 357 SHA256 ebd525995b6a8776c10d984533962fefe49a9d2e7e04ded9cc5b3efe664a58a8 SHA512 3bbc1d68b2999faf4c3a6acaf45f78621a7b612c7c691e5fdfbd7a92793be7629d67c7abf04b455c7cbef5bb0ab53214dfa15006a15df7fa40adca6689995c35 WHIRLPOOL 15b22a034a9186a4656431d20a4b64cb338ec865900fabf613e17da4c17f8e417fdf3223faaf6a9560c071b796c719157e84a8030bcf7365601f671b794461d2
diff --git a/net-firewall/firewalld/files/firewalld.init b/net-firewall/firewalld/files/firewalld.init
index 871384d4d87d..06613f3aabd3 100644
--- a/net-firewall/firewalld/files/firewalld.init
+++ b/net-firewall/firewalld/files/firewalld.init
@@ -1,21 +1,13 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/files/firewalld.init,v 1.1 2012/11/02 22:15:21 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/files/firewalld.init,v 1.2 2012/11/07 08:14:00 cardoe Exp $
+
+description="FirewallD"
+command=/usr/sbin/firewalld
+pidfile=/var/run/firewalld.pid
 
 depend() {
+	need dbus
 	provide iptables ip6tables ebtables
 }
-
-start() {
-	ebegin "Starting FirewallD"
-	start-stop-daemon --start --quiet --exec /usr/sbin/firewalld \
-		--pidfile /var/run/firewalld.pid
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping FirewallD"
-	start-stop-daemon --stop --quiet --pidfile /var/run/firewalld.pid
-	eend $?
-}
diff --git a/net-firewall/firewalld/files/firewalld.module b/net-firewall/firewalld/files/firewalld.module
new file mode 100644
index 000000000000..8760a30c6361
--- /dev/null
+++ b/net-firewall/firewalld/files/firewalld.module
@@ -0,0 +1,38 @@
+# Copyright (c) 2012 Doug Goldstein <cardoe@cardoe.com>
+# Released under the 2-clause BSD license.
+
+firewalld_depend()
+{
+	after interface
+	before dhcp
+	program start firewall-cmd
+	[ "$IFACE" != "lo" ] && need firewalld
+}
+
+_config_vars="$_config_vars firewalld_zone"
+
+firewalld_post_start()
+{
+	local firewalld_zone=
+	eval firewalld_zone=\$firewalld_zone_${IFVAR}
+
+	_exists || return 0
+
+	if [ "${IFACE}" != "lo" ]; then
+		firewall-cmd --zone="${firewalld_zone}" \
+			--change-interface="${IFACE}" > /dev/null 2>&1
+	fi
+
+	return 0
+}
+
+firewalld_pre_stop()
+{
+	_exists || return 0
+
+	if [ "${IFACE}" != "lo" ]; then
+		firewall-cmd --remove-interface="${IFACE}" > /dev/null 2>&1
+	fi
+
+	return 0
+}
\ No newline at end of file
diff --git a/net-firewall/firewalld/firewalld-0.2.9.ebuild b/net-firewall/firewalld/firewalld-0.2.9.ebuild
index 9422a5b7b109..14084b7add5b 100644
--- a/net-firewall/firewalld/firewalld-0.2.9.ebuild
+++ b/net-firewall/firewalld/firewalld-0.2.9.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/firewalld-0.2.9.ebuild,v 1.3 2012/11/06 07:30:01 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/firewalld-0.2.9.ebuild,v 1.4 2012/11/07 08:13:59 cardoe Exp $
 
 EAPI=4
 PYTHON_COMPAT=( python{2_6,2_7} )
 BACKPORTS=3ab6b297
 
-inherit autotools eutils gnome2-utils python-r1 systemd
+inherit autotools eutils gnome2-utils python-r1 systemd multilib
 
 DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
 HOMEPAGE="http://fedorahosted.org/firewalld"
@@ -25,6 +25,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/pygobject:3
 	net-firewall/ebtables
 	net-firewall/iptables[ipv6]
+	|| ( sys-apps/openrc sys-apps/systemd )
 	gui? (
 		dev-python/pygtk:2
 		>=x11-libs/gtk+-2.6:2
@@ -71,6 +72,12 @@ src_install() {
 	fi
 
 	newinitd "${FILESDIR}"/firewalld.init firewalld
+
+	# Work around until OpenRC starts carrying our module
+	if has_version '<=sys-apps/openrc-0.11.4'; then
+		insinto $(get_libdir)/rc/net
+		newins "${FILESDIR}"/firewalld.module firewalld.sh
+	fi
 }
 
 pkg_preinst() {