Accepting request 907505 from network

- add 1915.patch to fix build on tumbleweed

OBS-URL: https://build.opensuse.org/request/show/907505
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/keepalived?expand=0&rev=36

1915.patch

@@ -0,0 +1,30 @@
+From 3fd0c21e4f63ac0a52b5d7a09575f0f364972e4d Mon Sep 17 00:00:00 2001
+From: Quentin Armitage <quentin@armitage.org.uk>
+Date: Tue, 8 Jun 2021 08:57:45 +0100
+Subject: [PATCH] core: Fix compiling on RHEL 9
+
+Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
+---
+ 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 d2cc971a3..fdca04913 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"

keepalived.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jul 21 12:03:14 UTC 2021 - Dirk Müller <dmueller@suse.com>
+
+- add 1915.patch to fix build on tumbleweed
+
 -------------------------------------------------------------------
 Mon Mar  8 17:44:29 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>
 

keepalived.spec

@@ -52,6 +52,8 @@ URL:            http://www.keepalived.org/
 Source:         http://www.keepalived.org/software/%{name}-%{version}.tar.gz
 Source2:        keepalive-rpmlintrc
 Patch1:         keepalive-init.patch
+# PATCH-FIX-UPSTREAM: https://github.com/acassen/keepalived/pull/1915
+Patch2:         1915.patch
 BuildRequires:  file-devel
 BuildRequires:  net-snmp-devel
 BuildRequires:  pkgconfig
@@ -100,6 +102,7 @@ resilient infrastructures.
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 chmod 644 doc/samples/*
 
 %build