diff --git a/0032-add-support-for-upcoming-json-c-0.14.0.patch b/0032-add-support-for-upcoming-json-c-0.14.0.patch new file mode 100644 index 0000000..34d02f7 --- /dev/null +++ b/0032-add-support-for-upcoming-json-c-0.14.0.patch @@ -0,0 +1,28 @@ +From 8438a9cd8d7ed88645fa8e6a8f19c0fd9ae872a7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= +Date: Mon, 13 Apr 2020 19:22:02 +0200 +Subject: [PATCH] Add support for upcoming json-c 0.14.0. + +TRUE/FALSE are not defined anymore. 1 and 0 are used instead. +This is backwards compatible, as earlier versions of json-c are +using the same integer values in their present definitions. +--- + libdmmp/libdmmp_private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libdmmp/libdmmp_private.h b/libdmmp/libdmmp_private.h +index ac85b63f..4378962b 100644 +--- a/libdmmp/libdmmp_private.h ++++ b/libdmmp/libdmmp_private.h +@@ -82,7 +82,7 @@ static out_type func_name(struct dmmp_context *ctx, const char *var_name) { \ + do { \ + json_type j_type = json_type_null; \ + json_object *j_obj_tmp = NULL; \ +- if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != TRUE) { \ ++ if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != 1) { \ + _error(ctx, "Invalid JSON output from multipathd IPC: " \ + "key '%s' not found", key); \ + rc = DMMP_ERR_IPC_ERROR; \ +-- +2.26.0 + diff --git a/device-mapper-multipath.spec b/device-mapper-multipath.spec index 1db2d51..25c084b 100644 --- a/device-mapper-multipath.spec +++ b/device-mapper-multipath.spec @@ -1,6 +1,6 @@ Name: device-mapper-multipath Version: 0.8.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tools to manage multipath devices using device-mapper License: GPLv2 URL: http://christophe.varoqui.free.fr/ @@ -41,6 +41,7 @@ Patch0028: 0028-RH-reset-default-find_mutipaths-value-to-off.patch Patch0029: 0029-RH-Fix-nvme-compilation-warning.patch Patch0030: 0030-RH-attempt-to-get-ANA-info-via-sysfs-first.patch Patch0031: 0031-multipath-fix-issues-found-by-compiling-with-gcc-10.patch +Patch0032: 0032-add-support-for-upcoming-json-c-0.14.0.patch # runtime Requires: %{name}-libs = %{version}-%{release} @@ -235,6 +236,9 @@ fi %{_pkgconfdir}/libdmmp.pc %changelog +* Mon Apr 13 2020 Björn Esser - 0.8.2-5 +- Add 0032-add-support-for-upcoming-json-c-0.14.0.patch + * Mon Apr 13 2020 Björn Esser - 0.8.2-4 - Fix macro escaping in %%changelog