Accepting request 65151 from Base:System

Accepted submit request 65151 from user licensedigger

OBS-URL: https://build.opensuse.org/request/show/65151
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rsyslog?expand=0&rev=23

rsyslog-5.6.3.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:160d000a5200b4ef6451330d2f30509ef2c974f1850b834221ad8704c21c71d3
-size 1846846

rsyslog-5.6.5.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:38c5f3639d316d1fd78bb933a701063be0910977c71ba775fabac0eb3f94c013
+size 1848178

rsyslog-systemd-integration.bnc656104.diff

@@ -31,15 +31,15 @@ Date:   Tue Sep 7 13:06:04 2010 +0200
     
     [skipped whitespace-only changes -- mt@suse.de]
 diff --git a/ChangeLog b/ChangeLog
-index 72e2946..8b7c7b7 100644
+index 89d5711..1e2aaa7 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,5 @@
 +- acquire /dev/log socket optionally from systemd
 +  thanks to Lennart Poettering for this patch
  ---------------------------------------------------------------------------
- Version 5.6.3  [V5-STABLE] (rgerhards), 2011-01-26
- - bugfix: action processor released mememory too early, resulting in
+ Version 5.6.5  [V5-STABLE] (rgerhards), 2011-03-22
+ - bugfix: failover did not work correctly if repeated msg reduction was on
 diff --git a/plugins/imuxsock/Makefile.am b/plugins/imuxsock/Makefile.am
 index a2fe0ba..28f9f9e 100644
 --- a/plugins/imuxsock/Makefile.am
@@ -870,7 +870,7 @@ index 0000000..45aac8b
 +
 +#endif
 diff --git a/tools/syslogd.c b/tools/syslogd.c
-index ffcaa27..37c3848 100644
+index 1148108..e18101c 100644
 --- a/tools/syslogd.c
 +++ b/tools/syslogd.c
 @@ -135,6 +135,7 @@
@@ -881,7 +881,7 @@ index ffcaa27..37c3848 100644
  
  /* definitions for objects we access */
  DEFobjCurrIf(obj)
-@@ -2428,10 +2429,44 @@ doGlblProcessInit(void)
+@@ -2433,10 +2434,44 @@ doGlblProcessInit(void)
  				 */
  				exit(1); /* "good" exit - after forking, not diasabling anything */
  			}

rsyslog.changes

@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Thu Mar 24 16:34:31 UTC 2011 - mt@suse.de
+
+- Updated to 5.6.5 (v5-stable) with following bugfixes:
+  * bugfix: failover did not work correctly if repeated msg
+  reduction was on.
+  affected directive: $ActionExecOnlyWhenPreviousIsSuspended on
+  * bugfix: omlibdbi did not use password from rsyslog.conf
+  closes: http://bugzilla.adiscon.com/show_bug.cgi?id=203
+  * bugfix(kind of): tell users that config graph can currently
+  not be generated
+  closes: http://bugzilla.adiscon.com/show_bug.cgi?id=232
+  * bugfix: discard action did not work under some circumstances
+  fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=217
+  (bnc#676041)
+  * bugfix: potential abort condition when $RepeatedMsgReduction
+  were set to on as well as potentially in a number of other places
+  where MsgDup() was used. This only happened when the imudp input
+  module was used and it depended on name resolution not yet had
+  taken place. (bnc#679030)
+  * bugfix: fixed a memory leak and potential abort condition
+  this could happen if multiple rulesets were used and some output
+  batches contained messages belonging to more than one ruleset.
+  fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=226
+  fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=218
+  * bugfix: memory leak when $RepeatedMsgReduction on was used
+  bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=225
+  (bnc#681568)
+- Merged systemd socket activation support
+
 -------------------------------------------------------------------
 Wed Feb  2 16:47:24 UTC 2011 - mt@suse.de
 

rsyslog.spec

@@ -20,9 +20,9 @@
 
 Name:           rsyslog
 Summary:        The enhanced syslogd for Linux and Unix
-Version:        5.6.3
+Version:        5.6.5
 Release:        1
-%define         upstream_version            5.6.3
+%define         upstream_version            5.6.5
 %define         with_dbi                    0%{?suse_version} >= 1140 || 0%{?build_with_relp:1}
 %define         with_relp                   0%{?suse_version} >= 1130 || 0%{?build_with_relp:1}
 %define         _sbindir                    /sbin