Detect new json-c-0.11. Patch from Thomas D. <whissi@whissi.de>. Fixes bug #467338

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!

3 files changed, 83 insertions, 51 deletions

diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog
index 1aa27940e946..ce1306d64666 100644
--- a/app-admin/rsyslog/ChangeLog
+++ b/app-admin/rsyslog/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/rsyslog
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.90 2013/04/18 13:25:14 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.91 2013/04/28 10:20:13 hwoarang Exp $
+
+  28 Apr 2013; Markos Chandras <hwoarang@gentoo.org>
+  files/rsyslog-7.2.5-json-c-pkgconfig.patch:
+  Detect new json-c-0.11. Patch from Thomas D. <whissi@whissi.de>. Fixes bug
+  #467338
 
 *rsyslog-7.2.7 (18 Apr 2013)
 
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 1c2ab9da91ac..07f4c1904e20 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -15,7 +15,7 @@ AUX 7-stable/rsyslog-gentoo.conf 2630 SHA256 9b390cfffef39d3b5c6f845c6285e23fddc
 AUX 7-stable/rsyslog.confd 583 SHA256 ff2634927d3208ac2c82d352f0a7dc9fef1d0ee098d18f818d4417ac04516e9c SHA512 d7cdfd5eab63877ca2a4776c24b2810aee600c2590f10b598d9feee08a5fcedd9c33cdd2a8e1f89b869474b66ab22e7f96126a5b52e6e66760f742407ae81301 WHIRLPOOL f53744ca0177d2f52e1f070eed6927afddbd38c9b6f3fe889b4652cd8b3f0dd625abfe434253e73fbdbf7a14169c7ace5038dc8322ca4b3f97abf893125cedec
 AUX 7-stable/rsyslog.initd 985 SHA256 7b3b32e89c051566b68c5e5a077cd5960da183e071e411b1248d4e4702a24279 SHA512 982f2f11370a87fc5d3dd6d1961d35b4e2c1d0d91b4806f9d2ce422e08c08f8d62c7c0f0fdfa6950c0114da099f61bb3142af431a13ea62d7c6ea1720a6d6682 WHIRLPOOL 4b906fbed7d8a9acb2c0989d94d4611f63f8598d77c124506426ddb9d9d24ff9b92b7c91d5405158e18542fb8a383e0abdfecace03959507c1180244d1b93973
 AUX 7-stable/rsyslog.logrotate 547 SHA256 5ade60899ab0f01b757e2f6322ef044b34d143697151431fb0ff7ef65290b53f SHA512 1a43dad1d64f3fb08d55f3d8b60072b06d277eff40fa3e2092998110936f871e1f21ad19a2ef5e17fdd06c3b0643abf4c5668cf41e81847f1c8d7a5c5f9ebe0c WHIRLPOOL ded39f72f185ebfd623f75e60ebaa236f4c1c9fb25c63bd0e751e7b8bf32d8d23dac08e0e5246d6390f4b79040561053ccfebe747e7350e07d1f8ffc78493d39
