From e42ae854f8818adf804c76b193d0524fac4dd1d4 Mon Sep 17 00:00:00 2001 From: Nicholas Vinson Date: Sun, 23 Oct 2016 10:10:49 -0700 Subject: net-firewall/nftables: update systemd file target. Change the systemd unit files to use Before=network-pre.target Wants=network-pre.target as this better aligns with systemd documentation for this type of service. Special thanks to Shaun Bouckaert for triggering this review. He originally asked (via email) about how the connman systemd unit file handled its dependencies which prompted me to check this package as well. As for connman, v1.33-r1 seems to be aligned with systemd documentation. Package-Manager: portage-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/2649 Signed-off-by: Patrice Clement --- .../files/systemd/nftables-restore.service | 4 +- net-firewall/nftables/nftables-0.6-r3.ebuild | 87 ---------------------- net-firewall/nftables/nftables-0.6-r4.ebuild | 87 ++++++++++++++++++++++ 3 files changed, 89 insertions(+), 89 deletions(-) delete mode 100644 net-firewall/nftables/nftables-0.6-r3.ebuild create mode 100644 net-firewall/nftables/nftables-0.6-r4.ebuild (limited to 'net-firewall') diff --git a/net-firewall/nftables/files/systemd/nftables-restore.service b/net-firewall/nftables/files/systemd/nftables-restore.service index fbd5a838af54..4b68b0a5b09e 100644 --- a/net-firewall/nftables/files/systemd/nftables-restore.service +++ b/net-firewall/nftables/files/systemd/nftables-restore.service @@ -1,8 +1,8 @@ [Unit] Description=Store and restore nftables firewall rules ConditionPathExists=/var/lib/nftables/rules-save -Before=network.target -Before=shutdown.target +Before=network-pre.target +Wants=network-pre.target [Service] Type=oneshot diff --git a/net-firewall/nftables/nftables-0.6-r3.ebuild b/net-firewall/nftables/nftables-0.6-r3.ebuild deleted file mode 100644 index 7874baf0062b..000000000000 --- a/net-firewall/nftables/nftables-0.6-r3.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit autotools linux-info systemd - -DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools" -HOMEPAGE="http://netfilter.org/projects/nftables/" -SRC_URI="http://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="debug doc gmp +readline" - -RDEPEND=">=net-libs/libmnl-1.0.3 - >=net-libs/libnftnl-1.0.6 - gmp? ( dev-libs/gmp:0= ) - readline? ( sys-libs/readline:0= )" -DEPEND="${RDEPEND} - >=app-text/docbook2X-0.8.8-r4 - doc? ( >=app-text/dblatex-0.3.7 ) - sys-devel/bison - sys-devel/flex - virtual/pkgconfig" - -S="${WORKDIR}/v${PV}" - -PATCHES=( - "${FILESDIR}/${PN}-0.5-pdf-doc.patch" - "${FILESDIR}/${P}-null-payload-desc-fix.patch" -) - -pkg_setup() { - if kernel_is ge 3 13; then - CONFIG_CHECK="~NF_TABLES" - linux-info_pkg_setup - else - eerror "This package requires kernel version 3.13 or newer to work properly." - fi -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - --sbindir="${EPREFIX}"/sbin \ - $(use_enable doc pdf-doc) \ - $(use_enable debug) \ - $(use_with readline cli) \ - $(use_with !gmp mini_gmp) -} - -src_install() { - default - - dodir /usr/libexec/${PN} - exeinto /usr/libexec/${PN} - doexe "${FILESDIR}"/libexec/${PN}.sh - - newconfd "${FILESDIR}"/${PN}.confd ${PN} - newinitd "${FILESDIR}"/${PN}.init ${PN} - keepdir /var/lib/nftables - - systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service - systemd_enable_service basic.target ${PN}-restore.service -} - -pkg_postinst() { - local save_file - save_file="${EROOT}var/lib/nftables/rules-save" - - elog "In order for the nftables-restore systemd service to start, " - elog "the file, ${save_file}, must exist. To create this " - elog "file run the following command: " - elog "" - elog " touch '${save_file}'" - elog "" - elog "Afterwards, the nftables-restore service should be manually started " - elog "to ensure firewall changes are stored on system shutdown. The " - elog "systemd service will function normally thereafter." -} diff --git a/net-firewall/nftables/nftables-0.6-r4.ebuild b/net-firewall/nftables/nftables-0.6-r4.ebuild new file mode 100644 index 000000000000..7874baf0062b --- /dev/null +++ b/net-firewall/nftables/nftables-0.6-r4.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit autotools linux-info systemd + +DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools" +HOMEPAGE="http://netfilter.org/projects/nftables/" +SRC_URI="http://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="debug doc gmp +readline" + +RDEPEND=">=net-libs/libmnl-1.0.3 + >=net-libs/libnftnl-1.0.6 + gmp? ( dev-libs/gmp:0= ) + readline? ( sys-libs/readline:0= )" +DEPEND="${RDEPEND} + >=app-text/docbook2X-0.8.8-r4 + doc? ( >=app-text/dblatex-0.3.7 ) + sys-devel/bison + sys-devel/flex + virtual/pkgconfig" + +S="${WORKDIR}/v${PV}" + +PATCHES=( + "${FILESDIR}/${PN}-0.5-pdf-doc.patch" + "${FILESDIR}/${P}-null-payload-desc-fix.patch" +) + +pkg_setup() { + if kernel_is ge 3 13; then + CONFIG_CHECK="~NF_TABLES" + linux-info_pkg_setup + else + eerror "This package requires kernel version 3.13 or newer to work properly." + fi +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --sbindir="${EPREFIX}"/sbin \ + $(use_enable doc pdf-doc) \ + $(use_enable debug) \ + $(use_with readline cli) \ + $(use_with !gmp mini_gmp) +} + +src_install() { + default + + dodir /usr/libexec/${PN} + exeinto /usr/libexec/${PN} + doexe "${FILESDIR}"/libexec/${PN}.sh + + newconfd "${FILESDIR}"/${PN}.confd ${PN} + newinitd "${FILESDIR}"/${PN}.init ${PN} + keepdir /var/lib/nftables + + systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service + systemd_enable_service basic.target ${PN}-restore.service +} + +pkg_postinst() { + local save_file + save_file="${EROOT}var/lib/nftables/rules-save" + + elog "In order for the nftables-restore systemd service to start, " + elog "the file, ${save_file}, must exist. To create this " + elog "file run the following command: " + elog "" + elog " touch '${save_file}'" + elog "" + elog "Afterwards, the nftables-restore service should be manually started " + elog "to ensure firewall changes are stored on system shutdown. The " + elog "systemd service will function normally thereafter." +} -- cgit v1.2.3-65-gdbad