From 4e64d4ebfe21686b8653bd8572689f01e43c5643 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Mon, 4 Oct 2021 16:51:36 +0200
Subject: [PATCH 01/28] * Mon Oct 04 2021 Tomas Bzatek <tbzatek@redhat.com> -
 2.9.4-1 - Version 2.9.4 - Fixes CVE-2021-3802 (#2003650)

---
 .gitignore   | 1 +
 sources      | 2 +-
 udisks2.spec | 6 +++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index ead2e15..2befe26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /udisks-2.9.1.tar.bz2
 /udisks-2.9.2.tar.bz2
 /udisks-2.9.3.tar.bz2
+/udisks-2.9.4.tar.bz2
diff --git a/sources b/sources
index 35442d5..d2ecd4a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (udisks-2.9.3.tar.bz2) = 1ee6e982e599c6872183068dd64f9259a522dea7a91ddc3119f9bc436c9c6bf2911e61f7ae339d67d4851cb6f55ec05b6d9a4cc8c1a9f7c5d35c66b80d5ada42
+SHA512 (udisks-2.9.4.tar.bz2) = 35f5429bc2a7092aa659cba9296837d127e2b17c23ab23111d0d9b230d15ef5a6965e112b1f3829748a69a52fb5b09722153f86f1ef70977b3ad7b7a4ec40ec5
diff --git a/udisks2.spec b/udisks2.spec
index df16593..21bc3b1 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -42,7 +42,7 @@
 
 Name:    udisks2
 Summary: Disk Manager
-Version: 2.9.3
+Version: 2.9.4
 Release: 1%{?dist}
 License: GPLv2+
 URL:     https://github.com/storaged-project/udisks
@@ -420,6 +420,10 @@ fi
 %endif
 
 %changelog
+* Mon Oct 04 2021 Tomas Bzatek <tbzatek@redhat.com> - 2.9.4-1
+- Version 2.9.4
+- Fixes CVE-2021-3802 (#2003650)
+
 * Thu Aug 05 2021 Tomas Bzatek <tbzatek@redhat.com> - 2.9.3-1
 - Version 2.9.3
 

From acb069045be694e2939a230402b689ae3abd144c Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Mon, 4 Oct 2021 16:51:36 +0200
Subject: [PATCH 02/28] * Mon Oct 04 2021 Tomas Bzatek <tbzatek@redhat.com> -
 2.9.4-1 - Version 2.9.4 - Fixes CVE-2021-3802 (#2003650)

(cherry picked from commit 4e64d4ebfe21686b8653bd8572689f01e43c5643)
---
 .gitignore   | 1 +
 sources      | 2 +-
 udisks2.spec | 6 +++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index ead2e15..2befe26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /udisks-2.9.1.tar.bz2
 /udisks-2.9.2.tar.bz2
 /udisks-2.9.3.tar.bz2
+/udisks-2.9.4.tar.bz2
diff --git a/sources b/sources
index 35442d5..d2ecd4a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (udisks-2.9.3.tar.bz2) = 1ee6e982e599c6872183068dd64f9259a522dea7a91ddc3119f9bc436c9c6bf2911e61f7ae339d67d4851cb6f55ec05b6d9a4cc8c1a9f7c5d35c66b80d5ada42
+SHA512 (udisks-2.9.4.tar.bz2) = 35f5429bc2a7092aa659cba9296837d127e2b17c23ab23111d0d9b230d15ef5a6965e112b1f3829748a69a52fb5b09722153f86f1ef70977b3ad7b7a4ec40ec5
diff --git a/udisks2.spec b/udisks2.spec
index df16593..21bc3b1 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -42,7 +42,7 @@
 
 Name:    udisks2
 Summary: Disk Manager
-Version: 2.9.3
+Version: 2.9.4
 Release: 1%{?dist}
 License: GPLv2+
 URL:     https://github.com/storaged-project/udisks
@@ -420,6 +420,10 @@ fi
 %endif
 
 %changelog
+* Mon Oct 04 2021 Tomas Bzatek <tbzatek@redhat.com> - 2.9.4-1
+- Version 2.9.4
+- Fixes CVE-2021-3802 (#2003650)
+
 * Thu Aug 05 2021 Tomas Bzatek <tbzatek@redhat.com> - 2.9.3-1
 - Version 2.9.3
 

From 0655c07ec99a6e4771f7044b873110cc9625bdc4 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 22 Jan 2022 03:24:50 +0000
Subject: [PATCH 03/28] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 udisks2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/udisks2.spec b/udisks2.spec
index 21bc3b1..4332af8 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -43,7 +43,7 @@
 Name:    udisks2
 Summary: Disk Manager
 Version: 2.9.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL:     https://github.com/storaged-project/udisks
 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
@@ -420,6 +420,9 @@ fi
 %endif
 
 %changelog
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Mon Oct 04 2021 Tomas Bzatek <tbzatek@redhat.com> - 2.9.4-1
 - Version 2.9.4
 - Fixes CVE-2021-3802 (#2003650)

From 48f9326f04c9b303a2253605b587485be4862a70 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Thu, 3 Mar 2022 12:39:14 +0100
Subject: [PATCH 04/28] * Thu Mar 03 2022 Tomas Bzatek <tbzatek@redhat.com> -
 2.9.4-3 - Require ntfs-3g (#2058506)

---
 udisks2.spec | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/udisks2.spec b/udisks2.spec
index 4332af8..a48b066 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -43,7 +43,7 @@
 Name:    udisks2
 Summary: Disk Manager
 Version: 2.9.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL:     https://github.com/storaged-project/udisks
 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
@@ -114,9 +114,8 @@ Requires: lib%{name}%{?_isa} = %{version}-%{release}
 
 # For mkntfs (not available on rhel or on ppc/ppc64)
 %if ! 0%{?rhel}
-%ifnarch ppc ppc64
 Requires: ntfsprogs
-%endif
+Requires: ntfs-3g
 %endif
 
 Provides:  storaged = %{version}-%{release}
@@ -420,6 +419,9 @@ fi
 %endif
 
 %changelog
+* Thu Mar 03 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.9.4-3
+- Require ntfs-3g (#2058506)
+
 * Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From 235d323d233015d360b7ca8a20a634692f9d741f Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Thu, 3 Mar 2022 16:31:00 +0100
Subject: [PATCH 05/28] * Thu Mar 03 2022 Tomas Bzatek <tbzatek@redhat.com> -
 2.9.4-4 - Fix gtk-doc annotations

---
 udisks-2.10.0-doc_annotations.patch | 39 +++++++++++++++++++++++++++++
 udisks2.spec                        |  6 ++++-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 udisks-2.10.0-doc_annotations.patch

diff --git a/udisks-2.10.0-doc_annotations.patch b/udisks-2.10.0-doc_annotations.patch
new file mode 100644
index 0000000..30f85fc
--- /dev/null
+++ b/udisks-2.10.0-doc_annotations.patch
@@ -0,0 +1,39 @@
+From 1ef9ab02af5c10a0fc7611c5579c4bc2344e83d0 Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek@redhat.com>
+Date: Tue, 15 Feb 2022 13:25:22 +0100
+Subject: [PATCH] doc: Fix @since: annotations
+
+Recent changes in gdbus-codegen (2.71.1) have introduced parser
+issues on malformed annotations.
+
+https://gitlab.gnome.org/GNOME/glib/-/issues/2601
+---
+ data/org.freedesktop.UDisks2.xml                   | 2 +-
+ modules/lvm2/data/org.freedesktop.UDisks2.lvm2.xml | 1 -
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/data/org.freedesktop.UDisks2.xml b/data/org.freedesktop.UDisks2.xml
+index 23f18746f..d9045a7f3 100644
+--- a/data/org.freedesktop.UDisks2.xml
++++ b/data/org.freedesktop.UDisks2.xml
+@@ -1802,7 +1802,7 @@
+     <!-- Resize:
+          @size: New partition size in bytes, 0 for maximal size.
+          @options: Options.
+-         @since 2.7.2
++         @since: 2.7.2
+ 
+          Resizes the partition.
+ 
+diff --git a/modules/lvm2/data/org.freedesktop.UDisks2.lvm2.xml b/modules/lvm2/data/org.freedesktop.UDisks2.lvm2.xml
+index 46c8e5ac7..c1d61d44f 100644
+--- a/modules/lvm2/data/org.freedesktop.UDisks2.lvm2.xml
++++ b/modules/lvm2/data/org.freedesktop.UDisks2.lvm2.xml
+@@ -321,7 +321,6 @@
+          @write_policy: Specifies the write policy.
+          @options: Additional options.
+          @result: The object path of the new VDO logical volume.
+-
+          @since: 2.9.0
+ 
+          Create a new VDO logical volume that is backed by a newly created
diff --git a/udisks2.spec b/udisks2.spec
index a48b066..d1d356b 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -43,11 +43,12 @@
 Name:    udisks2
 Summary: Disk Manager
 Version: 2.9.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL:     https://github.com/storaged-project/udisks
 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
 Patch0:  ignore-apple-boot-part.patch
+Patch1:  udisks-2.10.0-doc_annotations.patch
 
 BuildRequires: make
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -419,6 +420,9 @@ fi
 %endif
 
 %changelog
+* Thu Mar 03 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.9.4-4
+- Fix gtk-doc annotations
+
 * Thu Mar 03 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.9.4-3
 - Require ntfs-3g (#2058506)
 

From 0c0f8bf2ee8fb324a24b34ddb1ffa6e468972f4c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 23 Jul 2022 11:16:31 +0000
Subject: [PATCH 06/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 udisks2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/udisks2.spec b/udisks2.spec
index d1d356b..070e271 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -43,7 +43,7 @@
 Name:    udisks2
 Summary: Disk Manager
 Version: 2.9.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 URL:     https://github.com/storaged-project/udisks
 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
@@ -420,6 +420,9 @@ fi
 %endif
 
 %changelog
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Thu Mar 03 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.9.4-4
 - Fix gtk-doc annotations
 

From eb5d779e3809aaa50daef40669b9000143674caf Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 21 Jan 2023 05:41:23 +0000
Subject: [PATCH 07/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 udisks2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/udisks2.spec b/udisks2.spec
index 070e271..834290e 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -43,7 +43,7 @@
 Name:    udisks2
 Summary: Disk Manager
 Version: 2.9.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 URL:     https://github.com/storaged-project/udisks
 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
@@ -420,6 +420,9 @@ fi
 %endif
 
 %changelog
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From e2051a88a7f79346a5a6f529ce425024f7cd7bcc Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Thu, 29 Jun 2023 13:57:19 +0200
Subject: [PATCH 08/28] * Thu Jun 29 2023 Tomas Bzatek <tbzatek@redhat.com> -
 2.10.0-1 - Version 2.10.0

---
 .gitignore                          |   1 +
 ignore-apple-boot-part.patch        |  25 ----
 sources                             |   2 +-
 udisks-2.10.0-doc_annotations.patch |  39 -------
 udisks2.spec                        | 169 +++++++---------------------
 5 files changed, 42 insertions(+), 194 deletions(-)
 delete mode 100644 ignore-apple-boot-part.patch
 delete mode 100644 udisks-2.10.0-doc_annotations.patch

diff --git a/.gitignore b/.gitignore
index 2befe26..afb30d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /udisks-2.9.2.tar.bz2
 /udisks-2.9.3.tar.bz2
 /udisks-2.9.4.tar.bz2
+/udisks-2.10.0.tar.bz2
diff --git a/ignore-apple-boot-part.patch b/ignore-apple-boot-part.patch
deleted file mode 100644
index 0c57303..0000000
--- a/ignore-apple-boot-part.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b9863c11601e199420a375e13505e2b795de77c5 Mon Sep 17 00:00:00 2001
-From: Frederick Grose <4335897+FGrose@users.noreply.github.com>
-Date: Tue, 9 Feb 2021 19:02:01 -0500
-Subject: [PATCH] 80-udisks2.rules: Ignore Apple boot partition from
- livecd-tools
-
-https://github.com/livecd-tools/livecd-tools/pull/176 creates a new boot
-partition with livecd-iso-to-disk from Fedora Live .iso files that UDISKS
-should ignore.
----
- data/80-udisks2.rules | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/data/80-udisks2.rules b/data/80-udisks2.rules
-index fb50f48a0..d6fa072fd 100644
---- a/data/80-udisks2.rules
-+++ b/data/80-udisks2.rules
-@@ -122,6 +122,7 @@ ENV{ID_PART_ENTRY_SCHEME}=="mac", ENV{ID_PART_ENTRY_TYPE}=="Apple_Bootstrap", EN
- 
- # Apple Boot partitions
- ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_TYPE}=="426f6f74-0000-11aa-aa11-00306543ecac", ENV{UDISKS_IGNORE}="1"
-+ENV{ID_FS_LABEL}=="ANACONDA", ENV{ID_PART_ENTRY_TYPE}=="48465300-0000-11aa-aa11-00306543ecac|0xaf", ENV{UDISKS_IGNORE}="1"
- 
- # special DOS partition types (EFI, hidden, etc.) and RAID/LVM
- # see http://www.win.tue.nl/~aeb/partitions/partition_types-1.html
diff --git a/sources b/sources
index d2ecd4a..0eeb143 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (udisks-2.9.4.tar.bz2) = 35f5429bc2a7092aa659cba9296837d127e2b17c23ab23111d0d9b230d15ef5a6965e112b1f3829748a69a52fb5b09722153f86f1ef70977b3ad7b7a4ec40ec5
+SHA512 (udisks-2.10.0.tar.bz2) = 3c9dc18dd5f6d61442205f4df2592ebf79211d12d71168f96e6814c2ce16f7a46cda7c0a5ccf47b7dc8b655d8af654d5a62e54b04e5b600af0b15558442cf3ed
diff --git a/udisks-2.10.0-doc_annotations.patch b/udisks-2.10.0-doc_annotations.patch
deleted file mode 100644
index 30f85fc..0000000
--- a/udisks-2.10.0-doc_annotations.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 1ef9ab02af5c10a0fc7611c5579c4bc2344e83d0 Mon Sep 17 00:00:00 2001
-From: Tomas Bzatek <tbzatek@redhat.com>
-Date: Tue, 15 Feb 2022 13:25:22 +0100
-Subject: [PATCH] doc: Fix @since: annotations
-
-Recent changes in gdbus-codegen (2.71.1) have introduced parser
-issues on malformed annotations.
-
-https://gitlab.gnome.org/GNOME/glib/-/issues/2601
----
- data/org.freedesktop.UDisks2.xml                   | 2 +-
- modules/lvm2/data/org.freedesktop.UDisks2.lvm2.xml | 1 -
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/data/org.freedesktop.UDisks2.xml b/data/org.freedesktop.UDisks2.xml
-index 23f18746f..d9045a7f3 100644
---- a/data/org.freedesktop.UDisks2.xml
-+++ b/data/org.freedesktop.UDisks2.xml
-@@ -1802,7 +1802,7 @@
-     <!-- Resize:
-          @size: New partition size in bytes, 0 for maximal size.
-          @options: Options.
--         @since 2.7.2
-+         @since: 2.7.2
- 
-          Resizes the partition.
- 
-diff --git a/modules/lvm2/data/org.freedesktop.UDisks2.lvm2.xml b/modules/lvm2/data/org.freedesktop.UDisks2.lvm2.xml
-index 46c8e5ac7..c1d61d44f 100644
---- a/modules/lvm2/data/org.freedesktop.UDisks2.lvm2.xml
-+++ b/modules/lvm2/data/org.freedesktop.UDisks2.lvm2.xml
-@@ -321,7 +321,6 @@
-          @write_policy: Specifies the write policy.
-          @options: Additional options.
-          @result: The object path of the new VDO logical volume.
--
-          @since: 2.9.0
- 
-          Create a new VDO logical volume that is backed by a newly created
diff --git a/udisks2.spec b/udisks2.spec
index 834290e..009f728 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -1,54 +1,33 @@
-%global glib2_version                   2.50
+%global glib2_version                   2.68
 %global gobject_introspection_version   1.30.0
 %global polkit_version                  0.102
 %global systemd_version                 208
 %global libatasmart_version             0.17
 %global dbus_version                    1.4.0
 %global with_gtk_doc                    1
-%global libblockdev_version             2.25
+%global libblockdev_version             3.0
 
-%define with_bcache                     1
 %define with_btrfs                      1
 %define with_lsm                        1
-%define with_zram                       1
-%define with_lvmcache                   1
-
-# valid options are 'luks1' or 'luks2'
-%define default_luks_encryption         luks2
 
 %define is_fedora                       0%{?rhel} == 0
 %define is_git                          %(git show > /dev/null 2>&1 && echo 1 || echo 0)
 %define git_hash                        %(git log -1 --pretty=format:"%h" || true)
 %define build_date                      %(date '+%Y%m%d')
 
-
-# bcache and zram are not available on RHEL
-%if (0%{?rhel})
-%define with_bcache 0
-%define with_zram 0
-%endif
-
-# btrfs is not available on RHEL > 7
-%if 0%{?rhel} > 7
+# btrfs is not available on RHEL
+%if 0%{?rhel}
 %define with_btrfs 0
 %endif
 
-# feature parity with existing RHEL 7 packages
-%if (0%{?rhel}) && (0%{?rhel} <= 7)
-%define with_lsm 0
-%define with_lvmcache 0
-%endif
-
 
 Name:    udisks2
 Summary: Disk Manager
-Version: 2.9.4
-Release: 6%{?dist}
+Version: 2.10.0
+Release: 1%{?dist}
 License: GPLv2+
 URL:     https://github.com/storaged-project/udisks
 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
-Patch0:  ignore-apple-boot-part.patch
-Patch1:  udisks-2.10.0-doc_annotations.patch
 
 BuildRequires: make
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -58,6 +37,7 @@ BuildRequires: libatasmart-devel >= %{libatasmart_version}
 BuildRequires: polkit-devel >= %{polkit_version}
 BuildRequires: systemd >= %{systemd_version}
 BuildRequires: systemd-devel >= %{systemd_version}
+BuildRequires: systemd-rpm-macros
 BuildRequires: libacl-devel
 BuildRequires: chrpath
 BuildRequires: gtk-doc
@@ -70,6 +50,7 @@ BuildRequires: libblockdev-swap-devel   >= %{libblockdev_version}
 BuildRequires: libblockdev-mdraid-devel >= %{libblockdev_version}
 BuildRequires: libblockdev-fs-devel     >= %{libblockdev_version}
 BuildRequires: libblockdev-crypto-devel >= %{libblockdev_version}
+BuildRequires: libblockdev-nvme-devel   >= %{libblockdev_version}
 BuildRequires: libmount-devel
 BuildRequires: libuuid-devel
 
@@ -80,10 +61,9 @@ Requires: libblockdev-swap   >= %{libblockdev_version}
 Requires: libblockdev-mdraid >= %{libblockdev_version}
 Requires: libblockdev-fs     >= %{libblockdev_version}
 Requires: libblockdev-crypto >= %{libblockdev_version}
+Requires: libblockdev-nvme   >= %{libblockdev_version}
 
-# Needed for the systemd-related macros used in this file
-%{?systemd_requires}
-BuildRequires: systemd
+Requires: lib%{name}%{?_isa} = %{version}-%{release}
 
 # Needed to pull in the system bus daemon
 Requires: dbus >= %{dbus_version}
@@ -99,28 +79,33 @@ Requires: e2fsprogs
 Requires: xfsprogs
 # For mkfs.vfat
 Requires: dosfstools
-Requires: gdisk
+# For exfat
+Requires: exfatprogs
+# For UDF
+Requires: udftools
 # For ejecting removable disks
 Requires: eject
 # For utab monitor
 Requires: libmount
+# The actual polkit agent
+Requires: polkit >= %{polkit_version}
 
-%if ! (0%{?rhel} && 0%{?rhel} < 8)
-# Not really needed but doesn't make much sense to use UDisks without polkit
-# (weak deps don't work on older versions of RHEL)
-Recommends: polkit
+# For mkntfs (not available on rhel or on ppc/ppc64) and f2fs
+%if %{is_fedora}
+Requires: f2fs-tools
+Requires: nilfs-utils
+%ifnarch ppc ppc64
+Requires: ntfsprogs
+%endif
 %endif
 
-Requires: lib%{name}%{?_isa} = %{version}-%{release}
-
-# For mkntfs (not available on rhel or on ppc/ppc64)
-%if ! 0%{?rhel}
-Requires: ntfsprogs
-Requires: ntfs-3g
+# btrfs
+%if 0%{?with_btrfs}
+Requires: btrfs-progs
 %endif
 
 Provides:  storaged = %{version}-%{release}
-Obsoletes: storaged
+Obsoletes: storaged < %{version}-%{release}
 
 %description
 The Udisks project provides a daemon, tools and libraries to access and
@@ -130,7 +115,7 @@ manipulate disks, storage devices and technologies.
 Summary: Dynamic library to access the udisksd daemon
 License: LGPLv2+
 Provides:  libstoraged = %{version}-%{release}
-Obsoletes: libstoraged
+Obsoletes: libstoraged < %{version}-%{release}
 
 %description -n lib%{name}
 This package contains the dynamic library, which provides
@@ -143,7 +128,7 @@ License: LGPLv2+
 Requires: iscsi-initiator-utils
 BuildRequires: iscsi-initiator-utils-devel
 Provides:  storaged-iscsi = %{version}-%{release}
-Obsoletes: storaged-iscsi
+Obsoletes: storaged-iscsi < %{version}-%{release}
 
 %description -n %{name}-iscsi
 This package contains module for iSCSI configuration.
@@ -154,10 +139,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 License: LGPLv2+
 Requires: lvm2
 Requires: libblockdev-lvm >= %{libblockdev_version}
-BuildRequires: lvm2-devel
 BuildRequires: libblockdev-lvm-devel >= %{libblockdev_version}
 Provides:  storaged-lvm2 = %{version}-%{release}
-Obsoletes: storaged-lvm2
+Obsoletes: storaged-lvm2 < %{version}-%{release}
 
 %description -n %{name}-lvm2
 This package contains module for LVM2 configuration.
@@ -167,25 +151,11 @@ Summary: Development files for lib%{name}
 Requires: lib%{name}%{?_isa} = %{version}-%{release}
 License: LGPLv2+
 Provides:  libstoraged-devel = %{version}-%{release}
-Obsoletes: libstoraged-devel
+Obsoletes: libstoraged-devel < %{version}-%{release}
 
 %description -n lib%{name}-devel
-This package contains the development files for the library lib%{name}, a
-dynamic library, which provides access to the udisksd daemon.
-
-%if 0%{?with_bcache}
-%package -n %{name}-bcache
-Summary: Module for Bcache
-Requires: %{name}%{?_isa} = %{version}-%{release}
-License: LGPLv2+
-Requires: libblockdev-kbd >= %{libblockdev_version}
-BuildRequires: libblockdev-kbd-devel >= %{libblockdev_version}
-Provides:  storaged-bcache = %{version}-%{release}
-Obsoletes: storaged-bcache
-
-%description -n %{name}-bcache
-This package contains module for Bcache configuration.
-%endif
+This package contains the development files for the library lib%{name},
+a dynamic library, which provides access to the udisksd daemon.
 
 %if 0%{?with_btrfs}
 %package -n %{name}-btrfs
@@ -195,7 +165,7 @@ License: LGPLv2+
 Requires: libblockdev-btrfs >= %{libblockdev_version}
 BuildRequires: libblockdev-btrfs-devel >= %{libblockdev_version}
 Provides:  storaged-btrfs = %{version}-%{release}
-Obsoletes: storaged-btrfs
+Obsoletes: storaged-btrfs < %{version}-%{release}
 
 %description -n %{name}-btrfs
 This package contains module for BTRFS configuration.
@@ -210,35 +180,18 @@ Requires: libstoragemgmt
 BuildRequires: libstoragemgmt-devel
 BuildRequires: libconfig-devel
 Provides:  storaged-lsm = %{version}-%{release}
-Obsoletes: storaged-lsm
+Obsoletes: storaged-lsm < %{version}-%{release}
 
 %description -n %{name}-lsm
 This package contains module for LSM configuration.
 %endif
 
-%if 0%{?with_zram}
-%package -n %{name}-zram
-Summary: Module for ZRAM
-Requires: %{name}%{?_isa} = %{version}-%{release}
-License: LGPLv2+
-Requires: libblockdev-kbd >= %{libblockdev_version}
-Requires: libblockdev-swap >= %{libblockdev_version}
-BuildRequires: libblockdev-kbd-devel >= %{libblockdev_version}
-BuildRequires: libblockdev-swap-devel
-Provides:  storaged-zram = %{version}-%{release}
-Obsoletes: storaged-zram
-
-%description -n %{name}-zram
-This package contains module for ZRAM configuration.
-%endif
-
 %prep
 %autosetup -p1 -n udisks-%{version}
-sed -i udisks/udisks2.conf.in -e "s/encryption=luks1/encryption=%{default_luks_encryption}/"
 rm -f src/tests/dbus-tests/config_h.py
 
 %build
-autoreconf -ivf
+# autoreconf -ivf
 # modules need to be explicitly enabled
 %configure            \
 %if %{with_gtk_doc}
@@ -246,21 +199,11 @@ autoreconf -ivf
 %else
     --disable-gtk-doc \
 %endif
-%if 0%{?with_bcache}
-    --enable-bcache   \
-%endif
 %if 0%{?with_btrfs}
     --enable-btrfs    \
-%endif
-    --disable-vdo      \
-%if 0%{?with_zram}
-    --enable-zram     \
 %endif
 %if 0%{?with_lsm}
     --enable-lsm      \
-%endif
-%if 0%{?with_lvmcache}
-    --enable-lvmcache \
 %endif
     --enable-lvm2     \
     --enable-iscsi
@@ -297,21 +240,6 @@ fi
 
 %ldconfig_scriptlets -n lib%{name}
 
-%if 0%{?with_zram}
-%post -n %{name}-zram
-%systemd_post udisks2-zram-setup@.service
-if [ -S /run/udev/control ]; then
-    udevadm control --reload
-    udevadm trigger
-fi
-
-%preun -n %{name}-zram
-%systemd_preun udisks2-zram-setup@.service
-
-%postun -n %{name}-zram
-%systemd_postun udisks2-zram-setup@.service
-%endif
-
 %files -f udisks2.lang
 %doc README.md AUTHORS NEWS HACKING
 %license COPYING
@@ -325,6 +253,7 @@ fi
 
 %{_datadir}/dbus-1/system.d/org.freedesktop.UDisks2.conf
 %{_datadir}/bash-completion/completions/udisksctl
+%{_datadir}/zsh/site-functions/_udisks2
 %{_tmpfilesdir}/%{name}.conf
 %{_unitdir}/udisks2.service
 %{_udevrulesdir}/80-udisks2.rules
@@ -376,24 +305,12 @@ fi
 %{_libdir}/pkgconfig/udisks2.pc
 %{_libdir}/pkgconfig/udisks2-lvm2.pc
 %{_libdir}/pkgconfig/udisks2-iscsi.pc
-%if 0%{?with_bcache}
-%{_libdir}/pkgconfig/udisks2-bcache.pc
-%endif
 %if 0%{?with_btrfs}
 %{_libdir}/pkgconfig/udisks2-btrfs.pc
 %endif
 %if 0%{?with_lsm}
 %{_libdir}/pkgconfig/udisks2-lsm.pc
 %endif
-%if 0%{?with_zram}
-%{_libdir}/pkgconfig/udisks2-zram.pc
-%endif
-
-%if 0%{?with_bcache}
-%files -n %{name}-bcache
-%{_libdir}/udisks2/modules/libudisks2_bcache.so
-%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.bcache.policy
-%endif
 
 %if 0%{?with_btrfs}
 %files -n %{name}-btrfs
@@ -410,16 +327,10 @@ fi
 %attr(0600,root,root) %{_sysconfdir}/udisks2/modules.conf.d/udisks2_lsm.conf
 %endif
 
-%if 0%{?with_zram}
-%files -n %{name}-zram
-%dir %{_sysconfdir}/udisks2/modules.conf.d
-%{_libdir}/udisks2/modules/libudisks2_zram.so
-%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.zram.policy
-%{_unitdir}/udisks2-zram-setup@.service
-%{_udevrulesdir}/90-udisks2-zram.rules
-%endif
-
 %changelog
+* Thu Jun 29 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.10.0-1
+- Version 2.10.0
+
 * Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From 7c098bff5e746d1df2bf58fb257caed133b6d221 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 22 Jul 2023 17:00:06 +0000
Subject: [PATCH 09/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 udisks2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/udisks2.spec b/udisks2.spec
index 009f728..2158e5c 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -24,7 +24,7 @@
 Name:    udisks2
 Summary: Disk Manager
 Version: 2.10.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL:     https://github.com/storaged-project/udisks
 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
@@ -328,6 +328,9 @@ fi
 %endif
 
 %changelog
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Thu Jun 29 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.10.0-1
 - Version 2.10.0
 

From 92fceb0c5dabd8f7845a1648d3e5ff3140e16edc Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Thu, 7 Sep 2023 15:47:38 +0200
Subject: [PATCH 10/28] * Thu Sep 07 2023 Tomas Bzatek <tbzatek@redhat.com> -
 2.10.1-1 - Version 2.10.1 - Default to ntfs-3g for stability reasons
 (#2182206) - Use Recommends: for filesystem tools (#2169848)

---
 .gitignore   |  1 +
 sources      |  2 +-
 udisks2.spec | 33 +++++++++++++++++++++------------
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index afb30d1..148ecf9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /udisks-2.9.3.tar.bz2
 /udisks-2.9.4.tar.bz2
 /udisks-2.10.0.tar.bz2
+/udisks-2.10.1.tar.bz2
diff --git a/sources b/sources
index 0eeb143..3712713 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (udisks-2.10.0.tar.bz2) = 3c9dc18dd5f6d61442205f4df2592ebf79211d12d71168f96e6814c2ce16f7a46cda7c0a5ccf47b7dc8b655d8af654d5a62e54b04e5b600af0b15558442cf3ed
+SHA512 (udisks-2.10.1.tar.bz2) = 9cdaeca4306a970c85f88d406dbe5d2dad23d72f47d9ab1c021b8c2888d4c790f680eb94388d86f9255024283b4a36e98b8aee4408d193a7d4aad1e74463356a
diff --git a/udisks2.spec b/udisks2.spec
index 2158e5c..bde7a8b 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -23,8 +23,8 @@
 
 Name:    udisks2
 Summary: Disk Manager
-Version: 2.10.0
-Release: 2%{?dist}
+Version: 2.10.1
+Release: 1%{?dist}
 License: GPLv2+
 URL:     https://github.com/storaged-project/udisks
 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
@@ -74,17 +74,17 @@ Requires: libatasmart >= %{libatasmart_version}
 # For mount, umount, mkswap
 Requires: util-linux
 # For mkfs.ext3, mkfs.ext3, e2label
-Requires: e2fsprogs
+Recommends: e2fsprogs
 # For mkfs.xfs, xfs_admin
-Requires: xfsprogs
+Recommends: xfsprogs
 # For mkfs.vfat
-Requires: dosfstools
+Recommends: dosfstools
 # For exfat
-Requires: exfatprogs
+Recommends: exfatprogs
 # For UDF
-Requires: udftools
+Recommends: udftools
 # For ejecting removable disks
-Requires: eject
+Recommends: eject
 # For utab monitor
 Requires: libmount
 # The actual polkit agent
@@ -92,16 +92,17 @@ Requires: polkit >= %{polkit_version}
 
 # For mkntfs (not available on rhel or on ppc/ppc64) and f2fs
 %if %{is_fedora}
-Requires: f2fs-tools
-Requires: nilfs-utils
+Recommends: f2fs-tools
+Recommends: nilfs-utils
 %ifnarch ppc ppc64
-Requires: ntfsprogs
+Recommends: ntfsprogs
 %endif
 %endif
+Recommends: ntfs-3g
 
 # btrfs
 %if 0%{?with_btrfs}
-Requires: btrfs-progs
+Recommends: btrfs-progs
 %endif
 
 Provides:  storaged = %{version}-%{release}
@@ -189,6 +190,9 @@ This package contains module for LSM configuration.
 %prep
 %autosetup -p1 -n udisks-%{version}
 rm -f src/tests/dbus-tests/config_h.py
+rm -f src/udisks-daemon-resources.{c,h}
+# default to ntfs-3g (#2182206)
+sed -i data/builtin_mount_options.conf -e 's/ntfs_drivers=ntfs3,ntfs/ntfs_drivers=ntfs,ntfs3/'
 
 %build
 # autoreconf -ivf
@@ -328,6 +332,11 @@ fi
 %endif
 
 %changelog
+* Thu Sep 07 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.10.1-1
+- Version 2.10.1
+- Default to ntfs-3g for stability reasons (#2182206)
+- Use Recommends: for filesystem tools (#2169848)
+
 * Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From 4fb3a071e2da800a202aef706b0cb5bc20a4961b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 27 Jan 2024 06:59:36 +0000
Subject: [PATCH 11/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 udisks2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/udisks2.spec b/udisks2.spec
index bde7a8b..dbb966e 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -24,7 +24,7 @@
 Name:    udisks2
 Summary: Disk Manager
 Version: 2.10.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL:     https://github.com/storaged-project/udisks
 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
@@ -332,6 +332,9 @@ fi
 %endif
 
 %changelog
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Thu Sep 07 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.10.1-1
 - Version 2.10.1
 - Default to ntfs-3g for stability reasons (#2182206)

From 9213e56a43ead3c35e610dad49846a203c8dc66b Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Mon, 12 Feb 2024 15:30:13 +0100
Subject: [PATCH 12/28] * Mon Feb 12 2024 Tomas Bzatek <tbzatek@redhat.com> -
 2.10.1-3 - Use a SPDX license tag - udiskslinuxblockobject: Try issuing
 BLKRRPART ioctl harder - udiskslinuxmanager: Fix use after free - tests: Fix
 targetcli_config.json

---
 udisks-2.11.0-BLKRRPART_harder.patch          |  55 +++++++++
 ...-targetcli_config.json_netif_timeout.patch |  38 ++++++
 ....0-udiskslinuxmanager_use_after_free.patch | 112 ++++++++++++++++++
 udisks2.spec                                  |  14 ++-
 4 files changed, 217 insertions(+), 2 deletions(-)
 create mode 100644 udisks-2.11.0-BLKRRPART_harder.patch
 create mode 100644 udisks-2.11.0-targetcli_config.json_netif_timeout.patch
 create mode 100644 udisks-2.11.0-udiskslinuxmanager_use_after_free.patch

diff --git a/udisks-2.11.0-BLKRRPART_harder.patch b/udisks-2.11.0-BLKRRPART_harder.patch
new file mode 100644
index 0000000..39af1e0
--- /dev/null
+++ b/udisks-2.11.0-BLKRRPART_harder.patch
@@ -0,0 +1,55 @@
+From eb1d4a2bcbb8744074d17553bd0d55ffbd76bdeb Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek@redhat.com>
+Date: Tue, 14 Nov 2023 13:16:39 +0000
+Subject: [PATCH] udiskslinuxblockobject: Try issuing BLKRRPART ioctl harder
+
+For some reason even after acquiring a voluntary BSD lock on
+the device the BLKRRPART ioctl still fails with EBUSY. Wait
+a couple of msec and everything is fine.
+
+So try harder, several attempts, if busy. There might be number
+of things going on in the system and it's out of our control
+even when holding a lock.
+---
+ src/udiskslinuxblockobject.c | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/src/udiskslinuxblockobject.c b/src/udiskslinuxblockobject.c
+index d5da4bc4d9..33604df841 100644
+--- a/src/udiskslinuxblockobject.c
++++ b/src/udiskslinuxblockobject.c
+@@ -1098,23 +1098,31 @@ udisks_linux_block_object_reread_partition_table (UDisksLinuxBlockObject  *objec
+     }
+   else
+     {
+-      gint num_tries = 0;
++      gint num_tries;
+ 
+       /* acquire an exclusive BSD lock to prevent udev probes.
+        * See also https://systemd.io/BLOCK_DEVICE_LOCKING
+        */
++      num_tries = 10;
+       while (flock (fd, LOCK_EX | LOCK_NB) != 0)
+         {
+           g_usleep (100 * 1000); /* microseconds */
+-          if (num_tries++ > 5)
++          if (num_tries-- < 0)
+             break;
+         }
+ 
+-      if (ioctl (fd, BLKRRPART) != 0)
++      num_tries = 5;
++      while (ioctl (fd, BLKRRPART) != 0)
+         {
++          if (errno == EBUSY && num_tries-- >= 0)
++            {
++              g_usleep (200 * 1000); /* microseconds */
++              continue;
++            }
+           g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno),
+                        "Error re-reading partition table (BLKRRPART ioctl) on %s: %m", device_file);
+           ret = FALSE;
++          break;
+         }
+       close (fd);
+     }
diff --git a/udisks-2.11.0-targetcli_config.json_netif_timeout.patch b/udisks-2.11.0-targetcli_config.json_netif_timeout.patch
new file mode 100644
index 0000000..e40f136
--- /dev/null
+++ b/udisks-2.11.0-targetcli_config.json_netif_timeout.patch
@@ -0,0 +1,38 @@
+From acae6bf4594f80da57855343ab325f87386178c4 Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek@redhat.com>
+Date: Fri, 3 Nov 2023 16:40:54 +0100
+Subject: [PATCH] tests: Fix targetcli_config.json
+
+Not all attributes are available anymore in newer kernel versions.
+---
+ src/tests/dbus-tests/targetcli_config.json | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/tests/dbus-tests/targetcli_config.json b/src/tests/dbus-tests/targetcli_config.json
+index 3be9eac2be..f50bf7d4d2 100644
+--- a/src/tests/dbus-tests/targetcli_config.json
++++ b/src/tests/dbus-tests/targetcli_config.json
+@@ -331,7 +331,6 @@
+             "demo_mode_write_protect": 0,
+             "generate_node_acls": 1,
+             "login_timeout": 15,
+-            "netif_timeout": 2,
+             "prod_mode_write_protect": 0,
+             "t10_pi": 0,
+             "tpg_enabled_sendtargets": 1
+@@ -393,7 +392,6 @@
+             "demo_mode_write_protect": 1,
+             "generate_node_acls": 0,
+             "login_timeout": 15,
+-            "netif_timeout": 2,
+             "prod_mode_write_protect": 0,
+             "t10_pi": 0,
+             "tpg_enabled_sendtargets": 1
+@@ -479,7 +477,6 @@
+             "demo_mode_write_protect": 1,
+             "generate_node_acls": 0,
+             "login_timeout": 15,
+-            "netif_timeout": 2,
+             "prod_mode_write_protect": 0,
+             "t10_pi": 0,
+             "tpg_enabled_sendtargets": 1
diff --git a/udisks-2.11.0-udiskslinuxmanager_use_after_free.patch b/udisks-2.11.0-udiskslinuxmanager_use_after_free.patch
new file mode 100644
index 0000000..3157b10
--- /dev/null
+++ b/udisks-2.11.0-udiskslinuxmanager_use_after_free.patch
@@ -0,0 +1,112 @@
+From 3dc036fb5045fc068c6abfbe4e62d0871d7ca82a Mon Sep 17 00:00:00 2001
+From: xinpeng wang <wangxinpeng@uniontech.com>
+Date: Thu, 21 Sep 2023 13:57:40 +0800
+Subject: [PATCH] udiskslinuxmanager:use dbus interface after free
+
+In handle_get_block_devices, call get_block_objects to obtain iface_block_device
+of all current UDisksLinuxBlockObject, and then obtain the corresponding
+UDisksLinuxBlockObject's object_path through iface_block_device.iface_block_device
+is a GDBusInterfaceSkeleton, which saves the object through
+g_dbus_interface_skeleton_set_object. g_object_add_weak_pointer is used here. This
+function is not thread-safe.At this time, if other threads are releasing the object,
+the program will crash.
+This scene can be reproduced by quickly plugging and unplugging the USB disk.
+The core is as follows (the redundant stack is omitted):
+When accessing object in thread 1, the object is released by thread 2
+info threads
+   Id Target Id Frame
+* 1 Thread 0x7f80979e70 (LWP 24559) 0x0000007f8a48dda0 in
+g_dbus_object_get_object_path (object=0x0) at ../../../gio/gdbusobject.c:109
+  2 Thread 0x7f88a43010 (LWP 1159) 0x0000007f8a0a6ae8 in __GI___libc_free
+(mem=0x556a919c80) at malloc.c:3093
+
+thread 1
+(gdb) bt
+0 0x0000007f8a48dda0 in g_dbus_object_get_object_path (object=0x0) at
+../../../gio/gdbusobject.c:109
+1 0x000000556a56911c in handle_get_block_devices (object=0x7f7c007ed0, invocation=
+0x7f74016f20 [GDBusMethodInvocation], arg_options=<optimized out>)
+     at udiskslinuxmanager.c:1063
+
+(gdb) p ((GObject*)(blocks_p->data))->ref_count
+$3 = 1
+(gdb) p *((GDBusInterfaceSkeleton*)(blocks_p->data))
+$6 = {parent_instance = {g_type_instance = {g_class = 0x556a64e740
+[g_type: UDisksLinuxBlock/UDisksBlockSkeleton/GDBusInterfaceSkeleton]}, ref_count = 1,
+qdata = 0x0},  priv = 0x7f7c004ac0}
+(gdb) p *((GDBusInterfaceSkeleton*)(blocks_p->data))->priv
+$7 = {lock = {p = 0x0, i = {0, 0}}, object = 0x0,
+flags = G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD,
+connections = 0x0, object_path = 0x0, hooked_vtable = 0x556a62b9f0}
+
+thread 2
+(gdb) bt
+0 0x0000007f8a0a6ae8 in __GI___libc_free (mem=0x556a919c80) at malloc.c:3093
+1 0x0000007f89ff1224 in () at /lib/aarch64-linux-gnu/libudev.so.1
+2 0x0000007f89ff1348 in () at /lib/aarch64-linux-gnu/libudev.so.1
+3 0x0000007f89ff5520 in () at /lib/aarch64-linux-gnu/libudev.so.1
+4 0x0000007f89fff878 in udev_device_unref () at /lib/aarch64-linux-gnu/libudev.so.1
+5 0x0000007f8a7aeb74 in () at /lib/aarch64-linux-gnu/libgudev-1.0.so.0
+6 0x0000007f8a3193f8 in g_object_unref (_object=<optimized out>) at
+../../../gobject/gobject.c:3346
+7 0x0000007f8a3193f8 in g_object_unref (_object=0x7f680038a0) at
+../../../gobject/gobject.c:3238
+8 0x000000556a57700c in udisks_linux_device_finalize (object=0x7f5c005730
+[UDisksLinuxDevice]) at udiskslinuxdevice.c:75
+9 0x0000007f8a3193f8 in g_object_unref (_object=<optimized out>) at
+../../../gobject/gobject.c:3346
+10 0x0000007f8a3193f8 in g_object_unref (_object=0x7f5c005730) at
+../../../gobject/gobject.c:3238
+11 0x000000556a55d0fc in udisks_linux_drive_object_uevent
+     (object=object@entry=0x556a5df370 [UDisksLinuxDriveObject],
+action=action@entry=0x556a87b120
+"remove",device=device@entry=0x7f74007610 [UDisksLinuxDevice])
+     at udiskslinuxdriveobject.c:715
+12 0x000000556a54840c in handle_block_uevent_for_drive
+     (provider=provider@entry=0x556a5c8200 [UDisksLinuxProvider],
+action=action@entry=0x556a87b120 "remove",device=device@entry=0x7f74007610
+[UDisksLinuxDevice]) at udiskslinuxprovider.c:1035
+13 0x000000556a548ab8 in handle_block_uevent (device=0x7f74007610 [UDisksLinuxDevice],
+action=0x556a87b120 "remove", provider=0x556a5c8200 [UDisksLinuxProvider]) at
+udiskslinuxprovider.c:1349
+14 0x000000556a548ab8 in udisks_linux_provider_handle_uevent
+     (provider=0x556a5c8200 [UDisksLinuxProvider], action=0x556a87b120 "remove",
+device=0x7f74007610 [UDisksLinuxDevice]) at udiskslinuxprovider.c:1399
+15 0x000000556a548cac in on_idle_with_probed_uevent (user_data=0x556a7e65a0) at
+udiskslinuxprovider.c:230
+---
+ src/udiskslinuxmanager.c | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/src/udiskslinuxmanager.c b/src/udiskslinuxmanager.c
+index 5bfeec103..491edb92b 100644
+--- a/src/udiskslinuxmanager.c
++++ b/src/udiskslinuxmanager.c
+@@ -1196,8 +1196,11 @@ handle_get_block_devices (UDisksManager         *object,
+   blocks = get_block_objects (object, &num_blocks);
+   block_paths = g_new0 (const gchar *, num_blocks + 1);
+ 
+-  for (i = 0,blocks_p = blocks; blocks_p != NULL; blocks_p = blocks_p->next, i++)
+-      block_paths[i] = g_dbus_object_get_object_path (g_dbus_interface_get_object (G_DBUS_INTERFACE (blocks_p->data)));
++  for (blocks_p = blocks; blocks_p != NULL; blocks_p = blocks_p->next) {
++	  GDBusObject * block_object = g_dbus_interface_get_object (G_DBUS_INTERFACE (blocks_p->data));
++	  if (block_object)
++		  block_paths[i++] = g_dbus_object_get_object_path (block_object);
++  }
+ 
+   udisks_manager_complete_get_block_devices  (object,
+                                               invocation,
+@@ -1284,9 +1287,11 @@ handle_resolve_device (UDisksManager         *object,
+     }
+ 
+   ret_paths = g_new0 (const gchar *, num_found + 1);
+-  for (i = 0,ret_p = ret; ret_p != NULL; ret_p = ret_p->next, i++)
++  for (i = 0,ret_p = ret; ret_p != NULL; ret_p = ret_p->next)
+     {
+-      ret_paths[i] = g_dbus_object_get_object_path (g_dbus_interface_get_object (G_DBUS_INTERFACE (ret_p->data)));
++      GDBusObject *block_object = g_dbus_interface_get_object (G_DBUS_INTERFACE (ret_p->data));
++      if (block_object)
++        ret_paths[i++] = g_dbus_object_get_object_path (block_object);
+     }
+ 
+   udisks_manager_complete_resolve_device (object,
diff --git a/udisks2.spec b/udisks2.spec
index dbb966e..271d0aa 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -24,11 +24,15 @@
 Name:    udisks2
 Summary: Disk Manager
 Version: 2.10.1
-Release: 2%{?dist}
-License: GPLv2+
+Release: 3%{?dist}
+License: GPL-2.0-or-later
 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.11.0-BLKRRPART_harder.patch
+Patch1:  udisks-2.11.0-targetcli_config.json_netif_timeout.patch
+Patch2:  udisks-2.11.0-udiskslinuxmanager_use_after_free.patch
+
 BuildRequires: make
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
@@ -332,6 +336,12 @@ fi
 %endif
 
 %changelog
+* Mon Feb 12 2024 Tomas Bzatek <tbzatek@redhat.com> - 2.10.1-3
+- Use a SPDX license tag
+- udiskslinuxblockobject: Try issuing BLKRRPART ioctl harder
+- udiskslinuxmanager: Fix use after free
+- tests: Fix targetcli_config.json
+
 * Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From acc0fd01a92a96d74dc7aafa120ba721b0a0d958 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Mon, 12 Feb 2024 16:07:14 +0100
Subject: [PATCH 13/28] * Mon Feb 12 2024 Tomas Bzatek <tbzatek@redhat.com> -
 2.10.1-4 - Use SPDX license tags for subpackages

---
 udisks2.spec | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/udisks2.spec b/udisks2.spec
index 271d0aa..62c70f3 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -24,7 +24,7 @@
 Name:    udisks2
 Summary: Disk Manager
 Version: 2.10.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL-2.0-or-later
 URL:     https://github.com/storaged-project/udisks
 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
@@ -118,7 +118,7 @@ manipulate disks, storage devices and technologies.
 
 %package -n lib%{name}
 Summary: Dynamic library to access the udisksd daemon
-License: LGPLv2+
+License: LGPL-2.0-or-later
 Provides:  libstoraged = %{version}-%{release}
 Obsoletes: libstoraged < %{version}-%{release}
 
@@ -129,7 +129,7 @@ access to the udisksd daemon.
 %package -n %{name}-iscsi
 Summary: Module for iSCSI
 Requires: %{name}%{?_isa} = %{version}-%{release}
-License: LGPLv2+
+License: LGPL-2.0-or-later
 Requires: iscsi-initiator-utils
 BuildRequires: iscsi-initiator-utils-devel
 Provides:  storaged-iscsi = %{version}-%{release}
@@ -141,7 +141,7 @@ This package contains module for iSCSI configuration.
 %package -n %{name}-lvm2
 Summary: Module for LVM2
 Requires: %{name}%{?_isa} = %{version}-%{release}
-License: LGPLv2+
+License: LGPL-2.0-or-later
 Requires: lvm2
 Requires: libblockdev-lvm >= %{libblockdev_version}
 BuildRequires: libblockdev-lvm-devel >= %{libblockdev_version}
@@ -154,7 +154,7 @@ This package contains module for LVM2 configuration.
 %package -n lib%{name}-devel
 Summary: Development files for lib%{name}
 Requires: lib%{name}%{?_isa} = %{version}-%{release}
-License: LGPLv2+
+License: LGPL-2.0-or-later
 Provides:  libstoraged-devel = %{version}-%{release}
 Obsoletes: libstoraged-devel < %{version}-%{release}
 
@@ -166,7 +166,7 @@ a dynamic library, which provides access to the udisksd daemon.
 %package -n %{name}-btrfs
 Summary: Module for BTRFS
 Requires: %{name}%{?_isa} = %{version}-%{release}
-License: LGPLv2+
+License: LGPL-2.0-or-later
 Requires: libblockdev-btrfs >= %{libblockdev_version}
 BuildRequires: libblockdev-btrfs-devel >= %{libblockdev_version}
 Provides:  storaged-btrfs = %{version}-%{release}
@@ -180,7 +180,7 @@ This package contains module for BTRFS configuration.
 %package -n %{name}-lsm
 Summary: Module for LSM
 Requires: %{name}%{?_isa} = %{version}-%{release}
-License: LGPLv2+
+License: LGPL-2.0-or-later
 Requires: libstoragemgmt
 BuildRequires: libstoragemgmt-devel
 BuildRequires: libconfig-devel
@@ -336,6 +336,9 @@ fi
 %endif
 
 %changelog
+* Mon Feb 12 2024 Tomas Bzatek <tbzatek@redhat.com> - 2.10.1-4
+- Use SPDX license tags for subpackages
+
 * Mon Feb 12 2024 Tomas Bzatek <tbzatek@redhat.com> - 2.10.1-3
 - Use a SPDX license tag
 - udiskslinuxblockobject: Try issuing BLKRRPART ioctl harder

From 3e2e56db8fe4801653f9a582defb7d854bb41170 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Fri, 1 Mar 2024 16:09:36 +0100
Subject: [PATCH 14/28] * Fri Mar 01 2024 Tomas Bzatek <tbzatek@redhat.com> -
 2.10.1-5 - udiskslinuxblock: Survive a missing /etc/fstab (#2264922)

---
 ...iskslinuxblock_survive_missing_fstab.patch | 32 +++++++++++++++++++
 udisks2.spec                                  |  6 +++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 udisks-2.11.0-udiskslinuxblock_survive_missing_fstab.patch

diff --git a/udisks-2.11.0-udiskslinuxblock_survive_missing_fstab.patch b/udisks-2.11.0-udiskslinuxblock_survive_missing_fstab.patch
new file mode 100644
index 0000000..9acd8bd
--- /dev/null
+++ b/udisks-2.11.0-udiskslinuxblock_survive_missing_fstab.patch
@@ -0,0 +1,32 @@
+From 8f62f7c6888659f3b66d5861d46fb9b3a34ff169 Mon Sep 17 00:00:00 2001
+From: Marius Vollmer <mvollmer@redhat.com>
+Date: Thu, 22 Feb 2024 16:49:24 +0200
+Subject: [PATCH] udiskslinuxblock: Survive a missing /etc/fstab
+
+This is similar to b79f6840ca82551e672156153b7e13328f0ba19d, which
+solved the same problem for /etc/crypttab.
+---
+ src/udiskslinuxblock.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c
+index 829dd5f78..a3fa183be 100644
+--- a/src/udiskslinuxblock.c
++++ b/src/udiskslinuxblock.c
+@@ -1541,7 +1541,15 @@ add_remove_fstab_entry (UDisksBlock *block,
+                             &contents,
+                             NULL,
+                             error))
+-    goto out;
++    {
++      if (g_error_matches (*error, G_FILE_ERROR, G_FILE_ERROR_NOENT))
++        {
++          contents = g_strdup ("");
++          g_clear_error (error);
++        }
++      else
++        goto out;
++    }
+ 
+   lines = g_strsplit (contents, "\n", 0);
+ 
diff --git a/udisks2.spec b/udisks2.spec
index 62c70f3..ae28c0e 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -24,7 +24,7 @@
 Name:    udisks2
 Summary: Disk Manager
 Version: 2.10.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL-2.0-or-later
 URL:     https://github.com/storaged-project/udisks
 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
@@ -32,6 +32,7 @@ Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{v
 Patch0:  udisks-2.11.0-BLKRRPART_harder.patch
 Patch1:  udisks-2.11.0-targetcli_config.json_netif_timeout.patch
 Patch2:  udisks-2.11.0-udiskslinuxmanager_use_after_free.patch
+Patch3:  udisks-2.11.0-udiskslinuxblock_survive_missing_fstab.patch
 
 BuildRequires: make
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -336,6 +337,9 @@ fi
 %endif
 
 %changelog
+* Fri Mar 01 2024 Tomas Bzatek <tbzatek@redhat.com> - 2.10.1-5
+- udiskslinuxblock: Survive a missing /etc/fstab (#2264922)
+
 * Mon Feb 12 2024 Tomas Bzatek <tbzatek@redhat.com> - 2.10.1-4
 - Use SPDX license tags for subpackages
 

From 28818e0a78b253abe434abcd85fd9286d22d3291 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 20 Jul 2024 08:08:40 +0000
Subject: [PATCH 15/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 udisks2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/udisks2.spec b/udisks2.spec
index ae28c0e..d2cf533 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -24,7 +24,7 @@
 Name:    udisks2
 Summary: Disk Manager
 Version: 2.10.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL-2.0-or-later
 URL:     https://github.com/storaged-project/udisks
 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
@@ -337,6 +337,9 @@ fi
 %endif
 
 %changelog
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Fri Mar 01 2024 Tomas Bzatek <tbzatek@redhat.com> - 2.10.1-5
 - udiskslinuxblock: Survive a missing /etc/fstab (#2264922)
 

From e7399d925c0dcf7043fcf87a237861d6620aec04 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Tue, 23 Jul 2024 12:23:07 -0400
Subject: [PATCH 16/28] Build without libstoragemgmt on i686

libstoragemgmt was disabled on i686 due to one of its dependencies:

https://src.fedoraproject.org/rpms/libstoragemgmt/c/0482cc8aeac9074d25bff4ab1a695e4b1933a659
---
 udisks2.spec | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/udisks2.spec b/udisks2.spec
index d2cf533..0f0e534 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -8,7 +8,9 @@
 %global libblockdev_version             3.0
 
 %define with_btrfs                      1
+%ifnarch %{ix86}
 %define with_lsm                        1
+%endif
 
 %define is_fedora                       0%{?rhel} == 0
 %define is_git                          %(git show > /dev/null 2>&1 && echo 1 || echo 0)
@@ -224,6 +226,9 @@ make install DESTDIR=%{buildroot}
 rm -fr %{buildroot}/%{_datadir}/gtk-doc/html/udisks2
 %endif
 
+# not created if lsm is disabled
+mkdir -p %{buildroot}%{_sysconfdir}/udisks2/modules.conf.d
+
 find %{buildroot} -name \*.la -o -name \*.a | xargs rm
 
 chrpath --delete %{buildroot}/%{_sbindir}/umount.udisks2

From 84854961811d6cf14c0c22035b510c430647f04b Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Wed, 2 Oct 2024 13:59:11 +0200
Subject: [PATCH 17/28] * Wed Oct 02 2024 Tomas Bzatek <tbzatek@redhat.com> -
 2.10.90-1 - Version 2.10.90

---
 .gitignore                                    |   1 +
 sources                                       |   2 +-
 udisks-2.11.0-BLKRRPART_harder.patch          |  55 ---------
 ...-targetcli_config.json_netif_timeout.patch |  38 ------
 ...iskslinuxblock_survive_missing_fstab.patch |  32 -----
 ....0-udiskslinuxmanager_use_after_free.patch | 112 ------------------
 udisks2.spec                                  |  25 ++--
 7 files changed, 15 insertions(+), 250 deletions(-)
 delete mode 100644 udisks-2.11.0-BLKRRPART_harder.patch
 delete mode 100644 udisks-2.11.0-targetcli_config.json_netif_timeout.patch
 delete mode 100644 udisks-2.11.0-udiskslinuxblock_survive_missing_fstab.patch
 delete mode 100644 udisks-2.11.0-udiskslinuxmanager_use_after_free.patch

diff --git a/.gitignore b/.gitignore
index 148ecf9..5efa339 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 /udisks-2.9.4.tar.bz2
 /udisks-2.10.0.tar.bz2
 /udisks-2.10.1.tar.bz2
+/udisks-2.10.90.tar.bz2
diff --git a/sources b/sources
index 3712713..55741ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (udisks-2.10.1.tar.bz2) = 9cdaeca4306a970c85f88d406dbe5d2dad23d72f47d9ab1c021b8c2888d4c790f680eb94388d86f9255024283b4a36e98b8aee4408d193a7d4aad1e74463356a
+SHA512 (udisks-2.10.90.tar.bz2) = 7e2507ee9b235925af6d367a0d55608f7a2780a07efba9db3c4bc06a3d42728ce74fc9edc42255fc9259aa3426c83eb164e1e99740a2d2c1b80ec2265b51df90
diff --git a/udisks-2.11.0-BLKRRPART_harder.patch b/udisks-2.11.0-BLKRRPART_harder.patch
deleted file mode 100644
index 39af1e0..0000000
--- a/udisks-2.11.0-BLKRRPART_harder.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From eb1d4a2bcbb8744074d17553bd0d55ffbd76bdeb Mon Sep 17 00:00:00 2001
-From: Tomas Bzatek <tbzatek@redhat.com>
-Date: Tue, 14 Nov 2023 13:16:39 +0000
-Subject: [PATCH] udiskslinuxblockobject: Try issuing BLKRRPART ioctl harder
-
-For some reason even after acquiring a voluntary BSD lock on
-the device the BLKRRPART ioctl still fails with EBUSY. Wait
-a couple of msec and everything is fine.
-
-So try harder, several attempts, if busy. There might be number
-of things going on in the system and it's out of our control
-even when holding a lock.
----
- src/udiskslinuxblockobject.c | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/src/udiskslinuxblockobject.c b/src/udiskslinuxblockobject.c
-index d5da4bc4d9..33604df841 100644
---- a/src/udiskslinuxblockobject.c
-+++ b/src/udiskslinuxblockobject.c
-@@ -1098,23 +1098,31 @@ udisks_linux_block_object_reread_partition_table (UDisksLinuxBlockObject  *objec
-     }
-   else
-     {
--      gint num_tries = 0;
-+      gint num_tries;
- 
-       /* acquire an exclusive BSD lock to prevent udev probes.
-        * See also https://systemd.io/BLOCK_DEVICE_LOCKING
-        */
-+      num_tries = 10;
-       while (flock (fd, LOCK_EX | LOCK_NB) != 0)
-         {
-           g_usleep (100 * 1000); /* microseconds */
--          if (num_tries++ > 5)
-+          if (num_tries-- < 0)
-             break;
-         }
- 
--      if (ioctl (fd, BLKRRPART) != 0)
-+      num_tries = 5;
-+      while (ioctl (fd, BLKRRPART) != 0)
-         {
-+          if (errno == EBUSY && num_tries-- >= 0)
-+            {
-+              g_usleep (200 * 1000); /* microseconds */
-+              continue;
-+            }
-           g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno),
-                        "Error re-reading partition table (BLKRRPART ioctl) on %s: %m", device_file);
-           ret = FALSE;
-+          break;
-         }
-       close (fd);
-     }
diff --git a/udisks-2.11.0-targetcli_config.json_netif_timeout.patch b/udisks-2.11.0-targetcli_config.json_netif_timeout.patch
deleted file mode 100644
index e40f136..0000000
--- a/udisks-2.11.0-targetcli_config.json_netif_timeout.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From acae6bf4594f80da57855343ab325f87386178c4 Mon Sep 17 00:00:00 2001
-From: Tomas Bzatek <tbzatek@redhat.com>
-Date: Fri, 3 Nov 2023 16:40:54 +0100
-Subject: [PATCH] tests: Fix targetcli_config.json
-
-Not all attributes are available anymore in newer kernel versions.
----
- src/tests/dbus-tests/targetcli_config.json | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/src/tests/dbus-tests/targetcli_config.json b/src/tests/dbus-tests/targetcli_config.json
-index 3be9eac2be..f50bf7d4d2 100644
---- a/src/tests/dbus-tests/targetcli_config.json
-+++ b/src/tests/dbus-tests/targetcli_config.json
-@@ -331,7 +331,6 @@
-             "demo_mode_write_protect": 0,
-             "generate_node_acls": 1,
-             "login_timeout": 15,
--            "netif_timeout": 2,
-             "prod_mode_write_protect": 0,
-             "t10_pi": 0,
-             "tpg_enabled_sendtargets": 1
-@@ -393,7 +392,6 @@
-             "demo_mode_write_protect": 1,
-             "generate_node_acls": 0,
-             "login_timeout": 15,
--            "netif_timeout": 2,
-             "prod_mode_write_protect": 0,
-             "t10_pi": 0,
-             "tpg_enabled_sendtargets": 1
-@@ -479,7 +477,6 @@
-             "demo_mode_write_protect": 1,
-             "generate_node_acls": 0,
-             "login_timeout": 15,
--            "netif_timeout": 2,
-             "prod_mode_write_protect": 0,
-             "t10_pi": 0,
-             "tpg_enabled_sendtargets": 1
diff --git a/udisks-2.11.0-udiskslinuxblock_survive_missing_fstab.patch b/udisks-2.11.0-udiskslinuxblock_survive_missing_fstab.patch
deleted file mode 100644
index 9acd8bd..0000000
--- a/udisks-2.11.0-udiskslinuxblock_survive_missing_fstab.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8f62f7c6888659f3b66d5861d46fb9b3a34ff169 Mon Sep 17 00:00:00 2001
-From: Marius Vollmer <mvollmer@redhat.com>
-Date: Thu, 22 Feb 2024 16:49:24 +0200
-Subject: [PATCH] udiskslinuxblock: Survive a missing /etc/fstab
-
-This is similar to b79f6840ca82551e672156153b7e13328f0ba19d, which
-solved the same problem for /etc/crypttab.
----
- src/udiskslinuxblock.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c
-index 829dd5f78..a3fa183be 100644
---- a/src/udiskslinuxblock.c
-+++ b/src/udiskslinuxblock.c
-@@ -1541,7 +1541,15 @@ add_remove_fstab_entry (UDisksBlock *block,
-                             &contents,
-                             NULL,
-                             error))
--    goto out;
-+    {
-+      if (g_error_matches (*error, G_FILE_ERROR, G_FILE_ERROR_NOENT))
-+        {
-+          contents = g_strdup ("");
-+          g_clear_error (error);
-+        }
-+      else
-+        goto out;
-+    }
- 
-   lines = g_strsplit (contents, "\n", 0);
- 
diff --git a/udisks-2.11.0-udiskslinuxmanager_use_after_free.patch b/udisks-2.11.0-udiskslinuxmanager_use_after_free.patch
deleted file mode 100644
index 3157b10..0000000
--- a/udisks-2.11.0-udiskslinuxmanager_use_after_free.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 3dc036fb5045fc068c6abfbe4e62d0871d7ca82a Mon Sep 17 00:00:00 2001
-From: xinpeng wang <wangxinpeng@uniontech.com>
-Date: Thu, 21 Sep 2023 13:57:40 +0800
-Subject: [PATCH] udiskslinuxmanager:use dbus interface after free
-
-In handle_get_block_devices, call get_block_objects to obtain iface_block_device
-of all current UDisksLinuxBlockObject, and then obtain the corresponding
-UDisksLinuxBlockObject's object_path through iface_block_device.iface_block_device
-is a GDBusInterfaceSkeleton, which saves the object through
-g_dbus_interface_skeleton_set_object. g_object_add_weak_pointer is used here. This
-function is not thread-safe.At this time, if other threads are releasing the object,
-the program will crash.
-This scene can be reproduced by quickly plugging and unplugging the USB disk.
-The core is as follows (the redundant stack is omitted):
-When accessing object in thread 1, the object is released by thread 2
-info threads
-   Id Target Id Frame
-* 1 Thread 0x7f80979e70 (LWP 24559) 0x0000007f8a48dda0 in
-g_dbus_object_get_object_path (object=0x0) at ../../../gio/gdbusobject.c:109
-  2 Thread 0x7f88a43010 (LWP 1159) 0x0000007f8a0a6ae8 in __GI___libc_free
-(mem=0x556a919c80) at malloc.c:3093
-
-thread 1
-(gdb) bt
-0 0x0000007f8a48dda0 in g_dbus_object_get_object_path (object=0x0) at
-../../../gio/gdbusobject.c:109
-1 0x000000556a56911c in handle_get_block_devices (object=0x7f7c007ed0, invocation=
-0x7f74016f20 [GDBusMethodInvocation], arg_options=<optimized out>)
-     at udiskslinuxmanager.c:1063
-
-(gdb) p ((GObject*)(blocks_p->data))->ref_count
-$3 = 1
-(gdb) p *((GDBusInterfaceSkeleton*)(blocks_p->data))
-$6 = {parent_instance = {g_type_instance = {g_class = 0x556a64e740
-[g_type: UDisksLinuxBlock/UDisksBlockSkeleton/GDBusInterfaceSkeleton]}, ref_count = 1,
-qdata = 0x0},  priv = 0x7f7c004ac0}
-(gdb) p *((GDBusInterfaceSkeleton*)(blocks_p->data))->priv
-$7 = {lock = {p = 0x0, i = {0, 0}}, object = 0x0,
-flags = G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD,
-connections = 0x0, object_path = 0x0, hooked_vtable = 0x556a62b9f0}
-
-thread 2
-(gdb) bt
-0 0x0000007f8a0a6ae8 in __GI___libc_free (mem=0x556a919c80) at malloc.c:3093
-1 0x0000007f89ff1224 in () at /lib/aarch64-linux-gnu/libudev.so.1
-2 0x0000007f89ff1348 in () at /lib/aarch64-linux-gnu/libudev.so.1
-3 0x0000007f89ff5520 in () at /lib/aarch64-linux-gnu/libudev.so.1
-4 0x0000007f89fff878 in udev_device_unref () at /lib/aarch64-linux-gnu/libudev.so.1
-5 0x0000007f8a7aeb74 in () at /lib/aarch64-linux-gnu/libgudev-1.0.so.0
-6 0x0000007f8a3193f8 in g_object_unref (_object=<optimized out>) at
-../../../gobject/gobject.c:3346
-7 0x0000007f8a3193f8 in g_object_unref (_object=0x7f680038a0) at
-../../../gobject/gobject.c:3238
-8 0x000000556a57700c in udisks_linux_device_finalize (object=0x7f5c005730
-[UDisksLinuxDevice]) at udiskslinuxdevice.c:75
-9 0x0000007f8a3193f8 in g_object_unref (_object=<optimized out>) at
-../../../gobject/gobject.c:3346
-10 0x0000007f8a3193f8 in g_object_unref (_object=0x7f5c005730) at
-../../../gobject/gobject.c:3238
-11 0x000000556a55d0fc in udisks_linux_drive_object_uevent
-     (object=object@entry=0x556a5df370 [UDisksLinuxDriveObject],
-action=action@entry=0x556a87b120
-"remove",device=device@entry=0x7f74007610 [UDisksLinuxDevice])
-     at udiskslinuxdriveobject.c:715
-12 0x000000556a54840c in handle_block_uevent_for_drive
-     (provider=provider@entry=0x556a5c8200 [UDisksLinuxProvider],
-action=action@entry=0x556a87b120 "remove",device=device@entry=0x7f74007610
-[UDisksLinuxDevice]) at udiskslinuxprovider.c:1035
-13 0x000000556a548ab8 in handle_block_uevent (device=0x7f74007610 [UDisksLinuxDevice],
-action=0x556a87b120 "remove", provider=0x556a5c8200 [UDisksLinuxProvider]) at
-udiskslinuxprovider.c:1349
-14 0x000000556a548ab8 in udisks_linux_provider_handle_uevent
-     (provider=0x556a5c8200 [UDisksLinuxProvider], action=0x556a87b120 "remove",
-device=0x7f74007610 [UDisksLinuxDevice]) at udiskslinuxprovider.c:1399
-15 0x000000556a548cac in on_idle_with_probed_uevent (user_data=0x556a7e65a0) at
-udiskslinuxprovider.c:230
----
- src/udiskslinuxmanager.c | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/src/udiskslinuxmanager.c b/src/udiskslinuxmanager.c
-index 5bfeec103..491edb92b 100644
---- a/src/udiskslinuxmanager.c
-+++ b/src/udiskslinuxmanager.c
-@@ -1196,8 +1196,11 @@ handle_get_block_devices (UDisksManager         *object,
-   blocks = get_block_objects (object, &num_blocks);
-   block_paths = g_new0 (const gchar *, num_blocks + 1);
- 
--  for (i = 0,blocks_p = blocks; blocks_p != NULL; blocks_p = blocks_p->next, i++)
--      block_paths[i] = g_dbus_object_get_object_path (g_dbus_interface_get_object (G_DBUS_INTERFACE (blocks_p->data)));
-+  for (blocks_p = blocks; blocks_p != NULL; blocks_p = blocks_p->next) {
-+	  GDBusObject * block_object = g_dbus_interface_get_object (G_DBUS_INTERFACE (blocks_p->data));
-+	  if (block_object)
-+		  block_paths[i++] = g_dbus_object_get_object_path (block_object);
-+  }
- 
-   udisks_manager_complete_get_block_devices  (object,
-                                               invocation,
-@@ -1284,9 +1287,11 @@ handle_resolve_device (UDisksManager         *object,
-     }
- 
-   ret_paths = g_new0 (const gchar *, num_found + 1);
--  for (i = 0,ret_p = ret; ret_p != NULL; ret_p = ret_p->next, i++)
-+  for (i = 0,ret_p = ret; ret_p != NULL; ret_p = ret_p->next)
-     {
--      ret_paths[i] = g_dbus_object_get_object_path (g_dbus_interface_get_object (G_DBUS_INTERFACE (ret_p->data)));
-+      GDBusObject *block_object = g_dbus_interface_get_object (G_DBUS_INTERFACE (ret_p->data));
-+      if (block_object)
-+        ret_paths[i++] = g_dbus_object_get_object_path (block_object);
-     }
- 
-   udisks_manager_complete_resolve_device (object,
diff --git a/udisks2.spec b/udisks2.spec
index 0f0e534..b5f1a77 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -2,10 +2,9 @@
 %global gobject_introspection_version   1.30.0
 %global polkit_version                  0.102
 %global systemd_version                 208
-%global libatasmart_version             0.17
 %global dbus_version                    1.4.0
 %global with_gtk_doc                    1
-%global libblockdev_version             3.0
+%global libblockdev_version             3.2
 
 %define with_btrfs                      1
 %ifnarch %{ix86}
@@ -25,22 +24,16 @@
 
 Name:    udisks2
 Summary: Disk Manager
-Version: 2.10.1
-Release: 6%{?dist}
+Version: 2.10.90
+Release: 1%{?dist}
 License: GPL-2.0-or-later
 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.11.0-BLKRRPART_harder.patch
-Patch1:  udisks-2.11.0-targetcli_config.json_netif_timeout.patch
-Patch2:  udisks-2.11.0-udiskslinuxmanager_use_after_free.patch
-Patch3:  udisks-2.11.0-udiskslinuxblock_survive_missing_fstab.patch
-
 BuildRequires: make
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
 BuildRequires: libgudev1-devel >= %{systemd_version}
-BuildRequires: libatasmart-devel >= %{libatasmart_version}
 BuildRequires: polkit-devel >= %{polkit_version}
 BuildRequires: systemd >= %{systemd_version}
 BuildRequires: systemd-devel >= %{systemd_version}
@@ -58,6 +51,7 @@ BuildRequires: libblockdev-mdraid-devel >= %{libblockdev_version}
 BuildRequires: libblockdev-fs-devel     >= %{libblockdev_version}
 BuildRequires: libblockdev-crypto-devel >= %{libblockdev_version}
 BuildRequires: libblockdev-nvme-devel   >= %{libblockdev_version}
+BuildRequires: libblockdev-smart-devel  >= %{libblockdev_version}
 BuildRequires: libmount-devel
 BuildRequires: libuuid-devel
 
@@ -69,6 +63,7 @@ Requires: libblockdev-mdraid >= %{libblockdev_version}
 Requires: libblockdev-fs     >= %{libblockdev_version}
 Requires: libblockdev-crypto >= %{libblockdev_version}
 Requires: libblockdev-nvme   >= %{libblockdev_version}
+Requires: libblockdev-smart  >= %{libblockdev_version}
 
 Requires: lib%{name}%{?_isa} = %{version}-%{release}
 
@@ -76,8 +71,6 @@ Requires: lib%{name}%{?_isa} = %{version}-%{release}
 Requires: dbus >= %{dbus_version}
 # Needed to pull in the udev daemon
 Requires: udev >= %{systemd_version}
-# We need at least this version for bugfixes/features etc.
-Requires: libatasmart >= %{libatasmart_version}
 # For mount, umount, mkswap
 Requires: util-linux
 # For mkfs.ext3, mkfs.ext3, e2label
@@ -112,6 +105,10 @@ Recommends: ntfs-3g
 Recommends: btrfs-progs
 %endif
 
+
+# For /proc/self/mountinfo, only available in 2.6.26 or higher
+Conflicts: kernel < 2.6.26
+
 Provides:  storaged = %{version}-%{release}
 Obsoletes: storaged < %{version}-%{release}
 
@@ -210,6 +207,7 @@ sed -i data/builtin_mount_options.conf -e 's/ntfs_drivers=ntfs3,ntfs/ntfs_driver
 %else
     --disable-gtk-doc \
 %endif
+    --enable-smart    \
 %if 0%{?with_btrfs}
     --enable-btrfs    \
 %endif
@@ -342,6 +340,9 @@ fi
 %endif
 
 %changelog
+* Wed Oct 02 2024 Tomas Bzatek <tbzatek@redhat.com> - 2.10.90-1
+- Version 2.10.90
+
 * Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From a698d1f0a2af188604baae7891d3fbd8f95cf111 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 19 Jan 2025 13:37:29 +0000
Subject: [PATCH 18/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 udisks2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/udisks2.spec b/udisks2.spec
index b5f1a77..b16123b 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -25,7 +25,7 @@
 Name:    udisks2
 Summary: Disk Manager
 Version: 2.10.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL-2.0-or-later
 URL:     https://github.com/storaged-project/udisks
 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
@@ -340,6 +340,9 @@ fi
 %endif
 
 %changelog
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.90-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Wed Oct 02 2024 Tomas Bzatek <tbzatek@redhat.com> - 2.10.90-1
 - Version 2.10.90
 

From 9423b5cd1fb7c0dc774f6e134d07a37d17b544a1 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Thu, 19 Jun 2025 15:48:48 +0200
Subject: [PATCH 19/28] * Thu Jun 19 2025 Tomas Bzatek <tbzatek@redhat.com> -
 2.10.90-3 - Harden temporary private mounts (#2373301)

---
 ...slinuxfilesystemhelpers_nodev,nosuid.patch | 43 +++++++++++++++++++
 udisks2.spec                                  |  8 +++-
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 udisks-2.10.91-udiskslinuxfilesystemhelpers_nodev,nosuid.patch

diff --git a/udisks-2.10.91-udiskslinuxfilesystemhelpers_nodev,nosuid.patch b/udisks-2.10.91-udiskslinuxfilesystemhelpers_nodev,nosuid.patch
new file mode 100644
index 0000000..d6b0f9a
--- /dev/null
+++ b/udisks-2.10.91-udiskslinuxfilesystemhelpers_nodev,nosuid.patch
@@ -0,0 +1,43 @@
+From 5e7277debea926370e587408517560afe87d28c9 Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek@redhat.com>
+Date: Wed, 4 Jun 2025 15:26:46 +0200
+Subject: [PATCH] udiskslinuxfilesystemhelpers: Mount private mounts with
+ 'nodev,nosuid'
+
+The private mount done in take_filesystem_ownership() should always
+default to 'nodev,nosuid' for security and 'errors=remount-ro' for
+selected filesystem types to handle an corrupted filesystem. This is
+consistent with mount options calculation for regular mounts.
+---
+ src/udiskslinuxfilesystemhelpers.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/udiskslinuxfilesystemhelpers.c b/src/udiskslinuxfilesystemhelpers.c
+index 7c5fc037c4..9eb7742c77 100644
+--- a/src/udiskslinuxfilesystemhelpers.c
++++ b/src/udiskslinuxfilesystemhelpers.c
+@@ -123,6 +123,7 @@ take_filesystem_ownership (const gchar  *device,
+ 
+ {
+   gchar *mountpoint = NULL;
++  const gchar *mount_opts;
+   GError *local_error = NULL;
+   gboolean unmount = FALSE;
+   gboolean success = TRUE;
+@@ -151,8 +152,15 @@ take_filesystem_ownership (const gchar  *device,
+               goto out;
+             }
+ 
++          mount_opts = "nodev,nosuid";
++          if (g_strcmp0 (fstype, "ext2") == 0 ||
++              g_strcmp0 (fstype, "ext3") == 0 ||
++              g_strcmp0 (fstype, "ext4") == 0 ||
++              g_strcmp0 (fstype, "jfs") == 0)
++            mount_opts = "nodev,nosuid,errors=remount-ro";
++
+           /* TODO: mount to a private mount namespace */
+-          if (!bd_fs_mount (device, mountpoint, fstype, NULL, NULL, &local_error))
++          if (!bd_fs_mount (device, mountpoint, fstype, mount_opts, NULL, &local_error))
+             {
+               g_set_error (error, UDISKS_ERROR, UDISKS_ERROR_FAILED,
+                            "Cannot mount %s at %s: %s",
diff --git a/udisks2.spec b/udisks2.spec
index b16123b..6846793 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -25,11 +25,14 @@
 Name:    udisks2
 Summary: Disk Manager
 Version: 2.10.90
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL-2.0-or-later
 URL:     https://github.com/storaged-project/udisks
 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=2373301
+Patch0:  udisks-2.10.91-udiskslinuxfilesystemhelpers_nodev,nosuid.patch
+
 BuildRequires: make
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
@@ -340,6 +343,9 @@ fi
 %endif
 
 %changelog
+* Thu Jun 19 2025 Tomas Bzatek <tbzatek@redhat.com> - 2.10.90-3
+- Harden temporary private mounts (#2373301)
+
 * Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.90-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

From 4eb16e3fd0e48187f50768b10d1d912a55319e97 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 25 Jul 2025 19:43:03 +0000
Subject: [PATCH 20/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 udisks2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/udisks2.spec b/udisks2.spec
index 6846793..76e7b2b 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -25,7 +25,7 @@
 Name:    udisks2
 Summary: Disk Manager
 Version: 2.10.90
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL-2.0-or-later
 URL:     https://github.com/storaged-project/udisks
 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
@@ -343,6 +343,9 @@ fi
 %endif
 
 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.90-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Thu Jun 19 2025 Tomas Bzatek <tbzatek@redhat.com> - 2.10.90-3
 - Harden temporary private mounts (#2373301)
 

From df9cdd8b1690d8f777d27553999dafbfdb7020f3 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Fri, 29 Aug 2025 13:26:12 +0200
Subject: [PATCH 21/28] * Fri Aug 29 2025 Tomas Bzatek <tbzatek@redhat.com> -
 2.10.91-1 - Version 2.10.91

---
 .gitignore                                    |  1 +
 sources                                       |  2 +-
 ...slinuxfilesystemhelpers_nodev,nosuid.patch | 43 -------------------
 udisks2.spec                                  | 10 ++---
 4 files changed, 7 insertions(+), 49 deletions(-)
 delete mode 100644 udisks-2.10.91-udiskslinuxfilesystemhelpers_nodev,nosuid.patch

diff --git a/.gitignore b/.gitignore
index 5efa339..459124a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
 /udisks-2.10.0.tar.bz2
 /udisks-2.10.1.tar.bz2
 /udisks-2.10.90.tar.bz2
+/udisks-2.10.91.tar.bz2
diff --git a/sources b/sources
index 55741ad..cf76c85 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (udisks-2.10.90.tar.bz2) = 7e2507ee9b235925af6d367a0d55608f7a2780a07efba9db3c4bc06a3d42728ce74fc9edc42255fc9259aa3426c83eb164e1e99740a2d2c1b80ec2265b51df90
+SHA512 (udisks-2.10.91.tar.bz2) = 85a11c7509317b1d53d2864f474b03a70773cc5964ab16ba42ed2704f9f95aa704585d40e55a5b86a63a8b4363caafafad03b1bdfecf282c9ee05a1b5644d3a2
diff --git a/udisks-2.10.91-udiskslinuxfilesystemhelpers_nodev,nosuid.patch b/udisks-2.10.91-udiskslinuxfilesystemhelpers_nodev,nosuid.patch
deleted file mode 100644
index d6b0f9a..0000000
--- a/udisks-2.10.91-udiskslinuxfilesystemhelpers_nodev,nosuid.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 5e7277debea926370e587408517560afe87d28c9 Mon Sep 17 00:00:00 2001
-From: Tomas Bzatek <tbzatek@redhat.com>
-Date: Wed, 4 Jun 2025 15:26:46 +0200
-Subject: [PATCH] udiskslinuxfilesystemhelpers: Mount private mounts with
- 'nodev,nosuid'
-
-The private mount done in take_filesystem_ownership() should always
-default to 'nodev,nosuid' for security and 'errors=remount-ro' for
-selected filesystem types to handle an corrupted filesystem. This is
-consistent with mount options calculation for regular mounts.
----
- src/udiskslinuxfilesystemhelpers.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/udiskslinuxfilesystemhelpers.c b/src/udiskslinuxfilesystemhelpers.c
-index 7c5fc037c4..9eb7742c77 100644
---- a/src/udiskslinuxfilesystemhelpers.c
-+++ b/src/udiskslinuxfilesystemhelpers.c
-@@ -123,6 +123,7 @@ take_filesystem_ownership (const gchar  *device,
- 
- {
-   gchar *mountpoint = NULL;
-+  const gchar *mount_opts;
-   GError *local_error = NULL;
-   gboolean unmount = FALSE;
-   gboolean success = TRUE;
-@@ -151,8 +152,15 @@ take_filesystem_ownership (const gchar  *device,
-               goto out;
-             }
- 
-+          mount_opts = "nodev,nosuid";
-+          if (g_strcmp0 (fstype, "ext2") == 0 ||
-+              g_strcmp0 (fstype, "ext3") == 0 ||
-+              g_strcmp0 (fstype, "ext4") == 0 ||
-+              g_strcmp0 (fstype, "jfs") == 0)
-+            mount_opts = "nodev,nosuid,errors=remount-ro";
-+
-           /* TODO: mount to a private mount namespace */
--          if (!bd_fs_mount (device, mountpoint, fstype, NULL, NULL, &local_error))
-+          if (!bd_fs_mount (device, mountpoint, fstype, mount_opts, NULL, &local_error))
-             {
-               g_set_error (error, UDISKS_ERROR, UDISKS_ERROR_FAILED,
-                            "Cannot mount %s at %s: %s",
diff --git a/udisks2.spec b/udisks2.spec
index 76e7b2b..4fa73de 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -24,15 +24,12 @@
 
 Name:    udisks2
 Summary: Disk Manager
-Version: 2.10.90
-Release: 4%{?dist}
+Version: 2.10.91
+Release: 1%{?dist}
 License: GPL-2.0-or-later
 URL:     https://github.com/storaged-project/udisks
 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=2373301
-Patch0:  udisks-2.10.91-udiskslinuxfilesystemhelpers_nodev,nosuid.patch
-
 BuildRequires: make
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
@@ -343,6 +340,9 @@ fi
 %endif
 
 %changelog
+* Fri Aug 29 2025 Tomas Bzatek <tbzatek@redhat.com> - 2.10.91-1
+- Version 2.10.91
+
 * Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.90-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
 

From 377b64ef212b22f9b894f611b1dafafc7b6e3f91 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Thu, 6 Nov 2025 17:34:45 +0100
Subject: [PATCH 22/28] * Thu Nov 06 2025 Tomas Bzatek <tbzatek@redhat.com> -
 2.11.0-1 - Version 2.11.0

---
 .gitignore   | 1 +
 sources      | 2 +-
 udisks2.spec | 7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 459124a..8df46b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
 /udisks-2.10.1.tar.bz2
 /udisks-2.10.90.tar.bz2
 /udisks-2.10.91.tar.bz2
+/udisks-2.11.0.tar.bz2
diff --git a/sources b/sources
index cf76c85..da0149d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (udisks-2.10.91.tar.bz2) = 85a11c7509317b1d53d2864f474b03a70773cc5964ab16ba42ed2704f9f95aa704585d40e55a5b86a63a8b4363caafafad03b1bdfecf282c9ee05a1b5644d3a2
+SHA512 (udisks-2.11.0.tar.bz2) = ddf7bbf6d71c100ea2787aa45d51ae84d8184d33d9e0c1c8824e3da1ca34814b3278f9f74a1aab7acc37efe3ed2b702404fbb9dc3733c0accbb366a74e7d3fe5
diff --git a/udisks2.spec b/udisks2.spec
index 4fa73de..d086c17 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -4,7 +4,7 @@
 %global systemd_version                 208
 %global dbus_version                    1.4.0
 %global with_gtk_doc                    1
-%global libblockdev_version             3.2
+%global libblockdev_version             3.4
 
 %define with_btrfs                      1
 %ifnarch %{ix86}
@@ -24,7 +24,7 @@
 
 Name:    udisks2
 Summary: Disk Manager
-Version: 2.10.91
+Version: 2.11.0
 Release: 1%{?dist}
 License: GPL-2.0-or-later
 URL:     https://github.com/storaged-project/udisks
@@ -340,6 +340,9 @@ fi
 %endif
 
 %changelog
+* Thu Nov 06 2025 Tomas Bzatek <tbzatek@redhat.com> - 2.11.0-1
+- Version 2.11.0
+
 * Fri Aug 29 2025 Tomas Bzatek <tbzatek@redhat.com> - 2.10.91-1
 - Version 2.10.91
 

From ff3d7f2ec7906b9b6ba4b00e27ab5795920bdbe0 Mon Sep 17 00:00:00 2001
From: Tom spot Callaway <spotaws@amazon.com>
Date: Wed, 17 Dec 2025 13:51:06 -0500
Subject: [PATCH 23/28] rebuild for new libconfig

---
 udisks2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/udisks2.spec b/udisks2.spec
index d086c17..00db129 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -25,7 +25,7 @@
 Name:    udisks2
 Summary: Disk Manager
 Version: 2.11.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL-2.0-or-later
 URL:     https://github.com/storaged-project/udisks
 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
@@ -340,6 +340,9 @@ fi
 %endif
 
 %changelog
+* Wed Dec 17 2025 Tom Callaway <spot@fedoraproject.org> - 2.11.0-2
+- rebuild for new libconfig
+
 * Thu Nov 06 2025 Tomas Bzatek <tbzatek@redhat.com> - 2.11.0-1
 - Version 2.11.0
 

From c73f9d51f8f8363475f8a9084f0f1023c38ca8da Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 17 Jan 2026 19:32:36 +0000
Subject: [PATCH 24/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild

---
 udisks2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/udisks2.spec b/udisks2.spec
index 00db129..709be46 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -25,7 +25,7 @@
 Name:    udisks2
 Summary: Disk Manager
 Version: 2.11.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL-2.0-or-later
 URL:     https://github.com/storaged-project/udisks
 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
@@ -340,6 +340,9 @@ fi
 %endif
 
 %changelog
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
 * Wed Dec 17 2025 Tom Callaway <spot@fedoraproject.org> - 2.11.0-2
 - rebuild for new libconfig
 

From c46c30a7bb2879b397bbc4f47afb8fab65583b6f Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Wed, 25 Feb 2026 16:32:39 +0100
Subject: [PATCH 25/28] * Wed Feb 25 2026 Tomas Bzatek <tbzatek@redhat.com> -
 2.11.1-1 - Version 2.11.1 (#2442584,#2442588)

---
 .gitignore   | 1 +
 sources      | 2 +-
 udisks2.spec | 7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8df46b3..f1e025e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 /udisks-2.10.90.tar.bz2
 /udisks-2.10.91.tar.bz2
 /udisks-2.11.0.tar.bz2
+/udisks-2.11.1.tar.bz2
diff --git a/sources b/sources
index da0149d..ecae2c7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (udisks-2.11.0.tar.bz2) = ddf7bbf6d71c100ea2787aa45d51ae84d8184d33d9e0c1c8824e3da1ca34814b3278f9f74a1aab7acc37efe3ed2b702404fbb9dc3733c0accbb366a74e7d3fe5
+SHA512 (udisks-2.11.1.tar.bz2) = c2ef8c1068f109bcc858a897cb45af970442170fc8dd991d5692b463c7f4693fe4731e4e5010bc923588a7ee9f1c794630ad5fffef454a9d959bcf17e8bf704f
diff --git a/udisks2.spec b/udisks2.spec
index 709be46..dee75c8 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -24,8 +24,8 @@
 
 Name:    udisks2
 Summary: Disk Manager
-Version: 2.11.0
-Release: 3%{?dist}
+Version: 2.11.1
+Release: 1%{?dist}
 License: GPL-2.0-or-later
 URL:     https://github.com/storaged-project/udisks
 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
@@ -340,6 +340,9 @@ fi
 %endif
 
 %changelog
+* Wed Feb 25 2026 Tomas Bzatek <tbzatek@redhat.com> - 2.11.1-1
+- Version 2.11.1 (#2442584,#2442588)
+
 * Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
 

From 53368c732a9153ffc15ee14cb7ac2e674dd3cb2f Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Wed, 1 Apr 2026 16:24:56 +0200
Subject: [PATCH 26/28] * Wed Apr 01 2026 Tomas Bzatek <tbzatek@redhat.com> -
 2.11.1-2 - Use 'sys_tz' exfat mount option by default (#2403452)

---
 udisks-2.11.90-exfat_mount_opts.patch | 32 +++++++++++++++++++++++++++
 udisks2.spec                          | 10 ++++++++-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 udisks-2.11.90-exfat_mount_opts.patch

diff --git a/udisks-2.11.90-exfat_mount_opts.patch b/udisks-2.11.90-exfat_mount_opts.patch
new file mode 100644
index 0000000..2db7040
--- /dev/null
+++ b/udisks-2.11.90-exfat_mount_opts.patch
@@ -0,0 +1,32 @@
+From b86e14e97f4bbe659bef4d7aaf970df671e78a09 Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek@redhat.com>
+Date: Wed, 1 Apr 2026 16:08:37 +0200
+Subject: [PATCH] mount options: Sync exfat allowed options with the latest
+ kernel
+
+In an ideal case we'd like to have 'sys_tz' turned on by default,
+however that option was only added later and the kernel driver
+refuses unknown options, so we can't do that to maintain broad
+compatibility.
+---
+ data/builtin_mount_options.conf | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/data/builtin_mount_options.conf b/data/builtin_mount_options.conf
+index 2a09a109..d9d30422 100644
+--- a/data/builtin_mount_options.conf
++++ b/data/builtin_mount_options.conf
+@@ -4,9 +4,8 @@ allow=exec,noexec,nodev,nosuid,atime,noatime,nodiratime,relatime,strictatime,laz
+ vfat_defaults=uid=$UID,gid=$GID,shortname=mixed,utf8=1,showexec,flush
+ vfat_allow=uid=$UID,gid=$GID,flush,utf8,shortname,umask,dmask,fmask,codepage,iocharset,usefree,showexec
+ 
+-# common options for both the native kernel driver and exfat-fuse
+ exfat_defaults=uid=$UID,gid=$GID,iocharset=utf8,errors=remount-ro
+-exfat_allow=uid=$UID,gid=$GID,dmask,errors,fmask,iocharset,namecase,umask
++exfat_allow=uid=$UID,gid=$GID,umask,dmask,fmask,allow_utime,iocharset,errors,discard,keep_last_dots,sys_tz,time_offset,zero_size_dir,namecase,codepage
+ 
+ # 'ntfs' signature, definitions for the legacy ntfs kernel driver and the ntfs-3g fuse driver
+ ntfs:ntfs_defaults=uid=$UID,gid=$GID,windows_names
+-- 
+2.53.0
+
diff --git a/udisks2.spec b/udisks2.spec
index dee75c8..ba5e5b9 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -25,11 +25,15 @@
 Name:    udisks2
 Summary: Disk Manager
 Version: 2.11.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL-2.0-or-later
 URL:     https://github.com/storaged-project/udisks
 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=2403452
+# Please set sys_tz by default for udisks2 exfat mounts
+Patch0:  udisks-2.11.90-exfat_mount_opts.patch
+
 BuildRequires: make
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
@@ -197,6 +201,7 @@ rm -f src/tests/dbus-tests/config_h.py
 rm -f src/udisks-daemon-resources.{c,h}
 # default to ntfs-3g (#2182206)
 sed -i data/builtin_mount_options.conf -e 's/ntfs_drivers=ntfs3,ntfs/ntfs_drivers=ntfs,ntfs3/'
+sed -i data/builtin_mount_options.conf -e 's/exfat_defaults=uid=\$UID,gid=\$GID,iocharset=utf8,errors=remount-ro/exfat_defaults=uid=\$UID,gid=\$GID,iocharset=utf8,errors=remount-ro,sys_tz/'
 
 %build
 # autoreconf -ivf
@@ -340,6 +345,9 @@ fi
 %endif
 
 %changelog
+* Wed Apr 01 2026 Tomas Bzatek <tbzatek@redhat.com> - 2.11.1-2
+- Use 'sys_tz' exfat mount option by default (#2403452)
+
 * Wed Feb 25 2026 Tomas Bzatek <tbzatek@redhat.com> - 2.11.1-1
 - Version 2.11.1 (#2442584,#2442588)
 

From d0dc33ff9956d23d46fa78ffbcd373a7b255e958 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 17 Jul 2026 08:06:45 +0000
Subject: [PATCH 27/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

---
 udisks2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/udisks2.spec b/udisks2.spec
index ba5e5b9..5b09b20 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -25,7 +25,7 @@
 Name:    udisks2
 Summary: Disk Manager
 Version: 2.11.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL-2.0-or-later
 URL:     https://github.com/storaged-project/udisks
 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
@@ -345,6 +345,9 @@ fi
 %endif
 
 %changelog
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
 * Wed Apr 01 2026 Tomas Bzatek <tbzatek@redhat.com> - 2.11.1-2
 - Use 'sys_tz' exfat mount option by default (#2403452)
 

From d15091ac2c8016330a81de72ca8e47d1ee239f6a Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Thu, 6 Aug 2026 17:34:30 +0200
Subject: [PATCH 28/28] * Thu Aug 06 2026 Tomas Bzatek <tbzatek@redhat.com> -
 2.11.2-1 - Version 2.11.2

---
 .gitignore                            |  1 +
 sources                               |  2 +-
 udisks-2.11.90-exfat_mount_opts.patch | 32 ---------------------------
 udisks2.spec                          | 11 +++++----
 4 files changed, 7 insertions(+), 39 deletions(-)
 delete mode 100644 udisks-2.11.90-exfat_mount_opts.patch

diff --git a/.gitignore b/.gitignore
index f1e025e..9b451cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
 /udisks-2.10.91.tar.bz2
 /udisks-2.11.0.tar.bz2
 /udisks-2.11.1.tar.bz2
+/udisks-2.11.2.tar.bz2
diff --git a/sources b/sources
index ecae2c7..e41b09d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (udisks-2.11.1.tar.bz2) = c2ef8c1068f109bcc858a897cb45af970442170fc8dd991d5692b463c7f4693fe4731e4e5010bc923588a7ee9f1c794630ad5fffef454a9d959bcf17e8bf704f
+SHA512 (udisks-2.11.2.tar.bz2) = 3996ac935cb330eb7f286f25a716da52ca374b14cc7b4f2e60a7e4b0b0745559607fa8c6d1e96e777b44eb8e07eb16e1ad6bc00b3051adea14e865df3efa2662
diff --git a/udisks-2.11.90-exfat_mount_opts.patch b/udisks-2.11.90-exfat_mount_opts.patch
deleted file mode 100644
index 2db7040..0000000
--- a/udisks-2.11.90-exfat_mount_opts.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b86e14e97f4bbe659bef4d7aaf970df671e78a09 Mon Sep 17 00:00:00 2001
-From: Tomas Bzatek <tbzatek@redhat.com>
-Date: Wed, 1 Apr 2026 16:08:37 +0200
-Subject: [PATCH] mount options: Sync exfat allowed options with the latest
- kernel
-
-In an ideal case we'd like to have 'sys_tz' turned on by default,
-however that option was only added later and the kernel driver
-refuses unknown options, so we can't do that to maintain broad
-compatibility.
----
- data/builtin_mount_options.conf | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/data/builtin_mount_options.conf b/data/builtin_mount_options.conf
-index 2a09a109..d9d30422 100644
---- a/data/builtin_mount_options.conf
-+++ b/data/builtin_mount_options.conf
-@@ -4,9 +4,8 @@ allow=exec,noexec,nodev,nosuid,atime,noatime,nodiratime,relatime,strictatime,laz
- vfat_defaults=uid=$UID,gid=$GID,shortname=mixed,utf8=1,showexec,flush
- vfat_allow=uid=$UID,gid=$GID,flush,utf8,shortname,umask,dmask,fmask,codepage,iocharset,usefree,showexec
- 
--# common options for both the native kernel driver and exfat-fuse
- exfat_defaults=uid=$UID,gid=$GID,iocharset=utf8,errors=remount-ro
--exfat_allow=uid=$UID,gid=$GID,dmask,errors,fmask,iocharset,namecase,umask
-+exfat_allow=uid=$UID,gid=$GID,umask,dmask,fmask,allow_utime,iocharset,errors,discard,keep_last_dots,sys_tz,time_offset,zero_size_dir,namecase,codepage
- 
- # 'ntfs' signature, definitions for the legacy ntfs kernel driver and the ntfs-3g fuse driver
- ntfs:ntfs_defaults=uid=$UID,gid=$GID,windows_names
--- 
-2.53.0
-
diff --git a/udisks2.spec b/udisks2.spec
index 5b09b20..0d1136b 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -24,16 +24,12 @@
 
 Name:    udisks2
 Summary: Disk Manager
-Version: 2.11.1
-Release: 3%{?dist}
+Version: 2.11.2
+Release: 1%{?dist}
 License: GPL-2.0-or-later
 URL:     https://github.com/storaged-project/udisks
 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=2403452
-# Please set sys_tz by default for udisks2 exfat mounts
-Patch0:  udisks-2.11.90-exfat_mount_opts.patch
-
 BuildRequires: make
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
@@ -345,6 +341,9 @@ fi
 %endif
 
 %changelog
+* Thu Aug 06 2026 Tomas Bzatek <tbzatek@redhat.com> - 2.11.2-1
+- Version 2.11.2
+
 * Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild