From d938e78fb40b12e96341bd4dad4dab9c220dbc17 Mon Sep 17 00:00:00 2001
From: Radovan Sroka <rsroka@redhat.com>
Date: Tue, 18 Apr 2017 13:54:06 +0200
Subject: [PATCH] Rebase to 8.26.0

---
 .gitignore                                  |  2 ++
 rsyslog-8.24.0-missing-chdir-w-chroot.patch | 15 ---------------
 rsyslog.spec                                | 12 ++++++++----
 sources                                     |  4 ++--
 4 files changed, 12 insertions(+), 21 deletions(-)
 delete mode 100644 rsyslog-8.24.0-missing-chdir-w-chroot.patch

diff --git a/.gitignore b/.gitignore
index a586369..d00a2b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,5 @@ rsyslog-4.6.3.tar.gz
 /rsyslog-doc-8.24.0.tar.gz
 /rsyslog-8.25.0.tar.gz
 /rsyslog-doc-8.25.0.tar.gz
+/rsyslog-8.26.0.tar.gz
+/rsyslog-doc-8.26.0.tar.gz
diff --git a/rsyslog-8.24.0-missing-chdir-w-chroot.patch b/rsyslog-8.24.0-missing-chdir-w-chroot.patch
deleted file mode 100644
index e67e13f..0000000
--- a/rsyslog-8.24.0-missing-chdir-w-chroot.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/tools/rsyslogd.c b/tools/rsyslogd.c
-index c099705..12b037f 100644
---- a/tools/rsyslogd.c
-+++ b/tools/rsyslogd.c
-@@ -1350,6 +1350,10 @@ initAll(int argc, char **argv)
- 				perror("chroot");
- 				exit(1);
- 			}
-+            if(chdir("/") != 0) {
-+                perror("chdir");
-+                exit(1);
-+            }
- 			break;
- 		case 'u':		/* misc user settings */
- 			iHelperUOpt = (arg == NULL) ? 0 : atoi(arg);
diff --git a/rsyslog.spec b/rsyslog.spec
index 5f81181..9e166d8 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -15,8 +15,8 @@
 
 Summary: Enhanced system logging and kernel message trapping daemon
 Name: rsyslog
-Version: 8.25.0
-Release: 2%{?dist}
+Version: 8.26.0
+Release: 1%{?dist}
 License: (GPLv3+ and ASL 2.0)
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -31,6 +31,7 @@ BuildRequires: automake
 BuildRequires: bison
 BuildRequires: dos2unix
 BuildRequires: flex
+BuildRequires: libgcrypt-devel
 BuildRequires: libfastjson-devel
 BuildRequires: libestr-devel >= 0.1.9
 BuildRequires: liblogging-stdlog-devel
@@ -55,7 +56,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.24.0-missing-chdir-w-chroot.patch
 
 %package crypto
 Summary: Encryption support
@@ -277,7 +277,6 @@ mv build doc
 %setup -q -D
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 autoreconf -iv
 
@@ -535,6 +534,11 @@ done
 %{_libdir}/rsyslog/omkafka.so
 
 %changelog
+* Tue Apr 18 2017 Radovan Sroka <rsroka@redhat.com> - 8.26.0-1
+- rebase to 8.26.0
+- dropped chdir patch, https://github.com/rsyslog/rsyslog/pull/1420 
+- added dependency libgcrypt also to rsyslog core
+
 * Wed Mar 01 2017 Jiri Vymazal <jvymazal@redhat.com> - 8.25.0-2
 - rebased doc subpackage to 8.25.0 as well
 - dropped upstreamed doc patch
diff --git a/sources b/sources
index bca40f2..f5a13cf 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (rsyslog-8.25.0.tar.gz) = 0e97db84cc8fe9fd6e3ffb5a78b32fd213e22833c6ed605329c579132d127b7d65b3f66c64e6bddeb1967aa9ed90645a7c24b9d5e643f95bdaf48ed9fc82cb5f
-SHA512 (rsyslog-doc-8.25.0.tar.gz) = e0068ec00bbda2d1cf7f14105ad83e82bea9291ed5d5fda3ffcff2db32747b65e7b6d65743a3221aeca03be9c6efcee1db7f03c2da115a3aed60848556befa71
+SHA512 (rsyslog-8.26.0.tar.gz) = 96cb3af0e05b3e2941f7d2b3558e36836818037ef424f13a8ae2ac8a1e2aa0c7a4eedf3366c8360c7d8eb4515aecc7f3665690646009c650b66689067069af19
+SHA512 (rsyslog-doc-8.26.0.tar.gz) = 5c05c13b3ae6be431343b7a5b3b2cb8676804d6d58d98826e6b44d685bb30fdaf3ced27d66a29908b40f1839bac45d1834d060ddf05d01477474ab3f45f973c8