libnftnl-1.2.2-1.el9

- New version 1.2.2

Resolves: rhbz#1917399
This commit is contained in:
Phil Sutter 2022-06-07 19:54:48 +02:00
parent d8aa34485f
commit 6b4cb59aad
4 changed files with 6 additions and 41 deletions

1
.gitignore vendored
View File

@ -21,3 +21,4 @@
/libnftnl-1.1.8.tar.bz2
/libnftnl-1.1.9.tar.bz2
/libnftnl-1.2.1.tar.bz2
/libnftnl-1.2.2.tar.bz2

View File

@ -1,37 +0,0 @@
From 1b07e9c74389dc57d727d8d6628d38a65db5026b Mon Sep 17 00:00:00 2001
From: Florian Westphal <fw@strlen.de>
Date: Sat, 19 Feb 2022 14:39:04 +0100
Subject: [PATCH] exthdr: tcp option reset support
Adds print debug support for tcp reset feature.
Signed-off-by: Florian Westphal <fw@strlen.de>
(cherry picked from commit e2514c0eff4da7e8e0aabd410f7b7d0b7564c880)
---
src/expr/exthdr.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c
index 1b813b1e47c4d..625dd5d3d0a49 100644
--- a/src/expr/exthdr.c
+++ b/src/expr/exthdr.c
@@ -247,10 +247,15 @@ nftnl_expr_exthdr_snprintf(char *buf, size_t len,
exthdr->offset,
exthdr->flags & NFT_EXTHDR_F_PRESENT ? " present" : "",
exthdr->dreg);
- else
+ else if (e->flags & (1 << NFTNL_EXPR_EXTHDR_SREG))
return snprintf(buf, len, "write%s reg %u => %ub @ %u + %u ",
op2str(exthdr->op), exthdr->sreg, exthdr->len, exthdr->type,
exthdr->offset);
+ else if (exthdr->op == NFT_EXTHDR_OP_TCPOPT && exthdr->len == 0)
+ return snprintf(buf, len, "reset tcpopt %u ", exthdr->type);
+ else
+ return snprintf(buf, len, "op %u len %u type %u offset %u ",
+ exthdr->op, exthdr->len, exthdr->type, exthdr->offset);
}
--
2.34.1

View File

@ -1,5 +1,5 @@
Name: libnftnl
Version: 1.2.1
Version: 1.2.2
Release: 1%{?dist}
Summary: Library for low-level interaction with nftables Netlink's API over libmnl
@ -7,8 +7,6 @@ License: GPLv2+
URL: https://netfilter.org/projects/libnftnl/
Source0: https://www.netfilter.org/pub/libnftnl/libnftnl-%{version}.tar.bz2
Patch01: 0001-exthdr-tcp-option-reset-support.patch
BuildRequires: libmnl-devel
BuildRequires: jansson-devel
BuildRequires: gcc
@ -60,6 +58,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%{_includedir}/libnftnl
%changelog
* Tue Jun 07 2022 Phil Sutter <psutter@redhat.com> - 1.2.2-1
- New version 1.2.2
* Wed May 18 2022 Phil Sutter <psutter@redhat.com> - 1.2.1-1
- Fix debug printing for tcp option reset expression
- new version 1.2.1

View File

@ -1 +1 @@
SHA512 (libnftnl-1.2.1.tar.bz2) = cabe6896210c451d7917d1abde5e73a65594d53f011486f75dd7be5b4804c49d10f0e508675e091e1faf0363b82670b3f3a167a85db91d52742dc69445888b6a
SHA512 (libnftnl-1.2.2.tar.bz2) = 657d48aa263043b80daa39eb8e2647c84c03b3e3a4a30b85bec1d8e4a0976075a71ad233bb384f4460d5f6662f285c12947feb8c1a6c9a534a2c9cf7ba04eee3