Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (ad7e744abfe0250eee0bd65fed58f0d3b62b6845)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (ad7e744abfe0250eee0bd65fed58f0d3b62b6845)
  • Date: Mon, 29 Jan 2018 02:00:50 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

utils/syslog-ng/HISTORY | 4 ++++
utils/syslog-ng/PRE_BUILD | 3 +++
utils/syslog-ng/json-c.patch | 33 +++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+)

New commits:
commit ad7e744abfe0250eee0bd65fed58f0d3b62b6845
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

utils/syslog-ng: added upstream fix to build with json-c >= 0.13

diff --git a/utils/syslog-ng/HISTORY b/utils/syslog-ng/HISTORY
index 6ff01e5..17e8ef8 100644
--- a/utils/syslog-ng/HISTORY
+++ b/utils/syslog-ng/HISTORY
@@ -1,3 +1,7 @@
+2018-01-28 Pavel Vinogradov <public AT sourcemage.org>
+ * PRE_BUILD, json-c.patch: added upstream patch for building with
+ json-c >= 0.13
+
2017-12-06 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 3.13.2

diff --git a/utils/syslog-ng/PRE_BUILD b/utils/syslog-ng/PRE_BUILD
index 1fa4c90..d8e4631 100755
--- a/utils/syslog-ng/PRE_BUILD
+++ b/utils/syslog-ng/PRE_BUILD
@@ -1,4 +1,7 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&

+# For json-c >= 0.13
+patch -p1 < "${SPELL_DIRECTORY}/json-c.patch" &&
+
skip_submodules=yes ./autogen.sh
diff --git a/utils/syslog-ng/json-c.patch b/utils/syslog-ng/json-c.patch
new file mode 100644
index 0000000..a30d03f
--- /dev/null
+++ b/utils/syslog-ng/json-c.patch
@@ -0,0 +1,33 @@
+From 1b824dd6389e209eab752d5a698c6093f311e3e3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82 AT fedoraproject.org>
+Date: Mon, 11 Dec 2017 15:46:06 +0100
+Subject: [PATCH] modules/json: Adaptions for json-c v0.13
+
+---
+ modules/json/json-parser.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/modules/json/json-parser.c b/modules/json/json-parser.c
+index 0368ed8f7f..356df48b9f 100644
+--- a/modules/json/json-parser.c
++++ b/modules/json/json-parser.c
+@@ -20,6 +20,8 @@
+ * COPYING for details.
+ */
+
++#define JSON_C_VER_013 (13 << 8)
++
+ #include "json-parser.h"
+ #include "dot-notation.h"
+ #include "scratch-buffers.h"
+@@ -28,7 +30,10 @@
+ #include <ctype.h>
+
+ #include <json.h>
++
++#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
+ #include <json_object_private.h>
++#endif
+
+ typedef struct _JSONParser
+ {



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (ad7e744abfe0250eee0bd65fed58f0d3b62b6845), Pavel Vinogradov, 01/28/2018

Archive powered by MHonArc 2.6.24.

Top of Page