diff options
author | Doug Goldstein <cardoe@gentoo.org> | 2012-11-18 05:30:51 +0000 |
---|---|---|
committer | Doug Goldstein <cardoe@gentoo.org> | 2012-11-18 05:30:51 +0000 |
commit | 43a41bd1387b84492e21fe8d3e5d286e29049493 (patch) | |
tree | 920d56ae1560900d1576ae44baef788b31766294 /net-firewall | |
parent | Stabilize on x86 based on a user report in bug #435700 since x86 is falling w... (diff) | |
download | gentoo-2-43a41bd1387b84492e21fe8d3e5d286e29049493.tar.gz gentoo-2-43a41bd1387b84492e21fe8d3e5d286e29049493.tar.bz2 gentoo-2-43a41bd1387b84492e21fe8d3e5d286e29049493.zip |
OpenRC now carries support for FirewallD, handle it.
(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'net-firewall')
-rw-r--r-- | net-firewall/firewalld/ChangeLog | 8 | ||||
-rw-r--r-- | net-firewall/firewalld/firewalld-0.2.9-r1.ebuild | 90 | ||||
-rw-r--r-- | net-firewall/firewalld/firewalld-0.2.9.ebuild | 10 |
3 files changed, 101 insertions, 7 deletions
diff --git a/net-firewall/firewalld/ChangeLog b/net-firewall/firewalld/ChangeLog index c26e002ddab8..ee681d9ffd5e 100644 --- a/net-firewall/firewalld/ChangeLog +++ b/net-firewall/firewalld/ChangeLog @@ -1,6 +1,12 @@ # 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.7 2012/11/10 19:49:37 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/ChangeLog,v 1.8 2012/11/18 05:30:51 cardoe Exp $ + +*firewalld-0.2.9-r1 (18 Nov 2012) + + 18 Nov 2012; Doug Goldstein <cardoe@gentoo.org> firewalld-0.2.9.ebuild, + +firewalld-0.2.9-r1.ebuild: + OpenRC now carries support for FirewallD, handle it. 10 Nov 2012; Doug Goldstein <cardoe@gentoo.org> files/firewalld.module: Fix the OpenRC module. diff --git a/net-firewall/firewalld/firewalld-0.2.9-r1.ebuild b/net-firewall/firewalld/firewalld-0.2.9-r1.ebuild new file mode 100644 index 000000000000..b5f7dcf0249c --- /dev/null +++ b/net-firewall/firewalld/firewalld-0.2.9-r1.ebuild @@ -0,0 +1,90 @@ +# 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-r1.ebuild,v 1.1 2012/11/18 05:30:51 cardoe Exp $ + +EAPI=4 +PYTHON_COMPAT=( python{2_6,2_7} ) +BACKPORTS=190680ba + +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" +SRC_URI="https://fedorahosted.org/released/firewalld/${P}.tar.bz2 + ${BACKPORTS:+http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gui" + +RDEPEND="${PYTHON_DEPS} + dev-python/dbus-python + dev-python/decorator + >=dev-python/python-slip-0.2.7[dbus] + dev-python/pygobject:3 + net-firewall/ebtables + net-firewall/iptables[ipv6] + || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) + gui? ( + dev-python/pygtk:2 + >=x11-libs/gtk+-2.6:2 + x11-libs/gtk+:3 + )" +DEPEND="${RDEPEND} + dev-libs/glib:2 + >=dev-util/intltool-0.35 + sys-devel/gettext" + +src_prepare() { + [[ -n ${BACKPORTS} ]] && \ + EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \ + epatch + + epatch_user + eautoreconf +} + +src_configure() { + python_export_best + + econf \ + --enable-systemd + "$(systemd_with_unitdir 'systemd-unitdir')" +} + +src_install() { + python_foreach_impl \ + emake DESTDIR="${ED}" pythondir="$(python_get_sitedir)" install + + # Get rid of junk + rm -f "${ED}/etc/rc.d/init.d/firewalld" + rm -f "${ED}/etc/sysconfig/firewalld" + rm -rf "${ED}/etc/rc.d/" + rm -rf "${ED}/etc/sysconfig/" + + # For non-gui installs we need to remove GUI bits + if ! use gui; then + rm -f "${ED}/usr/bin/firewall-applet" + rm -f "${ED}/usr/bin/firewall-config" + rm -rf "${ED}/usr/share/icons" + rm -rf "${ED}/usr/share/applications" + fi + + newinitd "${FILESDIR}"/firewalld.init firewalld +} + +pkg_preinst() { + gnome2_icon_savelist + gnome2_schemas_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + gnome2_schemas_update +} + +pkg_postrm() { + gnome2_icon_cache_update + gnome2_schemas_update +} diff --git a/net-firewall/firewalld/firewalld-0.2.9.ebuild b/net-firewall/firewalld/firewalld-0.2.9.ebuild index f5d121831844..cbb10b730f93 100644 --- a/net-firewall/firewalld/firewalld-0.2.9.ebuild +++ b/net-firewall/firewalld/firewalld-0.2.9.ebuild @@ -1,6 +1,6 @@ # 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.6 2012/11/08 03:56:30 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/firewalld-0.2.9.ebuild,v 1.7 2012/11/18 05:30:51 cardoe Exp $ EAPI=4 PYTHON_COMPAT=( python{2_6,2_7} ) @@ -25,7 +25,7 @@ RDEPEND="${PYTHON_DEPS} dev-python/pygobject:3 net-firewall/ebtables net-firewall/iptables[ipv6] - || ( sys-apps/openrc sys-apps/systemd ) + || ( <sys-apps/openrc-0.11.5 sys-apps/systemd ) gui? ( dev-python/pygtk:2 >=x11-libs/gtk+-2.6:2 @@ -74,10 +74,8 @@ src_install() { 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 + insinto $(get_libdir)/rc/net + newins "${FILESDIR}"/firewalld.module firewalld.sh } pkg_preinst() { |