Accepting request 135222 from Base:System
start failure workaround for a syslogd config parser compatibility issue (bnc#780607) OBS-URL: https://build.opensuse.org/request/show/135222 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rsyslog?expand=0&rev=56
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
661d498ae8
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5962bd9a1194e1acda933820ab33fee0b7fb5425904377ed922c90b2fe8027bc
|
||||
size 2530470
|
||||
@ -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;
|
||||
}
|
||||
|
||||
|
||||
3
rsyslog-6.4.2.tar.gz
Normal file
3
rsyslog-6.4.2.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ca92434c87f7390a5ea7ce6aea94c6cb05474bf778ec5d8ebc0b9a50f321749c
|
||||
size 2518961
|
||||
@ -1,3 +1,66 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 21 08:09:46 UTC 2012 - mt@suse.com
|
||||
|
||||
- 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
|
||||
|
||||
- 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
|
||||
|
||||
- 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
|
||||
|
||||
- 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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
###
|
||||
|
||||
14
rsyslog.spec
14
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.2
|
||||
Release: 0
|
||||
# for setting those bcond_with* configs see
|
||||
# http://lizards.opensuse.org/2008/09/12/conditional-features-aka-use-flags/
|
||||
@ -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
|
||||
@ -496,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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user