From e9df01df3db8fd67102e53c6a424bc0128100573 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Sun, 12 Mar 2023 14:56:55 +0800
Subject: libnftnl: upgrade 1.2.4 -> 1.2.5

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../0001-configure.ac-Add-serial-tests.patch       |  8 ++---
 .../recipes-filter/libnftnl/libnftnl_1.2.4.bb      | 39 ----------------------
 .../recipes-filter/libnftnl/libnftnl_1.2.5.bb      | 39 ++++++++++++++++++++++
 3 files changed, 43 insertions(+), 43 deletions(-)
 delete mode 100644 meta-networking/recipes-filter/libnftnl/libnftnl_1.2.4.bb
 create mode 100644 meta-networking/recipes-filter/libnftnl/libnftnl_1.2.5.bb

diff --git a/meta-networking/recipes-filter/libnftnl/libnftnl/0001-configure.ac-Add-serial-tests.patch b/meta-networking/recipes-filter/libnftnl/libnftnl/0001-configure.ac-Add-serial-tests.patch
index 049ad2d39a..abeca6579c 100644
--- a/meta-networking/recipes-filter/libnftnl/libnftnl/0001-configure.ac-Add-serial-tests.patch
+++ b/meta-networking/recipes-filter/libnftnl/libnftnl/0001-configure.ac-Add-serial-tests.patch
@@ -1,4 +1,4 @@
-From 1cb59c1fed33607e4fb2bee9144ce45276e9cc96 Mon Sep 17 00:00:00 2001
+From 801a4dd42449fb5f09fb9cb99714ed137278ca24 Mon Sep 17 00:00:00 2001
 From: Trevor Gamblin <trevor.gamblin@windriver.com>
 Date: Tue, 14 Dec 2021 12:31:12 -0500
 Subject: [PATCH] configure.ac: Add serial-tests
@@ -14,13 +14,13 @@ Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 8e68035..2704214 100644
+index d5c6bd0..d90048e 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -8,7 +8,9 @@ AC_CONFIG_HEADERS([config.h])
  m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
  
- AM_INIT_AUTOMAKE([-Wall foreign tar-pax no-dist-gzip dist-bzip2
+ AM_INIT_AUTOMAKE([-Wall foreign tar-pax no-dist-gzip dist-xz
 -	1.6 subdir-objects])
 +	1.6 subdir-objects serial-tests])
 +
@@ -29,5 +29,5 @@ index 8e68035..2704214 100644
  dnl kernel style compile messages
  m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 -- 
-2.33.1
+2.25.1
 
diff --git a/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.4.bb b/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.4.bb
deleted file mode 100644
index ede35e7624..0000000000
--- a/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.4.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-SUMMARY = "Library for low-level interaction with nftables Netlink's API over libmnl"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=79808397c3355f163c012616125c9e26"
-SECTION = "libs"
-
-SRC_URI = "git://git.netfilter.org/libnftnl;branch=master \
-           file://0001-configure.ac-Add-serial-tests.patch \
-           file://run-ptest \
-           "
-SRCREV = "141cc997755dd91e94dd64c5497f2a23bd9a894c"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig ptest
-
-DEPENDS = "libmnl"
-RDEPENDS:${PN}-ptest += " bash python3-core make"
-
-TESTDIR = "tests"
-
-do_compile_ptest() {
-    cp -rf ${S}/build-aux .
-    oe_runmake buildtest-TESTS
-}
-
-do_install_ptest() {
-    cp -rf ${B}/build-aux ${D}${PTEST_PATH}
-    install -d ${D}${PTEST_PATH}/${TESTDIR}
-    cp -rf ${B}/${TESTDIR}/Makefile ${D}${PTEST_PATH}/${TESTDIR}
-
-    # the binaries compiled in ${TESTDIR} will look for a compiler to
-    # use, which will cause failures. Substitute the binaries in
-    # ${TESTDIR}/.libs instead
-    cp -rf ${B}/${TESTDIR}/.libs/* ${D}${PTEST_PATH}/${TESTDIR}
-
-    # Alter the Makefile so that it does not try and rebuild anything in
-    # other nonexistent paths before running the actual tests
-    sed -i 's/^Makefile/_Makefile/'  ${D}${PTEST_PATH}/${TESTDIR}/Makefile
-}
diff --git a/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.5.bb b/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.5.bb
new file mode 100644
index 0000000000..380a33064b
--- /dev/null
+++ b/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.5.bb
@@ -0,0 +1,39 @@
+SUMMARY = "Library for low-level interaction with nftables Netlink's API over libmnl"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=79808397c3355f163c012616125c9e26"
+SECTION = "libs"
+
+SRC_URI = "git://git.netfilter.org/libnftnl;branch=master \
+           file://0001-configure.ac-Add-serial-tests.patch \
+           file://run-ptest \
+           "
+SRCREV = "c62bef65fef638452b4ed1893c2451fc253ca7ca"
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig ptest
+
+DEPENDS = "libmnl"
+RDEPENDS:${PN}-ptest += " bash python3-core make"
+
+TESTDIR = "tests"
+
+do_compile_ptest() {
+    cp -rf ${S}/build-aux .
+    oe_runmake buildtest-TESTS
+}
+
+do_install_ptest() {
+    cp -rf ${B}/build-aux ${D}${PTEST_PATH}
+    install -d ${D}${PTEST_PATH}/${TESTDIR}
+    cp -rf ${B}/${TESTDIR}/Makefile ${D}${PTEST_PATH}/${TESTDIR}
+
+    # the binaries compiled in ${TESTDIR} will look for a compiler to
+    # use, which will cause failures. Substitute the binaries in
+    # ${TESTDIR}/.libs instead
+    cp -rf ${B}/${TESTDIR}/.libs/* ${D}${PTEST_PATH}/${TESTDIR}
+
+    # Alter the Makefile so that it does not try and rebuild anything in
+    # other nonexistent paths before running the actual tests
+    sed -i 's/^Makefile/_Makefile/'  ${D}${PTEST_PATH}/${TESTDIR}/Makefile
+}
-- 
cgit v1.2.3-54-g00ecf