From 349045239fcc1a9c827904a570b1025253822f2935854354521cff26c4ef3b53 Mon Sep 17 00:00:00 2001
From: Lars Vogdt <lrupp@suse.com>
Date: Mon, 22 Jan 2018 14:07:53 +0000
Subject: [PATCH] Accepting request 568173 from home:darix:playground

- enable json stats and config dump support
  new BR: pkgconfig(json-c)
- disable dynamic loading of libipset and link it instead
- enable stacktrace support
- turn on snmp-rfcv2 and snmp-rfcv3 support
- do not reference the keepalived.socket in the rpm scriptlets

OBS-URL: https://build.opensuse.org/request/show/568173
OBS-URL: https://build.opensuse.org/package/show/network/keepalived?expand=0&rev=40
---
 keepalived.changes | 10 ++++++++++
 keepalived.spec    | 18 +++++++++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/keepalived.changes b/keepalived.changes
index 309d36f..8483135 100644
--- a/keepalived.changes
+++ b/keepalived.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jan 22 13:03:55 UTC 2018 - mrueckert@suse.de
+
+- enable json stats and config dump support
+  new BR: pkgconfig(json-c)
+- disable dynamic loading of libipset and link it instead
+- enable stacktrace support
+- turn on snmp-rfcv2 and snmp-rfcv3 support
+- do not reference the keepalived.socket in the rpm scriptlets
+
 -------------------------------------------------------------------
 Fri Jan 12 08:53:51 UTC 2018 - lars@linux-schulserver.de
 
diff --git a/keepalived.spec b/keepalived.spec
index f2ef50d..e32f689 100644
--- a/keepalived.spec
+++ b/keepalived.spec
@@ -50,6 +50,7 @@ BuildRequires:  snmp-mibs
 %if 0%{?suse_version} > 1110
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(gio-2.0)
+BuildRequires:  pkgconfig(json-c)
 BuildRequires:  pkgconfig(libipset)
 BuildRequires:  pkgconfig(libiptc)
 BuildRequires:  pkgconfig(libnl-3.0)
@@ -106,6 +107,9 @@ export CFLAGS="%optflags -DOPENSSL_NO_SSL_INTERN"
   %endif
   --enable-snmp \
   --enable-snmp-vrrp \
+  --enable-snmp-rfc \
+  --enable-snmp-rfcv2 \
+  --enable-snmp-rfcv3 \
   %if %{with dbus}
   --enable-dbus \
   --enable-dbus-create-instance \
@@ -121,7 +125,11 @@ export CFLAGS="%optflags -DOPENSSL_NO_SSL_INTERN"
   --enable-sha1 \
   --enable-routes \
   --enable-libiptc \
-  --enable-libipset
+  --enable-libipset \
+  --disable-libipset-dynamic \
+  --enable-libnl \
+  --enable-stacktrace \
+  --enable-json
 make %{?_smp_mflags}
 
 %install
@@ -153,26 +161,26 @@ getent passwd %{name} >/dev/null || \
 	/usr/sbin/useradd -g %{name} -s /bin/false -r -c "Keepalived" \
 	-d %{_var}/lib/%{name} %{name}
 %if %{with systemd}
-%service_add_pre %{name}.service %{name}.socket
+%service_add_pre %{name}.service
 %endif
 
 %preun
 %stop_on_removal %{name}
 %if %{with systemd}
-%service_del_preun %{name}.service %{name}.socket
+%service_del_preun %{name}.service
 %endif
 
 %post
 %fillup_only %{name}
 %if %{with systemd}
-%service_add_post %{name}.service %{name}.socket
+%service_add_post %{name}.service
 %endif
 
 %postun
 %insserv_cleanup
 %restart_on_update %{name}
 %if %{with systemd}
-%service_del_postun %{name}.service %{name}.socket
+%service_del_postun %{name}.service
 %endif
 
 %files