[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Matthew Thode]

commit: 3db8920138c46d19f2418586e31299c68cd600c7
Author: Matthew Thode  gentoo  org>
AuthorDate: Sat Apr 13 15:36:49 2024 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sat Apr 13 15:36:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3db89201

net-firewall/nftables: enable py3.12

Closes: https://bugs.gentoo.org/929691

Signed-off-by: Matthew Thode  gentoo.org>

 net-firewall/nftables/nftables-1.0.9.ebuild | 2 +-
 net-firewall/nftables/nftables-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/nftables/nftables-1.0.9.ebuild 
b/net-firewall/nftables/nftables-1.0.9.ebuild
index eab6320b4e4f..26816a8b5755 100644
--- a/net-firewall/nftables/nftables-1.0.9.ebuild
+++ b/net-firewall/nftables/nftables-1.0.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/netfilter.org.asc
 inherit edo linux-info distutils-r1 systemd verify-sig
 

diff --git a/net-firewall/nftables/nftables-.ebuild 
b/net-firewall/nftables/nftables-.ebuild
index 8f0a7f337111..a0795444e9b8 100644
--- a/net-firewall/nftables/nftables-.ebuild
+++ b/net-firewall/nftables/nftables-.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/netfilter.org.asc
 inherit edo linux-info distutils-r1 systemd verify-sig
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/files/, net-firewall/nftables/

[Sam James]

commit: 9174964fd14cdb0655d2538eb2709c3e8239a4a1
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 20 05:04:02 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 20 05:04:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9174964f

net-firewall/nftables: drop 1.0.7-r1, 1.0.8-r1, 1.0.8-r2

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/Manifest |   4 -
 .../nftables-1.0.8-fix-regression-evaluate.patch   | 235 -
 net-firewall/nftables/metadata.xml |   1 -
 net-firewall/nftables/nftables-1.0.7-r1.ebuild | 232 
 net-firewall/nftables/nftables-1.0.8-r1.ebuild | 217 ---
 net-firewall/nftables/nftables-1.0.8-r2.ebuild | 223 ---
 6 files changed, 912 deletions(-)

diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 0f38f5b23c9d..07f3200ad5d6 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -1,6 +1,2 @@
-DIST nftables-1.0.7.tar.xz 857140 BLAKE2B 
972adbb958f36b300618ce03fbbfc1fdb6fd55a3512227e4bc1fd71365be5cc8d3ee105424e8cc513588100bf00d5e69486310435efb2b0d3f5d464ed6999859
 SHA512 
063f3a42327fd4dca9214314c7e7bcc7310f2ccbbce4c36f86a291d61d443f94b0f91435ecd04eb757596df8be91a802daeef394ba422c3623a81b2917e01116
-DIST nftables-1.0.7.tar.xz.sig 566 BLAKE2B 
53abe2598e9b362912d3e2e94ea6e04352d0484b9d1d645c8f18b6133be53d63a8d71d500e57528a57aededb84dedaf61010236afda560b16e7642db45e2f45c
 SHA512 
b5821aa6939dc5b4d16065d9d7083e4ff40b9f99417354efbcbc95a8ccde43108b99a5b8a75a24086cd3df2291a049cad3adb7b06e2c098f0eb7861f85c5c768
-DIST nftables-1.0.8.tar.xz 882980 BLAKE2B 
cdf174846cbc3e581993cdee3a24e5ead3fdbb3d6b24d51473ed88affb7fcf70279a8374a4963b31044a9e64cb72ddb28ca1f1686bbaa3101eed4d623fb67d05
 SHA512 
06053c05a0d7c84a5cc4d22733836dadf9880c3552df3dace6d30aea95c7e1edb5528ea45df8576f282c15bf58f23407e26efb22257bd98a478849a8bdd4f8d5
-DIST nftables-1.0.8.tar.xz.sig 566 BLAKE2B 
2f22b9467a55a46ec9e8caf13efe3cd59a6a1a867174602b583549ccaff54576b5f80b5ad9b1cefd208c3f49bc6ce07072626218f479628df369ed7294e1b83b
 SHA512 
0ddd8f29dc5ba891069c63715719f11c0a4745f1e3cd9cd7f9e388ac35835cfbe8f34b371a2ce2a06cbda42384cc72d0bf57746fb02757d68a9b053bbbd67a77
 DIST nftables-1.0.9.tar.xz 971968 BLAKE2B 
1dfd1e79d3a7b645fd0995dad10893d70dbd13c92805c5cf30825acbbeb45071b2095072cecbd14b4f66cf0c284d2937a996c6b8013213438f53b92731af039d
 SHA512 
dc34099658e283d9fd4d06264b593710121074558305ea23ab298c5f6a6b564a826f186241b6e106fbaa4e11160cf77e68bb52b4ce401b28d8d2e403cd4b88e8
 DIST nftables-1.0.9.tar.xz.sig 566 BLAKE2B 
d4bb0a1f629d2950753799fba18f6c3ce50e5ff242816e392245a714bfeccb3408583added4362f1e0da47cc6e30b0b95f864cf8443a1872d59ae40b15b5f706
 SHA512 
9b96ce8539700713ff4802fb2deff5b2ea0dd3155c45f5a8f49a45f70226893c7449e0b79504833b2e63e5290290e693c962128a226ca8f6ca281185bdcd7b51

diff --git 
a/net-firewall/nftables/files/nftables-1.0.8-fix-regression-evaluate.patch 
b/net-firewall/nftables/files/nftables-1.0.8-fix-regression-evaluate.patch
deleted file mode 100644
index 1b81ab0e6ef2..
--- a/net-firewall/nftables/files/nftables-1.0.8-fix-regression-evaluate.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-https://patchwork.ozlabs.org/project/netfilter-devel/patch/20230719001444.154070-1-pa...@netfilter.org/
-https://git.netfilter.org/nftables/commit/?id=5f1676ac9f1aeb36d7695c3c354dade013a1e4f3
-
-From 5f1676ac9f1aeb36d7695c3c354dade013a1e4f3 Mon Sep 17 00:00:00 2001
-From: Pablo Neira Ayuso 
-Date: Tue, 18 Jul 2023 23:10:01 +0200
-Subject: meta: stash context statement length when generating payload/meta
- dependency
-
-... meta mark set ip dscp
-
-generates an implicit dependency from the inet family to match on meta
-nfproto ip.
-
-The length of this implicit expression is incorrectly adjusted to the
-statement length, ie. relational to compare meta nfproto takes 4 bytes
-instead of 1 byte. The evaluation of 'ip dscp' under the meta mark
-statement triggers this implicit dependency which should not consider
-the context statement length since it is added before the statement
-itself.
-
-This problem shows when listing the ruleset, since netlink_parse_cmp()
-where left->len < right->len, hence handling the implicit dependency as
-a concatenation, but it is actually a bug in the evaluation step that
-leads to incorrect bytecode.
-
-Fixes: 3c64ea7995cb ("evaluate: honor statement length in integer evaluation")
-Fixes: edecd58755a8 ("evaluate: support shifts larger than the width of the 
left operand")
-Tested-by: Brian Davidson 
-Signed-off-by: Pablo Neira Ayuso 
 a/src/payload.c
-+++ b/src/payload.c
-@@ -409,6 +409,7 @@ static int payload_add_dependency(struct eval_ctx *ctx,
-   const struct proto_hdr_template *tmpl;
-   struct expr *dep, *left, *right;
-   struct proto_ctx *pctx;
-+  unsigned int stmt_len;
-   struct stmt *stmt;
-   int protocol;
- 
-@@ -429,11 +430,16 @@ 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Arthur Zamarin]

commit: 7d5ed5d96af8ba6a5839858d19d8049a018e85f4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 19:11:13 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 19:11:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d5ed5d9

net-firewall/nftables: Stabilize 1.0.9 hppa, #919962

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-firewall/nftables/nftables-1.0.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.9.ebuild 
b/net-firewall/nftables/nftables-1.0.9.ebuild
index 40e7008f0c38..abbb77889f5c 100644
--- a/net-firewall/nftables/nftables-1.0.9.ebuild
+++ b/net-firewall/nftables/nftables-1.0.9.ebuild
@@ -21,7 +21,7 @@ else
https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )
"
-   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
sparc x86"
+   KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
sparc x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Arthur Zamarin]

commit: 3672e81d1dd7c743d463d5d53f51517fa7edeea0
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec 15 13:02:30 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec 15 13:02:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3672e81d

net-firewall/nftables: Stabilize 1.0.9 x86, #919962

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-firewall/nftables/nftables-1.0.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.9.ebuild 
b/net-firewall/nftables/nftables-1.0.9.ebuild
index d2ee1c7deebb..40e7008f0c38 100644
--- a/net-firewall/nftables/nftables-1.0.9.ebuild
+++ b/net-firewall/nftables/nftables-1.0.9.ebuild
@@ -21,7 +21,7 @@ else
https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )
"
-   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
sparc ~x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
sparc x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Arthur Zamarin]

commit: f6cd5ae7fea560f39f6c692f560483a4ae85311c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec 15 10:44:17 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec 15 10:44:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6cd5ae7

net-firewall/nftables: Stabilize 1.0.9 ppc64, #919962

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-firewall/nftables/nftables-1.0.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.9.ebuild 
b/net-firewall/nftables/nftables-1.0.9.ebuild
index 5e55db2021a5..d2ee1c7deebb 100644
--- a/net-firewall/nftables/nftables-1.0.9.ebuild
+++ b/net-firewall/nftables/nftables-1.0.9.ebuild
@@ -21,7 +21,7 @@ else
https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )
"
-   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
sparc ~x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
sparc ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 4a8d8626ed258173f0266af0a771367741706229
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 15 07:33:58 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 15 07:33:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a8d8626

net-firewall/nftables: Stabilize 1.0.9 amd64, #919962

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.9.ebuild 
b/net-firewall/nftables/nftables-1.0.9.ebuild
index 42834231fbb9..b2d7711bdd2d 100644
--- a/net-firewall/nftables/nftables-1.0.9.ebuild
+++ b/net-firewall/nftables/nftables-1.0.9.ebuild
@@ -21,7 +21,7 @@ else
https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )
"
-   KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
sparc ~x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
sparc ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 63942f317aa45a85cf90e6794817746ee2ce2c55
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 15 07:26:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 15 07:26:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63942f31

net-firewall/nftables: Stabilize 1.0.9 sparc, #919962

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.9.ebuild 
b/net-firewall/nftables/nftables-1.0.9.ebuild
index 491ded3b60cf..42834231fbb9 100644
--- a/net-firewall/nftables/nftables-1.0.9.ebuild
+++ b/net-firewall/nftables/nftables-1.0.9.ebuild
@@ -21,7 +21,7 @@ else
https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )
"
-   KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
+   KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
sparc ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: b7bced62a4597349c91311854c9dc5d5cf22d6a8
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 15 07:16:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 15 07:16:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7bced62

net-firewall/nftables: Stabilize 1.0.9 arm, #919962

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.9.ebuild 
b/net-firewall/nftables/nftables-1.0.9.ebuild
index 777ba6f02278..491ded3b60cf 100644
--- a/net-firewall/nftables/nftables-1.0.9.ebuild
+++ b/net-firewall/nftables/nftables-1.0.9.ebuild
@@ -21,7 +21,7 @@ else
https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )
"
-   KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
+   KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 6d3b7d192bd31ee78b868a52cee6ff84b2a5c611
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 15 07:13:41 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 15 07:13:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d3b7d19

net-firewall/nftables: Stabilize 1.0.9 arm64, #919962

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.9.ebuild 
b/net-firewall/nftables/nftables-1.0.9.ebuild
index 9c828d3d4642..777ba6f02278 100644
--- a/net-firewall/nftables/nftables-1.0.9.ebuild
+++ b/net-firewall/nftables/nftables-1.0.9.ebuild
@@ -21,7 +21,7 @@ else
https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )
"
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86"
+   KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: c537b3488f60d0bffb657726b91d08643b5ccd71
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 20 00:29:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 20 00:50:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c537b348

net-firewall/nftables: add 1.0.9

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/Manifest |  2 ++
 ...{nftables-.ebuild => nftables-1.0.9.ebuild} | 27 ++
 net-firewall/nftables/nftables-.ebuild | 27 ++
 3 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 9efdba0b9910..0f38f5b23c9d 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -2,3 +2,5 @@ DIST nftables-1.0.7.tar.xz 857140 BLAKE2B 
972adbb958f36b300618ce03fbbfc1fdb6fd55
 DIST nftables-1.0.7.tar.xz.sig 566 BLAKE2B 
53abe2598e9b362912d3e2e94ea6e04352d0484b9d1d645c8f18b6133be53d63a8d71d500e57528a57aededb84dedaf61010236afda560b16e7642db45e2f45c
 SHA512 
b5821aa6939dc5b4d16065d9d7083e4ff40b9f99417354efbcbc95a8ccde43108b99a5b8a75a24086cd3df2291a049cad3adb7b06e2c098f0eb7861f85c5c768
 DIST nftables-1.0.8.tar.xz 882980 BLAKE2B 
cdf174846cbc3e581993cdee3a24e5ead3fdbb3d6b24d51473ed88affb7fcf70279a8374a4963b31044a9e64cb72ddb28ca1f1686bbaa3101eed4d623fb67d05
 SHA512 
06053c05a0d7c84a5cc4d22733836dadf9880c3552df3dace6d30aea95c7e1edb5528ea45df8576f282c15bf58f23407e26efb22257bd98a478849a8bdd4f8d5
 DIST nftables-1.0.8.tar.xz.sig 566 BLAKE2B 
2f22b9467a55a46ec9e8caf13efe3cd59a6a1a867174602b583549ccaff54576b5f80b5ad9b1cefd208c3f49bc6ce07072626218f479628df369ed7294e1b83b
 SHA512 
0ddd8f29dc5ba891069c63715719f11c0a4745f1e3cd9cd7f9e388ac35835cfbe8f34b371a2ce2a06cbda42384cc72d0bf57746fb02757d68a9b053bbbd67a77
+DIST nftables-1.0.9.tar.xz 971968 BLAKE2B 
1dfd1e79d3a7b645fd0995dad10893d70dbd13c92805c5cf30825acbbeb45071b2095072cecbd14b4f66cf0c284d2937a996c6b8013213438f53b92731af039d
 SHA512 
dc34099658e283d9fd4d06264b593710121074558305ea23ab298c5f6a6b564a826f186241b6e106fbaa4e11160cf77e68bb52b4ce401b28d8d2e403cd4b88e8
+DIST nftables-1.0.9.tar.xz.sig 566 BLAKE2B 
d4bb0a1f629d2950753799fba18f6c3ce50e5ff242816e392245a714bfeccb3408583added4362f1e0da47cc6e30b0b95f864cf8443a1872d59ae40b15b5f706
 SHA512 
9b96ce8539700713ff4802fb2deff5b2ea0dd3155c45f5a8f49a45f70226893c7449e0b79504833b2e63e5290290e693c962128a226ca8f6ca281185bdcd7b51

diff --git a/net-firewall/nftables/nftables-.ebuild 
b/net-firewall/nftables/nftables-1.0.9.ebuild
similarity index 94%
copy from net-firewall/nftables/nftables-.ebuild
copy to net-firewall/nftables/nftables-1.0.9.ebuild
index db4ad6e3feb7..7a679d809706 100644
--- a/net-firewall/nftables/nftables-.ebuild
+++ b/net-firewall/nftables/nftables-1.0.9.ebuild
@@ -17,8 +17,10 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
EGIT_REPO_URI="https://git.netfilter.org/${PN};
BDEPEND="sys-devel/bison"
 else
-   SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.xz
-   verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )"
+   SRC_URI="
+   https://netfilter.org/projects/nftables/files/${P}.tar.xz
+   verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )
+   "
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
@@ -70,9 +72,6 @@ src_prepare() {
 
 src_configure() {
local myeconfargs=(
-   # We handle python separately
-   --disable-python
-   --disable-static
--sbindir="${EPREFIX}"/sbin
$(use_enable debug)
$(use_enable doc man-doc)
@@ -83,6 +82,7 @@ src_configure() {
$(use_enable static-libs static)
$(use_with xtables)
)
+
econf "${myeconfargs[@]}"
 
if use python; then
@@ -111,10 +111,19 @@ src_test() {
ewarn "Skipping shell tests (requires root)"
fi
 
-   # Need to rig up Python eclass if using this, but it doesn't seem to 
work
-   # for me anyway.
-   #cd tests/py || die
-   #"${EPYTHON}" nft-test.py || die
+   if use python; then
+   pushd tests/py >/dev/null || die
+   distutils-r1_src_test
+   popd >/dev/null || die
+   fi
+}
+
+python_test() {
+   if [[ ${EUID} == 0 ]]; then
+   edo "${EPYTHON}" nft-test.py
+   else
+   ewarn "Skipping Python tests (requires root)"
+   fi
 }
 
 src_install() {

diff --git a/net-firewall/nftables/nftables-.ebuild 
b/net-firewall/nftables/nftables-.ebuild
index db4ad6e3feb7..7a679d809706 100644
--- a/net-firewall/nftables/nftables-.ebuild
+++ b/net-firewall/nftables/nftables-.ebuild
@@ -17,8 +17,10 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Arthur Zamarin]

commit: cb0f71d8e12890db2759f8e71259d7c6f2f7803b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Aug 20 18:09:50 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Aug 20 18:09:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb0f71d8

net-firewall/nftables: Stabilize 1.0.8-r2 arm, #912557

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-firewall/nftables/nftables-1.0.8-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.8-r2.ebuild 
b/net-firewall/nftables/nftables-1.0.8-r2.ebuild
index 242bf08d27ae..f181f9d8158f 100644
--- a/net-firewall/nftables/nftables-1.0.8-r2.ebuild
+++ b/net-firewall/nftables/nftables-1.0.8-r2.ebuild
@@ -21,7 +21,7 @@ else
https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )
"
-   KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
sparc x86"
+   KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
sparc x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Arthur Zamarin]

commit: 1495239521d9483c542c1ebc7295d939ce93e100
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Aug 20 17:36:55 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Aug 20 17:36:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14952395

net-firewall/nftables: Stabilize 1.0.8-r2 amd64, #912557

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-firewall/nftables/nftables-1.0.8-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.8-r2.ebuild 
b/net-firewall/nftables/nftables-1.0.8-r2.ebuild
index 6e4363b4e446..242bf08d27ae 100644
--- a/net-firewall/nftables/nftables-1.0.8-r2.ebuild
+++ b/net-firewall/nftables/nftables-1.0.8-r2.ebuild
@@ -21,7 +21,7 @@ else
https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )
"
-   KEYWORDS="~amd64 ~arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
sparc x86"
+   KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
sparc x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: cedda6e341e85979d77c2a2136917f07f11d3264
Author: Sam James  gentoo  org>
AuthorDate: Sun Aug 20 13:15:55 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 20 13:15:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cedda6e3

net-firewall/nftables: Stabilize 1.0.8-r2 arm64, #912557

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.8-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.8-r2.ebuild 
b/net-firewall/nftables/nftables-1.0.8-r2.ebuild
index 6f5aa17df7d5..6e4363b4e446 100644
--- a/net-firewall/nftables/nftables-1.0.8-r2.ebuild
+++ b/net-firewall/nftables/nftables-1.0.8-r2.ebuild
@@ -21,7 +21,7 @@ else
https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )
"
-   KEYWORDS="~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
sparc x86"
+   KEYWORDS="~amd64 ~arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
sparc x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 2ca86f46a23f8f3775c8e7b073a2a39ef9905946
Author: Sam James  gentoo  org>
AuthorDate: Sun Aug 20 13:10:51 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 20 13:10:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ca86f46

net-firewall/nftables: Stabilize 1.0.8-r2 ppc64, #912557

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.8-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.8-r2.ebuild 
b/net-firewall/nftables/nftables-1.0.8-r2.ebuild
index 62ffb1d2f12b..6a75b5ea1519 100644
--- a/net-firewall/nftables/nftables-1.0.8-r2.ebuild
+++ b/net-firewall/nftables/nftables-1.0.8-r2.ebuild
@@ -21,7 +21,7 @@ else
https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )
"
-   KEYWORDS="~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
sparc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
sparc ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: b074fdb2760821472ac133725a118f979f14a1c4
Author: Sam James  gentoo  org>
AuthorDate: Sun Aug 20 13:10:52 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 20 13:10:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b074fdb2

net-firewall/nftables: Stabilize 1.0.8-r2 x86, #912557

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.8-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.8-r2.ebuild 
b/net-firewall/nftables/nftables-1.0.8-r2.ebuild
index 6a75b5ea1519..6f5aa17df7d5 100644
--- a/net-firewall/nftables/nftables-1.0.8-r2.ebuild
+++ b/net-firewall/nftables/nftables-1.0.8-r2.ebuild
@@ -21,7 +21,7 @@ else
https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )
"
-   KEYWORDS="~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
sparc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
sparc x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: ca4b51c6e7aca55910928e2fc9833b78a10e14c1
Author: Sam James  gentoo  org>
AuthorDate: Sun Aug 20 11:27:44 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 20 11:27:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca4b51c6

net-firewall/nftables: Stabilize 1.0.8-r2 hppa, #912557

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.8-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.8-r2.ebuild 
b/net-firewall/nftables/nftables-1.0.8-r2.ebuild
index 66fcb88a96d3..62ffb1d2f12b 100644
--- a/net-firewall/nftables/nftables-1.0.8-r2.ebuild
+++ b/net-firewall/nftables/nftables-1.0.8-r2.ebuild
@@ -21,7 +21,7 @@ else
https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )
"
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
sparc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
sparc ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: b382ecf44b2297a921b9db692678cd2d60b57854
Author: Sam James  gentoo  org>
AuthorDate: Sun Aug 20 08:29:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 20 08:29:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b382ecf4

net-firewall/nftables: Stabilize 1.0.8-r2 sparc, #912557

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.8-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.8-r2.ebuild 
b/net-firewall/nftables/nftables-1.0.8-r2.ebuild
index d19cafc3218a..4dfd26f6c24f 100644
--- a/net-firewall/nftables/nftables-1.0.8-r2.ebuild
+++ b/net-firewall/nftables/nftables-1.0.8-r2.ebuild
@@ -21,7 +21,7 @@ else
https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )
"
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv sparc ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 0b78bebcddf7d2fe49a863d9680003e62604679b
Author: Sam James  gentoo  org>
AuthorDate: Sun Aug 20 08:29:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 20 08:29:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b78bebc

