From 7c1121d2ca92045227f1ff8e2f85dfae7ddef1d6 Mon Sep 17 00:00:00 2001
From: Jiri Vymazal <jvymazal@redhat.com>
Date: Nov 14 2019 14:07:31 +0000
Subject: rebase to upstream version 8.1911.0

  resolves: rhbz#1771468

---

diff --git a/.gitignore b/.gitignore
index 5a7dcc5..f6e94b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,5 @@ rsyslog-4.6.3.tar.gz
 /rsyslog-doc-8.1907.0.tar.gz
 /rsyslog-8.1910.0.tar.gz
 /rsyslog-doc-8.1910.0.tar.gz
+/rsyslog-8.1911.0.tar.gz
+/rsyslog-doc-8.1911.0.tar.gz
diff --git a/rsyslog.spec b/rsyslog.spec
index e1009bd..c18954c 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -8,7 +8,7 @@
 
 Summary: Enhanced system logging and kernel message trapping daemon
 Name: rsyslog
-Version: 8.1910.0
+Version: 8.1911.0
 Release: 1%{?dist}
 License: (GPLv3+ and ASL 2.0)
 URL: http://www.rsyslog.com/
@@ -45,7 +45,6 @@ Obsoletes: sysklogd < 1.5-11
 
 # tweak the upstream service file to honour configuration from /etc/sysconfig/rsyslog
 Patch0: rsyslog-8.34.0-sd-service.patch
-Patch1: imjournal-rewrite.patch
 
 %package crypto
 Summary: Encryption support
@@ -247,7 +246,6 @@ mv build doc
 # set up rsyslog sources
 %setup -q -D
 %patch0 -p1
-%patch1 -p1
 
 autoreconf -iv
 
@@ -270,12 +268,15 @@ export HIREDIS_LIBS="-L%{_libdir} -lhiredis"
 	--enable-testbench \
 %endif
 	--enable-elasticsearch \
+	--enable-clickhouse \
 	--enable-generate-man-pages \
 	--enable-gnutls \
 	--enable-gssapi-krb5 \
 	--enable-imdiag \
+	--enable-imdocker \
 	--enable-imfile \
 	--enable-imjournal \
+	--enable-improg \
 	--enable-impstats \
 	--enable-imptcp \
 	--enable-libdbi \
@@ -290,6 +291,7 @@ export HIREDIS_LIBS="-L%{_libdir} -lhiredis"
 	--enable-mysql \
 	--enable-omamqp1 \
 	--enable-omhiredis \
+	--enable-omhttp \
 	--enable-omjournal \
 	--enable-ommongodb \
 	--enable-omprog \
@@ -375,10 +377,12 @@ done
 %config(noreplace) %{_sysconfdir}/sysconfig/rsyslog
 %config(noreplace) %{_sysconfdir}/logrotate.d/rsyslog
 # plugins
+%{_libdir}/rsyslog/imdocker.so
 %{_libdir}/rsyslog/imfile.so
 %{_libdir}/rsyslog/imjournal.so
 %{_libdir}/rsyslog/imklog.so
 %{_libdir}/rsyslog/immark.so
+%{_libdir}/rsyslog/improg.so
 %{_libdir}/rsyslog/impstats.so
 %{_libdir}/rsyslog/imptcp.so
 %{_libdir}/rsyslog/imtcp.so
@@ -394,6 +398,8 @@ done
 %{_libdir}/rsyslog/mmanon.so
 %{_libdir}/rsyslog/mmcount.so
 %{_libdir}/rsyslog/mmexternal.so
+%{_libdir}/rsyslog/omclickhouse.so
+%{_libdir}/rsyslog/omhttp.so
 %{_libdir}/rsyslog/omjournal.so
 %{_libdir}/rsyslog/ommail.so
 %{_libdir}/rsyslog/omprog.so
@@ -481,6 +487,10 @@ done
 %doc %{rsyslog_docdir}/k8s_container_name.rulebase
 
 %changelog
+* Thu Nov 14 2019 Jiri Vymazal <jvymazal@redhat.com> - 8.1911.0-1
+- rebase to upstream version 8.1911.0
+  resolves: rhbz#1771468
+
 * Thu Oct 17 2019 Jiri Vymazal <jvymazal@redhat.com> - 8.1910.0-1
 - rebase to upstream version 8.1910.0
   resolves: rhbz#1743537
diff --git a/sources b/sources
index 7ab4589..3d6aef6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (rsyslog-8.1910.0.tar.gz) = 85f5df91a6357ecb38708b4d569d26804a50ca28c928a636ac7749595f1a7105c3450fbd521835a436ebdfdcac33a33986e09a09026745ea4d1a2897406770d5
-SHA512 (rsyslog-doc-8.1910.0.tar.gz) = e46f14e40ae690efbe3114a859c1c94c8f9573ca5ebdb533ad4b5ed76c3a930c887cc205e7279fcc546fda3ce624eae507ce08d5d10ee1eb167a957edd742bf2
+SHA512 (rsyslog-8.1911.0.tar.gz) = 8414901a5072cb2cc28d35802c9e22d0f9c88f2ae15985a087a86b0e4053471b02d43bcc95d0c466719105e0a5ee683927af3842b9487f27ddddc1ca00ed713a
+SHA512 (rsyslog-doc-8.1911.0.tar.gz) = 2326550a0db108db407b701ff0b7b8545f94d06c1979bfbea3496a9a652de2a22bf49e9b95d4b2e6256bbf1f9db6a1c9822557c6ebd6a56bc00f096a642b19df