+* Wed Oct 06 2021 Christine Caulfield <ccaulfie@redhat.com> - 1.22-1

+- Rebase to v1.22
+  Resolves: rhbz#1999980

.gitignore

@@ -1 +1,3 @@
 /kronosnet-1.21.tar.xz
+/kronosnet-1.22.tar.gz
+/kronosnet-1.22.tar.xz

bz1954551-enable-stack-clash-protection.patch

@@ -1,58 +0,0 @@
-commit e13b7c74634c511d44603a203a328f4d67920321
-Author: Christine Caulfield <ccaulfie@redhat.com>
-Date:   Mon May 10 13:00:58 2021 +0100
-
-    [build] Add -fstack-clash-protection to release builds
-    
-    CentOS Stream CI insists on this but it's generally a 'good thing'
-
-diff --git a/configure.ac b/configure.ac
-index e429dcc..020cbe1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -173,6 +173,23 @@ AC_ARG_ENABLE([libnozzle],
- 
- AM_CONDITIONAL([BUILD_LIBNOZZLE], [test x$enable_libnozzle = xyes])
- 
-+## local helper functions
-+# this function checks if CC support options passed as
-+# args. Global CPPFLAGS are ignored during this test.
-+cc_supports_flag() {
-+	saveCPPFLAGS="$CPPFLAGS"
-+	CPPFLAGS="$@"
-+	if echo $CC | grep -q clang; then
-+		CPPFLAGS="-Werror $CPPFLAGS"
-+	fi
-+	AC_MSG_CHECKING([whether $CC supports "$@"])
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
-+			  [RC=0; AC_MSG_RESULT([yes])],
-+			  [RC=1; AC_MSG_RESULT([no])])
-+	CPPFLAGS="$saveCPPFLAGS"
-+	return $RC
-+}
-+
- # Checks for libraries.
- AX_PTHREAD(,[AC_MSG_ERROR([POSIX threads support is required])])
- saved_LIBS="$LIBS"
-@@ -297,12 +314,20 @@ AC_ARG_WITH([testdir],
- 
- AC_SUBST([TESTDIR])
- 
-+# Check for availablility of hardening options
-+HARDENING_FLAGS="-fstack-clash-protection"
-+for j in $HARDENING_FLAGS; do
-+    if cc_supports_flag $j; then
-+       EXTRA_HARDENING_FLAGS="$EXTRA_HARDENING_FLAGS $j";
-+    fi
-+done
-+
- # debug build stuff
- if test "x${enable_debug}" = xyes; then
- 	AC_DEFINE_UNQUOTED([DEBUG], [1], [Compiling Debugging code])
- 	OPT_CFLAGS="-O0"
- else
--	OPT_CFLAGS="-O3"
-+	OPT_CFLAGS="-O3 $EXTRA_HARDENING_FLAGS"
- fi
- 
- # gdb flags

kronosnet.spec

@@ -36,13 +36,13 @@
 
 Name: kronosnet
 Summary: Multipoint-to-Multipoint VPN daemon
-Version: 1.21
-Release: 4%{?dist}
+Version: 1.22
+Release: 1%{?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: bz1954551-enable-stack-clash-protection.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 .bz1954551-enable-stack-clash-protection
 
 %build
 %if %{with runautogen}
@@ -439,6 +439,10 @@ Requires: libknet1%{_isa} = %{version}-%{release}
 %endif
 
 %changelog
+* Wed Oct 06 2021 Christine Caulfield <ccaulfie@redhat.com> - 1.22-1
+- Rebase to v1.22
+  Resolves: rhbz#1999980
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.21-4
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688

sources

@@ -1 +1 @@
-SHA512 (kronosnet-1.21.tar.xz) = c265f3e31bace0f60e04a5a6b062c2a4be4db61450c1c5de3ccb48fbf879e3bbe89aca9b87e4ae757ba9f7e430406da5fdadf314b3cdf9d838b517031b90d5cc
+SHA512 (kronosnet-1.22.tar.xz) = 0cadd3c54eab2cac3bf350fbdcab221effcc09e3f30a01701a1d225e151a9114660fb5d968e7050df0dff46e34e602a7d6b39fabb5101c88e92c702a93cdedde