net-firewall/nftables: Stabilize 1.0.8-r2 ppc, #912557

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.8-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.8-r2.ebuild 
b/net-firewall/nftables/nftables-1.0.8-r2.ebuild
index 4dfd26f6c24f..66fcb88a96d3 100644
--- a/net-firewall/nftables/nftables-1.0.8-r2.ebuild
+++ b/net-firewall/nftables/nftables-1.0.8-r2.ebuild
@@ -21,7 +21,7 @@ else
https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )
"
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv sparc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
sparc ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/files/, net-firewall/nftables/

[Sam James]

commit: 06e1673af5319f058aaddf278ec0fcdfe7311701
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul 19 18:44:19 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 19 18:44:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06e1673a

net-firewall/nftables: backport 1.0.8 regression fix

Thanks to kerframil for the heads up.

Signed-off-by: Sam James  gentoo.org>

 .../nftables-1.0.8-fix-regression-evaluate.patch   | 235 +
 net-firewall/nftables/nftables-1.0.8-r2.ebuild | 223 +++
 2 files changed, 458 insertions(+)

diff --git 
a/net-firewall/nftables/files/nftables-1.0.8-fix-regression-evaluate.patch 
b/net-firewall/nftables/files/nftables-1.0.8-fix-regression-evaluate.patch
new file mode 100644
index ..1b81ab0e6ef2
--- /dev/null
+++ b/net-firewall/nftables/files/nftables-1.0.8-fix-regression-evaluate.patch
@@ -0,0 +1,235 @@
+https://patchwork.ozlabs.org/project/netfilter-devel/patch/20230719001444.154070-1-pa...@netfilter.org/
+https://git.netfilter.org/nftables/commit/?id=5f1676ac9f1aeb36d7695c3c354dade013a1e4f3
+
+From 5f1676ac9f1aeb36d7695c3c354dade013a1e4f3 Mon Sep 17 00:00:00 2001
+From: Pablo Neira Ayuso 
+Date: Tue, 18 Jul 2023 23:10:01 +0200
+Subject: meta: stash context statement length when generating payload/meta
+ dependency
+
+... meta mark set ip dscp
+
+generates an implicit dependency from the inet family to match on meta
+nfproto ip.
+
+The length of this implicit expression is incorrectly adjusted to the
+statement length, ie. relational to compare meta nfproto takes 4 bytes
+instead of 1 byte. The evaluation of 'ip dscp' under the meta mark
+statement triggers this implicit dependency which should not consider
+the context statement length since it is added before the statement
+itself.
+
+This problem shows when listing the ruleset, since netlink_parse_cmp()
+where left->len < right->len, hence handling the implicit dependency as
+a concatenation, but it is actually a bug in the evaluation step that
+leads to incorrect bytecode.
+
+Fixes: 3c64ea7995cb ("evaluate: honor statement length in integer evaluation")
+Fixes: edecd58755a8 ("evaluate: support shifts larger than the width of the 
left operand")
+Tested-by: Brian Davidson 
+Signed-off-by: Pablo Neira Ayuso 
+--- a/src/payload.c
 b/src/payload.c
+@@ -409,6 +409,7 @@ static int payload_add_dependency(struct eval_ctx *ctx,
+   const struct proto_hdr_template *tmpl;
+   struct expr *dep, *left, *right;
+   struct proto_ctx *pctx;
++  unsigned int stmt_len;
+   struct stmt *stmt;
+   int protocol;
+ 
+@@ -429,11 +430,16 @@ static int payload_add_dependency(struct eval_ctx *ctx,
+   constant_data_ptr(protocol, tmpl->len));
+ 
+   dep = relational_expr_alloc(>location, OP_EQ, left, right);
++
++  stmt_len = ctx->stmt_len;
++  ctx->stmt_len = 0;
++
+   stmt = expr_stmt_alloc(>location, dep);
+   if (stmt_evaluate(ctx, stmt) < 0) {
+   return expr_error(ctx->msgs, expr,
+ "dependency statement is invalid");
+   }
++  ctx->stmt_len = stmt_len;
+ 
+   if (ctx->inner_desc) {
+   if (tmpl->meta_key)
+@@ -543,6 +549,7 @@ int payload_gen_dependency(struct eval_ctx *ctx, const 
struct expr *expr,
+   const struct hook_proto_desc *h;
+   const struct proto_desc *desc;
+   struct proto_ctx *pctx;
++  unsigned int stmt_len;
+   struct stmt *stmt;
+   uint16_t type;
+ 
+@@ -559,12 +566,18 @@ int payload_gen_dependency(struct eval_ctx *ctx, const 
struct expr *expr,
+ "protocol specification is invalid "
+ "for this family");
+ 
++  stmt_len = ctx->stmt_len;
++  ctx->stmt_len = 0;
++
+   stmt = meta_stmt_meta_iiftype(>location, type);
+   if (stmt_evaluate(ctx, stmt) < 0) {
+   return expr_error(ctx->msgs, expr,
+ "dependency statement is invalid");
+   }
+   *res = stmt;
++
++  ctx->stmt_len = stmt_len;
++
+   return 0;
+   }
+ 
+--- a/tests/py/inet/meta.t
 b/tests/py/inet/meta.t
+@@ -25,3 +25,8 @@ meta mark set ct mark >> 8;ok
+ meta mark . tcp dport { 0x000a-0x0014 . 80-90, 0x0010-0x00100123 
. 100-120 };ok
+ ip saddr . meta mark { 1.2.3.4 . 0x0100 , 1.2.3.6-1.2.3.8 . 
0x0200-0x0300 };ok
+ ip saddr . meta mark { 1.2.3.4 . 0x0100 , 5.6.7.8 . 0x0200 };ok
++
++meta mark set ip dscp;ok
++meta mark set ip dscp | 0x40;ok
++meta mark set ip6 dscp;ok
++meta mark set ip6 dscp | 0x40;ok
+--- a/tests/py/inet/meta.t.json
 b/tests/py/inet/meta.t.json
+@@ -440,3 +440,89 @@
+ }
+ ]
+ 
++# meta mark set ip dscp
++[
++{
++"mangle": {
++"key": {
++"meta": {
++  

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: c6e48f7915516ed955c669d7a185c6ad8dfdd266
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 16 05:24:36 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 16 05:24:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6e48f79

net-firewall/nftables: update DESCRIPTION

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.7-r1.ebuild | 2 +-
 net-firewall/nftables/nftables-1.0.8-r1.ebuild | 2 +-
 net-firewall/nftables/nftables-.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-firewall/nftables/nftables-1.0.7-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.7-r1.ebuild
index 461806c0f9f7..48293af58b97 100644
--- a/net-firewall/nftables/nftables-1.0.7-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.7-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{9..11} )
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
 inherit edo linux-info distutils-r1 systemd verify-sig
 
-DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
+DESCRIPTION="Linux kernel firewall, NAT and packet mangling tools"
 HOMEPAGE="https://netfilter.org/projects/nftables/;
 
 if [[ ${PV} =~ ^[9]{4,}$ ]]; then

diff --git a/net-firewall/nftables/nftables-1.0.8-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.8-r1.ebuild
index 6acc2d710064..db4ad6e3feb7 100644
--- a/net-firewall/nftables/nftables-1.0.8-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.8-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{10..11} )
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
 inherit edo linux-info distutils-r1 systemd verify-sig
 
-DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
+DESCRIPTION="Linux kernel firewall, NAT and packet mangling tools"
 HOMEPAGE="https://netfilter.org/projects/nftables/;
 
 if [[ ${PV} =~ ^[9]{4,}$ ]]; then

diff --git a/net-firewall/nftables/nftables-.ebuild 
b/net-firewall/nftables/nftables-.ebuild
index 6acc2d710064..db4ad6e3feb7 100644
--- a/net-firewall/nftables/nftables-.ebuild
+++ b/net-firewall/nftables/nftables-.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{10..11} )
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
 inherit edo linux-info distutils-r1 systemd verify-sig
 
-DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
+DESCRIPTION="Linux kernel firewall, NAT and packet mangling tools"
 HOMEPAGE="https://netfilter.org/projects/nftables/;
 
 if [[ ${PV} =~ ^[9]{4,}$ ]]; then

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 430383814e62b1e25efaf2f8e786db772a8b02f4
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 15 13:20:41 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 15 13:20:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43038381

net-firewall/nftables: always install -mk variants

Fixes: 6a42bdbee74a5273dc7177cb62a250dffe21dea8
Signed-off-by: Sam James  gentoo.org>

 .../nftables/{nftables-1.0.8.ebuild => nftables-1.0.8-r1.ebuild}| 6 +++---
 net-firewall/nftables/nftables-.ebuild  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-firewall/nftables/nftables-1.0.8.ebuild 
b/net-firewall/nftables/nftables-1.0.8-r1.ebuild
similarity index 97%
rename from net-firewall/nftables/nftables-1.0.8.ebuild
rename to net-firewall/nftables/nftables-1.0.8-r1.ebuild
index d1055f03bbea..6acc2d710064 100644
--- a/net-firewall/nftables/nftables-1.0.8.ebuild
+++ b/net-firewall/nftables/nftables-1.0.8-r1.ebuild
@@ -133,9 +133,9 @@ src_install() {
rmdir "${ED}"/etc/nftables || die
 
exeinto /usr/libexec/${PN}
-   newexe "${FILESDIR}"/libexec/${PN}.sh ${PN}.sh
-   newconfd "${FILESDIR}"/${PN}.confd ${PN}
-   newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+   newexe "${FILESDIR}"/libexec/${PN}-mk.sh ${PN}.sh
+   newconfd "${FILESDIR}"/${PN}-mk.confd ${PN}
+   newinitd "${FILESDIR}"/${PN}-mk.init-r1 ${PN}
keepdir /var/lib/nftables
 
systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service

diff --git a/net-firewall/nftables/nftables-.ebuild 
b/net-firewall/nftables/nftables-.ebuild
index d1055f03bbea..6acc2d710064 100644
--- a/net-firewall/nftables/nftables-.ebuild
+++ b/net-firewall/nftables/nftables-.ebuild
@@ -133,9 +133,9 @@ src_install() {
rmdir "${ED}"/etc/nftables || die
 
exeinto /usr/libexec/${PN}
-   newexe "${FILESDIR}"/libexec/${PN}.sh ${PN}.sh
-   newconfd "${FILESDIR}"/${PN}.confd ${PN}
-   newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+   newexe "${FILESDIR}"/libexec/${PN}-mk.sh ${PN}.sh
+   newconfd "${FILESDIR}"/${PN}-mk.confd ${PN}
+   newinitd "${FILESDIR}"/${PN}-mk.init-r1 ${PN}
keepdir /var/lib/nftables
 
systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 6a42bdbee74a5273dc7177cb62a250dffe21dea8
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 15 13:15:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 15 13:17:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a42bdbe

net-firewall/nftables: add 1.0.8

With USE=modern-kernel dropped, for two reasons:
1. We do USE=old-kernel for this normally
2. > 3.19 is not simply "modern".

And I suppose a third:
3. You shouldn't use nftables on such an old kernel anyway, as it's buggy.

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/Manifest |  2 ++
 ...{nftables-.ebuild => nftables-1.0.8.ebuild} | 31 ++
 net-firewall/nftables/nftables-.ebuild | 31 ++
 3 files changed, 18 insertions(+), 46 deletions(-)

diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 61843826524a..9efdba0b9910 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -1,2 +1,4 @@
 DIST nftables-1.0.7.tar.xz 857140 BLAKE2B 
972adbb958f36b300618ce03fbbfc1fdb6fd55a3512227e4bc1fd71365be5cc8d3ee105424e8cc513588100bf00d5e69486310435efb2b0d3f5d464ed6999859
 SHA512 
063f3a42327fd4dca9214314c7e7bcc7310f2ccbbce4c36f86a291d61d443f94b0f91435ecd04eb757596df8be91a802daeef394ba422c3623a81b2917e01116
 DIST nftables-1.0.7.tar.xz.sig 566 BLAKE2B 
53abe2598e9b362912d3e2e94ea6e04352d0484b9d1d645c8f18b6133be53d63a8d71d500e57528a57aededb84dedaf61010236afda560b16e7642db45e2f45c
 SHA512 
b5821aa6939dc5b4d16065d9d7083e4ff40b9f99417354efbcbc95a8ccde43108b99a5b8a75a24086cd3df2291a049cad3adb7b06e2c098f0eb7861f85c5c768
+DIST nftables-1.0.8.tar.xz 882980 BLAKE2B 
cdf174846cbc3e581993cdee3a24e5ead3fdbb3d6b24d51473ed88affb7fcf70279a8374a4963b31044a9e64cb72ddb28ca1f1686bbaa3101eed4d623fb67d05
 SHA512 
06053c05a0d7c84a5cc4d22733836dadf9880c3552df3dace6d30aea95c7e1edb5528ea45df8576f282c15bf58f23407e26efb22257bd98a478849a8bdd4f8d5
+DIST nftables-1.0.8.tar.xz.sig 566 BLAKE2B 
2f22b9467a55a46ec9e8caf13efe3cd59a6a1a867174602b583549ccaff54576b5f80b5ad9b1cefd208c3f49bc6ce07072626218f479628df369ed7294e1b83b
 SHA512 
0ddd8f29dc5ba891069c63715719f11c0a4745f1e3cd9cd7f9e388ac35835cfbe8f34b371a2ce2a06cbda42384cc72d0bf57746fb02757d68a9b053bbbd67a77

diff --git a/net-firewall/nftables/nftables-.ebuild 
b/net-firewall/nftables/nftables-1.0.8.ebuild
similarity index 89%
copy from net-firewall/nftables/nftables-.ebuild
copy to net-firewall/nftables/nftables-1.0.8.ebuild
index bee5c7fd77bd..d1055f03bbea 100644
--- a/net-firewall/nftables/nftables-.ebuild
+++ b/net-firewall/nftables/nftables-1.0.8.ebuild
@@ -4,7 +4,8 @@
 EAPI=8
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
 inherit edo linux-info distutils-r1 systemd verify-sig
 
@@ -25,21 +26,19 @@ fi
 # See COPYING: new code is GPL-2+, existing code is GPL-2
 LICENSE="GPL-2 GPL-2+"
 SLOT="0/1"
-IUSE="debug doc +gmp json libedit +modern-kernel python +readline static-libs 
test xtables"
+IUSE="debug doc +gmp json libedit python +readline static-libs test xtables"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
>=net-libs/libmnl-1.0.4:=
-   >=net-libs/libnftnl-1.2.5:=
+   >=net-libs/libnftnl-1.2.6:=
gmp? ( dev-libs/gmp:= )
json? ( dev-libs/jansson:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:= )
xtables? ( >=net-firewall/iptables-1.6.1:= )
 "
-
 DEPEND="${RDEPEND}"
-
 BDEPEND+="
sys-devel/flex
virtual/pkgconfig
@@ -47,7 +46,7 @@ BDEPEND+="
app-text/asciidoc
>=app-text/docbook2X-0.8.8-r4
)
-   python? ( ${PYTHON_DEPS} )
+   python? ( ${DISTUTILS_DEPS} )
 "
 
 REQUIRED_USE="
@@ -55,18 +54,6 @@ REQUIRED_USE="
libedit? ( !readline )
 "
 
-pkg_setup() {
-   if kernel_is ge 3 13; then
-   if use modern-kernel && kernel_is lt 3 18; then
-   eerror "The modern-kernel USE flag requires kernel 
version 3.18 or newer to work properly."
-   fi
-   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
 
@@ -145,12 +132,10 @@ src_install() {
mv "${ED}"/etc/nftables/osf "${ED}"/usr/share/doc/${PF}/skels/osf || die
rmdir "${ED}"/etc/nftables || die
 
-   local mksuffix="$(usex modern-kernel '-mk' '')"
-
exeinto /usr/libexec/${PN}
-   newexe "${FILESDIR}"/libexec/${PN}${mksuffix}.sh ${PN}.sh
-   newconfd "${FILESDIR}"/${PN}${mksuffix}.confd ${PN}
-   newinitd "${FILESDIR}"/${PN}${mksuffix}.init-r1 ${PN}
+   newexe "${FILESDIR}"/libexec/${PN}.sh ${PN}.sh
+   newconfd 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 79559026aedfa0a4eff3a063a301d8e68fb06934
Author: Sam James  gentoo  org>
AuthorDate: Mon May  1 13:33:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  1 13:33:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79559026

net-firewall/nftables: drop 1.0.5-r1, 1.0.6-r1

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/Manifest |   4 -
 net-firewall/nftables/nftables-1.0.5-r1.ebuild | 231 -
 net-firewall/nftables/nftables-1.0.6-r1.ebuild | 231 -
 3 files changed, 466 deletions(-)

diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 2d752595dfcf..61843826524a 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -1,6 +1,2 @@
-DIST nftables-1.0.5.tar.bz2 982538 BLAKE2B 
5d58170b8fc6feccc1581653cd0815d37b59b43b7f4f9bff9f7fb46928c6c7eee5a6f07150c404f7cf42f5a1d2e980860a4dd2589b99773179e019a093c42cfa
 SHA512 
51cbf10579db7eed58f4358044840f2ce1bffe84533c5fb03e0ebcc702970856455576ac793169c94d38a9f8148e33631ad91444e54a8be189d93af7c27feb9a
-DIST nftables-1.0.5.tar.bz2.sig 566 BLAKE2B 
7744a84c213999b35c3094fa5d9f974acec6fedac3d310422834285823825bcb14fb55b463d88b91fa41d79e33ce34498769992d912b7178fa1f70bd7a1e0977
 SHA512 
fbff6b5b28d81e964d4523729c7866d0b52d764d090cae70a43d850bc579b17308ec41a3d7fe6707877850028e99ad09c33b5e87fa16ac5199dfeba193a61511
-DIST nftables-1.0.6.tar.xz 834584 BLAKE2B 
7c14db883f0ee9394b603870c93dcc92ce472bf0349a59d0e377f1d44efc870df3449d6f2dc9a198f2e396e5d73b19532dac498e832083ca8cf65cc78db9ccd4
 SHA512 
afe08381acd27d39cc94743190b07c579f8c49c4182c9b8753d5b3a0b7d1fe89ed664fdbc19cef1547c3ca4a0c1e32ca4303dba9ec626272fa08c77e88c9
-DIST nftables-1.0.6.tar.xz.sig 566 BLAKE2B 
3f90c48f521a1c433be9d0bee3b2beb080ac51f07c213f598af217b2d1b2e883e432f014c1a378c18eac4b8620e323fbdebb654aa53b345210a3f62ccfe93507
 SHA512 
83657d213e675c8ffa377112efc7fb0f5b756287f06aa9ccd3716eb76b87a14dab01a3ee82929511f26f7e9ce407d8b7ac0dd706c8211ad007fdfcf11d679a93
 DIST nftables-1.0.7.tar.xz 857140 BLAKE2B 
972adbb958f36b300618ce03fbbfc1fdb6fd55a3512227e4bc1fd71365be5cc8d3ee105424e8cc513588100bf00d5e69486310435efb2b0d3f5d464ed6999859
 SHA512 
063f3a42327fd4dca9214314c7e7bcc7310f2ccbbce4c36f86a291d61d443f94b0f91435ecd04eb757596df8be91a802daeef394ba422c3623a81b2917e01116
 DIST nftables-1.0.7.tar.xz.sig 566 BLAKE2B 
53abe2598e9b362912d3e2e94ea6e04352d0484b9d1d645c8f18b6133be53d63a8d71d500e57528a57aededb84dedaf61010236afda560b16e7642db45e2f45c
 SHA512 
b5821aa6939dc5b4d16065d9d7083e4ff40b9f99417354efbcbc95a8ccde43108b99a5b8a75a24086cd3df2291a049cad3adb7b06e2c098f0eb7861f85c5c768

diff --git a/net-firewall/nftables/nftables-1.0.5-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.5-r1.ebuild
deleted file mode 100644
index 232290e36198..
--- a/net-firewall/nftables/nftables-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{9..11} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
-inherit edo linux-info distutils-r1 systemd verify-sig
-
-DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
-HOMEPAGE="https://netfilter.org/projects/nftables/;
-
-if [[ ${PV} =~ ^[9]{4,}$ ]]; then
-   inherit autotools git-r3
-   EGIT_REPO_URI="https://git.netfilter.org/${PN};
-   BDEPEND="sys-devel/bison"
-else
-   SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
-   verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-   KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
sparc x86"
-   BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/1"
-IUSE="debug doc +gmp json libedit +modern-kernel python +readline static-libs 
test xtables"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   >=net-libs/libmnl-1.0.4:0=
-   >=net-libs/libnftnl-1.2.3:0=
-   gmp? ( dev-libs/gmp:= )
-   json? ( dev-libs/jansson:= )
-   python? ( ${PYTHON_DEPS} )
-   readline? ( sys-libs/readline:= )
-   xtables? ( >=net-firewall/iptables-1.6.1:= )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND+="
-   sys-devel/flex
-   virtual/pkgconfig
-   doc? (
-   app-text/asciidoc
-   >=app-text/docbook2X-0.8.8-r4
-   )
-   python? ( ${PYTHON_DEPS} )
-"
-
-REQUIRED_USE="
-   python? ( ${PYTHON_REQUIRED_USE} )
-   libedit? ( !readline )
-"
-
-pkg_setup() {
-   if kernel_is ge 3 13; then
-   if use modern-kernel && kernel_is lt 3 18; then
-   eerror "The modern-kernel USE flag requires kernel 
version 3.18 or newer to work properly."
-   fi
-   CONFIG_CHECK="~NF_TABLES"
-   linux-info_pkg_setup
-   

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 7479c520fdabeba0dbe4f7efd9c2a9d514d5cb2c
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Fri Apr 28 12:35:27 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 29 08:47:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7479c520

net-firewall/nftables: stable 1.0.7-r1 for hppa, bug #904916

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.7-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.7-r1.ebuild
index e76e0eb87406..461806c0f9f7 100644
--- a/net-firewall/nftables/nftables-1.0.7-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.7-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )"
-   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
sparc x86"
+   KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
sparc x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 1248ebc4d186efdf4c4c43be162593559d94bb1f
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Fri Apr 28 12:31:58 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 29 08:47:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1248ebc4

net-firewall/nftables: stable 1.0.7-r1 for sparc, bug #904916

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.7-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.7-r1.ebuild
index a8b06e75e1a3..e76e0eb87406 100644
--- a/net-firewall/nftables/nftables-1.0.7-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.7-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )"
-   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~sparc x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
sparc x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Jakov Smolić]

commit: ba2626e01422eef9927fa51fd5b34d7a70b60d0d
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Apr 24 12:38:18 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Apr 24 12:38:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba2626e0

net-firewall/nftables: Stabilize 1.0.7-r1 ppc, #904916

Signed-off-by: Jakov Smolić  gentoo.org>

 net-firewall/nftables/nftables-1.0.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.7-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.7-r1.ebuild
index f0ed5386769b..a8b06e75e1a3 100644
--- a/net-firewall/nftables/nftables-1.0.7-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.7-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )"
-   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~sparc x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~sparc x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Arthur Zamarin]

commit: f74d4da77c085bb4ec1f1b82654393abf52b7c88
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Apr 24 08:25:05 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Apr 24 08:25:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f74d4da7

net-firewall/nftables: Stabilize 1.0.7-r1 arm, #904916

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-firewall/nftables/nftables-1.0.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.7-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.7-r1.ebuild
index ea92092b6450..061a97f8c2f9 100644
--- a/net-firewall/nftables/nftables-1.0.7-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.7-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )"
-   KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~sparc x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~sparc x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Arthur Zamarin]

