From 4bab856a1b51f8ee3a84967b4d5deb8ed00638e2cf45368030e4ed8a518be7d9 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Fri, 29 Apr 2011 12:54:06 +0000 Subject: [PATCH 1/4] Accepting request 68832 from home:namtrac:branches:Base:System Fix possible memcpy overflow, found by gcc 4.6 OBS-URL: https://build.opensuse.org/request/show/68832 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=51 --- rsyslog-5.8.0-memcpy.patch | 11 +++++++++++ rsyslog.changes | 6 ++++++ rsyslog.spec | 3 +++ 3 files changed, 20 insertions(+) create mode 100644 rsyslog-5.8.0-memcpy.patch diff --git a/rsyslog-5.8.0-memcpy.patch b/rsyslog-5.8.0-memcpy.patch new file mode 100644 index 0000000..b1d19e1 --- /dev/null +++ b/rsyslog-5.8.0-memcpy.patch @@ -0,0 +1,11 @@ +--- runtime/net.c 2011-03-22 12:27:49.000000000 +0100 ++++ runtime/net.c 2011-04-29 13:30:47.249997266 +0200 +@@ -721,7 +721,7 @@ + SIN(allowIP.addr.NetAddr)->sin_port = 0; + memcpy(&(SIN(allowIP.addr.NetAddr)->sin_addr.s_addr), + &(SIN6(res->ai_addr)->sin6_addr.s6_addr32[3]), +- sizeof (struct sockaddr_in)); ++ sizeof (in_addr_t)); + + if((iRet = AddAllowedSenderEntry(ppRoot, ppLast, &allowIP, + iSignificantBits)) diff --git a/rsyslog.changes b/rsyslog.changes index 52a9665..f0b7149 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 29 11:38:40 UTC 2011 - idoenmez@novell.com + +- Add rsyslog-5.6.5-memcpy.patch: fix overflowing memcpy call in + runtime/net.c + ------------------------------------------------------------------- Wed Apr 27 16:19:31 UTC 2011 - mrueckert@suse.de diff --git a/rsyslog.spec b/rsyslog.spec index 357816f..a97c435 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -105,6 +105,8 @@ Source1: rsyslog.sysconfig Source2: rsyslog.conf.in Source3: rsyslog.early.conf.in Source4: rsyslog.d.remote.conf.in +# PATCH-FIX-UPSTREAM rsyslog-5.6.5-memcpy.patch idoenmez@suse.de -- Fix overflowing memcpy call +Patch1: rsyslog-5.8.0-memcpy.patch %description Rsyslog is an enhanced multi-threaded syslogd supporting, among others, @@ -258,6 +260,7 @@ This module provides a UDP forwarder that allows changing the sender address. %prep %setup -q -n %{name}-%{upstream_version} +%patch1 %if %{with systemd} # Bug: https://bugzilla.novell.com/show_bug.cgi?id=656259 # install the files systemd provides rather than what we provide. From 88d066bbd644007ae95a89298dccbfa118f4844d6d1e82510df3f918a9ae4126 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 5 May 2011 08:05:37 +0000 Subject: [PATCH 2/4] Accepting request 69430 from Base:System baserev update by copy to link target OBS-URL: https://build.opensuse.org/request/show/69430 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=53 --- rsyslog.spec | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/rsyslog.spec b/rsyslog.spec index a97c435..8fe6d2b 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -21,7 +21,7 @@ Name: rsyslog Summary: The enhanced syslogd for Linux and Unix Version: 5.8.0 -Release: 2 +Release: 1 # for setting those bcond_with* configs see # http://lizards.opensuse.org/2008/09/12/conditional-features-aka-use-flags/ %if 0%{?suse_version} >= 1140 @@ -143,6 +143,7 @@ This package provides additional diagnostic tools (small helpers, usually not needed). %if %{with gssapi} + %package module-gssapi License: GPLv3+ Group: System/Daemons @@ -158,6 +159,7 @@ network protected via Kerberos 5 encryption and authentication. %endif %if %{with mysql} + %package module-mysql License: GPLv3+ Group: System/Daemons @@ -173,6 +175,7 @@ databases. %endif %if %{with pgsql} + %package module-pgsql License: GPLv3+ Group: System/Daemons @@ -187,6 +190,7 @@ This module provides the support for logging into PostgreSQL databases. %endif %if %{with dbi} + %package module-dbi License: GPLv3+ Group: System/Daemons @@ -202,6 +206,7 @@ supported databases. %endif %if %{with snmp} + %package module-snmp License: GPLv3+ Group: System/Daemons @@ -217,6 +222,7 @@ v2c traps. %endif %if %{with gnutls} + %package module-gtls License: GPLv3+ Group: System/Daemons @@ -232,6 +238,7 @@ on current syslog-transport-tls internet drafts). %endif %if %{with relp} + %package module-relp License: GPLv3+ Group: System/Daemons @@ -563,6 +570,7 @@ fi %{_sbindir}/zpipe %if %{with gssapi} + %files module-gssapi %defattr(-,root,root) %{rsyslog_module_dir_withdeps}/omgssapi.so @@ -571,6 +579,7 @@ fi %endif %if %{with mysql} + %files module-mysql %defattr(-,root,root) %doc %{rsyslogdocdir}/mysql-createDB.sql @@ -578,6 +587,7 @@ fi %endif %if %{with pgsql} + %files module-pgsql %defattr(-,root,root) %doc %{rsyslogdocdir}/pgsql-createDB.sql @@ -585,24 +595,28 @@ fi %endif %if %{with dbi} + %files module-dbi %defattr(-,root,root) %{rsyslog_module_dir_withdeps}/omlibdbi.so %endif %if %{with snmp} + %files module-snmp %defattr(-,root,root) %{rsyslog_module_dir_withdeps}/omsnmp.so %endif %if %{with gnutls} + %files module-gtls %defattr(-,root,root) %{rsyslog_module_dir_withdeps}/lmnsd_gtls.so %endif %if %{with relp} + %files module-relp %defattr(-,root,root) %{rsyslog_module_dir_withdeps}/imrelp.so From d9a273d7aa1bc6a58cd2352dc0b0f765b2cd8b99dbd7e7a890bcda850e5eb0ae Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 5 May 2011 08:05:47 +0000 Subject: [PATCH 3/4] Updating link to change in openSUSE:Factory/rsyslog revision 29.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=20f6bfb1c8c8f8ba7209f880512bd68f --- rsyslog.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rsyslog.spec b/rsyslog.spec index 8fe6d2b..1e624fd 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -21,7 +21,7 @@ Name: rsyslog Summary: The enhanced syslogd for Linux and Unix Version: 5.8.0 -Release: 1 +Release: 4 # for setting those bcond_with* configs see # http://lizards.opensuse.org/2008/09/12/conditional-features-aka-use-flags/ %if 0%{?suse_version} >= 1140 From a9386218ebfad569c6f24a2f4a8f563009bdfb989333885438149af445866c4c Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Thu, 19 May 2011 16:08:03 +0000 Subject: [PATCH 4/4] Accepting request 70721 from home:darix:branches:Base:System - update to 5.8.1 OBS-URL: https://build.opensuse.org/request/show/70721 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=54 --- rsyslog-5.8.0.tar.bz2 | 3 --- rsyslog-5.8.1.tar.bz2 | 3 +++ rsyslog.changes | 52 +++++++++++++++++++++++++++++++++++++++++++ rsyslog.spec | 4 ++-- 4 files changed, 57 insertions(+), 5 deletions(-) delete mode 100644 rsyslog-5.8.0.tar.bz2 create mode 100644 rsyslog-5.8.1.tar.bz2 diff --git a/rsyslog-5.8.0.tar.bz2 b/rsyslog-5.8.0.tar.bz2 deleted file mode 100644 index 9a712f9..0000000 --- a/rsyslog-5.8.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ca538374f347eddff5f827f8f14792b0f3cda82dbbeecfe6509ea65e3a5f779 -size 1904404 diff --git a/rsyslog-5.8.1.tar.bz2 b/rsyslog-5.8.1.tar.bz2 new file mode 100644 index 0000000..3d2be71 --- /dev/null +++ b/rsyslog-5.8.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3af89801da9463c974d86ed90d5a9576852380f8bb2d96c4a7e612633f35f277 +size 1913310 diff --git a/rsyslog.changes b/rsyslog.changes index f0b7149..7ba4384 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,3 +1,55 @@ +------------------------------------------------------------------- +Thu May 19 15:43:28 UTC 2011 - mrueckert@suse.de + +- update to 5.8.1 + - bugfix: invalid processing in QUEUE_FULL condition If the the + multi-submit interface was used and a QUEUE_FULL condition + occured, the failed message was properly destructed. However, + the rest of the input batch, if it existed, was not processed. + So this lead to potential loss of messages and a memory leak. + The potential loss of messages was IMHO minor, because they + would have been dropped in most cases due to the queue + remaining full, but very few lucky ones from the batch may have + made it. Anyhow, this has now been changed so that the rest of + the batch is properly tried to be enqueued and, if not + possible, destructed. + - new module mmsnmptrapd, a sample message modification module + This can be useful to reformat snmptrapd messages and also + serves as a sample for how to write message modification + modules using the output module interface. Note that we + introduced this new functionality directly into the stable + release, as it does not modify the core and as such cannot have + any side-effects if it is not used (and thus the risk is solely + on users requiring that functionality). + - bugfix: rate-limiting inside imuxsock did not work 100% correct + reason was that a global config variable was invalidly accessed + where a listener variable should have been used. Also + performance-improved the case when rate limiting is turned off + (this is a very unintrusive change, thus done directly to the + stable version). + - bugfix: $myhostname not available in RainerScript (and no error + message) closes: + http://bugzilla.adiscon.com/show_bug.cgi?id=233 + - bugfix: memory and file descriptor leak in stream processing + Leaks could occur under some circumstances if the file stream + handler errored out during the open call. Among others, this + could cause very big memory leaks if there were a problem with + unreadable disk queue files. In regard to the memory leak, this + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=256 + - bugfix: doc for impstats had wrong config statements also, + config statements were named a bit inconsistent, resolved that + problem by introducing an alias and only documenting the + consistent statements Thanks to Marcin for bringing up this + problem. + - bugfix: IPv6-address could not be specified in omrelp this was + due to improper parsing of ":" closes: + http://bugzilla.adiscon.com/show_bug.cgi?id=250 + - bugfix: TCP connection invalidly aborted when messages needed + to be discarded (due to QUEUE_FULL or similar problem) + - bugfix: $LocalHostName was not honored under all circumstances + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=258 + - bugfix(minor): improper template function call in syslogd.c + ------------------------------------------------------------------- Fri Apr 29 11:38:40 UTC 2011 - idoenmez@novell.com diff --git a/rsyslog.spec b/rsyslog.spec index 1e624fd..a7998b2 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -20,7 +20,7 @@ Name: rsyslog Summary: The enhanced syslogd for Linux and Unix -Version: 5.8.0 +Version: 5.8.1 Release: 4 # for setting those bcond_with* configs see # http://lizards.opensuse.org/2008/09/12/conditional-features-aka-use-flags/ @@ -44,7 +44,7 @@ Release: 4 %bcond_without mysql %bcond_without pgsql %bcond_without snmp -%define upstream_version 5.8.0 +%define upstream_version %{version} %define _sbindir /sbin %define rsyslogdocdir %{_docdir}/%{name} %define additional_sockets %{_localstatedir}/run/rsyslog/additional-log-sockets.conf