- added json-c patch (fixes build with json-c 0.14), more BRs; release 2

diff --git a/multipath-tools-json-c.patch b/multipath-tools-json-c.patch
new file mode 100644 (file)
index 0000000..940ab72
--- /dev/null
+++ b/multipath-tools-json-c.patch
@@ -0,0 +1,20 @@
+--- multipath-tools-0.8.3-6c3bd36/libdmmp/libdmmp_private.h.orig       2019-10-02 09:15:03.000000000 +0200
++++ multipath-tools-0.8.3-6c3bd36/libdmmp/libdmmp_private.h    2020-05-01 21:47:31.600996702 +0200
+@@ -82,7 +82,7 @@
+ 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; \
+@@ -90,7 +90,7 @@
+       } \
+       if (j_obj_tmp == NULL) { \
+               _error(ctx, "BUG: Got NULL j_obj_tmp from " \
+-                     "json_object_object_get_ex() while it return TRUE"); \
++                     "json_object_object_get_ex() while it return 1"); \
+               rc = DMMP_ERR_BUG; \
+               goto out; \
+       } \

diff --git a/multipath-tools.spec b/multipath-tools.spec
index c39e38eb74719d5af333e156070de568ebba85e6..f47daae43419562d5df320dd86d611b7a20649a5 100644 (file)
--- a/multipath-tools.spec
+++ b/multipath-tools.spec
@@ -7,7 +7,7 @@ Summary(pl.UTF-8):      Implementacja wielotrasowego dostępu do zasobów przy użyci
 Name:          multipath-tools
 Version:       0.8.3
 %define        gitref  6c3bd36
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Base
 # http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=%{gitref};sf=tgz
@@ -22,15 +22,19 @@ Source4:    multipath.conf.defaults
 Patch0:                %{name}-paths.patch
 Patch1:                %{name}-kpartx-udev.patch
 Patch2:                config.patch
+Patch3:                %{name}-json-c.patch
 URL:           http://christophe.varoqui.free.fr/
 BuildRequires: device-mapper-devel >= 1.02.08
+BuildRequires: json-c-devel
 BuildRequires: libaio-devel
 BuildRequires: linux-libc-headers >= 2.6.12.0-5
+BuildRequires: pkgconfig
 BuildRequires: readline-devel
 BuildRequires: rpmbuild(macros) >= 1.647
 BuildRequires: sed >= 4.0
 BuildRequires: systemd-devel >= 1:209
 BuildRequires: udev-devel
+BuildRequires: userspace-rcu-devel
 %if %{with initrd}
 BuildRequires: device-mapper-initrd-devel
 BuildRequires: klibc-static
@@ -124,6 +128,7 @@ umożliwia tworzenie partycji na odwzorowaniach wielotrasowych.
 %patch1 -p1
 cp -p %{SOURCE4} .
 %patch2 -p1
+%patch3 -p1
 
 %build
 %if %{with initrd}