From 04b89333db5a1c02ef6df8dad0e6d5551cc05d20 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Dec 01 2021 12:35:38 +0000 Subject: import kronosnet-1.18-4.el8_5 --- diff --git a/SOURCES/bz2008195-calculate-defrag-buffers-correctly.patch b/SOURCES/bz2008195-calculate-defrag-buffers-correctly.patch deleted file mode 100644 index d74c290..0000000 --- a/SOURCES/bz2008195-calculate-defrag-buffers-correctly.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libknet/host.c.orig 2021-09-29 15:55:33.377260315 +0100 -+++ b/libknet/host.c 2021-09-29 15:55:38.642291193 +0100 -@@ -608,7 +608,7 @@ int _seq_num_lookup(struct knet_host *ho - _clear_cbuffers(host, seq_num); - } - -- _reclaim_old_defrag_bufs(host, seq_num); -+ _reclaim_old_defrag_bufs(host, *dst_seq_num); - - if (seq_num < *dst_seq_num) { - seq_dist = (SEQ_MAX - seq_num) + *dst_seq_num; diff --git a/SPECS/kronosnet.spec b/SPECS/kronosnet.spec index 5abff45..4d3e2e8 100644 --- a/SPECS/kronosnet.spec +++ b/SPECS/kronosnet.spec @@ -83,11 +83,11 @@ Name: kronosnet Summary: Multipoint-to-Multipoint VPN daemon Version: 1.18 -Release: 2%{?dist} +Release: 4%{?dist} License: GPLv2+ and LGPLv2+ URL: http://www.kronosnet.org Source0: http://www.kronosnet.org/releases/kronosnet-%{version}.tar.gz -Patch0: bz2008195-calculate-defrag-buffers-correctly.patch +#Patch0: bz2008196-calculate-defrag-buffers-correctly.patch # Build dependencies BuildRequires: gcc @@ -136,7 +136,7 @@ BuildRequires: autoconf %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -b .bz2008195-calculate-defrag-buffers-correctly +#%patch0 -p1 -b .bz2008196-calculate-defrag-buffers-correctly %build %if %{defined buildautogen} @@ -527,9 +527,17 @@ Requires: libnozzle1%{_isa} = %{version}-%{release} %endif %changelog -* Wed Sep 29 2021 Christine Caulfield - 1.18-2 - Calculate the defrag buffers correctly - Resolves: rhbz#2008195 +* Wed Nov 17 2021 Christine Caulfield - 1.18-4 + Revert defrag buffer change + Resolves: rhbz#2023847 + +* Thu Nov 11 2021 Christine Caulfield - 1.18-3 + Rebuild to, hopefully, fix tag error + Resolves: rhbz#2008196 + +* Wed Sep 29 2021 Christine Caulfield - 1.18-3 + Calculate defrag buffers correctly + Resolves: rhbz#2008196 * Wed Sep 23 2020 Christine Caulfield - 1.18-1 Rebase to 1.18