From 518c93450a311f1203ed0ffca53b3c079341f746 Mon Sep 17 00:00:00 2001
From: Christine Caulfield <ccaulfie@redhat.com>
Date: Wed, 18 Jan 2023 07:54:28 +0000
Subject: [PATCH] Mon Jan 16 2023 Christine Caulfield <ccaulfie@redhat.com> -
 1.25-1 Rebase to 1.25 for PMTUd fixes Resolves: rhbz#2161168

---
 .gitignore         |  1 +
 1_24.testfix.patch | 13 -------------
 kronosnet.spec     | 14 +++++++++-----
 sources            |  2 +-
 4 files changed, 11 insertions(+), 19 deletions(-)
 delete mode 100644 1_24.testfix.patch

diff --git a/.gitignore b/.gitignore
index c2db718..af26025 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /kronosnet-1.22.tar.gz
 /kronosnet-1.22.tar.xz
 /kronosnet-1.24.tar.xz
+/kronosnet-1.25.tar.xz
diff --git a/1_24.testfix.patch b/1_24.testfix.patch
deleted file mode 100644
index e336de1..0000000
--- a/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/kronosnet.spec b/kronosnet.spec
index e9a0496..0aeda4f 100644
--- a/kronosnet.spec
+++ b/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
-Release: 2%{?dist}
+Version: 1.25
+Release: 1%{?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}
@@ -439,6 +439,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
diff --git a/sources b/sources
index 38e64ba..b71c1d4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kronosnet-1.24.tar.xz) = 9ea2093e439d8b7e1a4b36a3239fc97a13ee27a4f313dcd53e15a8e44fb3db75298a67bd7dff05280a60a2d0d6552877676e62542250fa2b3fbc4e8104fe9344
+SHA512 (kronosnet-1.25.tar.xz) = 9d9816cd9e441904b3b9b1e8bc72e8f19f1010af87afb99b8ed70224121b16bce10f3df564f69fe16d4a5106a3dcffd03777ccfc7f550a8b090e9fb7c43d28a2