Gentoo Archives: gentoo-commits

From: Matthew Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/
Date: Sun, 30 Jun 2019 01:57:09
Message-Id: 1561859819.3c4624aec145476efcb4ee04eab239d7dc45710a.prometheanfire@gentoo
1 commit: 3c4624aec145476efcb4ee04eab239d7dc45710a
2 Author: Francisco Blas (klondike) Izquierdo Riera <klondike <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 29 23:08:30 2019 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 30 01:56:59 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c4624ae
7
8 net-firewall/nftables: add doc and xtables USE flags
9
10 This commit adds some fixes on the 0.9.1 package:
11 * Adds the doc USE flag to control building of the man pages
12 * Adds the app-text/asciidoc when building the man pages
13 * Adds the xtables USE flag for better compatibility with iptables-compat
14 * Adds the net-firewall/iptables dependency when using the xtables flag
15
16 I have chosen +doc, xtables for better compatibility with prior versions.
17 Also whilst man pages generally make sense, the xtables USE isn't needed
18 on pure nftables setups which are the recommended approach.
19
20 Closes: https://bugs.gentoo.org/688952
21 Signed-off-by: Francisco Blas Izquierdo Riera (klondike) <klondike <AT> gentoo.org>
22 Package-Manager: Portage-2.3.66, Repoman-2.3.11
23 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
24
25 net-firewall/nftables/metadata.xml | 2 ++
26 net-firewall/nftables/nftables-0.9.1.ebuild | 9 +++++++--
27 2 files changed, 9 insertions(+), 2 deletions(-)
28
29 diff --git a/net-firewall/nftables/metadata.xml b/net-firewall/nftables/metadata.xml
30 index dcc71d66d6f..0984d13e0f0 100644
31 --- a/net-firewall/nftables/metadata.xml
32 +++ b/net-firewall/nftables/metadata.xml
33 @@ -14,7 +14,9 @@
34 <name>Francisco Blas Izquierdo Riera</name>
35 </maintainer>
36 <use>
37 + <flag name="doc">Create man pages for the package (requires <pkg>app-text/asciidoc</pkg>)</flag>
38 <flag name="json">Enable JSON support via <pkg>dev-libs/jansson</pkg></flag>
39 <flag name="modern_kernel">Install init scripts for 3.18 or higher kernels with atomic rule updates</flag>
40 + <flag name="xtables">Add libxtables support to try to automatically translate rules added by iptables-compat</flag>
41 </use>
42 </pkgmetadata>
43
44 diff --git a/net-firewall/nftables/nftables-0.9.1.ebuild b/net-firewall/nftables/nftables-0.9.1.ebuild
45 index addd91fa7a8..db6f707d58c 100644
46 --- a/net-firewall/nftables/nftables-0.9.1.ebuild
47 +++ b/net-firewall/nftables/nftables-0.9.1.ebuild
48 @@ -15,7 +15,7 @@ SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2"
49 LICENSE="GPL-2"
50 SLOT="0"
51 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
52 -IUSE="debug +gmp json +modern_kernel python +readline static-libs"
53 +IUSE="debug +doc +gmp json +modern_kernel python +readline static-libs xtables"
54
55 RDEPEND="
56 >=net-libs/libmnl-1.0.3:0=
57 @@ -23,11 +23,14 @@ RDEPEND="
58 json? ( dev-libs/jansson )
59 python? ( ${PYTHON_DEPS} )
60 readline? ( sys-libs/readline:0= )
61 - >=net-libs/libnftnl-1.1.3:0="
62 + >=net-libs/libnftnl-1.1.3:0=
63 + xtables? ( >=net-firewall/iptables-1.6.1 )
64 +"
65
66 DEPEND="${RDEPEND}"
67
68 BDEPEND="
69 + doc? ( app-text/asciidoc )
70 >=app-text/docbook2X-0.8.8-r4
71 sys-devel/bison
72 sys-devel/flex
73 @@ -82,10 +85,12 @@ src_configure() {
74 --disable-python
75 --sbindir="${EPREFIX}"/sbin
76 $(use_enable debug)
77 + $(use_enable doc man-doc)
78 $(use_with !gmp mini_gmp)
79 $(use_with json)
80 $(use_with readline cli)
81 $(use_enable static-libs static)
82 + $(use_with xtables)
83 )
84 econf "${myeconfargs[@]}"
85 }