From a37dd6ebca776fa1c1f75599017b14854553b0a7 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 28 2023 12:41:26 +0000
Subject: import kronosnet-1.25-2.el9


---

diff --git a/.gitignore b/.gitignore
index 7b6f343..3857200 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/kronosnet-1.24.tar.xz
+SOURCES/kronosnet-1.25.tar.xz
diff --git a/.kronosnet.metadata b/.kronosnet.metadata
index 6a80175..125adfa 100644
--- a/.kronosnet.metadata
+++ b/.kronosnet.metadata
@@ -1 +1 @@
-1a3bb04c2f082076fea97d5582676addde84336d SOURCES/kronosnet-1.24.tar.xz
+69bbd8549a0a4d69971b30945daed0dbfd147c20 SOURCES/kronosnet-1.25.tar.xz
diff --git a/SOURCES/1_24.testfix.patch b/SOURCES/1_24.testfix.patch
deleted file mode 100644
index e336de1..0000000
--- a/SOURCES/1_24.testfix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 e9a0496..b31daed 100644
--- a/SPECS/kronosnet.spec
+++ b/SPECS/kronosnet.spec
@@ -1,7 +1,7 @@
 ###############################################################################
 ###############################################################################
 ##
-##  Copyright (C) 2012-2019 Red Hat, Inc.  All rights reserved.
+##  Copyright (C) 2012-2023 Red Hat, Inc.  All rights reserved.
 ##
 ##  This copyrighted material is made available to anyone wishing to use,
 ##  modify, copy, or redistribute it subject to the terms and conditions
@@ -36,13 +36,13 @@
 
 Name: kronosnet
 Summary: Multipoint-to-Multipoint VPN daemon
-Version: 1.24
+Version: 1.25
 Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+
 URL: https://kronosnet.org
 Source0: https://kronosnet.org/releases/%{name}-%{version}.tar.xz
 
-Patch0: 1_24.testfix.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 .1_24.testfix
+#%patch0 -p1 -b .1_24.testfix
 
 %build
 %if %{with runautogen}
@@ -426,6 +426,9 @@ Requires: libknet1-crypto-plugins-all%{_isa} = %{version}-%{release}
 Summary: Provides kronosnet test suite
 License: GPLv2+
 Requires: libknet1%{_isa} = %{version}-%{release}
+%if %{with libnozzle}
+Requires: libnozzle1%{_isa} = %{version}-%{release}
+%endif
 
 %description -n kronosnet-tests
  This package contains all the libknet and libnozzle test suite.
@@ -439,6 +442,10 @@ Requires: libknet1%{_isa} = %{version}-%{release}
 %endif
 
 %changelog
+* Wed Jan 18 2023 Christine Caulfield <ccaulfie@redhat.com> - 1.25-1
+  Rebase to 1.25 for PMTUd fixes
+  Resolves: rhbz#2161168
+
 * 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