| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | json-c-0.12 unlike 0.11 doesn't install json -> json-c symlink in include |
| 2 | |
| 3 | * Resolved in Version 7.6.4 [v7.6-stable] 2014-09-12 |
| 4 | https://github.com/rsyslog/rsyslog/blob/v7-stable/ChangeLog |
| 5 | * permits to build against json-c 0.12 |
| 6 | Unfortunately, json-c had an ABI breakage, so this is necessary. Note |
| 7 | that versions prior to 0.12 had security issues (CVE-2013-6370, |
| 8 | CVE-2013-6371) and so it is desirable to link against the new version. |
| 9 | Thanks to Thomas D. for the patch. Note that at least some distros |
| 10 | have fixed the security issue in older versions of json-c, so this |
| 11 | seems to apply mostly when building from sources. |
| 12 | |
| 13 | Upstream-Status: Backport |
| 14 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
| 15 | |
| 16 | diff --git a/plugins/ommongodb/ommongodb.c b/plugins/ommongodb/ommongodb.c |
| 17 | index 41c0d76..682c40e 100644 |
| 18 | --- a/plugins/ommongodb/ommongodb.c |
| 19 | +++ b/plugins/ommongodb/ommongodb.c |
| 20 | @@ -33,9 +33,9 @@ |
| 21 | #include <stdint.h> |
| 22 | #include <time.h> |
| 23 | #include <mongo.h> |
| 24 | -#include <json.h> |
| 25 | +#include <json-c/json.h> |
| 26 | /* For struct json_object_iter, should not be necessary in future versions */ |
| 27 | -#include <json_object_private.h> |
| 28 | +#include <json-c/json_object_private.h> |
| 29 | |
| 30 | #include "rsyslog.h" |
| 31 | #include "conf.h" |
| 32 | diff --git a/runtime/msg.c b/runtime/msg.c |
| 33 | index d04ce7b..b367e1f 100644 |
| 34 | --- a/runtime/msg.c |
| 35 | +++ b/runtime/msg.c |
| 36 | @@ -41,9 +41,9 @@ |
| 37 | #endif |
| 38 | #include <netdb.h> |
| 39 | #include <libestr.h> |
| 40 | -#include <json.h> |
| 41 | +#include <json-c/json.h> |
| 42 | /* For struct json_object_iter, should not be necessary in future versions */ |
| 43 | -#include <json_object_private.h> |
| 44 | +#include <json-c/json_object_private.h> |
| 45 | #if HAVE_MALLOC_H |
| 46 | # include <malloc.h> |
| 47 | #endif |