Fix build errors (#1987620)

This commit is contained in:
Ryan O'Hara 2021-08-03 12:48:52 -05:00
parent ece94fbbea
commit 68fd833be9
2 changed files with 39 additions and 1 deletions

View File

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

View File

@ -10,13 +10,15 @@
Name: keepalived Name: keepalived
Summary: High Availability monitor built upon LVS, VRRP and service pollers Summary: High Availability monitor built upon LVS, VRRP and service pollers
Version: 2.2.2 Version: 2.2.2
Release: 3%{?dist} Release: 4%{?dist}
License: GPLv2+ License: GPLv2+
URL: http://www.keepalived.org/ URL: http://www.keepalived.org/
Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
Source1: keepalived.service Source1: keepalived.service
Patch1: bz1987620-fix-build-errors.patch
Requires(post): systemd Requires(post): systemd
Requires(preun): systemd Requires(preun): systemd
Requires(postun): systemd Requires(postun): systemd
@ -55,6 +57,7 @@ infrastructures.
%prep %prep
%setup -q %setup -q
%patch1 -p1
%build %build
%configure \ %configure \
@ -104,6 +107,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived
%{_mandir}/man8/keepalived.8* %{_mandir}/man8/keepalived.8*
%changelog %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 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild