From baeb909dc0ac49c1165bbeffaed9c704ee819d5e Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Thu, 17 Aug 2017 11:53:12 +0200 Subject: [PATCH] rsyslog: update to 8.29.0 (#7417) --- .../rsyslog/patches/correct-mutex-arg.patch | 22 +++++++++++++++++++ srcpkgs/rsyslog/template | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/rsyslog/patches/correct-mutex-arg.patch diff --git a/srcpkgs/rsyslog/patches/correct-mutex-arg.patch b/srcpkgs/rsyslog/patches/correct-mutex-arg.patch new file mode 100644 index 00000000000..2ba15eb9449 --- /dev/null +++ b/srcpkgs/rsyslog/patches/correct-mutex-arg.patch @@ -0,0 +1,22 @@ +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/template b/srcpkgs/rsyslog/template index 13b2487d2b9..2563d30ad96 100644 --- a/srcpkgs/rsyslog/template +++ b/srcpkgs/rsyslog/template @@ -1,6 +1,6 @@ # Template file for 'rsyslog' pkgname=rsyslog -version=8.28.0 +version=8.29.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=4ca5405908d612d45da700e36856430510875518eb8028d296d1ee4d2c44678e +checksum=220ba30b5afb0f3ddb328613fea7aa3966b01e4d0c52d6de9ab27b0858f19738 lib32disabled=yes disable_parallel_build=yes