From 6c8dd6868c8fbcd53fdb9e786058eb0bc1d4aafc Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sep 27 2022 15:20:54 +0000
Subject: import kronosnet-1.24-2.el9


---

diff --git a/.gitignore b/.gitignore
index b9e43d8..7b6f343 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/kronosnet-1.22.tar.xz
+SOURCES/kronosnet-1.24.tar.xz
diff --git a/.kronosnet.metadata b/.kronosnet.metadata
index b64053c..6a80175 100644
--- a/.kronosnet.metadata
+++ b/.kronosnet.metadata
@@ -1 +1 @@
-9e89dc037ead2591de47e871903ea6c9c4258679 SOURCES/kronosnet-1.22.tar.xz
+1a3bb04c2f082076fea97d5582676addde84336d SOURCES/kronosnet-1.24.tar.xz
diff --git a/SOURCES/1_24.testfix.patch b/SOURCES/1_24.testfix.patch
new file mode 100644
index 0000000..e336de1
--- /dev/null
+++ b/SOURCES/1_24.testfix.patch
@@ -0,0 +1,13 @@
+diff --git a/libknet/tests/api_knet_handle_new.c b/libknet/tests/api_knet_handle_new.c
+index a6ccb3a..60e5c4f 100644
+--- a/libknet/tests/api_knet_handle_new.c
++++ b/libknet/tests/api_knet_handle_new.c
+@@ -112,7 +112,7 @@ static void test(void)
+ 
+ 	printf("Test knet_handle_new hostid 1, proper log_fd, proper log level (DEBUG)\n");
+ 
+-	knet_h1 = knet_handle_start(logfds, KNET_LOG_DEBUG, knet_h);
++	(void)knet_handle_start(logfds, KNET_LOG_DEBUG, knet_h);
+ 	CLEAN_EXIT(CONTINUE);
+ }
+ 
diff --git a/SPECS/kronosnet.spec b/SPECS/kronosnet.spec
index 4a655f8..e9a0496 100644
--- a/SPECS/kronosnet.spec
+++ b/SPECS/kronosnet.spec
@@ -36,13 +36,13 @@
 
 Name: kronosnet
 Summary: Multipoint-to-Multipoint VPN daemon
-Version: 1.22
-Release: 3%{?dist}
+Version: 1.24
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+
 URL: https://kronosnet.org
 Source0: https://kronosnet.org/releases/%{name}-%{version}.tar.xz
 
-#Patch0: bz1954551-enable-stack-clash-protection.patch
+Patch0: 1_24.testfix.patch
 
 # Build dependencies
 BuildRequires: make
@@ -87,7 +87,7 @@ BuildRequires: autoconf automake libtool
 
 %prep
 %setup -q -n %{name}-%{version}
-#%patch0 -p1 -b .bz1954551-enable-stack-clash-protection
+%patch0 -p1 -b .1_24.testfix
 
 %build
 %if %{with runautogen}
@@ -439,6 +439,14 @@ Requires: libknet1%{_isa} = %{version}-%{release}
 %endif
 
 %changelog
+* Fri Jul 15 2022 Christine Caulfield <ccaulfie@redhat.com> - 1.24-2
+- Fix libnozzle tests failing & covscan warning on api_knet_handle_new test
+  Resolves: rhbz#2024090
+
+* Fri Jul 15 2022 Christine Caulfield <ccaulfie@redhat.com> - 1.24-1
+- Rebase to 1.24
+  Resolves: rhbz#2024090
+
 * Wed Oct 06 2021 Christine Caulfield <ccaulfie@redhat.com> - 1.22-3
 - Add back the test suite that got lost in the pull from Fedora
   Resolves: rhbz#1999980