Accepting request 450453 from home:AndreasStieger:branches:Base:System

rsyslog 8.24.0

OBS-URL: https://build.opensuse.org/request/show/450453
OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=254

rsyslog.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package rsyslog
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@ Name:           rsyslog
 Summary:        The enhanced syslogd for Linux and Unix
 License:        (GPL-3.0+ and Apache-2.0)
 Group:          System/Daemons
-Version:        8.23.0
+Version:        8.24.0
 Release:        0
 %if 0%{?suse_version} >= 1210
 %bcond_without  systemd
@@ -58,6 +58,8 @@ Release:        0
 %bcond_without  omhttpfs
 %bcond_without  omamqp1
 %bcond_without  tcl
+# https://github.com/rsyslog/rsyslog/issues/1355
+%bcond_with	maxminddb
 # contributed modules not built for various reasons
 # --enable-mmgrok - grok not in factory
 # --enable-omkafka - librdkafka not in factory
@@ -195,6 +197,9 @@ BuildRequires:  libee-devel >= 0.4.0
 BuildRequires:  liblognorm-devel >= 1.1.2
 %endif
 %endif
+%if %{with maxminddb}
+BuildRequires:  pkgconfig(libmaxminddb)
+%endif
 #
 # mmjsonparse needs liblognorm,
 # but json check is unconditional
@@ -645,6 +650,7 @@ autoreconf -fiv
 	--enable-pmcisconames	\
 	--enable-pmaixforwardedfrom	\
 	--enable-pmsnare	\
+	--enable-pmnull		\
 	--enable-omruleset	\
 %if %{with mmnormalize}
 	--enable-mmnormalize \
@@ -684,6 +690,7 @@ autoreconf -fiv
 	--enable-mmfields	\
 	--enable-mmpstrucdata	\
 	--enable-mmrfc5424addhmac \
+	--enable-mmrm1stspace	\
 	--enable-pmciscoios \
 	--enable-pmpanngfw	\
 %if %{with guardtime}
@@ -697,6 +704,9 @@ autoreconf -fiv
 %endif
 %if %{with tcl}
 	--enable-omtcl		\
+%endif
+%if %{with maxminddb}
+	--enable-mmdblookup	\
 %endif
 	--enable-usertools	\
 	--disable-static
@@ -1003,6 +1013,7 @@ fi
 %{rsyslog_module_dir_nodeps}/mmrfc5424addhmac.so
 %{rsyslog_module_dir_nodeps}/mmsequence.so
 %{rsyslog_module_dir_nodeps}/mmutf8fix.so
+%{rsyslog_module_dir_nodeps}/mmrm1stspace.so
 %{rsyslog_module_dir_nodeps}/ommail.so
 %{rsyslog_module_dir_nodeps}/omprog.so
 %{rsyslog_module_dir_nodeps}/omruleset.so
@@ -1014,6 +1025,7 @@ fi
 %{rsyslog_module_dir_nodeps}/pmcisconames.so
 %{rsyslog_module_dir_nodeps}/pmciscoios.so
 %{rsyslog_module_dir_nodeps}/pmsnare.so
+%{rsyslog_module_dir_nodeps}/pmnull.so
 %{rsyslog_module_dir_nodeps}/pmpanngfw.so
 %if %{with rfc3195}
 %{rsyslog_module_dir_nodeps}/im3195.so