From 279b8e27e8da1e3e33d9f7b4be3749887dce5ae6 Mon Sep 17 00:00:00 2001
From: Tomas Heinrich <theinric@redhat.com>
Date: Mon, 5 Sep 2011 14:36:48 +0200
Subject: [PATCH] upgrade to new upstream version (CVE-2011-3200)

---
 .gitignore                                               | 1 +
 ...og-5.7.9-systemd.patch => rsyslog-5.8.5-systemd.patch | 8 ++++----
 rsyslog.spec                                             | 9 ++++++---
 sources                                                  | 2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)
 rename rsyslog-5.7.9-systemd.patch => rsyslog-5.8.5-systemd.patch (55%)

diff --git a/.gitignore b/.gitignore
index be4e180..e43b39b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ rsyslog-4.6.3.tar.gz
 /rsyslog-5.7.10.tar.gz
 /rsyslog-5.8.1.tar.gz
 /rsyslog-5.8.2.tar.gz
+/rsyslog-5.8.5.tar.gz
diff --git a/rsyslog-5.7.9-systemd.patch b/rsyslog-5.8.5-systemd.patch
similarity index 55%
rename from rsyslog-5.7.9-systemd.patch
rename to rsyslog-5.8.5-systemd.patch
index 1049c31..d7544c0 100644
--- a/rsyslog-5.7.9-systemd.patch
+++ b/rsyslog-5.8.5-systemd.patch
@@ -1,6 +1,6 @@
-diff -up rsyslog-5.7.9/rsyslog.service.in.orig rsyslog-5.7.9/rsyslog.service.in
---- rsyslog-5.7.9/rsyslog.service.in.orig	2011-03-18 18:05:58.760693398 +0100
-+++ rsyslog-5.7.9/rsyslog.service.in	2011-03-18 18:07:20.131691458 +0100
+diff -up rsyslog-5.8.5/rsyslog.service.in.orig rsyslog-5.8.5/rsyslog.service.in
+--- rsyslog-5.8.5/rsyslog.service.in.orig	2011-08-31 12:13:51.000000000 +0200
++++ rsyslog-5.8.5/rsyslog.service.in	2011-09-05 12:49:18.966194902 +0200
 @@ -2,8 +2,9 @@
  Description=System Logging Service
  
@@ -10,5 +10,5 @@ diff -up rsyslog-5.7.9/rsyslog.service.in.orig rsyslog-5.7.9/rsyslog.service.in
 -ExecStart=@sbindir@/rsyslogd -n -c5
 +ExecStart=@sbindir@/rsyslogd -n $SYSLOGD_OPTIONS
  Sockets=syslog.socket
+ StandardOutput=null
  
- [Install]
diff --git a/rsyslog.spec b/rsyslog.spec
index 6f5657d..a05546f 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -5,8 +5,8 @@
 
 Summary: Enhanced system logging and kernel message trapping daemon
 Name: rsyslog
-Version: 5.8.2
-Release: 3%{?dist}
+Version: 5.8.5
+Release: 1%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -16,7 +16,7 @@ Source2: rsyslog.conf
 Source3: rsyslog.sysconfig
 Source4: rsyslog.log
 # tweak the upstream service file to honour configuration from /etc/sysconfig/rsyslog
-Patch0: rsyslog-5.7.9-systemd.patch
+Patch0: rsyslog-5.8.5-systemd.patch
 
 BuildRequires: zlib-devel
 Requires: logrotate >= 3.5.2
@@ -311,6 +311,9 @@ mv /var/lock/subsys/rsyslogd /var/lock/subsys/rsyslog
 %{_libdir}/rsyslog/omudpspoof.so
 
 %changelog
+* Mon Sep 05 2011 Tomas Heinrich <theinric@redhat.com> 5.8.5-1
+- upgrade to new upstream version (CVE-2011-3200)
+
 * Fri Jul 22 2011 Tomas Heinrich <theinric@redhat.com> 5.8.2-3
 - move the SysV init script into a subpackage
 - Resolves: 697533
diff --git a/sources b/sources
index a760370..aed9f9c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fd7822622e974cc263bbd54768d5621c  rsyslog-5.8.2.tar.gz
+a73cb577cb4bc5b9c8f0d217eb054ad2  rsyslog-5.8.5.tar.gz