From f0e6e4cb264bc62261b8e5b004ffe9d3e0bfa726 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Thu, 26 Oct 2017 10:30:06 +0200 Subject: [PATCH] rsyslog: update to 8.30.0 (#8571) --- .../rsyslog/patches/correct-mutex-arg.patch | 22 ------------------- srcpkgs/rsyslog/patches/fix-oserr-param.patch | 20 +++++++++++++++++ srcpkgs/rsyslog/template | 4 ++-- 3 files changed, 22 insertions(+), 24 deletions(-) delete mode 100644 srcpkgs/rsyslog/patches/correct-mutex-arg.patch create mode 100644 srcpkgs/rsyslog/patches/fix-oserr-param.patch diff --git a/srcpkgs/rsyslog/patches/correct-mutex-arg.patch b/srcpkgs/rsyslog/patches/correct-mutex-arg.patch deleted file mode 100644 index 2ba15eb9449..00000000000 --- a/srcpkgs/rsyslog/patches/correct-mutex-arg.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/plugins/imptcp/imptcp.c b/plugins/imptcp/imptcp.c -index c373c17e..ab2a17e5 100644 ---- plugins/imptcp/imptcp.c -+++ plugins/imptcp/imptcp.c -@@ -828,7 +828,7 @@ AcceptConnReq(ptcplstn_t *pLstn, int *newSock, prop_t **peerName, prop_t **peerI - LogMsg(0, RS_RET_NO_ERRCODE, LOG_INFO, "imptcp: connection established with host: %s", propGetSzStr(*peerName)); - } - -- STATSCOUNTER_INC(pLstn->ctrSessOpen, pThis->pLstn->mutCtrSessOpen); -+ STATSCOUNTER_INC(pLstn->ctrSessOpen, pLstn->mutCtrSessOpen); - *newSock = iNewSock; - - finalize_it: -@@ -837,7 +837,7 @@ finalize_it: - if(iRet != RS_RET_NO_MORE_DATA && pLstn->pSrv->bEmitMsgOnOpen) { - LogError(0, NO_ERRCODE, "imptcp: connection could not be established with host: %s", propGetSzStr(*peerName)); - } -- STATSCOUNTER_INC(pLstn->ctrSessOpenErr, pThis->pLstn->mutCtrSessOpenErr); -+ STATSCOUNTER_INC(pLstn->ctrSessOpenErr, pLstn->mutCtrSessOpenErr); - /* the close may be redundant, but that doesn't hurt... */ - if(iNewSock != -1) - close(iNewSock); diff --git a/srcpkgs/rsyslog/patches/fix-oserr-param.patch b/srcpkgs/rsyslog/patches/fix-oserr-param.patch new file mode 100644 index 00000000000..50070776d10 --- /dev/null +++ b/srcpkgs/rsyslog/patches/fix-oserr-param.patch @@ -0,0 +1,20 @@ +--- plugins/imgssapi/imgssapi.c.orig 2017-10-26 09:49:24.486837008 +0200 ++++ plugins/imgssapi/imgssapi.c 2017-10-26 09:49:52.195141056 +0200 +@@ -291,7 +291,7 @@ + + + static rsRetVal +-doRcvData(tcps_sess_t *pSess, char *buf, size_t lenBuf, ssize_t *piLenRcvd) ++doRcvData(tcps_sess_t *pSess, char *buf, size_t lenBuf, ssize_t *piLenRcvd, int *const oserr) + { + DEFiRet; + int allowedMethods; +@@ -307,7 +307,7 @@ + CHKiRet(TCPSessGSSRecv(pSess, buf, lenBuf, piLenRcvd)); + } else { + *piLenRcvd = lenBuf; +- CHKiRet(netstrm.Rcv(pSess->pStrm, (uchar*) buf, piLenRcvd) != RS_RET_OK); ++ CHKiRet(netstrm.Rcv(pSess->pStrm, (uchar*) buf, piLenRcvd, oserr) != RS_RET_OK); + } + + finalize_it: diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template index 2563d30ad96..7964b2eb96b 100644 --- a/srcpkgs/rsyslog/template +++ b/srcpkgs/rsyslog/template @@ -1,6 +1,6 @@ # Template file for 'rsyslog' pkgname=rsyslog -version=8.29.0 +version=8.30.0 revision=1 build_style=gnu-configure configure_args="--sbindir=/usr/bin @@ -15,7 +15,7 @@ maintainer="Juan RP " license="GPL-3" homepage="http://www.rsyslog.com" distfiles="${homepage}/files/download/rsyslog/$pkgname-$version.tar.gz" -checksum=220ba30b5afb0f3ddb328613fea7aa3966b01e4d0c52d6de9ab27b0858f19738 +checksum=dfb9c3efe52ad03ad9f4479699139fb447177049553b6993315f53b668a2251f lib32disabled=yes disable_parallel_build=yes