-AUX rsyslog-7.2.5-json-c-pkgconfig.patch 4459 SHA256 55ba883c9d2b69cd8a08cf1417b838fadba4fe8d23107729e5358c81b877bff7 SHA512 06e5e07e97cc803476149d3f37151d612a24afa6862b1f36e35c9c80abcd0176f9b6d9d496c3633db4e1dd3d4257c3fb97e744afbcc377b2ec20a44f862bb8ea WHIRLPOOL 4086b1fb077554b0115cf7fdf83f28a1e92a510d09809fb89891b70a25b40b0fd2ba2c04ad0e2ef53b40ec3ef8b0e4bb5c2d7185310f87fe8f6d0f9479d8157b
+AUX rsyslog-7.2.5-json-c-pkgconfig.patch 5587 SHA256 107990512f1cbaf4459ec83870cde288fde8ca8c95905658b1202ee8ac12e6fc SHA512 04c4b12916fe158c580d5e9ad74449108d42b7242e0c5d8ecc89f99fdd13bf68b3576d187b4ef5b52d877bc7f7b3d7a2c12786fcd08140d23521a7bbf3c50a56 WHIRLPOOL 4cfc61d46d472b874864726c0ebb88495c4437106121b79fd05f338939ae48d3b8658676305a88d5de996da69f5bdee8b25dc73275ffe4aa01b209d89fb78c81
 DIST rsyslog-5.10.1.tar.gz 2390048 SHA256 2f643a2c613d5b09f242affd32a90cf4fb7a9ac4557dc80f218e6f3e5affb4c8 SHA512 5f70e97c60103c1f3198cd04cb1fb402d67c2e0232ff09c0aa0cd578667924e0a77a34529bcf4f530c0ef5b8da4f42b98bd5be029d1c2669dd04003e59c1b092 WHIRLPOOL 3f14b25dfca61bdcbdc954f0cd54f5e71481a8ebcbfbd45abceafac9185a51dfd67990e936dd3368c9944aabc9653435fbefc270aabcf925e1a2afda9d09e7ea
 DIST rsyslog-5.8.11.tar.gz 2393222 SHA256 f75b39cf22506f7a28d986d0a446a09a0806f253dba661f125a241a1b47d6285 SHA512 545db333efd136c2ae26131ad400e69f41aaa4fa458a5d586c73e9063f0acb044dbcfe3a13e48b3db77a72f471e87b3b8f9ab2bff008b1166b836dbdddb7974a WHIRLPOOL 2ab8ae35179dcade3953c612cb8bdbd48e7bce6c0cca54278d2949ff3c7c29311341855778511acc38328db4ebeca5599e632c94def038f7134cdd2df78e53e8
 DIST rsyslog-5.8.12.tar.gz 2393679 SHA256 18a408c92fa299773d26a8d6f324eec66282a148b0989c66d94b94318dd0a514 SHA512 18080b09a5e80d3a2dc4b04976c3470eb096560ebc038815dfaec73ef3e53ffbad74b2586d0247aeb318a6e2463e072fe84dad5a2040a9320f37b55511d890ae WHIRLPOOL 80b429beb88014c862fc74f0b9ff0b78bd54764b3c01a4b3f7595d4863eb2f8996d29e9db70b472c30c7cac02793a5290319f51b6eaab4b28dea4ca16246c030
@@ -35,12 +35,24 @@ EBUILD rsyslog-6.6.0.ebuild 7056 SHA256 431f39720521bb4181c8bbadf9a6f86663572edd
 EBUILD rsyslog-7.2.2-r1.ebuild 7137 SHA256 2814946a6ad96181c33fd7a5b6f874d99035a5b2f9e156a8bf1d99ddab76a39c SHA512 3ab258ddc9f8c1747c772ef9f9e7f209aa5285a5098eebf0bd445a65c152c8499b73944c0da64e1f584f568b776c338bc8b903977b35e144b6555abe6913fedd WHIRLPOOL 3b00dfe36d159dc57429cd05595f1d71bf6fcf0511657e96a07d327ca0e2d3ccfde25206ff8b3231a6fda80776d42965a31f321369b527d20b7951a28d535d31
 EBUILD rsyslog-7.2.5.ebuild 7138 SHA256 ad05447d4f322c4f901c43ac192accc3a9d30c20a261bbb7b925a84e10c667a2 SHA512 e8ed53579c636b6f2f863c02ab92d8cfbbdbc915a8a3f1ebe511c1c20225c980f574d6b708cd057b43d0f175798ae60c66dc50bcdcb939b78f0a48f819adee62 WHIRLPOOL 7e37583e9990e0e5952a0eb89beff092ba803d236dfb08dc49efd4af7b135117a3d8fd9168d5f4149cbe6e151c16984185a6506279c645f766a7f785e3a1e443
 EBUILD rsyslog-7.2.7.ebuild 7157 SHA256 f25a9ce11153d1dfa0e17f9c036c373d19b2d1befa9924fd0677151e2e8904c0 SHA512 765dc0cac35c9af5b3fba35e0ad7d2df6d8790b60bb823f7dce299bba47cbbda7f19160bd83ffa5e78517e05cc8f7ca0dd10de10504b250312cc847771833ee4 WHIRLPOOL 4d024decf1d6bbe4622b64e651b20e4215c35c076707ded85c39509f553a932815de58aba99c4aa871a4c59261a9574f64f58731a6539a0a7781d76aefcb8fae
