.gitignore

@@ -1 +1 @@
-SOURCES/kronosnet-1.30.tar.xz
+SOURCES/kronosnet-1.28.tar.xz

.kronosnet.metadata

@@ -1 +1 @@
-1f7e6a574c72ce645b0a6f614f8011cd6348e964 SOURCES/kronosnet-1.30.tar.xz
+2d8bac472188907dc04c0f1f9457bf4ae8d9f8d8 SOURCES/kronosnet-1.28.tar.xz

SPECS/kronosnet.spec

@@ -1,7 +1,7 @@
 ###############################################################################
 ###############################################################################
 ##
-##  Copyright (C) 2012-2022 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
@@ -21,11 +21,11 @@
 %bcond_without bzip2
 %bcond_without zstd
 %bcond_without libnozzle
-%bcond_with runautogen
+%bcond_without runautogen
 %bcond_with rpmdebuginfo
 %bcond_with overriderpmdebuginfo
 %bcond_without buildman
-%bcond_with installtests
+%bcond_without installtests
 
 %if %{with overriderpmdebuginfo}
 %undefine _enable_debug_packages
@@ -36,12 +36,14 @@
 
 Name: kronosnet
 Summary: Multipoint-to-Multipoint VPN daemon
-Version: 1.30
+Version: 1.28
 Release: 1%{?dist}
-License: GPL-2.0-or-later AND LGPL-2.1-or-later
+License: GPLv2+ and LGPLv2+
 URL: https://kronosnet.org
 Source0: https://kronosnet.org/releases/%{name}-%{version}.tar.xz
 
+#Patch0: 1_24.testfix.patch
+
 # Build dependencies
 BuildRequires: make
 BuildRequires: gcc libqb-devel
@@ -85,6 +87,7 @@ BuildRequires: autoconf automake libtool
 
 %prep
 %setup -q -n %{name}-%{version}
+#%patch0 -p1 -b .1_24.testfix
 
 %build
 %if %{with runautogen}
@@ -155,11 +158,11 @@ BuildRequires: autoconf automake libtool
 	--with-initdefaultdir=%{_sysconfdir}/sysconfig/ \
 	--with-systemddir=%{_unitdir}
 
