Accepting request 590851 from Base:System

rsyslog 8.33.1
- Use %license instead of %doc [bsc#1082318]

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

rsyslog-8.32.0.tar.gz

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

rsyslog-8.33.1.tar.gz

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

rsyslog-doc-8.32.0.tar.gz

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

rsyslog-doc-8.33.1.tar.gz

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

rsyslog-unit.patch

@@ -1,5 +1,7 @@
---- rsyslog-8.4.1/rsyslog.service.in
+Index: rsyslog-8.33.1/rsyslog.service.in
-+++ rsyslog-8.4.1/rsyslog.service.in	2014/09/30 11:04:56
+===================================================================
+--- rsyslog-8.33.1.orig/rsyslog.service.in
++++ rsyslog-8.33.1/rsyslog.service.in
 @@ -1,14 +1,21 @@
  [Unit]
  Description=System Logging Service
@@ -12,11 +14,11 @@
  
  [Service]
  Type=notify
--ExecStart=@sbindir@/rsyslogd -n
+-ExecStart=@sbindir@/rsyslogd -n -iNONE
 +Environment=RSYSLOGD_PARAMS=
 +EnvironmentFile=-/etc/sysconfig/syslog
 +ExecStartPre=@sbindir@/rsyslog-service-prepare
-+ExecStart=@sbindir@/rsyslogd -n $RSYSLOGD_PARAMS
++ExecStart=@sbindir@/rsyslogd -n -iNONE $RSYSLOGD_PARAMS
 +ExecReload=/bin/kill -HUP $MAINPID
  StandardOutput=null
 -Restart=on-failure

rsyslog.changes

@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Sat Mar 24 18:47:34 UTC 2018 - astieger@suse.com
+
+- rsyslog 8.33.1:
+  * devcontainer: use some more sensible defaults
+  * auto-detect if running inside a container (as pid 1)
+  * config: add include() script object
+  * template: add option to generate json "container"
+  * core/template: add format jsonf to constant template entries
+  * config: add ability to disable config parameter ("config.enable")
+  * script: permit to use environment variables during configuration
+  * new global config parameter "shutdown.enable.ctlc"
+  * config optimizer: detect totally empty "if" statements and optimize them out
+  * template: constant entry can now also be formatted as json field
+  * omstdout: support for new-style configuration parameters added
+  * core: set TZ on startup if not already set
+  * imjournal bugfix: file handle leak during journal rotation
+  * lmsig_ksils12 bugfix: dirOwner and dirGroup config was not respected
+  * script bugfix: replace() function worked incorrectly in some cases
+  * core bugfix: misadressing in external command parser
+  * core bugfix: small memory leak in external command parser
+  * core bugfix: string not properly terminated when RFC5424 MSGID is used
+  * bugfix: strndup() compatibility layer func copies too much
+- the upstream systemd unit file was changed to no longer write the
+  rsyslog pid, as it is no longer required for tracking under
+  systemd (-iNONE). Adjust rsyslog-unit.patch to match.
+
+-------------------------------------------------------------------
+Mon Mar 19 11:43:55 CET 2018 - kukuk@suse.de
+
+- Use %license instead of %doc [bsc#1082318]
+
 -------------------------------------------------------------------
 Mon Feb 19 09:16:20 UTC 2018 - Thomas.Blume@suse.com
 

rsyslog.spec

@@ -23,9 +23,9 @@
 
 Name:           rsyslog
 Summary:        The enhanced syslogd for Linux and Unix
-License:        (GPL-3.0+ and Apache-2.0)
+License:        (GPL-3.0-or-later AND Apache-2.0)
 Group:          System/Daemons
-Version:        8.32.0
+Version:        8.33.1
 Release:        0
 %if 0%{?suse_version} >= 1210
 %bcond_without  systemd
@@ -772,7 +772,7 @@ install    -m0600 %{_sourcedir}/rsyslog.sysconfig \
 #
 rm -f doc/Makefile*
 install -d -m0755 %{buildroot}%{rsyslogdocdir}/html/
-find ChangeLog README AUTHORS COPYING*  \
+find ChangeLog README AUTHORS \
 	\( -type d -exec install -m755 -d   %{buildroot}%{rsyslogdocdir}/\{\} \; \) \
      -o \( -type f -exec install -m644 \{\} %{buildroot}%{rsyslogdocdir}/\{\} \; \)
 cp -av build/* %{buildroot}%{rsyslogdocdir}/html/
@@ -992,11 +992,11 @@ fi
 %dir %{rsyslog_module_dir_withdeps}
 %{_mandir}/man5/rsyslog.conf.5*
 %{_mandir}/man8/rsyslogd.8*
+%license COPYING COPYING.ASL20 COPYING.LESSER
 %dir %{rsyslogdocdir}
 %doc %{rsyslogdocdir}/ChangeLog
 %doc %{rsyslogdocdir}/README
 %doc %{rsyslogdocdir}/AUTHORS
-%doc %{rsyslogdocdir}/COPYING*
 %dir %{_localstatedir}/spool/rsyslog
 %{_fillupdir}/sysconfig.syslog-rsyslog
 %attr(0755,root,root) %dir %ghost %{rsyslog_rundir}