From 9f2197006170b7dbf4bde5ebb7fb451ba896aa254f2950dacefff55239e4df45 Mon Sep 17 00:00:00 2001 From: Thomas Blume Date: Mon, 19 Mar 2018 12:40:33 +0000 Subject: [PATCH 1/2] Accepting request 588505 from home:kukuk:branches:Base:System - Use %license instead of %doc [bsc#1082318] OBS-URL: https://build.opensuse.org/request/show/588505 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=288 --- rsyslog.changes | 5 +++++ rsyslog.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/rsyslog.changes b/rsyslog.changes index c91709b..4c8eb1e 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/rsyslog.spec b/rsyslog.spec index 8ad7654..283a96d 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -23,7 +23,7 @@ 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 Release: 0 @@ -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} From 93a9a63293168600b1753f64e561ef33065dd837b3dfb0ec5ed0c38a88004425 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Sat, 24 Mar 2018 19:03:50 +0000 Subject: [PATCH 2/2] Accepting request 590850 from home:AndreasStieger:branches:Base:System rsyslog 8.33.1 OBS-URL: https://build.opensuse.org/request/show/590850 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=289 --- rsyslog-8.32.0.tar.gz | 3 --- rsyslog-8.33.1.tar.gz | 3 +++ rsyslog-doc-8.32.0.tar.gz | 3 --- rsyslog-doc-8.33.1.tar.gz | 3 +++ rsyslog-unit.patch | 10 ++++++---- rsyslog.changes | 27 +++++++++++++++++++++++++++ rsyslog.spec | 2 +- 7 files changed, 40 insertions(+), 11 deletions(-) delete mode 100644 rsyslog-8.32.0.tar.gz create mode 100644 rsyslog-8.33.1.tar.gz delete mode 100644 rsyslog-doc-8.32.0.tar.gz create mode 100644 rsyslog-doc-8.33.1.tar.gz diff --git a/rsyslog-8.32.0.tar.gz b/rsyslog-8.32.0.tar.gz deleted file mode 100644 index b349a99..0000000 --- a/rsyslog-8.32.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9646fdc33a6314464cba68323716010a8a55c3deb523cd798ba8b41a0efa40b8 -size 2478990 diff --git a/rsyslog-8.33.1.tar.gz b/rsyslog-8.33.1.tar.gz new file mode 100644 index 0000000..196a7a8 --- /dev/null +++ b/rsyslog-8.33.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2da2bd773dbd5fde4eb162d5411dac96bf596b33e62a4062610443686597e3a8 +size 2494338 diff --git a/rsyslog-doc-8.32.0.tar.gz b/rsyslog-doc-8.32.0.tar.gz deleted file mode 100644 index 4c6ec99..0000000 --- a/rsyslog-doc-8.32.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d38bcb3a06da917b15d0f6afac0645655dcc3475284a3839100de215d87b1436 -size 5368254 diff --git a/rsyslog-doc-8.33.1.tar.gz b/rsyslog-doc-8.33.1.tar.gz new file mode 100644 index 0000000..e3c04d0 --- /dev/null +++ b/rsyslog-doc-8.33.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad12c1214c4caf592caec46c78c15be11589224a9499bcdfbee3a948e2d84a23 +size 6770438 diff --git a/rsyslog-unit.patch b/rsyslog-unit.patch index af8aec0..42c1bd2 100644 --- a/rsyslog-unit.patch +++ b/rsyslog-unit.patch @@ -1,5 +1,7 @@ ---- rsyslog-8.4.1/rsyslog.service.in -+++ rsyslog-8.4.1/rsyslog.service.in 2014/09/30 11:04:56 +Index: rsyslog-8.33.1/rsyslog.service.in +=================================================================== +--- 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 diff --git a/rsyslog.changes b/rsyslog.changes index 4c8eb1e..257e2b0 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +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 diff --git a/rsyslog.spec b/rsyslog.spec index 283a96d..0b5d2cd 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -25,7 +25,7 @@ Name: rsyslog Summary: The enhanced syslogd for Linux and Unix 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