Update to 2.2.8 (#2211385)

keepalived-configure-c99.patch

@@ -1,51 +0,0 @@
-Fix a configure check that happens to trigger and implicit function
-declaration error.
-
-Fixed slightly differently in upstream via:
-
-commit 516032ec39169d05c613de0e8ee10845658748ff
-Author: Quentin Armitage <quentin@armitage.org.uk>
-Date:   Sun Apr 17 18:02:18 2022 +0100
-
-    config parser: Fix segfault caused by extra '}' and other parser fixes
-    
-    If there was a configuration error in a block, e.g. a vrrp_instance,
-    keepalived would apply the configuration in the rest of the block to
-    the previous object of that type, e.g. the previous vrrp instance. If
-    there had been no previous instance, keepalived would probably segfault.
-    
-    This commit changes the way the parser works. A new instance of an
-    object, e.g. a VRRP instance or a virtual server, is only added to the
-    list of those objects once the configuration of that object is complete.
-    In particular it no longer applies the configuration to the last entry
-    on the list of the relevant object type, but keeps a point to the
-    object currently being configured.
-    
-    Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
-
-diff --git a/configure b/configure
-index 7cd6c4f614930391..b099b8f42aca1cba 100755
---- a/configure
-+++ b/configure
-@@ -6382,7 +6382,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- 
-         #include <stdio.h>
- 
--        static int func(int i) __attribute__((error("deliberate error")))
-+        static int __attribute__((error("deliberate error"))) func(int i)
- 	{
- 	  return i * 2;
- 	}
-diff --git a/configure.ac b/configure.ac
-index 350a9f4e9567518c..5546143b4630aff6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -792,7 +792,7 @@ AC_COMPILE_IFELSE(
-       [[
-         #include <stdio.h>
- 
--        static int func(int i) __attribute__((error("deliberate error")))
-+        static int __attribute__((error("deliberate error"))) func(int i)
- 	{
- 	  return i * 2;
- 	}

keepalived.spec

@@ -1,7 +1,6 @@
 %bcond_without snmp
 %bcond_without vrrp
 %bcond_without sha1
-%bcond_without json
 %bcond_without nftables
 %bcond_with profile
 %bcond_with debug
@@ -11,13 +10,12 @@
 Name: keepalived
 Summary: High Availability monitor built upon LVS, VRRP and service pollers
 Version: 2.2.8
-Release: 8%{?dist}
-License: GPL-2.0-or-later
+Release: 1%{?dist}
+License: GPLv2+
 URL: http://www.keepalived.org/
 
 Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
 Source1: keepalived.service
-#Patch0: keepalived-configure-c99.patch
 
 Requires(post): systemd
 Requires(preun): systemd
@@ -57,10 +55,7 @@ can be used independently or all together to provide resilient
 infrastructures.
 
 %prep
-%autosetup -p1
-
-# Prevent re-running autotools.
-touch aclocal.m4 Makefile.in lib/config.h.in configure
+%setup -q
 
 %build
 %configure \
@@ -69,7 +64,6 @@ touch aclocal.m4 Makefile.in lib/config.h.in configure
     %{!?with_vrrp:--disable-vrrp} \
     %{?with_snmp:--enable-snmp --enable-snmp-rfc} \
     %{?with_nftables:--enable-nftables --disable-iptables} \
-    %{?with_json:--enable-json} \
     %{?with_sha1:--enable-sha1} \
     --with-init=systemd
 %{__make} %{?_smp_mflags} STRIP=/bin/true
@@ -113,39 +107,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived
 %{_mandir}/man8/keepalived.8*
 
 %changelog
-* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.8-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.8-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.8-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.8-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.8-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Aug 04 2023 Ryan O'Hara <rohara@redhat.com> - 2.2.8-3
-- Migrate to SPDX license
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
 * Thu Jun 08 2023 Ryan O'Hara <rohara@redhat.com> - 2.2.8-1
 - Update to 2.2.8 (#2211385)
 
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.7-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Dec 20 2022 Ryan O'Hara <rohara@redhat.com> - 2.2.7-5
-- Enable JSON support
-
-* Wed Dec  7 2022 Florian Weimer <fweimer@redhat.com> - 2.2.7-4
-- Fix spurious implicit function declaration in broken configure check
-
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild