diff --git a/.gitignore b/.gitignore index 9b451cd..2befe26 100644 --- a/.gitignore +++ b/.gitignore @@ -17,10 +17,3 @@ /udisks-2.9.2.tar.bz2 /udisks-2.9.3.tar.bz2 /udisks-2.9.4.tar.bz2 -/udisks-2.10.0.tar.bz2 -/udisks-2.10.1.tar.bz2 -/udisks-2.10.90.tar.bz2 -/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/ignore-apple-boot-part.patch b/ignore-apple-boot-part.patch new file mode 100644 index 0000000..0c57303 --- /dev/null +++ b/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 diff --git a/sources b/sources index e41b09d..d2ecd4a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (udisks-2.11.2.tar.bz2) = 3996ac935cb330eb7f286f25a716da52ca374b14cc7b4f2e60a7e4b0b0745559607fa8c6d1e96e777b44eb8e07eb16e1ad6bc00b3051adea14e865df3efa2662 +SHA512 (udisks-2.9.4.tar.bz2) = 35f5429bc2a7092aa659cba9296837d127e2b17c23ab23111d0d9b230d15ef5a6965e112b1f3829748a69a52fb5b09722153f86f1ef70977b3ad7b7a4ec40ec5 diff --git a/udisks2.spec b/udisks2.spec index 0d1136b..21bc3b1 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -1,43 +1,62 @@ -%global glib2_version 2.68 +%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 3.4 +%global libblockdev_version 2.25 +%define with_bcache 1 %define with_btrfs 1 -%ifnarch %{ix86} %define with_lsm 1 -%endif +%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 -%if 0%{?rhel} + +# 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 %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.11.2 +Version: 2.9.4 Release: 1%{?dist} -License: GPL-2.0-or-later +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 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: systemd-rpm-macros BuildRequires: libacl-devel BuildRequires: chrpath BuildRequires: gtk-doc @@ -50,8 +69,6 @@ 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: libblockdev-smart-devel >= %{libblockdev_version} BuildRequires: libmount-devel BuildRequires: libuuid-devel @@ -62,55 +79,48 @@ 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} -Requires: libblockdev-smart >= %{libblockdev_version} -Requires: lib%{name}%{?_isa} = %{version}-%{release} +# Needed for the systemd-related macros used in this file +%{?systemd_requires} +BuildRequires: systemd # Needed to pull in the system bus daemon 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 -Recommends: e2fsprogs +Requires: e2fsprogs # For mkfs.xfs, xfs_admin -Recommends: xfsprogs +Requires: xfsprogs # For mkfs.vfat -Recommends: dosfstools -# For exfat -Recommends: exfatprogs -# For UDF -Recommends: udftools +Requires: dosfstools +Requires: gdisk # For ejecting removable disks -Recommends: eject +Requires: eject # For utab monitor Requires: libmount -# The actual polkit agent -Requires: polkit >= %{polkit_version} -# For mkntfs (not available on rhel or on ppc/ppc64) and f2fs -%if %{is_fedora} -Recommends: f2fs-tools -Recommends: nilfs-utils +%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 -Recommends: ntfsprogs +Requires: ntfsprogs %endif %endif -Recommends: ntfs-3g - -# btrfs -%if 0%{?with_btrfs} -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} +Obsoletes: storaged %description The Udisks project provides a daemon, tools and libraries to access and @@ -118,9 +128,9 @@ manipulate disks, storage devices and technologies. %package -n lib%{name} Summary: Dynamic library to access the udisksd daemon -License: LGPL-2.0-or-later +License: LGPLv2+ Provides: libstoraged = %{version}-%{release} -Obsoletes: libstoraged < %{version}-%{release} +Obsoletes: libstoraged %description -n lib%{name} This package contains the dynamic library, which provides @@ -129,11 +139,11 @@ access to the udisksd daemon. %package -n %{name}-iscsi Summary: Module for iSCSI Requires: %{name}%{?_isa} = %{version}-%{release} -License: LGPL-2.0-or-later +License: LGPLv2+ Requires: iscsi-initiator-utils BuildRequires: iscsi-initiator-utils-devel Provides: storaged-iscsi = %{version}-%{release} -Obsoletes: storaged-iscsi < %{version}-%{release} +Obsoletes: storaged-iscsi %description -n %{name}-iscsi This package contains module for iSCSI configuration. @@ -141,12 +151,13 @@ This package contains module for iSCSI configuration. %package -n %{name}-lvm2 Summary: Module for LVM2 Requires: %{name}%{?_isa} = %{version}-%{release} -License: LGPL-2.0-or-later +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 < %{version}-%{release} +Obsoletes: storaged-lvm2 %description -n %{name}-lvm2 This package contains module for LVM2 configuration. @@ -154,23 +165,37 @@ 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: LGPL-2.0-or-later +License: LGPLv2+ Provides: libstoraged-devel = %{version}-%{release} -Obsoletes: libstoraged-devel < %{version}-%{release} +Obsoletes: libstoraged-devel %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. +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 %if 0%{?with_btrfs} %package -n %{name}-btrfs Summary: Module for BTRFS Requires: %{name}%{?_isa} = %{version}-%{release} -License: LGPL-2.0-or-later +License: LGPLv2+ Requires: libblockdev-btrfs >= %{libblockdev_version} BuildRequires: libblockdev-btrfs-devel >= %{libblockdev_version} Provides: storaged-btrfs = %{version}-%{release} -Obsoletes: storaged-btrfs < %{version}-%{release} +Obsoletes: storaged-btrfs %description -n %{name}-btrfs This package contains module for BTRFS configuration. @@ -180,27 +205,40 @@ This package contains module for BTRFS configuration. %package -n %{name}-lsm Summary: Module for LSM Requires: %{name}%{?_isa} = %{version}-%{release} -License: LGPL-2.0-or-later +License: LGPLv2+ Requires: libstoragemgmt BuildRequires: libstoragemgmt-devel BuildRequires: libconfig-devel Provides: storaged-lsm = %{version}-%{release} -Obsoletes: storaged-lsm < %{version}-%{release} +Obsoletes: storaged-lsm %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 -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 +autoreconf -ivf # modules need to be explicitly enabled %configure \ %if %{with_gtk_doc} @@ -208,12 +246,21 @@ sed -i data/builtin_mount_options.conf -e 's/exfat_defaults=uid=\$UID,gid=\$GID, %else --disable-gtk-doc \ %endif - --enable-smart \ +%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 @@ -225,9 +272,6 @@ 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 @@ -253,6 +297,21 @@ 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 @@ -266,7 +325,6 @@ 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 @@ -318,12 +376,24 @@ 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 @@ -340,87 +410,16 @@ 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 Aug 06 2026 Tomas Bzatek - 2.11.2-1 -- Version 2.11.2 - -* Fri Jul 17 2026 Fedora Release Engineering - 2.11.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Wed Apr 01 2026 Tomas Bzatek - 2.11.1-2 -- Use 'sys_tz' exfat mount option by default (#2403452) - -* Wed Feb 25 2026 Tomas Bzatek - 2.11.1-1 -- Version 2.11.1 (#2442584,#2442588) - -* Sat Jan 17 2026 Fedora Release Engineering - 2.11.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Wed Dec 17 2025 Tom Callaway - 2.11.0-2 -- rebuild for new libconfig - -* Thu Nov 06 2025 Tomas Bzatek - 2.11.0-1 -- Version 2.11.0 - -* Fri Aug 29 2025 Tomas Bzatek - 2.10.91-1 -- Version 2.10.91 - -* Fri Jul 25 2025 Fedora Release Engineering - 2.10.90-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jun 19 2025 Tomas Bzatek - 2.10.90-3 -- Harden temporary private mounts (#2373301) - -* Sun Jan 19 2025 Fedora Release Engineering - 2.10.90-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Oct 02 2024 Tomas Bzatek - 2.10.90-1 -- Version 2.10.90 - -* Sat Jul 20 2024 Fedora Release Engineering - 2.10.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Mar 01 2024 Tomas Bzatek - 2.10.1-5 -- udiskslinuxblock: Survive a missing /etc/fstab (#2264922) - -* Mon Feb 12 2024 Tomas Bzatek - 2.10.1-4 -- Use SPDX license tags for subpackages - -* Mon Feb 12 2024 Tomas Bzatek - 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 - 2.10.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Sep 07 2023 Tomas Bzatek - 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 - 2.10.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jun 29 2023 Tomas Bzatek - 2.10.0-1 -- Version 2.10.0 - -* Sat Jan 21 2023 Fedora Release Engineering - 2.9.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 2.9.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Mar 03 2022 Tomas Bzatek - 2.9.4-4 -- Fix gtk-doc annotations - -* Thu Mar 03 2022 Tomas Bzatek - 2.9.4-3 -- Require ntfs-3g (#2058506) - -* Sat Jan 22 2022 Fedora Release Engineering - 2.9.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - * Mon Oct 04 2021 Tomas Bzatek - 2.9.4-1 - Version 2.9.4 - Fixes CVE-2021-3802 (#2003650)