From 94eff79105fbd6d105288e5a761eaf5f9216f4aea1e6f83015b96a108c7e500e Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Tue, 5 Mar 2019 14:53:39 +0000 Subject: [PATCH 1/6] Accepting request 681784 from home:mwilck:branches:Base:System - Add kmod(xyz) style dependencies for SLE15-SP1 (jsc#SLE-3853, fate#326579) - Update to version 0.7.9+138+suse.0edd0a2: - Include reviewed fixes from upstream * libmutipath: continue to use old state on PATH_PENDING * libmultipath: disable user_friendly_names for NetApp * multipath: blacklist zram devices * various fixes for martinal path code * minor fixes suggested by coverity - Bug fixes: * multipathd: Fix miscounting active paths (bsc#1125043) * multipathd: avoid null pointer dereference in LOG_MSG (bsc#1127873) OBS-URL: https://build.opensuse.org/request/show/681784 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=182 --- _servicedata | 2 +- multipath-tools-0.7.9+111+suse.b4232b7.tar.xz | 3 --- multipath-tools-0.7.9+138+suse.0edd0a2.tar.xz | 3 +++ multipath-tools.changes | 21 +++++++++++++++++++ multipath-tools.spec | 10 ++++++++- multipath.conf | 4 ++-- 6 files changed, 36 insertions(+), 7 deletions(-) delete mode 100644 multipath-tools-0.7.9+111+suse.b4232b7.tar.xz create mode 100644 multipath-tools-0.7.9+138+suse.0edd0a2.tar.xz diff --git a/_servicedata b/_servicedata index ebf8360..c2283cc 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ https://github.com/openSUSE/multipath-tools.git - b4232b74b6fcc722cdc16286fabe8b7e339be05f + 0edd0a2c251a98d1f3c7b1e0e53038e4984be00d https://github.com/mwilck/multipath-tools.git 08a969b7fce0db769b63bdbfead2a452dc417d58 \ No newline at end of file diff --git a/multipath-tools-0.7.9+111+suse.b4232b7.tar.xz b/multipath-tools-0.7.9+111+suse.b4232b7.tar.xz deleted file mode 100644 index 45ec9c4..0000000 --- a/multipath-tools-0.7.9+111+suse.b4232b7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1cad80d5790731ee6d5426924c11671692c149c6d867df4100972c3128611bba -size 353340 diff --git a/multipath-tools-0.7.9+138+suse.0edd0a2.tar.xz b/multipath-tools-0.7.9+138+suse.0edd0a2.tar.xz new file mode 100644 index 0000000..94cb2d8 --- /dev/null +++ b/multipath-tools-0.7.9+138+suse.0edd0a2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2aff72041072e6dd327c68a9810783cfdbdad16edcc58772f553100fca5cc8eb +size 353584 diff --git a/multipath-tools.changes b/multipath-tools.changes index 192ac77..895a453 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Tue Mar 5 14:12:54 UTC 2019 - Martin Wilck + +- Add kmod(xyz) style dependencies for SLE15-SP1 + (jsc#SLE-3853, fate#326579) + +------------------------------------------------------------------- +Tue Mar 05 09:29:04 UTC 2019 - mwilck@suse.com + +- Update to version 0.7.9+138+suse.0edd0a2: +- Include reviewed fixes from upstream + * libmutipath: continue to use old state on PATH_PENDING + * libmultipath: disable user_friendly_names for NetApp + * multipath: blacklist zram devices + * various fixes for martinal path code + * minor fixes suggested by coverity +- Bug fixes: + * multipathd: Fix miscounting active paths (bsc#1125043) + * multipathd: avoid null pointer dereference in LOG_MSG + (bsc#1127873) + ------------------------------------------------------------------- Fri Jan 11 20:39:36 UTC 2019 - Martin Wilck diff --git a/multipath-tools.spec b/multipath-tools.spec index 83dd9f9..d957a1b 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -50,7 +50,7 @@ Name: multipath-tools Url: http://christophe.varoqui.free.fr/ -Version: 0.7.9+111+suse.b4232b7 +Version: 0.7.9+138+suse.0edd0a2 Release: 0 Summary: Tools to Manage Multipathed Devices with the device-mapper License: GPL-2.0-only AND LGPL-2.0-or-later @@ -82,6 +82,14 @@ Requires(post): suse-module-tools Requires: device-mapper >= 1.2.78 Requires: kpartx Requires: sg3_utils +# Generate kmod(xyz)-style dependencies for modules that we put +# in modules-load.d. Use the modules.d file (Source1) as input to avoid +# maintaining these dependencies in several places. +# This feature is to be enabled for SLE15-SP1, and some time in the +# near future, for Factory. +%if 0%{?sle_version} >= 150100 +%(sed 's/^\s*//;s/\s*$//;/^#/d;/^$/d;s/^/Requires: kmod(/;s/$/)/;' %{S:1}) +%endif Obsoletes: multipath-tools-rbd <= %{version} PreReq: coreutils grep diff --git a/multipath.conf b/multipath.conf index 3b51c33..d42da41 100644 --- a/multipath.conf +++ b/multipath.conf @@ -1,5 +1,5 @@ # Load device-handler and multipath module at boot -scsi_dh_alua + scsi_dh_alua scsi_dh_emc -scsi_dh_rdac + scsi_dh_rdac dm_multipath From fea6fc42458aa115bff321cfd4abb5b7e7e998e6598b4b9cefe073a3b2fe93fa Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Tue, 5 Mar 2019 15:03:01 +0000 Subject: [PATCH 2/6] Accepting request 681801 from home:mwilck:branches:Base:System Add bug reference for coverity: * minor fixes suggested by coverity (bsc#1127879) OBS-URL: https://build.opensuse.org/request/show/681801 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=183 --- multipath-tools.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multipath-tools.changes b/multipath-tools.changes index 895a453..2822f9a 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -13,11 +13,11 @@ Tue Mar 05 09:29:04 UTC 2019 - mwilck@suse.com * libmultipath: disable user_friendly_names for NetApp * multipath: blacklist zram devices * various fixes for martinal path code - * minor fixes suggested by coverity - Bug fixes: * multipathd: Fix miscounting active paths (bsc#1125043) * multipathd: avoid null pointer dereference in LOG_MSG (bsc#1127873) + * minor fixes suggested by coverity (bsc#1127879) ------------------------------------------------------------------- Fri Jan 11 20:39:36 UTC 2019 - Martin Wilck From d438c8b17df7ed56fa9e47a2356b1e2362eae15b950167c73c3a189063b19d8e Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Tue, 5 Mar 2019 15:13:45 +0000 Subject: [PATCH 3/6] Accepting request 681806 from home:mwilck:branches:Base:System Remove whitespace used for testing OBS-URL: https://build.opensuse.org/request/show/681806 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=184 --- multipath.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/multipath.conf b/multipath.conf index d42da41..9ce5ad1 100644 --- a/multipath.conf +++ b/multipath.conf @@ -1,5 +1,5 @@ # Load device-handler and multipath module at boot - scsi_dh_alua +scsi_dh_alua scsi_dh_emc - scsi_dh_rdac +scsi_dh_rdac dm_multipath From c19476b1fc42fa2bb0ffcaf7ca0c71d5ac1dcf75e07c41e598af5cb85f8695d5 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Tue, 5 Mar 2019 15:21:03 +0000 Subject: [PATCH 4/6] Accepting request 681812 from home:mwilck:branches:Base:System more whitespace fixes, sorry OBS-URL: https://build.opensuse.org/request/show/681812 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=185 --- multipath.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multipath.conf b/multipath.conf index 9ce5ad1..3b51c33 100644 --- a/multipath.conf +++ b/multipath.conf @@ -1,5 +1,5 @@ # Load device-handler and multipath module at boot scsi_dh_alua scsi_dh_emc -scsi_dh_rdac +scsi_dh_rdac dm_multipath From b006a0b899df6160bf66a133c8ef0a1200295f8d867a22dd6bdbe4757b626424 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Tue, 5 Mar 2019 15:29:27 +0000 Subject: [PATCH 5/6] Accepting request 681815 from home:mwilck:branches:Base:System Added bug reference (jsc#SLE-3853, fate#326579, bsc#1119414) OBS-URL: https://build.opensuse.org/request/show/681815 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=186 --- multipath-tools.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multipath-tools.changes b/multipath-tools.changes index 2822f9a..f25ee1b 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -2,7 +2,7 @@ Tue Mar 5 14:12:54 UTC 2019 - Martin Wilck - Add kmod(xyz) style dependencies for SLE15-SP1 - (jsc#SLE-3853, fate#326579) + (jsc#SLE-3853, fate#326579, bsc#1119414) ------------------------------------------------------------------- Tue Mar 05 09:29:04 UTC 2019 - mwilck@suse.com From 58fdadf9d36df01cbf9c76196f9fb0aea55672793fbbb78c086c22c754818626 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Thu, 7 Mar 2019 15:20:02 +0000 Subject: [PATCH 6/6] Accepting request 682516 from home:mwilck:branches:Base:System - Update to version 0.7.9+139+suse.ed9d450: * multipath-tools: Build: properly parse systemd's version OBS-URL: https://build.opensuse.org/request/show/682516 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=187 --- _servicedata | 2 +- multipath-tools-0.7.9+138+suse.0edd0a2.tar.xz | 3 --- multipath-tools-0.7.9+139+suse.ed9d450.tar.xz | 3 +++ multipath-tools.changes | 6 ++++++ multipath-tools.spec | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 multipath-tools-0.7.9+138+suse.0edd0a2.tar.xz create mode 100644 multipath-tools-0.7.9+139+suse.ed9d450.tar.xz diff --git a/_servicedata b/_servicedata index c2283cc..07b179c 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ https://github.com/openSUSE/multipath-tools.git - 0edd0a2c251a98d1f3c7b1e0e53038e4984be00d + ed9d45084265bdd23b816fcb69dc52c1b321fef5 https://github.com/mwilck/multipath-tools.git 08a969b7fce0db769b63bdbfead2a452dc417d58 \ No newline at end of file diff --git a/multipath-tools-0.7.9+138+suse.0edd0a2.tar.xz b/multipath-tools-0.7.9+138+suse.0edd0a2.tar.xz deleted file mode 100644 index 94cb2d8..0000000 --- a/multipath-tools-0.7.9+138+suse.0edd0a2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2aff72041072e6dd327c68a9810783cfdbdad16edcc58772f553100fca5cc8eb -size 353584 diff --git a/multipath-tools-0.7.9+139+suse.ed9d450.tar.xz b/multipath-tools-0.7.9+139+suse.ed9d450.tar.xz new file mode 100644 index 0000000..6d55eae --- /dev/null +++ b/multipath-tools-0.7.9+139+suse.ed9d450.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1208666943b8159bddf82d21974dd1e487f2de84451b041185b79ddd55fa19e6 +size 353576 diff --git a/multipath-tools.changes b/multipath-tools.changes index f25ee1b..5a8a8f7 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 07 15:09:30 UTC 2019 - mwilck@suse.com + +- Update to version 0.7.9+139+suse.ed9d450: + * multipath-tools: Build: properly parse systemd's version + ------------------------------------------------------------------- Tue Mar 5 14:12:54 UTC 2019 - Martin Wilck diff --git a/multipath-tools.spec b/multipath-tools.spec index d957a1b..45c661e 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -50,7 +50,7 @@ Name: multipath-tools Url: http://christophe.varoqui.free.fr/ -Version: 0.7.9+138+suse.0edd0a2 +Version: 0.7.9+139+suse.ed9d450 Release: 0 Summary: Tools to Manage Multipathed Devices with the device-mapper License: GPL-2.0-only AND LGPL-2.0-or-later