Accepting request 294852 from Base:System
1 OBS-URL: https://build.opensuse.org/request/show/294852 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rsyslog?expand=0&rev=103
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
8d752b4a02
@ -1,35 +0,0 @@
|
||||
From 2a1e9668f8d4c0383ae017a99bc77b26cf8496c9 Mon Sep 17 00:00:00 2001
|
||||
From: Rainer Gerhards <rgerhards@adiscon.com>
|
||||
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
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:147a7e474665af7a817ac18d7924e26448350a77572e7fd9cfe284cb6291a0eb
|
||||
size 2011692
|
||||
3
rsyslog-8.9.0.tar.gz
Normal file
3
rsyslog-8.9.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:eab00e8e758cd9dd33b3e2cf6af80297d1951dc7db37bd723a6488a35d577adc
|
||||
size 2022294
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a8639ad1c281ce9f4716bd4bb2818d99a606e8ae999fdcefc926683f3b3dd75c
|
||||
size 4091455
|
||||
3
rsyslog-doc-8.9.0.tar.gz
Normal file
3
rsyslog-doc-8.9.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d3c6747439fabbfa976922ca26ffa695778668e757261e00103f2444cf153afa
|
||||
size 4100654
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user