diff --git a/conntrack-tools.spec b/conntrack-tools.spec index daa07cc9f047583fdcebac4e408796b5305696c1..56022328259bd479f2b7f7c78ce9acaca811523a 100644 --- a/conntrack-tools.spec +++ b/conntrack-tools.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 Name: conntrack-tools Version: 1.4.8 Release: %{anolis_release}%{?dist} @@ -35,6 +35,13 @@ Patch0011: 0011-conntrack-improve-mark-parser.patch Patch0012: 0012-conntrack-Fix-for-ENOENT-in-mnl_nfct_delete_cb.patch # https://git.netfilter.org/conntrack-tools/commit/?id=7ab577898f83105e3aa38ac96f3ac70c91ecb2ac Patch0013: 0013-src-Eliminate-warnings-with-Wcalloc-transposed-args.patch +Patch0007: 0007-conntrack-tcp-fix-parsing-of-tuple-port-src-and-tupl.patch +Patch0008: 0008-conntrack-L-doesn-t-take-a-value-so-don-t-discard-on.patch +Patch0009: 0009-tests-conntrack-missing-space-before-option.patch +Patch0010: 0010-conntrack-improve-secmark-id-zone-parser.patch +Patch0011: 0011-conntrack-improve-mark-parser.patch +Patch0012: 0012-conntrack-Fix-for-ENOENT-in-mnl_nfct_delete_cb.patch +Patch0013: 0013-src-Eliminate-warnings-with-Wcalloc-transposed-args.patch BuildRequires: gcc make autoconf automake pkgconfig BuildRequires: systemd bison flex @@ -59,6 +66,7 @@ interface conntrack. %prep +| %autosetup -p1 %build @@ -102,6 +110,11 @@ install -m 0644 -p %{SOURCE2} %{buildroot}%{_sysconfdir}/conntrackd/ %systemd_postun conntrackd.service %changelog +* Thu Apr 04 2025 Anolis OS Team - 1.4.8-%{release} +- Sync upstream changes from commit 71462585bac7ce0e9a267027917d424a1a319b4e +- Backport fixes for TCP tuple parsing, -L option handling, secmark/zone/mark parser robustness, ENOENT handling in delete callback, and calloc argument warning +- Resolves: RHEL-66056 + * Fri Feb 28 2025 Zhao Hang - 1.4.8-1 - Update to 1.4.8-1 from 1.4.7-2 - Convert license to SPDX format