diff --git a/syslog-ng-3.11.1_json-c_013.patch b/syslog-ng-3.11.1_json-c_013.patch index 67d73df..9e2c855 100644 --- a/syslog-ng-3.11.1_json-c_013.patch +++ b/syslog-ng-3.11.1_json-c_013.patch @@ -1,19 +1,28 @@ -commit 58bfd2e21b44413f08eb92cd6702b1f0402d1498 +commit 1b824dd6389e209eab752d5a698c6093f311e3e3 Author: Björn Esser Date: Mon Dec 11 15:46:06 2017 +0100 modules/json: Adaptions for json-c v0.13 diff --git a/modules/json/json-parser.c b/modules/json/json-parser.c -index 0368ed8f..787cc261 100644 +index 0368ed8f..356df48b 100644 --- a/modules/json/json-parser.c +++ b/modules/json/json-parser.c -@@ -28,7 +28,10 @@ +@@ -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 #include + -+#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < 1300) ++#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013) #include +#endif diff --git a/syslog-ng.spec b/syslog-ng.spec index 36c0c02..acf1221 100644 --- a/syslog-ng.spec +++ b/syslog-ng.spec @@ -2,7 +2,7 @@ Name: syslog-ng Version: 3.11.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Next-generation syslog server Group: System Environment/Daemons @@ -393,6 +393,9 @@ fi %changelog +* Mon Dec 11 2017 Björn Esser - 3.11.1-4 +- Fix patch for json-c + * Mon Dec 11 2017 Björn Esser - 3.11.1-3 - Add patch for building cleanly against json-c v0.13