From 25c94043aad1dead540a4911fa702ea3f0e91273 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jul 14 2020 02:03:13 +0000
Subject: import udisks2-2.9.0-3.el8


---

diff --git a/SOURCES/udisks-2.9.1-lvm_vdo-test_resize_physical-size.patch b/SOURCES/udisks-2.9.1-lvm_vdo-test_resize_physical-size.patch
new file mode 100644
index 0000000..cd2f1b5
--- /dev/null
+++ b/SOURCES/udisks-2.9.1-lvm_vdo-test_resize_physical-size.patch
@@ -0,0 +1,34 @@
+From 890a0f3ca8cb5894d1764752c98b90dcb6274d6d Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Tue, 9 Jun 2020 11:16:15 +0200
+Subject: [PATCH] dbus-tests: Fix UdisksLVMVDOTest.test_resize_physical
+
+1 GiB suddenly isn't enough for physical size grow, lets hope
+2 GiB will be enough for everyone.
+
+Resolves: rhzb#1845435
+---
+ src/tests/dbus-tests/test_20_LVM.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/tests/dbus-tests/test_20_LVM.py b/src/tests/dbus-tests/test_20_LVM.py
+index e238879a3..1073a2f90 100644
+--- a/src/tests/dbus-tests/test_20_LVM.py
++++ b/src/tests/dbus-tests/test_20_LVM.py
+@@ -576,6 +576,7 @@ def test_resize_logical(self):
+         dbus_size = self.get_property(lv, '.LogicalVolume', 'Size')
+         dbus_size.assertEqual(vsize * 5)
+ 
++    @udiskstestcase.tag_test(udiskstestcase.TestTags.UNSTABLE)
+     def test_resize_physical(self):
+         vgname = 'udisks_test_vdo_vg'
+ 
+@@ -586,7 +587,7 @@ def test_resize_physical(self):
+         vg_free = self.get_property(vg, '.VolumeGroup', 'FreeSize')
+         lv_name = 'udisks_test_vdovlv'
+         pool_name = 'udisks_test_vdopool'
+-        psize = vg_free.value - 1 * 1024**3
++        psize = vg_free.value - 2 * 1024**3
+         vsize = psize * 5
+         lv_path = vg.CreateVDOVolume(lv_name, pool_name, dbus.UInt64(psize), dbus.UInt64(vsize),
+                                      dbus.UInt64(0), True, True, "auto", self.no_options,
diff --git a/SOURCES/udisks-2.9.1-teardown-needle-match.patch b/SOURCES/udisks-2.9.1-teardown-needle-match.patch
new file mode 100644
index 0000000..2d1d5ed
--- /dev/null
+++ b/SOURCES/udisks-2.9.1-teardown-needle-match.patch
@@ -0,0 +1,29 @@
+From fdf6b233df960e6903c62b86735d86c59d967d12 Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek@redhat.com>
+Date: Fri, 19 Jun 2020 19:12:07 +0200
+Subject: [PATCH] udiskslinuxblock: Fix fstab records matching by needle
+
+Apparently mnt_fs_match_options() is not suitable for this use case.
+---
+ src/udiskslinuxblock.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c
+index 888ec634..d5be8e4c 100644
+--- a/src/udiskslinuxblock.c
++++ b/src/udiskslinuxblock.c
+@@ -575,7 +575,10 @@ find_fstab_entries (UDisksDaemon     *daemon,
+         }
+       else if (needle != NULL)
+         {
+-          if (mnt_fs_match_options (fs, needle) == 0)
++          const char *opts;
++
++          opts = mnt_fs_get_options (fs);
++          if (! opts || g_strstr_len (opts, -1, needle) == NULL)
+             continue;
+         }
+ 
+-- 
+2.26.2
+
diff --git a/SPECS/udisks2.spec b/SPECS/udisks2.spec
index 14ccb7c..f58d217 100644
--- a/SPECS/udisks2.spec
+++ b/SPECS/udisks2.spec
@@ -5,7 +5,7 @@
 %global libatasmart_version             0.17
 %global dbus_version                    1.4.0
 %global with_gtk_doc                    1
-%global libblockdev_version             2.19
+%global libblockdev_version             2.24
 
 %define with_bcache                     1
 %define with_btrfs                      1
@@ -56,11 +56,13 @@
 Name:    udisks2
 Summary: Disk Manager
 Version: 2.9.0
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group:   System Environment/Libraries
 URL:     https://github.com/storaged-project/udisks
 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
+Patch0:  udisks-2.9.1-teardown-needle-match.patch
+Patch1:  udisks-2.9.1-lvm_vdo-test_resize_physical-size.patch
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
@@ -265,6 +267,8 @@ This package contains module for VDO management.
 
 %prep
 %setup -q -n udisks-%{version}
+%patch0 -p1
+%patch1 -p1
 sed -i udisks/udisks2.conf.in -e "s/encryption=luks1/encryption=%{default_luks_encryption}/"
 
 %build
@@ -457,6 +461,13 @@ fi
 %endif
 
 %changelog
+* Mon Jun 22 2020 Tomas Bzatek <tbzatek@redhat.com> - 2.9.0-3
+- Fix the UdisksLVMVDOTest.test_resize_physical test (#1845435)
+
+* Mon Jun 22 2020 Tomas Bzatek <tbzatek@redhat.com> - 2.9.0-2
+- Fix block tear-down functionality (#1843454)
+- Fix libblockdev requires
+
 * Tue May 26 2020 Tomas Bzatek <tbzatek@redhat.com> - 2.9.0-1
 - Rebase to 2.9.0 (#1824147)