Date: Wednesday, May 6, 2020 @ 07:46:20
Author: eworm
Revision: 625023
archrelease: copy trunk to community-x86_64
Added:
multipath-tools/repos/community-x86_64/0001-fix-boolean-value-with-json-c-0.14.patch
(from rev 625022,
multipath-tools/trunk/0001-fix-boolean-value-with-json-c-0.14.patch)
multipath-tools/repos/community-x86_64/0002-make.patch
(from rev 625022, multipath-tools/trunk/0002-make.patch)
multipath-tools/repos/community-x86_64/PKGBUILD
(from rev 625022, multipath-tools/trunk/PKGBUILD)
Deleted:
multipath-tools/repos/community-x86_64/0001-fix-boolean-value-with-json-c-0.14.patch
multipath-tools/repos/community-x86_64/PKGBUILD
-----------------------------------------------+
0001-fix-boolean-value-with-json-c-0.14.patch | 66 +++++++--------
0002-make.patch | 28 ++++++
PKGBUILD | 102 ++++++++++++------------
3 files changed, 114 insertions(+), 82 deletions(-)
Deleted: 0001-fix-boolean-value-with-json-c-0.14.patch
===================================================================
--- 0001-fix-boolean-value-with-json-c-0.14.patch 2020-05-06 07:46:11 UTC
(rev 625022)
+++ 0001-fix-boolean-value-with-json-c-0.14.patch 2020-05-06 07:46:20 UTC
(rev 625023)
@@ -1,33 +0,0 @@
-From 51430bc54d4d36aa4f722801d7dd06c663eda661 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <m...@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; \
- } \
Copied:
multipath-tools/repos/community-x86_64/0001-fix-boolean-value-with-json-c-0.14.patch
(from rev 625022,
multipath-tools/trunk/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-05-06 07:46:20 UTC
(rev 625023)
@@ -0,0 +1,33 @@
+From 51430bc54d4d36aa4f722801d7dd06c663eda661 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <m...@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; \
+ } \
Copied: multipath-tools/repos/community-x86_64/0002-make.patch (from rev
625022, multipath-tools/trunk/0002-make.patch)
===================================================================
--- 0002-make.patch (rev 0)
+++ 0002-make.patch 2020-05-06 07:46:20 UTC (rev 625023)
@@ -0,0 +1,28 @@
+From 78b28aac918ebe8f4008ff05424182e06d7082f7 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <m...@eworm.de>
+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 <m...@eworm.de>
+---
+ 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):
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-05-06 07:46:11 UTC (rev 625022)
+++ PKGBUILD 2020-05-06 07:46:20 UTC (rev 625023)
@@ -1,49 +0,0 @@
-# Maintainer: Robin Broda <ro...@broda.me>
-# Contributor: Michael Lass <be...@bi-co.net>
-# Contributor: Justin Dray <jus...@dray.be>
-# Contributor: Patrick McCarty <pnorcks at gmail dot com>
-# Contributor: Bartłomiej Piotrowski <nos...@bpiotrowski.pl>
-# Contributor: Thomas S Hatch <thatch45 ar gmail dot com>
-# Contributor: Michael P <ptchins...@archlinux.us>
-# Contributor: Matt Heagney <m...@heagney.com>
-
-pkgname=multipath-tools
-pkgver=0.8.3
-pkgrel=3
-pkgdesc='Multipath tools for Linux (including kpartx)'
-arch=('x86_64')
-url='http://christophe.varoqui.free.fr/'
-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}";
- '0001-fix-boolean-value-with-json-c-0.14.patch')
-sha256sums=('SKIP'
- '9aa4970790616637e0cc1b2ae609ca6bffb57effda0e8263fa73cbefc7f16a11')
-
-prepare() {
- cd "${pkgname}"
-
- # Fix systemd version detection in Makefile
- sed -i 's/sed -n .*$/head -n1 | cut -d" " -f2\)/g' Makefile.inc
-
- # 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() {
- cd "${pkgname}"
-
- make
-}
-
-package() {
- cd "${pkgname}"
-
- make DESTDIR="${pkgdir}" \
- exec_prefix="/usr" \
- LIB="/usr/lib" \
- install
-}
Copied: multipath-tools/repos/community-x86_64/PKGBUILD (from rev 625022,
multipath-tools/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-05-06 07:46:20 UTC (rev 625023)
@@ -0,0 +1,53 @@
+# Maintainer: Robin Broda <ro...@broda.me>
+# Contributor: Michael Lass <be...@bi-co.net>
+# Contributor: Justin Dray <jus...@dray.be>
+# Contributor: Patrick McCarty <pnorcks at gmail dot com>
+# Contributor: Bartłomiej Piotrowski <nos...@bpiotrowski.pl>
+# Contributor: Thomas S Hatch <thatch45 ar gmail dot com>
+# Contributor: Michael P <ptchins...@archlinux.us>
+# Contributor: Matt Heagney <m...@heagney.com>
+
+pkgname=multipath-tools
+pkgver=0.8.4
+pkgrel=1
+pkgdesc='Multipath tools for Linux (including kpartx)'
+arch=('x86_64')
+url='http://christophe.varoqui.free.fr/'
+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}";
+ '0001-fix-boolean-value-with-json-c-0.14.patch'
+ '0002-make.patch')
+sha256sums=('SKIP'
+ '9aa4970790616637e0cc1b2ae609ca6bffb57effda0e8263fa73cbefc7f16a11'
+ '95de3c6f42c8c80ee3ced00cefad7f003abdbf9358fcf72042d17819e871048a')
+
+prepare() {
+ cd "${pkgname}"
+
+ # Fix systemd version detection in Makefile
+ sed -i 's/sed -n .*$/head -n1 | cut -d" " -f2\)/g' Makefile.inc
+
+ # 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() {
+ cd "${pkgname}"
+
+ make
+}
+
+package() {
+ cd "${pkgname}"
+
+ make -j1 \
+ DESTDIR="${pkgdir}" \
+ exec_prefix="/usr" \
+ LIB="/usr/lib" \
+ install
+}
