Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -10,3 +10,10 @@
 /udisks-2.7.7.tar.bz2
 /udisks-2.8.0.tar.bz2
 /udisks-2.8.1.tar.bz2
+/udisks-2.8.2.tar.bz2
+/udisks-2.8.4.tar.bz2
+/udisks-2.9.0.tar.bz2
+/udisks-2.9.1.tar.bz2
+/udisks-2.9.2.tar.bz2
+/udisks-2.9.3.tar.bz2
+/udisks-2.9.4.tar.bz2

ignore-apple-boot-part.patch

@@ -0,0 +1,25 @@
+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.8.1.tar.bz2) = a3c7d26cd1bbd9cce59b25d118076c34482a698d7dca9e0468b6f9c928f40c8dbdd0b1cb61cf288ae77151643dc4a3eacf31e22af2c7b35a2828e49ee335e70b
+SHA512 (udisks-2.9.4.tar.bz2) = 35f5429bc2a7092aa659cba9296837d127e2b17c23ab23111d0d9b230d15ef5a6965e112b1f3829748a69a52fb5b09722153f86f1ef70977b3ad7b7a4ec40ec5

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

udisks2.spec

@@ -1,21 +1,20 @@
-%global glib2_version                   2.36
+%global glib2_version                   2.50
 %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.19
+%global libblockdev_version             2.25
 
 %define with_bcache                     1
 %define with_btrfs                      1
-%define with_vdo                        1
 %define with_lsm                        1
 %define with_zram                       1
 %define with_lvmcache                   1
 
 # valid options are 'luks1' or 'luks2'
-%define default_luks_encryption         luks1
+%define default_luks_encryption         luks2
 
 %define is_fedora                       0%{?rhel} == 0
 %define is_git                          %(git show > /dev/null 2>&1 && echo 1 || echo 0)
@@ -23,58 +22,46 @@
 %define build_date                      %(date '+%Y%m%d')
 
 
-# bcache is not available on RHEL
-%if (0%{?rhel}) || %{with_bcache} == 0
+# 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 || %{with_btrfs} == 0
+%if 0%{?rhel} > 7
 %define with_btrfs 0
 %endif
 
-# vdo is not available on Fedora
-%if (0%{?fedora}) || %{with_vdo} == 0
-%define with_vdo 0
-%endif
-
-# vdo is not available on i686
-%ifnarch x86_64 aarch64 ppc64le s390x
-%define with_vdo 0
-%endif
-
 # feature parity with existing RHEL 7 packages
 %if (0%{?rhel}) && (0%{?rhel} <= 7)
 %define with_lsm 0
-%define with_zram 0
 %define with_lvmcache 0
 %endif
 
-# default to LUKS2 for RHEL > 7
-%if 0%{?rhel} > 7
-%define default_luks_encryption luks2
-%endif
-
 
 Name:    udisks2
 Summary: Disk Manager
-Version: 2.8.1
-Release: 2%{?dist}
+Version: 2.9.4
+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
+Patch0:  ignore-apple-boot-part.patch
+Patch1:  udisks-2.10.0-doc_annotations.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}
-BuildRequires: gnome-common
 BuildRequires: libacl-devel
 BuildRequires: chrpath
 BuildRequires: gtk-doc
-BuildRequires: intltool
+BuildRequires: gettext-devel
 BuildRequires: redhat-rpm-config
 BuildRequires: libblockdev-devel        >= %{libblockdev_version}
 BuildRequires: libblockdev-part-devel   >= %{libblockdev_version}
@@ -84,6 +71,7 @@ BuildRequires: libblockdev-mdraid-devel >= %{libblockdev_version}
 BuildRequires: libblockdev-fs-devel     >= %{libblockdev_version}
 BuildRequires: libblockdev-crypto-devel >= %{libblockdev_version}
 BuildRequires: libmount-devel
+BuildRequires: libuuid-devel
 
 Requires: libblockdev        >= %{libblockdev_version}
 Requires: libblockdev-part   >= %{libblockdev_version}
@@ -117,17 +105,19 @@ Requires: eject
 # For utab monitor
 Requires: libmount
 
+%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
+%endif
+
 Requires: lib%{name}%{?_isa} = %{version}-%{release}
 
 # For mkntfs (not available on rhel or on ppc/ppc64)
 %if ! 0%{?rhel}
-%ifnarch ppc ppc64
 Requires: ntfsprogs
+Requires: ntfs-3g
 %endif
-%endif
-
-# For /proc/self/mountinfo, only available in 2.6.26 or higher
-Conflicts: kernel < 2.6.26
 
 Provides:  storaged = %{version}-%{release}
 Obsoletes: storaged
@@ -242,28 +232,15 @@ Obsoletes: storaged-zram
 This package contains module for ZRAM configuration.
 %endif
 
-%if 0%{?with_vdo}
-%package -n %{name}-vdo
-Summary: Module for VDO
-Requires: %{name}%{?_isa} = %{version}-%{release}
-License: LGPLv2+
-Requires: vdo
-Requires: libblockdev-vdo >= %{libblockdev_version}
-BuildRequires: libblockdev-vdo-devel >= %{libblockdev_version}
-
-%description -n %{name}-vdo
-This package contains module for VDO management.
-%endif
-
 %prep
-%setup -q -n udisks-%{version}
+%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
 # modules need to be explicitly enabled
 %configure            \
-    --sysconfdir=/etc \
 %if %{with_gtk_doc}
     --enable-gtk-doc  \
 %else
