import CS python-blivet-3.6.0-22.el9

SOURCES/0027-RHEL96-bugfixes-1.patch

@@ -0,0 +1,165 @@
+From 39382d82c35494d0b359b32a48de723d9f3a0908 Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Mon, 21 Nov 2022 11:04:40 +0100
+Subject: [PATCH 1/2] Add a basic read-only support for UDF filesystem
+
+Resolves: RHEL-13329
+---
+ blivet/formats/fs.py                        | 12 ++++++++++++
+ blivet/populator/helpers/disklabel.py       |  2 +-
+ blivet/populator/helpers/partition.py       |  2 +-
+ blivet/tasks/fsmount.py                     |  4 ++++
+ tests/storage_tests/formats_test/fs_test.py |  4 ++++
+ tests/unit_tests/populator_test.py          |  5 +++++
+ 6 files changed, 27 insertions(+), 2 deletions(-)
+
+diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py
+index 3f553eb0..5b60bd6f 100644
+--- a/blivet/formats/fs.py
++++ b/blivet/formats/fs.py
+@@ -1359,6 +1359,18 @@ class Iso9660FS(FS):
+ register_device_format(Iso9660FS)
+
+
++class UDFFS(FS):
++
++    """ UDF filesystem. """
++    _type = "udf"
++    _modules = ["udf"]
++    _supported = True
++    _mount_class = fsmount.UDFFSMount
++
++
++register_device_format(UDFFS)
++
++
+ class NoDevFS(FS):
+
+     """ nodev filesystem base class """
+diff --git a/blivet/populator/helpers/disklabel.py b/blivet/populator/helpers/disklabel.py
+index db10638e..842cd308 100644
+--- a/blivet/populator/helpers/disklabel.py
++++ b/blivet/populator/helpers/disklabel.py
+@@ -42,7 +42,7 @@ class DiskLabelFormatPopulator(FormatPopulator):
+         # XXX ignore disklabels on multipath or biosraid member disks
+         return (bool(udev.device_get_disklabel_type(data)) and
+                 not udev.device_is_biosraid_member(data) and
+-                udev.device_get_format(data) != "iso9660" and
++                udev.device_get_format(data) not in ("iso9660", "udf") and
+                 not (device.is_disk and udev.device_get_format(data) == "mpath_member"))
+
+     def _get_kwargs(self):
+diff --git a/blivet/populator/helpers/partition.py b/blivet/populator/helpers/partition.py
+index 8659bd48..9257407e 100644
+--- a/blivet/populator/helpers/partition.py
++++ b/blivet/populator/helpers/partition.py
+@@ -75,7 +75,7 @@ class PartitionDevicePopulator(DevicePopulator):
+             # For partitions on disklabels parted cannot make sense of, go ahead
+             # and instantiate a PartitionDevice so our view of the layout is
+             # complete.
+-            if not disk.partitionable or disk.format.type == "iso9660" or disk.format.hidden:
++            if not disk.partitionable or disk.format.type in ("iso9660", "udf") or disk.format.hidden:
+                 log.debug("ignoring partition %s on %s", name, disk.format.type)
+                 return
+
+diff --git a/blivet/tasks/fsmount.py b/blivet/tasks/fsmount.py
+index 65b2470a..a7f493dd 100644
+--- a/blivet/tasks/fsmount.py
++++ b/blivet/tasks/fsmount.py
+@@ -163,6 +163,10 @@ class Iso9660FSMount(FSMount):
+     options = ["ro"]
+
+
++class UDFFSMount(FSMount):
++    options = ["ro"]
++
++
+ class NoDevFSMount(FSMount):
+
+     @property
+--- a/tests/storage_tests/formats_test/fs_test.py
++++ b/tests/storage_tests/formats_test/fs_test.py
+@@ -223,6 +223,10 @@ class Iso9660FS(fstesting.FSAsRoot):
+     _fs_class = fs.Iso9660FS
+
+
++class UDFFS(fstesting.FSAsRoot):
++    _fs_class = fs.UDFFS
++
++
+ @unittest.skip("Too strange to test using this framework.")
+ class NoDevFSTestCase(fstesting.FSAsRoot):
+     _fs_class = fs.NoDevFS
+diff --git a/tests/unit_tests/populator_test.py b/tests/unit_tests/populator_test.py
+index 1ee29b57..df56e1f5 100644
+--- a/tests/unit_tests/populator_test.py
++++ b/tests/unit_tests/populator_test.py
+@@ -979,6 +979,11 @@ class DiskLabelPopulatorTestCase(PopulatorHelperTestCase):
+         self.assertFalse(self.helper_class.match(data, device))
+         device_get_format.return_value = None
+
++        # no match for whole-disk udf filesystem
++        device_get_format.return_value = "udf"
++        self.assertFalse(self.helper_class.match(data, device))
++        device_get_format.return_value = None
++
+         # no match for biosraid members
+         device_is_biosraid_member.return_value = True
+         self.assertFalse(self.helper_class.match(data, device))
+--
+2.46.0
+
+
+From 54e6cc7a7e01bfe8a627b2c2f4ba352c9e6e5564 Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Thu, 14 Mar 2024 15:10:27 +0100
+Subject: [PATCH 2/2] nvme: Skip startup/write when NVMe plugin isn't available
+
+This is similar to other modules like iSCSI where these methods
+are silently skipped if the technology isn't supported or
+available.
+
+Resolves: RHEL-28124
+---
+ blivet/nvme.py | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/blivet/nvme.py b/blivet/nvme.py
+index b1513c19..4309dea3 100644
+--- a/blivet/nvme.py
++++ b/blivet/nvme.py
+@@ -71,10 +71,21 @@ class NVMe(object):
+             except Exception:  # pylint: disable=broad-except
+                 pass
+
++    def available(self):
++        if not hasattr(blockdev.Plugin, "NVME"):
++            return False
++        if not hasattr(blockdev.NVMETech, "FABRICS"):
++            return False
++        return True
++
+     def startup(self):
+         if self.started:
+             return
+
++        if not self.available():
++            log.info("NVMe support not available, not starting")
++            return
++
+         self._hostnqn = blockdev.nvme_get_host_nqn()
+         self._hostid = blockdev.nvme_get_host_id()
+         if not self._hostnqn:
+@@ -97,6 +108,9 @@ class NVMe(object):
+         self.started = True
+
+     def write(self, root, overwrite=True):  # pylint: disable=unused-argument
++        if not self.available():
++            return
++
+         # write down the hostnqn and hostid files
+         p = root + ETC_NVME_PATH
+         if not os.path.isdir(p):
+--
+2.46.0
+

