From b2d2f151d3cd3cc2f4d80e4c00df956a955d0d43d46d09510959acb9cfc64563 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Mon, 8 Jun 2020 19:51:40 +0000 Subject: [PATCH 1/2] Accepting request 812729 from home:mwilck:branches:Base:System - Update to version 0.8.4+40+suse.b06c2e5a: - Fix udev rule processing during coldplug (bsc#1172157) * 11-dm-mpath.rules: Fix udev rule processing during coldplug - Fix compilation with gcc-10 * fix boolean value with json-c 0.14 * libmultipath: fix condlog NULL argument in uevent_get_env_var - Reviewed upstream changes: * simplify failed_wwid code * centralize path validation code - Use pkgconfig for BuildRequires OBS-URL: https://build.opensuse.org/request/show/812729 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=214 --- _servicedata | 2 +- multipath-tools-0.8.4+40+suse.b06c2e5a.obscpio | 3 +++ multipath-tools.changes | 14 ++++++++++++++ multipath-tools.obsinfo | 6 +++--- multipath-tools.spec | 13 +++++++------ 5 files changed, 28 insertions(+), 10 deletions(-) create mode 100644 multipath-tools-0.8.4+40+suse.b06c2e5a.obscpio diff --git a/_servicedata b/_servicedata index 7ebead3..801fbb2 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/multipath-tools.git - 8f5376473185e79aa7b2a68746a4ec83d870d02f \ No newline at end of file + b06c2e5aac407db77fc5d01710c448ff0c119f85 \ No newline at end of file diff --git a/multipath-tools-0.8.4+40+suse.b06c2e5a.obscpio b/multipath-tools-0.8.4+40+suse.b06c2e5a.obscpio new file mode 100644 index 0000000..aa50058 --- /dev/null +++ b/multipath-tools-0.8.4+40+suse.b06c2e5a.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70e209402c066e06b0fc3ccb24633cd8be8ba17a5b0277ca9976300431eeef3e +size 2444300 diff --git a/multipath-tools.changes b/multipath-tools.changes index 10bd2a2..3411416 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Jun 08 16:13:31 UTC 2020 - mwilck@suse.com + +- Update to version 0.8.4+40+suse.b06c2e5a: +- Fix udev rule processing during coldplug (bsc#1172157) + * 11-dm-mpath.rules: Fix udev rule processing during coldplug +- Fix compilation with gcc-10 + * fix boolean value with json-c 0.14 + * libmultipath: fix condlog NULL argument in uevent_get_env_var +- Reviewed upstream changes: + * simplify failed_wwid code + * centralize path validation code +- Use pkgconfig for BuildRequires + ------------------------------------------------------------------- Tue May 12 20:17:49 UTC 2020 - mwilck@suse.com diff --git a/multipath-tools.obsinfo b/multipath-tools.obsinfo index 481dcd0..afd6cd3 100644 --- a/multipath-tools.obsinfo +++ b/multipath-tools.obsinfo @@ -1,5 +1,5 @@ name: multipath-tools -version: 0.8.4+31+suse.8f53764 -mtime: 1589314526 -commit: 8f5376473185e79aa7b2a68746a4ec83d870d02f +version: 0.8.4+40+suse.b06c2e5a +mtime: 1591630462 +commit: b06c2e5aac407db77fc5d01710c448ff0c119f85 diff --git a/multipath-tools.spec b/multipath-tools.spec index dd1472e..b9e02fa 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -38,7 +38,7 @@ %define _sysdir usr/lib Name: multipath-tools -Version: 0.8.4+31+suse.8f53764 +Version: 0.8.4+40+suse.b06c2e5a Release: 0 Summary: Tools to Manage Multipathed Devices with the device-mapper License: GPL-2.0-only @@ -53,12 +53,12 @@ Source3: dm-parts.conf Source4: libmpathpersist-example.c BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} -BuildRequires: device-mapper-devel +BuildRequires: pkgconfig(devmapper) BuildRequires: libaio-devel %if 0%{?with_libdmmp} == 1 -BuildRequires: libjson-c-devel +BuildRequires: pkgconfig(json-c) %endif -BuildRequires: liburcu-devel +BuildRequires: pkgconfig(liburcu) BuildRequires: readline-devel BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libudev) @@ -67,9 +67,10 @@ BuildRequires: pkgconfig(udev) %if 0%{?with_check} == 1 BuildRequires: pkgconfig(cmocka) %endif -# For regenerate_initrd_posttrans macro -BuildRequires: suse-module-tools # For regenerate-initrd-posttrans +# For now, we still need to require suse-module-tools +# See https://github.com/openSUSE/rpm-config-SUSE/pull/6 +BuildRequires: suse-module-tools Requires(post): suse-module-tools Requires: device-mapper >= 1.2.78 Requires: kpartx From 76092b1685856509068b2ce20e6a9ea232bb4f3a394a229d0a1477f28a82fb07 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Wed, 10 Jun 2020 12:54:24 +0000 Subject: [PATCH 2/2] Accepting request 813227 from home:mwilck:branches:Base:System - Update to version 0.8.4+43+suse.908383f: * enable negated regular expression syntax in conf file * change default devnode blacklist to '!^(sd[a-z]|dasd[a-z]|nvme[0-9])' OBS-URL: https://build.opensuse.org/request/show/813227 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=215 --- _servicedata | 2 +- multipath-tools-0.8.4+31+suse.8f53764.obscpio | 3 --- multipath-tools-0.8.4+40+suse.b06c2e5a.obscpio | 3 --- multipath-tools-0.8.4+43+suse.908383f.obscpio | 3 +++ multipath-tools.changes | 8 ++++++++ multipath-tools.obsinfo | 6 +++--- multipath-tools.spec | 2 +- 7 files changed, 16 insertions(+), 11 deletions(-) delete mode 100644 multipath-tools-0.8.4+31+suse.8f53764.obscpio delete mode 100644 multipath-tools-0.8.4+40+suse.b06c2e5a.obscpio create mode 100644 multipath-tools-0.8.4+43+suse.908383f.obscpio diff --git a/_servicedata b/_servicedata index 801fbb2..f11569c 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/multipath-tools.git - b06c2e5aac407db77fc5d01710c448ff0c119f85 \ No newline at end of file + 908383f93b525ce0a07beb974ee6f2bcf8f6ee4c \ No newline at end of file diff --git a/multipath-tools-0.8.4+31+suse.8f53764.obscpio b/multipath-tools-0.8.4+31+suse.8f53764.obscpio deleted file mode 100644 index a8cc2ef..0000000 --- a/multipath-tools-0.8.4+31+suse.8f53764.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:408d1eef227bfe5dbf14b66f515ca345e1cfe33962c2477e06ab62c1945335de -size 2424332 diff --git a/multipath-tools-0.8.4+40+suse.b06c2e5a.obscpio b/multipath-tools-0.8.4+40+suse.b06c2e5a.obscpio deleted file mode 100644 index aa50058..0000000 --- a/multipath-tools-0.8.4+40+suse.b06c2e5a.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:70e209402c066e06b0fc3ccb24633cd8be8ba17a5b0277ca9976300431eeef3e -size 2444300 diff --git a/multipath-tools-0.8.4+43+suse.908383f.obscpio b/multipath-tools-0.8.4+43+suse.908383f.obscpio new file mode 100644 index 0000000..975ee68 --- /dev/null +++ b/multipath-tools-0.8.4+43+suse.908383f.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc86714e8c637b62bc16467b8b3168666b5636230d6a8f0a2d9699a419e4a2b8 +size 2449932 diff --git a/multipath-tools.changes b/multipath-tools.changes index 3411416..4ea80f3 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jun 10 10:56:49 UTC 2020 - mwilck@suse.com + +- Update to version 0.8.4+43+suse.908383f: + * enable negated regular expression syntax in conf file + * change default devnode blacklist to + '!^(sd[a-z]|dasd[a-z]|nvme[0-9])' + ------------------------------------------------------------------- Mon Jun 08 16:13:31 UTC 2020 - mwilck@suse.com diff --git a/multipath-tools.obsinfo b/multipath-tools.obsinfo index afd6cd3..7a09119 100644 --- a/multipath-tools.obsinfo +++ b/multipath-tools.obsinfo @@ -1,5 +1,5 @@ name: multipath-tools -version: 0.8.4+40+suse.b06c2e5a -mtime: 1591630462 -commit: b06c2e5aac407db77fc5d01710c448ff0c119f85 +version: 0.8.4+43+suse.908383f +mtime: 1591786519 +commit: 908383f93b525ce0a07beb974ee6f2bcf8f6ee4c diff --git a/multipath-tools.spec b/multipath-tools.spec index b9e02fa..b575ddf 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -38,7 +38,7 @@ %define _sysdir usr/lib Name: multipath-tools -Version: 0.8.4+40+suse.b06c2e5a +Version: 0.8.4+43+suse.908383f Release: 0 Summary: Tools to Manage Multipathed Devices with the device-mapper License: GPL-2.0-only