From 7276ac263d61e0e2c4235a1fd042c8e96df5c3cbaa9718f437979d8de14b46d7 Mon Sep 17 00:00:00 2001
From: Andreas Stieger <andreas.stieger@gmx.de>
Date: Wed, 11 Dec 2013 23:06:32 +0000
Subject: [PATCH] Accepting request 210619 from
 home:AndreasStieger:branches:Base:System

update to 7.4.7 [v7.4-stable] [bnc#855058]

OBS-URL: https://build.opensuse.org/request/show/210619
OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=170
---
 rsyslog-7.4.6.tar.gz |  3 ---
 rsyslog-7.4.7.tar.gz |  3 +++
 rsyslog.changes      | 18 ++++++++++++++++++
 rsyslog.spec         |  4 +++-
 4 files changed, 24 insertions(+), 4 deletions(-)
 delete mode 100644 rsyslog-7.4.6.tar.gz
 create mode 100644 rsyslog-7.4.7.tar.gz

diff --git a/rsyslog-7.4.6.tar.gz b/rsyslog-7.4.6.tar.gz
deleted file mode 100644
index e3cadf1..0000000
--- a/rsyslog-7.4.6.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:07c2cdc4152c05a4f226361fb12c6124087182cc100bf063334af18153d5f7d2
-size 2932031
diff --git a/rsyslog-7.4.7.tar.gz b/rsyslog-7.4.7.tar.gz
new file mode 100644
index 0000000..c530449
--- /dev/null
+++ b/rsyslog-7.4.7.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5fc7f930fa748bb6a9d86a3fc831eb1a14107db81b67d79ba8f113cf2776fa21
+size 2934197
diff --git a/rsyslog.changes b/rsyslog.changes
index e85a4f2..55a2933 100644
--- a/rsyslog.changes
+++ b/rsyslog.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Dec 11 22:53:14 UTC 2013 - andreas.stieger@gmx.de
+
+- update to 7.4.7 [v7.4-stable] [bnc#855058]
+- bugfix: limiting queue disk space did not work properly
+- bugfix: linux kernel-like ratelimiter did not work properly with all
+  inputs (for example, it did not work with imdup).
+- bugfix: disk queues created files in wrong working directory
+- bugfix: legacy directive $ActionQueueWorkerThreads was not honored
+- bugfix: segfault on startup when certain script constructs are used
+  e.g. "if not $msg ..."
+- bugfix: imuxsock: UseSysTimeStamp config parameter did not work correctly
+- bugfix: $SystemLogUseSysTimeStamp/$SystemLogUsePIDFromSystem did not work
+- improved checking of queue config parameters on startup
+- bugfix: call to ruleset with async queue did not use the queue
+- bugfix: if imtcp is loaded and no listeners are configured (which is
+  uncommon), rsyslog crashes during shutdown.
+
 -------------------------------------------------------------------
 Wed Nov  6 09:07:10 UTC 2013 - mt@suse.de
 
diff --git a/rsyslog.spec b/rsyslog.spec
index 18cc35e..87b2856 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:        7.4.6
+Version:        7.4.7
 Release:        0
 %if 0%{?suse_version} >= 1210
 %bcond_without  systemd
@@ -141,6 +141,8 @@ BuildRequires:  libnet-devel
 %if %{with mmnormalize}
 # mmnormalize support
 BuildRequires:  liblognorm-devel >= 0.3.1
+# no support for 1.0.0 as per configure
+BuildRequires:  liblognorm-devel < 1.0.0
 %if 0%{?suse_version} >= 1210
 BuildRequires:  pkgconfig(libee) >= 0.4.0
 %else