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

@@ -1,6 +1,6 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/openSUSE/multipath-tools.git</param>
-              <param name="changesrevision">b4232b74b6fcc722cdc16286fabe8b7e339be05f</param></service><service name="tar_scm">
+              <param name="changesrevision">0edd0a2c251a98d1f3c7b1e0e53038e4984be00d</param></service><service name="tar_scm">
                 <param name="url">https://github.com/mwilck/multipath-tools.git</param>
               <param name="changesrevision">08a969b7fce0db769b63bdbfead2a452dc417d58</param></service></servicedata>

multipath-tools-0.7.9+111+suse.b4232b7.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1cad80d5790731ee6d5426924c11671692c149c6d867df4100972c3128611bba
-size 353340

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

multipath-tools.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Tue Mar  5 14:12:54 UTC 2019 - Martin Wilck <mwilck@suse.com>
+
+- 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 <mwilck@suse.com>
 

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
 

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