SOURCES/0028-Fix-checking-for-NVMe-plugin-availability.patch

@@ -0,0 +1,27 @@
+From 7677fc312b821a9c67750220f2494d06f2357780 Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Wed, 18 Sep 2024 15:30:05 +0200
+Subject: [PATCH] Fix checking for NVMe plugin availability
+
+---
+ blivet/nvme.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/blivet/nvme.py b/blivet/nvme.py
+index 4309dea3..72a47070 100644
+--- a/blivet/nvme.py
++++ b/blivet/nvme.py
+@@ -76,6 +76,10 @@ class NVMe(object):
+             return False
+         if not hasattr(blockdev.NVMETech, "FABRICS"):
+             return False
++        try:
++            blockdev.nvme.is_tech_avail(blockdev.NVMETech.FABRICS, 0)  # pylint: disable=no-member
++        except (blockdev.BlockDevNotImplementedError, blockdev.NVMEError):
++            return False
+         return True
+ 
+     def startup(self):
+-- 
+2.46.1
+

SOURCES/0029-Align-sizes-up-for-growable-LVs.patch

@@ -0,0 +1,30 @@
+From 6a6eca0c9604a9bd508d98b75c5608f20a3a7bf6 Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Thu, 24 Oct 2024 12:18:58 +0200
+Subject: [PATCH] Align sizes up for growable LVs
+
+Growable LVs usually start at minimum size so adjusting it down
+can change the size below allowed minimum.
+
+Resolves: RHEL-8036
+Resolves: RHEL-19725
+---
+ blivet/devices/lvm.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/blivet/devices/lvm.py b/blivet/devices/lvm.py
+index 62974443..1293cae2 100644
+--- a/blivet/devices/lvm.py
++++ b/blivet/devices/lvm.py
+@@ -2574,7 +2574,7 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin
+         if not isinstance(newsize, Size):
+             raise ValueError("new size must be of type Size")
+
+-        newsize = self.vg.align(newsize)
++        newsize = self.vg.align(newsize, roundup=self.growable)
+         log.debug("trying to set lv %s size to %s", self.name, newsize)
+         # Don't refuse to set size if we think there's not enough space in the
+         # VG for an existing LV, since it's existence proves there is enough
+--
+2.47.0
+

SOURCES/0030-mod_pass_in_stratis_test.patch

@@ -0,0 +1,32 @@
+From c2177aa362d20278a0ebd5c25a776f952d83e5b1 Mon Sep 17 00:00:00 2001
+From: Jan Pokorny <japokorn@redhat.com>
+Date: Fri, 11 Oct 2024 17:17:41 +0200
+Subject: [PATCH] Modified passphrase in stratis test
+
+FIPS requires at least 8 chars long passphrase. Dummy passphrase used
+in stratis test was too short causing encryption
+tests with FIPS enabled to fail.
+
+Changed passphrase.
+
+fixes RHEL-45173, RHEL-8029
+---
+ tests/storage_tests/devices_test/stratis_test.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/storage_tests/devices_test/stratis_test.py b/tests/storage_tests/devices_test/stratis_test.py
+index 5aaa12d4..21c4d0f5 100644
+--- a/tests/storage_tests/devices_test/stratis_test.py
++++ b/tests/storage_tests/devices_test/stratis_test.py
+@@ -230,7 +230,7 @@ class StratisTestCaseClevis(StratisTestCaseBase):
+         blivet.partitioning.do_partitioning(self.storage)
+ 
+         pool = self.storage.new_stratis_pool(name="blivetTestPool", parents=[bd],
+-                                             encrypted=True, passphrase="abcde",
++                                             encrypted=True, passphrase="fipsneeds8chars",
+                                              clevis=StratisClevisConfig(pin="tang",
+                                                                         tang_url=self._tang_server,
+                                                                         tang_thumbprint=None))
+-- 
+2.45.0
+

