From ae2db6123bbb3c4dc36510b2e60e7725a7c85bc30b3897a551452c1716f024f2 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Tue, 7 Apr 2015 20:11:26 +0000 Subject: [PATCH] Accepting request 294851 from home:AndreasStieger:branches:Base:System rsyslog 8.9.0 OBS-URL: https://build.opensuse.org/request/show/294851 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=217 --- rsyslog-8.8.0-nonvoid-function-return.patch | 35 --------------------- rsyslog-8.8.0.tar.gz | 3 -- rsyslog-8.9.0.tar.gz | 3 ++ rsyslog-doc-8.8.0.tar.gz | 3 -- rsyslog-doc-8.9.0.tar.gz | 3 ++ rsyslog.changes | 26 +++++++++++++++ rsyslog.spec | 6 ++-- 7 files changed, 34 insertions(+), 45 deletions(-) delete mode 100644 rsyslog-8.8.0-nonvoid-function-return.patch delete mode 100644 rsyslog-8.8.0.tar.gz create mode 100644 rsyslog-8.9.0.tar.gz delete mode 100644 rsyslog-doc-8.8.0.tar.gz create mode 100644 rsyslog-doc-8.9.0.tar.gz diff --git a/rsyslog-8.8.0-nonvoid-function-return.patch b/rsyslog-8.8.0-nonvoid-function-return.patch deleted file mode 100644 index 2f44932..0000000 --- a/rsyslog-8.8.0-nonvoid-function-return.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 2a1e9668f8d4c0383ae017a99bc77b26cf8496c9 Mon Sep 17 00:00:00 2001 -From: Rainer Gerhards -Date: Sun, 1 Mar 2015 14:25:47 +0100 -Subject: [PATCH] non-void function setMaxLine does not return anything - -closes https://github.com/rsyslog/rsyslog/issues/255 ---- - runtime/glbl.c | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/runtime/glbl.c b/runtime/glbl.c -index f0750a2..01f82d4 100644 ---- a/runtime/glbl.c -+++ b/runtime/glbl.c -@@ -361,7 +361,7 @@ static rsRetVal setWorkDir(void __attribute__((unused)) *pVal, uchar *pNewVal) - - - /* This function is used both by legacy and RainerScript conf. It is a real setter. */ --static rsRetVal -+static void - setMaxLine(const int64_t iNew) - { - if(iNew < 128) { -@@ -381,9 +381,8 @@ setMaxLine(const int64_t iNew) - static rsRetVal - legacySetMaxMessageSize(void __attribute__((unused)) *pVal, int64_t iNew) - { -- DEFiRet; -- iRet = setMaxLine(iNew); -- RETiRet; -+ setMaxLine(iNew); -+ return RS_RET_OK; - } - - static rsRetVal diff --git a/rsyslog-8.8.0.tar.gz b/rsyslog-8.8.0.tar.gz deleted file mode 100644 index 8e1b6e6..0000000 --- a/rsyslog-8.8.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:147a7e474665af7a817ac18d7924e26448350a77572e7fd9cfe284cb6291a0eb -size 2011692 diff --git a/rsyslog-8.9.0.tar.gz b/rsyslog-8.9.0.tar.gz new file mode 100644 index 0000000..0d22d6e --- /dev/null +++ b/rsyslog-8.9.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eab00e8e758cd9dd33b3e2cf6af80297d1951dc7db37bd723a6488a35d577adc +size 2022294 diff --git a/rsyslog-doc-8.8.0.tar.gz b/rsyslog-doc-8.8.0.tar.gz deleted file mode 100644 index 28197a8..0000000 --- a/rsyslog-doc-8.8.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a8639ad1c281ce9f4716bd4bb2818d99a606e8ae999fdcefc926683f3b3dd75c -size 4091455 diff --git a/rsyslog-doc-8.9.0.tar.gz b/rsyslog-doc-8.9.0.tar.gz new file mode 100644 index 0000000..aa6c395 --- /dev/null +++ b/rsyslog-doc-8.9.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3c6747439fabbfa976922ca26ffa695778668e757261e00103f2444cf153afa +size 4100654 diff --git a/rsyslog.changes b/rsyslog.changes index 55077ab..fe07377 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Tue Apr 7 18:24:17 UTC 2015 - astieger@suse.com + +- rsyslog 8.9.0: + - omprog: add option "hup.forward" to forwards HUP to external + plugins + - imuxsock: added capability to use regular parser chain + - new sysSock.useSpecialParser module parameter + - new sysSock.parseHostname module parameter + - new useSpecialParser input parameter + - new parseHostname input parameter + - 0mq: improvements in input and output modules + - imtcp: add support for ip based bind for imtcp -> param "address" + - bugfix: MsgDeserialize out of sync with MsgSerialize for StrucData + - bugfix imfile: partial data loss, especially in readMode != 0 + - bugfix: potential large memory consumption with failed actions + - bugfix: omudpspoof: invalid default send template in RainerScript format + - bugfix: size-based legacy config statements did not work properly + on some platforms, they were incorrectly handled, resulting in all + sorts of "interesting" effects (up to segfault on startup) + - build system: added option --without-valgrind-testbench + ... which provides the capability to either enforce or turn off + valgrind use inside the testbench. Thanks to whissi for the patch. + - rsyslogd: fix misleading typos in error messa +- remove upstreamed rsyslog-8.8.0-nonvoid-function-return.patch + ------------------------------------------------------------------- Sun Mar 1 19:13:25 UTC 2015 - astieger@suse.com diff --git a/rsyslog.spec b/rsyslog.spec index 01c7da5..7738418 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -1,7 +1,7 @@ # # spec file for package rsyslog # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -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: 8.8.0 +Version: 8.9.0 Release: 0 %if 0%{?suse_version} >= 1210 %bcond_without systemd @@ -212,7 +212,6 @@ Source15: rsyslog.firewall # PATCH-FIX-OPENSUSE rsyslog-unit.patch crrodriguez@opensuse.org Customize upstream systemd unit for openSUSE needs. Patch0: rsyslog-unit.patch -Patch1: rsyslog-8.8.0-nonvoid-function-return.patch # this is a dirty hack since % dir does only work for the specified directory and nothing above # but I want to be able to switch this to /etc/apparmor.d once the profiles received more testing @@ -508,7 +507,6 @@ This module provides support for ZeroMQ. %prep %setup -q -n %{name}-%{upstream_version} -a 14 %patch0 -p1 -%patch1 -p1 # %if %{with systemd} for file in rsyslog-service-prepare; do