[arch-commits] Commit in multipath-tools/trunk (2 files)

[Christian Hesse]

    Date: Saturday, April 25, 2020 @ 19:07:25
  Author: eworm
Revision: 621045

upgpkg: multipath-tools 0.8.3-2

json-c 0.14 rebuild

Added:
  multipath-tools/trunk/0001-fix-boolean-value-with-json-c-0.14.patch
Modified:
  multipath-tools/trunk/PKGBUILD

-----------------------------------------------+
 0001-fix-boolean-value-with-json-c-0.14.patch |   33 ++++++++++++++++++++++++
 PKGBUILD                                      |   10 +++++--
 2 files changed, 40 insertions(+), 3 deletions(-)

Added: 0001-fix-boolean-value-with-json-c-0.14.patch
===================================================================
--- 0001-fix-boolean-value-with-json-c-0.14.patch	                        (rev 0)
+++ 0001-fix-boolean-value-with-json-c-0.14.patch	2020-04-25 19:07:25 UTC (rev 621045)
@@ -0,0 +1,33 @@
+From 51430bc54d4d36aa4f722801d7dd06c663eda661 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at eworm.de>
+Date: Sat, 25 Apr 2020 21:04:51 +0200
+Subject: [PATCH 1/1] fix boolean value with json-c 0.14
+
+Upstream removed the TRUE and FALSE defines in commit
+0992aac61f8b087efd7094e9ac2b84fa9c040fcd.
+---
+ libdmmp/libdmmp_private.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libdmmp/libdmmp_private.h b/libdmmp/libdmmp_private.h
+index ac85b63f..29400826 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; \
+@@ -90,7 +90,7 @@ do { \
+ 	} \
+ 	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; \
+ 	} \

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-25 19:06:57 UTC (rev 621044)
+++ PKGBUILD	2020-04-25 19:07:25 UTC (rev 621045)
@@ -9,7 +9,7 @@
 
 pkgname=multipath-tools
 pkgver=0.8.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Multipath tools for Linux (including kpartx)'
 arch=('x86_64')
 url='http://christophe.varoqui.free.fr/'
@@ -16,8 +16,10 @@
 license=('GPL2')
 depends=('libaio' 'device-mapper' 'json-c' 'liburcu' 'systemd-libs')
 makedepends=('git')
-source=("multipath-tools::git+https://git.opensvc.com/multipath-tools/.git#tag=${pkgver}")
-sha256sums=('SKIP')
+source=("multipath-tools::git+https://git.opensvc.com/multipath-tools/.git#tag=${pkgver}"
+        '0001-fix-boolean-value-with-json-c-0.14.patch')
+sha256sums=('SKIP'
+            '9aa4970790616637e0cc1b2ae609ca6bffb57effda0e8263fa73cbefc7f16a11')
 
 prepare() {
   cd "${pkgname}"
@@ -27,6 +29,8 @@
 
   # Fix bindir in Makefile
   sed -i 's|$(exec_prefix)/sbin|$(exec_prefix)/bin|g' Makefile.inc
+
+  patch -Np1 < ../0001-fix-boolean-value-with-json-c-0.14.patch
 }
 
 build() {