From c78adb070ca5926239e1e959da934e8c5627e3df Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 7 Dec 2022 13:23:17 +0100 Subject: [PATCH 01/11] Fix spurious implicit function declaration in broken configure check Related to: --- keepalived-configure-c99.patch | 51 ++++++++++++++++++++++++++++++++++ keepalived.spec | 11 ++++++-- 2 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 keepalived-configure-c99.patch diff --git a/keepalived-configure-c99.patch b/keepalived-configure-c99.patch new file mode 100644 index 0000000..cabf8d9 --- /dev/null +++ b/keepalived-configure-c99.patch @@ -0,0 +1,51 @@ +Fix a configure check that happens to trigger and implicit function +declaration error. + +Fixed slightly differently in upstream via: + +commit 516032ec39169d05c613de0e8ee10845658748ff +Author: Quentin Armitage +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 + +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 + +- 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 + +- static int func(int i) __attribute__((error("deliberate error"))) ++ static int __attribute__((error("deliberate error"))) func(int i) + { + return i * 2; + } diff --git a/keepalived.spec b/keepalived.spec index a224f4e..b4696be 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,12 +10,13 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.7 -Release: 3%{?dist} +Release: 4%{?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 @@ -55,7 +56,10 @@ can be used independently or all together to provide resilient infrastructures. %prep -%setup -q +%autosetup -p1 + +# Prevent re-running autotools. +touch aclocal.m4 Makefile.in lib/config.h.in configure %build %configure \ @@ -107,6 +111,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Wed Dec 7 2022 Florian Weimer - 2.2.7-4 +- Fix spurious implicit function declaration in broken configure check + * Thu Jul 21 2022 Fedora Release Engineering - 2.2.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 532118f86c7096d875ec411519e585865bce82a7 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Tue, 20 Dec 2022 18:14:59 -0600 Subject: [PATCH 02/11] Enable JSON support --- keepalived.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index b4696be..d3349ed 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -1,6 +1,7 @@ %bcond_without snmp %bcond_without vrrp %bcond_without sha1 +%bcond_without json %bcond_without nftables %bcond_with profile %bcond_with debug @@ -10,7 +11,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.7 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -68,6 +69,7 @@ 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 @@ -111,6 +113,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Tue Dec 20 2022 Ryan O'Hara - 2.2.7-5 +- Enable JSON support + * Wed Dec 7 2022 Florian Weimer - 2.2.7-4 - Fix spurious implicit function declaration in broken configure check From de115a1372cd7d7a3e5173a0e4f7147ad23cb8df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 14:21:30 +0000 Subject: [PATCH 03/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index d3349ed..a27852c 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -11,7 +11,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.7 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -113,6 +113,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.2.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Dec 20 2022 Ryan O'Hara - 2.2.7-5 - Enable JSON support From 780ef6446b07a9271d6b71c5730626baec512e03 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Thu, 8 Jun 2023 18:00:01 -0500 Subject: [PATCH 04/11] Update to 2.2.8 (#2211385) --- .gitignore | 1 + keepalived.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f32893f..fc05a06 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /keepalived-2.2.3.tar.gz /keepalived-2.2.4.tar.gz /keepalived-2.2.7.tar.gz +/keepalived-2.2.8.tar.gz diff --git a/keepalived.spec b/keepalived.spec index a27852c..1362ad4 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,14 +10,14 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 2.2.7 -Release: 6%{?dist} +Version: 2.2.8 +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 +#Patch0: keepalived-configure-c99.patch Requires(post): systemd Requires(preun): systemd @@ -113,6 +113,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Thu Jun 08 2023 Ryan O'Hara - 2.2.8-1 +- Update to 2.2.8 (#2211385) + * Thu Jan 19 2023 Fedora Release Engineering - 2.2.7-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 7b56158..68261a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-2.2.7.tar.gz) = 9869437fe6f0c10590b13088002b53474a51102da9838a6575d835d006c4871b61324ab80e0e81e0a23d0124e6f033cfc7114749e87b8f736408f3f0bedb3968 +SHA512 (keepalived-2.2.8.tar.gz) = dc0ab5b0ef8911a7859422eccc2771a40e942236c855a628158ed748eb5f7dc4b6f4850e9c3057e81fd9d2daa640ab51fb1d7af12748a613280a217b333eb06b From 098dca0ed21074b53aa7aed9026b4a0831bfbad2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 08:41:22 +0000 Subject: [PATCH 05/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index 1362ad4..121b73f 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -11,7 +11,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.8 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -113,6 +113,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 2.2.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jun 08 2023 Ryan O'Hara - 2.2.8-1 - Update to 2.2.8 (#2211385) From df0ff14d28dd89b4d19d8d58696f5db0900f6eae Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Fri, 4 Aug 2023 11:24:33 -0500 Subject: [PATCH 06/11] Migrate to SPDX license --- keepalived.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/keepalived.spec b/keepalived.spec index 121b73f..2ab8e6e 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -11,8 +11,8 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.8 -Release: 2%{?dist} -License: GPLv2+ +Release: 3%{?dist} +License: GPL-2.0-or-later URL: http://www.keepalived.org/ Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz @@ -113,6 +113,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Fri Aug 04 2023 Ryan O'Hara - 2.2.8-3 +- Migrate to SPDX license + * Thu Jul 20 2023 Fedora Release Engineering - 2.2.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 92bd098510522b0fc04f4f7870738c1f78ab6894 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 00:14:23 +0000 Subject: [PATCH 07/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index 2ab8e6e..0b5da89 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -11,7 +11,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.8 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL-2.0-or-later URL: http://www.keepalived.org/ @@ -113,6 +113,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 2.2.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Aug 04 2023 Ryan O'Hara - 2.2.8-3 - Migrate to SPDX license From 4151e48314acdf270dbc0e48b93bd204c5a8c3ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 23:54:28 +0000 Subject: [PATCH 08/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index 0b5da89..506f3eb 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -11,7 +11,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.8 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL-2.0-or-later URL: http://www.keepalived.org/ @@ -113,6 +113,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 2.2.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 2.2.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f65880bc11a1a6c9fc64cc7793768fecacc1a774 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 11:38:15 +0000 Subject: [PATCH 09/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index 506f3eb..fb45386 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -11,7 +11,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.8 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL-2.0-or-later URL: http://www.keepalived.org/ @@ -113,6 +113,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 2.2.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jan 24 2024 Fedora Release Engineering - 2.2.8-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 07efe939867a2a58a5b5ea8deb0666f87e7e2bd5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 08:36:42 +0000 Subject: [PATCH 10/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index fb45386..6a06c0d 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -11,7 +11,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.8 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL-2.0-or-later URL: http://www.keepalived.org/ @@ -113,6 +113,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 2.2.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 2.2.8-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From f2489fa190b0efca5bd8aac2c15822346370bfd0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 18:22:50 +0000 Subject: [PATCH 11/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index 6a06c0d..28896aa 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -11,7 +11,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.8 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL-2.0-or-later URL: http://www.keepalived.org/ @@ -113,6 +113,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 2.2.8-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 2.2.8-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild