From a19fed88ca661dfadd1dc00e0db7c80eaa461f62 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Fri, 29 Jan 2021 10:13:41 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/sid.git#251a8448a48b32faa5fb7aae0783b7695a652800
---
 ..._mpath-sync-with-mpath_valid-changes.patch | 26 +++++++++++++++++++
 sid.spec                                      | 11 +++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 sid-0-0-5-modules-ucmd-dm_mpath-sync-with-mpath_valid-changes.patch

diff --git a/sid-0-0-5-modules-ucmd-dm_mpath-sync-with-mpath_valid-changes.patch b/sid-0-0-5-modules-ucmd-dm_mpath-sync-with-mpath_valid-changes.patch
new file mode 100644
index 0000000..813dbde
--- /dev/null
+++ b/sid-0-0-5-modules-ucmd-dm_mpath-sync-with-mpath_valid-changes.patch
@@ -0,0 +1,26 @@
+commit 8bb6f6fd35342ab070d1a8a8ac4f2dbd18b7c063
+Author: Peter Rajnoha <prajnoha@redhat.com>
+Date:   Mon Jan 25 10:42:45 2021 +0100
+
+    modules: ucmd: dm_mpath: sync with mpath_valid changes
+    
+    Use symbolic MPATH_LOG_PRIO_NOLOG (instead of '-1') and MPATH_LOG_STDERR
+    (instead of MPATH_LOG_STDOUT which was removed) for mpathvalid_init
+    call.
+---
+ src/modules/ucmd/block/dm_mpath/dm_mpath.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/modules/ucmd/block/dm_mpath/dm_mpath.c b/src/modules/ucmd/block/dm_mpath/dm_mpath.c
+index 2c474b6..a31fee0 100644
+--- a/src/modules/ucmd/block/dm_mpath/dm_mpath.c
++++ b/src/modules/ucmd/block/dm_mpath/dm_mpath.c
+@@ -39,7 +39,7 @@ static int _dm_mpath_init(struct module *module, struct sid_ucmd_mod_ctx *ucmd_m
+ {
+ 	log_debug(MID, "init");
+ 	/* TODO - set up dm/udev logging */
+-	if (mpathvalid_init(-1, MPATH_LOG_STDIO)) {
++	if (mpathvalid_init(MPATH_LOG_PRIO_NOLOG, MPATH_LOG_STDERR)) {
+ 		log_error(MID, "failed to initialize mpathvalid");
+ 		return -1;
+ 	}
diff --git a/sid.spec b/sid.spec
index b229b58..b85e8f9 100644
--- a/sid.spec
+++ b/sid.spec
@@ -11,7 +11,7 @@
 
 Name: sid
 Version: 0.0.4
-Release: 1%{?scmsnap:.%{scmsnap}}%{?dist}
+Release: 3%{?scmsnap:.%{scmsnap}}%{?dist}
 Summary: Storage Instantiation Daemon (SID)
 
 License: GPLv2+
@@ -22,6 +22,9 @@ Source0: https://github.com/sid-project/%{name}/archive/%{commit}/%{name}-%{shor
 Source0: https://github.com/sid-project/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
 %endif
 
+Patch0: sid-0-0-5-modules-ucmd-dm_mpath-sync-with-mpath_valid-changes.patch
+
+BuildRequires: make
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
@@ -360,5 +363,11 @@ Instantiation Daemon (SID).
 
 
 %changelog
+* Fri Jan 29 2021 Peter Rajnoha <prajnoha@redhat.com> - 0.0.4-3
+- Sync with mpath_valid changes.
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Tue Oct 06 2020 Peter Rajnoha <prajnoha@redhat.com> - 0.0.4-1
 - Initial release.