-%make_build
+make %{_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-%make_install
+make install DESTDIR=%{buildroot}
 
 # tree cleanup
 # remove static libraries
@@ -167,6 +170,9 @@ find %{buildroot} -name "*.a" -exec rm {} \;
 # remove libtools leftovers
 find %{buildroot} -name "*.la" -exec rm {} \;
 
+# remove init scripts
+rm -rf %{buildroot}/etc/init.d
+
 # remove docs
 rm -rf %{buildroot}/usr/share/doc/kronosnet
 
@@ -177,7 +183,7 @@ rm -rf %{buildroot}/usr/share/doc/kronosnet
 %if %{with libnozzle}
 %package -n libnozzle1
 Summary: Simple userland wrapper around kernel tap devices
-License: LGPL-2.1-or-later
+License: LGPLv2+
 
 %description -n libnozzle1
  This is an over-engineered commodity library to manage a pool
@@ -197,7 +203,7 @@ License: LGPL-2.1-or-later
 
 %package -n libnozzle1-devel
 Summary: Simple userland wrapper around kernel tap devices (developer files)
-License: LGPL-2.1-or-later
+License: LGPLv2+
 Requires: libnozzle1%{_isa} = %{version}-%{release}
 Requires: pkgconfig
 
@@ -218,7 +224,7 @@ Requires: pkgconfig
 
 %package -n libknet1
 Summary: Kronosnet core switching implementation
-License: LGPL-2.1-or-later
+License: LGPLv2+
 
 %description -n libknet1
  The whole kronosnet core is implemented in this library.
@@ -239,7 +245,7 @@ License: LGPL-2.1-or-later
 
 %package -n libknet1-devel
 Summary: Kronosnet core switching implementation (developer files)
-License: LGPL-2.1-or-later
+License: LGPLv2+
 Requires: libknet1%{_isa} = %{version}-%{release}
 Requires: pkgconfig
 
@@ -260,7 +266,7 @@ Requires: pkgconfig
 %if %{with nss}
 %package -n libknet1-crypto-nss-plugin
 Summary: Provides libknet1 nss support
-License: LGPL-2.1-or-later
+License: LGPLv2+
 Requires: libknet1%{_isa} = %{version}-%{release}
 
 %description -n libknet1-crypto-nss-plugin
@@ -273,7 +279,7 @@ Requires: libknet1%{_isa} = %{version}-%{release}
 %if %{with openssl}
 %package -n libknet1-crypto-openssl-plugin
 Summary: Provides libknet1 openssl support
-License: LGPL-2.1-or-later
+License: LGPLv2+
 Requires: libknet1%{_isa} = %{version}-%{release}
 
 %description -n libknet1-crypto-openssl-plugin
@@ -286,7 +292,7 @@ Requires: libknet1%{_isa} = %{version}-%{release}
 %if %{with zlib}
 %package -n libknet1-compress-zlib-plugin
 Summary: Provides libknet1 zlib support
-License: LGPL-2.1-or-later
+License: LGPLv2+
 Requires: libknet1%{_isa} = %{version}-%{release}
 
 %description -n libknet1-compress-zlib-plugin
@@ -299,7 +305,7 @@ Requires: libknet1%{_isa} = %{version}-%{release}
 %if %{with lz4}
 %package -n libknet1-compress-lz4-plugin
 Summary: Provides libknet1 lz4 and lz4hc support
-License: LGPL-2.1-or-later
+License: LGPLv2+
 Requires: libknet1%{_isa} = %{version}-%{release}
 
 %description -n libknet1-compress-lz4-plugin
@@ -313,7 +319,7 @@ Requires: libknet1%{_isa} = %{version}-%{release}
 %if %{with lzo2}
 %package -n libknet1-compress-lzo2-plugin
 Summary: Provides libknet1 lzo2 support
-License: LGPL-2.1-or-later
+License: LGPLv2+
 Requires: libknet1%{_isa} = %{version}-%{release}
 
 %description -n libknet1-compress-lzo2-plugin
@@ -326,7 +332,7 @@ Requires: libknet1%{_isa} = %{version}-%{release}
 %if %{with lzma}
 %package -n libknet1-compress-lzma-plugin
 Summary: Provides libknet1 lzma support
-License: LGPL-2.1-or-later
+License: LGPLv2+
 Requires: libknet1%{_isa} = %{version}-%{release}
 
 %description -n libknet1-compress-lzma-plugin
@@ -339,7 +345,7 @@ Requires: libknet1%{_isa} = %{version}-%{release}
 %if %{with bzip2}
 %package -n libknet1-compress-bzip2-plugin
 Summary: Provides libknet1 bzip2 support
-License: LGPL-2.1-or-later
+License: LGPLv2+
 Requires: libknet1%{_isa} = %{version}-%{release}
 
 %description -n libknet1-compress-bzip2-plugin
@@ -352,7 +358,7 @@ Requires: libknet1%{_isa} = %{version}-%{release}
 %if %{with zstd}
 %package -n libknet1-compress-zstd-plugin
 Summary: Provides libknet1 zstd support
-License: LGPL-2.1-or-later
+License: LGPLv2+
 Requires: libknet1%{_isa} = %{version}-%{release}
 
 %description -n libknet1-compress-zstd-plugin
@@ -364,7 +370,7 @@ Requires: libknet1%{_isa} = %{version}-%{release}
 
 %package -n libknet1-crypto-plugins-all
 Summary: Provides libknet1 crypto plugins meta package
-License: LGPL-2.1-or-later
+License: LGPLv2+
 %if %{with nss}
 Requires: libknet1-crypto-nss-plugin%{_isa} = %{version}-%{release}
 %endif
@@ -379,7 +385,7 @@ Requires: libknet1-crypto-openssl-plugin%{_isa} = %{version}-%{release}
 
 %package -n libknet1-compress-plugins-all
 Summary: Provides libknet1 compress plugins meta package
-License: LGPL-2.1-or-later
+License: LGPLv2+
 %if %{with zlib}
 Requires: libknet1-compress-zlib-plugin%{_isa} = %{version}-%{release}
 %endif
@@ -406,7 +412,7 @@ Requires: libknet1-compress-zstd-plugin%{_isa} = %{version}-%{release}
 
 %package -n libknet1-plugins-all
 Summary: Provides libknet1 plugins meta package
-License: LGPL-2.1-or-later
+License: LGPLv2+
 Requires: libknet1-compress-plugins-all%{_isa} = %{version}-%{release}
 Requires: libknet1-crypto-plugins-all%{_isa} = %{version}-%{release}
 
@@ -418,7 +424,7 @@ Requires: libknet1-crypto-plugins-all%{_isa} = %{version}-%{release}
 %if %{with installtests}
 %package -n kronosnet-tests
 Summary: Provides kronosnet test suite
-License: GPL-2.0-or-later
+License: GPLv2+
 Requires: libknet1%{_isa} = %{version}-%{release}
 %if %{with libnozzle}
 Requires: libnozzle1%{_isa} = %{version}-%{release}
@@ -436,92 +442,54 @@ Requires: libnozzle1%{_isa} = %{version}-%{release}
 %endif
 
 %changelog
-* Mon Dec  2 2024 Christine Caulfield <ccaulfie@redhat.com> - 1.30-1
+* Mon Oct  9 2023 Christine Caulfield <ccaulfie@redhat.com> - 1.28-1
-- Rebase to 1.30
+  Rebase to 1.28 for startup and performance fixes
-  Resolves: RHEL-69636
+   threads: add config check to match min value with pong timeouts
-
+   rx: allow links to be active faster
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.28-5
+   links: fix ping interval and pong timeout value checking
-- Bump release for October 2024 mass rebuild:
+   crypto: Try crypt and decrypt on crypto_init
-  Resolves: RHEL-64018
+   tx: Remove expensive memsets
-
+   log: Add a TRACE log level
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.28-4
+  Resolves: #RHEL-11787
-- Bump release for June 2024 mass rebuild
+
-
+* Wed Jan 18 2023 Christine Caulfield <ccaulfie@redhat.com> - 1.25-1
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.28-3
+  Rebase to 1.25 for PMTUd fixes
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+  Resolves: rhbz#2161168
-
+
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.28-2
+* Fri Jul 15 2022 Christine Caulfield <ccaulfie@redhat.com> - 1.24-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+- Fix libnozzle tests failing & covscan warning on api_knet_handle_new test
-
+  Resolves: rhbz#2024090
-* Wed Sep 27 2023 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.28-1
+
-- New upstream release
+* Fri Jul 15 2022 Christine Caulfield <ccaulfie@redhat.com> - 1.24-1
-- Fix build on i686 machines
+- Rebase to 1.24
-
+  Resolves: rhbz#2024090
-* Tue Sep 26 2023 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.27-1
+
-- New upstream release
+* Wed Oct 06 2021 Christine Caulfield <ccaulfie@redhat.com> - 1.22-3
-- Fix potential startup race condition (corosync use case)
+- Add back the test suite that got lost in the pull from Fedora
-- Fix crypto config check
+  Resolves: rhbz#1999980
-- Minor API cleanup
+
-- Test suite fixes
+* Wed Oct 06 2021 Christine Caulfield <ccaulfie@redhat.com> - 1.22-1
-
+- Rebase to v1.22
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-2
+  Resolves: rhbz#1999980
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
-
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.21-4
-* Mon Jul 10 2023 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.26-1
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-- New upstream release
+  Related: rhbz#1991688
-- Improve TX performance and use less CPU
+
-- minor other improvements
+* Wed Jun 16 2021 Florian Weimer <fweimer@redhat.com> - 1.21-3
-- Build system update
+- Rebuilt for RHEL 9 BETA for openssl 3.0
-
+  Related: rhbz#1971065
-* Tue Jun 06 2023 Jan Friesse <jfriesse@redhat.com> - 1.25-3
+
-- migrated to SPDX license
+* Thu May 13 2021 Christine Caulfield <ccaulfie@redhat.com> - 1.21-2
-
+- add -fstack-clash-protection to the build. For the CI
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.25-2
+  Resolves: rhbz#1954551
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
-
+* Wed Apr 28 2021 Christine Caulfield <ccaulfie@redhat.com> - 1.21-1
-* Wed Jan 04 2023 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.25-1
+- Rebase to 1.21 to incorporate fixes for CI complaints & openssl3
-- New upstream release
+  Resolves: rhbz#1954551
-- Fix PMTUd issues
+
-- Update docs and upstream URLs
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.20-3
-- Fix spec file for test suite build conditional
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-- Build system update
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.24-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon May 30 2022 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.24-1
-- New upstream release
-- Fix minor issues
-- Update docs and upstream URLs
-- Test suite refactoring
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.23-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Nov 15 2021 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.23-1
-- New upstream release
-- Fix several major issues
-
-* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 1.22-2
-- Rebuilt with OpenSSL 3.0.0
-
-* Mon Aug 30 2021 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.22-1
-- New upstream release
-- Fix several major issues
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.21-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri May 14 2021 Timm Bäder <tbaeder@redhat.com> - 1.21-2
-- Use make macros
-
-* Wed Apr 28 2021 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.21-1
-- New upstream release
-- Update to openssl 3.0alpha13
-- Drop -rpath usage from libknet
-- Various libnozzle fixes
-- API: validate handles for public api calls to avoid crashes
-- Test suite improvements to speed up testing
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.20-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild