From 0b41c4d0e8cbf41f1d39884f7e1087b35b724abbd39183961da05726f299ef48 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Thu, 24 Mar 2011 12:29:01 +0000 Subject: [PATCH 1/3] - Updated to 5.6.5 (v5-stable) with following bugfixes: * bugfix: failover did not work correctly if repeated msg reduction was on * bugfix: omlibdbi did not use password from rsyslog.conf closes: http://bugzilla.adiscon.com/show_bug.cgi?id=203 * bugfix(kind of): tell users that config graph can currently not be generated closes: http://bugzilla.adiscon.com/show_bug.cgi?id=232 * bugfix: discard action did not work under some circumstances fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=217 * bugfix: potential abort condition when $RepeatedMsgReduction were set to on as well as potentially in a number of other places where MsgDup() was used. This only happened when the imudp input module was used and it depended on name resolution not yet had taken place. * bugfix: fixed a memory leak and potential abort condition this could happen if multiple rulesets were used and some output batches contained messages belonging to more than one ruleset. fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=226 fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=218 * bugfix: memory leak when $RepeatedMsgReduction on was used bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=225 - Merged systemd socket activation support OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=40 --- rsyslog-5.6.3.tar.bz2 | 3 --- rsyslog-5.6.5.tar.bz2 | 3 +++ rsyslog-systemd-integration.bnc656104.diff | 10 ++++---- rsyslog.changes | 27 ++++++++++++++++++++++ rsyslog.spec | 11 +++++---- 5 files changed, 42 insertions(+), 12 deletions(-) delete mode 100644 rsyslog-5.6.3.tar.bz2 create mode 100644 rsyslog-5.6.5.tar.bz2 diff --git a/rsyslog-5.6.3.tar.bz2 b/rsyslog-5.6.3.tar.bz2 deleted file mode 100644 index fb7dc2b..0000000 --- a/rsyslog-5.6.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:160d000a5200b4ef6451330d2f30509ef2c974f1850b834221ad8704c21c71d3 -size 1846846 diff --git a/rsyslog-5.6.5.tar.bz2 b/rsyslog-5.6.5.tar.bz2 new file mode 100644 index 0000000..262f355 --- /dev/null +++ b/rsyslog-5.6.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:38c5f3639d316d1fd78bb933a701063be0910977c71ba775fabac0eb3f94c013 +size 1848178 diff --git a/rsyslog-systemd-integration.bnc656104.diff b/rsyslog-systemd-integration.bnc656104.diff index 5bff472..fd96b49 100644 --- a/rsyslog-systemd-integration.bnc656104.diff +++ b/rsyslog-systemd-integration.bnc656104.diff @@ -31,15 +31,15 @@ Date: Tue Sep 7 13:06:04 2010 +0200 [skipped whitespace-only changes -- mt@suse.de] diff --git a/ChangeLog b/ChangeLog -index 72e2946..8b7c7b7 100644 +index 89d5711..1e2aaa7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +- acquire /dev/log socket optionally from systemd + thanks to Lennart Poettering for this patch --------------------------------------------------------------------------- - Version 5.6.3 [V5-STABLE] (rgerhards), 2011-01-26 - - bugfix: action processor released mememory too early, resulting in + Version 5.6.5 [V5-STABLE] (rgerhards), 2011-03-22 + - bugfix: failover did not work correctly if repeated msg reduction was on diff --git a/plugins/imuxsock/Makefile.am b/plugins/imuxsock/Makefile.am index a2fe0ba..28f9f9e 100644 --- a/plugins/imuxsock/Makefile.am @@ -870,7 +870,7 @@ index 0000000..45aac8b + +#endif diff --git a/tools/syslogd.c b/tools/syslogd.c -index ffcaa27..37c3848 100644 +index 1148108..e18101c 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -135,6 +135,7 @@ @@ -881,7 +881,7 @@ index ffcaa27..37c3848 100644 /* definitions for objects we access */ DEFobjCurrIf(obj) -@@ -2428,10 +2429,44 @@ doGlblProcessInit(void) +@@ -2433,10 +2434,44 @@ doGlblProcessInit(void) */ exit(1); /* "good" exit - after forking, not diasabling anything */ } diff --git a/rsyslog.changes b/rsyslog.changes index 3edb08a..d55a954 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Thu Mar 24 12:21:00 UTC 2011 - mt@suse.de + +- Updated to 5.6.5 (v5-stable) with following bugfixes: + * bugfix: failover did not work correctly if repeated msg + reduction was on + * bugfix: omlibdbi did not use password from rsyslog.conf + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=203 + * bugfix(kind of): tell users that config graph can currently + not be generated + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=232 + * bugfix: discard action did not work under some circumstances + fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=217 + * bugfix: potential abort condition when $RepeatedMsgReduction + were set to on as well as potentially in a number of other places + where MsgDup() was used. This only happened when the imudp input + module was used and it depended on name resolution not yet had + taken place. + * bugfix: fixed a memory leak and potential abort condition + this could happen if multiple rulesets were used and some output + batches contained messages belonging to more than one ruleset. + fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=226 + fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=218 + * bugfix: memory leak when $RepeatedMsgReduction on was used + bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=225 +- Merged systemd socket activation support + ------------------------------------------------------------------- Wed Feb 2 16:47:24 UTC 2011 - mt@suse.de diff --git a/rsyslog.spec b/rsyslog.spec index 3e47c17..f6f18dc 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -1,7 +1,7 @@ # -# spec file for package rsyslog (Version 5.6.3) +# spec file for package rsyslog # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,9 +20,9 @@ Name: rsyslog Summary: The enhanced syslogd for Linux and Unix -Version: 5.6.3 +Version: 5.6.5 Release: 1 -%define upstream_version 5.6.3 +%define upstream_version 5.6.5 %define with_dbi 0%{?suse_version} >= 1140 || 0%{?build_with_relp:1} %define with_relp 0%{?suse_version} >= 1130 || 0%{?build_with_relp:1} %define _sbindir /sbin @@ -142,6 +142,7 @@ package. This module provides the support for logging into PostgreSQL databases. %if 0%{?with_dbi} + %package module-dbi License: GPLv3+ Group: System/Daemons @@ -498,6 +499,7 @@ fi %{rsyslog_module_dir_withdeps}/ompgsql.so %if 0%{?with_dbi} + %files module-dbi %defattr(-,root,root) %{rsyslog_module_dir_withdeps}/omlibdbi.so @@ -512,6 +514,7 @@ fi %{rsyslog_module_dir_withdeps}/lmnsd_gtls.so %if 0%{?with_relp} + %files module-relp %defattr(-,root,root) %{rsyslog_module_dir_withdeps}/imrelp.so From ad16d411d1ef1b16acb41b2656463766637250b7dfaa7b64be2ed0011514b910 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Thu, 24 Mar 2011 13:34:14 +0000 Subject: [PATCH 2/3] reduction was on. affected directive: $ActionExecOnlyWhenPreviousIsSuspended on OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=41 --- rsyslog.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rsyslog.changes b/rsyslog.changes index d55a954..148e5e8 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -3,7 +3,8 @@ Thu Mar 24 12:21:00 UTC 2011 - mt@suse.de - Updated to 5.6.5 (v5-stable) with following bugfixes: * bugfix: failover did not work correctly if repeated msg - reduction was on + reduction was on. + affected directive: $ActionExecOnlyWhenPreviousIsSuspended on * bugfix: omlibdbi did not use password from rsyslog.conf closes: http://bugzilla.adiscon.com/show_bug.cgi?id=203 * bugfix(kind of): tell users that config graph can currently From 5288ed8f8306341c4431b7f7b4aee0b33e17d28a3c202aff0afa622dacd1b16b Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Thu, 24 Mar 2011 16:37:25 +0000 Subject: [PATCH 3/3] Added bnc#676041, bnc#679030, bnc#681568 to the changelog OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=42 --- rsyslog.changes | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rsyslog.changes b/rsyslog.changes index 148e5e8..f469edd 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Thu Mar 24 12:21:00 UTC 2011 - mt@suse.de +Thu Mar 24 16:34:31 UTC 2011 - mt@suse.de - Updated to 5.6.5 (v5-stable) with following bugfixes: * bugfix: failover did not work correctly if repeated msg @@ -12,11 +12,12 @@ Thu Mar 24 12:21:00 UTC 2011 - mt@suse.de closes: http://bugzilla.adiscon.com/show_bug.cgi?id=232 * bugfix: discard action did not work under some circumstances fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=217 + (bnc#676041) * bugfix: potential abort condition when $RepeatedMsgReduction were set to on as well as potentially in a number of other places where MsgDup() was used. This only happened when the imudp input module was used and it depended on name resolution not yet had - taken place. + taken place. (bnc#679030) * bugfix: fixed a memory leak and potential abort condition this could happen if multiple rulesets were used and some output batches contained messages belonging to more than one ruleset. @@ -24,6 +25,7 @@ Thu Mar 24 12:21:00 UTC 2011 - mt@suse.de fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=218 * bugfix: memory leak when $RepeatedMsgReduction on was used bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=225 + (bnc#681568) - Merged systemd socket activation support -------------------------------------------------------------------