Attachment #375076 for bug #507730




From d6f5d5aae579455badb2d546f8ef292956720824 Mon Sep 17 00:00:00 2001
From: Thomas D <whissi@whissi.de>
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


Lines 51-57 PATCHES=( Link Here

(-)original/app-admin/rsyslog/rsyslog-7.2.7.ebuild (-1 / +5 lines)
51	"${FILESDIR}"/${PN}-7.2.5-json-c-pkgconfig.patch	51	"${FILESDIR}"/${PN}-7.2.5-json-c-pkgconfig.patch
52		52
53	# Fix runtime UUID/JSON libs linking	53	# Fix runtime UUID/JSON libs linking
54	"${FILESDIR}"/6-stable/${PN}-6.6.0-fix-runtime.patch )	54	"${FILESDIR}"/6-stable/${PN}-6.6.0-fix-runtime.patch
		55
		56	# Fix for #507730
		57	"$FILESDIR"/${BRANCH}/${PN}-7.x-mmjsonparse.patch
		58	)
55		59
56	src_prepare() {	60	src_prepare() {
57	# Don't force '-g' CFLAG	61	# Don't force '-g' CFLAG

Lines 50-55 AUTOTOOLS_IN_SOURCE_BUILD=1 Link Here

(-)original/app-admin/rsyslog/rsyslog-7.4.10.ebuild (+4 lines)
50		50
51	DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)	51	DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)
52		52
		53	src_prepare() {
		54	epatch "$FILESDIR"/${BRANCH}/${PN}-7.x-mmjsonparse.patch
		55	}
		56
53	src_configure() {	57	src_configure() {
54	# Maintainer notes:	58	# Maintainer notes:
55	# * rfc3195 needs a library and development of that library	59	# * rfc3195 needs a library and development of that library

Lines 50-55 DOCS=(AUTHORS ChangeLog doc/rsyslog-exam Link Here

(-)original/app-admin/rsyslog/rsyslog-7.4.3.ebuild (+1 lines)
50	PATCHES=(	50	PATCHES=(
51	"${FILESDIR}"/${BRANCH}/${PN}-7.4.3-json-c-pkgconfig.patch	51	"${FILESDIR}"/${BRANCH}/${PN}-7.4.3-json-c-pkgconfig.patch
52	"${FILESDIR}"/${BRANCH}/${PN}-7.4.3-fix-runtime.patch	52	"${FILESDIR}"/${BRANCH}/${PN}-7.4.3-fix-runtime.patch
		53	"$FILESDIR"/${BRANCH}/${PN}-7.x-mmjsonparse.patch
53	)	54	)
54		55
55	src_configure() {	56	src_configure() {

Lines 48-53 AUTOTOOLS_IN_SOURCE_BUILD=1 Link Here

(-)original/app-admin/rsyslog/rsyslog-7.4.4.ebuild (+4 lines)
48		48
49	DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)	49	DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)
50		50
		51	src_prepare() {
		52	epatch "$FILESDIR"/${BRANCH}/${PN}-7.x-mmjsonparse.patch
		53	}
		54
51	src_configure() {	55	src_configure() {
52	# Maintainer notes:	56	# Maintainer notes:
53	# * rfc3195 needs a library and development of that library	57	# * rfc3195 needs a library and development of that library

Lines 48-53 AUTOTOOLS_IN_SOURCE_BUILD=1 Link Here

(-)original/app-admin/rsyslog/rsyslog-7.4.6.ebuild (+4 lines)
48		48
49	DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)	49	DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)
50		50
		51	src_prepare() {
		52	epatch "$FILESDIR"/${BRANCH}/${PN}-7.x-mmjsonparse.patch
		53	}
		54
51	src_configure() {	55	src_configure() {
52	# Maintainer notes:	56	# Maintainer notes:
53	# * rfc3195 needs a library and development of that library	57	# * rfc3195 needs a library and development of that library

Lines 49-54 AUTOTOOLS_IN_SOURCE_BUILD=1 Link Here

(-)original/app-admin/rsyslog/rsyslog-7.4.7.ebuild (+4 lines)
49		49
50	DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)	50	DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)
51		51
		52	src_prepare() {
		53	epatch "$FILESDIR"/${BRANCH}/${PN}-7.x-mmjsonparse.patch
		54	}
		55
52	src_configure() {	56	src_configure() {
53	# Maintainer notes:	57	# Maintainer notes:
54	# * rfc3195 needs a library and development of that library	58	# * rfc3195 needs a library and development of that library

Return to bug 507730

Line 0 Link Here

(-)original/app-admin/rsyslog/files/7-stable/rsyslog-7.x-mmjsonparse.patch (+26 lines)
	1	From d6f5d5aae579455badb2d546f8ef292956720824 Mon Sep 17 00:00:00 2001
	2	From: Thomas D <whissi@whissi.de>
	3	Date: Tue, 15 Apr 2014 17:56:05 +0200
	4	Subject: [PATCH] Fix for https://github.com/rsyslog/rsyslog/issues/61
	5
	6	Based on Maxim Koltsov proposed patch from https://bugs.gentoo.org/show_bug.cgi?id=507730
	7	---
	8	plugins/mmjsonparse/mmjsonparse.c \| 2 +-
	9	1 file changed, 1 insertion(+), 1 deletion(-)
	10
	11	diff --git a/plugins/mmjsonparse/mmjsonparse.c b/plugins/mmjsonparse/mmjsonparse.c
	12	index b16aef0..a5bfaa2 100644
	13	--- a/plugins/mmjsonparse/mmjsonparse.c
	14	+++ b/plugins/mmjsonparse/mmjsonparse.c
	15	@@ -146,7 +146,7 @@ processJSON(instanceData pData, msg_t pMsg, char *buf, size_t lenBuf)
	16
	17	err = pData->tokener->err;
	18	if(err != json_tokener_continue)
	19	- errMsg = json_tokener_errors[err];
	20	+ errMsg = json_tokener_error_desc(err);
	21	else
	22	errMsg = "Unterminated input";
	23	} else if((size_t)pData->tokener->char_offset < lenBuf)
	24	--
	25	1.9.1
	26