diff mbox series

[meta-networking,13/38] nftables: upgrade 1.1.5 -> 1.1.6

Message ID 20251209095552.690-13-wangmy@fujitsu.com
State New
Headers show
Series [meta-oe,01/38] boost-sml: upgrade 1.1.12 -> 1.1.13 | expand

Commit Message

Wang Mingyu Dec. 9, 2025, 9:55 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-fix-typo-in-test-script.patch
removed since it's included in 1.1.6

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../0001-fix-typo-in-test-script.patch        | 35 -------------------
 .../{nftables_1.1.5.bb => nftables_1.1.6.bb}  |  5 ++-
 2 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 meta-networking/recipes-filter/nftables/nftables/0001-fix-typo-in-test-script.patch
 rename meta-networking/recipes-filter/nftables/{nftables_1.1.5.bb => nftables_1.1.6.bb} (96%)
diff mbox series

Patch

diff --git a/meta-networking/recipes-filter/nftables/nftables/0001-fix-typo-in-test-script.patch b/meta-networking/recipes-filter/nftables/nftables/0001-fix-typo-in-test-script.patch
deleted file mode 100644
index c0d1e33b5e..0000000000
--- a/meta-networking/recipes-filter/nftables/nftables/0001-fix-typo-in-test-script.patch
+++ /dev/null
@@ -1,35 +0,0 @@ 
-From 956e7d89865b497f889483c90bc7fed9bec4e030 Mon Sep 17 00:00:00 2001
-From: Gyorgy Sarvari <skandigraun@gmail.com>
-Date: Sun, 26 Oct 2025 18:55:06 +0100
-Subject: [oe] [meta-networking] [PATCH 1/2] fix typo in test script
-
-While executing the test suite from tests/shell/testcases folder, a lot of errors
-are displayed:
-
-tests/shell/testcases/maps/vmap_timeout: line 48: [: : integer expected
-
-Looking at the script, a non-existing variable (expires) is tested instead of
-the existing one (expire).
-
-This change corrects this.
-
-Upstream-Status: Submitted [https://lore.kernel.org/netfilter-devel/20251026204107.2438565-1-skandigraun@gmail.com/T/#u]
-
-Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
----
- tests/shell/testcases/maps/vmap_timeout | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/shell/testcases/maps/vmap_timeout b/tests/shell/testcases/maps/vmap_timeout
-index 8ac7e8e7..55d1c1b9 100755
---- a/tests/shell/testcases/maps/vmap_timeout
-+++ b/tests/shell/testcases/maps/vmap_timeout
-@@ -45,7 +45,7 @@ for i in $(seq 1 100) ; do
- 		expire=$((RANDOM%utimeout))
- 
- 		expire_str=""
--		if [ "$expires" -gt 0 ]; then
-+		if [ "$expire" -gt 0 ]; then
- 			expire_str="expires ${expire}s"
- 		fi
- 
diff --git a/meta-networking/recipes-filter/nftables/nftables_1.1.5.bb b/meta-networking/recipes-filter/nftables/nftables_1.1.6.bb
similarity index 96%
rename from meta-networking/recipes-filter/nftables/nftables_1.1.5.bb
rename to meta-networking/recipes-filter/nftables/nftables_1.1.6.bb
index 5ae9fc609d..282c73b4fa 100644
--- a/meta-networking/recipes-filter/nftables/nftables_1.1.5.bb
+++ b/meta-networking/recipes-filter/nftables/nftables_1.1.6.bb
@@ -12,10 +12,9 @@  DEPENDS = "libmnl libnftnl bison-native \
            ${@bb.utils.contains('PACKAGECONFIG', 'mini-gmp', '', 'gmp', d)}"
 
 SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.xz \
-           file://0001-fix-typo-in-test-script.patch \
            file://run-ptest \
-          "
-SRC_URI[sha256sum] = "1daf10f322e14fd90a017538aaf2c034d7cc1eb1cc418ded47445d714ea168d4"
+           "
+SRC_URI[sha256sum] = "372931bda8556b310636a2f9020adc710f9bab66f47efe0ce90bff800ac2530c"
 
 inherit autotools manpages pkgconfig ptest