From 312b49b6e1ae5d247fec8c0a8cb50c336d4c161ebb10a806921ecbd96502d714 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Mon, 17 Sep 2012 12:17:44 +0000 Subject: [PATCH 1/5] =?UTF-8?q?-=20Update=20to=206.4.1=20=20[V6-STABLE]=20?= =?UTF-8?q?2012-09-06:=20=20=20-=20bugfix:=20multiple=20main=20queues=20wi?= =?UTF-8?q?th=20same=20queue=20file=20name=20were=20not=20=20=20=20=20dete?= =?UTF-8?q?cted.=20=20This=20lead=20to=20queue=20file=20corruption.=20Whil?= =?UTF-8?q?e=20the=20root=20=20=20=20=20cause=20is=20a=20config=20error,?= =?UTF-8?q?=20it=20is=20a=20bug=20that=20this=20important=20and=20=20=20?= =?UTF-8?q?=20=20hard=20to=20find=20config=20error=20was=20not=20detected?= =?UTF-8?q?=20by=20rsyslog.=20=20=20-=20bugfix:=20=E2=80=9Cjsonf=E2=80=9D?= =?UTF-8?q?=20property=20replacer=20option=20did=20generate=20invalid=20?= =?UTF-8?q?=20=20=20=20JSON=20in=20JSON,=20we=20have=20=E2=80=9Cfieldname?= =?UTF-8?q?=E2=80=9D:=E2=80=9Dvalue=E2=80=9D,=20but=20the=20option=20=20?= =?UTF-8?q?=20=20=20emitted=20=E2=80=9Cfieldname=E2=80=9D=3D=E2=80=9Dvalue?= =?UTF-8?q?=E2=80=9D.=20Interestingly,=20this=20was=20accepted=20=20=20=20?= =?UTF-8?q?=20by=20a=20couple=20of=20sinks,=20most=20importantly=20elastic?= =?UTF-8?q?search.=20Now=20the=20=20=20=20=20correct=20format=20is=20emitt?= =?UTF-8?q?ed,=20which=20causes=20a=20remote=20chance=20that=20=20=20=20?= =?UTF-8?q?=20some=20things=20that=20relied=20on=20the=20wrong=20format=20?= =?UTF-8?q?will=20break.=20=20=20=20=20Thanks=20to=20Miloslav=20Trma=C4=8D?= =?UTF-8?q?=20for=20the=20patch=20=20=20-=20change=20$!all-json=20did=20em?= =?UTF-8?q?it=20an=20empty=20(thus=20non-JSON)=20string=20if=20=20=20=20?= =?UTF-8?q?=20no=20libee=20data=20was=20present.=20It=20now=20emits=20{}?= =?UTF-8?q?=20and=20thus=20valid=20JSON.=20=20=20=20=20There=20is=20a=20sm?= =?UTF-8?q?all=20risk=20that=20this=20may=20break=20some=20things=20that?= =?UTF-8?q?=20=20=20=20=20relied=20on=20the=20previous=20inconsistency.=20?= =?UTF-8?q?Thanks=20to=20Miloslav=20Trma=C4=8D=20=20=20=20=20for=20the=20p?= =?UTF-8?q?atch=20=20=20-=20bugfix:=20omusrsmsg=20incorrect=20return=20sta?= =?UTF-8?q?te=20&=20config=20warning=20=20=20=20=20handling.=20During=20co?= =?UTF-8?q?nfig=20file=20processing,=20Omusrmsg=20often=20=20=20=20=20inco?= =?UTF-8?q?rrectly=20returned=20a=20warning=20status,=20even=20when=20no?= =?UTF-8?q?=20warning=20was=20=20=20=20=20present=20(caused=20by=20uniniti?= =?UTF-8?q?alized=20variable).=20Also,=20the=20core=20=20=20=20=20handled?= =?UTF-8?q?=20warning=20messages=20incorrectly,=20and=20treated=20them=20a?= =?UTF-8?q?s=20=20=20=20=20errors.=20As=20a=20result,=20omusrmsg=20(most?= =?UTF-8?q?=20often)=20could=20not=20properly=20be=20=20=20=20=20loaded.?= =?UTF-8?q?=20Note=20that=20this=20only=20occurs=20with=20legacy=20config?= =?UTF-8?q?=20action=20=20=20=20=20syntax.=20This=20was=20a=20regression?= =?UTF-8?q?=20caused=20by=20an=20incorrect=20merge=20in=20to=20=20=20=20?= =?UTF-8?q?=20the=206.3.x=20codebase.=20=20=20=20=20Thanks=20to=20Stefano?= =?UTF-8?q?=20Mason=20for=20alerting=20us=20of=20this=20bug.=20=20=20-=20b?= =?UTF-8?q?ugfix:=20Fixed=20TCP=20CheckConnection=20handling=20in=20omfwd.?= =?UTF-8?q?c.=20Interface=20=20=20=20=20needed=20to=20be=20changed=20in=20?= =?UTF-8?q?lower=20stream=20classes.=20Syslog=20TCP=20Sending=20=20=20=20?= =?UTF-8?q?=20is=20now=20resumed=20properly.=20Unfixed,=20that=20lead=20to?= =?UTF-8?q?=20non-detection=20of?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=93 --- rsyslog-6.4.0.tar.gz | 3 --- rsyslog-6.4.1.tar.gz | 3 +++ rsyslog.changes | 35 +++++++++++++++++++++++++++++++++++ rsyslog.spec | 2 +- 4 files changed, 39 insertions(+), 4 deletions(-) delete mode 100644 rsyslog-6.4.0.tar.gz create mode 100644 rsyslog-6.4.1.tar.gz diff --git a/rsyslog-6.4.0.tar.gz b/rsyslog-6.4.0.tar.gz deleted file mode 100644 index 8365253..0000000 --- a/rsyslog-6.4.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5962bd9a1194e1acda933820ab33fee0b7fb5425904377ed922c90b2fe8027bc -size 2530470 diff --git a/rsyslog-6.4.1.tar.gz b/rsyslog-6.4.1.tar.gz new file mode 100644 index 0000000..272a33d --- /dev/null +++ b/rsyslog-6.4.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6150e81f3338c8624c0e91dbfc83ce753b180993f12a211525a4ac59891efb21 +size 2526465 diff --git a/rsyslog.changes b/rsyslog.changes index 26c214e..dd555a1 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Mon Sep 17 12:13:04 UTC 2012 - mt@suse.com + +- Update to 6.4.1 [V6-STABLE] 2012-09-06: + - bugfix: multiple main queues with same queue file name were not + detected. This lead to queue file corruption. While the root + cause is a config error, it is a bug that this important and + hard to find config error was not detected by rsyslog. + - bugfix: “jsonf” property replacer option did generate invalid + JSON in JSON, we have “fieldname”:”value”, but the option + emitted “fieldname”=”value”. Interestingly, this was accepted + by a couple of sinks, most importantly elasticsearch. Now the + correct format is emitted, which causes a remote chance that + some things that relied on the wrong format will break. + Thanks to Miloslav Trmač for the patch + - change $!all-json did emit an empty (thus non-JSON) string if + no libee data was present. It now emits {} and thus valid JSON. + There is a small risk that this may break some things that + relied on the previous inconsistency. Thanks to Miloslav Trmač + for the patch + - bugfix: omusrsmsg incorrect return state & config warning + handling. During config file processing, Omusrmsg often + incorrectly returned a warning status, even when no warning was + present (caused by uninitialized variable). Also, the core + handled warning messages incorrectly, and treated them as + errors. As a result, omusrmsg (most often) could not properly be + loaded. Note that this only occurs with legacy config action + syntax. This was a regression caused by an incorrect merge in to + the 6.3.x codebase. + Thanks to Stefano Mason for alerting us of this bug. + - bugfix: Fixed TCP CheckConnection handling in omfwd.c. Interface + needed to be changed in lower stream classes. Syslog TCP Sending + is now resumed properly. Unfixed, that lead to non-detection of + downstate of remote hosts. + ------------------------------------------------------------------- Tue Sep 4 18:32:29 UTC 2012 - andreas.stieger@gmx.de diff --git a/rsyslog.spec b/rsyslog.spec index c012c4c..445690a 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -20,7 +20,7 @@ Name: rsyslog Summary: The enhanced syslogd for Linux and Unix License: (GPL-3.0+ and Apache-2.0) Group: System/Daemons -Version: 6.4.0 +Version: 6.4.1 Release: 0 # for setting those bcond_with* configs see # http://lizards.opensuse.org/2008/09/12/conditional-features-aka-use-flags/ From 2d6fe309821f88b1d9ccbe631f55fc308ba62d265454486c96b9ba381dadbb0d Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Thu, 20 Sep 2012 21:33:30 +0000 Subject: [PATCH 2/5] Accepting request 135188 from home:AndreasStieger:rsyslog:v6-stable - add rsyslog-6.4.1-CheckConnection-no-return-in-nonvoid-function.patch to fix rsyslog no-return-in-nonvoid-function netstrm.c:258 in CheckConnection() OBS-URL: https://build.opensuse.org/request/show/135188 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=94 --- ...onnection-no-return-in-nonvoid-function.patch | 16 ++++++++++++++++ rsyslog.changes | 7 +++++++ rsyslog.spec | 3 +++ 3 files changed, 26 insertions(+) create mode 100644 rsyslog-6.4.1-CheckConnection-no-return-in-nonvoid-function.patch diff --git a/rsyslog-6.4.1-CheckConnection-no-return-in-nonvoid-function.patch b/rsyslog-6.4.1-CheckConnection-no-return-in-nonvoid-function.patch new file mode 100644 index 0000000..0d467b2 --- /dev/null +++ b/rsyslog-6.4.1-CheckConnection-no-return-in-nonvoid-function.patch @@ -0,0 +1,16 @@ +Index: runtime/netstrm.c +=================================================================== +--- runtime/netstrm.c.orig 2012-09-06 11:00:51.000000000 +0100 ++++ runtime/netstrm.c 2012-09-20 22:26:02.000000000 +0100 +@@ -253,8 +253,10 @@ EnableKeepAlive(netstrm_t *pThis) + static rsRetVal + CheckConnection(netstrm_t *pThis) + { ++ DEFiRet; + ISOBJ_TYPE_assert(pThis, netstrm); +- pThis->Drvr.CheckConnection(pThis->pDrvrData); ++ iRet = pThis->Drvr.CheckConnection(pThis->pDrvrData); ++ RETiRet; + } + + diff --git a/rsyslog.changes b/rsyslog.changes index dd555a1..ca798fe 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 20 21:20:17 UTC 2012 - andreas.stieger@gmx.de + +- add rsyslog-6.4.1-CheckConnection-no-return-in-nonvoid-function.patch + to fix rsyslog no-return-in-nonvoid-function netstrm.c:258 in + CheckConnection() + ------------------------------------------------------------------- Mon Sep 17 12:13:04 UTC 2012 - mt@suse.com diff --git a/rsyslog.spec b/rsyslog.spec index 445690a..eac78b0 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -129,6 +129,8 @@ Source3: rsyslog.early.conf.in Source4: rsyslog.d.remote.conf.in #PATCH-FIX-OPENSUSE rsyslog-6.3.11-glblCheckCnf-no-return-in-nonvoid-function.patch andreas.stieger@gmx.de -- fix compiler error Patch0: rsyslog-6.3.11-glblCheckCnf-no-return-in-nonvoid-function.patch +#PATCH-FIX-OPENSUSE rsyslog-6.4.1-CheckConnection-no-return-in-nonvoid-function.patch andreas.stieger@gmx.de -- fix compiler error +Patch1: rsyslog-6.4.1-CheckConnection-no-return-in-nonvoid-function.patch %description Rsyslog is an enhanced multi-threaded syslogd supporting, among others, @@ -295,6 +297,7 @@ This module provides a UDP forwarder that allows changing the sender address. %prep %setup -q -n %{name}-%{upstream_version} %patch0 +%patch1 %if %{with systemd} %if 0%{?suse_version} <= 1140 # Bug: https://bugzilla.novell.com/show_bug.cgi?id=656259 From 139c655777caa1321effabea75964fa1455144c677704fcead2aefbf7b334085 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Thu, 20 Sep 2012 21:52:28 +0000 Subject: [PATCH 3/5] Accepting request 135190 from home:AndreasStieger:rsyslog:v6-stable - update to 6.4.2 [V6-STABLE] 2012-09-20 OBS-URL: https://build.opensuse.org/request/show/135190 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=95 --- rsyslog-6.4.1.tar.gz | 3 --- rsyslog-6.4.2.tar.gz | 3 +++ rsyslog.changes | 11 +++++++++++ rsyslog.spec | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) delete mode 100644 rsyslog-6.4.1.tar.gz create mode 100644 rsyslog-6.4.2.tar.gz diff --git a/rsyslog-6.4.1.tar.gz b/rsyslog-6.4.1.tar.gz deleted file mode 100644 index 272a33d..0000000 --- a/rsyslog-6.4.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6150e81f3338c8624c0e91dbfc83ce753b180993f12a211525a4ac59891efb21 -size 2526465 diff --git a/rsyslog-6.4.2.tar.gz b/rsyslog-6.4.2.tar.gz new file mode 100644 index 0000000..cebb535 --- /dev/null +++ b/rsyslog-6.4.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca92434c87f7390a5ea7ce6aea94c6cb05474bf778ec5d8ebc0b9a50f321749c +size 2518961 diff --git a/rsyslog.changes b/rsyslog.changes index ca798fe..1c028aa 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Sep 20 21:39:48 UTC 2012 - andreas.stieger@gmx.de + +- update to 6.4.2 [V6-STABLE] 2012-09-20: + - bugfix: potential abort, if action queue could not be properly + started + - bugfix: remove invalid socket option call from imuxsock + - bugfix: missing support for escape sequences in RainerScript + - bugfix: config validation run did not always return correct + return state + ------------------------------------------------------------------- Thu Sep 20 21:20:17 UTC 2012 - andreas.stieger@gmx.de diff --git a/rsyslog.spec b/rsyslog.spec index eac78b0..c5725ea 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -20,7 +20,7 @@ Name: rsyslog Summary: The enhanced syslogd for Linux and Unix License: (GPL-3.0+ and Apache-2.0) Group: System/Daemons -Version: 6.4.1 +Version: 6.4.2 Release: 0 # for setting those bcond_with* configs see # http://lizards.opensuse.org/2008/09/12/conditional-features-aka-use-flags/ From 1dc062119a5318de19350a57af1374ff35731ffc482f5315ea1376484d7c9f47 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Fri, 21 Sep 2012 08:39:27 +0000 Subject: [PATCH 4/5] - Changed the default /etc/rsyslog.conf we install to not use multiple facilities with the same priority pattern in one statement using the comma operator. This started to cause a start failure with rsyslog-6.4.x (bnc#780607) and seems to be a bug in rsyslog (upstream verify in progress). OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=96 --- rsyslog.changes | 9 +++++++++ rsyslog.conf.in | 8 ++++---- rsyslog.spec | 9 +++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/rsyslog.changes b/rsyslog.changes index 1c028aa..60a039f 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Sep 21 08:09:46 UTC 2012 - mt@suse.com + +- Changed the default /etc/rsyslog.conf we install to not use + multiple facilities with the same priority pattern in one + statement using the comma operator. This started to cause a + start failure with rsyslog-6.4.x (bnc#780607) and seems to + be a bug in rsyslog (upstream verify in progress). + ------------------------------------------------------------------- Thu Sep 20 21:39:48 UTC 2012 - andreas.stieger@gmx.de diff --git a/rsyslog.conf.in b/rsyslog.conf.in index 4612929..fc37ad8 100644 --- a/rsyslog.conf.in +++ b/rsyslog.conf.in @@ -158,9 +158,9 @@ news.notice -/var/log/news/news.notice # # Some foreign boot scripts require local7 # -local0,local1.* -/var/log/localmessages -local2,local3.* -/var/log/localmessages -local4,local5.* -/var/log/localmessages -local6,local7.* -/var/log/localmessages +local0.*,local1.* -/var/log/localmessages +local2.*,local3.* -/var/log/localmessages +local4.*,local5.* -/var/log/localmessages +local6.*,local7.* -/var/log/localmessages ### diff --git a/rsyslog.spec b/rsyslog.spec index c5725ea..a35dba3 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -499,6 +499,15 @@ if test "$replace_syslog" = "yes" ; then etc/sysconfig/syslog fi # +# Do not use multiple facilities with the same priority pattern. +# It causes start failure since rsyslog-6.4.x (bnc#780607). +# +# FIXME: it seems to be a valid syntax -> rsyslog bug? +# +if grep -qs '^local[0246],' etc/rsyslog.conf ; then + sed -i -e 's/^local\([0246]\),/local\1.*,/g' etc/rsyslog.conf +fi +# # create dirs, touch log default files # mkdir -p var/log From 26cc15db8c3efe0e5f348d10a76dcb0dcd18c90152df4496e7c81ec125e3f29e Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Fri, 21 Sep 2012 08:56:08 +0000 Subject: [PATCH 5/5] - Changed default /etc/rsyslog.conf we install to not use multiple facilities with the same priority pattern in one statement using the comma operator. This started to cause a start failure with rsyslog-6.4.x (bnc#780607) and seems to be a bug in rsyslog. Upstream report http://bugzilla.adiscon.com/show_bug.cgi?id=358, switched to use alternative syntax using semicolon separator. OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=97 --- rsyslog.changes | 11 ++++++----- rsyslog.conf.in | 8 ++++---- rsyslog.spec | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/rsyslog.changes b/rsyslog.changes index 60a039f..b2f4f01 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,11 +1,12 @@ ------------------------------------------------------------------- Fri Sep 21 08:09:46 UTC 2012 - mt@suse.com -- Changed the default /etc/rsyslog.conf we install to not use - multiple facilities with the same priority pattern in one - statement using the comma operator. This started to cause a - start failure with rsyslog-6.4.x (bnc#780607) and seems to - be a bug in rsyslog (upstream verify in progress). +- Changed default /etc/rsyslog.conf we install to not use multiple + facilities with the same priority pattern in one statement using + the comma operator. This started to cause a start failure with + rsyslog-6.4.x (bnc#780607) and seems to be a bug in rsyslog. + Upstream report http://bugzilla.adiscon.com/show_bug.cgi?id=358, + switched to use alternative syntax using semicolon separator. ------------------------------------------------------------------- Thu Sep 20 21:39:48 UTC 2012 - andreas.stieger@gmx.de diff --git a/rsyslog.conf.in b/rsyslog.conf.in index fc37ad8..39fdfd0 100644 --- a/rsyslog.conf.in +++ b/rsyslog.conf.in @@ -158,9 +158,9 @@ news.notice -/var/log/news/news.notice # # Some foreign boot scripts require local7 # -local0.*,local1.* -/var/log/localmessages -local2.*,local3.* -/var/log/localmessages -local4.*,local5.* -/var/log/localmessages -local6.*,local7.* -/var/log/localmessages +local0.*;local1.* -/var/log/localmessages +local2.*;local3.* -/var/log/localmessages +local4.*;local5.* -/var/log/localmessages +local6.*;local7.* -/var/log/localmessages ### diff --git a/rsyslog.spec b/rsyslog.spec index a35dba3..9a98572 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -505,7 +505,7 @@ fi # FIXME: it seems to be a valid syntax -> rsyslog bug? # if grep -qs '^local[0246],' etc/rsyslog.conf ; then - sed -i -e 's/^local\([0246]\),/local\1.*,/g' etc/rsyslog.conf + sed -i -e 's/^local\([0246]\),/local\1.*;/g' etc/rsyslog.conf fi # # create dirs, touch log default files