-MISC ChangeLog 16764 SHA256 7b528de21fe1ba8f55d68d2a45d40c081d5c10ef14094e187133d737e081a22f SHA512 bb41af18e04c791462c69e3dc8474fba7dee4a7995a6a068cde082969b1cd7a5f780174e5bcc0524ee81075bf92ca27aeee42ae3c8e3e66f605c5559d3d17844 WHIRLPOOL 9fb853bc3e6456affaadd5221d104f73b50a1cc7c87b99f2b1a148f53ab9df6d2f85b70b7e56ffc22af60e6e735ad636484793f8038bafbc865e2d3a22122759
+MISC ChangeLog 16951 SHA256 d2f748a02bc77c2735277a6e83900bca2680e6d69a21f2b00f39a4d0e2696951 SHA512 a5cc28375ea55e28ecfd09e2975fb04e47faa2962bd1c12eb44799770ae4da386cc8dd5d09311b9603f73fdad008b4e3f45ac51d0917f8f02eea32a1918908f7 WHIRLPOOL 1fe4de591f307515b768081ddc4cdd493fc173c329b62c8f0ec23dfe6341d744ef6e6474b4653c2b0d474b102dcb13e75434ed40c91004a6c8847880a886dd66
 MISC metadata.xml 654 SHA256 64c2e80b469c21ebea4933e47f601d390cc442d6c0ad83478888b7a2d39c3782 SHA512 f2d7bf3151036af2a023c959e75391b796066b6fc62c95b8493409a20a092d39ed2d9ac9f3ca466d5dcaeb4cc9eb82d899da381a21b1df6d9ee11b1537a54907 WHIRLPOOL c3529400558796c324cb007acb9d600e1b02f4227c5587600072e8addc207ae53c531d2929901f3d41912708d2be1ec943fab4b513f199e2822ba1ba44f6617e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF0EAREIAAYFAlFv9D8ACgkQKiQSS7ZY+hNw9gD/eu8KELrjeVqSpoVlKiRDImGF
-OlmFb72xEtbF/RcvhMsA9iU/6ZarphEcTQYByGZS99m1nXAvmX5FJ1HxGSGih1A=
-=2sFj
+iQJ8BAEBCABmBQJRfPfdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88rcUP/ih3QwK/eCtqtxMIiH5v3a3b
+3qLVoB7D8D7n8VUGZ5PcAClsXTTnvKDUkXc6tVal+D40Ut/taE7bAWmgXDzdn+On
+snxmnmHPZl0/doqi4ECjP70tVWGUQck70DaNrj5A+WIGEiWfZpWojs6gvD2KX1aw
+EU5lRyq4nRO2vw1e3DP6U/YfIAhA4cBwyzRt/uOZ5x2nEKaRdsICOf4nsCX1lDgV
+J1S2fLZvI2Nta0urD0oAkJHnjrL0QIrG6pnFa/4xhz9ByRvzV5DCZwZnJPo9xaJ1
+/hanTJcS//BWaJu0vel/oYqtxLUzupbl8SPvfvqeW08Sz4zsFgHwCMSugc+UBBRb
+Im+ICarRS+j/MNUigTu8u9bGbRi91L9GGXyUXWTjuwMMQBvLwZ5mBajEvjCMKDuH
+SWf7EE2MCdEAT1EMNBN4cM/2C6+8Kknb8J/RvWkNvDi8DVKOB7xO+mLfTBKoTr9z
+EuO52P4KhpS2YKQGuNNBtbN6DzYy2NYkWhrsMIKpe17ykgVGIRpkArMgzw60IW8d
+0SB5EEkfquSzYFb247Z2SMOD8yUw7IrStt76evS0lsPbUCphYGK2Og21OvqH8ht2
+4Ptg0EH7+6ZkJ/LuHQipv45n7Vf/sidjtcq/YT2Cje8hg0o2UFxnPAjV4QkyrzmR
+Aql6k6rhwYja0Qp3zEZS
+=t8VP
 -----END PGP SIGNATURE-----
diff --git a/app-admin/rsyslog/files/rsyslog-7.2.5-json-c-pkgconfig.patch b/app-admin/rsyslog/files/rsyslog-7.2.5-json-c-pkgconfig.patch
index 61cc38c5a3dc..3b000e868299 100644
--- a/app-admin/rsyslog/files/rsyslog-7.2.5-json-c-pkgconfig.patch
+++ b/app-admin/rsyslog/files/rsyslog-7.2.5-json-c-pkgconfig.patch
@@ -1,13 +1,20 @@
 From edf9b718d3007bdb519b3d64cb1f8145bba8e15e Mon Sep 17 00:00:00 2001
 From: Justin Lecher <jlec@gentoo.org>
 Date: Tue, 12 Feb 2013 11:55:17 +0100
