From 6a3a16a4ee5f69865a61a9e14873e54142b3d403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:13:34 +0100 Subject: [PATCH 01/31] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- keepalived.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index 76d61a4..e630ca9 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,7 +10,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -103,6 +103,10 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.2.1-3 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Tue Jan 26 2021 Fedora Release Engineering - 2.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From db9617baa5fe9d28cc337f3a20ee007d4228e95f Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Wed, 7 Apr 2021 08:22:41 -0500 Subject: [PATCH 02/31] Update to 2.2.2 (#1935590) --- .gitignore | 1 + keepalived.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 75a2df5..7f5d174 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ /keepalived-2.1.5.tar.gz /keepalived-2.2.0.tar.gz /keepalived-2.2.1.tar.gz +/keepalived-2.2.2.tar.gz diff --git a/keepalived.spec b/keepalived.spec index e630ca9..8f535e9 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -9,8 +9,8 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 2.2.1 -Release: 3%{?dist} +Version: 2.2.2 +Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -103,6 +103,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Wed Apr 07 2021 Ryan O'Hara - 2.2.2-1 +- Update to 2.2.2 (#1935590) + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.2.1-3 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. diff --git a/sources b/sources index 25ef34b..1754f00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-2.2.1.tar.gz) = 721ac77e641ba53b23b65d278002a7af639c17741405d6bce4fc5f9f069a7f84d2dcae8bf8d08c517326373c113424efdb522cfb31638d23e4ad6c261252ea3c +SHA512 (keepalived-2.2.2.tar.gz) = 05bb589c76faa4d3f734ecb1a3e5ac40af006fe5dce962bcd9617f192e59bb5336a911b148c1530fb864333da87c3d42a6fbf7d0ef074f6a53ce5a71db8ec706 From 4da4e454682f64448c23a057c2f6adccb4b0e133 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Wed, 7 Apr 2021 10:14:32 -0500 Subject: [PATCH 03/31] Update to 2.2.2 (#1935590) --- .gitignore | 1 + keepalived.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 75a2df5..7f5d174 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ /keepalived-2.1.5.tar.gz /keepalived-2.2.0.tar.gz /keepalived-2.2.1.tar.gz +/keepalived-2.2.2.tar.gz diff --git a/keepalived.spec b/keepalived.spec index 76d61a4..772066c 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -9,8 +9,8 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 2.2.1 -Release: 2%{?dist} +Version: 2.2.2 +Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -103,6 +103,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Wed Apr 07 2021 Ryan O'Hara - 2.2.2-1 +- Update to 2.2.2 (#1935590) + * Tue Jan 26 2021 Fedora Release Engineering - 2.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 25ef34b..1754f00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-2.2.1.tar.gz) = 721ac77e641ba53b23b65d278002a7af639c17741405d6bce4fc5f9f069a7f84d2dcae8bf8d08c517326373c113424efdb522cfb31638d23e4ad6c261252ea3c +SHA512 (keepalived-2.2.2.tar.gz) = 05bb589c76faa4d3f734ecb1a3e5ac40af006fe5dce962bcd9617f192e59bb5336a911b148c1530fb864333da87c3d42a6fbf7d0ef074f6a53ce5a71db8ec706 From 950a4aec8ba4307343fec3fa8dbedfe80a919d50 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Mon, 12 Apr 2021 11:58:48 -0500 Subject: [PATCH 04/31] Add BuildRequires for file-devel --- keepalived.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/keepalived.spec b/keepalived.spec index 8f535e9..cab114e 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,7 +10,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -36,6 +36,7 @@ BuildRequires: systemd-units BuildRequires: openssl-devel BuildRequires: libnl3-devel BuildRequires: libnfnetlink-devel +BuildRequires: file-devel BuildRequires: make %description @@ -61,7 +62,7 @@ infrastructures. %{?with_profile:--enable-profile} \ %{!?with_vrrp:--disable-vrrp} \ %{?with_snmp:--enable-snmp --enable-snmp-rfc} \ - %{?with_nftables:--enable-nftables --disable-iptables --disable-ipset} \ + %{?with_nftables:--enable-nftables --disable-iptables} \ %{?with_sha1:--enable-sha1} \ --with-init=systemd %{__make} %{?_smp_mflags} STRIP=/bin/true @@ -103,6 +104,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Mon Apr 12 2021 Ryan O'Hara - 2.2.2-2 +- Add BuildRequires for file-devel + * Wed Apr 07 2021 Ryan O'Hara - 2.2.2-1 - Update to 2.2.2 (#1935590) From f0a26611a243745f9663041a47c4d5c6c7f8a08d Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Mon, 12 Apr 2021 13:33:12 -0500 Subject: [PATCH 05/31] Add BuildRequires for file-devel --- keepalived.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/keepalived.spec b/keepalived.spec index 772066c..624d69b 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,7 +10,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -36,6 +36,7 @@ BuildRequires: systemd-units BuildRequires: openssl-devel BuildRequires: libnl3-devel BuildRequires: libnfnetlink-devel +BuildRequires: file-devel BuildRequires: make %description @@ -61,7 +62,7 @@ infrastructures. %{?with_profile:--enable-profile} \ %{!?with_vrrp:--disable-vrrp} \ %{?with_snmp:--enable-snmp --enable-snmp-rfc} \ - %{?with_nftables:--enable-nftables --disable-iptables --disable-ipset} \ + %{?with_nftables:--enable-nftables --disable-iptables} \ %{?with_sha1:--enable-sha1} \ --with-init=systemd %{__make} %{?_smp_mflags} STRIP=/bin/true @@ -103,6 +104,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Mon Apr 12 2021 Ryan O'Hara - 2.2.2-2 +- Add BuildRequires for file-devel + * Wed Apr 07 2021 Ryan O'Hara - 2.2.2-1 - Update to 2.2.2 (#1935590) From 97d33f6661e50372d480a8658b42f72e19647906 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Tue, 13 Apr 2021 11:50:49 -0500 Subject: [PATCH 06/31] Fix rhbz# in changelog --- keepalived.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index 624d69b..97305a2 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -108,7 +108,7 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived - Add BuildRequires for file-devel * Wed Apr 07 2021 Ryan O'Hara - 2.2.2-1 -- Update to 2.2.2 (#1935590) +- Update to 2.2.2 (#1935990) * Tue Jan 26 2021 Fedora Release Engineering - 2.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From ece94fbbeafba7329c49b958e185002789418df7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 09:41:04 +0000 Subject: [PATCH 07/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_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 cab114e..0ff02b2 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,7 +10,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -104,6 +104,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 2.2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Apr 12 2021 Ryan O'Hara - 2.2.2-2 - Add BuildRequires for file-devel From 68fd833be94b94f7381225021ab628db55ed8459 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Tue, 3 Aug 2021 12:48:52 -0500 Subject: [PATCH 08/31] Fix build errors (#1987620) --- bz1987620-fix-build-errors.patch | 32 ++++++++++++++++++++++++++++++++ keepalived.spec | 8 +++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 bz1987620-fix-build-errors.patch diff --git a/bz1987620-fix-build-errors.patch b/bz1987620-fix-build-errors.patch new file mode 100644 index 0000000..ee4a31b --- /dev/null +++ b/bz1987620-fix-build-errors.patch @@ -0,0 +1,32 @@ +From d9c99ffe43d9848579a472c7c5ec5515e6599cb9 Mon Sep 17 00:00:00 2001 +From: Ryan O'Hara +Date: Mon, 7 Jun 2021 16:58:23 -0500 +Subject: [PATCH] Fix build errors + +--- + keepalived/core/layer4.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/keepalived/core/layer4.c b/keepalived/core/layer4.c +index d2cc971a..fdca0491 100644 +--- a/keepalived/core/layer4.c ++++ b/keepalived/core/layer4.c +@@ -27,13 +27,14 @@ + #include + #include + #include ++#include ++#include + #include + #include + #ifdef ERRQUEUE_NEEDS_SYS_TIME + #include + #endif + #include +-#include + + #include "layer4.h" + #include "logger.h" +-- +2.31.1 + diff --git a/keepalived.spec b/keepalived.spec index 0ff02b2..1886933 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,13 +10,15 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.2 -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 +Patch1: bz1987620-fix-build-errors.patch + Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -55,6 +57,7 @@ infrastructures. %prep %setup -q +%patch1 -p1 %build %configure \ @@ -104,6 +107,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Tue Aug 03 2021 Ryan O'Hara - 2.2.2-4 +- Fix build errors (#1987620) + * Thu Jul 22 2021 Fedora Release Engineering - 2.2.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 465c8166fcad6e59be4b9d3384e01752c51394ac Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Tue, 3 Aug 2021 13:25:59 -0500 Subject: [PATCH 09/31] Add systemd notify support --- keepalived.service | 5 +++-- keepalived.spec | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/keepalived.service b/keepalived.service index a5a9b28..b4a521d 100644 --- a/keepalived.service +++ b/keepalived.service @@ -4,11 +4,12 @@ After=network-online.target syslog.target Wants=network-online.target [Service] -Type=forking +Type=notify +NotifyAccess=all PIDFile=/run/keepalived.pid KillMode=process EnvironmentFile=-/etc/sysconfig/keepalived -ExecStart=/usr/sbin/keepalived $KEEPALIVED_OPTIONS +ExecStart=/usr/sbin/keepalived --dont-fork $KEEPALIVED_OPTIONS ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/keepalived.spec b/keepalived.spec index 1886933..155f221 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,7 +10,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -35,6 +35,7 @@ BuildRequires: iptables-devel %endif BuildRequires: gcc BuildRequires: systemd-units +BuildRequires: systemd-devel BuildRequires: openssl-devel BuildRequires: libnl3-devel BuildRequires: libnfnetlink-devel @@ -107,6 +108,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Tue Aug 03 2021 Ryan O'Hara - 2.2.2-5 +- Add systemd notify support + * Tue Aug 03 2021 Ryan O'Hara - 2.2.2-4 - Fix build errors (#1987620) From 2d246f0caabac6a0da49bf3c1bf72d2e663f7793 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Sat, 14 Aug 2021 16:33:10 -0500 Subject: [PATCH 10/31] Update to 2.2.3 (#1993601) --- .gitignore | 1 + bz1987620-fix-build-errors.patch | 32 -------------------------------- keepalived.spec | 10 +++++----- sources | 2 +- 4 files changed, 7 insertions(+), 38 deletions(-) delete mode 100644 bz1987620-fix-build-errors.patch diff --git a/.gitignore b/.gitignore index 7f5d174..913af37 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /keepalived-2.2.0.tar.gz /keepalived-2.2.1.tar.gz /keepalived-2.2.2.tar.gz +/keepalived-2.2.3.tar.gz diff --git a/bz1987620-fix-build-errors.patch b/bz1987620-fix-build-errors.patch deleted file mode 100644 index ee4a31b..0000000 --- a/bz1987620-fix-build-errors.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d9c99ffe43d9848579a472c7c5ec5515e6599cb9 Mon Sep 17 00:00:00 2001 -From: Ryan O'Hara -Date: Mon, 7 Jun 2021 16:58:23 -0500 -Subject: [PATCH] Fix build errors - ---- - keepalived/core/layer4.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/keepalived/core/layer4.c b/keepalived/core/layer4.c -index d2cc971a..fdca0491 100644 ---- a/keepalived/core/layer4.c -+++ b/keepalived/core/layer4.c -@@ -27,13 +27,14 @@ - #include - #include - #include -+#include -+#include - #include - #include - #ifdef ERRQUEUE_NEEDS_SYS_TIME - #include - #endif - #include --#include - - #include "layer4.h" - #include "logger.h" --- -2.31.1 - diff --git a/keepalived.spec b/keepalived.spec index 155f221..77d63e5 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -9,16 +9,14 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 2.2.2 -Release: 5%{?dist} +Version: 2.2.3 +Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz Source1: keepalived.service -Patch1: bz1987620-fix-build-errors.patch - Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -58,7 +56,6 @@ infrastructures. %prep %setup -q -%patch1 -p1 %build %configure \ @@ -108,6 +105,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Sat Aug 14 2021 Ryan O'Hara - 2.2.3-1 +- Update to 2.2.3 (#1993601) + * Tue Aug 03 2021 Ryan O'Hara - 2.2.2-5 - Add systemd notify support diff --git a/sources b/sources index 1754f00..7328974 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-2.2.2.tar.gz) = 05bb589c76faa4d3f734ecb1a3e5ac40af006fe5dce962bcd9617f192e59bb5336a911b148c1530fb864333da87c3d42a6fbf7d0ef074f6a53ce5a71db8ec706 +SHA512 (keepalived-2.2.3.tar.gz) = 79c884d73326c0ab4eb1cd9335b87b11f145549a8aa97da782b3b3371d361504b4c4a34a430d13fbbd2ae11c65e4980b283527e8327db142dba34c00fda25ccd From f1c64ecfa34fb07e9a82d85fa69a955d17c401ce Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Mon, 23 Aug 2021 09:14:11 -0500 Subject: [PATCH 11/31] Update to 2.2.4 (#1996274) --- .gitignore | 1 + keepalived.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 913af37..3d0ed91 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ /keepalived-2.2.1.tar.gz /keepalived-2.2.2.tar.gz /keepalived-2.2.3.tar.gz +/keepalived-2.2.4.tar.gz diff --git a/keepalived.spec b/keepalived.spec index 77d63e5..35786bf 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -9,7 +9,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 2.2.3 +Version: 2.2.4 Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -105,6 +105,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Mon Aug 23 2021 Ryan O'Hara - 2.2.4-1 +- Update to 2.2.4 (#1996274) + * Sat Aug 14 2021 Ryan O'Hara - 2.2.3-1 - Update to 2.2.3 (#1993601) diff --git a/sources b/sources index 7328974..1ab012a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-2.2.3.tar.gz) = 79c884d73326c0ab4eb1cd9335b87b11f145549a8aa97da782b3b3371d361504b4c4a34a430d13fbbd2ae11c65e4980b283527e8327db142dba34c00fda25ccd +SHA512 (keepalived-2.2.4.tar.gz) = b8b0f3e7092b7b7093a9927259928076ee95ed176dd26b3a5c38e8c0dc7b83468433944905618dbc9e4b73b81b0cd3f16c2db4234ed4fcdf30f4fc0e532f9422 From df4d8c96ef3985f66c0e7cf0bf886ca520fe940f Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:05:11 +0200 Subject: [PATCH 12/31] Rebuilt with OpenSSL 3.0.0 --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index 35786bf..d5a8d64 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,7 +10,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -105,6 +105,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Tue Sep 14 2021 Sahana Prasad - 2.2.4-2 +- Rebuilt with OpenSSL 3.0.0 + * Mon Aug 23 2021 Ryan O'Hara - 2.2.4-1 - Update to 2.2.4 (#1996274) From 1a50e5dce8999b6fb9595cab3f4b7f09d2406c79 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 28 Nov 2021 12:15:41 -0800 Subject: [PATCH 13/31] Rebuild for new libnftnl --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index d5a8d64..13597f8 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,7 +10,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -105,6 +105,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Sat Nov 27 2021 Kevin Fenzi - 2.2.4-3 +- Rebuild for new libnftnl + * Tue Sep 14 2021 Sahana Prasad - 2.2.4-2 - Rebuilt with OpenSSL 3.0.0 From 47102d40dfc76491abd905d041d1807639638be2 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Tue, 14 Dec 2021 10:13:13 -0600 Subject: [PATCH 14/31] Fix dbus policy (#2027158, CVE-2021-44225) --- bz2027158-fix-dbus-policy.patch | 41 +++++++++++++++++++++++++++++++++ keepalived.spec | 8 ++++++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 bz2027158-fix-dbus-policy.patch diff --git a/bz2027158-fix-dbus-policy.patch b/bz2027158-fix-dbus-policy.patch new file mode 100644 index 0000000..29d1fc5 --- /dev/null +++ b/bz2027158-fix-dbus-policy.patch @@ -0,0 +1,41 @@ +From 7977fec0be89ae6fe87405b3f8da2f0b5e415e3d Mon Sep 17 00:00:00 2001 +From: Vincent Bernat +Date: Tue, 23 Nov 2021 06:50:59 +0100 +Subject: [PATCH] dbus: fix policy to not be overly broad + +The DBus policy did not restrict the message destination, allowing any +user to inspect and manipulate any property. + +Signed-off-by: Vincent Bernat +--- + keepalived/dbus/org.keepalived.Vrrp1.conf | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/keepalived/dbus/org.keepalived.Vrrp1.conf b/keepalived/dbus/org.keepalived.Vrrp1.conf +index 2b78a575..b5ced608 100644 +--- a/keepalived/dbus/org.keepalived.Vrrp1.conf ++++ b/keepalived/dbus/org.keepalived.Vrrp1.conf +@@ -3,12 +3,15 @@ + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> + + +- +- ++ ++ + + +- +- +- ++ ++ ++ + + +-- +2.33.1 + diff --git a/keepalived.spec b/keepalived.spec index 13597f8..8b27078 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,13 +10,15 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.4 -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 +Patch1: bz2027158-fix-dbus-policy.patch + Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -56,6 +58,7 @@ infrastructures. %prep %setup -q +%patch1 -p1 %build %configure \ @@ -105,6 +108,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Tue Dec 14 2021 Ryan O'Hara - 2.2.4-4 +- Fix dbus policy (#2027158, CVE-2021-44225) + * Sat Nov 27 2021 Kevin Fenzi - 2.2.4-3 - Rebuild for new libnftnl From 2646ddf12481d07589bb11fe1e51a79e19038c4e Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Tue, 14 Dec 2021 10:40:37 -0600 Subject: [PATCH 15/31] Update to 2.2.4 (#1996274) --- .gitignore | 1 + keepalived.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7f5d174..41253a0 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /keepalived-2.2.0.tar.gz /keepalived-2.2.1.tar.gz /keepalived-2.2.2.tar.gz +/keepalived-2.2.4.tar.gz diff --git a/keepalived.spec b/keepalived.spec index 97305a2..f66e598 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -9,8 +9,8 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 2.2.2 -Release: 2%{?dist} +Version: 2.2.4 +Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -104,6 +104,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Tue Dec 14 2021 Ryan O'Hara - 2.2.4-1 +- Update to 2.2.4 (#1996274) + * Mon Apr 12 2021 Ryan O'Hara - 2.2.2-2 - Add BuildRequires for file-devel diff --git a/sources b/sources index 1754f00..1ab012a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-2.2.2.tar.gz) = 05bb589c76faa4d3f734ecb1a3e5ac40af006fe5dce962bcd9617f192e59bb5336a911b148c1530fb864333da87c3d42a6fbf7d0ef074f6a53ce5a71db8ec706 +SHA512 (keepalived-2.2.4.tar.gz) = b8b0f3e7092b7b7093a9927259928076ee95ed176dd26b3a5c38e8c0dc7b83468433944905618dbc9e4b73b81b0cd3f16c2db4234ed4fcdf30f4fc0e532f9422 From c209254ea60da04ba1ed89ea1703e95144efabb1 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Tue, 14 Dec 2021 10:42:47 -0600 Subject: [PATCH 16/31] Fix dbus policy (#2027158, CVE-2021-442255) --- bz2027158-fix-dbus-policy.patch | 41 +++++++++++++++++++++++++++++++++ keepalived.spec | 8 ++++++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 bz2027158-fix-dbus-policy.patch diff --git a/bz2027158-fix-dbus-policy.patch b/bz2027158-fix-dbus-policy.patch new file mode 100644 index 0000000..29d1fc5 --- /dev/null +++ b/bz2027158-fix-dbus-policy.patch @@ -0,0 +1,41 @@ +From 7977fec0be89ae6fe87405b3f8da2f0b5e415e3d Mon Sep 17 00:00:00 2001 +From: Vincent Bernat +Date: Tue, 23 Nov 2021 06:50:59 +0100 +Subject: [PATCH] dbus: fix policy to not be overly broad + +The DBus policy did not restrict the message destination, allowing any +user to inspect and manipulate any property. + +Signed-off-by: Vincent Bernat +--- + keepalived/dbus/org.keepalived.Vrrp1.conf | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/keepalived/dbus/org.keepalived.Vrrp1.conf b/keepalived/dbus/org.keepalived.Vrrp1.conf +index 2b78a575..b5ced608 100644 +--- a/keepalived/dbus/org.keepalived.Vrrp1.conf ++++ b/keepalived/dbus/org.keepalived.Vrrp1.conf +@@ -3,12 +3,15 @@ + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> + + +- +- ++ ++ + + +- +- +- ++ ++ ++ + + +-- +2.33.1 + diff --git a/keepalived.spec b/keepalived.spec index f66e598..1b5e89d 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,13 +10,15 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz Source1: keepalived.service +Patch1: bz2027158-fix-dbus-policy.patch + Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -55,6 +57,7 @@ infrastructures. %prep %setup -q +%patch1 -p1 %build %configure \ @@ -104,6 +107,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Tue Dec 14 2021 Ryan O'Hara - 2.2.4-2 +- Fix dbus policy (#2027158, CVE-2021-442255) + * Tue Dec 14 2021 Ryan O'Hara - 2.2.4-1 - Update to 2.2.4 (#1996274) From 6f08ad609296011fcb6d7c5d91222512a60c26d7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 14:24:44 +0000 Subject: [PATCH 17/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_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 8b27078..e7e1d89 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,7 +10,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.4 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -108,6 +108,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.2.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Dec 14 2021 Ryan O'Hara - 2.2.4-4 - Fix dbus policy (#2027158, CVE-2021-44225) From 10c982818243172f3b90d4af6bebe99c98174860 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Mon, 14 Feb 2022 13:07:46 -0600 Subject: [PATCH 18/31] Update to 2.2.7 (#2041231) --- .gitignore | 1 + bz2027158-fix-dbus-policy.patch | 41 --------------------------------- keepalived.spec | 10 ++++---- sources | 2 +- 4 files changed, 7 insertions(+), 47 deletions(-) delete mode 100644 bz2027158-fix-dbus-policy.patch diff --git a/.gitignore b/.gitignore index 3d0ed91..f32893f 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /keepalived-2.2.2.tar.gz /keepalived-2.2.3.tar.gz /keepalived-2.2.4.tar.gz +/keepalived-2.2.7.tar.gz diff --git a/bz2027158-fix-dbus-policy.patch b/bz2027158-fix-dbus-policy.patch deleted file mode 100644 index 29d1fc5..0000000 --- a/bz2027158-fix-dbus-policy.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 7977fec0be89ae6fe87405b3f8da2f0b5e415e3d Mon Sep 17 00:00:00 2001 -From: Vincent Bernat -Date: Tue, 23 Nov 2021 06:50:59 +0100 -Subject: [PATCH] dbus: fix policy to not be overly broad - -The DBus policy did not restrict the message destination, allowing any -user to inspect and manipulate any property. - -Signed-off-by: Vincent Bernat ---- - keepalived/dbus/org.keepalived.Vrrp1.conf | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/keepalived/dbus/org.keepalived.Vrrp1.conf b/keepalived/dbus/org.keepalived.Vrrp1.conf -index 2b78a575..b5ced608 100644 ---- a/keepalived/dbus/org.keepalived.Vrrp1.conf -+++ b/keepalived/dbus/org.keepalived.Vrrp1.conf -@@ -3,12 +3,15 @@ - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> - - -- -- -+ -+ - - -- -- -- -+ -+ -+ - - --- -2.33.1 - diff --git a/keepalived.spec b/keepalived.spec index e7e1d89..a14eb15 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -9,16 +9,14 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 2.2.4 -Release: 5%{?dist} +Version: 2.2.7 +Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz Source1: keepalived.service -Patch1: bz2027158-fix-dbus-policy.patch - Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -58,7 +56,6 @@ infrastructures. %prep %setup -q -%patch1 -p1 %build %configure \ @@ -108,6 +105,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Mon Feb 14 2022 Ryan O'Hara - 2.2.7-1 +- Update to 2.2.7 (#2041231) + * Thu Jan 20 2022 Fedora Release Engineering - 2.2.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 1ab012a..7b56158 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-2.2.4.tar.gz) = b8b0f3e7092b7b7093a9927259928076ee95ed176dd26b3a5c38e8c0dc7b83468433944905618dbc9e4b73b81b0cd3f16c2db4234ed4fcdf30f4fc0e532f9422 +SHA512 (keepalived-2.2.7.tar.gz) = 9869437fe6f0c10590b13088002b53474a51102da9838a6575d835d006c4871b61324ab80e0e81e0a23d0124e6f033cfc7114749e87b8f736408f3f0bedb3968 From ef92eda6bc2debf35967cd8d53737fb16c72b0db Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Thu, 7 Jul 2022 09:21:11 -0500 Subject: [PATCH 19/31] Move keepalived.conf.sample to keepalived.conf --- keepalived.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index a14eb15..23443bc 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,7 +10,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -73,6 +73,8 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} rm -rf %{buildroot}%{_initrddir}/ rm -rf %{buildroot}%{_sysconfdir}/keepalived/samples/ +mv %{buildroot}%{_sysconfdir}/keepalived/keepalived.conf.sample \ + %{buildroot}%{_sysconfdir}/keepalived/keepalived.conf %{__install} -p -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/keepalived.service mkdir -p %{buildroot}%{_libexecdir}/keepalived @@ -105,6 +107,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Thu Jul 07 2022 Ryan O'Hara - 2.2.7-2 +- Move keepalived.conf.sample to keepalived.conf + * Mon Feb 14 2022 Ryan O'Hara - 2.2.7-1 - Update to 2.2.7 (#2041231) From ef21173d930a7c52bd65cec63c794ede08c2f1d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 15:51:41 +0000 Subject: [PATCH 20/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_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 23443bc..a224f4e 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,7 +10,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.7 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -107,6 +107,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 2.2.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jul 07 2022 Ryan O'Hara - 2.2.7-2 - Move keepalived.conf.sample to keepalived.conf From c78adb070ca5926239e1e959da934e8c5627e3df Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 7 Dec 2022 13:23:17 +0100 Subject: [PATCH 21/31] 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 22/31] 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 23/31] 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 24/31] 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 25/31] 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 26/31] 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 27/31] 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 28/31] 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 29/31] 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 30/31] 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 31/31] 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