diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2020-04-22 22:44:09 -0300 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-04-23 11:11:07 -0300 |
| commit | 9631fe68a3dbbec57ebb584856597a4fdf06bf2f (patch) | |
| tree | d1614c951e984ac3b5de4e6290d167fa45848816 /main/multipath-tools | |
| parent | cd20e783cb3913e1fc26a044636a094096c704a2 (diff) | |
main/multipath-tools: rebuild for json-c-0.14
Diffstat (limited to 'main/multipath-tools')
| -rw-r--r-- | main/multipath-tools/APKBUILD | 10 | ||||
| -rw-r--r-- | main/multipath-tools/json-c-0.14.patch | 23 |
2 files changed, 27 insertions, 6 deletions
diff --git a/main/multipath-tools/APKBUILD b/main/multipath-tools/APKBUILD index 21020923ef6..38c7c7cf626 100644 --- a/main/multipath-tools/APKBUILD +++ b/main/multipath-tools/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=multipath-tools pkgver=0.8.3 -pkgrel=4 +pkgrel=5 pkgdesc="Device Mapper Multipathing Driver" url="http://christophe.varoqui.free.fr" arch="all" @@ -10,7 +10,8 @@ depends="eudev device-mapper" makedepends="lvm2-dev libaio-dev readline-dev ncurses-dev eudev-dev userspace-rcu-dev json-c-dev perl" subpackages="$pkgname-doc $pkgname-openrc" -source="$pkgname-$pkgver.tar.gz::https://git.opensvc.com/gitweb.cgi?p=$pkgname/.git;a=snapshot;h=$pkgver;sf=tgz +source="$pkgname-$pkgver.tar.gz::https://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=snapshot;h=$pkgver;sf=tgz + json-c-0.14.patch multipath-tools.conf multipath.initd multipathd.initd @@ -26,8 +27,6 @@ prepare() { } build() { - cd $builddir - make prefix="/usr" \ sysconfdir="/etc" \ mandir="/usr/share/man" \ @@ -35,8 +34,6 @@ build() { } package() { - cd $builddir - make DESTDIR="$pkgdir" install install -D -m644 "$srcdir"/$pkgname.conf \ @@ -48,6 +45,7 @@ package() { } sha512sums="d9fdc2763f5a1efa15ee07c5d863008c9694623935f62a0e0b56f941df4e0d0ca3f86056fefc9b5ca828b47782127e3d55f2f925b1ed957e02b675bef36f4cae multipath-tools-0.8.3.tar.gz +fae0e1fbc7dfe6d932a5b19e9a80efdc30a2bad3ac4e24ff2f8ec9b156107378b5f15d4bec8c32dbfd87286cd7e30b4acebfadda416365f108dafeea0321318a json-c-0.14.patch e81462b22c0cbc92ea935d7544b9f9a0c4ccbcf13f3bc03dadf6de96407c9cf49964c9bbf02f12a134e1255c66421c6fde39d54b15eef975e8df81bdc88b2213 multipath-tools.conf 97deeee57daee787d807da0a4dbf50baae047ddcda30925f7000ec822b5a17a3dc55196c3e032c8ffbc2caeac690ce5ca485b0a7c99f15e66bddaa000439112a multipath.initd 2f913fed199f12f048eb042b5bb1a326f6f09cfe63d572ac269461d96ebf25b251576de22be7ba9ab631ded7af6fd47dac38fda3b29d00640c806181eb37447c multipathd.initd" diff --git a/main/multipath-tools/json-c-0.14.patch b/main/multipath-tools/json-c-0.14.patch new file mode 100644 index 00000000000..f827fdf1549 --- /dev/null +++ b/main/multipath-tools/json-c-0.14.patch @@ -0,0 +1,23 @@ +diff --git a/libdmmp/libdmmp_private.h b/libdmmp/libdmmp_private.h +index 3e813cb..9c89acb 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; \ + } \ |