|
|
|
|
@ -1,20 +1,21 @@
|
|
|
|
|
%global glib2_version 2.50
|
|
|
|
|
%global glib2_version 2.36
|
|
|
|
|
%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 2.19
|
|
|
|
|
|
|
|
|
|
%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 luks2
|
|
|
|
|
%define default_luks_encryption luks1
|
|
|
|
|
|
|
|
|
|
%define is_fedora 0%{?rhel} == 0
|
|
|
|
|
%define is_git %(git show > /dev/null 2>&1 && echo 1 || echo 0)
|
|
|
|
|
@ -22,35 +23,47 @@
|
|
|
|
|
%define build_date %(date '+%Y%m%d')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# bcache and zram are not available on RHEL
|
|
|
|
|
%if (0%{?rhel})
|
|
|
|
|
# bcache is not available on RHEL
|
|
|
|
|
%if (0%{?rhel}) || %{with_bcache} == 0
|
|
|
|
|
%define with_bcache 0
|
|
|
|
|
%define with_zram 0
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
# btrfs is not available on RHEL > 7
|
|
|
|
|
%if 0%{?rhel} > 7
|
|
|
|
|
%if 0%{?rhel} > 7 || %{with_btrfs} == 0
|
|
|
|
|
%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.9.4
|
|
|
|
|
Release: 6%{?dist}
|
|
|
|
|
Version: 2.8.4
|
|
|
|
|
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}
|
|
|
|
|
BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
|
|
|
|
|
BuildRequires: libgudev1-devel >= %{systemd_version}
|
|
|
|
|
@ -71,7 +84,6 @@ 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}
|
|
|
|
|
@ -105,19 +117,17 @@ 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
|
|
|
|
|
@ -232,10 +242,22 @@ 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
|
|
|
|
|
%autosetup -p1 -n udisks-%{version}
|
|
|
|
|
%setup -q -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
|
|
|
|
|
@ -252,7 +274,9 @@ autoreconf -ivf
|
|
|
|
|
%if 0%{?with_btrfs}
|
|
|
|
|
--enable-btrfs \
|
|
|
|
|
%endif
|
|
|
|
|
--disable-vdo \
|
|
|
|
|
%if 0%{?with_vdo}
|
|
|
|
|
--enable-vdo \
|
|
|
|
|
%endif
|
|
|
|
|
%if 0%{?with_zram}
|
|
|
|
|
--enable-zram \
|
|
|
|
|
%endif
|
|
|
|
|
@ -282,34 +306,29 @@ chrpath --delete %{buildroot}/%{_libexecdir}/udisks2/udisksd
|
|
|
|
|
|
|
|
|
|
%post -n %{name}
|
|
|
|
|
%systemd_post udisks2.service
|
|
|
|
|
# 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
|
|
|
|
|
%systemd_post clean-mount-point@.service
|
|
|
|
|
udevadm control --reload
|
|
|
|
|
udevadm trigger
|
|
|
|
|
|
|
|
|
|
%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 udisks2-zram-setup@.service
|
|
|
|
|
if [ -S /run/udev/control ]; then
|
|
|
|
|
udevadm control --reload
|
|
|
|
|
udevadm trigger
|
|
|
|
|
fi
|
|
|
|
|
%systemd_post zram-setup@.service
|
|
|
|
|
|
|
|
|
|
%preun -n %{name}-zram
|
|
|
|
|
%systemd_preun udisks2-zram-setup@.service
|
|
|
|
|
%systemd_preun zram-setup@.service
|
|
|
|
|
|
|
|
|
|
%postun -n %{name}-zram
|
|
|
|
|
%systemd_postun udisks2-zram-setup@.service
|
|
|
|
|
%systemd_postun zram-setup@.service
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%files -f udisks2.lang
|
|
|
|
|
@ -321,12 +340,12 @@ fi
|
|
|
|
|
%dir %{_sysconfdir}/udisks2/modules.conf.d
|
|
|
|
|
%endif
|
|
|
|
|
%{_sysconfdir}/udisks2/udisks2.conf
|
|
|
|
|
%{_sysconfdir}/udisks2/mount_options.conf.example
|
|
|
|
|
|
|
|
|
|
%{_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
|
|
|
|
|
|
|
|
|
|
@ -374,20 +393,6 @@ fi
|
|
|
|
|
%{_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
|
|
|
|
|
@ -415,81 +420,16 @@ fi
|
|
|
|
|
%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
|
|
|
|
|
%{_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
|
|
|
|
|
%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
|
|
|
|
|
|
|
|
|
|
|
Tomas Bzatek
Kalev Lember