diff -rupN original/app-admin/rsyslog/files/7-stable/rsyslog-7.x-mmjsonparse.patch new/app-admin/rsyslog/files/7-stable/rsyslog-7.x-mmjsonparse.patch --- original/app-admin/rsyslog/files/7-stable/rsyslog-7.x-mmjsonparse.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/app-admin/rsyslog/files/7-stable/rsyslog-7.x-mmjsonparse.patch 2014-04-16 10:56:00.000000000 +0200 @@ -0,0 +1,26 @@ +From d6f5d5aae579455badb2d546f8ef292956720824 Mon Sep 17 00:00:00 2001 +From: Thomas D +Date: Tue, 15 Apr 2014 17:56:05 +0200 +Subject: [PATCH] Fix for https://github.com/rsyslog/rsyslog/issues/61 + +Based on Maxim Koltsov proposed patch from https://bugs.gentoo.org/show_bug.cgi?id=507730 +--- + plugins/mmjsonparse/mmjsonparse.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/mmjsonparse/mmjsonparse.c b/plugins/mmjsonparse/mmjsonparse.c +index b16aef0..a5bfaa2 100644 +--- a/plugins/mmjsonparse/mmjsonparse.c ++++ b/plugins/mmjsonparse/mmjsonparse.c +@@ -146,7 +146,7 @@ processJSON(instanceData *pData, msg_t *pMsg, char *buf, size_t lenBuf) + + err = pData->tokener->err; + if(err != json_tokener_continue) +- errMsg = json_tokener_errors[err]; ++ errMsg = json_tokener_error_desc(err); + else + errMsg = "Unterminated input"; + } else if((size_t)pData->tokener->char_offset < lenBuf) +-- +1.9.1 + diff -rupN original/app-admin/rsyslog/rsyslog-7.2.7.ebuild new/app-admin/rsyslog/rsyslog-7.2.7.ebuild --- original/app-admin/rsyslog/rsyslog-7.2.7.ebuild 2014-03-01 23:31:02.000000000 +0100 +++ new/app-admin/rsyslog/rsyslog-7.2.7.ebuild 2014-04-16 11:08:11.000000000 +0200 @@ -51,7 +51,11 @@ PATCHES=( "${FILESDIR}"/${PN}-7.2.5-json-c-pkgconfig.patch # Fix runtime UUID/JSON libs linking - "${FILESDIR}"/6-stable/${PN}-6.6.0-fix-runtime.patch ) + "${FILESDIR}"/6-stable/${PN}-6.6.0-fix-runtime.patch + + # Fix for #507730 + "$FILESDIR"/${BRANCH}/${PN}-7.x-mmjsonparse.patch +) src_prepare() { # Don't force '-g' CFLAG diff -rupN original/app-admin/rsyslog/rsyslog-7.4.10.ebuild new/app-admin/rsyslog/rsyslog-7.4.10.ebuild --- original/app-admin/rsyslog/rsyslog-7.4.10.ebuild 2014-03-10 14:00:19.000000000 +0100 +++ new/app-admin/rsyslog/rsyslog-7.4.10.ebuild 2014-04-16 10:58:45.000000000 +0200 @@ -50,6 +50,10 @@ AUTOTOOLS_IN_SOURCE_BUILD=1 DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf) +src_prepare() { + epatch "$FILESDIR"/${BRANCH}/${PN}-7.x-mmjsonparse.patch +} + src_configure() { # Maintainer notes: # * rfc3195 needs a library and development of that library diff -rupN original/app-admin/rsyslog/rsyslog-7.4.3.ebuild new/app-admin/rsyslog/rsyslog-7.4.3.ebuild --- original/app-admin/rsyslog/rsyslog-7.4.3.ebuild 2014-03-01 23:31:02.000000000 +0100 +++ new/app-admin/rsyslog/rsyslog-7.4.3.ebuild 2014-04-16 11:05:25.000000000 +0200 @@ -50,6 +50,7 @@ DOCS=(AUTHORS ChangeLog doc/rsyslog-exam PATCHES=( "${FILESDIR}"/${BRANCH}/${PN}-7.4.3-json-c-pkgconfig.patch "${FILESDIR}"/${BRANCH}/${PN}-7.4.3-fix-runtime.patch + "$FILESDIR"/${BRANCH}/${PN}-7.x-mmjsonparse.patch ) src_configure() { diff -rupN original/app-admin/rsyslog/rsyslog-7.4.4.ebuild new/app-admin/rsyslog/rsyslog-7.4.4.ebuild --- original/app-admin/rsyslog/rsyslog-7.4.4.ebuild 2014-03-01 23:31:02.000000000 +0100 +++ new/app-admin/rsyslog/rsyslog-7.4.4.ebuild 2014-04-16 11:04:01.000000000 +0200 @@ -48,6 +48,10 @@ AUTOTOOLS_IN_SOURCE_BUILD=1 DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf) +src_prepare() { + epatch "$FILESDIR"/${BRANCH}/${PN}-7.x-mmjsonparse.patch +} + src_configure() { # Maintainer notes: # * rfc3195 needs a library and development of that library diff -rupN original/app-admin/rsyslog/rsyslog-7.4.6.ebuild new/app-admin/rsyslog/rsyslog-7.4.6.ebuild --- original/app-admin/rsyslog/rsyslog-7.4.6.ebuild 2014-03-01 23:31:02.000000000 +0100 +++ new/app-admin/rsyslog/rsyslog-7.4.6.ebuild 2014-04-16 11:02:42.000000000 +0200 @@ -48,6 +48,10 @@ AUTOTOOLS_IN_SOURCE_BUILD=1 DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf) +src_prepare() { + epatch "$FILESDIR"/${BRANCH}/${PN}-7.x-mmjsonparse.patch +} + src_configure() { # Maintainer notes: # * rfc3195 needs a library and development of that library diff -rupN original/app-admin/rsyslog/rsyslog-7.4.7.ebuild new/app-admin/rsyslog/rsyslog-7.4.7.ebuild --- original/app-admin/rsyslog/rsyslog-7.4.7.ebuild 2014-03-01 23:31:02.000000000 +0100 +++ new/app-admin/rsyslog/rsyslog-7.4.7.ebuild 2014-04-16 11:01:32.000000000 +0200 @@ -49,6 +49,10 @@ AUTOTOOLS_IN_SOURCE_BUILD=1 DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf) +src_prepare() { + epatch "$FILESDIR"/${BRANCH}/${PN}-7.x-mmjsonparse.patch +} + src_configure() { # Maintainer notes: # * rfc3195 needs a library and development of that library