diff --git a/0003-udata-Introduce-NFTNL_UDATA_TABLE_NFT-VER-BLD.patch b/0003-udata-Introduce-NFTNL_UDATA_TABLE_NFT-VER-BLD.patch new file mode 100644 index 0000000..61e3591 --- /dev/null +++ b/0003-udata-Introduce-NFTNL_UDATA_TABLE_NFT-VER-BLD.patch @@ -0,0 +1,37 @@ +From 775bf5eba066f61c7737d6995f276765f76328d9 Mon Sep 17 00:00:00 2001 +From: Phil Sutter +Date: Wed, 10 Sep 2025 17:29:07 +0200 +Subject: [PATCH] udata: Introduce NFTNL_UDATA_TABLE_NFT{VER,BLD} + +JIRA: https://issues.redhat.com/browse/RHEL-113823 +Upstream Status: libnftnl commit eb8fb569c501dc088dc950061369102687f8d2a5 + +commit eb8fb569c501dc088dc950061369102687f8d2a5 +Author: Phil Sutter +Date: Tue Aug 12 18:47:14 2025 +0200 + + udata: Introduce NFTNL_UDATA_TABLE_NFT{VER,BLD} + + Register these table udata types here to avoid accidental overlaps. + + Signed-off-by: Phil Sutter + Acked-by: Pablo Neira Ayuso + +Signed-off-by: Phil Sutter +--- + include/libnftnl/udata.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/libnftnl/udata.h b/include/libnftnl/udata.h +index dbf3a60..9b8a3b6 100644 +--- a/include/libnftnl/udata.h ++++ b/include/libnftnl/udata.h +@@ -11,6 +11,8 @@ extern "C" { + + enum nftnl_udata_table_types { + NFTNL_UDATA_TABLE_COMMENT, ++ NFTNL_UDATA_TABLE_NFTVER, ++ NFTNL_UDATA_TABLE_NFTBLD, + __NFTNL_UDATA_TABLE_MAX + }; + #define NFTNL_UDATA_TABLE_MAX (__NFTNL_UDATA_TABLE_MAX - 1) diff --git a/libnftnl.spec b/libnftnl.spec index f1510fb..fa1f238 100644 --- a/libnftnl.spec +++ b/libnftnl.spec @@ -1,6 +1,6 @@ Name: libnftnl Version: 1.2.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library for low-level interaction with nftables Netlink's API over libmnl License: GPL-2.0-or-later URL: https://netfilter.org/projects/libnftnl/ @@ -8,6 +8,7 @@ Source0: %{url}/files/%{name}-%{version}.tar.xz Patch1: 0001-set-Fix-for-array-overrun-when-setting-NFTNL_SET_DES.patch Patch2: 0002-trace-add-support-for-TRACE_CT-information.patch +Patch3: 0003-udata-Introduce-NFTNL_UDATA_TABLE_NFT-VER-BLD.patch BuildRequires: libmnl-devel BuildRequires: gcc @@ -56,6 +57,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_includedir}/libnftnl %changelog +* Wed Sep 10 2025 Phil Sutter [1.2.8-4.el10] +- udata: Introduce NFTNL_UDATA_TABLE_NFT{VER,BLD} (Phil Sutter) [RHEL-113823] + * Tue Jul 15 2025 Phil Sutter [1.2.8-3.el10] - trace: add support for TRACE_CT information (Phil Sutter) [RHEL-103864]