-Subject: [PATCH] Use pkg-config to detect json-c
+Subject: [PATCH] Use pkg-config to detect json or json-c
 
 There was a typo in the configure.ac which prevented correct usage of pkg-config
 to detect json-c.
 This patch corrects this typo and removes all paths from json.h in source files.
+Moreover, since json-c-0.11 the pkgconfig was renamed to json-c so the
+configure.ac file was modified to check for the new one if the old one was
+not found.
 
+Reported-by: Thomas D. <whissi@whissi.de>
+Tested-by: Thomas D. <whissi@whissi.de>
 Signed-off-by: Justin Lecher <jlec@gentoo.org>
+Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
+
 ---
  action.c                          | 2 +-
  configure.ac                      | 2 +-
@@ -21,10 +28,10 @@ Signed-off-by: Justin Lecher <jlec@gentoo.org>
  template.h                        | 2 +-
  10 files changed, 10 insertions(+), 10 deletions(-)
 
-diff --git a/action.c b/action.c
-index 07f3a6f..d5cf983 100644
---- a/action.c
-+++ b/action.c
+Index: rsyslog-7.2.7/action.c
+===================================================================
+--- rsyslog-7.2.7.orig/action.c
++++ rsyslog-7.2.7/action.c
 @@ -98,7 +98,7 @@
  #include <strings.h>
  #include <time.h>
@@ -34,11 +41,22 @@ index 07f3a6f..d5cf983 100644
  
  #include "dirty.h"
  #include "template.h"
-diff --git a/configure.ac b/configure.ac
-index e9fce3f..cad0d57 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -758,7 +758,7 @@ if test "x$enable_rsyslogrt" = "xyes"; then
+Index: rsyslog-7.2.7/configure.ac
+===================================================================
+--- rsyslog-7.2.7.orig/configure.ac
++++ rsyslog-7.2.7/configure.ac
+@@ -34,7 +34,9 @@ PKG_PROG_PKG_CONFIG
+ # modules we require
+ PKG_CHECK_MODULES(LIBESTR, libestr >= 0.1.5)
+ PKG_CHECK_MODULES(LIBEE, libee >= 0.4.0)
+-PKG_CHECK_MODULES([JSON_C], [json])
++PKG_CHECK_MODULES([JSON_C], [json],, [
++	PKG_CHECK_MODULES([JSON_C], [json-c])
++])
+ 
+ case "${host}" in
+   *-*-linux*)
+@@ -764,7 +766,7 @@ if test "x$enable_rsyslogrt" = "xyes"; t
    RSRT_LIBS1="\$(top_builddir)/runtime/librsyslog.la"
  fi
  AM_CONDITIONAL(ENABLE_RSYSLOGRT, test x$enable_rsyslogrt = xyes)
@@ -47,10 +65,10 @@ index e9fce3f..cad0d57 100644
  RSRT_LIBS="\$(RSRT_LIBS1) \$(LIBESTR_LIBS) \$(JSON_C_LIBS)"
  AC_SUBST(RSRT_CFLAGS1)
  AC_SUBST(RSRT_LIBS1)
-diff --git a/plugins/imkmsg/kmsg.c b/plugins/imkmsg/kmsg.c
-index b771d68..1c3ae4d 100644
---- a/plugins/imkmsg/kmsg.c
-+++ b/plugins/imkmsg/kmsg.c
+Index: rsyslog-7.2.7/plugins/imkmsg/kmsg.c
+===================================================================
+--- rsyslog-7.2.7.orig/plugins/imkmsg/kmsg.c
++++ rsyslog-7.2.7/plugins/imkmsg/kmsg.c
 @@ -35,7 +35,7 @@
  #ifdef  OS_LINUX
  #include <sys/klog.h>
@@ -60,10 +78,10 @@ index b771d68..1c3ae4d 100644
  
  #include "rsyslog.h"
  #include "srUtils.h"
-diff --git a/plugins/mmjsonparse/mmjsonparse.c b/plugins/mmjsonparse/mmjsonparse.c
-index c47aceb..56db557 100644
---- a/plugins/mmjsonparse/mmjsonparse.c
-+++ b/plugins/mmjsonparse/mmjsonparse.c
+Index: rsyslog-7.2.7/plugins/mmjsonparse/mmjsonparse.c
+===================================================================
+--- rsyslog-7.2.7.orig/plugins/mmjsonparse/mmjsonparse.c
++++ rsyslog-7.2.7/plugins/mmjsonparse/mmjsonparse.c
 @@ -36,7 +36,7 @@
  #include <unistd.h>
  #include <ctype.h>