commit: a87b18fe1bdf31641058573f00114381ffbd6de1
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Apr 24 08:25:06 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Apr 24 08:25:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a87b18fe

net-firewall/nftables: Stabilize 1.0.7-r1 ppc64, #904916

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-firewall/nftables/nftables-1.0.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.7-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.7-r1.ebuild
index 061a97f8c2f9..f0ed5386769b 100644
--- a/net-firewall/nftables/nftables-1.0.7-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.7-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )"
-   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~sparc x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~sparc x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 7963f86c3f731869ea21163bf84abf1523020c24
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 23 22:59:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 23 22:59:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7963f86c

net-firewall/nftables: Stabilize 1.0.7-r1 amd64, #904916

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.7-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.7-r1.ebuild
index bee5c7fd77bd..43730acaf1c2 100644
--- a/net-firewall/nftables/nftables-1.0.7-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.7-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )"
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: e605c94c6e0e53c9c0de6fcdea103b93b7c668bf
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 23 22:59:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 23 22:59:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e605c94c

net-firewall/nftables: Stabilize 1.0.7-r1 arm64, #904916

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.7-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.7-r1.ebuild
index 43730acaf1c2..411490762503 100644
--- a/net-firewall/nftables/nftables-1.0.7-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.7-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )"
-   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
+   KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 90b287735ec608aebbd39691cc5c2231af843f14
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 23 22:59:31 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 23 22:59:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90b28773

net-firewall/nftables: Stabilize 1.0.7-r1 x86, #904916

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.7-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.7-r1.ebuild
index 411490762503..ea92092b6450 100644
--- a/net-firewall/nftables/nftables-1.0.7-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.7-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )"
-   KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
+   KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~sparc x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: a0152b9752228314727fb6e1e757c1305a08b4ec
Author: Kerin Millar  plushkava  net>
AuthorDate: Wed Mar 22 03:29:49 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 22 04:05:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0152b97

net-firewall/nftables: Always require sys-devel/flex for building

It is always necessary for flex to be available, whereas bison is only
necessary where building from git. Update the BDEPEND declarations to
reflect this. Also, bump the revision number for the formal releases
because --changed-deps isn't a commonly used option and nftables isn't
a particularly large package.

Signed-off-by: Kerin Millar  plushkava.net>
Closes: https://bugs.gentoo.org/876730
Signed-off-by: Sam James  gentoo.org>

 .../nftables/{nftables-1.0.5.ebuild => nftables-1.0.5-r1.ebuild} | 9 +++--
 .../nftables/{nftables-1.0.6.ebuild => nftables-1.0.6-r1.ebuild} | 9 +++--
 .../nftables/{nftables-1.0.7.ebuild => nftables-1.0.7-r1.ebuild} | 9 +++--
 net-firewall/nftables/nftables-.ebuild   | 9 +++--
 4 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/net-firewall/nftables/nftables-1.0.5.ebuild 
b/net-firewall/nftables/nftables-1.0.5-r1.ebuild
similarity index 98%
rename from net-firewall/nftables/nftables-1.0.5.ebuild
rename to net-firewall/nftables/nftables-1.0.5-r1.ebuild
index 5226ca74577d..232290e36198 100644
--- a/net-firewall/nftables/nftables-1.0.5.ebuild
+++ b/net-firewall/nftables/nftables-1.0.5-r1.ebuild
@@ -14,16 +14,12 @@ HOMEPAGE="https://netfilter.org/projects/nftables/;
 if [[ ${PV} =~ ^[9]{4,}$ ]]; then
inherit autotools git-r3
EGIT_REPO_URI="https://git.netfilter.org/${PN};
-
-   BDEPEND="
-   sys-devel/bison
-   sys-devel/flex
-   "
+   BDEPEND="sys-devel/bison"
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
sparc x86"
-   BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
+   BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 
 LICENSE="GPL-2"
@@ -44,6 +40,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 BDEPEND+="
+   sys-devel/flex
virtual/pkgconfig
doc? (
app-text/asciidoc

diff --git a/net-firewall/nftables/nftables-1.0.6.ebuild 
b/net-firewall/nftables/nftables-1.0.6-r1.ebuild
similarity index 98%
rename from net-firewall/nftables/nftables-1.0.6.ebuild
rename to net-firewall/nftables/nftables-1.0.6-r1.ebuild
index e5de7f69c0a1..80c434c2fc43 100644
--- a/net-firewall/nftables/nftables-1.0.6.ebuild
+++ b/net-firewall/nftables/nftables-1.0.6-r1.ebuild
@@ -14,16 +14,12 @@ HOMEPAGE="https://netfilter.org/projects/nftables/;
 if [[ ${PV} =~ ^[9]{4,}$ ]]; then
inherit autotools git-r3
EGIT_REPO_URI="https://git.netfilter.org/${PN};
-
-   BDEPEND="
-   sys-devel/bison
-   sys-devel/flex
-   "
+   BDEPEND="sys-devel/bison"
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )"
KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
sparc x86"
-   BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
+   BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 
 LICENSE="GPL-2"
