From 784ec25f24f90a6492ee3b3aa6f34d7739277b82 Mon Sep 17 00:00:00 2001
From: Radovan Sroka <rsroka@redhat.com>
Date: Thu, 14 Dec 2017 13:32:02 +0100
Subject: [PATCH] Update to 8.31.0

- removed upstreamed patches
- added dependecies mongo-c-driver-devel snappy-devel
- removed depricated dependecies libmongo-client
- mongodb plugin now uses new driver with TLS,...
---
 .gitignore   |  2 ++
 rsyslog.spec | 22 +++++++++++++---------
 sources      |  4 ++--
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3b6963e..1e7c37b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,5 @@ rsyslog-4.6.3.tar.gz
 /rsyslog-doc-8.29.0.tar.gz
 /rsyslog-8.30.0.tar.gz
 /rsyslog-doc-8.30.0.tar.gz
+/rsyslog-8.31.0.tar.gz
+/rsyslog-doc-8.31.0.tar.gz
diff --git a/rsyslog.spec b/rsyslog.spec
index 5699a66..ef7b77b 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -15,8 +15,8 @@
 
 Summary: Enhanced system logging and kernel message trapping daemon
 Name: rsyslog
-Version: 8.30.0
-Release: 4%{?dist}
+Version: 8.31.0
+Release: 1%{?dist}
 License: (GPLv3+ and ASL 2.0)
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -55,9 +55,6 @@ Obsoletes: sysklogd < 1.5-11
 
 # tweak the upstream service file to honour configuration from /etc/sysconfig/rsyslog
 Patch0: rsyslog-8.8.0-sd-service.patch
-Patch1: rsyslog-8.23.0-msg_c_nonoverwrite_merge.patch
-Patch2: rsyslog-8.30.0-imgssapi-compile-error.patch
-Patch3: rsyslog-8.30.0-imjournal-fix.patch
 
 %package crypto
 Summary: Encryption support
@@ -121,7 +118,7 @@ BuildRequires: mariadb-connector-c-devel
 Summary: MongoDB support for rsyslog
 Group: System Environment/Daemons
 Requires: %name = %version-%release
-BuildRequires: libmongo-client-devel
+BuildRequires: mongo-c-driver-devel snappy-devel
 %endif
 
 %package pgsql
@@ -278,9 +275,9 @@ mv build doc
 # set up rsyslog sources
 %setup -q -D
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+#%patch1 -p1
+#%patch2 -p1
+#%patch3 -p1
 
 autoreconf -iv
 
@@ -538,6 +535,13 @@ done
 %{_libdir}/rsyslog/omkafka.so
 
 %changelog
+* Thu Dec 14 2017 Radovan Sroka <rsroka@redhat.com> - 8.31.0-1
+- update to 8.31.0
+- removed upstreamed patches
+- added dependecies mongo-c-driver-devel snappy-devel
+- removed depricated dependecies libmongo-client
+- mongodb plugin now uses new driver with TLS,...
+
 * Tue Nov 28 2017 Jiri Vymazal <jvymazal@redhat.com> - 8.30.0-4
 - changed rsyslog-doc to noarch
 
diff --git a/sources b/sources
index 22fdd70..b996447 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (rsyslog-8.30.0.tar.gz) = 90e172d08ba7548252fc9744f71259dadf5a40afef405516e7b1601620913ca4b2ffc4859b16f369b9c1974ea10f4e41bc2d987e3d6bf9aabeb979f7de6aefe0
-SHA512 (rsyslog-doc-8.30.0.tar.gz) = 8068bb9bb8408447bff49730e9aac105eab1bd610592dd524e7639b668b2d05a4836d3a9862622445a0bb8d8b140db67c861dad6ec207d11049ac368e363684d
+SHA512 (rsyslog-8.31.0.tar.gz) = aab888dda8df3ad7ff404767a58539cdc0bb92d0e537b703cf5833555688dd6d8223889b8d70bf8c594339a51831b57df7a65b397d8b40cded608dfb007befe7
+SHA512 (rsyslog-doc-8.31.0.tar.gz) = 51a63fa520d8176e183afa44ccf889374810dddfd5fdb363ed06b134bfbe0d1a94085e4836cf3bb2a07cb83564bbb87cef3763ac9429a5efc50aff276542defa