aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-04-15 07:04:38 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2016-04-15 09:08:51 +0200
commit74309b79dfb8a5d29d18acc27b71aaba24da8a04 (patch)
tree5a5e3179917a5a2e579d18097c5808792195e68c
parentb0f10b0622fc0c598162982373d9e50073c8fee0 (diff)
downloadaports-74309b79dfb8a5d29d18acc27b71aaba24da8a04.tar.gz
aports-74309b79dfb8a5d29d18acc27b71aaba24da8a04.tar.bz2
aports-74309b79dfb8a5d29d18acc27b71aaba24da8a04.tar.xz
main/multipath-tools: fix blacklisting of scsi devices
bug report: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=782488 fix from upstream: http://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=commitdiff;h=d041591e42b69e2ff99d9cc5c1111c83ccde3207 fixes #5396 (cherry picked from commit 8c958d609fb86f7c0450dbcbc06aefe7b5c373f1)
-rw-r--r--main/multipath-tools/APKBUILD12
-rw-r--r--main/multipath-tools/scsi_ident.patch28
2 files changed, 36 insertions, 4 deletions
diff --git a/main/multipath-tools/APKBUILD b/main/multipath-tools/APKBUILD
index 368aa1708c..a180713078 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.5.0
-pkgrel=3
+pkgrel=4
pkgdesc="Device Mapper Multipathing Driver"
url="http://christophe.varoqui.free.fr/"
arch="all"
@@ -17,6 +17,7 @@ source="http://christophe.varoqui.free.fr/multipath-tools/multipath-tools-$pkgve
sys-types.patch
daddr_t.patch
+ scsi_ident.patch
"
_builddir="$srcdir"/multipath-tools-$pkgver
@@ -51,16 +52,19 @@ d364a5ef62c23da92d81baf90e7b6192 multipath-tools.conf
52dcde0446669e9d19813b28f3dd622b multipath-tools.confd
e2032d8042fcc4b015b1dc1cc66cabe5 multipath-tools.initd
12f2c6235caa2cc0cbe97606ae379fff sys-types.patch
-9e7673f58a2b43798877396c4d9004fc daddr_t.patch"
+9e7673f58a2b43798877396c4d9004fc daddr_t.patch
+260d356837b3e082f5bf53f5e815ad1f scsi_ident.patch"
sha256sums="f13cf1eb84e94e83b2019e68f7965526903c13e94246db43965d181668a0a6f9 multipath-tools-0.5.0.tar.bz2
e5df29fc6cf01789db179e20aaac2705878975eb826157bd9f824a3f86a8dcd5 multipath-tools.conf
b13587b0865ea8c39f51e2177e4fbc0ada237408a5807fab836ff4b5ebcb3e37 multipath-tools.confd
bb7846f6c2bfdfb4ee50fe1965271909a9864b2b913d4892bb406d66f794ce9a multipath-tools.initd
d7bd2b5e3de194a151aaf15de4a3b136a218d064b78539027e7f2fa4613072fb sys-types.patch
-cb6877ba73f7e8ed6efded8af902ecb16ee5be901149b3f771b5c6ccdb3fe452 daddr_t.patch"
+cb6877ba73f7e8ed6efded8af902ecb16ee5be901149b3f771b5c6ccdb3fe452 daddr_t.patch
+a14de8791b7b6e7f64e0a07786a88bfd1c26820e18a2f1f3f66abc341a04332c scsi_ident.patch"
sha512sums="dfad21c45d0f69e39041d30d203a582c8ee8329bf390c51cde10155b3de379e7ad8fead2ac4beb268a924fd7e7dc8e1cf538ea3c70d41479fd8786fa30ba22a9 multipath-tools-0.5.0.tar.bz2
e81462b22c0cbc92ea935d7544b9f9a0c4ccbcf13f3bc03dadf6de96407c9cf49964c9bbf02f12a134e1255c66421c6fde39d54b15eef975e8df81bdc88b2213 multipath-tools.conf
303c62b7506b207ba2266310e7a701d76151e6f1544b44faf666dfabdc59c5aeb98544d380988e18b4a7b8235e4000380f025c4dd6c95d45a7b8b51bbf39dce5 multipath-tools.confd
1ca0a8be7ddd0d57b810ab4905bc35d6b89b924ef528a7ee77dad162b86b990e0b86ef714f63857def4a61e30bfabe7a3980f624d63b80108408dd876a7c468c multipath-tools.initd
bee0b1d18c0359a2c43719bd2cf7bc80ce073aa27e1315c9a9b9efa805474359df1b796dc832b0162a686b11b0d1aeb2c85b5bb2b36892dd472b53694c939cd4 sys-types.patch
-526707621ca2747b07192824e1269a17c81ffb7c19606d45388bb80ae7da027f68c25edd53a690d1485d00fc4ce6dab646e097d53a33394860f6c9d5b072e463 daddr_t.patch"
+526707621ca2747b07192824e1269a17c81ffb7c19606d45388bb80ae7da027f68c25edd53a690d1485d00fc4ce6dab646e097d53a33394860f6c9d5b072e463 daddr_t.patch
+12d126c5e61b6834d9d38e9ca6ea693b00bf08fa90a94b583c5ae846b3599b3c757fe37db73043e459ba60140a919583cf34107f9a87edab5457eb14f18af84f scsi_ident.patch"
diff --git a/main/multipath-tools/scsi_ident.patch b/main/multipath-tools/scsi_ident.patch
new file mode 100644
index 0000000000..c626c0e507
--- /dev/null
+++ b/main/multipath-tools/scsi_ident.patch
@@ -0,0 +1,28 @@
+From: Hannes Reinecke <hare@suse.de>
+Date: Thu, 10 Apr 2014 10:21:52 +0000 (+0200)
+Subject: Use 'SCSI_IDENT_.*' as the default property whitelist
+X-Git-Url: http://git.opensvc.com/gitweb.cgi?p=multipath-tools%2F.git;a=commitdiff_plain;h=d041591e42b69e2ff99d9cc5c1111c83ccde3207
+
+Use 'SCSI_IDENT_.*' as the default property whitelist
+
+59-scsi-sg_utils.rules export the VPD pages as
+SCSI_IDENT_<association>_<type>.
+So whenever we have a SCSI_IDENT_* property we know it
+has come from VPD pages and we have a legit device.
+
+Signed-off-by: Hannes Reinecke <hare@suse.de>
+---
+
+diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c
+index cea128c..30c5031 100644
+--- a/libmultipath/blacklist.c
++++ b/libmultipath/blacklist.c
+@@ -196,7 +196,7 @@ setup_default_blist (struct config * conf)
+ if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT))
+ return 1;
+
+- str = STRDUP("(ID_SCSI_VPD|ID_WWN)");
++ str = STRDUP("(SCSI_IDENT_.*|ID_WWN)");
+ if (!str)
+ return 1;
+ if (store_ble(conf->elist_property, str, ORIGIN_DEFAULT))