aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2018-05-21 00:48:14 +0200
committerJakub Jirutka <jakub@jirutka.cz>2018-05-21 01:03:02 +0200
commit2ac3a77dace7027c3f6a3e7bc4a9070106bcfeac (patch)
treea5ea8f9bfe5a55bc74b264ee52f0986f6149564d
parent879f66b4d8ac3ce3d818e10938fe1290d8dec8db (diff)
downloadaports-2ac3a77dace7027c3f6a3e7bc4a9070106bcfeac.tar.bz2
aports-2ac3a77dace7027c3f6a3e7bc4a9070106bcfeac.tar.xz
main/multipath-tools: upgrade to 0.7.7
-rw-r--r--main/multipath-tools/APKBUILD24
-rw-r--r--main/multipath-tools/fix-unknown-mode_t.patch18
2 files changed, 33 insertions, 9 deletions
diff --git a/main/multipath-tools/APKBUILD b/main/multipath-tools/APKBUILD
index 75a8d5c4ef..e38963de50 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.7.6
-pkgrel=2
+pkgver=0.7.7
+pkgrel=0
pkgdesc="Device Mapper Multipathing Driver"
url="http://christophe.varoqui.free.fr"
arch="all"
@@ -9,18 +9,23 @@ license="GPL"
depends="eudev"
makedepends="lvm2-dev libaio-dev readline-dev ncurses-dev eudev-dev
userspace-rcu-dev json-c-dev perl"
-_snapid="888735d20d6ae6f5b4363a2aa750d97174aac3ee"
subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=$_snapid;sf=tgz
+source="$pkgname-$pkgver.tar.gz::https://git.opensvc.com/gitweb.cgi?p=$pkgname/.git;a=snapshot;h=$pkgver;sf=tgz
multipath-tools.conf
multipath-tools.confd
multipath-tools.initd
-
0001-disable-rados.patch
+ fix-unknown-mode_t.patch
"
options="!check"
-_snapdirsuffix=$(echo $_snapid | cut -c1-7)
-builddir="$srcdir"/multipath-tools-$_snapdirsuffix
+builddir="$srcdir/multipath-tools"
+
+prepare() {
+ # Rename unpacked directory with hash in the name to something sane...
+ mv "$srcdir"/multipath-tools-$pkgver-* "$builddir"
+
+ default_prepare
+}
build() {
cd $builddir
@@ -41,8 +46,9 @@ package() {
install -D -m755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/multipathd
}
-sha512sums="dc0c0d4f6165c5e7c9fa4535af697a91beb7cef7cf664b15b768c76e43d63e22b21951a1909dfa59a3e34478f45bdb7b0fade940b9ccb49b0af66960293e5a98 multipath-tools-0.7.6.tar.gz
+sha512sums="87458f3eb0aaac09b22972c4ff26e332d64841a3d19fefce69cae662f1e2ce2df778e1795d5b4089b1110ec5081c6021aadbb902eeaeb764f989031cbe7da825 multipath-tools-0.7.7.tar.gz
e81462b22c0cbc92ea935d7544b9f9a0c4ccbcf13f3bc03dadf6de96407c9cf49964c9bbf02f12a134e1255c66421c6fde39d54b15eef975e8df81bdc88b2213 multipath-tools.conf
303c62b7506b207ba2266310e7a701d76151e6f1544b44faf666dfabdc59c5aeb98544d380988e18b4a7b8235e4000380f025c4dd6c95d45a7b8b51bbf39dce5 multipath-tools.confd
1ca0a8be7ddd0d57b810ab4905bc35d6b89b924ef528a7ee77dad162b86b990e0b86ef714f63857def4a61e30bfabe7a3980f624d63b80108408dd876a7c468c multipath-tools.initd
-2cdf669823d24fea230784fc911bf01942980ea04c611e973996ba6baa051c64ef5defc00161deccdf6ede45e3b38c526c6f6aaaf4ba9137c010ebbc1f97038f 0001-disable-rados.patch"
+2cdf669823d24fea230784fc911bf01942980ea04c611e973996ba6baa051c64ef5defc00161deccdf6ede45e3b38c526c6f6aaaf4ba9137c010ebbc1f97038f 0001-disable-rados.patch
+079943d788d4ecf250a201f38cca4661c29499dd1ba9b74b471c66fe59785215fd096425d51e74664e5e68a21378179b081bc8d9503c7ed99bc3d7f785ecf8cd fix-unknown-mode_t.patch"
diff --git a/main/multipath-tools/fix-unknown-mode_t.patch b/main/multipath-tools/fix-unknown-mode_t.patch
new file mode 100644
index 0000000000..e5f980e3f6
--- /dev/null
+++ b/main/multipath-tools/fix-unknown-mode_t.patch
@@ -0,0 +1,18 @@
+Fixes the following error:
+
+ In file included from alias.c:15:0:
+ file.h:9:47: error: unknown type name 'mode_t'
+ int ensure_directories_exist(const char *str, mode_t dir_mode);
+ ^~~~~~
+ make[1]: *** [../Makefile.inc:134: alias.o] Error 1
+
+--- a/libmultipath/alias.c
++++ b/libmultipath/alias.c
+@@ -8,6 +8,7 @@
+ #include <string.h>
+ #include <limits.h>
+ #include <stdio.h>
++#include <sys/stat.h>
+
+ #include "debug.h"
+ #include "uxsock.h"