pool/rsyslog
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

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

Browse Source 
rsyslog 8.8.0

OBS-URL: https://build.opensuse.org/request/show/288359
OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=215
This commit is contained in:
Andreas Stieger
2015-03-01 19:20:23 +00:00
committed by Git OBS Bridge
parent a2bf607468
commit 857b6059c6
7 changed files with 62 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rsyslog-8.7.0.tar.gz
View File

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

35
rsyslog-8.8.0-nonvoid-function-return.patch Normal file
View File

@@ -0,0 +1,35 @@
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

3
rsyslog-8.8.0.tar.gz Normal file
View File

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

3
rsyslog-doc-8.7.0.tar.gz
View File

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

3
rsyslog-doc-8.8.0.tar.gz Normal file
View File

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

17
rsyslog.changes
View File

@@ -1,3 +1,20 @@
-------------------------------------------------------------------
Sun Mar 1 19:13:25 UTC 2015 - astieger@suse.com
- rsyslog 8.8.0:
- omkafka: add support for dynamic topics and auto partitioning
- imtcp/imptcp: support for broken Cisco ASA TCP syslog framing
- omfwd: more detailled error messages in case of UDP send error
- TLS syslog: enable capability to turn on GnuTLS debug logging
- bugfix: $AbortOnUncleanConfig did not work
- improve rsyslogd -v output and error message with meta information
- bugfix imtcp: octet-counted framing cannot be turned off
- bugfix: build problems on Illuminos
- bugfix: invalid data size for iMaxLine global property
- bugfix: negative values for maxMessageSize global parameter were permitted
- add upstream patch rsyslog-8.8.0-nonvoid-function-return.patch
to fix compiler warnings/errors
-------------------------------------------------------------------
Fri Feb 13 10:31:00 UTC 2015 - astieger@suse.com

6
rsyslog.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package rsyslog
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX Products 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.7.0
Version: 8.8.0
Release: 0
%if 0%{?suse_version} >= 1210
%bcond_without systemd
@@ -212,6 +212,7 @@ 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
@@ -507,6 +508,7 @@ 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