8 files changed, 62 insertions, 8 deletions
diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog
index b72706b983ca..7d670080cdf1 100644
--- a/app-admin/rsyslog/ChangeLog
+++ b/app-admin/rsyslog/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/rsyslog
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.110 2014/03/10 13:00:19 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.111 2014/04/16 16:14:41 maksbotan Exp $
+
+  16 Apr 2014; Maxim Koltsov <maksbotan@gentoo.org>
+  +files/7-stable/rsyslog-7.x-mmjsonparse.patch, rsyslog-7.2.7.ebuild,
+  rsyslog-7.4.10.ebuild, rsyslog-7.4.3.ebuild, rsyslog-7.4.4.ebuild,
+  rsyslog-7.4.6.ebuild, rsyslog-7.4.7.ebuild:
+  Add upstream patch for >=dev-libs/json-c-0.12, bug #507730. Thanks to Thomas
+  D. <whissi@whissi.de>.
 
 *rsyslog-7.4.10 (10 Mar 2014)
 
diff --git a/app-admin/rsyslog/files/7-stable/rsyslog-7.x-mmjsonparse.patch b/app-admin/rsyslog/files/7-stable/rsyslog-7.x-mmjsonparse.patch
new file mode 100644
index 000000000000..ad5c8ea777d9
--- /dev/null
+++ b/app-admin/rsyslog/files/7-stable/rsyslog-7.x-mmjsonparse.patch
@@ -0,0 +1,26 @@
+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
+
diff --git a/app-admin/rsyslog/rsyslog-7.2.7.ebuild b/app-admin/rsyslog/rsyslog-7.2.7.ebuild
index d13cb742ba3c..a2d5c3d05721 100644
--- a/app-admin/rsyslog/rsyslog-7.2.7.ebuild
+++ b/app-admin/rsyslog/rsyslog-7.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.2.7.ebuild,v 1.9 2014/03/01 22:11:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.2.7.ebuild,v 1.10 2014/04/16 16:14:41 maksbotan Exp $
 
 EAPI=4
 AUTOTOOLS_AUTORECONF=yes
@@ -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 --git a/app-admin/rsyslog/rsyslog-7.4.10.ebuild b/app-admin/rsyslog/rsyslog-7.4.10.ebuild
index c1c03cd49039..1744fa9eaf7e 100644
--- a/app-admin/rsyslog/rsyslog-7.4.10.ebuild
+++ b/app-admin/rsyslog/rsyslog-7.4.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.10.ebuild,v 1.1 2014/03/10 13:00:19 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.10.ebuild,v 1.2 2014/04/16 16:14:41 maksbotan Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=yes
@@ -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 --git a/app-admin/rsyslog/rsyslog-7.4.3.ebuild b/app-admin/rsyslog/rsyslog-7.4.3.ebuild
index f4c6ff6cfa3b..007d1ae8dad0 100644
--- a/app-admin/rsyslog/rsyslog-7.4.3.ebuild
+++ b/app-admin/rsyslog/rsyslog-7.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.3.ebuild,v 1.7 2014/03/01 22:11:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.3.ebuild,v 1.8 2014/04/16 16:14:41 maksbotan Exp $
 
 EAPI=4
 AUTOTOOLS_AUTORECONF=yes
@@ -50,6 +50,7 @@ DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)
 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 --git a/app-admin/rsyslog/rsyslog-7.4.4.ebuild b/app-admin/rsyslog/rsyslog-7.4.4.ebuild
index 43926b5e0e36..4e2b7e142676 100644
--- a/app-admin/rsyslog/rsyslog-7.4.4.ebuild
+++ b/app-admin/rsyslog/rsyslog-7.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.4.ebuild,v 1.9 2014/03/01 22:11:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.4.ebuild,v 1.10 2014/04/16 16:14:41 maksbotan Exp $
 
 EAPI=4
 AUTOTOOLS_AUTORECONF=yes
@@ -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 --git a/app-admin/rsyslog/rsyslog-7.4.6.ebuild b/app-admin/rsyslog/rsyslog-7.4.6.ebuild
index 934c1ef6ea05..73b852e64afb 100644
--- a/app-admin/rsyslog/rsyslog-7.4.6.ebuild
+++ b/app-admin/rsyslog/rsyslog-7.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.6.ebuild,v 1.5 2014/03/01 22:11:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.6.ebuild,v 1.6 2014/04/16 16:14:41 maksbotan Exp $
 
 EAPI=4
 AUTOTOOLS_AUTORECONF=yes
@@ -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 --git a/app-admin/rsyslog/rsyslog-7.4.7.ebuild b/app-admin/rsyslog/rsyslog-7.4.7.ebuild
index 7e893bd2c5a8..4eac17feddb9 100644
--- a/app-admin/rsyslog/rsyslog-7.4.7.ebuild
+++ b/app-admin/rsyslog/rsyslog-7.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.7.ebuild,v 1.4 2014/03/01 22:11:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.7.ebuild,v 1.5 2014/04/16 16:14:41 maksbotan Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=yes
@@ -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