* Thu Jun 29 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.10.0-1

- Version 2.10.0

.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

ignore-apple-boot-part.patch

@@ -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

sources

@@ -1 +1 @@
-SHA512 (udisks-2.9.4.tar.bz2) = 35f5429bc2a7092aa659cba9296837d127e2b17c23ab23111d0d9b230d15ef5a6965e112b1f3829748a69a52fb5b09722153f86f1ef70977b3ad7b7a4ec40ec5
+SHA512 (udisks-2.10.0.tar.bz2) = 3c9dc18dd5f6d61442205f4df2592ebf79211d12d71168f96e6814c2ce16f7a46cda7c0a5ccf47b7dc8b655d8af654d5a62e54b04e5b600af0b15558442cf3ed

udisks-2.10.0-doc_annotations.patch

@@ -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

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')
 
-
+# btrfs is not available on RHEL
-# bcache and zram are not available on RHEL
+%if 0%{?rhel}
-%if (0%{?rhel})
-%define with_bcache 0
-%define with_zram 0
-%endif
-
-# btrfs is not available on RHEL > 7
-%if 0%{?rhel} > 7
 %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
+Version: 2.10.0
-Release: 6%{?dist}
+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
+Requires: lib%{name}%{?_isa} = %{version}-%{release}
-%{?systemd_requires}
-BuildRequires: systemd
 
 # 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)
+# For mkntfs (not available on rhel or on ppc/ppc64) and f2fs
-# Not really needed but doesn't make much sense to use UDisks without polkit
+%if %{is_fedora}
-# (weak deps don't work on older versions of RHEL)
+Requires: f2fs-tools
-Recommends: polkit
+Requires: nilfs-utils
+%ifnarch ppc ppc64
+Requires: ntfsprogs
+%endif
 %endif
 
-Requires: lib%{name}%{?_isa} = %{version}-%{release}
+# btrfs
-
+%if 0%{?with_btrfs}
-# For mkntfs (not available on rhel or on ppc/ppc64)
+Requires: btrfs-progs
-%if ! 0%{?rhel}
-Requires: ntfsprogs
-Requires: ntfs-3g
 %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
+This package contains the development files for the library lib%{name},
-dynamic library, which provides access to the udisksd daemon.
+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
 
 %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