update conntrack-tools version to 1.4.7

This commit is contained in:
yangl777 2023-01-31 03:08:39 +00:00
parent 7fff7d4917
commit 326fece3a2
4 changed files with 10 additions and 38 deletions

View File

@ -1,32 +0,0 @@
From 42cb292d6c9e8567db2e30e183b1bd31093700ad Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil@nwl.cc>
Date: Fri, 25 Mar 2022 10:30:29 +0100
Subject: connntrack: Fix for memleak when parsing -j arg
Have to free the strings allocated by split_address_and_port().
Fixes: 29b390a212214 ("conntrack: Support IPv6 NAT")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Conflict:do_parse => main
Reference:https://git.netfilter.org/conntrack-tools/commit/?id=42cb292d6c9e8567db2e30e183b1bd31093700ad
---
src/conntrack.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/conntrack.c b/src/conntrack.c
index f65926b..415f551 100644
--- a/src/conntrack.c
+++ b/src/conntrack.c
@@ -2466,6 +2466,8 @@ int main(int argc, char *argv[])
nfct_set_nat_details(c, tmpl.ct, &ad,
port_str, family);
}
+ free(port_str);
+ free(nat_address);
}
break;
case 'w':
--
2.33.0

Binary file not shown.

Binary file not shown.

View File

@ -1,7 +1,7 @@
#needsrootforbuild
Name: conntrack-tools
Version: 1.4.6
Release: 6
Version: 1.4.7
Release: 1
Summary: Userspace tools for interacting with the Connection Tracking System
License: GPLv2
URL: http://conntrack-tools.netfilter.org/
@ -9,12 +9,10 @@ Source0: http://netfilter.org/projects/conntrack-tools/files/%{name}-%{
Source1: conntrackd.service
Source2: conntrackd.conf
Patch0: backport-Fix-for-memleak-when-parsing-j-arg.patch
BuildRequires: libnfnetlink-devel >= 1.0.1 libnetfilter_conntrack-devel >= 1.0.8 libtirpc-devel
BuildRequires: libnfnetlink-devel >= 1.0.1 libnetfilter_conntrack-devel >= 1.0.9 libtirpc-devel
BuildRequires: libnetfilter_cttimeout-devel >= 1.0.0 libnetfilter_cthelper-devel >= 1.0.0 systemd
BuildRequires: libmnl-devel >= 1.0.3 libnetfilter_queue-devel >= 1.0.2 pkgconfig bison flex systemd-devel
BuildRequires: gcc
BuildRequires: gcc make
Provides: conntrack = 1.0-1
Obsoletes: conntrack < 1.0-1
Requires(post): systemd
@ -87,6 +85,12 @@ cd ../../
%{_mandir}/man8/*
%changelog
* Tue Jan 31 2023 yanglu <yanglu72@h-partners.com> - 1.4.7-1
- Type:requirement
- ID:NA
- SUG:NA
- DESC:update conntrack-tools version to 1.4.7
* Thu Jan 19 2023 yanglu <yanglu72@h-partners.com> - 1.4.6-6
- Type:bugfix
- ID:NA