Package: rsyslog
Version: 5.8.6-1
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch
Dear Maintainer,
Please consider applying this patch which fixes an rsyslogd bug.
In Ubuntu, the attached patch was applied to achieve the following:
This upstream patch was backported to fix corruption/crashes when using
RFC5424 format in rsyslogd.
Please consult:
https://bugs.launchpad.net/ubuntu/+source/rsyslog/+bug/1059592 for more
info.
* debian/patches/101-fix-rfc5424-instabilities.patch:
- bugfix: instabilities when using RFC5424 header fields (LP: #1059592)
The upstream bug is: http://bugzilla.adiscon.com/show_bug.cgi?id=296
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-34-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru rsyslog-5.8.6/debian/changelog rsyslog-5.8.6/debian/changelog
diff -Nru rsyslog-5.8.6/debian/control rsyslog-5.8.6/debian/control
--- rsyslog-5.8.6/debian/control 2012-03-30 12:10:24.000000000 -0500
+++ rsyslog-5.8.6/debian/control 2012-11-21 11:09:28.000000000 -0600
@@ -1,8 +1,7 @@
Source: rsyslog
Section: admin
Priority: important
-Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
-XSBC-Original-Maintainer: Michael Biebl <bi...@debian.org>
+Maintainer: Michael Biebl <bi...@debian.org>
Build-Depends: debhelper (>= 8),
dpkg-dev (>= 1.6.1),
autotools-dev (>= 20100122.1),
diff -Nru rsyslog-5.8.6/debian/patches/101-fix-rfc5424-instabilities.patch rsyslog-5.8.6/debian/patches/101-fix-rfc5424-instabilities.patch
--- rsyslog-5.8.6/debian/patches/101-fix-rfc5424-instabilities.patch 1969-12-31 18:00:00.000000000 -0600
+++ rsyslog-5.8.6/debian/patches/101-fix-rfc5424-instabilities.patch 2012-11-21 10:26:38.000000000 -0600
@@ -0,0 +1,59 @@
+From: Kaiwang Chen <kaiwang.c...@gmail.com>
+Date: Mon, 9 Jan 2012 13:32:52 +0000 (+0100)
+Subject: bugfix: instabilities when using RFC5424 header fields
+X-Git-Url: http://git.adiscon.com/?p=rsyslog.git;a=commitdiff_plain;h=791b16ce06d75944e338a6e5fa14c0394bde6f1d
+
+bugfix: instabilities when using RFC5424 header fields
+
+Origin: upstream, http://git.adiscon.com/?p=rsyslog.git;a=commitdiff_plain;h=791b16ce06d75944e338a6e5fa14c0394bde6f1d
+Bug: http://bugzilla.adiscon.com/show_bug.cgi?id=296
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/rsyslog/+bug/1059592
+---
+
+--- a/runtime/msg.c
++++ b/runtime/msg.c
+@@ -7,7 +7,7 @@
+ * of the "old" message code without any modifications. However, it
+ * helps to have things at the right place one we go to the meat of it.
+ *
+- * Copyright 2007, 2008 Rainer Gerhards and Adiscon GmbH.
++ * Copyright 2007-2012 Rainer Gerhards and Adiscon GmbH.
+ *
+ * This file is part of the rsyslog runtime library.
+ *
+@@ -1609,7 +1609,7 @@ char *getPROCID(msg_t *pM, sbool bLockMu
+
+ ISOBJ_TYPE_assert(pM, msg);
+ if(bLockMutex == LOCK_MUTEX)
+- MsgUnlock(pM);
++ MsgLock(pM);
+ preparePROCID(pM, MUTEX_ALREADY_LOCKED);
+ if(pM->pCSPROCID == NULL)
+ pszRet = UCHAR_CONSTANT("");
+@@ -1846,7 +1846,7 @@ static inline char *getStructuredData(ms
+ {
+ uchar *pszRet;
+
+- MsgUnlock(pM);
++ MsgLock(pM);
+ if(pM->pCSStrucData == NULL)
+ pszRet = UCHAR_CONSTANT("-");
+ else
+@@ -1894,7 +1894,7 @@ uchar *getProgramName(msg_t *pM, sbool b
+ uchar *pszRet;
+
+ if(bLockMutex == LOCK_MUTEX)
+- MsgUnlock(pM);
++ MsgLock(pM);
+ prepareProgramName(pM, MUTEX_ALREADY_LOCKED);
+ if(pM->pCSProgName == NULL)
+ pszRet = UCHAR_CONSTANT("");
+@@ -1952,7 +1952,7 @@ char *getAPPNAME(msg_t *pM, sbool bLockM
+
+ assert(pM != NULL);
+ if(bLockMutex == LOCK_MUTEX)
+- MsgUnlock(pM);
++ MsgLock(pM);
+ prepareAPPNAME(pM, MUTEX_ALREADY_LOCKED);
+ if(pM->pCSAPPNAME == NULL)
+ pszRet = UCHAR_CONSTANT("");
diff -Nru rsyslog-5.8.6/debian/patches/series rsyslog-5.8.6/debian/patches/series
--- rsyslog-5.8.6/debian/patches/series 2012-03-30 12:10:24.000000000 -0500
+++ rsyslog-5.8.6/debian/patches/series 2012-11-21 09:40:09.000000000 -0600
@@ -2,3 +2,4 @@
01-dont_create_db.patch
# Ubuntu patches for rsyslog
100-imuxsock-allow-missing-date.patch
+101-fix-rfc5424-instabilities.patch
