From b70cc3e85d45f0925e778d30923cb7a2c8d2f4c0 Mon Sep 17 00:00:00 2001 From: Jiri Vymazal Date: Thu, 2 Mar 2017 10:40:42 +0100 Subject: [PATCH 01/24] removing old sources entries --- sources | 2 -- 1 file changed, 2 deletions(-) diff --git a/sources b/sources index f03e016..bca40f2 100644 --- a/sources +++ b/sources @@ -1,4 +1,2 @@ -SHA512 (rsyslog-8.24.0.tar.gz) = b25b8ae72133376f732f54863c97aea3c8dfbf37c62c6a61840932996913c9d4e63155a24ffc577db48a18514f3e35b6fb109b1864380ba93ddf3fa6d84d728d -SHA512 (rsyslog-doc-8.24.0.tar.gz) = b55cde1485a7baec6d4c4928107c22a078cf412a2994c0dfcbb12c47b49c3b263af8a64011b1329567cf86e04927b9e383581dc868eaea81d554adada6b3786b SHA512 (rsyslog-8.25.0.tar.gz) = 0e97db84cc8fe9fd6e3ffb5a78b32fd213e22833c6ed605329c579132d127b7d65b3f66c64e6bddeb1967aa9ed90645a7c24b9d5e643f95bdaf48ed9fc82cb5f SHA512 (rsyslog-doc-8.25.0.tar.gz) = e0068ec00bbda2d1cf7f14105ad83e82bea9291ed5d5fda3ffcff2db32747b65e7b6d65743a3221aeca03be9c6efcee1db7f03c2da115a3aed60848556befa71 From 75d84a029acc927844be41d09f64397c00ac4c37 Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Tue, 18 Apr 2017 13:54:06 +0200 Subject: [PATCH 02/24] 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 - 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 - 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 From c11f395a467ce46b107a3376be623b5a843c68ba Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Tue, 18 Apr 2017 14:06:54 +0200 Subject: [PATCH 03/24] Fix libgcrypt dependency, moved to core --- rsyslog.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rsyslog.spec b/rsyslog.spec index 9e166d8..22d68b8 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -61,7 +61,6 @@ Patch1: rsyslog-8.23.0-msg_c_nonoverwrite_merge.patch Summary: Encryption support Group: System Environment/Daemons Requires: %name = %version-%release -BuildRequires: libgcrypt-devel %package doc Summary: HTML documentation for rsyslog @@ -537,7 +536,7 @@ done * Tue Apr 18 2017 Radovan Sroka - 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 +- moved dependency libgcrypt to rsyslog core * Wed Mar 01 2017 Jiri Vymazal - 8.25.0-2 - rebased doc subpackage to 8.25.0 as well From 86f3311ed913e4cfb544a7970fe849d2f048669e Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Tue, 18 Apr 2017 14:23:52 +0200 Subject: [PATCH 04/24] Added patch for rhbz#1436113 "rsyslog documentation manual page horribly out-of-date" --- rsyslog-8.26.0-doc-update.patch | 27 +++++++++++++++++++++++++++ rsyslog.spec | 3 +++ 2 files changed, 30 insertions(+) create mode 100644 rsyslog-8.26.0-doc-update.patch diff --git a/rsyslog-8.26.0-doc-update.patch b/rsyslog-8.26.0-doc-update.patch new file mode 100644 index 0000000..b0a6dbf --- /dev/null +++ b/rsyslog-8.26.0-doc-update.patch @@ -0,0 +1,27 @@ +From d03793d30c6120fae645daad813b61b4037ba5dd Mon Sep 17 00:00:00 2001 +From: Jiri Vymazal +Date: Thu, 13 Apr 2017 14:33:59 +0200 +Subject: [PATCH] updated manpage discard section + +--- + tools/rsyslog.conf.5 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/rsyslog.conf.5 b/tools/rsyslog.conf.5 +index 793562f..2621f24 100644 +--- a/tools/rsyslog.conf.5 ++++ b/tools/rsyslog.conf.5 +@@ -320,11 +320,11 @@ fill your log files. To do that, place the discard actions early in your log fil + This often plays well with property-based filters, giving you great freedom in specifying + what you do not want. + +-Discard is just the single tilde character with no further parameters. ++Discard is just the single 'stop' command with no further parameters. + .sp + .B Example: + .RS +-*.* ~ # discards everything. ++*.* stop # discards everything. + .RE + + diff --git a/rsyslog.spec b/rsyslog.spec index 22d68b8..b8bbb1a 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -56,6 +56,7 @@ 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.26.0-doc-update.patch %package crypto Summary: Encryption support @@ -276,6 +277,7 @@ mv build doc %setup -q -D %patch0 -p1 %patch1 -p1 +%patch2 -p1 autoreconf -iv @@ -535,6 +537,7 @@ done %changelog * Tue Apr 18 2017 Radovan Sroka - 8.26.0-1 - rebase to 8.26.0 +- added doc patch rhbz#1436113 - dropped chdir patch, https://github.com/rsyslog/rsyslog/pull/1420 - moved dependency libgcrypt to rsyslog core From 5e8d234639ecbb846c489f63d8f0159134203fe9 Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Tue, 23 May 2017 10:17:34 +0200 Subject: [PATCH 05/24] Rebase to 8.27.0 - dropped doc patch (upstreamed) --- .gitignore | 2 ++ rsyslog.spec | 8 +++++--- sources | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d00a2b5..dfd7ea4 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,5 @@ rsyslog-4.6.3.tar.gz /rsyslog-doc-8.25.0.tar.gz /rsyslog-8.26.0.tar.gz /rsyslog-doc-8.26.0.tar.gz +/rsyslog-doc-8.27.0.tar.gz +/rsyslog-8.27.0.tar.gz diff --git a/rsyslog.spec b/rsyslog.spec index b8bbb1a..c1b47e7 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -15,7 +15,7 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog -Version: 8.26.0 +Version: 8.27.0 Release: 1%{?dist} License: (GPLv3+ and ASL 2.0) Group: System Environment/Daemons @@ -56,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.26.0-doc-update.patch %package crypto Summary: Encryption support @@ -277,7 +276,6 @@ mv build doc %setup -q -D %patch0 -p1 %patch1 -p1 -%patch2 -p1 autoreconf -iv @@ -535,6 +533,10 @@ done %{_libdir}/rsyslog/omkafka.so %changelog +* Mon May 22 2017 Radovan Sroka - 8.27.0-1 +- dropped patch2 (upstreamed) +- rebase to 8.27.0 + * Tue Apr 18 2017 Radovan Sroka - 8.26.0-1 - rebase to 8.26.0 - added doc patch rhbz#1436113 diff --git a/sources b/sources index f5a13cf..0d2201a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rsyslog-8.26.0.tar.gz) = 96cb3af0e05b3e2941f7d2b3558e36836818037ef424f13a8ae2ac8a1e2aa0c7a4eedf3366c8360c7d8eb4515aecc7f3665690646009c650b66689067069af19 -SHA512 (rsyslog-doc-8.26.0.tar.gz) = 5c05c13b3ae6be431343b7a5b3b2cb8676804d6d58d98826e6b44d685bb30fdaf3ced27d66a29908b40f1839bac45d1834d060ddf05d01477474ab3f45f973c8 +SHA512 (rsyslog-doc-8.27.0.tar.gz) = 08d935ecad070d65e7169a56c6a4d35d49e895b4f7cfe4d747939d8a92bdadd0fc3be7cc47d23d233a33b964f2a4d809a34b37419d2e42c3f8c183120412ab2c +SHA512 (rsyslog-8.27.0.tar.gz) = dad957c21d9f7ed3a97a1ed87658fe9381dad00365bd2f5af2396dde3dc4a9f96db17c4df9eb9bd02562cc538f99bf8e2ca00229680d6b7892179161265db753 From bfc17c81c8e71b2a72c2134e6e50b835ebb2abf1 Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Tue, 23 May 2017 10:26:16 +0200 Subject: [PATCH 06/24] Removed unused patch from repo --- rsyslog-8.26.0-doc-update.patch | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 rsyslog-8.26.0-doc-update.patch diff --git a/rsyslog-8.26.0-doc-update.patch b/rsyslog-8.26.0-doc-update.patch deleted file mode 100644 index b0a6dbf..0000000 --- a/rsyslog-8.26.0-doc-update.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d03793d30c6120fae645daad813b61b4037ba5dd Mon Sep 17 00:00:00 2001 -From: Jiri Vymazal -Date: Thu, 13 Apr 2017 14:33:59 +0200 -Subject: [PATCH] updated manpage discard section - ---- - tools/rsyslog.conf.5 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tools/rsyslog.conf.5 b/tools/rsyslog.conf.5 -index 793562f..2621f24 100644 ---- a/tools/rsyslog.conf.5 -+++ b/tools/rsyslog.conf.5 -@@ -320,11 +320,11 @@ fill your log files. To do that, place the discard actions early in your log fil - This often plays well with property-based filters, giving you great freedom in specifying - what you do not want. - --Discard is just the single tilde character with no further parameters. -+Discard is just the single 'stop' command with no further parameters. - .sp - .B Example: - .RS --*.* ~ # discards everything. -+*.* stop # discards everything. - .RE - - From 5b3eddf1772de1a46df94464ff9be6e0ce71bdff Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Tue, 15 Aug 2017 16:03:26 +0200 Subject: [PATCH 07/24] Rebase to 8.29.0 --- .gitignore | 2 ++ rsyslog.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dfd7ea4..6fd5140 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,5 @@ rsyslog-4.6.3.tar.gz /rsyslog-doc-8.26.0.tar.gz /rsyslog-doc-8.27.0.tar.gz /rsyslog-8.27.0.tar.gz +/rsyslog-8.29.0.tar.gz +/rsyslog-doc-8.29.0.tar.gz diff --git a/rsyslog.spec b/rsyslog.spec index c1b47e7..048c4c2 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -15,7 +15,7 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog -Version: 8.27.0 +Version: 8.29.0 Release: 1%{?dist} License: (GPLv3+ and ASL 2.0) Group: System Environment/Daemons @@ -533,6 +533,9 @@ done %{_libdir}/rsyslog/omkafka.so %changelog +* Tue Aug 15 2017 Marek Tamaskovic - 8.29.0-1 +- rebase to 8.29.0 + * Mon May 22 2017 Radovan Sroka - 8.27.0-1 - dropped patch2 (upstreamed) - rebase to 8.27.0 diff --git a/sources b/sources index 0d2201a..9913b63 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rsyslog-doc-8.27.0.tar.gz) = 08d935ecad070d65e7169a56c6a4d35d49e895b4f7cfe4d747939d8a92bdadd0fc3be7cc47d23d233a33b964f2a4d809a34b37419d2e42c3f8c183120412ab2c -SHA512 (rsyslog-8.27.0.tar.gz) = dad957c21d9f7ed3a97a1ed87658fe9381dad00365bd2f5af2396dde3dc4a9f96db17c4df9eb9bd02562cc538f99bf8e2ca00229680d6b7892179161265db753 +SHA512 (rsyslog-8.29.0.tar.gz) = 6e0a69f2ac36fcfd0714b2b7053bd263ca8875d2aba7ad6452223eb8677edfa1cf4978989661614dd65dd1822f0123599d565679c8faa3960f136c8d9472e952 +SHA512 (rsyslog-doc-8.29.0.tar.gz) = 791633b93693c1eacde965e07ced863b96d1bfa488fc5c4770424825ab702cae7babd5286e552da5e17d1d7779f228c61a1527b9726dffea31bbb3b4e80525dc From 5e440311f908b40de20d7aa12a25bcd236e0a65e Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Wed, 16 Aug 2017 10:34:38 +0200 Subject: [PATCH 08/24] Rebuild --- rsyslog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rsyslog.spec b/rsyslog.spec index 048c4c2..dc82acc 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -16,7 +16,7 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog Version: 8.29.0 -Release: 1%{?dist} +Release: 2%{?dist} License: (GPLv3+ and ASL 2.0) Group: System Environment/Daemons URL: http://www.rsyslog.com/ @@ -533,6 +533,9 @@ done %{_libdir}/rsyslog/omkafka.so %changelog +* Tue Aug 16 2017 Radovan Sroka - 8.29.0-2 +- rebuild + * Tue Aug 15 2017 Marek Tamaskovic - 8.29.0-1 - rebase to 8.29.0 From d1474fb5e1c46c0a2857f102c96fc4f4fcdd980c Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Wed, 16 Aug 2017 10:38:32 +0200 Subject: [PATCH 09/24] Fixed bogus date --- rsyslog.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rsyslog.spec b/rsyslog.spec index dc82acc..a483eac 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -533,7 +533,7 @@ done %{_libdir}/rsyslog/omkafka.so %changelog -* Tue Aug 16 2017 Radovan Sroka - 8.29.0-2 +* Wed Aug 16 2017 Radovan Sroka - 8.29.0-2 - rebuild * Tue Aug 15 2017 Marek Tamaskovic - 8.29.0-1 From 3b664f17f812b1235bdf8d4475e1fa9356dd78d9 Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Mon, 23 Oct 2017 16:34:01 +0200 Subject: [PATCH 10/24] Rebase to 8.30.0 - added patch that resolves imgssapi compilation errors --- .gitignore | 2 + rsyslog-8.30.0-imgssapi-compile-error.patch | 128 ++++++++++++++++++++ rsyslog.spec | 10 +- sources | 4 +- 4 files changed, 140 insertions(+), 4 deletions(-) create mode 100644 rsyslog-8.30.0-imgssapi-compile-error.patch diff --git a/.gitignore b/.gitignore index 6fd5140..3b6963e 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,5 @@ rsyslog-4.6.3.tar.gz /rsyslog-8.27.0.tar.gz /rsyslog-8.29.0.tar.gz /rsyslog-doc-8.29.0.tar.gz +/rsyslog-8.30.0.tar.gz +/rsyslog-doc-8.30.0.tar.gz diff --git a/rsyslog-8.30.0-imgssapi-compile-error.patch b/rsyslog-8.30.0-imgssapi-compile-error.patch new file mode 100644 index 0000000..8427aea --- /dev/null +++ b/rsyslog-8.30.0-imgssapi-compile-error.patch @@ -0,0 +1,128 @@ +From 8d793eafdde0b74d0b4424f0d194b5dc6801a5d1 Mon Sep 17 00:00:00 2001 +From: Rainer Gerhards +Date: Tue, 17 Oct 2017 17:34:49 +0200 +Subject: [PATCH] imgssapi: fix compiler warnings + +--- + plugins/imgssapi/imgssapi.c | 25 ++++++++++++------------- + 1 file changed, 12 insertions(+), 13 deletions(-) + +diff --git a/plugins/imgssapi/imgssapi.c b/plugins/imgssapi/imgssapi.c +index aafce7d2..836931c7 100644 +--- a/plugins/imgssapi/imgssapi.c ++++ b/plugins/imgssapi/imgssapi.c +@@ -9,7 +9,7 @@ + * NOTE: read comments in module-template.h to understand how this file + * works! + * +- * Copyright 2007, 2014 Rainer Gerhards and Adiscon GmbH. ++ * Copyright 2007, 2017 Rainer Gerhards and Adiscon GmbH. + * + * This file is part of rsyslog. + * +@@ -63,7 +63,6 @@ + + MODULE_TYPE_INPUT + MODULE_TYPE_NOKEEP +-MODULE_CNFNAME("imgssapi") + + /* defines */ + #define ALLOWEDMETHOD_GSS 2 +@@ -162,7 +161,7 @@ OnSessDestruct(void *ppUsr) + OM_uint32 maj_stat, min_stat; + maj_stat = gss_delete_sec_context(&min_stat, &(*ppGSess)->gss_context, GSS_C_NO_BUFFER); + if (maj_stat != GSS_S_COMPLETE) +- gssutil.display_status("deleting context", maj_stat, min_stat); ++ gssutil.display_status((char*)"deleting context", maj_stat, min_stat); + } + + free(*ppGSess); +@@ -291,7 +290,7 @@ finalize_it: + + + static rsRetVal +-doRcvData(tcps_sess_t *pSess, char *buf, size_t lenBuf, ssize_t *piLenRcvd) ++doRcvData(tcps_sess_t *pSess, char *buf, size_t lenBuf, ssize_t *piLenRcvd, int *const oserr) + { + DEFiRet; + int allowedMethods; +@@ -307,7 +306,7 @@ doRcvData(tcps_sess_t *pSess, char *buf, size_t lenBuf, ssize_t *piLenRcvd) + CHKiRet(TCPSessGSSRecv(pSess, buf, lenBuf, piLenRcvd)); + } else { + *piLenRcvd = lenBuf; +- CHKiRet(netstrm.Rcv(pSess->pStrm, (uchar*) buf, piLenRcvd) != RS_RET_OK); ++ CHKiRet(netstrm.Rcv(pSess->pStrm, (uchar*) buf, piLenRcvd, oserr)); + } + + finalize_it: +@@ -380,11 +379,11 @@ static int TCPSessGSSInit(void) + if (gss_server_creds != GSS_C_NO_CREDENTIAL) + return 0; + +- name_buf.value = (gss_listen_service_name == NULL) ? "host" : gss_listen_service_name; ++ name_buf.value = (gss_listen_service_name == NULL) ? (char*)"host" : gss_listen_service_name; + name_buf.length = strlen(name_buf.value) + 1; + maj_stat = gss_import_name(&min_stat, &name_buf, GSS_C_NT_HOSTBASED_SERVICE, &server_name); + if (maj_stat != GSS_S_COMPLETE) { +- gssutil.display_status("importing name", maj_stat, min_stat); ++ gssutil.display_status((char*)"importing name", maj_stat, min_stat); + return -1; + } + +@@ -392,7 +391,7 @@ static int TCPSessGSSInit(void) + GSS_C_NULL_OID_SET, GSS_C_ACCEPT, + &gss_server_creds, NULL, NULL); + if (maj_stat != GSS_S_COMPLETE) { +- gssutil.display_status("acquiring credentials", maj_stat, min_stat); ++ gssutil.display_status((char*)"acquiring credentials", maj_stat, min_stat); + return -1; + } + +@@ -549,7 +548,7 @@ OnSessAcceptGSS(tcpsrv_t *pThis, tcps_sess_t *pSess) + pGSess->allowedMethods = ALLOWEDMETHOD_TCP; + ABORT_FINALIZE(RS_RET_OK); // TODO: define good error codes + } +- gssutil.display_status("accepting context", maj_stat, acc_sec_min_stat); ++ gssutil.display_status((char*)"accepting context", maj_stat, acc_sec_min_stat); + ABORT_FINALIZE(RS_RET_ERR); // TODO: define good error codes + } + if (send_tok.length != 0) { +@@ -566,7 +565,7 @@ OnSessAcceptGSS(tcpsrv_t *pThis, tcps_sess_t *pSess) + + maj_stat = gss_display_name(&min_stat, client, &recv_tok, NULL); + if (maj_stat != GSS_S_COMPLETE) { +- gssutil.display_status("displaying name", maj_stat, min_stat); ++ gssutil.display_status((char*)"displaying name", maj_stat, min_stat); + } else { + dbgprintf("GSS-API Accepted connection from peer %s: %s\n", (char *)pszPeer, (char*) recv_tok.value); + } +@@ -608,7 +607,7 @@ int TCPSessGSSRecv(tcps_sess_t *pSess, void *buf, size_t buf_len, ssize_t *piLen + maj_stat = gss_unwrap(&min_stat, *context, &xmit_buf, &msg_buf, + &conf_state, (gss_qop_t *) NULL); + if(maj_stat != GSS_S_COMPLETE) { +- gssutil.display_status("unsealing message", maj_stat, min_stat); ++ gssutil.display_status((char*)"unsealing message", maj_stat, min_stat); + if(xmit_buf.value) { + free(xmit_buf.value); + xmit_buf.value = 0; +@@ -644,7 +643,7 @@ void TCPSessGSSClose(tcps_sess_t* pSess) + context = &pGSess->gss_context; + maj_stat = gss_delete_sec_context(&min_stat, context, GSS_C_NO_BUFFER); + if (maj_stat != GSS_S_COMPLETE) +- gssutil.display_status("deleting context", maj_stat, min_stat); ++ gssutil.display_status((char*)"deleting context", maj_stat, min_stat); + *context = GSS_C_NO_CONTEXT; + pGSess->gss_flags = 0; + pGSess->allowedMethods = 0; +@@ -665,7 +664,7 @@ TCPSessGSSDeinit(void) + if (gss_server_creds != GSS_C_NO_CREDENTIAL) { + maj_stat = gss_release_cred(&min_stat, &gss_server_creds); + if (maj_stat != GSS_S_COMPLETE) +- gssutil.display_status("releasing credentials", maj_stat, min_stat); ++ gssutil.display_status((char*)"releasing credentials", maj_stat, min_stat); + } + RETiRet; + } +-- +2.13.6 + diff --git a/rsyslog.spec b/rsyslog.spec index b6dc55f..68b3098 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -15,8 +15,8 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog -Version: 8.29.0 -Release: 2%{?dist} +Version: 8.30.0 +Release: 1%{?dist} License: (GPLv3+ and ASL 2.0) Group: System Environment/Daemons URL: http://www.rsyslog.com/ @@ -56,6 +56,7 @@ 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 %package crypto Summary: Encryption support @@ -276,6 +277,7 @@ mv build doc %setup -q -D %patch0 -p1 %patch1 -p1 +%patch2 -p1 autoreconf -iv @@ -533,6 +535,10 @@ done %{_libdir}/rsyslog/omkafka.so %changelog +* Mon Oct 23 2017 Radovan Sroka - 8.30.0-1 +- rebase to 8.30.0 +- added patch that resolves imgssapi compilation errors + * Tue Aug 15 2017 Radovan Sroka - 8.29.0-2 - rebuild, bumped release number diff --git a/sources b/sources index 9913b63..22fdd70 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rsyslog-8.29.0.tar.gz) = 6e0a69f2ac36fcfd0714b2b7053bd263ca8875d2aba7ad6452223eb8677edfa1cf4978989661614dd65dd1822f0123599d565679c8faa3960f136c8d9472e952 -SHA512 (rsyslog-doc-8.29.0.tar.gz) = 791633b93693c1eacde965e07ced863b96d1bfa488fc5c4770424825ab702cae7babd5286e552da5e17d1d7779f228c61a1527b9726dffea31bbb3b4e80525dc +SHA512 (rsyslog-8.30.0.tar.gz) = 90e172d08ba7548252fc9744f71259dadf5a40afef405516e7b1601620913ca4b2ffc4859b16f369b9c1974ea10f4e41bc2d987e3d6bf9aabeb979f7de6aefe0 +SHA512 (rsyslog-doc-8.30.0.tar.gz) = 8068bb9bb8408447bff49730e9aac105eab1bd610592dd524e7639b668b2d05a4836d3a9862622445a0bb8d8b140db67c861dad6ec207d11049ac368e363684d From 2b1f417828a33b9a5308cdc00ad73d558ef67488 Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Mon, 23 Oct 2017 16:34:01 +0200 Subject: [PATCH 11/24] Rebase to 8.30.0 - added patch that resolves imgssapi compilation errors --- .gitignore | 2 + rsyslog-8.30.0-imgssapi-compile-error.patch | 128 ++++++++++++++++++++ rsyslog.spec | 10 +- sources | 4 +- 4 files changed, 140 insertions(+), 4 deletions(-) create mode 100644 rsyslog-8.30.0-imgssapi-compile-error.patch diff --git a/.gitignore b/.gitignore index 6fd5140..3b6963e 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,5 @@ rsyslog-4.6.3.tar.gz /rsyslog-8.27.0.tar.gz /rsyslog-8.29.0.tar.gz /rsyslog-doc-8.29.0.tar.gz +/rsyslog-8.30.0.tar.gz +/rsyslog-doc-8.30.0.tar.gz diff --git a/rsyslog-8.30.0-imgssapi-compile-error.patch b/rsyslog-8.30.0-imgssapi-compile-error.patch new file mode 100644 index 0000000..8427aea --- /dev/null +++ b/rsyslog-8.30.0-imgssapi-compile-error.patch @@ -0,0 +1,128 @@ +From 8d793eafdde0b74d0b4424f0d194b5dc6801a5d1 Mon Sep 17 00:00:00 2001 +From: Rainer Gerhards +Date: Tue, 17 Oct 2017 17:34:49 +0200 +Subject: [PATCH] imgssapi: fix compiler warnings + +--- + plugins/imgssapi/imgssapi.c | 25 ++++++++++++------------- + 1 file changed, 12 insertions(+), 13 deletions(-) + +diff --git a/plugins/imgssapi/imgssapi.c b/plugins/imgssapi/imgssapi.c +index aafce7d2..836931c7 100644 +--- a/plugins/imgssapi/imgssapi.c ++++ b/plugins/imgssapi/imgssapi.c +@@ -9,7 +9,7 @@ + * NOTE: read comments in module-template.h to understand how this file + * works! + * +- * Copyright 2007, 2014 Rainer Gerhards and Adiscon GmbH. ++ * Copyright 2007, 2017 Rainer Gerhards and Adiscon GmbH. + * + * This file is part of rsyslog. + * +@@ -63,7 +63,6 @@ + + MODULE_TYPE_INPUT + MODULE_TYPE_NOKEEP +-MODULE_CNFNAME("imgssapi") + + /* defines */ + #define ALLOWEDMETHOD_GSS 2 +@@ -162,7 +161,7 @@ OnSessDestruct(void *ppUsr) + OM_uint32 maj_stat, min_stat; + maj_stat = gss_delete_sec_context(&min_stat, &(*ppGSess)->gss_context, GSS_C_NO_BUFFER); + if (maj_stat != GSS_S_COMPLETE) +- gssutil.display_status("deleting context", maj_stat, min_stat); ++ gssutil.display_status((char*)"deleting context", maj_stat, min_stat); + } + + free(*ppGSess); +@@ -291,7 +290,7 @@ finalize_it: + + + static rsRetVal +-doRcvData(tcps_sess_t *pSess, char *buf, size_t lenBuf, ssize_t *piLenRcvd) ++doRcvData(tcps_sess_t *pSess, char *buf, size_t lenBuf, ssize_t *piLenRcvd, int *const oserr) + { + DEFiRet; + int allowedMethods; +@@ -307,7 +306,7 @@ doRcvData(tcps_sess_t *pSess, char *buf, size_t lenBuf, ssize_t *piLenRcvd) + CHKiRet(TCPSessGSSRecv(pSess, buf, lenBuf, piLenRcvd)); + } else { + *piLenRcvd = lenBuf; +- CHKiRet(netstrm.Rcv(pSess->pStrm, (uchar*) buf, piLenRcvd) != RS_RET_OK); ++ CHKiRet(netstrm.Rcv(pSess->pStrm, (uchar*) buf, piLenRcvd, oserr)); + } + + finalize_it: +@@ -380,11 +379,11 @@ static int TCPSessGSSInit(void) + if (gss_server_creds != GSS_C_NO_CREDENTIAL) + return 0; + +- name_buf.value = (gss_listen_service_name == NULL) ? "host" : gss_listen_service_name; ++ name_buf.value = (gss_listen_service_name == NULL) ? (char*)"host" : gss_listen_service_name; + name_buf.length = strlen(name_buf.value) + 1; + maj_stat = gss_import_name(&min_stat, &name_buf, GSS_C_NT_HOSTBASED_SERVICE, &server_name); + if (maj_stat != GSS_S_COMPLETE) { +- gssutil.display_status("importing name", maj_stat, min_stat); ++ gssutil.display_status((char*)"importing name", maj_stat, min_stat); + return -1; + } + +@@ -392,7 +391,7 @@ static int TCPSessGSSInit(void) + GSS_C_NULL_OID_SET, GSS_C_ACCEPT, + &gss_server_creds, NULL, NULL); + if (maj_stat != GSS_S_COMPLETE) { +- gssutil.display_status("acquiring credentials", maj_stat, min_stat); ++ gssutil.display_status((char*)"acquiring credentials", maj_stat, min_stat); + return -1; + } + +@@ -549,7 +548,7 @@ OnSessAcceptGSS(tcpsrv_t *pThis, tcps_sess_t *pSess) + pGSess->allowedMethods = ALLOWEDMETHOD_TCP; + ABORT_FINALIZE(RS_RET_OK); // TODO: define good error codes + } +- gssutil.display_status("accepting context", maj_stat, acc_sec_min_stat); ++ gssutil.display_status((char*)"accepting context", maj_stat, acc_sec_min_stat); + ABORT_FINALIZE(RS_RET_ERR); // TODO: define good error codes + } + if (send_tok.length != 0) { +@@ -566,7 +565,7 @@ OnSessAcceptGSS(tcpsrv_t *pThis, tcps_sess_t *pSess) + + maj_stat = gss_display_name(&min_stat, client, &recv_tok, NULL); + if (maj_stat != GSS_S_COMPLETE) { +- gssutil.display_status("displaying name", maj_stat, min_stat); ++ gssutil.display_status((char*)"displaying name", maj_stat, min_stat); + } else { + dbgprintf("GSS-API Accepted connection from peer %s: %s\n", (char *)pszPeer, (char*) recv_tok.value); + } +@@ -608,7 +607,7 @@ int TCPSessGSSRecv(tcps_sess_t *pSess, void *buf, size_t buf_len, ssize_t *piLen + maj_stat = gss_unwrap(&min_stat, *context, &xmit_buf, &msg_buf, + &conf_state, (gss_qop_t *) NULL); + if(maj_stat != GSS_S_COMPLETE) { +- gssutil.display_status("unsealing message", maj_stat, min_stat); ++ gssutil.display_status((char*)"unsealing message", maj_stat, min_stat); + if(xmit_buf.value) { + free(xmit_buf.value); + xmit_buf.value = 0; +@@ -644,7 +643,7 @@ void TCPSessGSSClose(tcps_sess_t* pSess) + context = &pGSess->gss_context; + maj_stat = gss_delete_sec_context(&min_stat, context, GSS_C_NO_BUFFER); + if (maj_stat != GSS_S_COMPLETE) +- gssutil.display_status("deleting context", maj_stat, min_stat); ++ gssutil.display_status((char*)"deleting context", maj_stat, min_stat); + *context = GSS_C_NO_CONTEXT; + pGSess->gss_flags = 0; + pGSess->allowedMethods = 0; +@@ -665,7 +664,7 @@ TCPSessGSSDeinit(void) + if (gss_server_creds != GSS_C_NO_CREDENTIAL) { + maj_stat = gss_release_cred(&min_stat, &gss_server_creds); + if (maj_stat != GSS_S_COMPLETE) +- gssutil.display_status("releasing credentials", maj_stat, min_stat); ++ gssutil.display_status((char*)"releasing credentials", maj_stat, min_stat); + } + RETiRet; + } +-- +2.13.6 + diff --git a/rsyslog.spec b/rsyslog.spec index a483eac..dc09211 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -15,8 +15,8 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog -Version: 8.29.0 -Release: 2%{?dist} +Version: 8.30.0 +Release: 1%{?dist} License: (GPLv3+ and ASL 2.0) Group: System Environment/Daemons URL: http://www.rsyslog.com/ @@ -56,6 +56,7 @@ 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 %package crypto Summary: Encryption support @@ -276,6 +277,7 @@ mv build doc %setup -q -D %patch0 -p1 %patch1 -p1 +%patch2 -p1 autoreconf -iv @@ -533,6 +535,10 @@ done %{_libdir}/rsyslog/omkafka.so %changelog +* Mon Oct 23 2017 Radovan Sroka - 8.30.0-1 +- rebase to 8.30.0 +- added patch that resolves imgssapi compilation errors + * Wed Aug 16 2017 Radovan Sroka - 8.29.0-2 - rebuild diff --git a/sources b/sources index 9913b63..22fdd70 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rsyslog-8.29.0.tar.gz) = 6e0a69f2ac36fcfd0714b2b7053bd263ca8875d2aba7ad6452223eb8677edfa1cf4978989661614dd65dd1822f0123599d565679c8faa3960f136c8d9472e952 -SHA512 (rsyslog-doc-8.29.0.tar.gz) = 791633b93693c1eacde965e07ced863b96d1bfa488fc5c4770424825ab702cae7babd5286e552da5e17d1d7779f228c61a1527b9726dffea31bbb3b4e80525dc +SHA512 (rsyslog-8.30.0.tar.gz) = 90e172d08ba7548252fc9744f71259dadf5a40afef405516e7b1601620913ca4b2ffc4859b16f369b9c1974ea10f4e41bc2d987e3d6bf9aabeb979f7de6aefe0 +SHA512 (rsyslog-doc-8.30.0.tar.gz) = 8068bb9bb8408447bff49730e9aac105eab1bd610592dd524e7639b668b2d05a4836d3a9862622445a0bb8d8b140db67c861dad6ec207d11049ac368e363684d From c7bd68399bc1d08ea9d8f94a861bdc91d12b59f1 Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Wed, 25 Oct 2017 13:29:25 +0200 Subject: [PATCH 12/24] Fixed imjournal module - imjournal didn't work at all - added imjournal patch for rhbz#1505853 --- rsyslog-8.30.0-imjournal-fix.patch | 77 ++++++++++++++++++++++++++++++ rsyslog.spec | 8 +++- 2 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 rsyslog-8.30.0-imjournal-fix.patch diff --git a/rsyslog-8.30.0-imjournal-fix.patch b/rsyslog-8.30.0-imjournal-fix.patch new file mode 100644 index 0000000..a786b8c --- /dev/null +++ b/rsyslog-8.30.0-imjournal-fix.patch @@ -0,0 +1,77 @@ +From 4736e53d471ac45024333588fcdf5bce5f8c61b8 Mon Sep 17 00:00:00 2001 +From: Rainer Gerhards +Date: Wed, 25 Oct 2017 11:09:40 +0200 +Subject: [PATCH] imjournal bugfix: module did not work at all + +The open function was broken by commit 92ac801 (v8.30.0), +resulting in no data being ever read from the journal. + +patch bases on the idea of Radovan Sroka given here: +https://github.com/rsyslog/rsyslog/issues/1895#issuecomment-339017357 +but follows the current imjournal-paradigm of having the journal +handle inside a global variable. + +see also https://github.com/rsyslog/rsyslog/issues/1895 +closes https://github.com/rsyslog/rsyslog/issues/1897 +--- + plugins/imjournal/imjournal.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/plugins/imjournal/imjournal.c b/plugins/imjournal/imjournal.c +index 8f043d5e1..2f1569837 100644 +--- a/plugins/imjournal/imjournal.c ++++ b/plugins/imjournal/imjournal.c +@@ -118,20 +118,20 @@ static sd_journal *j; + static rsRetVal persistJournalState(void); + static rsRetVal loadJournalState(void); + +-static rsRetVal openJournal(sd_journal* jj) { ++static rsRetVal openJournal(void) { + DEFiRet; + +- if (sd_journal_open(&jj, SD_JOURNAL_LOCAL_ONLY) < 0) ++ if (sd_journal_open(&j, SD_JOURNAL_LOCAL_ONLY) < 0) + iRet = RS_RET_IO_ERROR; + RETiRet; + } + +-static void closeJournal(sd_journal* jj) { ++static void closeJournal(void) { + + if (cs.stateFile) { /* can't persist without a state file */ + persistJournalState(); + } +- sd_journal_close(jj); ++ sd_journal_close(j); + } + + +@@ -513,10 +513,10 @@ pollJournal(void) + /* do not persist stateFile sd_journal_get_cursor will fail! */ + char* tmp = cs.stateFile; + cs.stateFile = NULL; +- closeJournal(j); ++ closeJournal(); + cs.stateFile = tmp; + +- iRet = openJournal(j); ++ iRet = openJournal(); + if (iRet != RS_RET_OK) { + char errStr[256]; + rs_strerror_r(errno, errStr, sizeof(errStr)); +@@ -773,13 +773,13 @@ ENDfreeCnf + /* open journal */ + BEGINwillRun + CODESTARTwillRun +- iRet = openJournal(j); ++ iRet = openJournal(); + ENDwillRun + + /* close journal */ + BEGINafterRun + CODESTARTafterRun +- closeJournal(j); ++ closeJournal(); + ratelimitDestruct(ratelimiter); + ENDafterRun + diff --git a/rsyslog.spec b/rsyslog.spec index 68b3098..f629339 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -16,7 +16,7 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog Version: 8.30.0 -Release: 1%{?dist} +Release: 2%{?dist} License: (GPLv3+ and ASL 2.0) Group: System Environment/Daemons URL: http://www.rsyslog.com/ @@ -57,6 +57,7 @@ Obsoletes: sysklogd < 1.5-11 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 @@ -278,6 +279,7 @@ mv build doc %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 autoreconf -iv @@ -535,6 +537,10 @@ done %{_libdir}/rsyslog/omkafka.so %changelog +* Wed Oct 25 2017 Radovan Sroka - 8.30.0-2 +- imjournal didn't work at all +- added imjournal patch for rhbz#1505853 + * Mon Oct 23 2017 Radovan Sroka - 8.30.0-1 - rebase to 8.30.0 - added patch that resolves imgssapi compilation errors From cdeb2ccbdac20fedd766c5c0a52383dee987b8d8 Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Wed, 25 Oct 2017 13:29:25 +0200 Subject: [PATCH 13/24] Fixed imjournal module - imjournal didn't work at all - added imjournal patch for rhbz#1505853 --- rsyslog-8.30.0-imjournal-fix.patch | 77 ++++++++++++++++++++++++++++++ rsyslog.spec | 8 +++- 2 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 rsyslog-8.30.0-imjournal-fix.patch diff --git a/rsyslog-8.30.0-imjournal-fix.patch b/rsyslog-8.30.0-imjournal-fix.patch new file mode 100644 index 0000000..a786b8c --- /dev/null +++ b/rsyslog-8.30.0-imjournal-fix.patch @@ -0,0 +1,77 @@ +From 4736e53d471ac45024333588fcdf5bce5f8c61b8 Mon Sep 17 00:00:00 2001 +From: Rainer Gerhards +Date: Wed, 25 Oct 2017 11:09:40 +0200 +Subject: [PATCH] imjournal bugfix: module did not work at all + +The open function was broken by commit 92ac801 (v8.30.0), +resulting in no data being ever read from the journal. + +patch bases on the idea of Radovan Sroka given here: +https://github.com/rsyslog/rsyslog/issues/1895#issuecomment-339017357 +but follows the current imjournal-paradigm of having the journal +handle inside a global variable. + +see also https://github.com/rsyslog/rsyslog/issues/1895 +closes https://github.com/rsyslog/rsyslog/issues/1897 +--- + plugins/imjournal/imjournal.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/plugins/imjournal/imjournal.c b/plugins/imjournal/imjournal.c +index 8f043d5e1..2f1569837 100644 +--- a/plugins/imjournal/imjournal.c ++++ b/plugins/imjournal/imjournal.c +@@ -118,20 +118,20 @@ static sd_journal *j; + static rsRetVal persistJournalState(void); + static rsRetVal loadJournalState(void); + +-static rsRetVal openJournal(sd_journal* jj) { ++static rsRetVal openJournal(void) { + DEFiRet; + +- if (sd_journal_open(&jj, SD_JOURNAL_LOCAL_ONLY) < 0) ++ if (sd_journal_open(&j, SD_JOURNAL_LOCAL_ONLY) < 0) + iRet = RS_RET_IO_ERROR; + RETiRet; + } + +-static void closeJournal(sd_journal* jj) { ++static void closeJournal(void) { + + if (cs.stateFile) { /* can't persist without a state file */ + persistJournalState(); + } +- sd_journal_close(jj); ++ sd_journal_close(j); + } + + +@@ -513,10 +513,10 @@ pollJournal(void) + /* do not persist stateFile sd_journal_get_cursor will fail! */ + char* tmp = cs.stateFile; + cs.stateFile = NULL; +- closeJournal(j); ++ closeJournal(); + cs.stateFile = tmp; + +- iRet = openJournal(j); ++ iRet = openJournal(); + if (iRet != RS_RET_OK) { + char errStr[256]; + rs_strerror_r(errno, errStr, sizeof(errStr)); +@@ -773,13 +773,13 @@ ENDfreeCnf + /* open journal */ + BEGINwillRun + CODESTARTwillRun +- iRet = openJournal(j); ++ iRet = openJournal(); + ENDwillRun + + /* close journal */ + BEGINafterRun + CODESTARTafterRun +- closeJournal(j); ++ closeJournal(); + ratelimitDestruct(ratelimiter); + ENDafterRun + diff --git a/rsyslog.spec b/rsyslog.spec index dc09211..cb98949 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -16,7 +16,7 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog Version: 8.30.0 -Release: 1%{?dist} +Release: 2%{?dist} License: (GPLv3+ and ASL 2.0) Group: System Environment/Daemons URL: http://www.rsyslog.com/ @@ -57,6 +57,7 @@ Obsoletes: sysklogd < 1.5-11 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 @@ -278,6 +279,7 @@ mv build doc %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 autoreconf -iv @@ -535,6 +537,10 @@ done %{_libdir}/rsyslog/omkafka.so %changelog +* Wed Oct 25 2017 Radovan Sroka - 8.30.0-2 +- imjournal didn't work at all +- added imjournal patch for rhbz#1505853 + * Mon Oct 23 2017 Radovan Sroka - 8.30.0-1 - rebase to 8.30.0 - added patch that resolves imgssapi compilation errors From 08a4e12c2ee13611e5cdd1fcffe1a62abea8e388 Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Wed, 25 Oct 2017 13:46:39 +0200 Subject: [PATCH 14/24] Rebuild --- rsyslog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rsyslog.spec b/rsyslog.spec index f629339..0486151 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -16,7 +16,7 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog Version: 8.30.0 -Release: 2%{?dist} +Release: 3%{?dist} License: (GPLv3+ and ASL 2.0) Group: System Environment/Daemons URL: http://www.rsyslog.com/ @@ -537,6 +537,9 @@ done %{_libdir}/rsyslog/omkafka.so %changelog +* Wed Oct 25 2017 Radovan Sroka - 8.30.0-3 +- rebuild + * Wed Oct 25 2017 Radovan Sroka - 8.30.0-2 - imjournal didn't work at all - added imjournal patch for rhbz#1505853 From c516abae89b01fae16c4ea7e85b86bfd97a137f4 Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Wed, 25 Oct 2017 13:46:39 +0200 Subject: [PATCH 15/24] Rebuild --- rsyslog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rsyslog.spec b/rsyslog.spec index cb98949..c8dbb4d 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -16,7 +16,7 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog Version: 8.30.0 -Release: 2%{?dist} +Release: 3%{?dist} License: (GPLv3+ and ASL 2.0) Group: System Environment/Daemons URL: http://www.rsyslog.com/ @@ -537,6 +537,9 @@ done %{_libdir}/rsyslog/omkafka.so %changelog +* Wed Oct 25 2017 Radovan Sroka - 8.30.0-3 +- rebuild + * Wed Oct 25 2017 Radovan Sroka - 8.30.0-2 - imjournal didn't work at all - added imjournal patch for rhbz#1505853 From 507efa3de7d7e91841ed67117f6a719e554485d1 Mon Sep 17 00:00:00 2001 From: Jiri Vymazal Date: Tue, 28 Nov 2017 13:47:44 +0100 Subject: [PATCH 16/24] changed rsyslog-doc to noarch --- rsyslog.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rsyslog.spec b/rsyslog.spec index 0486151..e58b2ce 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -67,6 +67,7 @@ Requires: %name = %version-%release %package doc Summary: HTML documentation for rsyslog Group: Documentation +BuildArch: noarch %package elasticsearch Summary: ElasticSearch output module for rsyslog @@ -537,6 +538,9 @@ done %{_libdir}/rsyslog/omkafka.so %changelog +* Tue Nov 28 2017 Jiri Vymazal - 8.30.0-3 +- changed rsyslog-doc to noarch + * Wed Oct 25 2017 Radovan Sroka - 8.30.0-3 - rebuild From a33a3b263e22d8be9df7cfab02212cdc4b5b712b Mon Sep 17 00:00:00 2001 From: Jiri Vymazal Date: Tue, 28 Nov 2017 13:50:53 +0100 Subject: [PATCH 17/24] changed rsyslog-doc to noarch --- rsyslog.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rsyslog.spec b/rsyslog.spec index c8dbb4d..7753089 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -67,6 +67,7 @@ Requires: %name = %version-%release %package doc Summary: HTML documentation for rsyslog Group: Documentation +BuildArch: noarch %package elasticsearch Summary: ElasticSearch output module for rsyslog @@ -537,6 +538,9 @@ done %{_libdir}/rsyslog/omkafka.so %changelog +* Tue Feb 28 2017 Jiri Vymazal - 8.30.0-3 +- changed rsyslog-doc to noarch + * Wed Oct 25 2017 Radovan Sroka - 8.30.0-3 - rebuild From c75de835514cf3d4cb428418372d50da5f560135 Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Thu, 14 Dec 2017 13:32:02 +0100 Subject: [PATCH 18/24] 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 | 24 ++++++++++++++---------- sources | 4 ++-- 3 files changed, 18 insertions(+), 12 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 e58b2ce..f84a029 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: 3%{?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: mysql-devel >= 4.0 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,7 +535,14 @@ done %{_libdir}/rsyslog/omkafka.so %changelog -* Tue Nov 28 2017 Jiri Vymazal - 8.30.0-3 +* Thu Dec 14 2017 Radovan Sroka - 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 - 8.30.0-4 - changed rsyslog-doc to noarch * Wed Oct 25 2017 Radovan Sroka - 8.30.0-3 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 From 69e718297d7f39bca6e1472ea2c8967ba0f12edc Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Thu, 14 Dec 2017 14:03:50 +0100 Subject: [PATCH 19/24] Added also cyrus-sasl-devel dependency --- rsyslog.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rsyslog.spec b/rsyslog.spec index f84a029..01fb798 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -16,7 +16,7 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog Version: 8.31.0 -Release: 1%{?dist} +Release: 2%{?dist} License: (GPLv3+ and ASL 2.0) Group: System Environment/Daemons URL: http://www.rsyslog.com/ @@ -118,7 +118,7 @@ BuildRequires: mysql-devel >= 4.0 Summary: MongoDB support for rsyslog Group: System Environment/Daemons Requires: %name = %version-%release -BuildRequires: mongo-c-driver-devel snappy-devel +BuildRequires: mongo-c-driver-devel snappy-devel cyrus-sasl-devel %endif %package pgsql @@ -535,6 +535,9 @@ done %{_libdir}/rsyslog/omkafka.so %changelog +* Thu Dec 14 2017 Radovan Sroka - 8.31.0-2 +- added also cyrus-sasl-devel dependency + * Thu Dec 14 2017 Radovan Sroka - 8.31.0-1 - update to 8.31.0 - removed upstreamed patches From 98bf6e696c5bfbddc018e15ce7c72da813ec5e77 Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Thu, 14 Dec 2017 13:32:02 +0100 Subject: [PATCH 20/24] 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 | 24 ++++++++++++++---------- sources | 4 ++-- 3 files changed, 18 insertions(+), 12 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 7753089..30dbf03 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: 3%{?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: mysql-devel >= 4.0 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,7 +535,14 @@ done %{_libdir}/rsyslog/omkafka.so %changelog -* Tue Feb 28 2017 Jiri Vymazal - 8.30.0-3 +* Thu Dec 14 2017 Radovan Sroka - 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 - 8.30.0-4 - changed rsyslog-doc to noarch * Wed Oct 25 2017 Radovan Sroka - 8.30.0-3 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 From 7fef5bade292eb1db35cc812bc68bccec3925e1b Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Thu, 14 Dec 2017 14:03:50 +0100 Subject: [PATCH 21/24] Added also cyrus-sasl-devel dependency --- rsyslog.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rsyslog.spec b/rsyslog.spec index 30dbf03..d1b899d 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -16,7 +16,7 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog Version: 8.31.0 -Release: 1%{?dist} +Release: 2%{?dist} License: (GPLv3+ and ASL 2.0) Group: System Environment/Daemons URL: http://www.rsyslog.com/ @@ -118,7 +118,7 @@ BuildRequires: mysql-devel >= 4.0 Summary: MongoDB support for rsyslog Group: System Environment/Daemons Requires: %name = %version-%release -BuildRequires: mongo-c-driver-devel snappy-devel +BuildRequires: mongo-c-driver-devel snappy-devel cyrus-sasl-devel %endif %package pgsql @@ -535,6 +535,9 @@ done %{_libdir}/rsyslog/omkafka.so %changelog +* Thu Dec 14 2017 Radovan Sroka - 8.31.0-2 +- added also cyrus-sasl-devel dependency + * Thu Dec 14 2017 Radovan Sroka - 8.31.0-1 - update to 8.31.0 - removed upstreamed patches From 8ee7fef352656b3bb9fc38c3582a00982550dab1 Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Thu, 17 May 2018 10:57:39 +0200 Subject: [PATCH 22/24] 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 2fe14474145849054457b75f0a4ba57d3dd5ef7b Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Thu, 17 May 2018 11:06:52 +0200 Subject: [PATCH 23/24] 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 23513fe4d3272baae7a86fb62f7962f1002b25fd Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Thu, 17 May 2018 11:10:49 +0200 Subject: [PATCH 24/24] 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