@@ -275,9 +252,7 @@ autoreconf -ivf
 %if 0%{?with_btrfs}
     --enable-btrfs    \
 %endif
-%if 0%{?with_vdo}
-    --enable-vdo      \
-%endif
+    --disable-vdo      \
 %if 0%{?with_zram}
     --enable-zram     \
 %endif
@@ -307,29 +282,34 @@ chrpath --delete %{buildroot}/%{_libexecdir}/udisks2/udisksd
 
 %post -n %{name}
 %systemd_post udisks2.service
-%systemd_post clean-mount-point@.service
-udevadm control --reload
-udevadm trigger
+# skip retriggering if udevd isn't even accessible, e.g. containers or
+# rpm-ostree-based systems
+if [ -S /run/udev/control ]; then
+    udevadm control --reload
+    udevadm trigger
+fi
 
 %preun -n %{name}
 %systemd_preun udisks2.service
-%systemd_preun clean-mount-point@.service
 
 %postun -n %{name}
 %systemd_postun_with_restart udisks2.service
-%systemd_postun clean-mount-point@.service
 
 %ldconfig_scriptlets -n lib%{name}
 
 %if 0%{?with_zram}
 %post -n %{name}-zram
-%systemd_post zram-setup@.service
+%systemd_post udisks2-zram-setup@.service
+if [ -S /run/udev/control ]; then
+    udevadm control --reload
+    udevadm trigger
+fi
 
 %preun -n %{name}-zram
-%systemd_preun zram-setup@.service
+%systemd_preun udisks2-zram-setup@.service
 
 %postun -n %{name}-zram
-%systemd_postun zram-setup@.service
+%systemd_postun udisks2-zram-setup@.service
 %endif
 
 %files -f udisks2.lang
@@ -341,11 +321,12 @@ udevadm trigger
 %dir %{_sysconfdir}/udisks2/modules.conf.d
 %endif
 %{_sysconfdir}/udisks2/udisks2.conf
+%{_sysconfdir}/udisks2/mount_options.conf.example
 
-%{_sysconfdir}/dbus-1/system.d/org.freedesktop.UDisks2.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.UDisks2.conf
 %{_datadir}/bash-completion/completions/udisksctl
+%{_tmpfilesdir}/%{name}.conf
 %{_unitdir}/udisks2.service
-%{_unitdir}/clean-mount-point@.service
 %{_udevrulesdir}/80-udisks2.rules
 %{_sbindir}/umount.udisks2
 
@@ -393,6 +374,20 @@ udevadm trigger
 %{_datadir}/gtk-doc/html/udisks2/*
 %endif
 %{_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
@@ -420,16 +415,93 @@ udevadm trigger
 %dir %{_sysconfdir}/udisks2/modules.conf.d
 %{_libdir}/udisks2/modules/libudisks2_zram.so
 %{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.zram.policy
-%{_unitdir}/zram-setup@.service
-%endif
-
-%if 0%{?with_vdo}
-%files -n %{name}-vdo
-%{_libdir}/udisks2/modules/libudisks2_vdo.so
-%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.vdo.policy
+%{_unitdir}/udisks2-zram-setup@.service
+%{_udevrulesdir}/90-udisks2-zram.rules
 %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
+
+* 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)
+
+* 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)
+
+* Thu Aug 05 2021 Tomas Bzatek <tbzatek@redhat.com> - 2.9.3-1
+- Version 2.9.3
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 18 2021 Tomas Bzatek <tbzatek@redhat.com> - 2.9.2-5
+- Switch the default encryption to LUKS2
+
+* Mon Apr 19 2021 Tomas Bzatek <tbzatek@redhat.com> - 2.9.2-4
+- Fix a couple of issues found by Coverity
+- Ignore systemd "Extended Boot Loader" GPT partition
+
+* Fri Mar 26 2021 Tomas Bzatek <tbzatek@redhat.com> - 2.9.2-3
+- Fix FAT mkfs with dosfstools >= 4.2
+- udiskslinuxdriveata: Use GTask to apply configuration in a thread
+- Limit allowed module names
+- 80-udisks2.rules: Ignore Apple boot partition from livecd-tools
+
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.9.2-2
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
+* Thu Feb 04 2021 Tomas Bzatek <tbzatek@redhat.com> - 2.9.2-1
+- Version 2.9.2
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Sep 07 2020 Neal Gompa <ngompa13@gmail.com> - 2.9.1-2
+- Fix conditional around polkit Recommends for building on EL7
+
+* Wed Aug 12 2020 Tomas Bzatek <tbzatek@redhat.com> - 2.9.1-1
+- Version 2.9.1
+- Renamed zram-setup@.service to udisks2-zram-setup@.service
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue May 26 2020 Tomas Bzatek <tbzatek@redhat.com> - 2.9.0-1
+- Version 2.9.0
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Oct 01 2019 Jonathan Lebon <jonathan@jlebon.com> - 2.8.4-3
+- Don't trigger udev if socket is not accessible
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Jul 22 2019 Tomas Bzatek <tbzatek@redhat.com> - 2.8.4-1
+- Version 2.8.4
+
+* Thu Jun 13 2019 Tomas Bzatek <tbzatek@redhat.com> - 2.8.3-1
+- Version 2.8.3
+
+* Fri Mar 15 2019 Debarshi Ray <rishi@fedoraproject.org> - 2.8.2-2
+- Update for tmpfiles.d snippet
+
+* Mon Mar 04 2019 Tomas Bzatek <tbzatek@redhat.com> - 2.8.2-1
+- Version 2.8.2
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild