From 3b664f17f812b1235bdf8d4475e1fa9356dd78d9 Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Mon, 23 Oct 2017 16:34:01 +0200 Subject: [PATCH 01/21] 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 c7bd68399bc1d08ea9d8f94a861bdc91d12b59f1 Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Wed, 25 Oct 2017 13:29:25 +0200 Subject: [PATCH 02/21] 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 08a4e12c2ee13611e5cdd1fcffe1a62abea8e388 Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Wed, 25 Oct 2017 13:46:39 +0200 Subject: [PATCH 03/21] 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 507efa3de7d7e91841ed67117f6a719e554485d1 Mon Sep 17 00:00:00 2001 From: Jiri Vymazal Date: Tue, 28 Nov 2017 13:47:44 +0100 Subject: [PATCH 04/21] 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 c75de835514cf3d4cb428418372d50da5f560135 Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Thu, 14 Dec 2017 13:32:02 +0100 Subject: [PATCH 05/21] 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 06/21] 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 6b04df01e02e12fd2e31956cbeffdf8365efd798 Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Thu, 17 May 2018 10:57:39 +0200 Subject: [PATCH 07/21] 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 08/21] 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 09/21] 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 92853018cbb55333e20149b47c92689a9e201c2c Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Thu, 17 May 2018 10:57:39 +0200 Subject: [PATCH 10/21] 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 6c3f95e8306edc1c80f3933ef9048c88ea6aabf6 Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Thu, 17 May 2018 11:06:52 +0200 Subject: [PATCH 11/21] 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 695d95b0f2ebb593100e050d3bac280985c3d69a Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Thu, 17 May 2018 11:10:49 +0200 Subject: [PATCH 12/21] 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 f788eda2f2fdd8f8f789b3fab02944b97137bdec Mon Sep 17 00:00:00 2001 From: Jiri Vymazal Date: Mon, 2 Jul 2018 16:58:09 +0200 Subject: [PATCH 13/21] removed old unused patch files --- rsyslog-8.30.0-imgssapi-compile-error.patch | 128 -------------------- rsyslog-8.30.0-imjournal-fix.patch | 77 ------------ 2 files changed, 205 deletions(-) delete mode 100644 rsyslog-8.30.0-imgssapi-compile-error.patch delete mode 100644 rsyslog-8.30.0-imjournal-fix.patch diff --git a/rsyslog-8.30.0-imgssapi-compile-error.patch b/rsyslog-8.30.0-imgssapi-compile-error.patch deleted file mode 100644 index 8427aea..0000000 --- a/rsyslog-8.30.0-imgssapi-compile-error.patch +++ /dev/null @@ -1,128 +0,0 @@ -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-8.30.0-imjournal-fix.patch b/rsyslog-8.30.0-imjournal-fix.patch deleted file mode 100644 index a786b8c..0000000 --- a/rsyslog-8.30.0-imjournal-fix.patch +++ /dev/null @@ -1,77 +0,0 @@ -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 - From 4d31f1884b4b8f2bb848a81226ba91026b2036f4 Mon Sep 17 00:00:00 2001 From: Jiri Vymazal Date: Wed, 8 Aug 2018 12:36:39 +0200 Subject: [PATCH 14/21] 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 From 6161c0c9fc34c115c49d19aefc1ab6a1b02b3cea Mon Sep 17 00:00:00 2001 From: Jiri Vymazal Date: Mon, 2 Jul 2018 16:55:09 +0200 Subject: [PATCH 15/21] removed unusued patch file --- rsyslog-8.23.0-msg_c_nonoverwrite_merge.patch | 65 ------------------- 1 file changed, 65 deletions(-) delete mode 100644 rsyslog-8.23.0-msg_c_nonoverwrite_merge.patch diff --git a/rsyslog-8.23.0-msg_c_nonoverwrite_merge.patch b/rsyslog-8.23.0-msg_c_nonoverwrite_merge.patch deleted file mode 100644 index 1ca26ff..0000000 --- a/rsyslog-8.23.0-msg_c_nonoverwrite_merge.patch +++ /dev/null @@ -1,65 +0,0 @@ -From fa7d98b0cb0512d84355e3aafdc5a3e366842f2a Mon Sep 17 00:00:00 2001 -From: Radovan Sroka -Date: Mon, 21 Nov 2016 13:38:18 +0100 -Subject: [PATCH 2/4] Rebased from: Patch2: - rsyslog-7.2.1-msg_c_nonoverwrite_merge.patch - -Resolves: - no adressed bugzila ---- - runtime/msg.c | 25 +++++++++++++++++++++++-- - 1 file changed, 23 insertions(+), 2 deletions(-) - -diff --git a/runtime/msg.c b/runtime/msg.c -index f6e017b..5430331 100644 ---- a/runtime/msg.c -+++ b/runtime/msg.c -@@ -4632,6 +4632,27 @@ finalize_it: - RETiRet; - } - -+static rsRetVal jsonMerge(struct json_object *existing, struct json_object *json); -+ -+static rsRetVal -+jsonMergeNonOverwrite(struct json_object *existing, struct json_object *json) -+{ -+ DEFiRet; -+ -+ struct json_object_iterator it = json_object_iter_begin(existing); -+ struct json_object_iterator itEnd = json_object_iter_end(existing); -+ while (!json_object_iter_equal(&it, &itEnd)) { -+ json_object_object_add(json, json_object_iter_peek_name(&it), -+ json_object_get(json_object_iter_peek_value(&it))); -+ json_object_iter_next(&it); -+ } -+ -+ CHKiRet(jsonMerge(existing, json)); -+finalize_it: -+ RETiRet; -+} -+ -+ - static rsRetVal - jsonMerge(struct json_object *existing, struct json_object *json) - { -@@ -4714,7 +4735,7 @@ msgAddJSON(msg_t * const pM, uchar *name, struct json_object *json, int force_re - if(*pjroot == NULL) - *pjroot = json; - else -- CHKiRet(jsonMerge(*pjroot, json)); -+ CHKiRet(jsonMergeNonOverwrite(*pjroot, json)); - } else { - if(*pjroot == NULL) { - /* now we need a root obj */ -@@ -4742,7 +4763,7 @@ msgAddJSON(msg_t * const pM, uchar *name, struct json_object *json, int force_re - json_object_object_add(parent, (char*)leaf, json); - } else { - if(json_object_get_type(json) == json_type_object) { -- CHKiRet(jsonMerge(*pjroot, json)); -+ CHKiRet(jsonMergeNonOverwrite(*pjroot, json)); - } else { - /* TODO: improve the code below, however, the current - * state is not really bad */ --- -2.7.4 - From a72c9c407d4adf094b06a510841a24959553235e Mon Sep 17 00:00:00 2001 From: Jiri Vymazal Date: Mon, 2 Jul 2018 16:58:09 +0200 Subject: [PATCH 16/21] removed old unused patch files --- rsyslog-8.30.0-imgssapi-compile-error.patch | 128 -------------------- rsyslog-8.30.0-imjournal-fix.patch | 77 ------------ 2 files changed, 205 deletions(-) delete mode 100644 rsyslog-8.30.0-imgssapi-compile-error.patch delete mode 100644 rsyslog-8.30.0-imjournal-fix.patch diff --git a/rsyslog-8.30.0-imgssapi-compile-error.patch b/rsyslog-8.30.0-imgssapi-compile-error.patch deleted file mode 100644 index 8427aea..0000000 --- a/rsyslog-8.30.0-imgssapi-compile-error.patch +++ /dev/null @@ -1,128 +0,0 @@ -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-8.30.0-imjournal-fix.patch b/rsyslog-8.30.0-imjournal-fix.patch deleted file mode 100644 index a786b8c..0000000 --- a/rsyslog-8.30.0-imjournal-fix.patch +++ /dev/null @@ -1,77 +0,0 @@ -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 - From 8f97df78c1f0372803e4b7b356f2037b0a479ef8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 03:46:38 +0000 Subject: [PATCH 17/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rsyslog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rsyslog.spec b/rsyslog.spec index 9e394f6..a72e0b9 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -9,7 +9,7 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog Version: 8.36.0 -Release: 1%{?dist} +Release: 2%{?dist} License: (GPLv3+ and ASL 2.0) Group: System Environment/Daemons URL: http://www.rsyslog.com/ @@ -500,6 +500,9 @@ done %{_libdir}/rsyslog/mmkubernetes.so %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 8.36.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Jul 02 2018 Jiri Vymazal - 8.36.0-1 - rebase to 8.36.0 - removed stdlog dependency as upstream is going to drop it From 1e8cce579b04eacc1a5b2191ce6dcc136e5b5e42 Mon Sep 17 00:00:00 2001 From: Jiri Vymazal Date: Mon, 23 Jul 2018 13:22:09 +0200 Subject: [PATCH 18/21] added gcc to buildrequires following f29 system-wide change --- rsyslog.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rsyslog.spec b/rsyslog.spec index a72e0b9..0d4c6cf 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -19,6 +19,7 @@ Source2: rsyslog.conf Source3: rsyslog.sysconfig Source4: rsyslog.log +BuildRequires: gcc BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -500,6 +501,9 @@ done %{_libdir}/rsyslog/mmkubernetes.so %changelog +* Mon Jul 23 2018 Jiri Vymazal - 8.36.0-2 +- added gcc to buildrequires following f29 system-wide change + * Sat Jul 14 2018 Fedora Release Engineering - 8.36.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 78dc3b2a83aff2161c22ccb31333e0c2d8ed317c Mon Sep 17 00:00:00 2001 From: Jiri Vymazal Date: Wed, 25 Jul 2018 10:54:56 +0200 Subject: [PATCH 19/21] fixed a typo in commented-out part of default conf + reordered it resolves: rhbz#1579592 --- rsyslog.conf | 40 ++++++++++++++++++++-------------------- rsyslog.spec | 14 ++++++++++++++ 2 files changed, 34 insertions(+), 20 deletions(-) diff --git a/rsyslog.conf b/rsyslog.conf index 547acda..b51e844 100644 --- a/rsyslog.conf +++ b/rsyslog.conf @@ -4,26 +4,6 @@ # or latest version online at http://www.rsyslog.com/doc/rsyslog_conf.html # If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html -#### MODULES #### - -module(load="imuxsock" # provides support for local system logging (e.g. via logger command) - SysSock.Use="off") # Turn off message reception via local log socket; - # local messages are retrieved through imjournal now. -module(load="imjournal" # provides access to the systemd journal - StateFile="imjournal.state") # File to store the position in the journal -#module(load="imklog") # reads kernel messages (the same are read from journald) -#module(load"immark") # provides --MARK-- message capability - -# Provides UDP syslog reception -# for parameters see http://www.rsyslog.com/doc/imudp.html -#module(load="imudp") # needs to be done just once -#input(type="imudp" port="514") - -# Provides TCP syslog reception -# for parameters see http://www.rsyslog.com/doc/imtcp.html -#module(load="imtcp") # needs to be done just once -#input(type="imtcp" port="514") - #### GLOBAL DIRECTIVES #### # Where to place auxiliary files @@ -35,6 +15,26 @@ module(load="builtin:omfile" Template="RSYSLOG_TraditionalFileFormat") # Include all config files in /etc/rsyslog.d/ include(file="/etc/rsyslog.d/*.conf" mode="optional") +#### MODULES #### + +module(load="imuxsock" # provides support for local system logging (e.g. via logger command) + SysSock.Use="off") # Turn off message reception via local log socket; + # local messages are retrieved through imjournal now. +module(load="imjournal" # provides access to the systemd journal + StateFile="imjournal.state") # File to store the position in the journal +#module(load="imklog") # reads kernel messages (the same are read from journald) +#module(load="immark") # provides --MARK-- message capability + +# Provides UDP syslog reception +# for parameters see http://www.rsyslog.com/doc/imudp.html +#module(load="imudp") # needs to be done just once +#input(type="imudp" port="514") + +# Provides TCP syslog reception +# for parameters see http://www.rsyslog.com/doc/imtcp.html +#module(load="imtcp") # needs to be done just once +#input(type="imtcp" port="514") + #### RULES #### # Log all kernel messages to the console. diff --git a/rsyslog.spec b/rsyslog.spec index 0d4c6cf..7f90b30 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -501,6 +501,20 @@ done %{_libdir}/rsyslog/mmkubernetes.so %changelog +* Wed Aug 08 2018 Jiri Vymazal - 8.37.0-1 +- rebase to upstream version 8.37.0 + resolves: rhbz#1612079 + resolves: rhbz#1598217 + resolves: rhbz#1544139 + - dropped needless libee dependency +* Wed Jul 25 2018 Jiri Vymazal - 8.36.0-3 +- fixed a typo in commented-out part of default conf + reordered it + resolves: rhbz#1579592 + +* Tue Jul 24 2018 Jason L Tibbitts III - 8.36.0-3 +- Rebuild for unannounced net-snmp soversion bump. +- Use python3-docutils because rst2man has moved there. + * Mon Jul 23 2018 Jiri Vymazal - 8.36.0-2 - added gcc to buildrequires following f29 system-wide change From 3b6595b5ae8dedb86e6282513869f476fcb84f04 Mon Sep 17 00:00:00 2001 From: Jiri Vymazal Date: Wed, 8 Aug 2018 12:10:49 +0200 Subject: [PATCH 20/21] rebase to upstream version 8.37.0 resolves: rhbz#1612079 resolves: rhbz#1598217 resolves: rhbz#1544139 dropped needless libee dependency --- .gitignore | 2 ++ rsyslog.spec | 7 ++++--- sources | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2098b59..943e9a1 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,5 @@ rsyslog-4.6.3.tar.gz /rsyslog-doc-8.35.0.tar.gz /rsyslog-8.36.0.tar.gz /rsyslog-doc-8.36.0.tar.gz +/rsyslog-8.37.0.tar.gz +/rsyslog-doc-8.37.0.tar.gz diff --git a/rsyslog.spec b/rsyslog.spec index 7f90b30..b086a60 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -8,8 +8,8 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog -Version: 8.36.0 -Release: 2%{?dist} +Version: 8.37.0 +Release: 1%{?dist} License: (GPLv3+ and ASL 2.0) Group: System Environment/Daemons URL: http://www.rsyslog.com/ @@ -80,7 +80,7 @@ Requires: %name = %version-%release Summary: Log normalization support for rsyslog Group: System Environment/Daemons Requires: %name = %version-%release -BuildRequires: libestr-devel libee-devel liblognorm-devel >= 1.0.2 +BuildRequires: libestr-devel liblognorm-devel >= 1.0.2 %package mmaudit Summary: Message modification module supporting Linux audit format @@ -507,6 +507,7 @@ done resolves: rhbz#1598217 resolves: rhbz#1544139 - dropped needless libee dependency + * Wed Jul 25 2018 Jiri Vymazal - 8.36.0-3 - fixed a typo in commented-out part of default conf + reordered it resolves: rhbz#1579592 diff --git a/sources b/sources index eb9483f..35fd967 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rsyslog-8.36.0.tar.gz) = b0c8689374b5b0fb5ad9675ad8983ce67bd04d34ad07d39cf8f91498fd2fd21a173f1077e5fa1b66a89a9d93ab011fc6345ac1a3be9961f4794fc9e152c32a50 -SHA512 (rsyslog-doc-8.36.0.tar.gz) = a93f56c9c9464a9ca87f61169c6fcfaa94608f31210eaac77e882e64bf5f514c887765db6bb57e4defafeb2a6e552506f0274c1ed275306efc1656f5520b5efa +SHA512 (rsyslog-8.37.0.tar.gz) = 2989eb7ed3333151e979a720fa0e95e330bda9b40f65009f7969069bcbbeee8f493c6a3189f67bbbc2529d3a2ac14a022d7e8c4f2d0dae42b67d7508d7611fa0 +SHA512 (rsyslog-doc-8.37.0.tar.gz) = 827ac6762ad9257d9499201d5dc3d110c65f11891ab58d36dce568ffa5f8b57fe10505bc2c7b0743dcca319f294ba6418a880b7ca787eb19dcc1f262ba0f3b59 From ef1208f149bb737f735d1d1f7458ca8bfda2ed68 Mon Sep 17 00:00:00 2001 From: Jiri Vymazal Date: Wed, 8 Aug 2018 13:42:09 +0200 Subject: [PATCH 21/21] librelp dependency bump --- rsyslog.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rsyslog.spec b/rsyslog.spec index b086a60..0870e3d 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -132,7 +132,7 @@ BuildRequires: krb5-devel Summary: RELP protocol support for rsyslog Group: System Environment/Daemons Requires: %name = %version-%release -BuildRequires: librelp-devel >= 1.0.3 +BuildRequires: librelp-devel >= 1.2.16 %package gnutls Summary: TLS protocol support for rsyslog @@ -506,7 +506,8 @@ done resolves: rhbz#1612079 resolves: rhbz#1598217 resolves: rhbz#1544139 - - dropped needless libee dependency +- dropped needless libee dependency +- bumped librelp dependency to actually needed version * Wed Jul 25 2018 Jiri Vymazal - 8.36.0-3 - fixed a typo in commented-out part of default conf + reordered it