From 30521c556a7418a99e3550c5b226c5d95e5a9885 Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Wed, 6 Nov 2019 13:30:03 -0600
Subject: [PATCH 01/41] Update to 2.0.19 (#1763424)

---
 .gitignore      | 1 +
 keepalived.spec | 7 +++++--
 sources         | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index a7d0a2c..64c0b73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@
 /keepalived-2.0.11.tar.gz
 /keepalived-2.0.12.tar.gz
 /keepalived-2.0.18.tar.gz
+/keepalived-2.0.19.tar.gz
diff --git a/keepalived.spec b/keepalived.spec
index 0b36367..9d47db3 100644
--- a/keepalived.spec
+++ b/keepalived.spec
@@ -8,8 +8,8 @@
 
 Name: keepalived
 Summary: High Availability monitor built upon LVS, VRRP and service pollers
-Version: 2.0.18
-Release: 2%{?dist}
+Version: 2.0.19
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.keepalived.org/
 
@@ -95,6 +95,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived
 %{_mandir}/man8/keepalived.8*
 
 %changelog
+* Wed Nov 06 2019 Ryan O'Hara <rohara@redhat.com> - 2.0.19-1
+- Update to 2.0.19 (#1763424)
+
 * Tue Jul 30 2019 Ryan O'Hara <rohara@redhat.com> - 2.0.18-2
 - Change pidfile directory (#1712730)
 
diff --git a/sources b/sources
index 63a74a2..e7a9ff7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepalived-2.0.18.tar.gz) = 11e0a9b9bdca734a923254b4484f4e808cf362e795e3f457f707772b7522929be4bbbba9b1c152b7cb7601d8315b6faea229ed59f115787d6197fbc62770f9a3
+SHA512 (keepalived-2.0.19.tar.gz) = 68a510983bc043484e5edbc1d87563677a048282ec52873105f0af922e8b4de5b8e7176944010f9d4d6f65d1a4ebaf930c3d37273e28c1f115ed0fda245d8109

From 876ddb0e6e6350c3035e0db3cded7a43fa6f6599 Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Wed, 6 Nov 2019 13:47:41 -0600
Subject: [PATCH 02/41] Enable nftables support (#1769278)

---
 keepalived.spec | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/keepalived.spec b/keepalived.spec
index 9d47db3..fe1f5f3 100644
--- a/keepalived.spec
+++ b/keepalived.spec
@@ -1,6 +1,7 @@
 %bcond_without snmp
 %bcond_without vrrp
 %bcond_without sha1
+%bcond_without nftables
 %bcond_with profile
 %bcond_with debug
 
@@ -23,6 +24,9 @@ Requires(postun): systemd
 %if %{with snmp}
 BuildRequires: net-snmp-devel
 %endif
+%if %{with nftables}
+BuildRequires: libnftnl-devel
+%endif
 BuildRequires: gcc
 BuildRequires: systemd-units
 BuildRequires: openssl-devel
@@ -54,6 +58,7 @@ infrastructures.
     %{?with_profile:--enable-profile} \
     %{!?with_vrrp:--disable-vrrp} \
     %{?with_snmp:--enable-snmp --enable-snmp-rfc} \
+    %{?with_nftables:--enable-nftables} \
     %{?with_sha1:--enable-sha1} \
     --with-init=systemd
 %{__make} %{?_smp_mflags} STRIP=/bin/true
@@ -95,6 +100,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived
 %{_mandir}/man8/keepalived.8*
 
 %changelog
+* Wed Nov 06 2019 Ryan O'Hara <rohara@redhat.com> - 2.0.19-2
+- Enable nftables support (#1769278)
+
 * Wed Nov 06 2019 Ryan O'Hara <rohara@redhat.com> - 2.0.19-1
 - Update to 2.0.19 (#1763424)
 

From c453f7e249adedd76c702dfc5b28efe98a7e118d Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Tue, 12 Nov 2019 04:44:42 -0600
Subject: [PATCH 03/41] Fix track_process with PIDs over 32767 (#1770766)

---
 ...ed-fix-track_process-with-pids-32767.patch | 49 +++++++++++++++++++
 keepalived.spec                               |  8 ++-
 2 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 keepalived-fix-track_process-with-pids-32767.patch

diff --git a/keepalived-fix-track_process-with-pids-32767.patch b/keepalived-fix-track_process-with-pids-32767.patch
new file mode 100644
index 0000000..35b7025
--- /dev/null
+++ b/keepalived-fix-track_process-with-pids-32767.patch
@@ -0,0 +1,49 @@
+From 23a5b8113bf0b8ec4718443df0406882e8e4d831 Mon Sep 17 00:00:00 2001
+From: Quentin Armitage <quentin@armitage.org.uk>
+Date: Sat, 9 Nov 2019 10:07:48 +0000
+Subject: [PATCH] Fix track_process with PIDs > 32767
+
+Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
+---
+ keepalived/core/track_process.c | 4 ++--
+ lib/scheduler.c                 | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/keepalived/core/track_process.c b/keepalived/core/track_process.c
+index 550254b1..76ff6009 100644
+--- a/keepalived/core/track_process.c
++++ b/keepalived/core/track_process.c
+@@ -341,7 +341,7 @@ check_process(pid_t pid, char *comm, tracked_process_instance_t *tpi)
+ 	 * swapped in to read it. */
+ 	if (!have_comm) {
+ 		if (vrrp_data->vrrp_use_process_cmdline) {
+-			snprintf(cmdline, sizeof(cmdline), "/proc/%hd/cmdline", pid);
++			snprintf(cmdline, sizeof(cmdline), "/proc/%d/cmdline", pid);
+ 
+ 			if ((fd = open(cmdline, O_RDONLY)) == -1)
+ 				return;
+@@ -358,7 +358,7 @@ check_process(pid_t pid, char *comm, tracked_process_instance_t *tpi)
+ 		}
+ 
+ 		if (vrrp_data->vrrp_use_process_comm) {
+-			snprintf(cmdline, sizeof(cmdline), "/proc/%hd/comm", pid);
++			snprintf(cmdline, sizeof(cmdline), "/proc/%d/comm", pid);
+ 
+ 			fd = open(cmdline, O_RDONLY);
+ 			if (fd == -1) {
+diff --git a/lib/scheduler.c b/lib/scheduler.c
+index 3cd7b65a..de92c7d4 100644
+--- a/lib/scheduler.c
++++ b/lib/scheduler.c
+@@ -441,7 +441,7 @@ report_child_status(int status, pid_t pid, char const *prog_name)
+ 		prog_id = child_finder_name(pid);
+ 
+ 	if (!prog_id) {
+-		snprintf(pid_buf, sizeof(pid_buf), "pid %hd", pid);
++		snprintf(pid_buf, sizeof(pid_buf), "pid %d", pid);
+ 		prog_id = pid_buf;
+ 	}
+ 
+-- 
+2.23.0
+
diff --git a/keepalived.spec b/keepalived.spec
index fe1f5f3..c1dca52 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.0.19
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://www.keepalived.org/
 
 Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
 Source1: keepalived.service
 
+Patch0: keepalived-fix-track_process-with-pids-32767.patch
+
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
@@ -51,6 +53,7 @@ infrastructures.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \
@@ -100,6 +103,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived
 %{_mandir}/man8/keepalived.8*
 
 %changelog
+* Tue Nov 12 2019 Ryan O'Hara <rohara@redhat.com> - 2.0.19-3
+- Fix track_process with PIDs over 32767 (#1770766)
+
 * Wed Nov 06 2019 Ryan O'Hara <rohara@redhat.com> - 2.0.19-2
 - Enable nftables support (#1769278)
 

From 50dd9a30e1cf19a1eecc3d4c7b5b03bd38ed8cb2 Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Tue, 12 Nov 2019 04:47:40 -0600
Subject: [PATCH 04/41] Fix file descriptor errors on reload

---
 ...fix-file-descriptor-errors-on-reload.patch | 164 ++++++++++++++++++
 keepalived.spec                               |   7 +-
 2 files changed, 170 insertions(+), 1 deletion(-)
 create mode 100644 keepalived-fix-file-descriptor-errors-on-reload.patch

diff --git a/keepalived-fix-file-descriptor-errors-on-reload.patch b/keepalived-fix-file-descriptor-errors-on-reload.patch
new file mode 100644
index 0000000..1530517
--- /dev/null
+++ b/keepalived-fix-file-descriptor-errors-on-reload.patch
@@ -0,0 +1,164 @@
+From 1c3c8eefd0a40d4938d6f05969c886988116a425 Mon Sep 17 00:00:00 2001
+From: Quentin Armitage <quentin@armitage.org.uk>
+Date: Wed, 6 Nov 2019 23:15:23 +0000
+Subject: [PATCH] Resolve file descriptor errors on reload
+
+If a read or write thread was on the thread reaady queue when a
+reload was processed, the file descriptor was not removed from the
+epoll instance.
+
+This commit ensures that file descriptors relating to threads on
+the thread ready queue are removed from the epoll instance during
+a reload.
+
+Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
+---
+ keepalived/bfd/bfd_scheduler.c   |  2 +-
+ keepalived/check/check_bfd.c     |  2 +-
+ keepalived/vrrp/vrrp_scheduler.c |  2 +-
+ lib/scheduler.c                  | 31 +++++++++++++++++++------------
+ lib/scheduler.h                  |  3 ++-
+ 5 files changed, 24 insertions(+), 16 deletions(-)
+
+diff --git a/keepalived/bfd/bfd_scheduler.c b/keepalived/bfd/bfd_scheduler.c
+index 5c3d0691..d51d420f 100644
+--- a/keepalived/bfd/bfd_scheduler.c
++++ b/keepalived/bfd/bfd_scheduler.c
+@@ -908,7 +908,7 @@ bfd_receiver_thread(thread_ref_t thread)
+ 	data->thread_in = NULL;
+ 
+ 	/* Ignore THREAD_READ_TIMEOUT */
+-	if (thread->type == THREAD_READY_FD) {
++	if (thread->type == THREAD_READY_READ_FD) {
+ 		if (!bfd_receive_packet(&pkt, fd, bfd_buffer, BFD_BUFFER_SIZE))
+ 			bfd_handle_packet(&pkt);
+ 	}
+diff --git a/keepalived/check/check_bfd.c b/keepalived/check/check_bfd.c
+index 4bd8af23..f9590c30 100644
+--- a/keepalived/check/check_bfd.c
++++ b/keepalived/check/check_bfd.c
+@@ -290,7 +290,7 @@ bfd_check_thread(thread_ref_t thread)
+ 	bfd_thread = thread_add_read(master, bfd_check_thread, NULL,
+ 				     thread->u.f.fd, TIMER_NEVER, false);
+ 
+-	if (thread->type != THREAD_READY_FD)
++	if (thread->type != THREAD_READY_READ_FD)
+ 		return 0;
+ 
+ 	while (read(thread->u.f.fd, &evt, sizeof(bfd_event_t)) != -1)
+diff --git a/keepalived/vrrp/vrrp_scheduler.c b/keepalived/vrrp/vrrp_scheduler.c
+index 91a4898c..7e6da60a 100644
+--- a/keepalived/vrrp/vrrp_scheduler.c
++++ b/keepalived/vrrp/vrrp_scheduler.c
+@@ -762,7 +762,7 @@ vrrp_bfd_thread(thread_ref_t thread)
+ 	bfd_thread = thread_add_read(master, vrrp_bfd_thread, NULL,
+ 				     thread->u.f.fd, TIMER_NEVER, false);
+ 
+-	if (thread->type != THREAD_READY_FD)
++	if (thread->type != THREAD_READY_READ_FD)
+ 		return 0;
+ 
+ 	while (read(thread->u.f.fd, &evt, sizeof(bfd_event_t)) != -1)
+diff --git a/lib/scheduler.c b/lib/scheduler.c
+index 8fc2a032..3cd7b65a 100644
+--- a/lib/scheduler.c
++++ b/lib/scheduler.c
+@@ -116,7 +116,8 @@ get_thread_type_str(thread_type_t id)
+ 	if (id == THREAD_CHILD_TERMINATED) return "CHILD_TERMINATED";
+ 	if (id == THREAD_TERMINATE_START) return "TERMINATE_START";
+ 	if (id == THREAD_TERMINATE) return "TERMINATE";
+-	if (id == THREAD_READY_FD) return "READY_FD";
++	if (id == THREAD_READY_READ_FD) return "READY_READ_FD";
++	if (id == THREAD_READY_WRITE_FD) return "READY_WRITE_FD";
+ 	if (id == THREAD_READ_ERROR) return "READ_ERROR";
+ 	if (id == THREAD_WRITE_ERROR) return "WRITE_ERROR";
+ #ifdef USE_SIGNAL_THREADS
+@@ -859,7 +860,8 @@ thread_destroy_rb(thread_master_t *m, rb_root_cached_t *root)
+ 
+ 		if (thread->type == THREAD_READ ||
+ 		    thread->type == THREAD_WRITE ||
+-		    thread->type == THREAD_READY_FD ||
++		    thread->type == THREAD_READY_READ_FD ||
++		    thread->type == THREAD_READY_WRITE_FD ||
+ 		    thread->type == THREAD_READ_TIMEOUT ||
+ 		    thread->type == THREAD_WRITE_TIMEOUT ||
+ 		    thread->type == THREAD_READ_ERROR ||
+@@ -1409,14 +1411,18 @@ thread_cancel(thread_ref_t thread_cp)
+ 		rb_erase_cached(&thread->n, &m->child);
+ 		rb_erase(&thread->rb_data, &m->child_pid);
+ 		break;
+-	case THREAD_READY_FD:
++	case THREAD_READY_READ_FD:
+ 	case THREAD_READ_TIMEOUT:
++		if (thread->event)
++			thread_event_del(thread, THREAD_FL_EPOLL_READ_BIT);
++		list_head_del(&thread->next);
++		break;
++	case THREAD_READY_WRITE_FD:
+ 	case THREAD_WRITE_TIMEOUT:
+-		if (thread->event) {
+-			rb_erase(&thread->event->n, &m->io_events);
+-			FREE(thread->event);
+-		}
+-		/* ... falls through ... */
++		if (thread->event)
++			thread_event_del(thread, THREAD_FL_EPOLL_WRITE_BIT);
++		list_head_del(&thread->next);
++		break;
+ 	case THREAD_EVENT:
+ 	case THREAD_READY:
+ #ifdef USE_SIGNAL_THREADS
+@@ -1735,7 +1741,7 @@ thread_fetch_next_queue(thread_master_t *m)
+ 						      , ev->fd, ep_ev->events);
+ 					continue;
+ 				}
+-				thread_move_ready(m, &m->read, ev->read, THREAD_READY_FD);
++				thread_move_ready(m, &m->read, ev->read, THREAD_READY_READ_FD);
+ 				ev->read = NULL;
+ 			}
+ 
+@@ -1746,7 +1752,7 @@ thread_fetch_next_queue(thread_master_t *m)
+ 						      , ev->fd, ep_ev->events);
+ 					continue;
+ 				}
+-				thread_move_ready(m, &m->write, ev->write, THREAD_READY_FD);
++				thread_move_ready(m, &m->write, ev->write, THREAD_READY_WRITE_FD);
+ 				ev->write = NULL;
+ 			}
+ 		}
+@@ -1804,7 +1810,8 @@ process_threads(thread_master_t *m)
+ 		 * snmp_read, bfd_receiver, bfd pipe in vrrp/check, dbus pipe or netlink fds. */
+ 		thread = thread_trim_head(thread_list);
+ 		if (!shutting_down ||
+-		    (thread->type == THREAD_READY_FD &&
++		    ((thread->type == THREAD_READY_READ_FD ||
++		      thread->type == THREAD_READY_WRITE_FD) &&
+ 		     (thread->u.f.fd == m->timer_fd ||
+ 		      thread->u.f.fd == m->signal_fd
+ #ifdef _WITH_SNMP_
+@@ -1823,7 +1830,7 @@ process_threads(thread_master_t *m)
+ 				shutting_down = true;
+ 		}
+ 
+-		m->current_event = (thread->type == THREAD_READY_FD) ? thread->event : NULL;
++		m->current_event = (thread->type == THREAD_READY_READ_FD || thread->type == THREAD_READY_WRITE_FD) ? thread->event : NULL;
+ 		thread_type = thread->type;
+ 		thread_add_unuse(master, thread);
+ 
+diff --git a/lib/scheduler.h b/lib/scheduler.h
+index 69324fe0..fea99cd0 100644
+--- a/lib/scheduler.h
++++ b/lib/scheduler.h
+@@ -56,7 +56,8 @@ typedef enum {
+ 	THREAD_CHILD_TERMINATED,
+ 	THREAD_TERMINATE_START,
+ 	THREAD_TERMINATE,
+-	THREAD_READY_FD,
++	THREAD_READY_READ_FD,
++	THREAD_READY_WRITE_FD,
+ 	THREAD_READ_ERROR,
+ 	THREAD_WRITE_ERROR,
+ #ifdef USE_SIGNAL_THREADS
+-- 
+2.23.0
+
diff --git a/keepalived.spec b/keepalived.spec
index c1dca52..8e73f42 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.0.19
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://www.keepalived.org/
 
@@ -18,6 +18,7 @@ Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
 Source1: keepalived.service
 
 Patch0: keepalived-fix-track_process-with-pids-32767.patch
+Patch1: keepalived-fix-file-descriptor-errors-on-reload.patch
 
 Requires(post): systemd
 Requires(preun): systemd
@@ -54,6 +55,7 @@ infrastructures.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure \
@@ -103,6 +105,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived
 %{_mandir}/man8/keepalived.8*
 
 %changelog
+* Tue Nov 12 2019 Ryan O'Hara <rohara@redhat.com> - 2.0.19-4
+- Fix file descriptor errors on reload
+
 * Tue Nov 12 2019 Ryan O'Hara <rohara@redhat.com> - 2.0.19-3
 - Fix track_process with PIDs over 32767 (#1770766)
 

From af6662bda06ff09fc68198c2c12ab61a901f6582 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 29 Jan 2020 06:58:36 +0000
Subject: [PATCH 05/41] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 keepalived.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/keepalived.spec b/keepalived.spec
index 8e73f42..5480edb 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.0.19
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 URL: http://www.keepalived.org/
 
@@ -105,6 +105,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived
 %{_mandir}/man8/keepalived.8*
 
 %changelog
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.19-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Tue Nov 12 2019 Ryan O'Hara <rohara@redhat.com> - 2.0.19-4
 - Fix file descriptor errors on reload
 

From 09cfcb545fbe4d4e61de13b9e58ca5c5e8fb7cff Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Wed, 12 Feb 2020 18:35:12 -0600
Subject: [PATCH 06/41] Update to 2.0.20 (#1794135)

---
 .gitignore      | 1 +
 keepalived.spec | 7 +++++--
 sources         | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 64c0b73..7718416 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@
 /keepalived-2.0.12.tar.gz
 /keepalived-2.0.18.tar.gz
 /keepalived-2.0.19.tar.gz
+/keepalived-2.0.20.tar.gz
diff --git a/keepalived.spec b/keepalived.spec
index 5480edb..6069a14 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.0.19
-Release: 5%{?dist}
+Version: 2.0.20
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.keepalived.org/
 
@@ -105,6 +105,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived
 %{_mandir}/man8/keepalived.8*
 
 %changelog
+* Wed Feb 12 2019 Ryan O'Hara <rohara@redhat.com> - 2.0.20-1
+- Update to 2.0.20 (#1794135)
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.19-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index e7a9ff7..c4f0b3d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepalived-2.0.19.tar.gz) = 68a510983bc043484e5edbc1d87563677a048282ec52873105f0af922e8b4de5b8e7176944010f9d4d6f65d1a4ebaf930c3d37273e28c1f115ed0fda245d8109
+SHA512 (keepalived-2.0.20.tar.gz) = 36bbc4aa0a1045486e608c9f4ed73f4335b871dae88beaed10d86445474c462136885225cd6b61219a36fca2ff43771623bc6d072e406cf684acc2ca8f2a38f6

From 431b0fca307543e53c6e88582b1fdd95f673a2b9 Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Thu, 13 Feb 2020 10:31:48 -0600
Subject: [PATCH 07/41] Remove unused patches

---
 ...fix-file-descriptor-errors-on-reload.patch | 164 ------------------
 ...ed-fix-track_process-with-pids-32767.patch |  49 ------
 keepalived.spec                               |  12 +-
 3 files changed, 5 insertions(+), 220 deletions(-)
 delete mode 100644 keepalived-fix-file-descriptor-errors-on-reload.patch
 delete mode 100644 keepalived-fix-track_process-with-pids-32767.patch

diff --git a/keepalived-fix-file-descriptor-errors-on-reload.patch b/keepalived-fix-file-descriptor-errors-on-reload.patch
deleted file mode 100644
index 1530517..0000000
--- a/keepalived-fix-file-descriptor-errors-on-reload.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From 1c3c8eefd0a40d4938d6f05969c886988116a425 Mon Sep 17 00:00:00 2001
-From: Quentin Armitage <quentin@armitage.org.uk>
-Date: Wed, 6 Nov 2019 23:15:23 +0000
-Subject: [PATCH] Resolve file descriptor errors on reload
-
-If a read or write thread was on the thread reaady queue when a
-reload was processed, the file descriptor was not removed from the
-epoll instance.
-
-This commit ensures that file descriptors relating to threads on
-the thread ready queue are removed from the epoll instance during
-a reload.
-
-Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
----
- keepalived/bfd/bfd_scheduler.c   |  2 +-
- keepalived/check/check_bfd.c     |  2 +-
- keepalived/vrrp/vrrp_scheduler.c |  2 +-
- lib/scheduler.c                  | 31 +++++++++++++++++++------------
- lib/scheduler.h                  |  3 ++-
- 5 files changed, 24 insertions(+), 16 deletions(-)
-
-diff --git a/keepalived/bfd/bfd_scheduler.c b/keepalived/bfd/bfd_scheduler.c
-index 5c3d0691..d51d420f 100644
---- a/keepalived/bfd/bfd_scheduler.c
-+++ b/keepalived/bfd/bfd_scheduler.c
-@@ -908,7 +908,7 @@ bfd_receiver_thread(thread_ref_t thread)
- 	data->thread_in = NULL;
- 
- 	/* Ignore THREAD_READ_TIMEOUT */
--	if (thread->type == THREAD_READY_FD) {
-+	if (thread->type == THREAD_READY_READ_FD) {
- 		if (!bfd_receive_packet(&pkt, fd, bfd_buffer, BFD_BUFFER_SIZE))
- 			bfd_handle_packet(&pkt);
- 	}
-diff --git a/keepalived/check/check_bfd.c b/keepalived/check/check_bfd.c
-index 4bd8af23..f9590c30 100644
---- a/keepalived/check/check_bfd.c
-+++ b/keepalived/check/check_bfd.c
-@@ -290,7 +290,7 @@ bfd_check_thread(thread_ref_t thread)
- 	bfd_thread = thread_add_read(master, bfd_check_thread, NULL,
- 				     thread->u.f.fd, TIMER_NEVER, false);
- 
--	if (thread->type != THREAD_READY_FD)
-+	if (thread->type != THREAD_READY_READ_FD)
- 		return 0;
- 
- 	while (read(thread->u.f.fd, &evt, sizeof(bfd_event_t)) != -1)
-diff --git a/keepalived/vrrp/vrrp_scheduler.c b/keepalived/vrrp/vrrp_scheduler.c
-index 91a4898c..7e6da60a 100644
---- a/keepalived/vrrp/vrrp_scheduler.c
-+++ b/keepalived/vrrp/vrrp_scheduler.c
-@@ -762,7 +762,7 @@ vrrp_bfd_thread(thread_ref_t thread)
- 	bfd_thread = thread_add_read(master, vrrp_bfd_thread, NULL,
- 				     thread->u.f.fd, TIMER_NEVER, false);
- 
--	if (thread->type != THREAD_READY_FD)
-+	if (thread->type != THREAD_READY_READ_FD)
- 		return 0;
- 
- 	while (read(thread->u.f.fd, &evt, sizeof(bfd_event_t)) != -1)
-diff --git a/lib/scheduler.c b/lib/scheduler.c
-index 8fc2a032..3cd7b65a 100644
---- a/lib/scheduler.c
-+++ b/lib/scheduler.c
-@@ -116,7 +116,8 @@ get_thread_type_str(thread_type_t id)
- 	if (id == THREAD_CHILD_TERMINATED) return "CHILD_TERMINATED";
- 	if (id == THREAD_TERMINATE_START) return "TERMINATE_START";
- 	if (id == THREAD_TERMINATE) return "TERMINATE";
--	if (id == THREAD_READY_FD) return "READY_FD";
-+	if (id == THREAD_READY_READ_FD) return "READY_READ_FD";
-+	if (id == THREAD_READY_WRITE_FD) return "READY_WRITE_FD";
- 	if (id == THREAD_READ_ERROR) return "READ_ERROR";
- 	if (id == THREAD_WRITE_ERROR) return "WRITE_ERROR";
- #ifdef USE_SIGNAL_THREADS
-@@ -859,7 +860,8 @@ thread_destroy_rb(thread_master_t *m, rb_root_cached_t *root)
- 
- 		if (thread->type == THREAD_READ ||
- 		    thread->type == THREAD_WRITE ||
--		    thread->type == THREAD_READY_FD ||
-+		    thread->type == THREAD_READY_READ_FD ||
-+		    thread->type == THREAD_READY_WRITE_FD ||
- 		    thread->type == THREAD_READ_TIMEOUT ||
- 		    thread->type == THREAD_WRITE_TIMEOUT ||
- 		    thread->type == THREAD_READ_ERROR ||
-@@ -1409,14 +1411,18 @@ thread_cancel(thread_ref_t thread_cp)
- 		rb_erase_cached(&thread->n, &m->child);
- 		rb_erase(&thread->rb_data, &m->child_pid);
- 		break;
--	case THREAD_READY_FD:
-+	case THREAD_READY_READ_FD:
- 	case THREAD_READ_TIMEOUT:
-+		if (thread->event)
-+			thread_event_del(thread, THREAD_FL_EPOLL_READ_BIT);
-+		list_head_del(&thread->next);
-+		break;
-+	case THREAD_READY_WRITE_FD:
- 	case THREAD_WRITE_TIMEOUT:
--		if (thread->event) {
--			rb_erase(&thread->event->n, &m->io_events);
--			FREE(thread->event);
--		}
--		/* ... falls through ... */
-+		if (thread->event)
-+			thread_event_del(thread, THREAD_FL_EPOLL_WRITE_BIT);
-+		list_head_del(&thread->next);
-+		break;
- 	case THREAD_EVENT:
- 	case THREAD_READY:
- #ifdef USE_SIGNAL_THREADS
-@@ -1735,7 +1741,7 @@ thread_fetch_next_queue(thread_master_t *m)
- 						      , ev->fd, ep_ev->events);
- 					continue;
- 				}
--				thread_move_ready(m, &m->read, ev->read, THREAD_READY_FD);
-+				thread_move_ready(m, &m->read, ev->read, THREAD_READY_READ_FD);
- 				ev->read = NULL;
- 			}
- 
-@@ -1746,7 +1752,7 @@ thread_fetch_next_queue(thread_master_t *m)
- 						      , ev->fd, ep_ev->events);
- 					continue;
- 				}
--				thread_move_ready(m, &m->write, ev->write, THREAD_READY_FD);
-+				thread_move_ready(m, &m->write, ev->write, THREAD_READY_WRITE_FD);
- 				ev->write = NULL;
- 			}
- 		}
-@@ -1804,7 +1810,8 @@ process_threads(thread_master_t *m)
- 		 * snmp_read, bfd_receiver, bfd pipe in vrrp/check, dbus pipe or netlink fds. */
- 		thread = thread_trim_head(thread_list);
- 		if (!shutting_down ||
--		    (thread->type == THREAD_READY_FD &&
-+		    ((thread->type == THREAD_READY_READ_FD ||
-+		      thread->type == THREAD_READY_WRITE_FD) &&
- 		     (thread->u.f.fd == m->timer_fd ||
- 		      thread->u.f.fd == m->signal_fd
- #ifdef _WITH_SNMP_
-@@ -1823,7 +1830,7 @@ process_threads(thread_master_t *m)
- 				shutting_down = true;
- 		}
- 
--		m->current_event = (thread->type == THREAD_READY_FD) ? thread->event : NULL;
-+		m->current_event = (thread->type == THREAD_READY_READ_FD || thread->type == THREAD_READY_WRITE_FD) ? thread->event : NULL;
- 		thread_type = thread->type;
- 		thread_add_unuse(master, thread);
- 
-diff --git a/lib/scheduler.h b/lib/scheduler.h
-index 69324fe0..fea99cd0 100644
---- a/lib/scheduler.h
-+++ b/lib/scheduler.h
-@@ -56,7 +56,8 @@ typedef enum {
- 	THREAD_CHILD_TERMINATED,
- 	THREAD_TERMINATE_START,
- 	THREAD_TERMINATE,
--	THREAD_READY_FD,
-+	THREAD_READY_READ_FD,
-+	THREAD_READY_WRITE_FD,
- 	THREAD_READ_ERROR,
- 	THREAD_WRITE_ERROR,
- #ifdef USE_SIGNAL_THREADS
--- 
-2.23.0
-
diff --git a/keepalived-fix-track_process-with-pids-32767.patch b/keepalived-fix-track_process-with-pids-32767.patch
deleted file mode 100644
index 35b7025..0000000
--- a/keepalived-fix-track_process-with-pids-32767.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 23a5b8113bf0b8ec4718443df0406882e8e4d831 Mon Sep 17 00:00:00 2001
-From: Quentin Armitage <quentin@armitage.org.uk>
-Date: Sat, 9 Nov 2019 10:07:48 +0000
-Subject: [PATCH] Fix track_process with PIDs > 32767
-
-Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
----
- keepalived/core/track_process.c | 4 ++--
- lib/scheduler.c                 | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/keepalived/core/track_process.c b/keepalived/core/track_process.c
-index 550254b1..76ff6009 100644
---- a/keepalived/core/track_process.c
-+++ b/keepalived/core/track_process.c
-@@ -341,7 +341,7 @@ check_process(pid_t pid, char *comm, tracked_process_instance_t *tpi)
- 	 * swapped in to read it. */
- 	if (!have_comm) {
- 		if (vrrp_data->vrrp_use_process_cmdline) {
--			snprintf(cmdline, sizeof(cmdline), "/proc/%hd/cmdline", pid);
-+			snprintf(cmdline, sizeof(cmdline), "/proc/%d/cmdline", pid);
- 
- 			if ((fd = open(cmdline, O_RDONLY)) == -1)
- 				return;
-@@ -358,7 +358,7 @@ check_process(pid_t pid, char *comm, tracked_process_instance_t *tpi)
- 		}
- 
- 		if (vrrp_data->vrrp_use_process_comm) {
--			snprintf(cmdline, sizeof(cmdline), "/proc/%hd/comm", pid);
-+			snprintf(cmdline, sizeof(cmdline), "/proc/%d/comm", pid);
- 
- 			fd = open(cmdline, O_RDONLY);
- 			if (fd == -1) {
-diff --git a/lib/scheduler.c b/lib/scheduler.c
-index 3cd7b65a..de92c7d4 100644
---- a/lib/scheduler.c
-+++ b/lib/scheduler.c
-@@ -441,7 +441,7 @@ report_child_status(int status, pid_t pid, char const *prog_name)
- 		prog_id = child_finder_name(pid);
- 
- 	if (!prog_id) {
--		snprintf(pid_buf, sizeof(pid_buf), "pid %hd", pid);
-+		snprintf(pid_buf, sizeof(pid_buf), "pid %d", pid);
- 		prog_id = pid_buf;
- 	}
- 
--- 
-2.23.0
-
diff --git a/keepalived.spec b/keepalived.spec
index 6069a14..3925e7f 100644
--- a/keepalived.spec
+++ b/keepalived.spec
@@ -10,16 +10,13 @@
 Name: keepalived
 Summary: High Availability monitor built upon LVS, VRRP and service pollers
 Version: 2.0.20
-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
 
-Patch0: keepalived-fix-track_process-with-pids-32767.patch
-Patch1: keepalived-fix-file-descriptor-errors-on-reload.patch
-
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
@@ -54,8 +51,6 @@ infrastructures.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure \
@@ -105,7 +100,10 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived
 %{_mandir}/man8/keepalived.8*
 
 %changelog
-* Wed Feb 12 2019 Ryan O'Hara <rohara@redhat.com> - 2.0.20-1
+* Thu Feb 13 2020 Ryan O'Hara <rohara@redhat.com> - 2.0.20-2
+- Remove unused patches
+
+* Wed Feb 12 2020 Ryan O'Hara <rohara@redhat.com> - 2.0.20-1
 - Update to 2.0.20 (#1794135)
 
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.19-5

From 2bce22461137d744df40d135afa438f801bac88f Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Tue, 18 Feb 2020 16:01:10 -0600
Subject: [PATCH 08/41] Build with nftables support instead of iptables

---
 keepalived.spec | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/keepalived.spec b/keepalived.spec
index 3925e7f..5839924 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.0.20
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://www.keepalived.org/
 
@@ -25,14 +25,16 @@ Requires(postun): systemd
 BuildRequires: net-snmp-devel
 %endif
 %if %{with nftables}
+BuildRequires: libmnl-devel
 BuildRequires: libnftnl-devel
+%else
+BuildRequires: ipset-devel
+BuildRequires: iptables-devel
 %endif
 BuildRequires: gcc
 BuildRequires: systemd-units
 BuildRequires: openssl-devel
 BuildRequires: libnl3-devel
-BuildRequires: ipset-devel
-BuildRequires: iptables-devel
 BuildRequires: libnfnetlink-devel
 
 %description
@@ -58,7 +60,7 @@ infrastructures.
     %{?with_profile:--enable-profile} \
     %{!?with_vrrp:--disable-vrrp} \
     %{?with_snmp:--enable-snmp --enable-snmp-rfc} \
-    %{?with_nftables:--enable-nftables} \
+    %{?with_nftables:--enable-nftables --disable-iptables --disable-ipset} \
     %{?with_sha1:--enable-sha1} \
     --with-init=systemd
 %{__make} %{?_smp_mflags} STRIP=/bin/true
@@ -100,6 +102,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived
 %{_mandir}/man8/keepalived.8*
 
 %changelog
+* Tue Feb 18 2020 Ryan O'Hara <rohara@redhat.com> - 2.0.20-3
+- Build with nftables support instead of iptables
+
 * Thu Feb 13 2020 Ryan O'Hara <rohara@redhat.com> - 2.0.20-2
 - Remove unused patches
 

From 81079d0e6c5845230f45d6237b8a161efd017c52 Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Wed, 15 Jul 2020 10:46:06 -0500
Subject: [PATCH 09/41] Update to 2.1.5 (#1794135)

---
 .gitignore      | 1 +
 keepalived.spec | 7 +++++--
 sources         | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7718416..2c78dfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@
 /keepalived-2.0.18.tar.gz
 /keepalived-2.0.19.tar.gz
 /keepalived-2.0.20.tar.gz
+/keepalived-2.1.5.tar.gz
diff --git a/keepalived.spec b/keepalived.spec
index 5839924..8613a98 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.0.20
-Release: 3%{?dist}
+Version: 2.1.5
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.keepalived.org/
 
@@ -102,6 +102,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived
 %{_mandir}/man8/keepalived.8*
 
 %changelog
+* Wed Jul 15 2020 Ryan O'Hara <rohara@redhat.com> - 2.1.5-1
+- Update to 2.1.5 (#1794135)
+
 * Tue Feb 18 2020 Ryan O'Hara <rohara@redhat.com> - 2.0.20-3
 - Build with nftables support instead of iptables
 
diff --git a/sources b/sources
index c4f0b3d..3486f36 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepalived-2.0.20.tar.gz) = 36bbc4aa0a1045486e608c9f4ed73f4335b871dae88beaed10d86445474c462136885225cd6b61219a36fca2ff43771623bc6d072e406cf684acc2ca8f2a38f6
+SHA512 (keepalived-2.1.5.tar.gz) = 107d071aa1546023a3eb7c2cba4707ab6fbb10af62984ab41c9358b5e28289f8f277456983fe8649a15a77939734d3af573b8b050500d9eb521b4b0537f97aa6

From 8c86bb36180e030d2865cab597c2048dfb9d4f8f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 28 Jul 2020 02:59:20 +0000
Subject: [PATCH 10/41] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 keepalived.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/keepalived.spec b/keepalived.spec
index 8613a98..5393a58 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.1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://www.keepalived.org/
 
@@ -102,6 +102,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived
 %{_mandir}/man8/keepalived.8*
 
 %changelog
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Wed Jul 15 2020 Ryan O'Hara <rohara@redhat.com> - 2.1.5-1
 - Update to 2.1.5 (#1794135)
 

From ff693becfeb1037ad1f9d39eceea78eda6c5ffc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20=C5=98=C3=ADdk=C3=BD?= <jridky@redhat.com>
Date: Thu, 27 Aug 2020 14:13:48 +0200
Subject: [PATCH 11/41] Rebuilt for new net-snmp release

---
 keepalived.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/keepalived.spec b/keepalived.spec
index 5393a58..a6d0d3c 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.1.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://www.keepalived.org/
 
@@ -102,6 +102,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived
 %{_mandir}/man8/keepalived.8*
 
 %changelog
+* Thu Aug 27 2020 Josef Řídký <jridky@redhat.com> - 2.1.5-3
+- Rebuilt for new net-snmp release
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From aa67a09473a788891a9f4416182992f99ae9d347 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Mon, 4 Jan 2021 22:38:36 +0000
Subject: [PATCH 12/41] Add BuildRequires: make

https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
---
 keepalived.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/keepalived.spec b/keepalived.spec
index a6d0d3c..27ab28b 100644
--- a/keepalived.spec
+++ b/keepalived.spec
@@ -36,6 +36,7 @@ BuildRequires: systemd-units
 BuildRequires: openssl-devel
 BuildRequires: libnl3-devel
 BuildRequires: libnfnetlink-devel
+BuildRequires: make
 
 %description
 Keepalived provides simple and robust facilities for load balancing

From ab73f75b7a89b8f0304e0f10ead4c271d6bf2496 Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Thu, 14 Jan 2021 13:07:21 -0600
Subject: [PATCH 13/41] Update to 2.2.0 (#1914512)

---
 .gitignore      | 1 +
 keepalived.spec | 7 +++++--
 sources         | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2c78dfb..1c614ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
 /keepalived-2.0.19.tar.gz
 /keepalived-2.0.20.tar.gz
 /keepalived-2.1.5.tar.gz
+/keepalived-2.2.0.tar.gz
diff --git a/keepalived.spec b/keepalived.spec
index 27ab28b..55537f7 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.1.5
-Release: 3%{?dist}
+Version: 2.2.0
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.keepalived.org/
 
@@ -103,6 +103,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived
 %{_mandir}/man8/keepalived.8*
 
 %changelog
+* Thu Jan 14 2021 Ryan O'Hara <rohara@redhat.com> - 2.2.0-1
+- Update to 2.2.0 (#1914512)
+
 * Thu Aug 27 2020 Josef Řídký <jridky@redhat.com> - 2.1.5-3
 - Rebuilt for new net-snmp release
 
diff --git a/sources b/sources
index 3486f36..f388362 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepalived-2.1.5.tar.gz) = 107d071aa1546023a3eb7c2cba4707ab6fbb10af62984ab41c9358b5e28289f8f277456983fe8649a15a77939734d3af573b8b050500d9eb521b4b0537f97aa6
+SHA512 (keepalived-2.2.0.tar.gz) = f93d29f34ab5a8b0e7d9c9e8ce23f978f27d200dbecffe04d236bd05a2afeabc94569d5b53399e7cdd358f9e794b5d37bc476ce8ec1adb1942017c35434064f9

From d5123177642a10fb6f4e11a707f889710370c7f9 Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Mon, 18 Jan 2021 10:13:49 -0600
Subject: [PATCH 14/41] Update to 2.2.1 (#1917152)

---
 .gitignore      | 1 +
 keepalived.spec | 5 ++++-
 sources         | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1c614ea..75a2df5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@
 /keepalived-2.0.20.tar.gz
 /keepalived-2.1.5.tar.gz
 /keepalived-2.2.0.tar.gz
+/keepalived-2.2.1.tar.gz
diff --git a/keepalived.spec b/keepalived.spec
index 55537f7..45847a8 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.0
+Version: 2.2.1
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.keepalived.org/
@@ -103,6 +103,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived
 %{_mandir}/man8/keepalived.8*
 
 %changelog
+* Mon Jan 18 2021 Ryan O'Hara <rohara@redhat.com> - 2.2.1-1
+- Update to 2.2.1 (#1917152)
+
 * Thu Jan 14 2021 Ryan O'Hara <rohara@redhat.com> - 2.2.0-1
 - Update to 2.2.0 (#1914512)
 
diff --git a/sources b/sources
index f388362..25ef34b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepalived-2.2.0.tar.gz) = f93d29f34ab5a8b0e7d9c9e8ce23f978f27d200dbecffe04d236bd05a2afeabc94569d5b53399e7cdd358f9e794b5d37bc476ce8ec1adb1942017c35434064f9
+SHA512 (keepalived-2.2.1.tar.gz) = 721ac77e641ba53b23b65d278002a7af639c17741405d6bce4fc5f9f069a7f84d2dcae8bf8d08c517326373c113424efdb522cfb31638d23e4ad6c261252ea3c

From 2e6a5516c93376a0dead0d03815e29123e88c2d6 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 26 Jan 2021 15:26:47 +0000
Subject: [PATCH 15/41] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 keepalived.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/keepalived.spec b/keepalived.spec
index 45847a8..76d61a4 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: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://www.keepalived.org/
 
@@ -103,6 +103,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived
 %{_mandir}/man8/keepalived.8*
 
 %changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Mon Jan 18 2021 Ryan O'Hara <rohara@redhat.com> - 2.2.1-1
 - Update to 2.2.1 (#1917152)
 

From 6a3a16a4ee5f69865a61a9e14873e54142b3d403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 2 Mar 2021 16:13:34 +0100
Subject: [PATCH 16/41] 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 <zbyszek@in.waw.pl> - 2.2.1-3
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 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 <rohara@redhat.com>
Date: Wed, 7 Apr 2021 08:22:41 -0500
Subject: [PATCH 17/41] 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 <rohara@redhat.com> - 2.2.2-1
+- Update to 2.2.2 (#1935590)
+
 * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 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 950a4aec8ba4307343fec3fa8dbedfe80a919d50 Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Mon, 12 Apr 2021 11:58:48 -0500
Subject: [PATCH 18/41] 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 <rohara@redhat.com> - 2.2.2-2
+- Add BuildRequires for file-devel
+
 * Wed Apr 07 2021 Ryan O'Hara <rohara@redhat.com> - 2.2.2-1
 - Update to 2.2.2 (#1935590)
 

From ece94fbbeafba7329c49b958e185002789418df7 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 22 Jul 2021 09:41:04 +0000
Subject: [PATCH 19/41] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 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 <releng@fedoraproject.org> - 2.2.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Mon Apr 12 2021 Ryan O'Hara <rohara@redhat.com> - 2.2.2-2
 - Add BuildRequires for file-devel
 

From 68fd833be94b94f7381225021ab628db55ed8459 Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Tue, 3 Aug 2021 12:48:52 -0500
Subject: [PATCH 20/41] 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 <rohara@redhat.com>
+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 <errno.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <netinet/in.h>
++#include <net/if.h>
+ #include <linux/icmp.h>
+ #include <linux/icmpv6.h>
+ #ifdef ERRQUEUE_NEEDS_SYS_TIME
+ #include <sys/time.h>
+ #endif
+ #include <linux/errqueue.h>
+-#include <netinet/in.h>
+ 
+ #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 <rohara@redhat.com> - 2.2.2-4
+- Fix build errors (#1987620)
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 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 <rohara@redhat.com>
Date: Tue, 3 Aug 2021 13:25:59 -0500
Subject: [PATCH 21/41] 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 <rohara@redhat.com> - 2.2.2-5
+- Add systemd notify support
+
 * Tue Aug 03 2021 Ryan O'Hara <rohara@redhat.com> - 2.2.2-4
 - Fix build errors (#1987620)
 

From 2d246f0caabac6a0da49bf3c1bf72d2e663f7793 Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Sat, 14 Aug 2021 16:33:10 -0500
Subject: [PATCH 22/41] 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 <rohara@redhat.com>
-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 <errno.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#include <netinet/in.h>
-+#include <net/if.h>
- #include <linux/icmp.h>
- #include <linux/icmpv6.h>
- #ifdef ERRQUEUE_NEEDS_SYS_TIME
- #include <sys/time.h>
- #endif
- #include <linux/errqueue.h>
--#include <netinet/in.h>
- 
- #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 <rohara@redhat.com> - 2.2.3-1
+- Update to 2.2.3 (#1993601)
+
 * Tue Aug 03 2021 Ryan O'Hara <rohara@redhat.com> - 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 <rohara@redhat.com>
Date: Mon, 23 Aug 2021 09:14:11 -0500
Subject: [PATCH 23/41] 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 <rohara@redhat.com> - 2.2.4-1
+- Update to 2.2.4 (#1996274)
+
 * Sat Aug 14 2021 Ryan O'Hara <rohara@redhat.com> - 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 <sahana@redhat.com>
Date: Tue, 14 Sep 2021 19:05:11 +0200
Subject: [PATCH 24/41] 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 <sahana@redhat.com> - 2.2.4-2
+- Rebuilt with OpenSSL 3.0.0
+
 * Mon Aug 23 2021 Ryan O'Hara <rohara@redhat.com> - 2.2.4-1
 - Update to 2.2.4 (#1996274)
 

From 1a50e5dce8999b6fb9595cab3f4b7f09d2406c79 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Sun, 28 Nov 2021 12:15:41 -0800
Subject: [PATCH 25/41] 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 <kevin@scrye.com> - 2.2.4-3
+- Rebuild for new libnftnl
+
 * Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 2.2.4-2
 - Rebuilt with OpenSSL 3.0.0
 

From 47102d40dfc76491abd905d041d1807639638be2 Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Tue, 14 Dec 2021 10:13:13 -0600
Subject: [PATCH 26/41] 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 <vincent@bernat.ch>
+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 <vincent@bernat.ch>
+---
+ 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">
+ <busconfig>
+ 	<policy user="root">
+-		<allow own="org.keepalived.Vrrp1"/>
+-		<allow send_destination="org.keepalived.Vrrp1"/>
++		<allow own="org.keepalived.Vrrp1" />
++		<allow send_destination="org.keepalived.Vrrp1" />
+ 	</policy>
+ 	<policy context="default">
+-		<allow send_interface="org.freedesktop.DBus.Introspectable" />
+-		<allow send_interface="org.freedesktop.DBus.Peer" />
+-		<allow send_interface="org.freedesktop.DBus.Properties" />
++		<allow send_destination="org.keepalived.Vrrp1"
++		       send_interface="org.freedesktop.DBus.Introspectable" />
++		<allow send_destination="org.keepalived.Vrrp1"
++		       send_interface="org.freedesktop.DBus.Peer" />
++		<allow send_destination="org.keepalived.Vrrp1"
++		       send_interface="org.freedesktop.DBus.Properties" />
+ 	</policy>
+ </busconfig>
+-- 
+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 <rohara@redhat.com> - 2.2.4-4
+- Fix dbus policy (#2027158, CVE-2021-44225)
+
 * Sat Nov 27 2021 Kevin Fenzi <kevin@scrye.com> - 2.2.4-3
 - Rebuild for new libnftnl
 

From 6f08ad609296011fcb6d7c5d91222512a60c26d7 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 20 Jan 2022 14:24:44 +0000
Subject: [PATCH 27/41] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 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 <releng@fedoraproject.org> - 2.2.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Tue Dec 14 2021 Ryan O'Hara <rohara@redhat.com> - 2.2.4-4
 - Fix dbus policy (#2027158, CVE-2021-44225)
 

From 10c982818243172f3b90d4af6bebe99c98174860 Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Mon, 14 Feb 2022 13:07:46 -0600
Subject: [PATCH 28/41] 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 <vincent@bernat.ch>
-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 <vincent@bernat.ch>
----
- 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">
- <busconfig>
- 	<policy user="root">
--		<allow own="org.keepalived.Vrrp1"/>
--		<allow send_destination="org.keepalived.Vrrp1"/>
-+		<allow own="org.keepalived.Vrrp1" />
-+		<allow send_destination="org.keepalived.Vrrp1" />
- 	</policy>
- 	<policy context="default">
--		<allow send_interface="org.freedesktop.DBus.Introspectable" />
--		<allow send_interface="org.freedesktop.DBus.Peer" />
--		<allow send_interface="org.freedesktop.DBus.Properties" />
-+		<allow send_destination="org.keepalived.Vrrp1"
-+		       send_interface="org.freedesktop.DBus.Introspectable" />
-+		<allow send_destination="org.keepalived.Vrrp1"
-+		       send_interface="org.freedesktop.DBus.Peer" />
-+		<allow send_destination="org.keepalived.Vrrp1"
-+		       send_interface="org.freedesktop.DBus.Properties" />
- 	</policy>
- </busconfig>
--- 
-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 <rohara@redhat.com> - 2.2.7-1
+- Update to 2.2.7 (#2041231)
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 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 <rohara@redhat.com>
Date: Thu, 7 Jul 2022 09:21:11 -0500
Subject: [PATCH 29/41] 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 <rohara@redhat.com> - 2.2.7-2
+- Move keepalived.conf.sample to keepalived.conf
+
 * Mon Feb 14 2022 Ryan O'Hara <rohara@redhat.com> - 2.2.7-1
 - Update to 2.2.7 (#2041231)
 

From ef21173d930a7c52bd65cec63c794ede08c2f1d0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 21 Jul 2022 15:51:41 +0000
Subject: [PATCH 30/41] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 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 <releng@fedoraproject.org> - 2.2.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Thu Jul 07 2022 Ryan O'Hara <rohara@redhat.com> - 2.2.7-2
 - Move keepalived.conf.sample to keepalived.conf
 

From c78adb070ca5926239e1e959da934e8c5627e3df Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Wed, 7 Dec 2022 13:23:17 +0100
Subject: [PATCH 31/41] Fix spurious implicit function declaration in broken
 configure check

Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
---
 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 <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;
+ 	}
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 <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
 

From 532118f86c7096d875ec411519e585865bce82a7 Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Tue, 20 Dec 2022 18:14:59 -0600
Subject: [PATCH 32/41] 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 <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
 

From de115a1372cd7d7a3e5173a0e4f7147ad23cb8df Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 19 Jan 2023 14:21:30 +0000
Subject: [PATCH 33/41] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 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 <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
 

From 780ef6446b07a9271d6b71c5730626baec512e03 Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Thu, 8 Jun 2023 18:00:01 -0500
Subject: [PATCH 34/41] 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 <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
 
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 <releng@fedoraproject.org>
Date: Thu, 20 Jul 2023 08:41:22 +0000
Subject: [PATCH 35/41] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 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 <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)
 

From df0ff14d28dd89b4d19d8d58696f5db0900f6eae Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Fri, 4 Aug 2023 11:24:33 -0500
Subject: [PATCH 36/41] 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 <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
 

From 92bd098510522b0fc04f4f7870738c1f78ab6894 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 21 Jan 2024 00:14:23 +0000
Subject: [PATCH 37/41] 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 <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
 

From 4151e48314acdf270dbc0e48b93bd204c5a8c3ef Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 24 Jan 2024 23:54:28 +0000
Subject: [PATCH 38/41] 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 <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
 

From f65880bc11a1a6c9fc64cc7793768fecacc1a774 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 18 Jul 2024 11:38:15 +0000
Subject: [PATCH 39/41] 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 <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
 

From 07efe939867a2a58a5b5ea8deb0666f87e7e2bd5 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 17 Jan 2025 08:36:42 +0000
Subject: [PATCH 40/41] 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 <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
 

From f2489fa190b0efca5bd8aac2c15822346370bfd0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 24 Jul 2025 18:22:50 +0000
Subject: [PATCH 41/41] 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 <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