@@ -73,10 +91,10 @@ index c47aceb..56db557 100644
  #include "conf.h"
  #include "syslogd-types.h"
  #include "template.h"
-diff --git a/plugins/mmnormalize/mmnormalize.c b/plugins/mmnormalize/mmnormalize.c
-index fd2004a..45dde98 100644
---- a/plugins/mmnormalize/mmnormalize.c
-+++ b/plugins/mmnormalize/mmnormalize.c
+Index: rsyslog-7.2.7/plugins/mmnormalize/mmnormalize.c
+===================================================================
+--- rsyslog-7.2.7.orig/plugins/mmnormalize/mmnormalize.c
++++ rsyslog-7.2.7/plugins/mmnormalize/mmnormalize.c
 @@ -40,7 +40,7 @@
  #include <unistd.h>
  #include <libestr.h>
@@ -86,10 +104,10 @@ index fd2004a..45dde98 100644
  #include <liblognorm.h>
  #include "conf.h"
  #include "syslogd-types.h"
-diff --git a/plugins/ommongodb/ommongodb.c b/plugins/ommongodb/ommongodb.c
-index dd99741..64d501d 100644
---- a/plugins/ommongodb/ommongodb.c
-+++ b/plugins/ommongodb/ommongodb.c
+Index: rsyslog-7.2.7/plugins/ommongodb/ommongodb.c
+===================================================================
+--- rsyslog-7.2.7.orig/plugins/ommongodb/ommongodb.c
++++ rsyslog-7.2.7/plugins/ommongodb/ommongodb.c
 @@ -33,7 +33,7 @@
  #include <stdint.h>
  #include <time.h>
@@ -99,10 +117,10 @@ index dd99741..64d501d 100644
  /* For struct json_object_iter, should not be necessary in future versions */
  #include <json/json_object_private.h>
  
-diff --git a/runtime/msg.c b/runtime/msg.c
-index 68577ad..664abb9 100644
---- a/runtime/msg.c
-+++ b/runtime/msg.c
+Index: rsyslog-7.2.7/runtime/msg.c
+===================================================================
+--- rsyslog-7.2.7.orig/runtime/msg.c
++++ rsyslog-7.2.7/runtime/msg.c
 @@ -41,7 +41,7 @@
  #endif
  #include <netdb.h>
@@ -112,10 +130,10 @@ index 68577ad..664abb9 100644
  /* For struct json_object_iter, should not be necessary in future versions */
  #include <json/json_object_private.h>
  #if HAVE_MALLOC_H
-diff --git a/runtime/msg.h b/runtime/msg.h
-index 564441b..caa825f 100644
---- a/runtime/msg.h
-+++ b/runtime/msg.h
+Index: rsyslog-7.2.7/runtime/msg.h
+===================================================================
+--- rsyslog-7.2.7.orig/runtime/msg.h
++++ rsyslog-7.2.7/runtime/msg.h
 @@ -30,7 +30,7 @@
  
  #include <pthread.h>
@@ -125,10 +143,10 @@ index 564441b..caa825f 100644
  #include "obj.h"
  #include "syslogd-types.h"
  #include "template.h"
-diff --git a/template.c b/template.c
-index 1ccb375..974aba3 100644
---- a/template.c
-+++ b/template.c
+Index: rsyslog-7.2.7/template.c
+===================================================================
+--- rsyslog-7.2.7.orig/template.c
++++ rsyslog-7.2.7/template.c
 @@ -34,7 +34,7 @@
  #include <string.h>
  #include <ctype.h>
@@ -138,10 +156,10 @@ index 1ccb375..974aba3 100644
  #include "stringbuf.h"
  #include "syslogd-types.h"
  #include "template.h"
-diff --git a/template.h b/template.h
-index 018e2f5..c87e7a8 100644
---- a/template.h
-+++ b/template.h
+Index: rsyslog-7.2.7/template.h
+===================================================================
+--- rsyslog-7.2.7.orig/template.h
++++ rsyslog-7.2.7/template.h
 @@ -30,7 +30,7 @@
  #ifndef	TEMPLATE_H_INCLUDED
  #define	TEMPLATE_H_INCLUDED 1
@@ -151,6 +169,3 @@ index 018e2f5..c87e7a8 100644
  #include <libestr.h>
  #include "regexp.h"
  #include "stringbuf.h"
--- 
-1.8.1.2
-