@@ -44,6 +40,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 BDEPEND+="
+   sys-devel/flex
virtual/pkgconfig
doc? (
app-text/asciidoc

diff --git a/net-firewall/nftables/nftables-1.0.7.ebuild 
b/net-firewall/nftables/nftables-1.0.7-r1.ebuild
similarity index 98%
rename from net-firewall/nftables/nftables-1.0.7.ebuild
rename to net-firewall/nftables/nftables-1.0.7-r1.ebuild
index 13ecec61248b..bee5c7fd77bd 100644
--- a/net-firewall/nftables/nftables-1.0.7.ebuild
+++ b/net-firewall/nftables/nftables-1.0.7-r1.ebuild
@@ -14,16 +14,12 @@ HOMEPAGE="https://netfilter.org/projects/nftables/;
 if [[ ${PV} =~ ^[9]{4,}$ ]]; then
inherit autotools git-r3
EGIT_REPO_URI="https://git.netfilter.org/${PN};
-
-   BDEPEND="
-   sys-devel/bison
-   sys-devel/flex
-   "
+   BDEPEND="sys-devel/bison"
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86"
-   BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
+   BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 
 # See COPYING: new code is GPL-2+, existing code is GPL-2
@@ -45,6 +41,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 BDEPEND+="
+   

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 68a4aeb7ce34ec6f16710ce40443a1b460af6517
Author: Kerin Millar  plushkava  net>
AuthorDate: Sun Mar 19 09:04:41 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 19 22:21:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68a4aeb7

net-firewall/nftables: Use the newly built libnftables.so in the pkg_preinst 
check

Doing so is appropriate because it's not a library that's provided
externally. Also, tidy up the code structure and replace the outdated
pkg_preinst() function in the ebuild for v1.0.5.

Signed-off-by: Kerin Millar  plushkava.net>
Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.5.ebuild | 33 --
 net-firewall/nftables/nftables-1.0.6.ebuild | 44 ++---
 net-firewall/nftables/nftables-1.0.7.ebuild | 44 ++---
 net-firewall/nftables/nftables-.ebuild  | 44 ++---
 4 files changed, 90 insertions(+), 75 deletions(-)

diff --git a/net-firewall/nftables/nftables-1.0.5.ebuild 
b/net-firewall/nftables/nftables-1.0.5.ebuild
index 3b4f9fbbf1d2..5226ca74577d 100644
--- a/net-firewall/nftables/nftables-1.0.5.ebuild
+++ b/net-firewall/nftables/nftables-1.0.5.ebuild
@@ -167,15 +167,30 @@ src_install() {
 }
 
 pkg_preinst() {
-   if [[ -d /sys/module/nf_tables ]] && [[ -x /sbin/nft ]] && [[ -z 
${ROOT} ]]; then
-   if ! /sbin/nft -t list ruleset | "${ED}"/sbin/nft -c -f -; then
-   eerror "Your currently loaded ruleset cannot be parsed 
by the newly built instance of"
-   eerror "nft. This probably means that there is a 
regression introduced by v${PV}."
-   eerror "(To make the ebuild fail instead of warning, 
set NFTABLES_ABORT_ON_RELOAD_FAILURE=1.)"
-
-   if [[ -n ${NFTABLES_ABORT_ON_RELOAD_FAILURE} ]] ; then
-   die "Aborting because of failed nft reload!"
-   fi
+   local stderr
+
+   # There's a history of regressions with nftables upgrades. Perform a
+   # safety check to help us spot them earlier. For the check to pass, the
+   # currently loaded ruleset, if any, must be successfully evaluated by
+   # the newly built instance of nft(8).
+   if [[ -n ${ROOT} ]] || [[ ! -d /sys/module/nftables ]] || [[ ! -x 
/sbin/nft ]]; then
+   # Either nftables isn't yet in use or nft(8) cannot be executed.
+   return
+   elif ! stderr=$(umask 177; /sbin/nft -t list ruleset 2>&1 
>"${T}"/ruleset.nft); then
+   # Report errors induced by trying to list the ruleset but don't
+   # treat them as being fatal.
+   printf '%s\n' "${stderr}" >&2
+   elif [[ ${stderr} == *"is managed by iptables-nft"* ]]; then
+   # Rulesets generated by iptables-nft are special in nature and
+   # will not always be printed in a way that constitutes a valid
+   # syntax for ntf(8). Ignore them.
+   return
+   elif set -- "${ED}"/usr/lib*/libnftables.so; ! LD_LIBRARY_PATH=${1%/*} 
"${ED}"/sbin/nft -c -f -- "${T}"/ruleset.nft; then
+   eerror "Your currently loaded ruleset cannot be parsed by the 
newly built instance of"
+   eerror "nft. This probably means that there is a regression 
introduced by v${PV}."
+   eerror "(To make the ebuild fail instead of warning, set 
NFTABLES_ABORT_ON_RELOAD_FAILURE=1.)"
+   if [[ -n ${NFTABLES_ABORT_ON_RELOAD_FAILURE} ]] ; then
+   die "Aborting because of failed nft reload!"
fi
fi
 }

diff --git a/net-firewall/nftables/nftables-1.0.6.ebuild 
b/net-firewall/nftables/nftables-1.0.6.ebuild
index bd4f23708a7e..e5de7f69c0a1 100644
--- a/net-firewall/nftables/nftables-1.0.6.ebuild
+++ b/net-firewall/nftables/nftables-1.0.6.ebuild
@@ -169,28 +169,28 @@ src_install() {
 pkg_preinst() {
local stderr
 
-   # There's a history of regressions with nftables upgrades. Add a safety
-   # check to help us spot them earlier.
-   if [[ -d /sys/module/nf_tables ]] && [[ -x /sbin/nft ]] && [[ -z 
${ROOT} ]]; then
-   # Check the current loaded ruleset, if any, using the newly
-   # built instance of nft(8).
-   if ! stderr=$(umask 177; /sbin/nft -t list ruleset 2>&1 
>"${T}"/ruleset.nft); then
-   # Report errors induced by trying to list the ruleset
-   # but don't treat them as being fatal.
-   printf '%s\n' "${stderr}" >&2
-   elif [[ ${stderr} == *"is managed by iptables-nft"* ]]; then
-   # Rulesets generated by iptables-nft are special in
-   # nature and will not always be printed in a way that
-   # constitutes a valid syntax for ntf(8). Ignore them.
-   return
-   

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 538020594e352762d668bdb9eab6d992b9e13a97
Author: Kerin Millar  plushkava  net>
AuthorDate: Sun Mar 19 08:36:47 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 19 22:21:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53802059

net-firewall/nftables: Require >=libnftnl-1.2.5 for 1.0.7 and 

Signed-off-by: Kerin Millar  plushkava.net>
Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.7.ebuild | 2 +-
 net-firewall/nftables/nftables-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/nftables/nftables-1.0.7.ebuild 
b/net-firewall/nftables/nftables-1.0.7.ebuild
index f9713c4a95f6..b144fded77b4 100644
--- a/net-firewall/nftables/nftables-1.0.7.ebuild
+++ b/net-firewall/nftables/nftables-1.0.7.ebuild
@@ -34,7 +34,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
>=net-libs/libmnl-1.0.4:=
-   >=net-libs/libnftnl-1.2.4:=
+   >=net-libs/libnftnl-1.2.5:=
gmp? ( dev-libs/gmp:= )
json? ( dev-libs/jansson:= )
python? ( ${PYTHON_DEPS} )

diff --git a/net-firewall/nftables/nftables-.ebuild 
b/net-firewall/nftables/nftables-.ebuild
index f9713c4a95f6..b144fded77b4 100644
--- a/net-firewall/nftables/nftables-.ebuild
+++ b/net-firewall/nftables/nftables-.ebuild
@@ -34,7 +34,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
>=net-libs/libmnl-1.0.4:=
-   >=net-libs/libnftnl-1.2.4:=
+   >=net-libs/libnftnl-1.2.5:=
gmp? ( dev-libs/gmp:= )
json? ( dev-libs/jansson:= )
python? ( ${PYTHON_DEPS} )

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 9a223c82dd8cfd2b72e0e7135b2a773df79b9c78
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 15 02:41:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 15 02:41:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a223c82

net-firewall/nftables: add 1.0.7

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/Manifest |  2 ++
 .../{nftables-.ebuild => nftables-1.0.7.ebuild}| 18 --
 net-firewall/nftables/nftables-.ebuild | 18 --
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 3537caf064d6..2d752595dfcf 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -2,3 +2,5 @@ DIST nftables-1.0.5.tar.bz2 982538 BLAKE2B 
5d58170b8fc6feccc1581653cd0815d37b59b
 DIST nftables-1.0.5.tar.bz2.sig 566 BLAKE2B 
7744a84c213999b35c3094fa5d9f974acec6fedac3d310422834285823825bcb14fb55b463d88b91fa41d79e33ce34498769992d912b7178fa1f70bd7a1e0977
 SHA512 
fbff6b5b28d81e964d4523729c7866d0b52d764d090cae70a43d850bc579b17308ec41a3d7fe6707877850028e99ad09c33b5e87fa16ac5199dfeba193a61511
 DIST nftables-1.0.6.tar.xz 834584 BLAKE2B 
7c14db883f0ee9394b603870c93dcc92ce472bf0349a59d0e377f1d44efc870df3449d6f2dc9a198f2e396e5d73b19532dac498e832083ca8cf65cc78db9ccd4
 SHA512 
afe08381acd27d39cc94743190b07c579f8c49c4182c9b8753d5b3a0b7d1fe89ed664fdbc19cef1547c3ca4a0c1e32ca4303dba9ec626272fa08c77e88c9
 DIST nftables-1.0.6.tar.xz.sig 566 BLAKE2B 
3f90c48f521a1c433be9d0bee3b2beb080ac51f07c213f598af217b2d1b2e883e432f014c1a378c18eac4b8620e323fbdebb654aa53b345210a3f62ccfe93507
 SHA512 
83657d213e675c8ffa377112efc7fb0f5b756287f06aa9ccd3716eb76b87a14dab01a3ee82929511f26f7e9ce407d8b7ac0dd706c8211ad007fdfcf11d679a93
+DIST nftables-1.0.7.tar.xz 857140 BLAKE2B 
972adbb958f36b300618ce03fbbfc1fdb6fd55a3512227e4bc1fd71365be5cc8d3ee105424e8cc513588100bf00d5e69486310435efb2b0d3f5d464ed6999859
 SHA512 
063f3a42327fd4dca9214314c7e7bcc7310f2ccbbce4c36f86a291d61d443f94b0f91435ecd04eb757596df8be91a802daeef394ba422c3623a81b2917e01116
+DIST nftables-1.0.7.tar.xz.sig 566 BLAKE2B 
53abe2598e9b362912d3e2e94ea6e04352d0484b9d1d645c8f18b6133be53d63a8d71d500e57528a57aededb84dedaf61010236afda560b16e7642db45e2f45c
 SHA512 
b5821aa6939dc5b4d16065d9d7083e4ff40b9f99417354efbcbc95a8ccde43108b99a5b8a75a24086cd3df2291a049cad3adb7b06e2c098f0eb7861f85c5c768

diff --git a/net-firewall/nftables/nftables-.ebuild 
b/net-firewall/nftables/nftables-1.0.7.ebuild
similarity index 89%
copy from net-firewall/nftables/nftables-.ebuild
copy to net-firewall/nftables/nftables-1.0.7.ebuild
index f60144b1a850..f9713c4a95f6 100644
--- a/net-firewall/nftables/nftables-.ebuild
+++ b/net-firewall/nftables/nftables-1.0.7.ebuild
@@ -26,7 +26,8 @@ else
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 
-LICENSE="GPL-2"
+# See COPYING: new code is GPL-2+, existing code is GPL-2
+LICENSE="GPL-2 GPL-2+"
 SLOT="0/1"
 IUSE="debug doc +gmp json libedit +modern-kernel python +readline static-libs 
test xtables"
 RESTRICT="!test? ( test )"
@@ -167,10 +168,23 @@ src_install() {
 }
 
 pkg_preinst() {
+   local stderr
+
# There's a history of regressions with nftables upgrades. Add a safety
# check to help us spot them earlier.
if [[ -d /sys/module/nf_tables ]] && [[ -x /sbin/nft ]] && [[ -z 
${ROOT} ]]; then
-   if ! /sbin/nft -t list ruleset | "${ED}"/sbin/nft -c -f -; then
+   # Check the current loaded ruleset, if any, using the newly
+   # built instance of nft(8).
+   if ! stderr=$(umask 177; /sbin/nft -t list ruleset 2>&1 
>"${T}"/ruleset.nft); then
+   # Report errors induced by trying to list the ruleset
+   # but don't treat them as being fatal.
+   printf '%s\n' "${stderr}" >&2
+   elif [[ ${stderr} == *"is managed by iptables-nft"* ]]; then
+   # Rulesets generated by iptables-nft are special in
+   # nature and will not always be printed in a way that
+   # constitutes a valid syntax for ntf(8). Ignore them.
+   return
+   elif ! "${ED}"/sbin/nft -c -f "${T}"/ruleset.nft; then
eerror "Your currently loaded ruleset cannot be parsed 
by the newly built instance of"
eerror "nft. This probably means that there is a 
regression introduced by v${PV}."
eerror "(To make the ebuild fail instead of warning, 
set NFTABLES_ABORT_ON_RELOAD_FAILURE=1.)"

diff --git a/net-firewall/nftables/nftables-.ebuild 
b/net-firewall/nftables/nftables-.ebuild
index f60144b1a850..f9713c4a95f6 100644
--- a/net-firewall/nftables/nftables-.ebuild
+++ b/net-firewall/nftables/nftables-.ebuild
@@ -26,7 +26,8 @@ else
   

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 40de849d06e7fce4c95bc436399aa04310af7812
Author: Kerin Millar  plushkava  net>
AuthorDate: Thu Mar  9 18:11:14 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 10 03:51:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40de849d

net-firewall/nftables: Don't test iptables-nft rulesets in pkg_preinst()

Rulesets generated by iptables-nft are special in nature and will not
always be printed in a way that constitutes a valid syntax for nft(8).
Consider the following example in which iptables-nft would ideally have
generated a native rule that specifies "reject with tcp reset". Instead,
it generated a rule that integrates with an xtables target.

# iptables-nft -S
-A INPUT -j REJECT --reject-with tcp-reset

# nft list ruleset
# Warning: table ip filter is managed by iptables-nft, do not touch!
table ip filter {
chain INPUT {
type filter hook input priority filter; policy accept;
counter packets 0 bytes 0 xt target REJECT
}
}

Simply ignore the ruleset in the case that it appears to have been
generated by iptables-nft.

Signed-off-by: Kerin Millar  plushkava.net>
Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.6.ebuild | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.6.ebuild 
b/net-firewall/nftables/nftables-1.0.6.ebuild
index e434040260a7..69e3d6988f20 100644
--- a/net-firewall/nftables/nftables-1.0.6.ebuild
+++ b/net-firewall/nftables/nftables-1.0.6.ebuild
@@ -167,8 +167,21 @@ src_install() {
 }
 
 pkg_preinst() {
+   local stderr
+
if [[ -d /sys/module/nf_tables ]] && [[ -x /sbin/nft ]] && [[ -z 
${ROOT} ]]; then
-   if ! /sbin/nft -t list ruleset | "${ED}"/sbin/nft -c -f -; then
+   # Check the current loaded ruleset, if any, using the newly
+   # built instance of nft(8).
+   if ! stderr=$(umask 177; /sbin/nft -t list ruleset 2>&1 
>"${T}"/ruleset.nft); then
+   # Report errors induced by trying to list the ruleset
+   # but don't treat them as being fatal.
+   printf '%s\n' "${stderr}" >&2
+   elif [[ ${stderr} == *"is managed by iptables-nft"* ]]; then
+   # Rulesets generated by iptables-nft are special in
+   # nature and will not always be printed in a way that
+   # constitutes a valid syntax for ntf(8). Ignore them.
+   return
+   elif ! "${ED}"/sbin/nft -c -f "${T}"/ruleset.nft; then
eerror "Your currently loaded ruleset cannot be parsed 
by the newly built instance of"
eerror "nft. This probably means that there is a 
regression introduced by v${PV}."
eerror "(To make the ebuild fail instead of warning, 
set NFTABLES_ABORT_ON_RELOAD_FAILURE=1.)"

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 43a474eb12b0ff14f18688fcfcea48fae915be7b
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 10 03:52:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 10 03:52:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43a474eb

net-firewall/nftables: add commentary re pkg_preinst check

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.6.ebuild | 2 ++
 net-firewall/nftables/nftables-.ebuild  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/net-firewall/nftables/nftables-1.0.6.ebuild 
b/net-firewall/nftables/nftables-1.0.6.ebuild
index 69e3d6988f20..bd4f23708a7e 100644
--- a/net-firewall/nftables/nftables-1.0.6.ebuild
+++ b/net-firewall/nftables/nftables-1.0.6.ebuild
@@ -169,6 +169,8 @@ src_install() {
 pkg_preinst() {
local stderr
 
+   # There's a history of regressions with nftables upgrades. Add a safety
+   # check to help us spot them earlier.
if [[ -d /sys/module/nf_tables ]] && [[ -x /sbin/nft ]] && [[ -z 
${ROOT} ]]; then
# Check the current loaded ruleset, if any, using the newly
# built instance of nft(8).

diff --git a/net-firewall/nftables/nftables-.ebuild 
b/net-firewall/nftables/nftables-.ebuild
index 2ef025795e56..f60144b1a850 100644
--- a/net-firewall/nftables/nftables-.ebuild
+++ b/net-firewall/nftables/nftables-.ebuild
@@ -167,6 +167,8 @@ src_install() {
 }
 
 pkg_preinst() {
+   # There's a history of regressions with nftables upgrades. Add a safety
+   # check to help us spot them earlier.
if [[ -d /sys/module/nf_tables ]] && [[ -x /sbin/nft ]] && [[ -z 
${ROOT} ]]; then
if ! /sbin/nft -t list ruleset | "${ED}"/sbin/nft -c -f -; then
eerror "Your currently loaded ruleset cannot be parsed 
by the newly built instance of"

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Arthur Zamarin]

commit: 4c6ab25ac9033520e75d8ed3d66373da46653421
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 11:55:57 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 11:55:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c6ab25a

net-firewall/nftables: Stabilize 1.0.6 ppc64, #899340

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-firewall/nftables/nftables-1.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.6.ebuild 
b/net-firewall/nftables/nftables-1.0.6.ebuild
index 70bb0c3752f5..e434040260a7 100644
--- a/net-firewall/nftables/nftables-1.0.6.ebuild
+++ b/net-firewall/nftables/nftables-1.0.6.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )"
-   KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
sparc x86"
+   KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
sparc x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Arthur Zamarin]

commit: 1a69947e9297a8b836253d5e3fbc03df46f3
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 09:55:14 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 09:55:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a69947e

net-firewall/nftables: Stabilize 1.0.6 amd64, #899340

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-firewall/nftables/nftables-1.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.6.ebuild 
b/net-firewall/nftables/nftables-1.0.6.ebuild
index 2dea3c78eede..70bb0c3752f5 100644
--- a/net-firewall/nftables/nftables-1.0.6.ebuild
+++ b/net-firewall/nftables/nftables-1.0.6.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )"
-   KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
sparc x86"
+   KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
sparc x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Arthur Zamarin]

commit: 4d681ebf899db9f3050979ed352d178571afa059
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 07:42:47 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 07:42:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d681ebf

net-firewall/nftables: Stabilize 1.0.6 x86, #899340

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-firewall/nftables/nftables-1.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.6.ebuild 
b/net-firewall/nftables/nftables-1.0.6.ebuild
index 313722e77085..2dea3c78eede 100644
--- a/net-firewall/nftables/nftables-1.0.6.ebuild
+++ b/net-firewall/nftables/nftables-1.0.6.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )"
-   KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
sparc ~x86"
+   KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
sparc x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Arthur Zamarin]

commit: 42831c4b6af5ad34195d17ed2378abad38128df1
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 07:02:37 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 07:02:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42831c4b

net-firewall/nftables: Stabilize 1.0.6 ppc, #899340

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-firewall/nftables/nftables-1.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.6.ebuild 
b/net-firewall/nftables/nftables-1.0.6.ebuild
index 3f6d0c08b17f..313722e77085 100644
--- a/net-firewall/nftables/nftables-1.0.6.ebuild
+++ b/net-firewall/nftables/nftables-1.0.6.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )"
-   KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
sparc ~x86"
+   KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
sparc ~x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Arthur Zamarin]

commit: 34014a318ea097f50809799912a068b3bdfdc24a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 06:14:10 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 06:14:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34014a31

net-firewall/nftables: Stabilize 1.0.6 hppa, #899340

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-firewall/nftables/nftables-1.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.6.ebuild 
b/net-firewall/nftables/nftables-1.0.6.ebuild
index f0c66aa9b99b..3f6d0c08b17f 100644
--- a/net-firewall/nftables/nftables-1.0.6.ebuild
+++ b/net-firewall/nftables/nftables-1.0.6.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )"
-   KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
sparc ~x86"
+   KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
sparc ~x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Arthur Zamarin]

commit: 6c6a9b3fb46ec7d9e6aff3379f9850c259ada9e0
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 05:49:40 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 05:49:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c6a9b3f

net-firewall/nftables: Stabilize 1.0.6 arm, #899340

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-firewall/nftables/nftables-1.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.6.ebuild 
b/net-firewall/nftables/nftables-1.0.6.ebuild
index 93ee88b2c3b7..f0c66aa9b99b 100644
--- a/net-firewall/nftables/nftables-1.0.6.ebuild
+++ b/net-firewall/nftables/nftables-1.0.6.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )"
-   KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
sparc ~x86"
+   KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
sparc ~x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Arthur Zamarin]

commit: 58b7fc0f6de82c31a71ede77cef51119eec0068c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 05:46:27 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 05:46:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58b7fc0f

net-firewall/nftables: Stabilize 1.0.6 arm64, #899340

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-firewall/nftables/nftables-1.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.6.ebuild 
b/net-firewall/nftables/nftables-1.0.6.ebuild
index a3dec9cd37bf..93ee88b2c3b7 100644
--- a/net-firewall/nftables/nftables-1.0.6.ebuild
+++ b/net-firewall/nftables/nftables-1.0.6.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )"
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv sparc ~x86"
+   KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
sparc ~x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Arthur Zamarin]

commit: 472b934703da695702a512b17cb50bcbabe47453
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 05:38:35 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 05:38:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=472b9347

net-firewall/nftables: Stabilize 1.0.6 sparc, #899340

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-firewall/nftables/nftables-1.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.6.ebuild 
b/net-firewall/nftables/nftables-1.0.6.ebuild
index 2ef025795e56..a3dec9cd37bf 100644
--- a/net-firewall/nftables/nftables-1.0.6.ebuild
+++ b/net-firewall/nftables/nftables-1.0.6.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.xz
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )"
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv sparc ~x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: b98bf67817a34b90f025aefdba6fbb2a74d182f7
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 21 23:50:51 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 21 23:52:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b98bf678

net-firewall/nftables: add 1.0.6

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/Manifest |  2 ++
 .../nftables/{nftables-.ebuild => nftables-1.0.6.ebuild}   | 10 +-
 net-firewall/nftables/nftables-.ebuild | 10 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 0c996cf52097..72f7151be1aa 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -4,3 +4,5 @@ DIST nftables-1.0.4.tar.bz2 979540 BLAKE2B 
1b2c596245cb7f1bc574250d13b9ff6f424f9
 DIST nftables-1.0.4.tar.bz2.sig 566 BLAKE2B 
1ac42a2eb678abcc21d01bbaf5f9a3af3f4c49fa1f0732f2522d3da14e94aacbb12075650d2786224f8fef869fcdc94a1463bd76272aa44fc50ea31a8ebae1bf
 SHA512 
2d2acd4810c1ede844e1eac81a5480866ad40ae71dfcf92d166fd9295290adff70d35d7de8cf1ec81ab63d184b221419ff144bc7010e18884afa992173723af8
 DIST nftables-1.0.5.tar.bz2 982538 BLAKE2B 
5d58170b8fc6feccc1581653cd0815d37b59b43b7f4f9bff9f7fb46928c6c7eee5a6f07150c404f7cf42f5a1d2e980860a4dd2589b99773179e019a093c42cfa
 SHA512 
51cbf10579db7eed58f4358044840f2ce1bffe84533c5fb03e0ebcc702970856455576ac793169c94d38a9f8148e33631ad91444e54a8be189d93af7c27feb9a
 DIST nftables-1.0.5.tar.bz2.sig 566 BLAKE2B 
7744a84c213999b35c3094fa5d9f974acec6fedac3d310422834285823825bcb14fb55b463d88b91fa41d79e33ce34498769992d912b7178fa1f70bd7a1e0977
 SHA512 
fbff6b5b28d81e964d4523729c7866d0b52d764d090cae70a43d850bc579b17308ec41a3d7fe6707877850028e99ad09c33b5e87fa16ac5199dfeba193a61511
+DIST nftables-1.0.6.tar.xz 834584 BLAKE2B 
7c14db883f0ee9394b603870c93dcc92ce472bf0349a59d0e377f1d44efc870df3449d6f2dc9a198f2e396e5d73b19532dac498e832083ca8cf65cc78db9ccd4
 SHA512 
afe08381acd27d39cc94743190b07c579f8c49c4182c9b8753d5b3a0b7d1fe89ed664fdbc19cef1547c3ca4a0c1e32ca4303dba9ec626272fa08c77e88c9
+DIST nftables-1.0.6.tar.xz.sig 566 BLAKE2B 
3f90c48f521a1c433be9d0bee3b2beb080ac51f07c213f598af217b2d1b2e883e432f014c1a378c18eac4b8620e323fbdebb654aa53b345210a3f62ccfe93507
 SHA512 
83657d213e675c8ffa377112efc7fb0f5b756287f06aa9ccd3716eb76b87a14dab01a3ee82929511f26f7e9ce407d8b7ac0dd706c8211ad007fdfcf11d679a93

diff --git a/net-firewall/nftables/nftables-.ebuild 
b/net-firewall/nftables/nftables-1.0.6.ebuild
similarity index 97%
copy from net-firewall/nftables/nftables-.ebuild
copy to net-firewall/nftables/nftables-1.0.6.ebuild
index b6fdb61bd493..7355f2e856c6 100644
--- a/net-firewall/nftables/nftables-.ebuild
+++ b/net-firewall/nftables/nftables-1.0.6.ebuild
@@ -20,9 +20,9 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
sys-devel/flex
"
 else
-   SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
-   verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
+   SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.xz
+   verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 
@@ -32,8 +32,8 @@ IUSE="debug doc +gmp json libedit +modern-kernel python 
+readline static-libs te
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-   >=net-libs/libmnl-1.0.4:0=
-   >=net-libs/libnftnl-1.2.3:0=
+   >=net-libs/libmnl-1.0.4:=
+   >=net-libs/libnftnl-1.2.4:=
gmp? ( dev-libs/gmp:= )
json? ( dev-libs/jansson:= )
python? ( ${PYTHON_DEPS} )

diff --git a/net-firewall/nftables/nftables-.ebuild 
b/net-firewall/nftables/nftables-.ebuild
index b6fdb61bd493..7355f2e856c6 100644
--- a/net-firewall/nftables/nftables-.ebuild
+++ b/net-firewall/nftables/nftables-.ebuild
@@ -20,9 +20,9 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
sys-devel/flex
"
 else
-   SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
-   verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
+   SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.xz
+   verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 
@@ -32,8 +32,8 @@ IUSE="debug doc +gmp json libedit +modern-kernel python 
+readline static-libs te
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[WANG Xuerui]

commit: 176fbf41b1709bfc982affc7f589043346a6b603
Author: WANG Xuerui  gentoo  org>
AuthorDate: Sat Nov 19 02:42:09 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Sat Nov 19 04:50:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=176fbf41

net-firewall/nftables: keyword 1.0.5 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 net-firewall/nftables/nftables-1.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.5.ebuild 
b/net-firewall/nftables/nftables-1.0.5.ebuild
index 235a23c61ff1..9f7bce158c18 100644
--- a/net-firewall/nftables/nftables-1.0.5.ebuild
+++ b/net-firewall/nftables/nftables-1.0.5.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-   KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+   KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
sparc x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: b950a890e3df8d61f2c4049a62f8be0166c3dba5
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 11 18:22:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 11 18:25:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b950a890

net-firewall/nftables: Stabilize 1.0.5 amd64, #872743

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.5.ebuild 
b/net-firewall/nftables/nftables-1.0.5.ebuild
index fa24a8b2fa6a..235a23c61ff1 100644
--- a/net-firewall/nftables/nftables-1.0.5.ebuild
+++ b/net-firewall/nftables/nftables-1.0.5.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-   KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+   KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Arthur Zamarin]

commit: 478690d564169f857189ffbb80e8bfc142ec54c7
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Oct 11 17:15:01 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Oct 11 17:15:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=478690d5

net-firewall/nftables: Stabilize 1.0.5 hppa, #872743

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-firewall/nftables/nftables-1.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.5.ebuild 
b/net-firewall/nftables/nftables-1.0.5.ebuild
index 25c141bfe41e..fa24a8b2fa6a 100644
--- a/net-firewall/nftables/nftables-1.0.5.ebuild
+++ b/net-firewall/nftables/nftables-1.0.5.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-   KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+   KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Agostino Sarubbo]

commit: 5aac2284251cb2ba243e7d0e90be98f8ac2d3b5c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Oct 11 09:19:34 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Oct 11 09:19:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5aac2284

net-firewall/nftables: Stabilize 1.0.5 sparc, #872743

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-firewall/nftables/nftables-1.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.5.ebuild 
b/net-firewall/nftables/nftables-1.0.5.ebuild
index 86cac3a62cff..25c141bfe41e 100644
--- a/net-firewall/nftables/nftables-1.0.5.ebuild
+++ b/net-firewall/nftables/nftables-1.0.5.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-   KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc 
x86"
+   KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Agostino Sarubbo]

commit: 9163a767db56308682ce0a52e5c7c5200cf6f9af
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Oct 11 09:18:50 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Oct 11 09:18:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9163a767

net-firewall/nftables: Stabilize 1.0.5 ppc, #872743

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-firewall/nftables/nftables-1.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.5.ebuild 
b/net-firewall/nftables/nftables-1.0.5.ebuild
index a65639048674..86cac3a62cff 100644
--- a/net-firewall/nftables/nftables-1.0.5.ebuild
+++ b/net-firewall/nftables/nftables-1.0.5.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-   KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc 
x86"
+   KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc 
x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Agostino Sarubbo]

commit: 9ead1f6b73901224d45b62b78c5d5363a34ca79f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Oct 11 06:45:57 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Oct 11 06:45:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ead1f6b

net-firewall/nftables: Stabilize 1.0.5 ppc64, #872743

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-firewall/nftables/nftables-1.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.5.ebuild 
b/net-firewall/nftables/nftables-1.0.5.ebuild
index 54607cdbfa78..a65639048674 100644
--- a/net-firewall/nftables/nftables-1.0.5.ebuild
+++ b/net-firewall/nftables/nftables-1.0.5.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-   KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
x86"
+   KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc 
x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: cbb47b4567660062a24d404f3ef17224835a04fc
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct 10 23:36:00 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 10 23:36:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbb47b45

net-firewall/nftables: Stabilize 1.0.5 x86, #872743

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.5.ebuild 
b/net-firewall/nftables/nftables-1.0.5.ebuild
index 6f59bde1ac65..abae2b04 100644
--- a/net-firewall/nftables/nftables-1.0.5.ebuild
+++ b/net-firewall/nftables/nftables-1.0.5.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-   KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+   KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 69f2fc681234df26d4e323c9a7df8e1e5094e1a4
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct 10 23:36:26 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 10 23:36:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69f2fc68

net-firewall/nftables: Stabilize 1.0.5 arm64, #872743

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.5.ebuild 
b/net-firewall/nftables/nftables-1.0.5.ebuild
index abae2b04..54607cdbfa78 100644
--- a/net-firewall/nftables/nftables-1.0.5.ebuild
+++ b/net-firewall/nftables/nftables-1.0.5.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-   KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
x86"
+   KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: d64cc474355fd77a42a7e64dddfc76574912f589
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct 10 22:35:44 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 10 22:35:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d64cc474

net-firewall/nftables: Stabilize 1.0.5 arm, #872743

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.5.ebuild 
b/net-firewall/nftables/nftables-1.0.5.ebuild
index b6fdb61bd493..6f59bde1ac65 100644
--- a/net-firewall/nftables/nftables-1.0.5.ebuild
+++ b/net-firewall/nftables/nftables-1.0.5.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
+   KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
~x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Arthur Zamarin]

commit: 03768382938f11f98b644f22db4c7cf2205a13b1
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Sep 16 18:01:24 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Sep 16 18:01:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03768382

net-firewall/nftables: Stabilize 1.0.4-r2 ppc, #868963

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-firewall/nftables/nftables-1.0.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.4-r2.ebuild 
b/net-firewall/nftables/nftables-1.0.4-r2.ebuild
index 854c86cbac18..394dfa382ae0 100644
--- a/net-firewall/nftables/nftables-1.0.4-r2.ebuild
+++ b/net-firewall/nftables/nftables-1.0.4-r2.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-   KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86"
+   KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Arthur Zamarin]

commit: f5b57f3e29021e81986d4bf66132643f3ab871a4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Sep 16 17:45:01 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Sep 16 17:45:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5b57f3e

net-firewall/nftables: Stabilize 1.0.4-r2 hppa, #868963

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-firewall/nftables/nftables-1.0.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.4-r2.ebuild 
b/net-firewall/nftables/nftables-1.0.4-r2.ebuild
index bc156d4da60f..854c86cbac18 100644
--- a/net-firewall/nftables/nftables-1.0.4-r2.ebuild
+++ b/net-firewall/nftables/nftables-1.0.4-r2.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86"
+   KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Arthur Zamarin]

commit: 23ec3bce0d37a38b2bd1e9fa7d27aeab32ac9bc8
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Sep 15 19:57:36 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Sep 15 19:57:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23ec3bce

net-firewall/nftables: Stabilize 1.0.4-r2 ppc64, #868963

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-firewall/nftables/nftables-1.0.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.4-r2.ebuild 
b/net-firewall/nftables/nftables-1.0.4-r2.ebuild
index a1e256654082..bc156d4da60f 100644
--- a/net-firewall/nftables/nftables-1.0.4-r2.ebuild
+++ b/net-firewall/nftables/nftables-1.0.4-r2.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc 
x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Mike Gilbert]

commit: a60bcdc8ce5eec6674d5e28afa2bd4899d137508
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Sep 13 17:33:30 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Sep 13 17:34:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a60bcdc8

net-firewall/nftables: drop RESTRICT="test? ( userpriv )"

Instead, check for root and skip the relevant tests otherwise.

Closes: https://bugs.gentoo.org/869989
Signed-off-by: Mike Gilbert  gentoo.org>

 net-firewall/nftables/nftables-1.0.4-r2.ebuild | 8 ++--
 net-firewall/nftables/nftables-1.0.5.ebuild| 8 ++--
 net-firewall/nftables/nftables-.ebuild | 8 ++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/net-firewall/nftables/nftables-1.0.4-r2.ebuild 
b/net-firewall/nftables/nftables-1.0.4-r2.ebuild
index 0da0a19b311e..a1e256654082 100644
--- a/net-firewall/nftables/nftables-1.0.4-r2.ebuild
+++ b/net-firewall/nftables/nftables-1.0.4-r2.ebuild
@@ -29,7 +29,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0/1"
 IUSE="debug doc +gmp json libedit +modern-kernel python +readline static-libs 
test xtables"
-RESTRICT="test? ( userpriv ) !test? ( test )"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
>=net-libs/libmnl-1.0.4:0=
@@ -123,7 +123,11 @@ src_compile() {
 src_test() {
emake check
 
-   edo tests/shell/run-tests.sh -v
+   if [[ ${EUID} == 0 ]]; then
+   edo tests/shell/run-tests.sh -v
+   else
+   ewarn "Skipping shell tests (requires root)"
+   fi
 
# Need to rig up Python eclass if using this, but it doesn't seem to 
work
# for me anyway.

diff --git a/net-firewall/nftables/nftables-1.0.5.ebuild 
b/net-firewall/nftables/nftables-1.0.5.ebuild
index 24d357de9872..b6fdb61bd493 100644
--- a/net-firewall/nftables/nftables-1.0.5.ebuild
+++ b/net-firewall/nftables/nftables-1.0.5.ebuild
@@ -29,7 +29,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0/1"
 IUSE="debug doc +gmp json libedit +modern-kernel python +readline static-libs 
test xtables"
-RESTRICT="test? ( userpriv ) !test? ( test )"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
>=net-libs/libmnl-1.0.4:0=
@@ -120,7 +120,11 @@ src_compile() {
 src_test() {
emake check
 
-   edo tests/shell/run-tests.sh -v
+   if [[ ${EUID} == 0 ]]; then
+   edo tests/shell/run-tests.sh -v
+   else
+   ewarn "Skipping shell tests (requires root)"
+   fi
 
# Need to rig up Python eclass if using this, but it doesn't seem to 
work
# for me anyway.

diff --git a/net-firewall/nftables/nftables-.ebuild 
b/net-firewall/nftables/nftables-.ebuild
index 24d357de9872..b6fdb61bd493 100644
--- a/net-firewall/nftables/nftables-.ebuild
+++ b/net-firewall/nftables/nftables-.ebuild
@@ -29,7 +29,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0/1"
 IUSE="debug doc +gmp json libedit +modern-kernel python +readline static-libs 
test xtables"
-RESTRICT="test? ( userpriv ) !test? ( test )"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
>=net-libs/libmnl-1.0.4:0=
@@ -120,7 +120,11 @@ src_compile() {
 src_test() {
emake check
 
-   edo tests/shell/run-tests.sh -v
+   if [[ ${EUID} == 0 ]]; then
+   edo tests/shell/run-tests.sh -v
+   else
+   ewarn "Skipping shell tests (requires root)"
+   fi
 
# Need to rig up Python eclass if using this, but it doesn't seem to 
work
# for me anyway.

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Agostino Sarubbo]

commit: cb247e6d2a38de030d300af9d4f399c6bbd30f80
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Sep  8 11:35:16 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Sep  8 11:35:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb247e6d

net-firewall/nftables: Stabilize 1.0.4-r2 arm64, #868963

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-firewall/nftables/nftables-1.0.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.4-r2.ebuild 
b/net-firewall/nftables/nftables-1.0.4-r2.ebuild
index 4aa46efd6d8a..0da0a19b311e 100644
--- a/net-firewall/nftables/nftables-1.0.4-r2.ebuild
+++ b/net-firewall/nftables/nftables-1.0.4-r2.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-   KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc 
x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc 
x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Agostino Sarubbo]

commit: 389cb89424d8a573043b8c7ade10c73cd96ecd38
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Sep  8 11:24:11 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Sep  8 11:24:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=389cb894

net-firewall/nftables: Stabilize 1.0.4-r2 arm, #868963

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-firewall/nftables/nftables-1.0.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.4-r2.ebuild 
b/net-firewall/nftables/nftables-1.0.4-r2.ebuild
index e971146318d6..4aa46efd6d8a 100644
--- a/net-firewall/nftables/nftables-1.0.4-r2.ebuild
+++ b/net-firewall/nftables/nftables-1.0.4-r2.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc 
x86"
+   KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc 
x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Agostino Sarubbo]

commit: 9160fa123edcd64ea244e958b6cb964caa7b9012
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Sep  8 07:25:55 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Sep  8 07:25:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9160fa12

net-firewall/nftables: x86 stable wrt bug #868963

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-firewall/nftables/nftables-1.0.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.4-r2.ebuild 
b/net-firewall/nftables/nftables-1.0.4-r2.ebuild
index 44ee8d14e6a6..e971146318d6 100644
--- a/net-firewall/nftables/nftables-1.0.4-r2.ebuild
+++ b/net-firewall/nftables/nftables-1.0.4-r2.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc 
~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc 
x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Agostino Sarubbo]

commit: bfbaf2f3bfea1afc70d4ed01e41183d1a7f80be1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Sep  7 13:16:22 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Sep  7 13:16:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfbaf2f3

net-firewall/nftables: sparc stable wrt bug #868963

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-firewall/nftables/nftables-1.0.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.4-r2.ebuild 
b/net-firewall/nftables/nftables-1.0.4-r2.ebuild
index 3c3fa10bad86..44ee8d14e6a6 100644
--- a/net-firewall/nftables/nftables-1.0.4-r2.ebuild
+++ b/net-firewall/nftables/nftables-1.0.4-r2.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc 
~x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Agostino Sarubbo]

commit: ded977fe2cd5efd77a7b50f5bb010c7594e82b69
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Sep  7 13:15:32 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Sep  7 13:15:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ded977fe

net-firewall/nftables: amd64 stable wrt bug #868963

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-firewall/nftables/nftables-1.0.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.4-r2.ebuild 
b/net-firewall/nftables/nftables-1.0.4-r2.ebuild
index e15c2462f85d..3c3fa10bad86 100644
--- a/net-firewall/nftables/nftables-1.0.4-r2.ebuild
+++ b/net-firewall/nftables/nftables-1.0.4-r2.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
~x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Patrick McLean]

commit: e5a05a8af3f00d04b8c1cf57a487b12330216820
Author: Patrick McLean  gentoo  org>
AuthorDate: Wed Aug 10 00:10:53 2022 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Wed Aug 10 00:11:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5a05a8a

net-firewall/nftables: add 1.0.5

Signed-off-by: Patrick McLean  gentoo.org>

 net-firewall/nftables/Manifest  |   2 +
 net-firewall/nftables/nftables-1.0.5.ebuild | 215 
 2 files changed, 217 insertions(+)

diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 89b4506ccf95..0c996cf52097 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -2,3 +2,5 @@ DIST nftables-1.0.2.tar.bz2 970781 BLAKE2B 
650ae6badb574ff3628d21c8aa99f81e73932
 DIST nftables-1.0.2.tar.bz2.sig 566 BLAKE2B 
5b7a20b28c274a950b718e2e14313772707b6bdc3f4519f747350593c1eb3bfbcf8c5dd9ae7d5aa0488c5cde9af8b58e05349c75e8a8246c5634303a331f9d98
 SHA512 
9be59d771833ac315fd52cffe7074ed9d49fbf592aec8d94500bbc7cc1f44dcb54b3815c46831a5e7e4c4770901cbdd6b8ffc5aa8d8cb7e064ec1c8453d890f1
 DIST nftables-1.0.4.tar.bz2 979540 BLAKE2B 
1b2c596245cb7f1bc574250d13b9ff6f424f98e98d5955befadb83ea0a71acc6524b066e39f1e9d151f3946b690b2dee45b7d416347371f88911c8d6a9de047e
 SHA512 
7d96c791365d399b3b930a1f9d6c6aa4a8c2180c258bb5163d9d62ea4d094857e2ebb20fc3ef13b89f449f216d0a291d3bcf288704f1e3bd3ceb51b6cadf8215
 DIST nftables-1.0.4.tar.bz2.sig 566 BLAKE2B 
1ac42a2eb678abcc21d01bbaf5f9a3af3f4c49fa1f0732f2522d3da14e94aacbb12075650d2786224f8fef869fcdc94a1463bd76272aa44fc50ea31a8ebae1bf
 SHA512 
2d2acd4810c1ede844e1eac81a5480866ad40ae71dfcf92d166fd9295290adff70d35d7de8cf1ec81ab63d184b221419ff144bc7010e18884afa992173723af8
+DIST nftables-1.0.5.tar.bz2 982538 BLAKE2B 
5d58170b8fc6feccc1581653cd0815d37b59b43b7f4f9bff9f7fb46928c6c7eee5a6f07150c404f7cf42f5a1d2e980860a4dd2589b99773179e019a093c42cfa
 SHA512 
51cbf10579db7eed58f4358044840f2ce1bffe84533c5fb03e0ebcc702970856455576ac793169c94d38a9f8148e33631ad91444e54a8be189d93af7c27feb9a
+DIST nftables-1.0.5.tar.bz2.sig 566 BLAKE2B 
7744a84c213999b35c3094fa5d9f974acec6fedac3d310422834285823825bcb14fb55b463d88b91fa41d79e33ce34498769992d912b7178fa1f70bd7a1e0977
 SHA512 
fbff6b5b28d81e964d4523729c7866d0b52d764d090cae70a43d850bc579b17308ec41a3d7fe6707877850028e99ad09c33b5e87fa16ac5199dfeba193a61511

diff --git a/net-firewall/nftables/nftables-1.0.5.ebuild 
b/net-firewall/nftables/nftables-1.0.5.ebuild
new file mode 100644
index ..24d357de9872
--- /dev/null
+++ b/net-firewall/nftables/nftables-1.0.5.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8..11} )
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+inherit edo linux-info distutils-r1 systemd verify-sig
+
+DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
+HOMEPAGE="https://netfilter.org/projects/nftables/;
+
+if [[ ${PV} =~ ^[9]{4,}$ ]]; then
+   inherit autotools git-r3
+   EGIT_REPO_URI="https://git.netfilter.org/${PN};
+
+   BDEPEND="
+   sys-devel/bison
+   sys-devel/flex
+   "
+else
+   SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
+   verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
+   BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/1"
+IUSE="debug doc +gmp json libedit +modern-kernel python +readline static-libs 
test xtables"
+RESTRICT="test? ( userpriv ) !test? ( test )"
+
+RDEPEND="
+   >=net-libs/libmnl-1.0.4:0=
+   >=net-libs/libnftnl-1.2.3:0=
+   gmp? ( dev-libs/gmp:= )
+   json? ( dev-libs/jansson:= )
+   python? ( ${PYTHON_DEPS} )
+   readline? ( sys-libs/readline:= )
+   xtables? ( >=net-firewall/iptables-1.6.1:= )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND+="
+   virtual/pkgconfig
+   doc? (
+   app-text/asciidoc
+   >=app-text/docbook2X-0.8.8-r4
+   )
+   python? ( ${PYTHON_DEPS} )
+"
+
+REQUIRED_USE="
+   python? ( ${PYTHON_REQUIRED_USE} )
+   libedit? ( !readline )
+"
+
+pkg_setup() {
+   if kernel_is ge 3 13; then
+   if use modern-kernel && kernel_is lt 3 18; then
+   eerror "The modern-kernel USE flag requires kernel 
version 3.18 or newer to work properly."
+   fi
+   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
+
+   if [[ ${PV} =~ ^[9]{4,}$ ]] ; then
+   eautoreconf
+   fi
+
+   if use python; then

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Patrick McLean]

commit: f121a066cd6c96cda9be6479e21edcfea0d101c2
Author: Patrick McLean  gentoo  org>
AuthorDate: Wed Aug 10 00:11:02 2022 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Wed Aug 10 00:11:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f121a066

net-firewall/nftables: Sync 

Signed-off-by: Patrick McLean  gentoo.org>

 net-firewall/nftables/nftables-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-.ebuild 
b/net-firewall/nftables/nftables-.ebuild
index 51f0627a762d..24d357de9872 100644
--- a/net-firewall/nftables/nftables-.ebuild
+++ b/net-firewall/nftables/nftables-.ebuild
@@ -33,7 +33,7 @@ RESTRICT="test? ( userpriv ) !test? ( test )"
 
 RDEPEND="
>=net-libs/libmnl-1.0.4:0=
-   >=net-libs/libnftnl-1.2.2:0=
+   >=net-libs/libnftnl-1.2.3:0=
gmp? ( dev-libs/gmp:= )
json? ( dev-libs/jansson:= )
python? ( ${PYTHON_DEPS} )

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 1c73d672e4a3e228c1b6b287d4345d229597fa35
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 17 18:42:28 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 17 18:44:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c73d672

net-firewall/nftables: add emergency pkg_preinst sanity check

The idea here is that we check just before merging whether the freshly
built `nft` binary can safely (pretend) reload the system ruleset.

A significant number of recent regressions have manifested in immediate
segfaults when doing this, so it's worth doing the safety check (it's
not as if it's niche or unlikely for a failure to occur at this point).

Those who want a failed check to be *fatal* can set 
NFTABLES_ABORT_ON_RELOAD_FAILURE=1.

Otherwise, it's just a warning.

Bug: https://bugs.gentoo.org/852662
Thanks-to: Kerin Millar  plushkava.net>
Signed-off-by: Sam James  gentoo.org>

 ...{nftables-.ebuild => nftables-1.0.4-r2.ebuild} | 19 ++-
 net-firewall/nftables/nftables-.ebuild| 16 +++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/net-firewall/nftables/nftables-.ebuild 
b/net-firewall/nftables/nftables-1.0.4-r2.ebuild
similarity index 88%
copy from net-firewall/nftables/nftables-.ebuild
copy to net-firewall/nftables/nftables-1.0.4-r2.ebuild
index d3b5ea2ddc40..e15c2462f85d 100644
--- a/net-firewall/nftables/nftables-.ebuild
+++ b/net-firewall/nftables/nftables-1.0.4-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python3_{8..11} )
@@ -70,6 +70,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+   local PATCHES=(
+   
"${FILESDIR}/nftables-1.0.4-revert-scanner-flags-move-to-own-scope.patch"
+   )
default
 
if [[ ${PV} =~ ^[9]{4,}$ ]] ; then
@@ -162,6 +165,20 @@ src_install() {
find "${ED}" -type f -name "*.la" -delete || die
 }
 
+pkg_preinst() {
+   if [[ -d /sys/module/nf_tables ]] && [[ -x /sbin/nft ]] && [[ -z 
${ROOT} ]]; then
+   if ! /sbin/nft -t list ruleset | "${ED}"/sbin/nft -c -f -; then
+   eerror "Your currently loaded ruleset cannot be parsed 
by the newly built instance of"
+   eerror "nft. This probably means that there is a 
regression introduced by v${PV}."
+   eerror "(To make the ebuild fail instead of warning, 
set NFTABLES_ABORT_ON_RELOAD_FAILURE=1.)"
+
+   if [[ -n ${NFTABLES_ABORT_ON_RELOAD_FAILURE} ]] ; then
+   die "Aborting because of failed nft reload!"
+   fi
+   fi
+   fi
+}
+
 pkg_postinst() {
local save_file
save_file="${EROOT}"/var/lib/nftables/rules-save

diff --git a/net-firewall/nftables/nftables-.ebuild 
b/net-firewall/nftables/nftables-.ebuild
index d3b5ea2ddc40..51f0627a762d 100644
--- a/net-firewall/nftables/nftables-.ebuild
+++ b/net-firewall/nftables/nftables-.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python3_{8..11} )
@@ -162,6 +162,20 @@ src_install() {
find "${ED}" -type f -name "*.la" -delete || die
 }
 
+pkg_preinst() {
+   if [[ -d /sys/module/nf_tables ]] && [[ -x /sbin/nft ]] && [[ -z 
${ROOT} ]]; then
+   if ! /sbin/nft -t list ruleset | "${ED}"/sbin/nft -c -f -; then
+   eerror "Your currently loaded ruleset cannot be parsed 
by the newly built instance of"
+   eerror "nft. This probably means that there is a 
regression introduced by v${PV}."
+   eerror "(To make the ebuild fail instead of warning, 
set NFTABLES_ABORT_ON_RELOAD_FAILURE=1.)"
+
+   if [[ -n ${NFTABLES_ABORT_ON_RELOAD_FAILURE} ]] ; then
+   die "Aborting because of failed nft reload!"
+   fi
+   fi
+   fi
+}
+
 pkg_postinst() {
local save_file
save_file="${EROOT}"/var/lib/nftables/rules-save

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/files/, net-firewall/nftables/

[Mike Gilbert]

commit: 8c7d289358511150d712e08b2cbb175b1374d9f7
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Jun 17 16:16:41 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Fri Jun 17 16:16:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c7d2893

net-firewall/nftables: backport upstream revert

Closes: https://bugs.gentoo.org/852662
Signed-off-by: Mike Gilbert  gentoo.org>

 4-revert-scanner-flags-move-to-own-scope.patch | 252 +
 ...ables-1.0.4.ebuild => nftables-1.0.4-r1.ebuild} |   3 +
 2 files changed, 255 insertions(+)

diff --git 
a/net-firewall/nftables/files/nftables-1.0.4-revert-scanner-flags-move-to-own-scope.patch
 
b/net-firewall/nftables/files/nftables-1.0.4-revert-scanner-flags-move-to-own-scope.patch
new file mode 100644
index ..db58602bb4e6
--- /dev/null
+++ 
b/net-firewall/nftables/files/nftables-1.0.4-revert-scanner-flags-move-to-own-scope.patch
@@ -0,0 +1,252 @@
+From 638af0ceb2b22307098bb2730822e148ef0b9424 Mon Sep 17 00:00:00 2001
+From: Florian Westphal 
+Date: Fri, 10 Jun 2022 13:01:46 +0200
+Subject: Revert "scanner: flags: move to own scope"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Excess nesting of scanner scopes is very fragile and error prone:
+
+rule `iif != lo ip daddr 127.0.0.1/8 counter limit rate 1/second log flags all 
prefix "nft_lo4 " drop`
+fails with `Error: No symbol type information` hinting at `prefix`
+
+Problem is that we nest via:
+ counter
+   limit
+ log
+flags
+
+By the time 'prefix' is scanned, state is still stuck in 'counter' due
+to this nesting.  Working around "prefix" isn't enough, any other
+keyword, e.g. "level" in 'flags all level debug' will be parsed as 'string' 
too.
+
+So, revert this.
+
+Fixes: a16697097e2b ("scanner: flags: move to own scope")
+Reported-by: Christian Göttsche 
+Signed-off-by: Florian Westphal 
+---
+ include/parser.h  |  1 -
+ src/parser_bison.y| 29 ++---
+ src/scanner.l | 18 +++---
+ tests/shell/testcases/parsing/log | 10 ++
+ 4 files changed, 31 insertions(+), 27 deletions(-)
+ create mode 100755 tests/shell/testcases/parsing/log
+
+diff --git a/include/parser.h b/include/parser.h
+index f32154cc..d8d2eb11 100644
+--- a/include/parser.h
 b/include/parser.h
+@@ -35,7 +35,6 @@ enum startcond_type {
+   PARSER_SC_CT,
+   PARSER_SC_COUNTER,
+   PARSER_SC_ETH,
+-  PARSER_SC_FLAGS,
+   PARSER_SC_ICMP,
+   PARSER_SC_IGMP,
+   PARSER_SC_IP,
+diff --git a/src/parser_bison.y b/src/parser_bison.y
+index ca5c488c..2a0240fb 100644
+--- a/src/parser_bison.y
 b/src/parser_bison.y
+@@ -942,7 +942,6 @@ close_scope_esp: { 
scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_ESP); }
+ close_scope_eth   : { scanner_pop_start_cond(nft->scanner, 
PARSER_SC_ETH); };
+ close_scope_export: { scanner_pop_start_cond(nft->scanner, 
PARSER_SC_CMD_EXPORT); };
+ close_scope_fib   : { scanner_pop_start_cond(nft->scanner, 
PARSER_SC_EXPR_FIB); };
+-close_scope_flags : { scanner_pop_start_cond(nft->scanner, 
PARSER_SC_FLAGS); };
+ close_scope_frag  : { scanner_pop_start_cond(nft->scanner, 
PARSER_SC_EXPR_FRAG); };
+ close_scope_fwd   : { scanner_pop_start_cond(nft->scanner, 
PARSER_SC_STMT_FWD); };
+ close_scope_hash  : { scanner_pop_start_cond(nft->scanner, 
PARSER_SC_EXPR_HASH); };
+@@ -1679,7 +1678,7 @@ table_block_alloc:   /* empty */
+   }
+   ;
+ 
+-table_options :   FLAGS   STRING  close_scope_flags
++table_options :   FLAGS   STRING
+   {
+   if (strcmp($2, "dormant") == 0) {
+   $0->flags |= TABLE_F_DORMANT;
+@@ -1946,7 +1945,7 @@ set_block:   /* empty */ { $$ = 
$-1; }
+   datatype_set($1->key, $3->dtype);
+   $$ = $1;
+   }
+-  |   set_block   FLAGS   set_flag_list   
stmt_separator  close_scope_flags
++  |   set_block   FLAGS   set_flag_list   
stmt_separator
+   {
+   $1->flags = $3;
+   $$ = $1;
+@@ -2080,7 +2079,7 @@ map_block:   /* empty */ { $$ = 
$-1; }
+   $1->flags  |= NFT_SET_OBJECT;
+   $$ = $1;
+   }
+-  |   map_block   FLAGS   set_flag_list   
stmt_separator  close_scope_flags
++  |   map_block   FLAGS   set_flag_list   
stmt_separator
+   {
+   $1->flags |= $3;
+

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Mike Gilbert]

commit: abba72542b34205c1a18fadba8b897a427108ce8
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Jun 17 16:08:38 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Fri Jun 17 16:08:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abba7254

net-firewall/nftables: sync live ebuild

Signed-off-by: Mike Gilbert  gentoo.org>

 net-firewall/nftables/nftables-.ebuild | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/net-firewall/nftables/nftables-.ebuild 
b/net-firewall/nftables/nftables-.ebuild
index 86c5513a263c..d3b5ea2ddc40 100644
--- a/net-firewall/nftables/nftables-.ebuild
+++ b/net-firewall/nftables/nftables-.ebuild
@@ -33,7 +33,7 @@ RESTRICT="test? ( userpriv ) !test? ( test )"
 
 RDEPEND="
>=net-libs/libmnl-1.0.4:0=
-   >=net-libs/libnftnl-1.2.1:0=
+   >=net-libs/libnftnl-1.2.2:0=
gmp? ( dev-libs/gmp:= )
json? ( dev-libs/jansson:= )
python? ( ${PYTHON_DEPS} )
@@ -57,11 +57,6 @@ REQUIRED_USE="
libedit? ( !readline )
 "
 
-PATCHES=(
-   "${FILESDIR}"/${P}-optimize-segfault.patch
-   "${FILESDIR}"/${P}-test-shell-sets.patch
-)
-
 pkg_setup() {
if kernel_is ge 3 13; then
if use modern-kernel && kernel_is lt 3 18; then

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/files/, net-firewall/nftables/

[Mike Gilbert]

commit: 00f385e7029c9a98e4b9a1912c749d20a8ce77cb
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Jun 17 16:07:26 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Fri Jun 17 16:07:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00f385e7

net-firewall/nftables: drop 1.0.1-r2, 1.0.3, 1.0.3-r1

Signed-off-by: Mike Gilbert  gentoo.org>

 net-firewall/nftables/Manifest |   4 -
 .../nftables/files/nftables-0.9.8-slibtool.patch   |  13 --
 .../files/nftables-1.0.3-optimize-segfault.patch   |  64 ---
 .../files/nftables-1.0.3-test-shell-sets.patch |  21 ---
 net-firewall/nftables/nftables-1.0.1-r2.ebuild | 188 ---
 net-firewall/nftables/nftables-1.0.3-r1.ebuild | 206 -
 net-firewall/nftables/nftables-1.0.3.ebuild| 185 --
 7 files changed, 681 deletions(-)

diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 5b6889bfbb24..89b4506ccf95 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -1,8 +1,4 @@
-DIST nftables-1.0.1.tar.bz2 954586 BLAKE2B 
e406699c96b98495f1b6deeab0233873ce20b43c13c162eafea1e6b371961123a69f3d5e7bd2f1bedfdbe58fed56ba3e2dae962b88657af6f4ab5b3743fb6373
 SHA512 
a0db4d82725509d2a9c638ba7ba55547ad7b5138a5fe686b0e90260d6a65e060dd72a470969c1d69e945303bd2bfc33b2021d9f4141b88befefddc61b7afe10d
-DIST nftables-1.0.1.tar.bz2.sig 566 BLAKE2B 
d504987b16b7a8676586ecb3a1ce9588bff972ca54bbb3ce3b0db5288f1fd981e529dccea009bd01a3a96e5199a034956bd43cdeaba67847239a88d458f43f8a
 SHA512 
0884098ceabe7b070e146e47292afd8c80188ea595eaeaadb228307f502dae4a43bf801dea2a25519eaef3c96d567daf40e45c37fabb58db1b2256eb8f256cb0
 DIST nftables-1.0.2.tar.bz2 970781 BLAKE2B 
650ae6badb574ff3628d21c8aa99f81e73932dd172b3569618696100bf3853b9a108bf0296dcf9d615ae7c0fbec84b48266299b62cf755d181d19c626f8a3cd4
 SHA512 
560d23c6e369eafd7b354d29fe73d46154e4a74dec000178c1aea47751fe535d20c4e6bbecd3955eb2b327c7a60b1269e5c6dc5781498546b639fa2d1367a9ca
 DIST nftables-1.0.2.tar.bz2.sig 566 BLAKE2B 
5b7a20b28c274a950b718e2e14313772707b6bdc3f4519f747350593c1eb3bfbcf8c5dd9ae7d5aa0488c5cde9af8b58e05349c75e8a8246c5634303a331f9d98
 SHA512 
9be59d771833ac315fd52cffe7074ed9d49fbf592aec8d94500bbc7cc1f44dcb54b3815c46831a5e7e4c4770901cbdd6b8ffc5aa8d8cb7e064ec1c8453d890f1
-DIST nftables-1.0.3.tar.bz2 978270 BLAKE2B 
f0410805e47679749a7e157e76834ee977bda53042a3c9fa34052778613c25bfc944257f6e51a94c9981cacbe28fb82ec8e3b82a2e1e34865b1412890138bfb0
 SHA512 
83252c0275f20243065c4d77dfca4ab2b70b4042c9491fb3323eb60c96f9a6e0d69699a641457f3d629d078269ba62ce766ffdb2ad79c64bd54ad11943819900
-DIST nftables-1.0.3.tar.bz2.sig 566 BLAKE2B 
8cf74954708c827e16932c58481981838b129f598f760a457fc2ab503500dfdf4de42f671d07e7920a028d2489f8a96a14bf8698fa3a9ad9997ce3411d6be0fd
 SHA512 
f8a4acc6cf0a844720cf4bf2808b0c6a103f81f54d90cf155bd2c86938d997dc92d405b94eb91b725edeb8e76ef23c6ec318f067b30b2049fbef765230020ff2
 DIST nftables-1.0.4.tar.bz2 979540 BLAKE2B 
1b2c596245cb7f1bc574250d13b9ff6f424f98e98d5955befadb83ea0a71acc6524b066e39f1e9d151f3946b690b2dee45b7d416347371f88911c8d6a9de047e
 SHA512 
7d96c791365d399b3b930a1f9d6c6aa4a8c2180c258bb5163d9d62ea4d094857e2ebb20fc3ef13b89f449f216d0a291d3bcf288704f1e3bd3ceb51b6cadf8215
 DIST nftables-1.0.4.tar.bz2.sig 566 BLAKE2B 
1ac42a2eb678abcc21d01bbaf5f9a3af3f4c49fa1f0732f2522d3da14e94aacbb12075650d2786224f8fef869fcdc94a1463bd76272aa44fc50ea31a8ebae1bf
 SHA512 
2d2acd4810c1ede844e1eac81a5480866ad40ae71dfcf92d166fd9295290adff70d35d7de8cf1ec81ab63d184b221419ff144bc7010e18884afa992173723af8

diff --git a/net-firewall/nftables/files/nftables-0.9.8-slibtool.patch 
b/net-firewall/nftables/files/nftables-0.9.8-slibtool.patch
deleted file mode 100644
index a92645f793c7..
--- a/net-firewall/nftables/files/nftables-0.9.8-slibtool.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-This fixes build with sys-devel/slibtool
-
 nftables-0.9.8/src/Makefile.am
-+++ nftables-0.9.8/src/Makefile.am
-@@ -90,7 +90,7 @@
- 
- libnftables_la_LIBADD = ${LIBMNL_LIBS} ${LIBNFTNL_LIBS} libparser.la
- libnftables_la_LDFLAGS = -version-info ${libnftables_LIBVERSION} \
--   --version-script=$(srcdir)/libnftables.map
-+   -Wl,--version-script=$(srcdir)/libnftables.map
- 
- if BUILD_MINIGMP
- noinst_LTLIBRARIES += libminigmp.la

diff --git a/net-firewall/nftables/files/nftables-1.0.3-optimize-segfault.patch 
b/net-firewall/nftables/files/nftables-1.0.3-optimize-segfault.patch
deleted file mode 100644
index 95e53adc0b2f..
--- a/net-firewall/nftables/files/nftables-1.0.3-optimize-segfault.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-https://git.netfilter.org/nftables/commit/?id=59bd944f6d75e99fe0c8d743e7fd482672640c2d
-
-From: Pablo Neira Ayuso 
-Date: Wed, 1 Jun 2022 10:14:22 +0200
-Subject: optimize: segfault when releasing unsupported statement
-
-Call xfree() instead since stmt_alloc() does not initialize the
-statement type 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Patrick McLean]

commit: 60d8462e92ee38b266d8d6c91e451032db46fe2c
Author: Patrick McLean  gentoo  org>
AuthorDate: Tue Jun  7 20:31:05 2022 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Tue Jun  7 20:31:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60d8462e

net-firewall/nftables: add 1.0.4

Signed-off-by: Patrick McLean  gentoo.org>

 net-firewall/nftables/Manifest  |   2 +
 net-firewall/nftables/nftables-1.0.4.ebuild | 201 
 2 files changed, 203 insertions(+)

diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 3435a1a543d2..5b6889bfbb24 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -4,3 +4,5 @@ DIST nftables-1.0.2.tar.bz2 970781 BLAKE2B 
650ae6badb574ff3628d21c8aa99f81e73932
 DIST nftables-1.0.2.tar.bz2.sig 566 BLAKE2B 
5b7a20b28c274a950b718e2e14313772707b6bdc3f4519f747350593c1eb3bfbcf8c5dd9ae7d5aa0488c5cde9af8b58e05349c75e8a8246c5634303a331f9d98
 SHA512 
9be59d771833ac315fd52cffe7074ed9d49fbf592aec8d94500bbc7cc1f44dcb54b3815c46831a5e7e4c4770901cbdd6b8ffc5aa8d8cb7e064ec1c8453d890f1
 DIST nftables-1.0.3.tar.bz2 978270 BLAKE2B 
f0410805e47679749a7e157e76834ee977bda53042a3c9fa34052778613c25bfc944257f6e51a94c9981cacbe28fb82ec8e3b82a2e1e34865b1412890138bfb0
 SHA512 
83252c0275f20243065c4d77dfca4ab2b70b4042c9491fb3323eb60c96f9a6e0d69699a641457f3d629d078269ba62ce766ffdb2ad79c64bd54ad11943819900
 DIST nftables-1.0.3.tar.bz2.sig 566 BLAKE2B 
8cf74954708c827e16932c58481981838b129f598f760a457fc2ab503500dfdf4de42f671d07e7920a028d2489f8a96a14bf8698fa3a9ad9997ce3411d6be0fd
 SHA512 
f8a4acc6cf0a844720cf4bf2808b0c6a103f81f54d90cf155bd2c86938d997dc92d405b94eb91b725edeb8e76ef23c6ec318f067b30b2049fbef765230020ff2
+DIST nftables-1.0.4.tar.bz2 979540 BLAKE2B 
1b2c596245cb7f1bc574250d13b9ff6f424f98e98d5955befadb83ea0a71acc6524b066e39f1e9d151f3946b690b2dee45b7d416347371f88911c8d6a9de047e
 SHA512 
7d96c791365d399b3b930a1f9d6c6aa4a8c2180c258bb5163d9d62ea4d094857e2ebb20fc3ef13b89f449f216d0a291d3bcf288704f1e3bd3ceb51b6cadf8215
+DIST nftables-1.0.4.tar.bz2.sig 566 BLAKE2B 
1ac42a2eb678abcc21d01bbaf5f9a3af3f4c49fa1f0732f2522d3da14e94aacbb12075650d2786224f8fef869fcdc94a1463bd76272aa44fc50ea31a8ebae1bf
 SHA512 
2d2acd4810c1ede844e1eac81a5480866ad40ae71dfcf92d166fd9295290adff70d35d7de8cf1ec81ab63d184b221419ff144bc7010e18884afa992173723af8

diff --git a/net-firewall/nftables/nftables-1.0.4.ebuild 
b/net-firewall/nftables/nftables-1.0.4.ebuild
new file mode 100644
index ..d3b5ea2ddc40
--- /dev/null
+++ b/net-firewall/nftables/nftables-1.0.4.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8..11} )
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+inherit edo linux-info distutils-r1 systemd verify-sig
+
+DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
+HOMEPAGE="https://netfilter.org/projects/nftables/;
+
+if [[ ${PV} =~ ^[9]{4,}$ ]]; then
+   inherit autotools git-r3
+   EGIT_REPO_URI="https://git.netfilter.org/${PN};
+
+   BDEPEND="
+   sys-devel/bison
+   sys-devel/flex
+   "
+else
+   SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
+   verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
+   BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/1"
+IUSE="debug doc +gmp json libedit +modern-kernel python +readline static-libs 
test xtables"
+RESTRICT="test? ( userpriv ) !test? ( test )"
+
+RDEPEND="
+   >=net-libs/libmnl-1.0.4:0=
+   >=net-libs/libnftnl-1.2.2:0=
+   gmp? ( dev-libs/gmp:= )
+   json? ( dev-libs/jansson:= )
+   python? ( ${PYTHON_DEPS} )
+   readline? ( sys-libs/readline:= )
+   xtables? ( >=net-firewall/iptables-1.6.1:= )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND+="
+   virtual/pkgconfig
+   doc? (
+   app-text/asciidoc
+   >=app-text/docbook2X-0.8.8-r4
+   )
+   python? ( ${PYTHON_DEPS} )
+"
+
+REQUIRED_USE="
+   python? ( ${PYTHON_REQUIRED_USE} )
+   libedit? ( !readline )
+"
+
+pkg_setup() {
+   if kernel_is ge 3 13; then
+   if use modern-kernel && kernel_is lt 3 18; then
+   eerror "The modern-kernel USE flag requires kernel 
version 3.18 or newer to work properly."
+   fi
+   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
+
+   if [[ ${PV} =~ ^[9]{4,}$ ]] ; then
+   eautoreconf
+   fi
+
+   if use python; then

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 33de47eadff3c80c6d5b5167b23b989fabec642f
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun  5 09:20:13 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun  5 09:20:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33de47ea

net-firewall/nftables: fix doc install

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.3-r1.ebuild | 1 +
 net-firewall/nftables/nftables-.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/net-firewall/nftables/nftables-1.0.3-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.3-r1.ebuild
index d4ace7fe057b..86c5513a263c 100644
--- a/net-firewall/nftables/nftables-1.0.3-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.3-r1.ebuild
@@ -144,6 +144,7 @@ src_install() {
 
# Do it here instead of in src_prepare to avoid eautoreconf
# rmdir lets us catch if more files end up installed in /etc/nftables
+   dodir /usr/share/doc/${PF}/skels/
mv "${ED}"/etc/nftables/osf "${ED}"/usr/share/doc/${PF}/skels/osf || die
rmdir "${ED}"/etc/nftables || die
 

diff --git a/net-firewall/nftables/nftables-.ebuild 
b/net-firewall/nftables/nftables-.ebuild
index d4ace7fe057b..86c5513a263c 100644
--- a/net-firewall/nftables/nftables-.ebuild
+++ b/net-firewall/nftables/nftables-.ebuild
@@ -144,6 +144,7 @@ src_install() {
 
# Do it here instead of in src_prepare to avoid eautoreconf
# rmdir lets us catch if more files end up installed in /etc/nftables
+   dodir /usr/share/doc/${PF}/skels/
mv "${ED}"/etc/nftables/osf "${ED}"/usr/share/doc/${PF}/skels/osf || die
rmdir "${ED}"/etc/nftables || die
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/, net-firewall/nftables/files/

[Sam James]

commit: 9996c079375c4db6aa9a5b35f3e947608c4b99c5
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun  5 06:41:40 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun  5 06:44:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9996c079

net-firewall/nftables: backport crash fix; add test infrastructure

Signed-off-by: Sam James  gentoo.org>

 .../files/nftables-1.0.3-optimize-segfault.patch   | 64 ++
 .../files/nftables-1.0.3-test-shell-sets.patch | 21 +++
 ...tables-.ebuild => nftables-1.0.3-r1.ebuild} | 48 +++-
 net-firewall/nftables/nftables-.ebuild | 48 +++-
 4 files changed, 153 insertions(+), 28 deletions(-)

diff --git a/net-firewall/nftables/files/nftables-1.0.3-optimize-segfault.patch 
b/net-firewall/nftables/files/nftables-1.0.3-optimize-segfault.patch
new file mode 100644
index ..95e53adc0b2f
--- /dev/null
+++ b/net-firewall/nftables/files/nftables-1.0.3-optimize-segfault.patch
@@ -0,0 +1,64 @@
+https://git.netfilter.org/nftables/commit/?id=59bd944f6d75e99fe0c8d743e7fd482672640c2d
+
+From: Pablo Neira Ayuso 
+Date: Wed, 1 Jun 2022 10:14:22 +0200
+Subject: optimize: segfault when releasing unsupported statement
+
+Call xfree() instead since stmt_alloc() does not initialize the
+statement type fields.
+
+Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1609
+Fixes: ea1f1c9ff608 ("optimize: memleak in statement matrix")
+Signed-off-by: Pablo Neira Ayuso 
+--- a/src/optimize.c
 b/src/optimize.c
+@@ -304,7 +304,7 @@ static int rule_collect_stmts(struct optimize_ctx *ctx, 
struct rule *rule)
+   clone->nat.type_flags = stmt->nat.type_flags;
+   break;
+   default:
+-  stmt_free(clone);
++  xfree(clone);
+   continue;
+   }
+ 
+--- a/tests/shell/testcases/optimizations/dumps/merge_vmaps.nft
 b/tests/shell/testcases/optimizations/dumps/merge_vmaps.nft
+@@ -1,4 +1,10 @@
+ table ip x {
++  set s {
++  type ipv4_addr
++  size 65535
++  flags dynamic
++  }
++
+   chain filter_in_tcp {
+   }
+ 
+@@ -6,6 +12,7 @@ table ip x {
+   }
+ 
+   chain y {
++  update @s { ip saddr limit rate 12/minute burst 30 packets } 
accept
+   tcp dport vmap { 80 : accept, 81 : accept, 443 : accept, 
8000-8100 : accept, 24000-25000 : accept }
+   meta l4proto vmap { tcp : goto filter_in_tcp, udp : goto 
filter_in_udp }
+   log
+--- a/tests/shell/testcases/optimizations/merge_vmaps
 b/tests/shell/testcases/optimizations/merge_vmaps
+@@ -3,11 +3,16 @@
+ set -e
+ 
+ RULESET="table ip x {
++  set s {
++  type ipv4_addr
++  flags dynamic
++  }
+   chain filter_in_tcp {
+   }
+   chain filter_in_udp {
+   }
+   chain y {
++  update @s { ip saddr limit rate 12/minute burst 30 packets } 
accept
+   tcp dport vmap {
+   80 : accept,
+   81 : accept,
+cgit v1.2.3

diff --git a/net-firewall/nftables/files/nftables-1.0.3-test-shell-sets.patch 
b/net-firewall/nftables/files/nftables-1.0.3-test-shell-sets.patch
new file mode 100644
index ..c5f93e20eea6
--- /dev/null
+++ b/net-firewall/nftables/files/nftables-1.0.3-test-shell-sets.patch
@@ -0,0 +1,21 @@
+https://git.netfilter.org/nftables/commit/?id=3835de19fe5773baac5b79f35484d0f0e99bcfe1
+
+From: Pablo Neira Ayuso 
+Date: Wed, 1 Jun 2022 18:17:02 +0200
+Subject: tests: shell: sets_with_ifnames release netns on exit
+
+Missing ip netns del call from cleanup()
+
+Fixes: d6fdb0d8d482 ("sets_with_ifnames: add test case for concatenated range")
+Signed-off-by: Pablo Neira Ayuso 
+--- a/tests/shell/testcases/sets/sets_with_ifnames
 b/tests/shell/testcases/sets/sets_with_ifnames
+@@ -13,6 +13,7 @@ ns2="nft2ifname-$rnd"
+ cleanup()
+ {
+   ip netns del "$ns1"
++  ip netns del "$ns2"
+ }
+ 
+ trap cleanup EXIT
+cgit v1.2.3

diff --git a/net-firewall/nftables/nftables-.ebuild 
b/net-firewall/nftables/nftables-1.0.3-r1.ebuild
similarity index 82%
copy from net-firewall/nftables/nftables-.ebuild
copy to net-firewall/nftables/nftables-1.0.3-r1.ebuild
index fa427dadfaab..d4ace7fe057b 100644
--- a/net-firewall/nftables/nftables-.ebuild
+++ b/net-firewall/nftables/nftables-1.0.3-r1.ebuild
@@ -3,15 +3,16 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_OPTIONAL=1
-inherit autotools linux-info distutils-r1 systemd verify-sig
+PYTHON_COMPAT=( python3_{8..11} )
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+inherit edo linux-info distutils-r1 systemd verify-sig
 
 DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
 HOMEPAGE="https://netfilter.org/projects/nftables/;
 
 if [[ ${PV} =~ ^[9]{4,}$ ]]; then
-   inherit 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Patrick McLean]

commit: 9b414a68ec09718eea2cb5c73e001bb3efa15197
Author: Patrick McLean  gentoo  org>
AuthorDate: Tue May 31 22:24:50 2022 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Tue May 31 22:24:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b414a68

net-firewall/nftables: add 1.0.3

Signed-off-by: Patrick McLean  gentoo.org>

 net-firewall/nftables/Manifest  |   2 +
 net-firewall/nftables/nftables-1.0.3.ebuild | 185 
 2 files changed, 187 insertions(+)

diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index a4a06b4bf72b..3435a1a543d2 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -2,3 +2,5 @@ DIST nftables-1.0.1.tar.bz2 954586 BLAKE2B 
e406699c96b98495f1b6deeab0233873ce20b
 DIST nftables-1.0.1.tar.bz2.sig 566 BLAKE2B 
d504987b16b7a8676586ecb3a1ce9588bff972ca54bbb3ce3b0db5288f1fd981e529dccea009bd01a3a96e5199a034956bd43cdeaba67847239a88d458f43f8a
 SHA512 
0884098ceabe7b070e146e47292afd8c80188ea595eaeaadb228307f502dae4a43bf801dea2a25519eaef3c96d567daf40e45c37fabb58db1b2256eb8f256cb0
 DIST nftables-1.0.2.tar.bz2 970781 BLAKE2B 
650ae6badb574ff3628d21c8aa99f81e73932dd172b3569618696100bf3853b9a108bf0296dcf9d615ae7c0fbec84b48266299b62cf755d181d19c626f8a3cd4
 SHA512 
560d23c6e369eafd7b354d29fe73d46154e4a74dec000178c1aea47751fe535d20c4e6bbecd3955eb2b327c7a60b1269e5c6dc5781498546b639fa2d1367a9ca
 DIST nftables-1.0.2.tar.bz2.sig 566 BLAKE2B 
5b7a20b28c274a950b718e2e14313772707b6bdc3f4519f747350593c1eb3bfbcf8c5dd9ae7d5aa0488c5cde9af8b58e05349c75e8a8246c5634303a331f9d98
 SHA512 
9be59d771833ac315fd52cffe7074ed9d49fbf592aec8d94500bbc7cc1f44dcb54b3815c46831a5e7e4c4770901cbdd6b8ffc5aa8d8cb7e064ec1c8453d890f1
+DIST nftables-1.0.3.tar.bz2 978270 BLAKE2B 
f0410805e47679749a7e157e76834ee977bda53042a3c9fa34052778613c25bfc944257f6e51a94c9981cacbe28fb82ec8e3b82a2e1e34865b1412890138bfb0
 SHA512 
83252c0275f20243065c4d77dfca4ab2b70b4042c9491fb3323eb60c96f9a6e0d69699a641457f3d629d078269ba62ce766ffdb2ad79c64bd54ad11943819900
+DIST nftables-1.0.3.tar.bz2.sig 566 BLAKE2B 
8cf74954708c827e16932c58481981838b129f598f760a457fc2ab503500dfdf4de42f671d07e7920a028d2489f8a96a14bf8698fa3a9ad9997ce3411d6be0fd
 SHA512 
f8a4acc6cf0a844720cf4bf2808b0c6a103f81f54d90cf155bd2c86938d997dc92d405b94eb91b725edeb8e76ef23c6ec318f067b30b2049fbef765230020ff2

diff --git a/net-firewall/nftables/nftables-1.0.3.ebuild 
b/net-firewall/nftables/nftables-1.0.3.ebuild
new file mode 100644
index ..cdfe5fdcf824
--- /dev/null
+++ b/net-firewall/nftables/nftables-1.0.3.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_OPTIONAL=1
+inherit autotools linux-info distutils-r1 systemd verify-sig
+
+DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
+HOMEPAGE="https://netfilter.org/projects/nftables/;
+
+if [[ ${PV} =~ ^[9]{4,}$ ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.netfilter.org/${PN};
+
+   BDEPEND="
+   sys-devel/bison
+   sys-devel/flex
+   "
+else
+   SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
+   verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
+   
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+   BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/1"
+IUSE="debug doc +gmp json libedit +modern-kernel python +readline static-libs 
xtables"
+
+RDEPEND="
+   >=net-libs/libmnl-1.0.4:0=
+   >=net-libs/libnftnl-1.2.1:0=
+   gmp? ( dev-libs/gmp:= )
+   json? ( dev-libs/jansson:= )
+   python? ( ${PYTHON_DEPS} )
+   readline? ( sys-libs/readline:= )
+   xtables? ( >=net-firewall/iptables-1.6.1:= )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND+="
+   doc? (
+   app-text/asciidoc
+   >=app-text/docbook2X-0.8.8-r4
+   )
+   virtual/pkgconfig
+"
+
+REQUIRED_USE="
+   python? ( ${PYTHON_REQUIRED_USE} )
+   libedit? ( !readline )
+"
+
+pkg_setup() {
+   if kernel_is ge 3 13; then
+   if use modern-kernel && kernel_is lt 3 18; then
+   eerror "The modern-kernel USE flag requires kernel 
version 3.18 or newer to work properly."
+   fi
+   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
+
+   # fix installation path for doc stuff
+   sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}/skels@' \
+   -i files/nftables/Makefile.am || die
+   sed 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Jakov Smolić]

commit: c0b26d60740701f342a3ed1776dd69737cf94277
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun May 22 11:27:17 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun May 22 11:27:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0b26d60

net-firewall/nftables: Stabilize 1.0.2-r1 hppa, #846866

Signed-off-by: Jakov Smolić  gentoo.org>

 net-firewall/nftables/nftables-1.0.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.2-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.2-r1.ebuild
index 9a7af1d5d32a..a7337abb2897 100644
--- a/net-firewall/nftables/nftables-1.0.2-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.2-r1.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+   KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"

VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Agostino Sarubbo]

commit: 697c2ffd18048a79839e18094d1c93401cbcbcda
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun May 22 06:21:10 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun May 22 06:21:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=697c2ffd

net-firewall/nftables: sparc stable wrt bug #846866

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-firewall/nftables/nftables-1.0.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.2-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.2-r1.ebuild
index f12391d2ac8c..9a7af1d5d32a 100644
--- a/net-firewall/nftables/nftables-1.0.2-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.2-r1.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"

VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Agostino Sarubbo]

commit: 2b143812fb56a14f64e0906f617bafc2cec9d987
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun May 22 06:19:01 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun May 22 06:19:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b143812

net-firewall/nftables: arm64 stable wrt bug #846866

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="arm64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-firewall/nftables/nftables-1.0.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.2-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.2-r1.ebuild
index 5cdff3145b7d..f12391d2ac8c 100644
--- a/net-firewall/nftables/nftables-1.0.2-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.2-r1.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-   KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc 
x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"

VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Agostino Sarubbo]

commit: b01a079ae6239b67114025970e612c03cbaf67d3
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun May 22 06:17:00 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun May 22 06:17:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b01a079a

net-firewall/nftables: arm stable wrt bug #846866

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-firewall/nftables/nftables-1.0.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.2-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.2-r1.ebuild
index dc7514e4f523..5cdff3145b7d 100644
--- a/net-firewall/nftables/nftables-1.0.2-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.2-r1.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc 
x86"
+   KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc 
x86"

VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: dd879feada8d429ea41afba54469f0695cafd23d
Author: Sam James  gentoo  org>
AuthorDate: Sun May 22 03:53:25 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 22 03:53:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd879fea

net-firewall/nftables: Stabilize 1.0.2-r1 ppc64, #846866

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.2-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.2-r1.ebuild
index 79879547ec0e..dc7514e4f523 100644
--- a/net-firewall/nftables/nftables-1.0.2-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.2-r1.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc 
x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc 
x86"

VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: c2797f7a17e2c2e25153ae329259d49105d764fd
Author: Sam James  gentoo  org>
AuthorDate: Sun May 22 03:25:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 22 03:25:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2797f7a

net-firewall/nftables: Stabilize 1.0.2-r1 ppc, #846866

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.2-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.2-r1.ebuild
index b85ab17dacdc..79879547ec0e 100644
--- a/net-firewall/nftables/nftables-1.0.2-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.2-r1.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc 
x86"

VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 8243912adebed0615db6740d1b86490577a44e0c
Author: Sam James  gentoo  org>
AuthorDate: Sun May 22 03:21:13 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 22 03:21:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8243912a

net-firewall/nftables: Stabilize 1.0.2-r1 x86, #846866

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.2-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.2-r1.ebuild
index efddc00e9729..b85ab17dacdc 100644
--- a/net-firewall/nftables/nftables-1.0.2-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.2-r1.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
x86"

VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: f9c6af04832ca7d8dc2ddd5cbfd9ff264022be73
Author: Sam James  gentoo  org>
AuthorDate: Sun May 22 03:19:42 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 22 03:19:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9c6af04

net-firewall/nftables: Stabilize 1.0.2-r1 amd64, #846866

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.2-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.2-r1.ebuild
index 4e105370dd23..efddc00e9729 100644
--- a/net-firewall/nftables/nftables-1.0.2-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.2-r1.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
~x86"

VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 17ebcc21dca47779c398ca44b6a2e36c2963e533
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 17 17:11:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 17 17:12:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17ebcc21

net-firewall/nftables: drop 0.9.8-r2, 0.9.9-r1, 1.0.0-r1

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/Manifest |   3 -
 net-firewall/nftables/nftables-0.9.8-r2.ebuild | 166 ---
 net-firewall/nftables/nftables-0.9.9-r1.ebuild | 179 -
 net-firewall/nftables/nftables-1.0.0-r1.ebuild | 179 -
 4 files changed, 527 deletions(-)

diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 1ca881039072..a4a06b4bf72b 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -1,6 +1,3 @@
-DIST nftables-0.9.8.tar.bz2 879516 BLAKE2B 
5063090d648668f4d5ae6d4be48ebecc65dfd4b525768e94a0d90ceebbee73874c916727be8de633550db71c612d698d88cf93575931362b48d954e6ac275143
 SHA512 
1c5709825c8b2c13cbed0310658959ecee164c930bc9e2447618a0894598138b9a549d20509c32a5c23ce99e40438df38f9e170cf656ce993d819f365490a180
-DIST nftables-0.9.9.tar.bz2 922624 BLAKE2B 
8de2709576a26ca84a8d694f7cb06cad2bb2fb4671ba21ffc32c0d5997e8124ae7cd794dafddf4db48d8a49c280b48b07d2a31b6c18f6647fdb67cfe7f065b61
 SHA512 
dfdd3ffc0ffc1742ca0494a3f8fac1c7b2fe942849e60d33fc3cb8a51e27bd39e1ccfeda2195191377a32bb5363ea244f4c3e71b4a6d930f33bf87e17a534fab
-DIST nftables-1.0.0.tar.bz2 921053 BLAKE2B 
ee86a323170433c3ba62f80118947864aac0fe0aaeb48afeb5a116a48782185c83313ef1b5735c7749eb5eccb88f252b444d1ee908be25bdaa4d9c0b833c1dc2
 SHA512 
33460bef4ee76b7caa44fa5515357127ae84be468448cc838dd31919b6e045ba6195b761118d4c8a4219a9f008c4416542ce784f4daad94f3b44c0626bcdd014
 DIST nftables-1.0.1.tar.bz2 954586 BLAKE2B 
e406699c96b98495f1b6deeab0233873ce20b43c13c162eafea1e6b371961123a69f3d5e7bd2f1bedfdbe58fed56ba3e2dae962b88657af6f4ab5b3743fb6373
 SHA512 
a0db4d82725509d2a9c638ba7ba55547ad7b5138a5fe686b0e90260d6a65e060dd72a470969c1d69e945303bd2bfc33b2021d9f4141b88befefddc61b7afe10d
 DIST nftables-1.0.1.tar.bz2.sig 566 BLAKE2B 
d504987b16b7a8676586ecb3a1ce9588bff972ca54bbb3ce3b0db5288f1fd981e529dccea009bd01a3a96e5199a034956bd43cdeaba67847239a88d458f43f8a
 SHA512 
0884098ceabe7b070e146e47292afd8c80188ea595eaeaadb228307f502dae4a43bf801dea2a25519eaef3c96d567daf40e45c37fabb58db1b2256eb8f256cb0
 DIST nftables-1.0.2.tar.bz2 970781 BLAKE2B 
650ae6badb574ff3628d21c8aa99f81e73932dd172b3569618696100bf3853b9a108bf0296dcf9d615ae7c0fbec84b48266299b62cf755d181d19c626f8a3cd4
 SHA512 
560d23c6e369eafd7b354d29fe73d46154e4a74dec000178c1aea47751fe535d20c4e6bbecd3955eb2b327c7a60b1269e5c6dc5781498546b639fa2d1367a9ca

diff --git a/net-firewall/nftables/nftables-0.9.8-r2.ebuild 
b/net-firewall/nftables/nftables-0.9.8-r2.ebuild
deleted file mode 100644
index 58bf1cc65087..
--- a/net-firewall/nftables/nftables-0.9.8-r2.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools linux-info python-r1 systemd
-
-DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
-HOMEPAGE="https://netfilter.org/projects/nftables/;
-SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="debug doc +gmp json +modern-kernel python +readline static-libs xtables"
-
-RDEPEND="
-   >=net-libs/libmnl-1.0.4:0=
-   >=net-libs/libnftnl-1.1.9:0=
-   gmp? ( dev-libs/gmp:= )
-   json? ( dev-libs/jansson:= )
-   python? ( ${PYTHON_DEPS} )
-   readline? ( sys-libs/readline:= )
-   xtables? ( >=net-firewall/iptables-1.6.1:= )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-   doc? (
-   app-text/asciidoc
-   >=app-text/docbook2X-0.8.8-r4
-   )
-   virtual/pkgconfig
-"
-
-REQUIRED_USE="
-   python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-0.9.8-slibtool.patch"
-)
-
-python_make() {
-   emake \
-   -C py \
-   abs_builddir="${S}" \
-   DESTDIR="${D}" \
-   PYTHON_BIN="${PYTHON}" \
-   "${@}"
-}
-
-pkg_setup() {
-   if kernel_is ge 3 13; then
-   if use modern-kernel && kernel_is lt 3 18; then
-   eerror "The modern-kernel USE flag requires kernel 
version 3.18 or newer to work properly."
-   fi
-   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
-
-   # fix installation path for doc stuff
-   sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}/skels@' 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 9988904e1660bddfb33e49cec5f05b6ec3fac223
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 27 02:58:09 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 02:58:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9988904e

net-firewall/nftables: drop patches from live ebuild

All applied upstream.

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-.ebuild | 6 --
 1 file changed, 6 deletions(-)

diff --git a/net-firewall/nftables/nftables-.ebuild 
b/net-firewall/nftables/nftables-.ebuild
index 4e105370dd23..fa427dadfaab 100644
--- a/net-firewall/nftables/nftables-.ebuild
+++ b/net-firewall/nftables/nftables-.ebuild
@@ -55,12 +55,6 @@ REQUIRED_USE="
libedit? ( !readline )
 "
 
-PATCHES=(
-   "${FILESDIR}/nftables-1.0.2-compilation.patch"
-   
"${FILESDIR}/nftables-1.0.2-build-explicitly-pass-version-script-to-linker.patch"
-   
"${FILESDIR}/nftables-1.0.2-libnftables.map-export-new-nft_ctx_-get-set-_optimiz.patch"
-)
-
 pkg_setup() {
if kernel_is ge 3 13; then
if use modern-kernel && kernel_is lt 3 18; then

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 0e8c96332ffea0e15f4749e7574ecf70199a0e5b
Author: Jonathan Davies  protonmail  com>
AuthorDate: Sat Mar 26 23:56:13 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 02:56:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e8c9633

net-firewall/nftables: Sync live ebuild.

Signed-off-by: Jonathan Davies  protonmail.com>
Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-.ebuild | 16 +++-
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/net-firewall/nftables/nftables-.ebuild 
b/net-firewall/nftables/nftables-.ebuild
index d6697d8a7eef..4e105370dd23 100644
--- a/net-firewall/nftables/nftables-.ebuild
+++ b/net-firewall/nftables/nftables-.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_OPTIONAL=1
-inherit autotools linux-info distutils-r1 systemd
+inherit autotools linux-info distutils-r1 systemd verify-sig
 
 DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
 HOMEPAGE="https://netfilter.org/projects/nftables/;
@@ -19,8 +19,11 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
sys-devel/flex
"
 else
-   SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2;
-   KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+   SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
+   verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
+   
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+   BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 
 LICENSE="GPL-2"
@@ -53,7 +56,9 @@ REQUIRED_USE="
 "
 
 PATCHES=(
-   "${FILESDIR}/${PN}-0.9.8-slibtool.patch"
+   "${FILESDIR}/nftables-1.0.2-compilation.patch"
+   
"${FILESDIR}/nftables-1.0.2-build-explicitly-pass-version-script-to-linker.patch"
+   
"${FILESDIR}/nftables-1.0.2-libnftables.map-export-new-nft_ctx_-get-set-_optimiz.patch"
 )
 
 pkg_setup() {
@@ -90,6 +95,7 @@ src_configure() {
local myeconfargs=(
# We handle python separately
--disable-python
+   --disable-static
--sbindir="${EPREFIX}"/sbin
$(use_enable debug)
$(use_enable doc man-doc)

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 47dd20a2863b0184ae25566161b4709909391a0d
Author: Jonathan Davies  protonmail  com>
AuthorDate: Sat Mar 26 21:09:37 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 02:56:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47dd20a2

net-firewall/nftables: Added verify-sig integration.

Signed-off-by: Jonathan Davies  protonmail.com>
Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/Manifest | 2 ++
 net-firewall/nftables/nftables-1.0.1-r2.ebuild | 7 +--
 net-firewall/nftables/nftables-1.0.2-r1.ebuild | 7 +--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 164083bf9526..1ca881039072 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -2,4 +2,6 @@ DIST nftables-0.9.8.tar.bz2 879516 BLAKE2B 
5063090d648668f4d5ae6d4be48ebecc65dfd
 DIST nftables-0.9.9.tar.bz2 922624 BLAKE2B 
8de2709576a26ca84a8d694f7cb06cad2bb2fb4671ba21ffc32c0d5997e8124ae7cd794dafddf4db48d8a49c280b48b07d2a31b6c18f6647fdb67cfe7f065b61
 SHA512 
dfdd3ffc0ffc1742ca0494a3f8fac1c7b2fe942849e60d33fc3cb8a51e27bd39e1ccfeda2195191377a32bb5363ea244f4c3e71b4a6d930f33bf87e17a534fab
 DIST nftables-1.0.0.tar.bz2 921053 BLAKE2B 
ee86a323170433c3ba62f80118947864aac0fe0aaeb48afeb5a116a48782185c83313ef1b5735c7749eb5eccb88f252b444d1ee908be25bdaa4d9c0b833c1dc2
 SHA512 
33460bef4ee76b7caa44fa5515357127ae84be468448cc838dd31919b6e045ba6195b761118d4c8a4219a9f008c4416542ce784f4daad94f3b44c0626bcdd014
 DIST nftables-1.0.1.tar.bz2 954586 BLAKE2B 
e406699c96b98495f1b6deeab0233873ce20b43c13c162eafea1e6b371961123a69f3d5e7bd2f1bedfdbe58fed56ba3e2dae962b88657af6f4ab5b3743fb6373
 SHA512 
a0db4d82725509d2a9c638ba7ba55547ad7b5138a5fe686b0e90260d6a65e060dd72a470969c1d69e945303bd2bfc33b2021d9f4141b88befefddc61b7afe10d
+DIST nftables-1.0.1.tar.bz2.sig 566 BLAKE2B 
d504987b16b7a8676586ecb3a1ce9588bff972ca54bbb3ce3b0db5288f1fd981e529dccea009bd01a3a96e5199a034956bd43cdeaba67847239a88d458f43f8a
 SHA512 
0884098ceabe7b070e146e47292afd8c80188ea595eaeaadb228307f502dae4a43bf801dea2a25519eaef3c96d567daf40e45c37fabb58db1b2256eb8f256cb0
 DIST nftables-1.0.2.tar.bz2 970781 BLAKE2B 
650ae6badb574ff3628d21c8aa99f81e73932dd172b3569618696100bf3853b9a108bf0296dcf9d615ae7c0fbec84b48266299b62cf755d181d19c626f8a3cd4
 SHA512 
560d23c6e369eafd7b354d29fe73d46154e4a74dec000178c1aea47751fe535d20c4e6bbecd3955eb2b327c7a60b1269e5c6dc5781498546b639fa2d1367a9ca
+DIST nftables-1.0.2.tar.bz2.sig 566 BLAKE2B 
5b7a20b28c274a950b718e2e14313772707b6bdc3f4519f747350593c1eb3bfbcf8c5dd9ae7d5aa0488c5cde9af8b58e05349c75e8a8246c5634303a331f9d98
 SHA512 
9be59d771833ac315fd52cffe7074ed9d49fbf592aec8d94500bbc7cc1f44dcb54b3815c46831a5e7e4c4770901cbdd6b8ffc5aa8d8cb7e064ec1c8453d890f1

diff --git a/net-firewall/nftables/nftables-1.0.1-r2.ebuild 
b/net-firewall/nftables/nftables-1.0.1-r2.ebuild
index 3ab5c9291110..a6b3f71dcc5e 100644
--- a/net-firewall/nftables/nftables-1.0.1-r2.ebuild
+++ b/net-firewall/nftables/nftables-1.0.1-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_OPTIONAL=1
-inherit autotools linux-info distutils-r1 systemd
+inherit autotools linux-info distutils-r1 systemd verify-sig
 
 DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
 HOMEPAGE="https://netfilter.org/projects/nftables/;
@@ -19,8 +19,11 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
sys-devel/flex
"
 else
-   SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2;
+   SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
+   verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+   
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+   BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 
 LICENSE="GPL-2"

diff --git a/net-firewall/nftables/nftables-1.0.2-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.2-r1.ebuild
index 8b7db17f23e8..4e105370dd23 100644
--- a/net-firewall/nftables/nftables-1.0.2-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_OPTIONAL=1
-inherit autotools linux-info distutils-r1 systemd
+inherit autotools linux-info distutils-r1 systemd verify-sig
 
 DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
 HOMEPAGE="https://netfilter.org/projects/nftables/;
@@ -19,8 +19,11 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
sys-devel/flex
"
 else
-   SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2;
+   SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
+   verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/, net-firewall/nftables/files/

[Sam James]

commit: 1dfcad644e14a6095f13e17bd16a5e9b39466b90
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 24 20:15:00 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 24 23:53:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dfcad64

net-firewall/nftables: restore slibtool patch, API export fix

Signed-off-by: Sam James  gentoo.org>

 ...-explicitly-pass-version-script-to-linker.patch | 27 +++
 .../files/nftables-1.0.2-compilation.patch |  2 ++
 map-export-new-nft_ctx_-get-set-_optimiz.patch | 31 ++
 ...ables-1.0.2.ebuild => nftables-1.0.2-r1.ebuild} |  2 ++
 4 files changed, 62 insertions(+)

diff --git 
a/net-firewall/nftables/files/nftables-1.0.2-build-explicitly-pass-version-script-to-linker.patch
 
b/net-firewall/nftables/files/nftables-1.0.2-build-explicitly-pass-version-script-to-linker.patch
new file mode 100644
index ..41c3de5bc83b
--- /dev/null
+++ 
b/net-firewall/nftables/files/nftables-1.0.2-build-explicitly-pass-version-script-to-linker.patch
@@ -0,0 +1,27 @@
+https://git.netfilter.org/nftables/commit/src?id=1d507ce7f1d3c12481ee24bd1dcac2fc1984ee9f
+
+From: Sam James 
+Date: Thu, 24 Feb 2022 19:45:43 +
+Subject: build: explicitly pass --version-script to linker
+
+--version-script is a linker option, so let's use -Wl, so that
+libtool handles it properly. It seems like the previous method gets silently
+ignored with GNU libtool in some cases(?) and downstream in Gentoo,
+we had to apply this change to make the build work with slibtool anyway.
+
+But it's indeed correct in any case, so let's swap.
+
+Signed-off-by: Sam James 
+Signed-off-by: Pablo Neira Ayuso 
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -91,7 +91,7 @@ libparser_la_CFLAGS = ${AM_CFLAGS} \
+ 
+ libnftables_la_LIBADD = ${LIBMNL_LIBS} ${LIBNFTNL_LIBS} libparser.la
+ libnftables_la_LDFLAGS = -version-info ${libnftables_LIBVERSION} \
+-   --version-script=$(srcdir)/libnftables.map
++   -Wl,--version-script=$(srcdir)/libnftables.map
+ 
+ if BUILD_MINIGMP
+ noinst_LTLIBRARIES += libminigmp.la
+cgit v1.2.3

diff --git a/net-firewall/nftables/files/nftables-1.0.2-compilation.patch 
b/net-firewall/nftables/files/nftables-1.0.2-compilation.patch
index 166063587485..96670c1d9531 100644
--- a/net-firewall/nftables/files/nftables-1.0.2-compilation.patch
+++ b/net-firewall/nftables/files/nftables-1.0.2-compilation.patch
@@ -1,3 +1,5 @@
+https://git.netfilter.org/nftables/commit/?id=18a08fb7f0443f8bde83393bd6f69e23a04246b3
+
 From 18a08fb7f0443f8bde83393bd6f69e23a04246b3 Mon Sep 17 00:00:00 2001
 From: Pablo Neira Ayuso 
 Date: Tue, 22 Feb 2022 00:56:36 +0100

diff --git 
a/net-firewall/nftables/files/nftables-1.0.2-libnftables.map-export-new-nft_ctx_-get-set-_optimiz.patch
 
b/net-firewall/nftables/files/nftables-1.0.2-libnftables.map-export-new-nft_ctx_-get-set-_optimiz.patch
new file mode 100644
index ..09841d48
--- /dev/null
+++ 
b/net-firewall/nftables/files/nftables-1.0.2-libnftables.map-export-new-nft_ctx_-get-set-_optimiz.patch
@@ -0,0 +1,31 @@
+https://git.netfilter.org/nftables/commit/src?id=e98a9b83cd52c7c75bedb3dad46539b197ed17ba
+
+From: Sam James 
+Date: Thu, 24 Feb 2022 19:45:42 +
+Subject: libnftables.map: export new nft_ctx_{get,set}_optimize API
+
+[ Remove incorrect symbol names were exported via .map file ]
+
+Without this, we're not explicitly saying this is part of the
+public API.
+
+This new API was added in 1.0.2 and is used by e.g. the main
+nft binary. Noticed when fixing the version-script option
+(separate patch) which picked up this problem when .map
+was missing symbols (related to when symbol visibility
+options get set).
+
+Signed-off-by: Sam James 
+Signed-off-by: Pablo Neira Ayuso 
+--- a/src/libnftables.map
 b/src/libnftables.map
+@@ -30,6 +30,6 @@ LIBNFTABLES_2 {
+ } LIBNFTABLES_1;
+ 
+ LIBNFTABLES_3 {
+-  nft_set_optimize;
+-  nft_get_optimize;
++  nft_ctx_set_optimize;
++  nft_ctx_get_optimize;
+ } LIBNFTABLES_2;
+cgit v1.2.3

diff --git a/net-firewall/nftables/nftables-1.0.2.ebuild 
b/net-firewall/nftables/nftables-1.0.2-r1.ebuild
similarity index 96%
rename from net-firewall/nftables/nftables-1.0.2.ebuild
rename to net-firewall/nftables/nftables-1.0.2-r1.ebuild
index 0bbf94f10942..8b7db17f23e8 100644
--- a/net-firewall/nftables/nftables-1.0.2.ebuild
+++ b/net-firewall/nftables/nftables-1.0.2-r1.ebuild
@@ -54,6 +54,8 @@ REQUIRED_USE="
 
 PATCHES=(
"${FILESDIR}/nftables-1.0.2-compilation.patch"
+   
"${FILESDIR}/nftables-1.0.2-build-explicitly-pass-version-script-to-linker.patch"
+   
"${FILESDIR}/nftables-1.0.2-libnftables.map-export-new-nft_ctx_-get-set-_optimiz.patch"
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/files/, net-firewall/nftables/

[Patrick McLean]

commit: 63428e7ae12c38a6c101386f7cf0499cfb087f04
Author: Patrick McLean  sony  com>
AuthorDate: Thu Feb 24 17:20:32 2022 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Thu Feb 24 17:20:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63428e7a

net-firewall/nftables: Version bump to 1.0.2

Had to drop the slibtool patch as it causes build to fail with GNU
libtool.

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Patrick McLean  gentoo.org>

 net-firewall/nftables/Manifest |   1 +
 .../files/nftables-1.0.2-compilation.patch |  34 
 net-firewall/nftables/nftables-1.0.2.ebuild| 186 +
 3 files changed, 221 insertions(+)

diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 9ba8523f3bc9..164083bf9526 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -2,3 +2,4 @@ DIST nftables-0.9.8.tar.bz2 879516 BLAKE2B 
5063090d648668f4d5ae6d4be48ebecc65dfd
 DIST nftables-0.9.9.tar.bz2 922624 BLAKE2B 
8de2709576a26ca84a8d694f7cb06cad2bb2fb4671ba21ffc32c0d5997e8124ae7cd794dafddf4db48d8a49c280b48b07d2a31b6c18f6647fdb67cfe7f065b61
 SHA512 
dfdd3ffc0ffc1742ca0494a3f8fac1c7b2fe942849e60d33fc3cb8a51e27bd39e1ccfeda2195191377a32bb5363ea244f4c3e71b4a6d930f33bf87e17a534fab
 DIST nftables-1.0.0.tar.bz2 921053 BLAKE2B 
ee86a323170433c3ba62f80118947864aac0fe0aaeb48afeb5a116a48782185c83313ef1b5735c7749eb5eccb88f252b444d1ee908be25bdaa4d9c0b833c1dc2
 SHA512 
33460bef4ee76b7caa44fa5515357127ae84be468448cc838dd31919b6e045ba6195b761118d4c8a4219a9f008c4416542ce784f4daad94f3b44c0626bcdd014
 DIST nftables-1.0.1.tar.bz2 954586 BLAKE2B 
e406699c96b98495f1b6deeab0233873ce20b43c13c162eafea1e6b371961123a69f3d5e7bd2f1bedfdbe58fed56ba3e2dae962b88657af6f4ab5b3743fb6373
 SHA512 
a0db4d82725509d2a9c638ba7ba55547ad7b5138a5fe686b0e90260d6a65e060dd72a470969c1d69e945303bd2bfc33b2021d9f4141b88befefddc61b7afe10d
+DIST nftables-1.0.2.tar.bz2 970781 BLAKE2B 
650ae6badb574ff3628d21c8aa99f81e73932dd172b3569618696100bf3853b9a108bf0296dcf9d615ae7c0fbec84b48266299b62cf755d181d19c626f8a3cd4
 SHA512 
560d23c6e369eafd7b354d29fe73d46154e4a74dec000178c1aea47751fe535d20c4e6bbecd3955eb2b327c7a60b1269e5c6dc5781498546b639fa2d1367a9ca

diff --git a/net-firewall/nftables/files/nftables-1.0.2-compilation.patch 
b/net-firewall/nftables/files/nftables-1.0.2-compilation.patch
new file mode 100644
index ..166063587485
--- /dev/null
+++ b/net-firewall/nftables/files/nftables-1.0.2-compilation.patch
@@ -0,0 +1,34 @@
+From 18a08fb7f0443f8bde83393bd6f69e23a04246b3 Mon Sep 17 00:00:00 2001
+From: Pablo Neira Ayuso 
+Date: Tue, 22 Feb 2022 00:56:36 +0100
+Subject: examples: compile with `make check' and add AM_CPPFLAGS
+
+Compile examples via `make check' like libnftnl does. Use AM_CPPFLAGS to
+specify local headers via -I.
+
+Unfortunately, `make distcheck' did not catch this compile time error in
+my system, since it was using the nftables/libnftables.h file of the
+previous nftables release.
+
+Fixes: 5b364657a35f ("build: missing SUBIRS update")
+Fixes: caf2a6ad2d22 ("examples: add libnftables example program")
+Signed-off-by: Pablo Neira Ayuso 
+---
+ examples/Makefile.am | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/examples/Makefile.am b/examples/Makefile.am
+index c972170d..3b8b0b67 100644
+--- a/examples/Makefile.am
 b/examples/Makefile.am
+@@ -1,4 +1,6 @@
+-noinst_PROGRAMS   = nft-buffer\
++check_PROGRAMS= nft-buffer\
+ nft-json-file
+ 
++AM_CPPFLAGS = -I$(top_srcdir)/include
++
+ LDADD = $(top_builddir)/src/libnftables.la
+-- 
+cgit v1.2.3
+

diff --git a/net-firewall/nftables/nftables-1.0.2.ebuild 
b/net-firewall/nftables/nftables-1.0.2.ebuild
new file mode 100644
index ..0bbf94f10942
--- /dev/null
+++ b/net-firewall/nftables/nftables-1.0.2.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_OPTIONAL=1
+inherit autotools linux-info distutils-r1 systemd
+
+DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
+HOMEPAGE="https://netfilter.org/projects/nftables/;
+
+if [[ ${PV} =~ ^[9]{4,}$ ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.netfilter.org/${PN};
+
+   BDEPEND="
+   sys-devel/bison
+   sys-devel/flex
+   "
+else
+   SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2;
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/1"
+IUSE="debug doc +gmp json libedit +modern-kernel python +readline static-libs 
xtables"
+
+RDEPEND="
+   >=net-libs/libmnl-1.0.4:0=
+   >=net-libs/libnftnl-1.2.1:0=
+   gmp? ( dev-libs/gmp:= )
+   json? ( 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: f1ae701c376a51515e37c30472508e3de833c8f5
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sun Feb 13 10:14:50 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 13 14:58:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1ae701c

net-firewall/nftables: stable 1.0.1-r2 for hppa, bug #833063

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.1-r2.ebuild 
b/net-firewall/nftables/nftables-1.0.1-r2.ebuild
index 200d07a1c304..3ab5c9291110 100644
--- a/net-firewall/nftables/nftables-1.0.1-r2.ebuild
+++ b/net-firewall/nftables/nftables-1.0.1-r2.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
"
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2;
-   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+   KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: a90213e9289ee8d04a062c163158b70e92f8db16
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 10 11:49:48 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 10 11:50:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a90213e9

net-firewall/nftables: add subslot dependency on iptables

Signed-off-by: Sam James  gentoo.org>

 .../{nftables-0.9.8-r1.ebuild => nftables-0.9.8-r2.ebuild}| 8 
 .../nftables/{nftables-0.9.9.ebuild => nftables-0.9.9-r1.ebuild}  | 8 
 .../nftables/{nftables-1.0.0.ebuild => nftables-1.0.0-r1.ebuild}  | 8 
 .../{nftables-1.0.1-r1.ebuild => nftables-1.0.1-r2.ebuild}| 6 +++---
 net-firewall/nftables/nftables-.ebuild| 6 +++---
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/net-firewall/nftables/nftables-0.9.8-r1.ebuild 
b/net-firewall/nftables/nftables-0.9.8-r2.ebuild
similarity index 96%
rename from net-firewall/nftables/nftables-0.9.8-r1.ebuild
rename to net-firewall/nftables/nftables-0.9.8-r2.ebuild
index 17044fb39c47..58bf1cc65087 100644
--- a/net-firewall/nftables/nftables-0.9.8-r1.ebuild
+++ b/net-firewall/nftables/nftables-0.9.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,11 +19,11 @@ IUSE="debug doc +gmp json +modern-kernel python +readline 
static-libs xtables"
 RDEPEND="
>=net-libs/libmnl-1.0.4:0=
>=net-libs/libnftnl-1.1.9:0=
-   gmp? ( dev-libs/gmp:0= )
+   gmp? ( dev-libs/gmp:= )
json? ( dev-libs/jansson:= )
python? ( ${PYTHON_DEPS} )
-   readline? ( sys-libs/readline:0= )
-   xtables? ( >=net-firewall/iptables-1.6.1 )
+   readline? ( sys-libs/readline:= )
+   xtables? ( >=net-firewall/iptables-1.6.1:= )
 "
 
 DEPEND="${RDEPEND}"

diff --git a/net-firewall/nftables/nftables-0.9.9.ebuild 
b/net-firewall/nftables/nftables-0.9.9-r1.ebuild
similarity index 96%
rename from net-firewall/nftables/nftables-0.9.9.ebuild
rename to net-firewall/nftables/nftables-0.9.9-r1.ebuild
index 3a44d46ef975..40d4fbc36744 100644
--- a/net-firewall/nftables/nftables-0.9.9.ebuild
+++ b/net-firewall/nftables/nftables-0.9.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,11 +30,11 @@ IUSE="debug doc +gmp json libedit +modern-kernel python 
+readline static-libs xt
 RDEPEND="
>=net-libs/libmnl-1.0.4:0=
>=net-libs/libnftnl-1.2.0:0=
-   gmp? ( dev-libs/gmp:0= )
+   gmp? ( dev-libs/gmp:= )
json? ( dev-libs/jansson:= )
python? ( ${PYTHON_DEPS} )
-   readline? ( sys-libs/readline:0= )
-   xtables? ( >=net-firewall/iptables-1.6.1 )
+   readline? ( sys-libs/readline:= )
+   xtables? ( >=net-firewall/iptables-1.6.1:= )
 "
 
 DEPEND="${RDEPEND}"

diff --git a/net-firewall/nftables/nftables-1.0.0.ebuild 
b/net-firewall/nftables/nftables-1.0.0-r1.ebuild
similarity index 96%
rename from net-firewall/nftables/nftables-1.0.0.ebuild
rename to net-firewall/nftables/nftables-1.0.0-r1.ebuild
index 6285ac74649d..31bd6d1de988 100644
--- a/net-firewall/nftables/nftables-1.0.0.ebuild
+++ b/net-firewall/nftables/nftables-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,11 +30,11 @@ IUSE="debug doc +gmp json libedit +modern-kernel python 
+readline static-libs xt
 RDEPEND="
>=net-libs/libmnl-1.0.4:0=
>=net-libs/libnftnl-1.2.0:0=
-   gmp? ( dev-libs/gmp:0= )
+   gmp? ( dev-libs/gmp:= )
json? ( dev-libs/jansson:= )
python? ( ${PYTHON_DEPS} )
-   readline? ( sys-libs/readline:0= )
-   xtables? ( >=net-firewall/iptables-1.6.1 )
+   readline? ( sys-libs/readline:= )
+   xtables? ( >=net-firewall/iptables-1.6.1:= )
 "
 
 DEPEND="${RDEPEND}"

diff --git a/net-firewall/nftables/nftables-1.0.1-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.1-r2.ebuild
similarity index 97%
rename from net-firewall/nftables/nftables-1.0.1-r1.ebuild
rename to net-firewall/nftables/nftables-1.0.1-r2.ebuild
index 2cb2b24bbafa..200d07a1c304 100644
--- a/net-firewall/nftables/nftables-1.0.1-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.1-r2.ebuild
@@ -30,11 +30,11 @@ IUSE="debug doc +gmp json libedit +modern-kernel python 
+readline static-libs xt
 RDEPEND="
>=net-libs/libmnl-1.0.4:0=
>=net-libs/libnftnl-1.2.1:0=
-   gmp? ( dev-libs/gmp:0= )
+   gmp? ( dev-libs/gmp:= )
json? ( dev-libs/jansson:= )
python? ( ${PYTHON_DEPS} )
-   readline? ( sys-libs/readline:0= )
-   xtables? ( >=net-firewall/iptables-1.6.1 )
+   readline? ( sys-libs/readline:= )
+   xtables? ( 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 189a65478272809baf116f77e89e6f5c36dad771
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 10 11:42:57 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 10 11:42:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=189a6547

net-firewall/nftables: Stabilize 1.0.1-r1 ppc64, #832395

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.1-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.1-r1.ebuild
index 4b2d7b92fd59..2cb2b24bbafa 100644
--- a/net-firewall/nftables/nftables-1.0.1-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.1-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
"
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2;
-   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv sparc x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 397381c4d5c501806a2df4c0018f7cefd50f0e8d
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 10 11:42:38 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 10 11:42:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=397381c4

net-firewall/nftables: Stabilize 1.0.1-r1 ppc, #832395

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.1-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.1-r1.ebuild
index edc3f3aeedc5..4b2d7b92fd59 100644
--- a/net-firewall/nftables/nftables-1.0.1-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.1-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
"
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2;
-   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc 
x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv sparc x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 320a052c8dee3c08fa16d451ea0324a5606a06b6
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 10 10:17:13 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 10 10:17:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=320a052c

net-firewall/nftables: Stabilize 1.0.1-r1 arm64, #832395

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.1-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.1-r1.ebuild
index e6ae2843f045..edc3f3aeedc5 100644
--- a/net-firewall/nftables/nftables-1.0.1-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.1-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
"
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2;
-   KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc 
x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc 
x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: e3ef864f8ae033ca964025d71bc67cacf5100071
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 10 10:17:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 10 10:17:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3ef864f

net-firewall/nftables: Stabilize 1.0.1-r1 arm, #832395

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.1-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.1-r1.ebuild
index dd1a0f2590b7..e6ae2843f045 100644
--- a/net-firewall/nftables/nftables-1.0.1-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.1-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
"
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2;
-   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc 
x86"
+   KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc 
x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: df771d5a8dcbfd6bcced575813c8b98ad0f23ed5
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 10 10:11:02 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 10 10:11:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df771d5a

net-firewall/nftables: Stabilize 1.0.1-r1 sparc, #832395

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.1-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.1-r1.ebuild
index ac3989b2e8f8..dd1a0f2590b7 100644
--- a/net-firewall/nftables/nftables-1.0.1-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.1-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
"
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2;
-   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc 
x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: a33916fa1fa89e9c1eb2e638eb09c6f7109b39ff
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 10 09:59:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 10 09:59:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a33916fa

net-firewall/nftables: Stabilize 1.0.1-r1 x86, #832395

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.1-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.1-r1.ebuild
index 73091814de64..ac3989b2e8f8 100644
--- a/net-firewall/nftables/nftables-1.0.1-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.1-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
"
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2;
-   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 9ad709b7b199008bb55aaa80bdf515e437e19bdc
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 10 09:50:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 10 09:50:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ad709b7

net-firewall/nftables: Stabilize 1.0.1-r1 amd64, #832395

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.1-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.1-r1.ebuild
index 584e495b73d4..73091814de64 100644
--- a/net-firewall/nftables/nftables-1.0.1-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.1-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
"
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2;
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
~x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Sam James]

commit: 5e015e17b8b2739bbdf3614159678a8508f2c7a6
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  1 06:56:30 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  1 06:56:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e015e17

net-firewall/nftables: Keyword 1.0.1-r1 hppa, #832455

Signed-off-by: Sam James  gentoo.org>

 net-firewall/nftables/nftables-1.0.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/nftables/nftables-1.0.1-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.1-r1.ebuild
index 82923aace969..584e495b73d4 100644
--- a/net-firewall/nftables/nftables-1.0.1-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.1-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
"
 else
SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2;
-   KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Patrick McLean]

commit: b7fb1e25477f431c2a5b1cfa2ba3362e86a44fdc
Author: Patrick McLean  sony  com>
AuthorDate: Mon Jan 31 19:00:26 2022 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Mon Jan 31 19:00:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7fb1e25

net-firewall/nftables: Sync 

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Patrick McLean  gentoo.org>

 net-firewall/nftables/nftables-.ebuild | 36 +-
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/net-firewall/nftables/nftables-.ebuild 
b/net-firewall/nftables/nftables-.ebuild
index 944c87fea31f..82923aace969 100644
--- a/net-firewall/nftables/nftables-.ebuild
+++ b/net-firewall/nftables/nftables-.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..10} )
-
-inherit autotools linux-info python-r1 systemd
+DISTUTILS_OPTIONAL=1
+inherit autotools linux-info distutils-r1 systemd
 
 DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
 HOMEPAGE="https://netfilter.org/projects/nftables/;
@@ -56,15 +56,6 @@ PATCHES=(
"${FILESDIR}/${PN}-0.9.8-slibtool.patch"
 )
 
-python_make() {
-   emake \
-   -C py \
-   abs_builddir="${S}" \
-   DESTDIR="${D}" \
-   PYTHON_BIN="${PYTHON}" \
-   "${@}"
-}
-
 pkg_setup() {
if kernel_is ge 3 13; then
if use modern-kernel && kernel_is lt 3 18; then
@@ -87,6 +78,12 @@ src_prepare() {
-i files/osf/Makefile.am || die
 
eautoreconf
+
+   if use python; then
+   pushd py >/dev/null || die
+   distutils-r1_src_prepare
+   popd >/dev/null || die
+   fi
 }
 
 src_configure() {
@@ -104,13 +101,21 @@ src_configure() {
$(use_with xtables)
)
econf "${myeconfargs[@]}"
+
+   if use python; then
+   pushd py >/dev/null || die
+   distutils-r1_src_configure
+   popd >/dev/null || die
+   fi
 }
 
 src_compile() {
default
 
if use python; then
-   python_foreach_impl python_make
+   pushd py >/dev/null || die
+   distutils-r1_src_compile
+   popd >/dev/null || die
fi
 }
 
@@ -134,8 +139,9 @@ src_install() {
systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service
 
if use python ; then
-   python_foreach_impl python_make install
-   python_foreach_impl python_optimize
+   pushd py >/dev/null || die
+   distutils-r1_src_install
+   popd >/dev/null || die
fi
 
find "${ED}" -type f -name "*.la" -delete || die

[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/

[Patrick McLean]

commit: bb71ed3992d7a0aa8bc221b4ee52dd4ef091d191
Author: Patrick McLean  sony  com>
AuthorDate: Mon Jan 31 18:58:57 2022 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Mon Jan 31 19:00:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb71ed39

net-firewall/nftables: revbump, use distutils eclass (bug #832395)

Closes: https://bugs.gentoo.org/832395
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Patrick McLean  gentoo.org>

 ...ables-1.0.1.ebuild => nftables-1.0.1-r1.ebuild} | 36 +-
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/net-firewall/nftables/nftables-1.0.1.ebuild 
b/net-firewall/nftables/nftables-1.0.1-r1.ebuild
similarity index 89%
rename from net-firewall/nftables/nftables-1.0.1.ebuild
rename to net-firewall/nftables/nftables-1.0.1-r1.ebuild
index 944c87fea31f..82923aace969 100644
--- a/net-firewall/nftables/nftables-1.0.1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..10} )
-
-inherit autotools linux-info python-r1 systemd
+DISTUTILS_OPTIONAL=1
+inherit autotools linux-info distutils-r1 systemd
 
 DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
 HOMEPAGE="https://netfilter.org/projects/nftables/;
@@ -56,15 +56,6 @@ PATCHES=(
"${FILESDIR}/${PN}-0.9.8-slibtool.patch"
 )
 
-python_make() {
-   emake \
-   -C py \
-   abs_builddir="${S}" \
-   DESTDIR="${D}" \
-   PYTHON_BIN="${PYTHON}" \
-   "${@}"
-}
-
 pkg_setup() {
if kernel_is ge 3 13; then
if use modern-kernel && kernel_is lt 3 18; then
@@ -87,6 +78,12 @@ src_prepare() {
-i files/osf/Makefile.am || die
 
eautoreconf
+
+   if use python; then
+   pushd py >/dev/null || die
+   distutils-r1_src_prepare
+   popd >/dev/null || die
+   fi
 }
 
 src_configure() {
@@ -104,13 +101,21 @@ src_configure() {
$(use_with xtables)
)
econf "${myeconfargs[@]}"
+
+   if use python; then
+   pushd py >/dev/null || die
+   distutils-r1_src_configure
+   popd >/dev/null || die
+   fi
 }
 
 src_compile() {
default
 
if use python; then
-   python_foreach_impl python_make
+   pushd py >/dev/null || die
+   distutils-r1_src_compile
+   popd >/dev/null || die
fi
 }
 
@@ -134,8 +139,9 @@ src_install() {
systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service
 
if use python ; then
-   python_foreach_impl python_make install
-   python_foreach_impl python_optimize
+   pushd py >/dev/null || die
+   distutils-r1_src_install
+   popd >/dev/null || die
fi
 
find "${ED}" -type f -name "*.la" -delete || die