Accepting request 877819 from network

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

keepalived.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Mon Mar  8 17:44:29 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>
+
+- drop linux-4.15.patch: No longer needed as it was a backport from
+  upstream
+- Cleanup configure options after consultation with upstream:
+  - --enable-regex-timers is for debugging purposes
+  - --enable-snmp-checker and --enable-snmp-vrrp are enabled by
+    --enable-snmp
+  - --enable-snmp-rfcv2 and --enable-snmp-rfcv3 anre enabled by
+    --enable-snmp-rfc
+  - --enable-stacktrace is definitely a debugging option
+- on systems where we have nftables support we will only ship with
+  nftables support (>= 15.0) and use iptables support only on older
+  distributions.
+
 -------------------------------------------------------------------
 Sun Mar  7 00:34:36 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>
 

keepalived.spec

@@ -52,8 +52,6 @@ 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/commit/947248af144bcab6376ccddab8dc40f313b14281.patch
-Patch2:         linux-4.15.patch
 BuildRequires:  file-devel
 BuildRequires:  net-snmp-devel
 BuildRequires:  pkgconfig
@@ -102,7 +100,6 @@ resilient infrastructures.
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p0
 chmod 644 doc/samples/*
 
 %build
@@ -118,20 +115,19 @@ export CFLAGS="%optflags -DOPENSSL_NO_SSL_INTERN"
   --enable-json \
   %endif
   --enable-snmp \
-  --enable-snmp-checker \
-  --enable-snmp-vrrp \
   --enable-snmp-rfc \
-  --enable-snmp-rfcv2 \
-  --enable-snmp-rfcv3 \
   %if %{with dbus}
   --enable-dbus \
   %endif
   %if %{with keepalived_regex}
   --enable-regex \
-  --enable-regex-timers \
   %endif
   %if %{with keepalived_nftables}
   --enable-nftables \
+  --disable-iptables \
+  %else
+  --enable-iptables \
+  --enable-libipset \
   %endif
   %if %{with systemd}
   --enable-systemd \
@@ -145,14 +141,11 @@ export CFLAGS="%optflags -DOPENSSL_NO_SSL_INTERN"
   --enable-hardening \
   --enable-log-file \
   --enable-routes \
-  --enable-iptables \
   --disable-dynamic-linking \
   --disable-libiptc-dynamic \
   --disable-libipset-dynamic \
   --disable-libnl-dynamic \
-  --enable-libipset \
   --enable-libnl \
-  --enable-stacktrace \
   --enable-json
 make %{?_smp_mflags}
 

linux-4.15.patch

@@ -1,68 +0,0 @@
-From 947248af144bcab6376ccddab8dc40f313b14281 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Fri, 9 Feb 2018 11:55:19 +0200
-Subject: [PATCH] Fix build with Linux kernel headers v4.15
-
-Linux kernel version 4.15 changed the libc/kernel headers suppression
-logic in a way that introduces collisions:
-
-In file included from ./../include/vrrp_ipaddress.h:32:0,
-                 from ./../include/vrrp_arp.h:31,
-                 from vrrp.c:29:
-/home/peko/autobuild/instance-1/output/host/arc-buildroot-linux-uclibc/sysroot/usr/include/linux/in.h:29:3: error: redeclaration of enumerator 'IPPROTO_IP'
-   IPPROTO_IP = 0,  /* Dummy protocol for TCP  */
-   ^
-/home/peko/autobuild/instance-1/output/host/arc-buildroot-linux-uclibc/sysroot/usr/include/netinet/in.h:33:5: note: previous definition of 'IPPROTO_IP' was here
-     IPPROTO_IP = 0,    /* Dummy protocol for TCP.  */
-     ^~~~~~~~~~
-
-Include the libc netinet/in.h header first to suppress the kernel
-header.
-
-In addition, add _GNU_SOURCE to vrrp.c for the libc provided in6_pktinfo
-definition.
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
- keepalived/include/vrrp_arp.h | 1 +
- keepalived/vrrp/vrrp.c        | 1 +
- 2 files changed, 2 insertions(+)
-
-Index: keepalived/include/vrrp_arp.h
-===================================================================
---- keepalived/include/vrrp_arp.h.orig
-+++ keepalived/include/vrrp_arp.h
-@@ -24,6 +24,7 @@
- #define _VRRP_ARP_H
- 
- /* system includes */
-+#include <netinet/in.h>
- #include <sys/types.h>
- #include <linux/if_infiniband.h>
- 
-Index: keepalived/vrrp/vrrp.c
-===================================================================
---- keepalived/vrrp/vrrp.c.orig
-+++ keepalived/vrrp/vrrp.c
-@@ -44,6 +44,7 @@
- #endif
- 
- /* local include */
-+#define _GNU_SOURCE
- #include "parser.h"
- 
- #include "vrrp_arp.h"
-Index: keepalived/include/vrrp_if.h
-===================================================================
---- keepalived/include/vrrp_if.h.orig
-+++ keepalived/include/vrrp_if.h
-@@ -33,9 +33,7 @@
- #include <sys/types.h>
- #include <net/if.h>
- #include <stdio.h>
--#ifdef _HAVE_NET_LINUX_IF_H_COLLISION_
- #define _LINUX_IF_H
--#endif
- #include <linux/netdevice.h>
- #ifdef _HAVE_VRRP_VMAC_
- #include <linux/if_link.h>