diff --git a/backport-Fix-for-memleak-when-parsing-j-arg.patch b/backport-Fix-for-memleak-when-parsing-j-arg.patch deleted file mode 100644 index 60d13d3..0000000 --- a/backport-Fix-for-memleak-when-parsing-j-arg.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 42cb292d6c9e8567db2e30e183b1bd31093700ad Mon Sep 17 00:00:00 2001 -From: Phil Sutter -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 - -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 - diff --git a/conntrack-tools-1.4.6.tar.bz2 b/conntrack-tools-1.4.6.tar.bz2 deleted file mode 100644 index aa475b7..0000000 Binary files a/conntrack-tools-1.4.6.tar.bz2 and /dev/null differ diff --git a/conntrack-tools-1.4.7.tar.bz2 b/conntrack-tools-1.4.7.tar.bz2 new file mode 100644 index 0000000..c97a7c5 Binary files /dev/null and b/conntrack-tools-1.4.7.tar.bz2 differ diff --git a/conntrack-tools.spec b/conntrack-tools.spec index 1134fda..109750e 100644 --- a/conntrack-tools.spec +++ b/conntrack-tools.spec @@ -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 - 1.4.7-1 +- Type:requirement +- ID:NA +- SUG:NA +- DESC:update conntrack-tools version to 1.4.7 + * Thu Jan 19 2023 yanglu - 1.4.6-6 - Type:bugfix - ID:NA