Hello community, here is the log from the commit of package syslog-ng for openSUSE:Factory checked in at 2018-01-10 23:37:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/syslog-ng (Old) and /work/SRC/openSUSE:Factory/.syslog-ng.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "syslog-ng" Wed Jan 10 23:37:57 2018 rev:94 rq:563228 version:3.12.1 Changes: -------- --- /work/SRC/openSUSE:Factory/syslog-ng/syslog-ng.changes 2018-01-09 14:56:30.530476302 +0100 +++ /work/SRC/openSUSE:Factory/.syslog-ng.new/syslog-ng.changes 2018-01-10 23:37:58.664113675 +0100 @@ -1,0 +2,6 @@ +Wed Jan 10 07:15:18 UTC 2018 - [email protected] + +- fix build error with json-c v0.13 with patch + 0001-modules-json-Adaptions-for-json-c-v0.13.patch + +------------------------------------------------------------------- New: ---- 0001-modules-json-Adaptions-for-json-c-v0.13.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syslog-ng.spec ++++++ --- /var/tmp/diff_new_pack.0MfyRL/_old 2018-01-10 23:37:59.472075770 +0100 +++ /var/tmp/diff_new_pack.0MfyRL/_new 2018-01-10 23:37:59.472075770 +0100 @@ -41,6 +41,7 @@ Source3: syslog-ng.service Source4: syslog-ng-service-prepare Patch0: syslog-ng-3.10.1-sourcetarget.patch +Patch1: 0001-modules-json-Adaptions-for-json-c-v0.13.patch %if 0%{?suse_version} >= 1210 %bcond_without systemd @@ -285,6 +286,7 @@ %prep %setup -q -n syslog-ng-%{version} %patch0 -p1 +%patch1 -p1 # fill out placeholders in the config, # systemd service and prepare script. for file in \ ++++++ 0001-modules-json-Adaptions-for-json-c-v0.13.patch ++++++ >From 1b824dd6389e209eab752d5a698c6093f311e3e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <[email protected]> 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 0368ed8f..356df48b 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 { -- 2.13.6
