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

Accepting request 135188 from home:AndreasStieger:rsyslog:v6-stable

Browse Source 
- add rsyslog-6.4.1-CheckConnection-no-return-in-nonvoid-function.patch
  to fix rsyslog no-return-in-nonvoid-function netstrm.c:258 in
  CheckConnection()

OBS-URL: https://build.opensuse.org/request/show/135188
OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=94
This commit is contained in:
Andreas Stieger
2012-09-20 21:33:30 +00:00
committed by Git OBS Bridge
parent 312b49b6e1
commit 2d6fe30982
3 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rsyslog-6.4.1-CheckConnection-no-return-in-nonvoid-function.patch Normal file
View File

@@ -0,0 +1,16 @@
Index: runtime/netstrm.c
===================================================================
--- runtime/netstrm.c.orig 2012-09-06 11:00:51.000000000 +0100
+++ runtime/netstrm.c 2012-09-20 22:26:02.000000000 +0100
@@ -253,8 +253,10 @@ EnableKeepAlive(netstrm_t *pThis)
static rsRetVal
CheckConnection(netstrm_t *pThis)
{
+ DEFiRet;
ISOBJ_TYPE_assert(pThis, netstrm);
- pThis->Drvr.CheckConnection(pThis->pDrvrData);
+ iRet = pThis->Drvr.CheckConnection(pThis->pDrvrData);
+ RETiRet;
}

7
rsyslog.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Sep 20 21:20:17 UTC 2012 - andreas.stieger@gmx.de
- add rsyslog-6.4.1-CheckConnection-no-return-in-nonvoid-function.patch
to fix rsyslog no-return-in-nonvoid-function netstrm.c:258 in
CheckConnection()
-------------------------------------------------------------------
Mon Sep 17 12:13:04 UTC 2012 - mt@suse.com

3
rsyslog.spec
View File

@@ -129,6 +129,8 @@ Source3: rsyslog.early.conf.in
Source4: rsyslog.d.remote.conf.in
#PATCH-FIX-OPENSUSE rsyslog-6.3.11-glblCheckCnf-no-return-in-nonvoid-function.patch andreas.stieger@gmx.de -- fix compiler error
Patch0: rsyslog-6.3.11-glblCheckCnf-no-return-in-nonvoid-function.patch
#PATCH-FIX-OPENSUSE rsyslog-6.4.1-CheckConnection-no-return-in-nonvoid-function.patch andreas.stieger@gmx.de -- fix compiler error
Patch1: rsyslog-6.4.1-CheckConnection-no-return-in-nonvoid-function.patch
%description
Rsyslog is an enhanced multi-threaded syslogd supporting, among others,
@@ -295,6 +297,7 @@ This module provides a UDP forwarder that allows changing the sender address.
%prep
%setup -q -n %{name}-%{upstream_version}
%patch0
%patch1
%if %{with systemd}
%if 0%{?suse_version} <= 1140
# Bug: https://bugzilla.novell.com/show_bug.cgi?id=656259