Accepting request 717976 from home:computersalat:devel:network

Update to 2.0.17

OBS-URL: https://build.opensuse.org/request/show/717976
OBS-URL: https://build.opensuse.org/package/show/network/keepalived?expand=0&rev=58

keepalived-2.0.15.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:933ee01bc6346aa573453b998f87510d3cce4aba4537c9642b24e6dbfba5c6f4
-size 972461

keepalived-2.0.17.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8965ffa2ffe243014f9c0245daa65f00a9930cf746edf33525d28a86f97497b4
+size 1003077

keepalived.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Jul 23 17:30:04 UTC 2019 - chris@computersalat.de
+
+- Update to 2.0.17 (2019-06-25)
+  * https://www.keepalived.org/changelog.html 
+- remove obsolete patch
+  * systemd-after-snmp.patch
+- rebase patch
+  * linux-4.15.patch
+
 -------------------------------------------------------------------
 Tue Apr 16 19:04:13 UTC 2019 - Marcus Rueckert <mrueckert@suse.de>
 

keepalived.spec

@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -43,7 +43,7 @@
 %bcond_without json
 
 Name:           keepalived
-Version:        2.0.15
+Version:        2.0.17
 Release:        0
 Summary:        A keepalive facility for Linux
 License:        GPL-2.0-or-later
@@ -54,7 +54,6 @@ Source2:        keepalive-rpmlintrc
 Patch1:         keepalive-init.patch
 # PATCH-FIX-UPSTREAM: https://github.com/acassen/keepalived/commit/947248af144bcab6376ccddab8dc40f313b14281.patch
 Patch2:         linux-4.15.patch
-Patch3:         systemd-after-snmp.patch
 BuildRequires:  file-devel
 BuildRequires:  net-snmp-devel
 BuildRequires:  pkgconfig
@@ -101,8 +100,7 @@ resilient infrastructures.
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch2 -p0
 chmod 644 doc/samples/*
 
 %build

linux-4.15.patch

@@ -28,10 +28,10 @@ Signed-off-by: Baruch Siach <baruch@tkos.co.il>
  keepalived/vrrp/vrrp.c        | 1 +
  2 files changed, 2 insertions(+)
 
-Index: keepalived-2.0.9/keepalived/include/vrrp_arp.h
+Index: keepalived/include/vrrp_arp.h
 ===================================================================
---- keepalived-2.0.9.orig/keepalived/include/vrrp_arp.h
-+++ keepalived-2.0.9/keepalived/include/vrrp_arp.h
+--- keepalived/include/vrrp_arp.h.orig
++++ keepalived/include/vrrp_arp.h
 @@ -24,6 +24,7 @@
  #define _VRRP_ARP_H
  
@@ -40,22 +40,22 @@ Index: keepalived-2.0.9/keepalived/include/vrrp_arp.h
  #include <sys/types.h>
  #include <linux/if_infiniband.h>
  
-Index: keepalived-2.0.9/keepalived/vrrp/vrrp.c
+Index: keepalived/vrrp/vrrp.c
 ===================================================================
---- keepalived-2.0.9.orig/keepalived/vrrp/vrrp.c
-+++ keepalived-2.0.9/keepalived/vrrp/vrrp.c
-@@ -40,6 +40,7 @@
- #include <net/ethernet.h>
+--- 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-2.0.9/keepalived/include/vrrp_if.h
+Index: keepalived/include/vrrp_if.h
 ===================================================================
---- keepalived-2.0.9.orig/keepalived/include/vrrp_if.h
-+++ keepalived-2.0.9/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>

systemd-after-snmp.patch

@@ -1,14 +0,0 @@
-Index: keepalived-2.0.15/keepalived/keepalived.service.in
-===================================================================
---- keepalived-2.0.15.orig/keepalived/keepalived.service.in
-+++ keepalived-2.0.15/keepalived/keepalived.service.in
-@@ -1,7 +1,7 @@
- [Unit]
- Description=LVS and VRRP High Availability Monitor
--After= network-online.target syslog.target
--Wants=network-online.target
-+After= network-online.target syslog.target snmpd.service
-+Wants=network-online.target snmpd.service
- 
- [Service]
- Type=forking