SOURCES/0031-Fix_running_tests_in_FIPS_mode.patch

@@ -0,0 +1,35 @@
+From b7f03738543a4bb416fb19c7138f0b9d3049af61 Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Fri, 8 Nov 2024 09:19:45 +0100
+Subject: [PATCH] Fix "Modified passphrase in stratis test"
+
+Follow up for 68708e347ef7b2f98312c76aa80366091dd4aade, two more
+places where the passphrase is too short for FIPS mode.
+
+Resolves: RHEL-8029
+---
+ tests/storage_tests/devices_test/stratis_test.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/storage_tests/devices_test/stratis_test.py b/tests/storage_tests/devices_test/stratis_test.py
+index 21c4d0f50..9792e0618 100644
+--- a/tests/storage_tests/devices_test/stratis_test.py
++++ b/tests/storage_tests/devices_test/stratis_test.py
+@@ -105,7 +105,7 @@ def test_stratis_encrypted(self):
+         blivet.partitioning.do_partitioning(self.storage)
+ 
+         pool = self.storage.new_stratis_pool(name="blivetTestPool", parents=[bd],
+-                                             encrypted=True, passphrase="abcde")
++                                             encrypted=True, passphrase="fipsneeds8chars")
+         self.storage.create_device(pool)
+ 
+         self.storage.do_it()
+@@ -260,7 +260,7 @@ def test_stratis_encrypted_clevis_tpm(self):
+         blivet.partitioning.do_partitioning(self.storage)
+ 
+         pool = self.storage.new_stratis_pool(name="blivetTestPool", parents=[bd],
+-                                             encrypted=True, passphrase="abcde",
++                                             encrypted=True, passphrase="fipsneeds8chars",
+                                              clevis=StratisClevisConfig(pin="tpm2"))
+         self.storage.create_device(pool)
+ 

SPECS/python-blivet.spec

@@ -23,7 +23,7 @@ Version: 3.6.0
 
 #%%global prerelease .b2
 # prerelease, if defined, should be something like .a1, .b1, .b2.dev1, or .c2
-Release: 17%{?prerelease}%{?dist}
+Release: 22%{?prerelease}%{?dist}
 Epoch: 1
 License: LGPLv2+
 %global realname blivet
@@ -56,6 +56,11 @@ Patch22: 0023-Do-not-add-new-PVs-to-the-LVM-devices-file-if-it-doe.patch
 Patch23: 0024-Added-support-for-PV-grow.patch
 Patch24: 0025-Stratis-fixes-backport.patch
 Patch25: 0026-XFS-resize-test-fix.patch
+Patch26: 0027-RHEL96-bugfixes-1.patch
+Patch27: 0028-Fix-checking-for-NVMe-plugin-availability.patch
+Patch28: 0029-Align-sizes-up-for-growable-LVs.patch
+Patch29: 0030-mod_pass_in_stratis_test.patch
+Patch30: 0031-Fix_running_tests_in_FIPS_mode.patch
 
 # Versions of required components (done so we make sure the buildrequires
 # match the requires versions of things).
@@ -219,6 +224,29 @@ configuration.
 %endif
 
 %changelog
+* Tue Nov 12 2024 Vojtech Trefny <vtrefny@redhat.com> - 3.6.0-22
+- Fix running tests in FIPS mode
+  Resolves: RHEL-8029
+
+* Fri Nov 1 2024 Jan Pokorny <japokorn@redhat.com> - 3.6.0-21
+- Modified passphrase in stratis test
+  Resolves: RHEL-8029
+
+* Thu Oct 24 2024 Vojtech Trefny <vtrefny@redhat.com> - 3.6.0-20
+- Align sizes up for growable LVs
+  Resolves: RHEL-8036
+  Resolves: RHEL-19725
+
+* Mon Sep 23 2024 Vojtech Trefny <vtrefny@redhat.com> - 3.6.0-19
+- Fix checking for NVMe plugin availability
+  Resolves: RHEL-28124
+
+* Mon Sep 09 2024 Vojtech Trefny <vtrefny@redhat.com> - 3.6.0-18
+- Add a basic read-only support for UDF filesystem
+  Resolves: RHEL-13329
+- nvme: Skip startup/write when NVMe plugin isn't available
+  Resolves: RHEL-28124
+
 * Mon Jul 22 2024 Vojtech Trefny <vtrefny@redhat.com> - 3.6.0-17
 - Fix 'Try waiting after partition creation for XFS resize test'
   Resolves: RHEL-8009