From 6b04df01e02e12fd2e31956cbeffdf8365efd798 Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Thu, 17 May 2018 10:57:39 +0200 Subject: [PATCH 1/4] rebase to 8.35.0 --- .gitignore | 2 ++ rsyslog.spec | 9 ++++++--- sources | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 06e8815..ae91f6e 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,5 @@ rsyslog-4.6.3.tar.gz /rsyslog-8.32.0.tar.gz /rsyslog-doc-8.34.0.tar.gz /rsyslog-8.34.0.tar.gz +/rsyslog-8.35.0.tar.gz +/rsyslog-doc-8.35.0.tar.gz diff --git a/rsyslog.spec b/rsyslog.spec index 7179be9..b892075 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -15,7 +15,7 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog -Version: 8.34.0 +Version: 8.35.0 Release: 1%{?dist} License: (GPLv3+ and ASL 2.0) Group: System Environment/Daemons @@ -323,6 +323,7 @@ export HIREDIS_LIBS="-L%{_libdir} -lhiredis" --enable-mmanon \ --enable-mmaudit \ --enable-mmcount \ + --enable-mmkubernetes \ --enable-mmjsonparse \ --enable-mmnormalize \ --enable-mmsnmptrapd \ @@ -349,8 +350,7 @@ export HIREDIS_LIBS="-L%{_libdir} -lhiredis" --enable-snmp \ --enable-unlimited-select \ --enable-usertools \ - --enable-omkafka \ - --enable-mmkubernetes \ + --enable-omkafka make V=1 @@ -526,6 +526,9 @@ done %{_libdir}/rsyslog/mmkubernetes.so %changelog +* Thu May 17 2018 Radovan Sroka - 8.35.0 +- rebase to 8.35.0 + * Thu Apr 05 2018 Jiri Vymazal - 8.34.0-1 - rebase to 8.34.0 - added mmkubernetes module diff --git a/sources b/sources index 2599b7d..a3ec2f7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rsyslog-doc-8.34.0.tar.gz) = edf9aa63c777624c3dc27dfd64b38893b9b4c9b56941df1d7a8c6bc3cb4cbbfb83e8c356cbefeab7c688ecb6017b66ed99931cb71b69b7c927b4743548dd40d4 -SHA512 (rsyslog-8.34.0.tar.gz) = 69eaececa2f8b98799deac8e6cb2cf635a5117da7a21cbb0b880b7df1d83c6ccf16133dab099a6e5fb865f34c2dad164a1bf1952d16ca116af3b1dd35d15065e +SHA512 (rsyslog-8.35.0.tar.gz) = 3b8845fc057147c2dd740b3bb432e7fb101ad60be5c6bc86a2c2796bcd3f3526c617d45b9e8301388d51047a125ca18ba4ac54f8be2a13eabbbe8fb9361beecc +SHA512 (rsyslog-doc-8.35.0.tar.gz) = f78d0451eef789d60f7c5ae1eed46c4a9f7a6ade73b829f65aa2373aa786b00e84e8957089532b1b652838bd9f62b41d92530276a0d27e21b8e94d5f0e4728a6 From 224bceb301992ebf302cc3f6cb90fa0893260fe5 Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Thu, 17 May 2018 11:06:52 +0200 Subject: [PATCH 2/4] Added fmhash.so file --- rsyslog.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rsyslog.spec b/rsyslog.spec index b892075..c904957 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -449,6 +449,7 @@ done %{_libdir}/rsyslog/pmlastmsg.so %{_libdir}/rsyslog/pmsnare.so %{_libdir}/rsyslog/fmhttp.so +%{_libdir}/rsyslog/fmhash.so %files crypto %{_bindir}/rscryutil From 8a36b667d41b38fea9bde0c14d9258b7131df645 Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Thu, 17 May 2018 11:10:49 +0200 Subject: [PATCH 3/4] Bumped release number --- rsyslog.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rsyslog.spec b/rsyslog.spec index c904957..0e9cf7e 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -16,7 +16,7 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog Version: 8.35.0 -Release: 1%{?dist} +Release: 2%{?dist} License: (GPLv3+ and ASL 2.0) Group: System Environment/Daemons URL: http://www.rsyslog.com/ @@ -527,7 +527,7 @@ done %{_libdir}/rsyslog/mmkubernetes.so %changelog -* Thu May 17 2018 Radovan Sroka - 8.35.0 +* Thu May 17 2018 Radovan Sroka - 8.35.0-2 - rebase to 8.35.0 * Thu Apr 05 2018 Jiri Vymazal - 8.34.0-1 From 4d31f1884b4b8f2bb848a81226ba91026b2036f4 Mon Sep 17 00:00:00 2001 From: Jiri Vymazal Date: Wed, 8 Aug 2018 12:36:39 +0200 Subject: [PATCH 4/4] reverted python-docutils version --- rsyslog.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rsyslog.spec b/rsyslog.spec index 2385fcf..e7b6c5b 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -31,7 +31,7 @@ BuildRequires: libestr-devel >= 0.1.9 BuildRequires: libtool BuildRequires: libuuid-devel BuildRequires: pkgconfig -BuildRequires: python3-docutils +BuildRequires: python-docutils # make sure systemd is in a version that isn't affected by rhbz#974132 BuildRequires: systemd-devel >= 204-8 BuildRequires: zlib-devel