Date: Thursday, November 12, 2020 @ 10:48:44 Author: eworm Revision: 751555
upgpkg: multipath-tools 0.8.5-1: new upstream release Modified: multipath-tools/trunk/PKGBUILD Deleted: multipath-tools/trunk/0001-fix-boolean-value-with-json-c-0.14.patch multipath-tools/trunk/0002-make.patch -----------------------------------------------+ 0001-fix-boolean-value-with-json-c-0.14.patch | 33 ------------------------ 0002-make.patch | 28 -------------------- PKGBUILD | 14 ++-------- 3 files changed, 4 insertions(+), 71 deletions(-) Deleted: 0001-fix-boolean-value-with-json-c-0.14.patch =================================================================== --- 0001-fix-boolean-value-with-json-c-0.14.patch 2020-11-12 10:44:35 UTC (rev 751554) +++ 0001-fix-boolean-value-with-json-c-0.14.patch 2020-11-12 10:48:44 UTC (rev 751555) @@ -1,33 +0,0 @@ -From 51430bc54d4d36aa4f722801d7dd06c663eda661 Mon Sep 17 00:00:00 2001 -From: Christian Hesse <[email protected]> -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; \ - } \ Deleted: 0002-make.patch =================================================================== --- 0002-make.patch 2020-11-12 10:44:35 UTC (rev 751554) +++ 0002-make.patch 2020-11-12 10:48:44 UTC (rev 751555) @@ -1,28 +0,0 @@ -From 78b28aac918ebe8f4008ff05424182e06d7082f7 Mon Sep 17 00:00:00 2001 -From: Christian Hesse <[email protected]> -Date: Wed, 6 May 2020 09:29:55 +0200 -Subject: libmpathpersist: depend on libmultipath - -Without this the build fails with: - -/usr/bin/ld: cannot find -lmultipath - -Signed-off-by: Christian Hesse <[email protected]> ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 1dee3680..ba1d73ba 100644 ---- a/Makefile -+++ b/Makefile -@@ -28,7 +28,7 @@ all: $(BUILDDIRS) - $(BUILDDIRS): - $(MAKE) -C $@ - --multipath multipathd mpathpersist: libmultipath -+libmpathpersist multipath multipathd mpathpersist: libmultipath - mpathpersist: libmpathpersist - - $(BUILDDIRS.clean): - Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-11-12 10:44:35 UTC (rev 751554) +++ PKGBUILD 2020-11-12 10:48:44 UTC (rev 751555) @@ -8,7 +8,8 @@ # Contributor: Matt Heagney <[email protected]> pkgname=multipath-tools -pkgver=0.8.4 +_tag='eecfcba56c95128c9241e8a2abaa6166847fba9d' # git rev-parse ${pkgver} +pkgver=0.8.5 pkgrel=1 pkgdesc='Multipath tools for Linux (including kpartx)' arch=('x86_64') @@ -16,12 +17,8 @@ license=('GPL2') depends=('libaio' 'device-mapper' 'json-c' 'liburcu' 'systemd-libs') makedepends=('git' 'systemd') -source=("multipath-tools::git+https://git.opensvc.com/multipath-tools/.git#tag=${pkgver}"; - '0001-fix-boolean-value-with-json-c-0.14.patch' - '0002-make.patch') -sha256sums=('SKIP' - '9aa4970790616637e0cc1b2ae609ca6bffb57effda0e8263fa73cbefc7f16a11' - '95de3c6f42c8c80ee3ced00cefad7f003abdbf9358fcf72042d17819e871048a') +source=("multipath-tools::git+https://git.opensvc.com/multipath-tools/.git#tag=${_tag}";) +sha256sums=('SKIP') prepare() { cd "${pkgname}" @@ -31,9 +28,6 @@ # 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 - patch -Np1 < ../0002-make.patch } build() {
