Accepting request 180608 from home:AndreasStieger:branches:Base:System

update to 7.4.1  [v7.4-stable]

OBS-URL: https://build.opensuse.org/request/show/180608
OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=152

rsyslog-7.3.14.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:333a23edecd2313c59dbd30e90f132618b7041f5c938106f2bf094a3a369de19
-size 2897853

rsyslog-7.4.1.tar.gz

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

rsyslog-unit.patch

@@ -1,33 +1,28 @@
---- rsyslog-7.3.14.orig/rsyslog.service.in
+---
-+++ rsyslog-7.3.14/rsyslog.service.in
+ rsyslog.service.in |    9 ++++++++-
-@@ -1,9 +1,17 @@
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+Index: rsyslog-7.4.1/rsyslog.service.in
+===================================================================
+--- rsyslog-7.4.1.orig/rsyslog.service.in	2013-06-17 06:50:28.000000000 +0100
++++ rsyslog-7.4.1/rsyslog.service.in	2013-06-22 21:41:46.000000000 +0100
+@@ -1,11 +1,18 @@
  [Unit]
  Description=System Logging Service
+ Requires=syslog.socket
 +Requires=var-run.mount
-+Requires=syslog.socket
 +After=var-run.mount
 +Conflicts=syslog-ng.service syslogd.service
  
  [Service]
+ Type=notify
 -ExecStart=@sbindir@/rsyslogd -n
--Sockets=syslog.socket
++ExecStart=@sbindir@/rsyslogd -n $RSYSLOGD_PARAMS
-+Type=notify
+ StandardOutput=null
 +Environment=RSYSLOGD_PARAMS=
 +ExecStartPre=@sbindir@/rsyslog-service-prepare
 +EnvironmentFile=-/etc/sysconfig/syslog
-+ExecStart=@sbindir@/rsyslogd -n $RSYSLOGD_PARAMS
 +ExecReload=/bin/kill -HUP $MAINPID
- StandardOutput=null
  
  [Install]
---- rsyslog-7.3.14.orig/tools/syslogd.c
+ WantedBy=multi-user.target
-+++ rsyslog-7.3.14/tools/syslogd.c
-@@ -2033,7 +2033,7 @@ int realMain(int argc, char **argv)
- 		close(2);
- 		ourConf->globals.bErrMsgToStderr = 0;
- 	}
--
-+    sd_notify(0, "READY=1");
- 	mainloop();
- 
- 	/* do any de-init's that need to be done AFTER this comment */

rsyslog.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Sat Jun 22 20:54:14 UTC 2013 - andreas.stieger@gmx.de
+
+- update to 7.4.1  [v7.4-stable]:
+  - imjournal: add ratelimiting capability
+  - bugfix imzmq3: potential segfault on startup
+- includes changes from 7.4.0  [v7.4-stable]:
+  - doc bugfix: ReadMode wrong in imfile doc, two values were swapped
+  - imjournal: no longer do periodic wakeup
+  - bugfix: potential hang *in debug mode* on rsyslogd termination
+  - bugfix: $template statement with multiple spaces lead to invalid tpl name
+  - 0mq fixes
+- includes changes from version 7.3.15 
+  - bugfix: problem in build system (especially when cross-compiling)
+  - bugfix: imjournal had problem with systemd journal API change
+  - imjournal: now obtain and include PID
+  - bugfix: .logsig files had tlv16 indicator bit at wrong offset
+  - bugfix: omrelp legacy config parameters set a timeout of zero
+    which lead the legacy config to be unusable.
+  - bugfix: segfault on startup if a disk queue was configure without file
+    name
+  - bugfix: invalid addressing in string class (recent regression)
+- packaging changes:
+  - rebase rsyslog-unit.patch
+  - move libee/liblognorm dependencies to mmnormalize conditional
+
 -------------------------------------------------------------------
 Fri Jun 14 04:17:57 UTC 2013 - crrodriguez@opensuse.org
 

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.3.14
+Version:        7.4.1
 Release:        0
 %if 0%{?suse_version} >= 1210
 %bcond_without  systemd
@@ -140,13 +140,18 @@ BuildRequires:  libnet-devel
 %endif
 %if %{with mmnormalize}
 # mmnormalize support
-BuildRequires:  liblognorm-devel
+BuildRequires:  liblognorm-devel >= 0.3.1
-%endif
+%if 0%{?suse_version} >= 1210
+BuildRequires:  pkgconfig(libee) >= 0.4.0
+%else
+BuildRequires:  libee-devel
+%endif # >= 1210
+%endif # with mmnormalize
+#
 # mmjsonparse needs liblognorm,
 # but json check is unconditional
 %if 0%{?suse_version} >= 1210
 BuildRequires:  pkgconfig(json) >= 0.9
-BuildRequires:  pkgconfig(libee) >= 0.4.0
 BuildRequires:  pkgconfig(libestr) >= 0.1.5
 %else
 BuildRequires:  libee-devel