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