diff --git a/.gitignore b/.gitignore index 1e7c37b..2d762d3 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,5 @@ rsyslog-4.6.3.tar.gz /rsyslog-doc-8.30.0.tar.gz /rsyslog-8.31.0.tar.gz /rsyslog-doc-8.31.0.tar.gz +/rsyslog-doc-8.32.0.tar.gz +/rsyslog-8.32.0.tar.gz 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 - diff --git a/rsyslog.spec b/rsyslog.spec index 01e4d70..628ef2a 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -15,8 +15,8 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog -Version: 8.31.0 -Release: 2%{?dist} +Version: 8.32.0 +Release: 1%{?dist} License: (GPLv3+ and ASL 2.0) Group: System Environment/Daemons URL: http://www.rsyslog.com/ @@ -32,7 +32,7 @@ BuildRequires: bison BuildRequires: dos2unix BuildRequires: flex BuildRequires: libgcrypt-devel -BuildRequires: libfastjson-devel +BuildRequires: libfastjson-devel >= 0.99.8 BuildRequires: libestr-devel >= 0.1.9 BuildRequires: liblogging-stdlog-devel BuildRequires: libtool @@ -275,9 +275,6 @@ mv build doc # set up rsyslog sources %setup -q -D %patch0 -p1 -#%patch1 -p1 -#%patch2 -p1 -#%patch3 -p1 autoreconf -iv @@ -535,6 +532,10 @@ done %{_libdir}/rsyslog/omkafka.so %changelog +* Thu Jan 11 2018 Jiri Vymazal - 8.32.0-1 +- rebase to 8.32.0 +- now requires higher version of libfastjson + * Thu Dec 14 2017 Radovan Sroka - 8.31.0-2 - added also cyrus-sasl-devel dependency diff --git a/sources b/sources index b996447..67d6d13 100644 --- a/sources +++ b/sources @@ -1,2 +1,4 @@ SHA512 (rsyslog-8.31.0.tar.gz) = aab888dda8df3ad7ff404767a58539cdc0bb92d0e537b703cf5833555688dd6d8223889b8d70bf8c594339a51831b57df7a65b397d8b40cded608dfb007befe7 SHA512 (rsyslog-doc-8.31.0.tar.gz) = 51a63fa520d8176e183afa44ccf889374810dddfd5fdb363ed06b134bfbe0d1a94085e4836cf3bb2a07cb83564bbb87cef3763ac9429a5efc50aff276542defa +SHA512 (rsyslog-doc-8.32.0.tar.gz) = e64eba3c40eab35e266826fb7e183418f38eb008f2a21ddf2c523d1e42aacaa20f882a561e5df67a979463048b58232fa82759645a21dc6962f6836ac8f57bce +SHA512 (rsyslog-8.32.0.tar.gz) = eea85d77bf3624fbad6f0838fa2a4af7c14d853c8f120f14cf697cdfda7f7e0692dab684d2ddd07fe44a0bcd50cf91baf69af1bb63dc9d60e19146f1150155ac