diff --git a/0002-Fix-options-for-ISCSI-functions-1632656.patch b/0002-Fix-options-for-ISCSI-functions-1632656.patch deleted file mode 100644 index b482f6bc123bc83dd668a14e515b7a90fb11c12d..0000000000000000000000000000000000000000 --- a/0002-Fix-options-for-ISCSI-functions-1632656.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 48d19a9835ebb6743ec03e4c9182c8cc74db4cf8 Mon Sep 17 00:00:00 2001 -From: Vojtech Trefny -Date: Wed, 3 Oct 2018 14:11:08 +0200 -Subject: [PATCH] Fix options for ISCSI functions (#1632656) - -Correct mutual authentication options in UDisks are -"reverse-username" and "reverse-password". ---- - blivet/iscsi.py | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/blivet/iscsi.py b/blivet/iscsi.py -index b979e01c..ca51f8ed 100644 ---- a/blivet/iscsi.py -+++ b/blivet/iscsi.py -@@ -385,9 +385,9 @@ class iSCSI(object): - if password: - auth_info["password"] = GLib.Variant("s", password) - if r_username: -- auth_info["r_username"] = GLib.Variant("s", r_username) -+ auth_info["reverse-username"] = GLib.Variant("s", r_username) - if r_password: -- auth_info["r_password"] = GLib.Variant("s", r_password) -+ auth_info["reverse-password"] = GLib.Variant("s", r_password) - - args = GLib.Variant("(sqa{sv})", (ipaddr, int(port), auth_info)) - nodes, _n_nodes = self._call_initiator_method("DiscoverSendTargets", args) -@@ -423,9 +423,9 @@ class iSCSI(object): - if password: - auth_info["password"] = GLib.Variant("s", password) - if r_username: -- auth_info["r_username"] = GLib.Variant("s", r_username) -+ auth_info["reverse-username"] = GLib.Variant("s", r_username) - if r_password: -- auth_info["r_password"] = GLib.Variant("s", r_password) -+ auth_info["reverse-password"] = GLib.Variant("s", r_password) - - try: - self._login(node, auth_info) --- -2.17.1 - diff --git a/blivet-3.1.1.tar.gz b/blivet-3.1.1.tar.gz deleted file mode 100644 index 106f128dc428bd873d2ee2c34dfd0a81ec166f8f..0000000000000000000000000000000000000000 Binary files a/blivet-3.1.1.tar.gz and /dev/null differ diff --git a/blivet-3.2.2.tar.gz b/blivet-3.2.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8eb242b8ca03663b1a044079ff680e32caf9b7c2 Binary files /dev/null and b/blivet-3.2.2.tar.gz differ diff --git a/check-if-disklabel-supports-partition-names.patch b/check-if-disklabel-supports-partition-names.patch deleted file mode 100644 index d28d0475d3ce948ea0139289d2dc214358b822e0..0000000000000000000000000000000000000000 --- a/check-if-disklabel-supports-partition-names.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 6817db6f11ffbaac511c5d43129473910c80736e Mon Sep 17 00:00:00 2001 -From: Vojtech Trefny -Date: Sat, 21 Mar 2020 18:06:51 +0800 -Subject: [PATCH] check if disklabel supports partition names - -pyparted now raises an exception when trying to access partition -name on a disklabel that doesn't support partition names, see -https://github.com/dcantrell/pyparted/issues/59 ---- - blivet/formats/disklabel.py | 7 +++++++ - blivet/populator/helpers/boot.py | 1 + - 2 files changed, 8 insertions(+) - -diff --git a/blivet/formats/disklabel.py b/blivet/formats/disklabel.py -index e13ab2f..125f2ba 100644 ---- a/blivet/formats/disklabel.py -+++ b/blivet/formats/disklabel.py -@@ -329,6 +329,13 @@ class DiskLabel(DeviceFormat): - """ Device status. """ - return False - -+ @property -+ def supports_names(self): -+ if not self.supported or not self.parted_disk: -+ return False -+ -+ return self.parted_disk.supportsFeature(parted.DISK_TYPE_PARTITION_NAME) -+ - def _create(self, **kwargs): - """ Create the device. """ - log_method_call(self, device=self.device, -diff --git a/blivet/populator/helpers/boot.py b/blivet/populator/helpers/boot.py -index 76eed22..5eee9ae 100644 ---- a/blivet/populator/helpers/boot.py -+++ b/blivet/populator/helpers/boot.py -@@ -59,6 +59,7 @@ class MacEFIFormatPopulator(BootFormatPopulator): - fmt = formats.get_format(cls._type_specifier) - try: - return (super(MacEFIFormatPopulator, MacEFIFormatPopulator).match(data, device) and -+ device.disk.format.supports_names and - device.parted_partition.name == fmt.name) - except AttributeError: - # just in case device.parted_partition has no name attr --- -1.8.3.1 - diff --git a/fix-the-long-hostname.patch b/fix-the-long-hostname.patch index d8d23c1e510f7bfe71abe99083e6cabdc172b4ab..b1b38861255e134f6eabf4be9bc760be97033186 100644 --- a/fix-the-long-hostname.patch +++ b/fix-the-long-hostname.patch @@ -1,7 +1,7 @@ diff -Nur blivet-3.1.1/blivet/devicelibs/lvm.py blivet-3.1.1-old/blivet/devicelibs/lvm.py --- blivet-3.1.1/blivet/devicelibs/lvm.py 2019-01-26 04:29:13.358210238 -0500 +++ blivet-3.1.1-old/blivet/devicelibs/lvm.py 2019-01-26 04:29:54.489210238 -0500 -@@ -201,7 +201,7 @@ +@@ -219,7 +219,7 @@ # minus the number of hyphens, and possibly minus up to another 8 characters # in some unspecified set of situations. Instead of figuring all of that out, # no one gets a vg or lv name longer than, let's say, 55. diff --git a/python-blivet.spec b/python-blivet.spec index a601c097edafea7993773943cb7a8dea4242700d..694f4c3436371b4a1af9ebe542921d7d42223182 100644 --- a/python-blivet.spec +++ b/python-blivet.spec @@ -1,13 +1,13 @@ %bcond_with enable_python2 Name: python-blivet -Version: 3.1.1 -Release: 8 +Version: 3.2.2 +Release: 1 Epoch: 1 Summary: A python module for system storage configuration License: LGPLv2+ URL: https://storageapis.wordpress.com/projects/blivet -Source0: http://github.com/storaged-project/blivet/archive/blivet-%{version}.tar.gz +Source0: http://github.com/storaged-project/blivet/releases/download/blivet-%{version}/blivet-%{version}.tar.gz BuildArch: noarch BuildRequires: systemd gettext python3-devel python3-setuptools @@ -17,12 +17,9 @@ BuildRequires: python2-devel python2-setuptools %endif Patch0: 0001-force-lvm-plugin.patch -Patch1: 0002-Fix-options-for-ISCSI-functions-1632656.patch Patch9000: fix-the-long-hostname.patch -# from upstream https://github.com/dcantrell/pyparted/issues/59 -Patch6000: check-if-disklabel-supports-partition-names.patch %description The python-blivet package is a python module for examining and modifying @@ -123,6 +120,12 @@ make PYTHON=%{__python2} DESTDIR=%{buildroot} install %doc README %changelog +* Mon Aug 24 2020 yuboyun - 3.2.2-1 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:upgrate to version 3.2.2 + * Sat Mar 21 2020 songnannan - 3.1.1-8 - bugfix about update