diff --git a/.gitignore b/.gitignore index 49a418b..45c63f0 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,5 @@ rsyslog-4.6.3.tar.gz /rsyslog-8.10.0.tar.gz /rsyslog-8.12.0.tar.gz /rsyslog-doc-8.12.0.tar.gz +/rsyslog-8.21.0.tar.gz +/rsyslog-doc-8.21.0.tar.gz diff --git a/rsyslog-8.10.0-imfile-maxlinesatonce.patch b/rsyslog-8.10.0-imfile-maxlinesatonce.patch deleted file mode 100644 index 3600c62..0000000 --- a/rsyslog-8.10.0-imfile-maxlinesatonce.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 20912054d062137a35a82962db7e53e1de2b819d Mon Sep 17 00:00:00 2001 -From: Tomas Heinrich -Date: Tue, 23 Jun 2015 13:48:43 +0200 -Subject: [PATCH 3/4] imfile: fix type overflow - -Data type of a configuration variable wasn't big enough for -eCmdHdlrSize. ---- - plugins/imfile/imfile.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c -index e3d0884..7e5ec62 100644 ---- a/plugins/imfile/imfile.c -+++ b/plugins/imfile/imfile.c -@@ -128,7 +128,7 @@ static struct configSettings_s { - int iFacility; /* local0 */ - int iSeverity; /* notice, as of rfc 3164 */ - int readMode; /* mode to use for ReadMultiLine call */ -- int maxLinesAtOnce; /* how many lines to process in a row? */ -+ int64 maxLinesAtOnce; /* how many lines to process in a row? */ - ruleset_t *pBindRuleset; /* ruleset to bind listener to (use system default if unspecified) */ - } cs; - --- -1.9.3 - diff --git a/rsyslog-8.10.0-imjournal-empty-messages.patch b/rsyslog-8.10.0-imjournal-empty-messages.patch deleted file mode 100644 index 8857c7f..0000000 --- a/rsyslog-8.10.0-imjournal-empty-messages.patch +++ /dev/null @@ -1,40 +0,0 @@ -From f1f77872ab6e962fcc7f53c0b51ef7b2d331c1bf Mon Sep 17 00:00:00 2001 -From: Tomas Heinrich -Date: Tue, 23 Jun 2015 18:09:52 +0200 -Subject: [PATCH 1/4] imjournal: don't sanitize empty messages - -It is an error to pass an empty message to -parser.SanitizeMsg() and doing so could crash the daemon. Besides, -there's no point in doing so in the first place. ---- - plugins/imjournal/imjournal.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/plugins/imjournal/imjournal.c b/plugins/imjournal/imjournal.c -index b5866e8..6ad9fca 100644 ---- a/plugins/imjournal/imjournal.c -+++ b/plugins/imjournal/imjournal.c -@@ -176,6 +176,7 @@ enqMsg(uchar *msg, uchar *pszTag, int iFacility, int iSeverity, struct timeval * - { - struct syslogTime st; - msg_t *pMsg; -+ size_t len; - DEFiRet; - - assert(msg != NULL); -@@ -189,8 +190,10 @@ enqMsg(uchar *msg, uchar *pszTag, int iFacility, int iSeverity, struct timeval * - } - MsgSetFlowControlType(pMsg, eFLOWCTL_LIGHT_DELAY); - MsgSetInputName(pMsg, pInputName); -- MsgSetRawMsgWOSize(pMsg, (char*)msg); -- parser.SanitizeMsg(pMsg); -+ len = strlen((char*)msg); -+ MsgSetRawMsg(pMsg, (char*)msg, len); -+ if(len > 0) -+ parser.SanitizeMsg(pMsg); - MsgSetMSGoffs(pMsg, 0); /* we do not have a header... */ - MsgSetRcvFrom(pMsg, glbl.GetLocalHostNameProp()); - MsgSetRcvFromIP(pMsg, pLocalHostIP); --- -1.9.3 - diff --git a/rsyslog-8.10.0-resetconfigvariables.patch b/rsyslog-8.10.0-resetconfigvariables.patch deleted file mode 100644 index 82f7521..0000000 --- a/rsyslog-8.10.0-resetconfigvariables.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 4f6456f536076b32802959506389cf69f2b08d03 Mon Sep 17 00:00:00 2001 -From: Tomas Heinrich -Date: Thu, 25 Jun 2015 18:20:54 +0200 -Subject: [PATCH 2/4] Harmonize resetConfigVariables values and defaults - -Default values for several global and main message queue parameters -were defined in two places which, over time, became inconsistent. -This merges the code used in resetConfigVariables and the rsconf_t -constructor. In cases where values for the same parameter differed, -the value with a more recent commit timestamp was used. ---- - runtime/rsconf.c | 49 ++++++++++++++++--------------------------------- - 1 file changed, 16 insertions(+), 33 deletions(-) - -diff --git a/runtime/rsconf.c b/runtime/rsconf.c -index d6e0bdf..c5b6132 100644 ---- a/runtime/rsconf.c -+++ b/runtime/rsconf.c -@@ -122,9 +122,10 @@ static struct cnfparamblk parserpblk = - /* forward-definitions */ - void cnfDoCfsysline(char *ln); - --/* Standard-Constructor -- */ --BEGINobjConstruct(rsconf) /* be sure to specify the object type also in END macro! */ -+void cnfSetDefaults(rsconf_t *pThis) -+{ -+ pThis->globals.bAbortOnUncleanConfig = 0; -+ pThis->globals.bReduceRepeatMsgs = 0; - pThis->globals.bDebugPrintTemplateList = 1; - pThis->globals.bDebugPrintModuleList = 0; - pThis->globals.bDebugPrintCfSysLineHandlerList = 0; -@@ -135,9 +136,6 @@ BEGINobjConstruct(rsconf) /* be sure to specify the object type also in END macr - pThis->templates.last = NULL; - pThis->templates.lastStatic = NULL; - pThis->actions.nbrActions = 0; -- lookupInitCnf(&pThis->lu_tabs); -- CHKiRet(llInit(&pThis->rulesets.llRulesets, rulesetDestructForLinkedList, -- rulesetKeyDestruct, strcasecmp)); - /* queue params */ - pThis->globals.mainQ.iMainMsgQueueSize = 100000; - pThis->globals.mainQ.iMainMsgQHighWtrMark = 80000; -@@ -161,7 +159,16 @@ BEGINobjConstruct(rsconf) /* be sure to specify the object type also in END macr - pThis->globals.mainQ.bMainMsgQSaveOnShutdown = 1; - pThis->globals.mainQ.iMainMsgQueueDeqtWinFromHr = 0; - pThis->globals.mainQ.iMainMsgQueueDeqtWinToHr = 25; -- /* end queue params */ -+} -+ -+ -+/* Standard-Constructor -+ */ -+BEGINobjConstruct(rsconf) /* be sure to specify the object type also in END macro! */ -+ cnfSetDefaults(pThis); -+ lookupInitCnf(&pThis->lu_tabs); -+ CHKiRet(llInit(&pThis->rulesets.llRulesets, rulesetDestructForLinkedList, -+ rulesetKeyDestruct, strcasecmp)); - finalize_it: - ENDobjConstruct(rsconf) - -@@ -967,33 +974,9 @@ finalize_it: - /* legacy config system: reset config variables to default values. */ - static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __attribute__((unused)) *pVal) - { -- loadConf->globals.bLogStatusMsgs = DFLT_bLogStatusMsgs; -- loadConf->globals.bDebugPrintTemplateList = 1; -- loadConf->globals.bDebugPrintCfSysLineHandlerList = 1; -- loadConf->globals.bDebugPrintModuleList = 1; -- loadConf->globals.bAbortOnUncleanConfig = 0; -- loadConf->globals.bReduceRepeatMsgs = 0; - free(loadConf->globals.mainQ.pszMainMsgQFName); -- loadConf->globals.mainQ.pszMainMsgQFName = NULL; -- loadConf->globals.mainQ.iMainMsgQueueSize = 10000; -- loadConf->globals.mainQ.iMainMsgQHighWtrMark = 8000; -- loadConf->globals.mainQ.iMainMsgQLowWtrMark = 2000; -- loadConf->globals.mainQ.iMainMsgQDiscardMark = 9800; -- loadConf->globals.mainQ.iMainMsgQDiscardSeverity = 8; -- loadConf->globals.mainQ.iMainMsgQueMaxFileSize = 1024 * 1024; -- loadConf->globals.mainQ.iMainMsgQueueNumWorkers = 1; -- loadConf->globals.mainQ.iMainMsgQPersistUpdCnt = 0; -- loadConf->globals.mainQ.bMainMsgQSyncQeueFiles = 0; -- loadConf->globals.mainQ.iMainMsgQtoQShutdown = 1500; -- loadConf->globals.mainQ.iMainMsgQtoActShutdown = 1000; -- loadConf->globals.mainQ.iMainMsgQtoEnq = 2000; -- loadConf->globals.mainQ.iMainMsgQtoWrkShutdown = 60000; -- loadConf->globals.mainQ.iMainMsgQWrkMinMsgs = 100; -- loadConf->globals.mainQ.iMainMsgQDeqSlowdown = 0; -- loadConf->globals.mainQ.bMainMsgQSaveOnShutdown = 1; -- loadConf->globals.mainQ.MainMsgQueType = QUEUETYPE_FIXED_ARRAY; -- loadConf->globals.mainQ.iMainMsgQueMaxDiskSpace = 0; -- loadConf->globals.mainQ.iMainMsgQueDeqBatchSize = 32; -+ -+ cnfSetDefaults(loadConf); - - return RS_RET_OK; - } --- -1.9.3 - diff --git a/rsyslog-8.12.0-gnutls-detection.patch b/rsyslog-8.12.0-gnutls-detection.patch deleted file mode 100644 index cf645f2..0000000 --- a/rsyslog-8.12.0-gnutls-detection.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up ./configure.ac.fix ./configure.ac ---- ./configure.ac.fix 2015-08-10 12:25:41.000000000 +0200 -+++ ./configure.ac 2015-08-31 10:35:18.515110190 +0200 -@@ -763,17 +763,11 @@ AC_ARG_ENABLE(gnutls, - if test "x$enable_gnutls" = "xyes"; then - PKG_CHECK_MODULES(GNUTLS, gnutls >= 1.4.0) - AC_DEFINE([ENABLE_GNUTLS], [1], [Indicator that GnuTLS is present]) -- AC_CHECK_LIB( -- [gnutls], -- [gnutls_global_init], -- [ -- AC_DEFINE(HAVE_LIB_GNUTLS, 1, [gnutls is available]) -- ], -- [AC_MSG_WARN([gnutls_global_init function missing or not detected])], -- [] -- ) -+ save_libs=$LIBS -+ LIBS="$LIBS $GNUTLS_LIBS" - AC_CHECK_FUNCS(gnutls_certificate_set_retrieve_function,,) - AC_CHECK_FUNCS(gnutls_certificate_type_set_priority,,) -+ LIBS=$save_libs - fi - AM_CONDITIONAL(ENABLE_GNUTLS, test x$enable_gnutls = xyes) - diff --git a/rsyslog-8.8.0-imjournal-dflt-pri.patch b/rsyslog-8.8.0-imjournal-dflt-pri.patch deleted file mode 100644 index 738d52d..0000000 --- a/rsyslog-8.8.0-imjournal-dflt-pri.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f88f5d4f7e57a6f41b01d4e06f8d40dee4c0dbad Mon Sep 17 00:00:00 2001 -From: Tomas Heinrich -Date: Fri, 20 Mar 2015 18:17:05 +0100 -Subject: [PATCH] imjournal: fix default message priority - ---- - plugins/imjournal/imjournal.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/plugins/imjournal/imjournal.c b/plugins/imjournal/imjournal.c -index 7c2c2fa..b5866e8 100644 ---- a/plugins/imjournal/imjournal.c -+++ b/plugins/imjournal/imjournal.c -@@ -97,8 +97,8 @@ static struct cnfparamblk modpblk = - }; - - #define DFLT_persiststateinterval 10 --#define DFLT_SEVERITY pri2fac(LOG_NOTICE) --#define DFLT_FACILITY pri2sev(LOG_USER) -+#define DFLT_SEVERITY pri2sev(LOG_NOTICE) -+#define DFLT_FACILITY pri2fac(LOG_USER) - - static int bLegacyCnfModGlobalsPermitted = 1;/* are legacy module-global config parameters permitted? */ - --- -1.9.3 - diff --git a/rsyslog-8.8.0-missing-test-data.patch b/rsyslog-8.8.0-missing-test-data.patch deleted file mode 100644 index 8042de5..0000000 --- a/rsyslog-8.8.0-missing-test-data.patch +++ /dev/null @@ -1,45 +0,0 @@ -From e07210a7eb47df978b958d1489b91084732fdd47 Mon Sep 17 00:00:00 2001 -From: Tomas Heinrich -Date: Sun, 15 Mar 2015 16:25:33 +0100 -Subject: [PATCH] Add missing test data - ---- - tests/testsuites/mmnormalize_regex.rulebase | 1 + - tests/testsuites/mmnormalize_tokenized.rulebase | 5 +++++ - tests/testsuites/mmnormalize_variable.rulebase | 1 + - 3 files changed, 7 insertions(+) - create mode 100644 tests/testsuites/mmnormalize_regex.rulebase - create mode 100644 tests/testsuites/mmnormalize_tokenized.rulebase - create mode 100644 tests/testsuites/mmnormalize_variable.rulebase - -diff --git a/tests/testsuites/mmnormalize_regex.rulebase b/tests/testsuites/mmnormalize_regex.rulebase -new file mode 100644 -index 0000000..f58e8f2 ---- /dev/null -+++ b/tests/testsuites/mmnormalize_regex.rulebase -@@ -0,0 +1 @@ -+rule=:http host ports are %hps:regex:([0-9.\x3a]+(, )?)+% etc -\ No newline at end of file -diff --git a/tests/testsuites/mmnormalize_tokenized.rulebase b/tests/testsuites/mmnormalize_tokenized.rulebase -new file mode 100644 -index 0000000..da5242d ---- /dev/null -+++ b/tests/testsuites/mmnormalize_tokenized.rulebase -@@ -0,0 +1,5 @@ -+rule=only_ips:%only_ips:tokenized:, :ipv4% -+rule=local_ips:local ips are %local_ips:tokenized:, :ipv4% -+rule=external_ips:%external_ips:tokenized:, :ipv4% are external ips -+rule=paths:for %user:char-to:@%@localhost path was %fragments:tokenized:\x3a:char-sep:\x3a% -+rule=recur_comma_colon_nos:comma separated list of colon separated numbers: %some_nos:tokenized:, :tokenized: \x3a :tokenized:#:number% -\ No newline at end of file -diff --git a/tests/testsuites/mmnormalize_variable.rulebase b/tests/testsuites/mmnormalize_variable.rulebase -new file mode 100644 -index 0000000..4d40d4c ---- /dev/null -+++ b/tests/testsuites/mmnormalize_variable.rulebase -@@ -0,0 +1 @@ -+rule=hms:%hr:number%:%min:number%:%sec:number% %zone:word% -\ No newline at end of file --- -1.9.3 - diff --git a/rsyslog.spec b/rsyslog.spec index 470b8e0..638db9c 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -11,8 +11,8 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog -Version: 8.12.0 -Release: 3%{?dist} +Version: 8.21.0 +Release: 1%{?dist} License: (GPLv3+ and ASL 2.0) Group: System Environment/Daemons URL: http://www.rsyslog.com/ @@ -21,13 +21,6 @@ Source1: http://www.rsyslog.com/files/download/rsyslog/%{name}-doc-%{version}.ta Source2: rsyslog.conf Source3: rsyslog.sysconfig Source4: rsyslog.log -# tweak the upstream service file to honour configuration from /etc/sysconfig/rsyslog -Patch0: rsyslog-8.8.0-sd-service.patch -# prevent modification of trusted properties (proposed upstream) -Patch1: rsyslog-8.8.0-immutable-json-props.patch -# Fix detection of the GnuTLS package -# https://github.com/rsyslog/rsyslog/pull/476 -Patch2: rsyslog-8.12.0-gnutls-detection.patch BuildRequires: autoconf BuildRequires: automake @@ -54,6 +47,9 @@ Requires(postun): systemd Provides: syslog 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 + %package crypto Summary: Encryption support Group: System Environment/Daemons @@ -254,8 +250,6 @@ mv build doc # set up rsyslog sources %setup -q -D %patch0 -p1 -%patch1 -p1 -%patch2 -p1 autoreconf -iv @@ -506,6 +500,13 @@ done %{_libdir}/rsyslog/omudpspoof.so %changelog +* Wed Oct 05 2016 Radovan Sroka 8.21.0-1 +- rebase to 8.21.0 +- dropped rsyslog-8.12.0-gnutls-detection.patch +- dropped rsyslog-8.8.0-immutable-json-props.patch + - remove from specs but nor from git + - could be useful in future + * Thu Feb 04 2016 Fedora Release Engineering - 8.12.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 0168483..b7586a6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -c31c2d545c8a3b8695bdf076851d1517 rsyslog-8.12.0.tar.gz -8ec9d7a060450e92119bbf0dd28b624e rsyslog-doc-8.12.0.tar.gz +f9b89a192090cd56f80c2ff930b5fd30 rsyslog-8.21.0.tar.gz +cf08e576c71ce1379fdae7b74ccc623e rsyslog-doc-8.21.0.tar.gz