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] 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