Date: Friday, August 22, 2014 @ 14:06:53 Author: spupykin Revision: 117762
upgpkg: rsyslog 8.4.0-1 upd Added: rsyslog/trunk/build-fix.patch Modified: rsyslog/trunk/PKGBUILD -----------------+ PKGBUILD | 15 +++++++++++---- build-fix.patch | 15 +++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-08-22 10:39:13 UTC (rev 117761) +++ PKGBUILD 2014-08-22 12:06:53 UTC (rev 117762) @@ -2,7 +2,7 @@ # Maintainer: Sergej Pupykin <[email protected]> pkgname=rsyslog -pkgver=8.2.2 +pkgver=8.4.0 pkgrel=1 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/"; @@ -20,11 +20,18 @@ options=('strip' 'zipman') source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"; 'rsyslog.logrotate' - 'rsyslog.conf') -md5sums=('87f15fc5710af292fd1690a53541ccb5' + 'rsyslog.conf' + 'build-fix.patch') +md5sums=('18984c59da976e1aaf2ff076d079bc56' '0d990373f5c70ddee989296007b4df5b' - 'd61dd424e660eb16401121eed20d98bc') + 'd61dd424e660eb16401121eed20d98bc' + '1211cde1be4a2196c77d89e38c48c930') +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -p1 <$srcdir/build-fix.patch +} + build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr \ Added: build-fix.patch =================================================================== --- build-fix.patch (rev 0) +++ build-fix.patch 2014-08-22 12:06:53 UTC (rev 117762) @@ -0,0 +1,15 @@ +diff -wbBur rsyslog-8.4.0/runtime/msg.c rsyslog-8.4.0.my/runtime/msg.c +--- rsyslog-8.4.0/runtime/msg.c 2014-08-18 13:14:06.000000000 +0400 ++++ rsyslog-8.4.0.my/runtime/msg.c 2014-08-22 15:58:52.974045109 +0400 +@@ -4074,7 +4074,11 @@ + + err = tokener->err; + if(err != json_tokener_continue) ++# if HAVE_JSON_TOKENER_ERROR_DESC ++ errMsg = json_tokener_error_desc(err); ++# else + errMsg = json_tokener_errors[err]; ++# endif + else + errMsg = "Unterminated input"; + } else if(!json_object_is_type(json, json_type_object))
