From 41f914199f6b54de96b45aa3f8196554f36f56c6 Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Wed, 4 Jul 2018 09:20:17 +0200 Subject: [PATCH 01/56] New udisks upstream release 2.7.7 --- .gitignore | 1 + sources | 2 +- udisks2.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7e47219..3fad943 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /udisks-2.7.4.tar.bz2 /udisks-2.7.5.tar.bz2 /udisks-2.7.6.tar.bz2 +/udisks-2.7.7.tar.bz2 diff --git a/sources b/sources index a1039d7..8844788 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (udisks-2.7.6.tar.bz2) = 29df238c6648700e8a18659ecb099baf4cdd811540856a5298439a88cffeee40ae8deb2fc312375913333dbe92fbc55131389f958a8b80efd5b2fdb5b3f11ec7 +SHA512 (udisks-2.7.7.tar.bz2) = f679feb10a4a569445538a835fc573035639ace7821b4319d2ff5be801145d74966f3bbd8c90afbd4ab02bee552af23fa23db55a5d3e7699d41a15df3477008e diff --git a/udisks2.spec b/udisks2.spec index 97fbf47..4664c29 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -5,7 +5,7 @@ %global libatasmart_version 0.17 %global dbus_version 1.4.0 %global with_gtk_doc 1 -%global libblockdev_version 2.14 +%global libblockdev_version 2.18 %define is_fedora 0%{?rhel} == 0 %define is_git %(git show > /dev/null 2>&1 && echo 1 || echo 0) @@ -14,7 +14,7 @@ Name: udisks2 Summary: Disk Manager -Version: 2.7.6 +Version: 2.7.7 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -348,6 +348,9 @@ udevadm trigger %endif %changelog +* Wed Jul 04 2018 Vojtech Trefny - 2.7.7-1 +- Version 2.7.7 + * Thu Feb 08 2018 Vojtech Trefny - 2.7.6-1 - Version 2.7.6 From d2884436573806c5f0d0ba2aa2fd65e02d594177 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:09:07 +0000 Subject: [PATCH 02/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- udisks2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks2.spec b/udisks2.spec index 4664c29..031ebb7 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -15,7 +15,7 @@ Name: udisks2 Summary: Disk Manager Version: 2.7.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://github.com/storaged-project/udisks @@ -348,6 +348,9 @@ udevadm trigger %endif %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 2.7.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Jul 04 2018 Vojtech Trefny - 2.7.7-1 - Version 2.7.7 From 006dd9e3ff430c0d7a10f364774e1a90f302a408 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 24 Jul 2018 14:04:01 -0700 Subject: [PATCH 03/56] Rebuild for new libconfig --- udisks2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks2.spec b/udisks2.spec index 031ebb7..7e5fe54 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -15,7 +15,7 @@ Name: udisks2 Summary: Disk Manager Version: 2.7.7 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://github.com/storaged-project/udisks @@ -348,6 +348,9 @@ udevadm trigger %endif %changelog +* Tue Jul 24 2018 Adam Williamson - 2.7.7-3 +- Rebuild for new libconfig + * Sat Jul 14 2018 Fedora Release Engineering - 2.7.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 9699a35ff882b3277da8c7e5b79f742b376236f0 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Tue, 14 Aug 2018 12:21:50 +0200 Subject: [PATCH 04/56] Update to upstream 2.8.0 release --- .gitignore | 1 + sources | 2 +- udisks2.spec | 120 +++++++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 108 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 3fad943..79a354d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /udisks-2.7.5.tar.bz2 /udisks-2.7.6.tar.bz2 /udisks-2.7.7.tar.bz2 +/udisks-2.8.0.tar.bz2 diff --git a/sources b/sources index 8844788..96d7217 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (udisks-2.7.7.tar.bz2) = f679feb10a4a569445538a835fc573035639ace7821b4319d2ff5be801145d74966f3bbd8c90afbd4ab02bee552af23fa23db55a5d3e7699d41a15df3477008e +SHA512 (udisks-2.8.0.tar.bz2) = 3814c4c02fbadc58d9e3a6615f015d385648211f12075ce46eb0016605f102fa0c8eeca152f2e03491522b484c43039901bf8f1be2f469ac35b1b6259e7e0ceb diff --git a/udisks2.spec b/udisks2.spec index 7e5fe54..23c403a 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -5,17 +5,58 @@ %global libatasmart_version 0.17 %global dbus_version 1.4.0 %global with_gtk_doc 1 -%global libblockdev_version 2.18 +%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 luks1 %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 is not available on RHEL +%if (0%{?rhel}) || %{with_bcache} == 0 +%define with_bcache 0 +%endif + +# btrfs is not available on 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.7.7 -Release: 3%{?dist} +Version: 2.8.0 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://github.com/storaged-project/udisks @@ -144,7 +185,7 @@ Obsoletes: libstoraged-devel This package contains the development files for the library lib%{name}, a dynamic library, which provides access to the udisksd daemon. -%if %{is_fedora} +%if 0%{?with_bcache} %package -n %{name}-bcache Summary: Module for Bcache Group: System Environment/Libraries @@ -157,7 +198,9 @@ 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 Group: System Environment/Libraries @@ -170,7 +213,9 @@ Obsoletes: storaged-btrfs %description -n %{name}-btrfs This package contains module for BTRFS configuration. +%endif +%if 0%{?with_lsm} %package -n %{name}-lsm Summary: Module for LSM Group: System Environment/Libraries @@ -184,7 +229,9 @@ 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 Group: System Environment/Libraries @@ -201,11 +248,27 @@ Obsoletes: storaged-zram This package contains module for ZRAM configuration. %endif +%if 0%{?with_vdo} +%package -n %{name}-vdo +Summary: Module for VDO +Group: System Environment/Libraries +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} +sed -i udisks/udisks2.conf.in -e "s/encryption=luks1/encryption=%{default_luks_encryption}/" %build autoreconf -ivf +# modules need to be explicitly enabled %configure \ --sysconfdir=/etc \ %if %{with_gtk_doc} @@ -213,12 +276,26 @@ autoreconf -ivf %else --disable-gtk-doc \ %endif -%if %{is_fedora} - --enable-modules -%else - --enable-iscsi \ - --enable-lvm2 +%if 0%{?with_bcache} + --enable-bcache \ %endif +%if 0%{?with_btrfs} + --enable-btrfs \ +%endif +%if 0%{?with_vdo} + --enable-vdo \ +%endif +%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 make %{?_smp_mflags} %install @@ -251,7 +328,7 @@ udevadm trigger %ldconfig_scriptlets -n lib%{name} -%if %{is_fedora} +%if 0%{?with_zram} %post -n %{name}-zram %systemd_post zram-setup@.service @@ -324,22 +401,28 @@ udevadm trigger %endif %{_libdir}/pkgconfig/udisks2.pc -%if %{is_fedora} +%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 %{_libdir}/udisks2/modules/libudisks2_btrfs.so %{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.btrfs.policy +%endif +%if 0%{?with_lsm} %files -n %{name}-lsm %dir %{_sysconfdir}/udisks2/modules.conf.d %{_libdir}/udisks2/modules/libudisks2_lsm.so %{_mandir}/man5/udisks2_lsm.conf.* %{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.lsm.policy %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 @@ -347,7 +430,16 @@ udevadm trigger %{_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 +* Mon Aug 13 2018 Tomas Bzatek - 2.8.0-1 +- Version 2.8.0 + * Tue Jul 24 2018 Adam Williamson - 2.7.7-3 - Rebuild for new libconfig From fdfe30270879cd03cb4b6034c24719d35620be6c Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 14 Sep 2018 13:03:00 -0700 Subject: [PATCH 05/56] Backport PR #576 to fix udev multipath device check See https://bugzilla.redhat.com/show_bug.cgi?id=1628192 . --- ..._MULTIPATH_DEVICE_PATH-in-udev-rules.patch | 56 +++++++++++++++++++ udisks2.spec | 10 +++- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-DM_MULTIPATH_DEVICE_PATH-in-udev-rules.patch diff --git a/0001-Fix-DM_MULTIPATH_DEVICE_PATH-in-udev-rules.patch b/0001-Fix-DM_MULTIPATH_DEVICE_PATH-in-udev-rules.patch new file mode 100644 index 0000000..432da9f --- /dev/null +++ b/0001-Fix-DM_MULTIPATH_DEVICE_PATH-in-udev-rules.patch @@ -0,0 +1,56 @@ +From b3d9f04f354d2ac21964a637ef42815476b6ff78 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Thu, 13 Sep 2018 16:40:44 -0700 +Subject: [PATCH] Fix DM_MULTIPATH_DEVICE_PATH in udev rules + +As we worked out in +https://bugzilla.redhat.com/show_bug.cgi?id=1628774 , with +multipath-tools 0.7.7 or higher, DM_MULTIPATH_DEVICE_PATH gets +set to the value 0 for non-multipath devices in some cases. +Before 0.7.7, it was always either set to 1 or not set at all. +Now it can be set to 0, checks like this: + +ENV{DM_MULTIPATH_DEVICE_PATH}=="?*" + +don't work right any more, because that check will actually +match if the value is 0 (it will only not match if the var is +not set at all, or is set to an empty string). Instead we should +just check if it is set to exactly 1, otherwise assume the device +isn't multipath. + +The impact of this is I think quite limited: we only skip two +rules if this check matches, and they only affect mdraid devices. +On installed systems without any multipath devices, the bug +should not happen, because there should be no /etc/multipath.conf +and when that file doesn't exist, the multipath rules skip out +early and don't wind up setting the value to 0 ever. I think the +only cases affected by this are 'generic' environments like live +images and installers, and installed systems with multipath +devices. In both these cases there will be a /etc/multipath.conf +file, so for some devices, the multipath rules will get far +enough to set the value to 0. The consequence will be that the +UDISKS_MD_* values that these two rules try to set will not get +set for devices they *should* get set for. I'm not sure what the +further consequences of that are, if any. + +Signed-off-by: Adam Williamson +--- + data/80-udisks2.rules | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/80-udisks2.rules b/data/80-udisks2.rules +index e8f7c5ee..a64f1cb3 100644 +--- a/data/80-udisks2.rules ++++ b/data/80-udisks2.rules +@@ -10,7 +10,7 @@ + # Skip probing if not a block device or if requested by other rules + # + SUBSYSTEM!="block", GOTO="udisks_probe_end" +-ENV{DM_MULTIPATH_DEVICE_PATH}=="?*", GOTO="udisks_probe_end" ++ENV{DM_MULTIPATH_DEVICE_PATH}=="1", GOTO="udisks_probe_end" + ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="?*", GOTO="udisks_probe_end" + + # MD-RAID (aka Linux Software RAID) members +-- +2.19.0 + diff --git a/udisks2.spec b/udisks2.spec index 23c403a..3a434c1 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -56,11 +56,15 @@ Name: udisks2 Summary: Disk Manager Version: 2.8.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://github.com/storaged-project/udisks Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2 +# https://github.com/storaged-project/udisks/pull/576 +# Fix udev multipath device check for device-mapper-multipath 0.7.7+ +# https://bugzilla.redhat.com/show_bug.cgi?id=1628192 +Patch0: 0001-Fix-DM_MULTIPATH_DEVICE_PATH-in-udev-rules.patch BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version} @@ -264,6 +268,7 @@ This package contains module for VDO management. %prep %setup -q -n udisks-%{version} +%patch0 -p1 sed -i udisks/udisks2.conf.in -e "s/encryption=luks1/encryption=%{default_luks_encryption}/" %build @@ -437,6 +442,9 @@ udevadm trigger %endif %changelog +* Fri Sep 14 2018 Adam Williamson - 2.8.0-2 +- Backport PR #576 to fix udev multipath device check (see RHBZ#1628192) + * Mon Aug 13 2018 Tomas Bzatek - 2.8.0-1 - Version 2.8.0 From 504348dfdc10f949d52b321171b7e584866832e8 Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Wed, 26 Sep 2018 09:59:01 +0200 Subject: [PATCH 06/56] New udisks upstream release 2.8.1 --- .gitignore | 1 + ..._MULTIPATH_DEVICE_PATH-in-udev-rules.patch | 56 ------------------- sources | 2 +- udisks2.spec | 15 ++--- 4 files changed, 10 insertions(+), 64 deletions(-) delete mode 100644 0001-Fix-DM_MULTIPATH_DEVICE_PATH-in-udev-rules.patch diff --git a/.gitignore b/.gitignore index 79a354d..8b23a70 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /udisks-2.7.6.tar.bz2 /udisks-2.7.7.tar.bz2 /udisks-2.8.0.tar.bz2 +/udisks-2.8.1.tar.bz2 diff --git a/0001-Fix-DM_MULTIPATH_DEVICE_PATH-in-udev-rules.patch b/0001-Fix-DM_MULTIPATH_DEVICE_PATH-in-udev-rules.patch deleted file mode 100644 index 432da9f..0000000 --- a/0001-Fix-DM_MULTIPATH_DEVICE_PATH-in-udev-rules.patch +++ /dev/null @@ -1,56 +0,0 @@ -From b3d9f04f354d2ac21964a637ef42815476b6ff78 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Thu, 13 Sep 2018 16:40:44 -0700 -Subject: [PATCH] Fix DM_MULTIPATH_DEVICE_PATH in udev rules - -As we worked out in -https://bugzilla.redhat.com/show_bug.cgi?id=1628774 , with -multipath-tools 0.7.7 or higher, DM_MULTIPATH_DEVICE_PATH gets -set to the value 0 for non-multipath devices in some cases. -Before 0.7.7, it was always either set to 1 or not set at all. -Now it can be set to 0, checks like this: - -ENV{DM_MULTIPATH_DEVICE_PATH}=="?*" - -don't work right any more, because that check will actually -match if the value is 0 (it will only not match if the var is -not set at all, or is set to an empty string). Instead we should -just check if it is set to exactly 1, otherwise assume the device -isn't multipath. - -The impact of this is I think quite limited: we only skip two -rules if this check matches, and they only affect mdraid devices. -On installed systems without any multipath devices, the bug -should not happen, because there should be no /etc/multipath.conf -and when that file doesn't exist, the multipath rules skip out -early and don't wind up setting the value to 0 ever. I think the -only cases affected by this are 'generic' environments like live -images and installers, and installed systems with multipath -devices. In both these cases there will be a /etc/multipath.conf -file, so for some devices, the multipath rules will get far -enough to set the value to 0. The consequence will be that the -UDISKS_MD_* values that these two rules try to set will not get -set for devices they *should* get set for. I'm not sure what the -further consequences of that are, if any. - -Signed-off-by: Adam Williamson ---- - data/80-udisks2.rules | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/80-udisks2.rules b/data/80-udisks2.rules -index e8f7c5ee..a64f1cb3 100644 ---- a/data/80-udisks2.rules -+++ b/data/80-udisks2.rules -@@ -10,7 +10,7 @@ - # Skip probing if not a block device or if requested by other rules - # - SUBSYSTEM!="block", GOTO="udisks_probe_end" --ENV{DM_MULTIPATH_DEVICE_PATH}=="?*", GOTO="udisks_probe_end" -+ENV{DM_MULTIPATH_DEVICE_PATH}=="1", GOTO="udisks_probe_end" - ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="?*", GOTO="udisks_probe_end" - - # MD-RAID (aka Linux Software RAID) members --- -2.19.0 - diff --git a/sources b/sources index 96d7217..072088e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (udisks-2.8.0.tar.bz2) = 3814c4c02fbadc58d9e3a6615f015d385648211f12075ce46eb0016605f102fa0c8eeca152f2e03491522b484c43039901bf8f1be2f469ac35b1b6259e7e0ceb +SHA512 (udisks-2.8.1.tar.bz2) = a3c7d26cd1bbd9cce59b25d118076c34482a698d7dca9e0468b6f9c928f40c8dbdd0b1cb61cf288ae77151643dc4a3eacf31e22af2c7b35a2828e49ee335e70b diff --git a/udisks2.spec b/udisks2.spec index 3a434c1..e9b5eb4 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -18,6 +18,9 @@ %define default_luks_encryption luks1 %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 is not available on RHEL @@ -55,16 +58,12 @@ Name: udisks2 Summary: Disk Manager -Version: 2.8.0 -Release: 2%{?dist} +Version: 2.8.1 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://github.com/storaged-project/udisks Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2 -# https://github.com/storaged-project/udisks/pull/576 -# Fix udev multipath device check for device-mapper-multipath 0.7.7+ -# https://bugzilla.redhat.com/show_bug.cgi?id=1628192 -Patch0: 0001-Fix-DM_MULTIPATH_DEVICE_PATH-in-udev-rules.patch BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version} @@ -268,7 +267,6 @@ This package contains module for VDO management. %prep %setup -q -n udisks-%{version} -%patch0 -p1 sed -i udisks/udisks2.conf.in -e "s/encryption=luks1/encryption=%{default_luks_encryption}/" %build @@ -442,6 +440,9 @@ udevadm trigger %endif %changelog +* Wed Sep 26 2018 Vojtech Trefny - 2.8.1-1 +- Version 2.8.1 + * Fri Sep 14 2018 Adam Williamson - 2.8.0-2 - Backport PR #576 to fix udev multipath device check (see RHBZ#1628192) From 388b0a4c8d346dcfe4a0f8756d90fde24da01543 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:29 +0100 Subject: [PATCH 07/56] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- udisks2.spec | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/udisks2.spec b/udisks2.spec index e9b5eb4..036ef82 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -61,7 +61,6 @@ Summary: Disk Manager Version: 2.8.1 Release: 1%{?dist} License: GPLv2+ -Group: System Environment/Libraries URL: https://github.com/storaged-project/udisks Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2 @@ -139,7 +138,6 @@ manipulate disks, storage devices and technologies. %package -n lib%{name} Summary: Dynamic library to access the udisksd daemon -Group: System Environment/Libraries License: LGPLv2+ Provides: libstoraged = %{version}-%{release} Obsoletes: libstoraged @@ -150,7 +148,6 @@ access to the udisksd daemon. %package -n %{name}-iscsi Summary: Module for iSCSI -Group: System Environment/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} License: LGPLv2+ Requires: iscsi-initiator-utils @@ -163,7 +160,6 @@ This package contains module for iSCSI configuration. %package -n %{name}-lvm2 Summary: Module for LVM2 -Group: System Environment/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} License: LGPLv2+ Requires: lvm2 @@ -178,7 +174,6 @@ This package contains module for LVM2 configuration. %package -n lib%{name}-devel Summary: Development files for lib%{name} -Group: Development/Libraries Requires: lib%{name}%{?_isa} = %{version}-%{release} License: LGPLv2+ Provides: libstoraged-devel = %{version}-%{release} @@ -191,7 +186,6 @@ dynamic library, which provides access to the udisksd daemon. %if 0%{?with_bcache} %package -n %{name}-bcache Summary: Module for Bcache -Group: System Environment/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} License: LGPLv2+ Requires: libblockdev-kbd >= %{libblockdev_version} @@ -206,7 +200,6 @@ This package contains module for Bcache configuration. %if 0%{?with_btrfs} %package -n %{name}-btrfs Summary: Module for BTRFS -Group: System Environment/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} License: LGPLv2+ Requires: libblockdev-btrfs >= %{libblockdev_version} @@ -221,7 +214,6 @@ This package contains module for BTRFS configuration. %if 0%{?with_lsm} %package -n %{name}-lsm Summary: Module for LSM -Group: System Environment/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} License: LGPLv2+ Requires: libstoragemgmt @@ -237,7 +229,6 @@ This package contains module for LSM configuration. %if 0%{?with_zram} %package -n %{name}-zram Summary: Module for ZRAM -Group: System Environment/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} License: LGPLv2+ Requires: libblockdev-kbd >= %{libblockdev_version} @@ -254,7 +245,6 @@ This package contains module for ZRAM configuration. %if 0%{?with_vdo} %package -n %{name}-vdo Summary: Module for VDO -Group: System Environment/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} License: LGPLv2+ Requires: vdo From a8bcbe972de8b319da22cc72ae83073dbbc84cbe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 10:40:49 +0000 Subject: [PATCH 08/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- udisks2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks2.spec b/udisks2.spec index 036ef82..5bc39fd 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -59,7 +59,7 @@ Name: udisks2 Summary: Disk Manager Version: 2.8.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 @@ -430,6 +430,9 @@ udevadm trigger %endif %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 2.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Sep 26 2018 Vojtech Trefny - 2.8.1-1 - Version 2.8.1 From bcc3bab261199954c084e02b1c760f978b6398c4 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Mon, 4 Mar 2019 16:23:58 +0100 Subject: [PATCH 09/56] New udisks upstream release 2.8.2 --- .gitignore | 1 + sources | 2 +- udisks2.spec | 12 +++++++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 8b23a70..d8d2c87 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /udisks-2.7.7.tar.bz2 /udisks-2.8.0.tar.bz2 /udisks-2.8.1.tar.bz2 +/udisks-2.8.2.tar.bz2 diff --git a/sources b/sources index 072088e..a6a9c63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (udisks-2.8.1.tar.bz2) = a3c7d26cd1bbd9cce59b25d118076c34482a698d7dca9e0468b6f9c928f40c8dbdd0b1cb61cf288ae77151643dc4a3eacf31e22af2c7b35a2828e49ee335e70b +SHA512 (udisks-2.8.2.tar.bz2) = dc0087ed2d3ab71dc66f63f868a6e2cd0e4e7578c40b2240739cecaffd6f50f5a2cecfc7ef7df9304e291d84ab12f59a940b9fb42b34a5a60d12061e6aaffc1a diff --git a/udisks2.spec b/udisks2.spec index 5bc39fd..491b3fc 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -58,8 +58,8 @@ Name: udisks2 Summary: Disk Manager -Version: 2.8.1 -Release: 2%{?dist} +Version: 2.8.2 +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 @@ -70,11 +70,10 @@ BuildRequires: libgudev1-devel >= %{systemd_version} BuildRequires: libatasmart-devel >= %{libatasmart_version} BuildRequires: polkit-devel >= %{polkit_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} @@ -342,7 +341,7 @@ udevadm trigger %endif %{_sysconfdir}/udisks2/udisks2.conf -%{_sysconfdir}/dbus-1/system.d/org.freedesktop.UDisks2.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.UDisks2.conf %{_datadir}/bash-completion/completions/udisksctl %{_unitdir}/udisks2.service %{_unitdir}/clean-mount-point@.service @@ -430,6 +429,9 @@ udevadm trigger %endif %changelog +* Mon Mar 04 2019 Tomas Bzatek - 2.8.2-1 +- Version 2.8.2 + * Sun Feb 03 2019 Fedora Release Engineering - 2.8.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 061d7cf0986f96e6f176abd2c798c4330c52e53a Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 19 Jul 2019 11:32:30 +0300 Subject: [PATCH 10/56] Avoid hardcoding sysconfdir Just rely on %configure passing the correct value. This fixes the build for flatpak modules where sysconfdir is not /etc, but /app/etc. --- udisks2.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/udisks2.spec b/udisks2.spec index 491b3fc..a150800 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -262,7 +262,6 @@ sed -i udisks/udisks2.conf.in -e "s/encryption=luks1/encryption=%{default_luks_e autoreconf -ivf # modules need to be explicitly enabled %configure \ - --sysconfdir=/etc \ %if %{with_gtk_doc} --enable-gtk-doc \ %else From 2a86c1137c4b364ed5da740de280438bd3e85868 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Tue, 23 Jul 2019 15:00:29 +0200 Subject: [PATCH 11/56] * Mon Jul 22 2019 Tomas Bzatek - 2.8.4-1 - Version 2.8.4 --- .gitignore | 1 + sources | 2 +- udisks2.spec | 13 ++++++++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d8d2c87..042b391 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /udisks-2.8.0.tar.bz2 /udisks-2.8.1.tar.bz2 /udisks-2.8.2.tar.bz2 +/udisks-2.8.4.tar.bz2 diff --git a/sources b/sources index a6a9c63..f76a3b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (udisks-2.8.2.tar.bz2) = dc0087ed2d3ab71dc66f63f868a6e2cd0e4e7578c40b2240739cecaffd6f50f5a2cecfc7ef7df9304e291d84ab12f59a940b9fb42b34a5a60d12061e6aaffc1a +SHA512 (udisks-2.8.4.tar.bz2) = 70860e5ca9ac73d442ca67f0e0429ce2f33575d8f64945fbf06d1694b080c8b6fed8d65b2485eff0ab66eab59cdebeb9309424820a2ee82c5faaa38029e15e6c diff --git a/udisks2.spec b/udisks2.spec index a150800..820faa4 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -58,7 +58,7 @@ Name: udisks2 Summary: Disk Manager -Version: 2.8.2 +Version: 2.8.4 Release: 1%{?dist} License: GPLv2+ URL: https://github.com/storaged-project/udisks @@ -69,6 +69,7 @@ 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: libacl-devel BuildRequires: chrpath @@ -342,6 +343,7 @@ udevadm trigger %{_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 @@ -428,6 +430,15 @@ udevadm trigger %endif %changelog +* Mon Jul 22 2019 Tomas Bzatek - 2.8.4-1 +- Version 2.8.4 + +* Thu Jun 13 2019 Tomas Bzatek - 2.8.3-1 +- Version 2.8.3 + +* Fri Mar 15 2019 Debarshi Ray - 2.8.2-2 +- Update for tmpfiles.d snippet + * Mon Mar 04 2019 Tomas Bzatek - 2.8.2-1 - Version 2.8.2 From b743c2506be57577f473bc3dbbd9505975b65fd6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:20:27 +0000 Subject: [PATCH 12/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- udisks2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks2.spec b/udisks2.spec index 820faa4..b0b4521 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -59,7 +59,7 @@ Name: udisks2 Summary: Disk Manager Version: 2.8.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 @@ -430,6 +430,9 @@ udevadm trigger %endif %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 2.8.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon Jul 22 2019 Tomas Bzatek - 2.8.4-1 - Version 2.8.4 From f651544b5437457335e7b40e4c1275bc24fbbc40 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Tue, 1 Oct 2019 10:03:05 -0400 Subject: [PATCH 13/56] Don't trigger udev if socket is not accessible In container environments or rpm-ostree systems, scriptlets are not directly run on a host system. Thus, there's no point in asking udev to reload and retrigger: the host udev wouldn't see the new rules anyway. Let's just generalize this by checking if the udev socket even exists. If not, then we can't talk to `udevd` and we should just skip the reload & trigger bits. Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1753786 --- udisks2.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/udisks2.spec b/udisks2.spec index b0b4521..cc0f8fd 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -59,7 +59,7 @@ Name: udisks2 Summary: Disk Manager Version: 2.8.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 @@ -307,8 +307,12 @@ 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 @@ -430,6 +434,9 @@ udevadm trigger %endif %changelog +* Tue Oct 01 2019 Jonathan Lebon - 2.8.4-3 +- Don't trigger udev if socket is not accessible + * Sat Jul 27 2019 Fedora Release Engineering - 2.8.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 5d23da857dfe8ae2631c4d4dc1226fc3a3b4f53d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 02:27:14 +0000 Subject: [PATCH 14/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- udisks2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks2.spec b/udisks2.spec index cc0f8fd..67ce1e1 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -59,7 +59,7 @@ Name: udisks2 Summary: Disk Manager Version: 2.8.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 @@ -434,6 +434,9 @@ fi %endif %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 2.8.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Oct 01 2019 Jonathan Lebon - 2.8.4-3 - Don't trigger udev if socket is not accessible From 72f25be85a4b2a40e0ae0c524a7f005ba763c5ca Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Tue, 26 May 2020 18:01:08 +0200 Subject: [PATCH 15/56] * Tue May 26 2020 Tomas Bzatek - 2.9.0-1 - Version 2.9.0 --- .gitignore | 1 + sources | 2 +- udisks2.spec | 32 +++++++++++++++++++++++++------- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 042b391..944284a 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /udisks-2.8.1.tar.bz2 /udisks-2.8.2.tar.bz2 /udisks-2.8.4.tar.bz2 +/udisks-2.9.0.tar.bz2 diff --git a/sources b/sources index f76a3b6..615c536 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (udisks-2.8.4.tar.bz2) = 70860e5ca9ac73d442ca67f0e0429ce2f33575d8f64945fbf06d1694b080c8b6fed8d65b2485eff0ab66eab59cdebeb9309424820a2ee82c5faaa38029e15e6c +SHA512 (udisks-2.9.0.tar.bz2) = 314355c9b0cc562b2359ea77137b3f2189c48e642c67cc9d9ed07048176967b67e78dfb3190dd160db2f92e8143a4f005bf2cc1aa814388a79201705e5297d0c diff --git a/udisks2.spec b/udisks2.spec index 67ce1e1..9476d48 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -5,7 +5,7 @@ %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.24 %define with_bcache 1 %define with_btrfs 1 @@ -58,8 +58,8 @@ Name: udisks2 Summary: Disk Manager -Version: 2.8.4 -Release: 4%{?dist} +Version: 2.9.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 @@ -84,6 +84,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} @@ -306,7 +307,6 @@ chrpath --delete %{buildroot}/%{_libexecdir}/udisks2/udisksd %post -n %{name} %systemd_post udisks2.service -%systemd_post clean-mount-point@.service # skip retriggering if udevd isn't even accessible, e.g. containers or # rpm-ostree-based systems if [ -S /run/udev/control ]; then @@ -316,11 +316,9 @@ 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} @@ -344,12 +342,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 @@ -397,6 +395,23 @@ 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_vdo} +%{_libdir}/pkgconfig/udisks2-vdo.pc +%endif %if 0%{?with_bcache} %files -n %{name}-bcache @@ -434,6 +449,9 @@ fi %endif %changelog +* Tue May 26 2020 Tomas Bzatek - 2.9.0-1 +- Version 2.9.0 + * Fri Jan 31 2020 Fedora Release Engineering - 2.8.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 90c4849dd8f5d32bac14c000ea111751bf17e810 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:10:47 +0000 Subject: [PATCH 16/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- udisks2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks2.spec b/udisks2.spec index 9476d48..09dd5e1 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -59,7 +59,7 @@ Name: udisks2 Summary: Disk Manager Version: 2.9.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 @@ -449,6 +449,9 @@ fi %endif %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2.9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue May 26 2020 Tomas Bzatek - 2.9.0-1 - Version 2.9.0 From 81e8fe7195dc9a0beacd67a9cd3336e45b331436 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Wed, 12 Aug 2020 17:33:39 +0200 Subject: [PATCH 17/56] * Wed Aug 12 2020 Tomas Bzatek - 2.9.1-1 - Version 2.9.1 - Renamed zram-setup@.service to udisks2-zram-setup@.service --- .gitignore | 1 + sources | 2 +- udisks2.spec | 27 +++++++++++++++++++++------ 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 944284a..ef9f576 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /udisks-2.8.2.tar.bz2 /udisks-2.8.4.tar.bz2 /udisks-2.9.0.tar.bz2 +/udisks-2.9.1.tar.bz2 diff --git a/sources b/sources index 615c536..e711ce4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (udisks-2.9.0.tar.bz2) = 314355c9b0cc562b2359ea77137b3f2189c48e642c67cc9d9ed07048176967b67e78dfb3190dd160db2f92e8143a4f005bf2cc1aa814388a79201705e5297d0c +SHA512 (udisks-2.9.1.tar.bz2) = a360cafc65375153c5de65f817eecbc65d56a9d9167222e1adbc8f57568d15ccf7ed317e8e0b567340f250ca9247196de104442191bd069510f72dfc5ed65eb3 diff --git a/udisks2.spec b/udisks2.spec index 09dd5e1..b8ae69a 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -58,8 +58,8 @@ Name: udisks2 Summary: Disk Manager -Version: 2.9.0 -Release: 2%{?dist} +Version: 2.9.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 @@ -118,6 +118,12 @@ Requires: eject # For utab monitor Requires: libmount +%if (0%{?rhel}) && (0%{?rhel} <= 7) +# 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) @@ -324,13 +330,17 @@ fi %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 @@ -439,7 +449,8 @@ fi %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 +%{_unitdir}/udisks2-zram-setup@.service +%{_udevrulesdir}/90-udisks2-zram.rules %endif %if 0%{?with_vdo} @@ -449,6 +460,10 @@ fi %endif %changelog +* Wed Aug 12 2020 Tomas Bzatek - 2.9.1-1 +- Version 2.9.1 +- Renamed zram-setup@.service to udisks2-zram-setup@.service + * Wed Jul 29 2020 Fedora Release Engineering - 2.9.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 247c58e5e31df8409b61ea4294b576b6519a72ab Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 7 Sep 2020 17:15:02 -0400 Subject: [PATCH 18/56] Fix conditional around polkit Recommends for building on EL7 --- udisks2.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/udisks2.spec b/udisks2.spec index b8ae69a..ee37423 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -59,7 +59,7 @@ Name: udisks2 Summary: Disk Manager Version: 2.9.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 @@ -118,7 +118,7 @@ Requires: eject # For utab monitor Requires: libmount -%if (0%{?rhel}) && (0%{?rhel} <= 7) +%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 @@ -460,6 +460,9 @@ fi %endif %changelog +* Mon Sep 07 2020 Neal Gompa - 2.9.1-2 +- Fix conditional around polkit Recommends for building on EL7 + * Wed Aug 12 2020 Tomas Bzatek - 2.9.1-1 - Version 2.9.1 - Renamed zram-setup@.service to udisks2-zram-setup@.service From d9817ba5f86bc9dc651deff68b508d2191428dc8 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Wed, 21 Oct 2020 14:45:46 +0000 Subject: [PATCH 19/56] Minor conditional tweak for ELN Signed-off-by: Troy Dawson --- udisks2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/udisks2.spec b/udisks2.spec index ee37423..21b3c21 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -34,7 +34,7 @@ %endif # vdo is not available on Fedora -%if (0%{?fedora}) || %{with_vdo} == 0 +%if (0%{?fedora}) || 0%{?rhel} >= 9 || %{with_vdo} == 0 %define with_vdo 0 %endif From a4f75c79bc516ae693067e140c2513fbbba0b3a2 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Fri, 30 Oct 2020 15:39:49 +0100 Subject: [PATCH 20/56] Remove the udisks2-vdo subpackage The standalone VDO udisks2 module has been deprecated in udisks-2.9.0 and will be removed upstream soon. It has never been built for Fedora anyway so let's remove it right away. The preferred way of managing VDO devices through LVM2 is active, supported and unaffected by this change. The actual burden is on libblockdev though. --- udisks2.spec | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/udisks2.spec b/udisks2.spec index 21b3c21..d2863e2 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -9,7 +9,6 @@ %define with_bcache 1 %define with_btrfs 1 -%define with_vdo 1 %define with_lsm 1 %define with_zram 1 %define with_lvmcache 1 @@ -33,16 +32,6 @@ %define with_btrfs 0 %endif -# vdo is not available on Fedora -%if (0%{?fedora}) || 0%{?rhel} >= 9 || %{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 @@ -249,19 +238,6 @@ 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} sed -i udisks/udisks2.conf.in -e "s/encryption=luks1/encryption=%{default_luks_encryption}/" @@ -281,9 +257,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 @@ -419,9 +393,6 @@ fi %if 0%{?with_zram} %{_libdir}/pkgconfig/udisks2-zram.pc %endif -%if 0%{?with_vdo} -%{_libdir}/pkgconfig/udisks2-vdo.pc -%endif %if 0%{?with_bcache} %files -n %{name}-bcache @@ -453,12 +424,6 @@ fi %{_udevrulesdir}/90-udisks2-zram.rules %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 * Mon Sep 07 2020 Neal Gompa - 2.9.1-2 - Fix conditional around polkit Recommends for building on EL7 From 6cbde98048694788c1a7a9336618103f73106565 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:18:41 +0000 Subject: [PATCH 21/56] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- udisks2.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/udisks2.spec b/udisks2.spec index d2863e2..37d4ca5 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -53,6 +53,7 @@ License: GPLv2+ URL: https://github.com/storaged-project/udisks Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2 +BuildRequires: make BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version} BuildRequires: libgudev1-devel >= %{systemd_version} From df05017b2dbea9ff1d9305b5e43b56123538de6b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 22:34:25 +0000 Subject: [PATCH 22/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- udisks2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks2.spec b/udisks2.spec index 37d4ca5..46472b0 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -48,7 +48,7 @@ Name: udisks2 Summary: Disk Manager Version: 2.9.1 -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 @@ -426,6 +426,9 @@ fi %endif %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 2.9.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Sep 07 2020 Neal Gompa - 2.9.1-2 - Fix conditional around polkit Recommends for building on EL7 From 966314636968c734fd976f20ebc0cea04158f616 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Thu, 4 Feb 2021 17:05:27 +0100 Subject: [PATCH 23/56] * Thu Feb 04 2021 Tomas Bzatek - 2.9.2-1 - Version 2.9.2 --- .gitignore | 1 + sources | 2 +- udisks2.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index ef9f576..4e6d3b5 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /udisks-2.8.4.tar.bz2 /udisks-2.9.0.tar.bz2 /udisks-2.9.1.tar.bz2 +/udisks-2.9.2.tar.bz2 diff --git a/sources b/sources index e711ce4..5d50d1c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (udisks-2.9.1.tar.bz2) = a360cafc65375153c5de65f817eecbc65d56a9d9167222e1adbc8f57568d15ccf7ed317e8e0b567340f250ca9247196de104442191bd069510f72dfc5ed65eb3 +SHA512 (udisks-2.9.2.tar.bz2) = 73a162bbb0fd6ec1e6a79af2a01185672712d7e94eacdc1a913f559a87fc620a095fe4c8b4dacbaa12bc816f565fc966d28c2f9299104da18581d4879321aee9 diff --git a/udisks2.spec b/udisks2.spec index 46472b0..3d0064d 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -1,11 +1,11 @@ -%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.24 +%global libblockdev_version 2.25 %define with_bcache 1 %define with_btrfs 1 @@ -47,8 +47,8 @@ Name: udisks2 Summary: Disk Manager -Version: 2.9.1 -Release: 3%{?dist} +Version: 2.9.2 +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 @@ -426,6 +426,9 @@ fi %endif %changelog +* Thu Feb 04 2021 Tomas Bzatek - 2.9.2-1 +- Version 2.9.2 + * Wed Jan 27 2021 Fedora Release Engineering - 2.9.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From bec888cb71881d8f397612388e609a3ad9a524c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:12:07 +0100 Subject: [PATCH 24/56] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- udisks2.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/udisks2.spec b/udisks2.spec index 3d0064d..1a55969 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -48,7 +48,7 @@ Name: udisks2 Summary: Disk Manager Version: 2.9.2 -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 @@ -426,6 +426,10 @@ fi %endif %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.9.2-2 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Thu Feb 04 2021 Tomas Bzatek - 2.9.2-1 - Version 2.9.2 From 41209e51126c53b10a91a6f3b07482d27afd83d6 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Fri, 26 Mar 2021 18:09:54 +0100 Subject: [PATCH 25/56] * Fri Mar 26 2021 Tomas Bzatek - 2.9.2-2 - 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 --- ignore-apple-boot-part.patch | 25 ++++ udisks-2.10.0-ata_conf_apply_GTask.patch | 60 ++++++++ ...ks-2.10.0-dosfstools_4.2-reread_part.patch | 24 ++++ udisks-2.10.0-dosfstools_4.2.patch | 75 ++++++++++ udisks-2.10.0-module-names.patch | 136 ++++++++++++++++++ udisks2.spec | 17 ++- 6 files changed, 335 insertions(+), 2 deletions(-) create mode 100644 ignore-apple-boot-part.patch create mode 100644 udisks-2.10.0-ata_conf_apply_GTask.patch create mode 100644 udisks-2.10.0-dosfstools_4.2-reread_part.patch create mode 100644 udisks-2.10.0-dosfstools_4.2.patch create mode 100644 udisks-2.10.0-module-names.patch 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/udisks-2.10.0-ata_conf_apply_GTask.patch b/udisks-2.10.0-ata_conf_apply_GTask.patch new file mode 100644 index 0000000..077fada --- /dev/null +++ b/udisks-2.10.0-ata_conf_apply_GTask.patch @@ -0,0 +1,60 @@ +commit 6ff556afabd490feb6c4b29f9e91e81d64e2c0ed +Author: Tomas Bzatek +Date: Tue Mar 23 12:56:40 2021 +0100 + + udiskslinuxdriveata: Use GTask to apply configuration in a thread + + Should fix a leaking GThread without a need to join or track it anyhow. + +diff --git a/src/udiskslinuxdriveata.c b/src/udiskslinuxdriveata.c +index 5ebdcd76..2de138cd 100644 +--- a/src/udiskslinuxdriveata.c ++++ b/src/udiskslinuxdriveata.c +@@ -1625,10 +1625,13 @@ apply_conf_data_free (ApplyConfData *data) + g_free (data); + } + +-static gpointer +-apply_configuration_thread_func (gpointer user_data) ++static void ++apply_configuration_thread_func (GTask *task, ++ gpointer source_object, ++ gpointer task_data, ++ GCancellable *cancellable) + { +- ApplyConfData *data = user_data; ++ ApplyConfData *data = task_data; + UDisksDaemon *daemon; + const gchar *device_file = NULL; + gint fd = -1; +@@ -1799,8 +1802,6 @@ apply_configuration_thread_func (gpointer user_data) + out: + if (fd != -1) + close (fd); +- apply_conf_data_free (data); +- return NULL; + } + + /** +@@ -1819,6 +1820,7 @@ udisks_linux_drive_ata_apply_configuration (UDisksLinuxDriveAta *drive, + { + gboolean has_conf = FALSE; + ApplyConfData *data = NULL; ++ GTask *task; + + data = g_new0 (ApplyConfData, 1); + data->ata_pm_standby = -1; +@@ -1862,9 +1864,10 @@ udisks_linux_drive_ata_apply_configuration (UDisksLinuxDriveAta *drive, + /* this can easily take a long time and thus block (the drive may be in standby mode + * and needs to spin up) - so run it in a thread + */ +- g_thread_new ("apply-conf-thread", +- apply_configuration_thread_func, +- data); ++ task = g_task_new (data->object, NULL, NULL, NULL); ++ g_task_set_task_data (task, data, (GDestroyNotify) apply_conf_data_free); ++ g_task_run_in_thread (task, apply_configuration_thread_func); ++ g_object_unref (task); + + data = NULL; /* don't free data below */ + diff --git a/udisks-2.10.0-dosfstools_4.2-reread_part.patch b/udisks-2.10.0-dosfstools_4.2-reread_part.patch new file mode 100644 index 0000000..414c830 --- /dev/null +++ b/udisks-2.10.0-dosfstools_4.2-reread_part.patch @@ -0,0 +1,24 @@ +commit d58ebcc32b583371dd73ab7f4c7be5191674ca62 +Author: Tomas Bzatek +Date: Wed Mar 17 18:52:22 2021 +0100 + + udiskslinuxblock: Re-read partition table after creating FAT filesystem + + Might not be needed after reverting mkfs.vfat behaviour back + to the legacy way, added just as a precautionary measure. + +diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c +index 901426ad..69161b61 100644 +--- a/src/udiskslinuxblock.c ++++ b/src/udiskslinuxblock.c +@@ -2913,7 +2913,9 @@ static inline gboolean + need_partprobe_after_mkfs (const gchar *fs_type) + { + /* udftools makes fake MBR since the 2.0 release */ +- return (g_strcmp0 (fs_type, "udf") == 0); ++ /* dosfstools makes fake MBR since the 4.2 release */ ++ return (g_strcmp0 (fs_type, "udf") == 0 || ++ g_strcmp0 (fs_type, "vfat") == 0); + } + + void diff --git a/udisks-2.10.0-dosfstools_4.2.patch b/udisks-2.10.0-dosfstools_4.2.patch new file mode 100644 index 0000000..2764315 --- /dev/null +++ b/udisks-2.10.0-dosfstools_4.2.patch @@ -0,0 +1,75 @@ +commit ef1979d8cbfb8ad976de0af21a70f8c0f98fbbe9 +Author: Tomas Bzatek +Date: Wed Mar 17 18:50:19 2021 +0100 + + udiskslinuxfsinfo: Add dosfstools >= 4.2 quirks + + Reverting back the legacy behaviour with no protective (fake) MBR + created while making new FAT filesystem on an unpartitioned block device. + + Added a label clear functionality as well. + +diff --git a/src/udiskslinuxfsinfo.c b/src/udiskslinuxfsinfo.c +index 15af26c8..f18b9b80 100644 +--- a/src/udiskslinuxfsinfo.c ++++ b/src/udiskslinuxfsinfo.c +@@ -21,6 +21,8 @@ + #include + #include + ++#include ++ + #include "config.h" + #include "udiskslinuxfsinfo.h" + #include "udisksconfigmanager.h" +@@ -236,6 +238,19 @@ const FSInfo _fs_info[] = + }, + }; + ++/* workaround for dosfstools >= 4.2 */ ++static const FSInfo vfat_dosfstools_42 = ++ { ++ FS_VFAT, ++ "fatlabel $DEVICE $LABEL", ++ "fatlabel --reset $DEVICE", ++ FALSE, /* supports_online_label_rename */ ++ FALSE, /* supports_owners */ ++ "mkfs.vfat -I -n $LABEL --mbr=n $DEVICE", ++ NULL, ++ NULL, /* option_no_discard */ ++ }; ++ + /** + * get_fs_info: + * +@@ -248,6 +263,7 @@ const FSInfo _fs_info[] = + const FSInfo * + get_fs_info (const gchar *fstype) + { ++ const FSInfo *info = NULL; + guint n; + + g_return_val_if_fail (fstype != NULL, NULL); +@@ -255,10 +271,20 @@ get_fs_info (const gchar *fstype) + for (n = 0; n < sizeof(_fs_info)/sizeof(FSInfo); n++) + { + if (strcmp (_fs_info[n].fstype, fstype) == 0) +- return &_fs_info[n]; ++ { ++ info = &_fs_info[n]; ++ break; ++ } ++ } ++ ++ /* dosfstools >= 4.2 workaround */ ++ if (g_str_equal (fstype, FS_VFAT) && ++ bd_utils_check_util_version ("mkfs.vfat", "4.2", "--help", "mkfs.fat\\s+([\\d\\.]+).+", NULL)) ++ { ++ info = &vfat_dosfstools_42; + } + +- return NULL; ++ return info; + } + + /** diff --git a/udisks-2.10.0-module-names.patch b/udisks-2.10.0-module-names.patch new file mode 100644 index 0000000..a1a6619 --- /dev/null +++ b/udisks-2.10.0-module-names.patch @@ -0,0 +1,136 @@ +commit e062c17e3829f3c04c25b5f6fc17ccc4491befa8 +Author: Tomas Bzatek +Date: Tue Mar 23 16:48:08 2021 +0100 + + modules: Limit module name to alphanumeric characters and -_ separators + + A hardening feature as long as the module name is directly involved + in filename creation. + +diff --git a/doc/udisks2-sections.txt.daemon.sections.in b/doc/udisks2-sections.txt.daemon.sections.in +index 16eaf74e..204ca897 100644 +--- a/doc/udisks2-sections.txt.daemon.sections.in ++++ b/doc/udisks2-sections.txt.daemon.sections.in +@@ -312,6 +312,7 @@ udisks_daemon_util_get_free_mdraid_device + udisks_ata_identify_get_word + udisks_daemon_util_trigger_uevent + udisks_daemon_util_trigger_uevent_sync ++udisks_module_validate_name + + +
+diff --git a/src/udisksconfigmanager.c b/src/udisksconfigmanager.c +index 9558e276..5868e864 100644 +--- a/src/udisksconfigmanager.c ++++ b/src/udisksconfigmanager.c +@@ -26,6 +26,7 @@ + #include "udiskslogging.h" + #include "udisksdaemontypes.h" + #include "udisksconfigmanager.h" ++#include "udisksdaemonutil.h" + + struct _UDisksConfigManager { + GObject parent_instance; +@@ -60,6 +61,8 @@ enum + #define DEFAULTS_GROUP_NAME "defaults" + #define DEFAULTS_ENCRYPTION_KEY "encryption" + ++#define MODULES_ALL_ARG "*" ++ + static void + udisks_config_manager_get_property (GObject *object, + guint property_id, +@@ -170,7 +173,16 @@ parse_config_file (UDisksConfigManager *manager, + { + modules_tmp = modules; + for (module_i = *modules_tmp; module_i; module_i = *++modules_tmp) +- *out_modules = g_list_append (*out_modules, g_strdup (g_strstrip (module_i))); ++ { ++ g_strstrip (module_i); ++ if (! udisks_module_validate_name (module_i) && !g_str_equal (module_i, MODULES_ALL_ARG)) ++ { ++ g_warning ("Invalid module name '%s' specified in the %s config file.", ++ module_i, conf_filename); ++ continue; ++ } ++ *out_modules = g_list_append (*out_modules, g_strdup (module_i)); ++ } + g_strfreev (modules); + } + } +@@ -397,7 +409,7 @@ udisks_config_manager_get_modules_all (UDisksConfigManager *manager) + + parse_config_file (manager, NULL, NULL, &modules); + +- ret = !modules || (g_strcmp0 (modules->data, "*") == 0 && g_list_length (modules) == 1); ++ ret = !modules || (g_strcmp0 (modules->data, MODULES_ALL_ARG) == 0 && g_list_length (modules) == 1); + + g_list_free_full (modules, (GDestroyNotify) g_free); + +diff --git a/src/udisksdaemonutil.c b/src/udisksdaemonutil.c +index 60134765..1695b524 100644 +--- a/src/udisksdaemonutil.c ++++ b/src/udisksdaemonutil.c +@@ -1880,3 +1880,29 @@ udisks_daemon_util_trigger_uevent_sync (UDisksDaemon *daemon, + } + + /* ---------------------------------------------------------------------------------------------------- */ ++ ++/** ++ * udisks_module_validate_name: ++ * @module_name: A udisks2 module name. ++ * ++ * Checks the string for a valid udisks2 module name. Only alphanumeric characters ++ * along with the '-' and '_' separators are permitted. ++ * ++ * Returns: %TRUE if the string is a valid udisks2 module name, %FALSE otherwise. ++ */ ++gboolean ++udisks_module_validate_name (const gchar *module_name) ++{ ++ int i; ++ ++ for (i = 0; module_name[i] != '\0'; i++) ++ /* going ASCII, will disqualify any UTF-* string */ ++ if (! g_ascii_isalnum (module_name[i]) && ++ module_name[i] != '-' && ++ module_name[i] != '_') ++ return FALSE; ++ ++ return TRUE; ++} ++ ++/* ---------------------------------------------------------------------------------------------------- */ +diff --git a/src/udisksdaemonutil.h b/src/udisksdaemonutil.h +index 2d7ac981..df584de4 100644 +--- a/src/udisksdaemonutil.h ++++ b/src/udisksdaemonutil.h +@@ -129,6 +129,8 @@ gchar *udisks_daemon_util_get_free_mdraid_device (void); + + guint16 udisks_ata_identify_get_word (const guchar *identify_data, guint word_number); + ++gboolean udisks_module_validate_name (const gchar *module_name); ++ + /* Utility macro for policy verification. */ + #define UDISKS_DAEMON_CHECK_AUTHORIZATION(daemon, \ + object, \ +diff --git a/src/udiskslinuxmanager.c b/src/udiskslinuxmanager.c +index 8af65d97..26d8a5d7 100644 +--- a/src/udiskslinuxmanager.c ++++ b/src/udiskslinuxmanager.c +@@ -956,6 +956,15 @@ handle_enable_module (UDisksManager *object, + UDisksLinuxManager *manager = UDISKS_LINUX_MANAGER (object); + EnableModulesData *data; + ++ if (! udisks_module_validate_name (arg_name)) ++ { ++ g_dbus_method_invocation_return_error (invocation, ++ G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, ++ "Requested module name '%s' is not a valid udisks2 module name.", ++ arg_name); ++ return TRUE; ++ } ++ + if (! arg_enable) + { + /* TODO: implement proper module unloading */ diff --git a/udisks2.spec b/udisks2.spec index 1a55969..21421ee 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -48,10 +48,16 @@ Name: udisks2 Summary: Disk Manager Version: 2.9.2 -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 +Patch0: udisks-2.10.0-dosfstools_4.2.patch +Patch1: udisks-2.10.0-dosfstools_4.2-reread_part.patch +Patch2: udisks-2.10.0-module-names.patch +Patch3: udisks-2.10.0-ata_conf_apply_GTask.patch +# https://github.com/storaged-project/udisks/pull/847 +Patch4: ignore-apple-boot-part.patch BuildRequires: make BuildRequires: glib2-devel >= %{glib2_version} @@ -240,8 +246,9 @@ This package contains module for ZRAM configuration. %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 @@ -426,6 +433,12 @@ fi %endif %changelog +* Fri Mar 26 2021 Tomas Bzatek - 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 - 2.9.2-2 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 5ea57b40c2b9c5cd1f3c4565fa73a72d668103e1 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Mon, 19 Apr 2021 16:41:25 +0200 Subject: [PATCH 26/56] * Mon Apr 19 2021 Tomas Bzatek - 2.9.2-4 - Fix a couple of issues found by Coverity - Ignore systemd "Extended Boot Loader" GPT partition --- ...e-Extended-Boot-Loader-GPT-partition.patch | 29 ++++++++++++ udisks-2.10.0-g_mkdtemp-leak.patch | 32 +++++++++++++ udisks-2.10.0-mdraid-g_source_attach.patch | 44 +++++++++++++++++ udisks-2.10.0-mdraid-iochannel-data.patch | 47 +++++++++++++++++++ udisks2.spec | 18 +++++-- 5 files changed, 165 insertions(+), 5 deletions(-) create mode 100644 udisks-2.10.0-Ignore-Extended-Boot-Loader-GPT-partition.patch create mode 100644 udisks-2.10.0-g_mkdtemp-leak.patch create mode 100644 udisks-2.10.0-mdraid-g_source_attach.patch create mode 100644 udisks-2.10.0-mdraid-iochannel-data.patch diff --git a/udisks-2.10.0-Ignore-Extended-Boot-Loader-GPT-partition.patch b/udisks-2.10.0-Ignore-Extended-Boot-Loader-GPT-partition.patch new file mode 100644 index 0000000..1f98913 --- /dev/null +++ b/udisks-2.10.0-Ignore-Extended-Boot-Loader-GPT-partition.patch @@ -0,0 +1,29 @@ +From 79eed9aa35fbf1c5131b44b50b407742f68e2f61 Mon Sep 17 00:00:00 2001 +From: Florian Ziegler +Date: Sat, 17 Apr 2021 13:31:31 +0200 +Subject: [PATCH 8/8] Ignore "Extended Boot Loader" GPT partition + +--- + data/80-udisks2.rules | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/data/80-udisks2.rules b/data/80-udisks2.rules +index fb50f48a..39bfa28b 100644 +--- a/data/80-udisks2.rules ++++ b/data/80-udisks2.rules +@@ -135,6 +135,12 @@ ENV{ID_PART_ENTRY_SCHEME}=="gpt", \ + ENV{ID_PART_ENTRY_TYPE}=="c12a7328-f81f-11d2-ba4b-00a0c93ec93b|21686148-6449-6e6f-744e-656564454649|a19d880f-05fc-4d3b-a006-743f0f84911e|e6d6d379-f507-44c2-a23c-238f2a3df928|e3c9e316-0b5c-4db8-817d-f92df00215ae|de94bba4-06d1-4d40-a16a-bfd50179d6ac", \ + ENV{UDISKS_IGNORE}="1" + ++# special Extended Boot Loader partition (XBOOTLDR) ++# see https://systemd.io/BOOT_LOADER_SPECIFICATION/ ++ENV{ID_PART_ENTRY_SCHEME}=="gpt", \ ++ ENV{ID_PART_ENTRY_TYPE}=="bc13c2ff-59e6-4262-a352-b275fd6f7172", \ ++ ENV{UDISKS_IGNORE}="1" ++ + # ZFS member partitions + ENV{ID_PART_ENTRY_SCHEME}=="gpt", \ + ENV{ID_FS_TYPE}=="zfs_member", ENV{ID_PART_ENTRY_TYPE}=="6a898cc3-1dd2-11b2-99a6-080020736631", \ +-- +2.30.2 + diff --git a/udisks-2.10.0-g_mkdtemp-leak.patch b/udisks-2.10.0-g_mkdtemp-leak.patch new file mode 100644 index 0000000..58d58cd --- /dev/null +++ b/udisks-2.10.0-g_mkdtemp-leak.patch @@ -0,0 +1,32 @@ +From fcdec5d58ba2bbe6d7ecf7168ab1a11282763041 Mon Sep 17 00:00:00 2001 +From: Tomas Bzatek +Date: Fri, 16 Apr 2021 18:15:03 +0200 +Subject: [PATCH 5/8] udiskslinuxfilesystemhelpers: Fix leaking string in case + g_mkdtemp() fails + +--- + src/udiskslinuxfilesystemhelpers.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/udiskslinuxfilesystemhelpers.c b/src/udiskslinuxfilesystemhelpers.c +index 74d83152..7c5fc037 100644 +--- a/src/udiskslinuxfilesystemhelpers.c ++++ b/src/udiskslinuxfilesystemhelpers.c +@@ -142,11 +142,11 @@ take_filesystem_ownership (const gchar *device, + else + { + /* device is not mounted, we need to mount it */ +- mountpoint = g_mkdtemp (g_strdup ("/run/udisks2/temp-mount-XXXXXX")); +- if (mountpoint == NULL) ++ mountpoint = g_strdup ("/run/udisks2/temp-mount-XXXXXX"); ++ if (g_mkdtemp (mountpoint) == NULL) + { + g_set_error (error, UDISKS_ERROR, UDISKS_ERROR_FAILED, +- "Cannot create temporary mountpoint."); ++ "Cannot create temporary mountpoint: %m."); + success = FALSE; + goto out; + } +-- +2.30.2 + diff --git a/udisks-2.10.0-mdraid-g_source_attach.patch b/udisks-2.10.0-mdraid-g_source_attach.patch new file mode 100644 index 0000000..9fb9911 --- /dev/null +++ b/udisks-2.10.0-mdraid-g_source_attach.patch @@ -0,0 +1,44 @@ +From cd458666a93fe9d07f3718e88f3169f01a11a63e Mon Sep 17 00:00:00 2001 +From: Tomas Bzatek +Date: Fri, 16 Apr 2021 18:36:16 +0200 +Subject: [PATCH 7/8] udiskslinuxmdraidobject: Handle source attach failure + gracefully + +Only negligible theoretical chance to hit this, reported by Coverity. +--- + src/udiskslinuxmdraidobject.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/udiskslinuxmdraidobject.c b/src/udiskslinuxmdraidobject.c +index 20ca89c5..828c7058 100644 +--- a/src/udiskslinuxmdraidobject.c ++++ b/src/udiskslinuxmdraidobject.c +@@ -468,7 +468,8 @@ watch_attr (UDisksLinuxDevice *device, + GError *error = NULL; + gchar *path = NULL; + GIOChannel *channel = NULL; +- GSource *ret = NULL;; ++ GSource *ret = NULL; ++ guint source_id; + + g_return_val_if_fail (UDISKS_IS_LINUX_DEVICE (device), NULL); + +@@ -478,9 +479,14 @@ watch_attr (UDisksLinuxDevice *device, + { + ret = g_io_create_watch (channel, G_IO_ERR); + g_source_set_callback (ret, callback, user_data, NULL); +- g_source_attach (ret, g_main_context_get_thread_default ()); ++ source_id = g_source_attach (ret, g_main_context_get_thread_default ()); + g_source_unref (ret); + g_io_channel_unref (channel); /* the keeps a reference to this object */ ++ if (source_id == 0) ++ { ++ /* something bad happened while attaching the source */ ++ ret = NULL; ++ } + } + else + { +-- +2.30.2 + diff --git a/udisks-2.10.0-mdraid-iochannel-data.patch b/udisks-2.10.0-mdraid-iochannel-data.patch new file mode 100644 index 0000000..51daf79 --- /dev/null +++ b/udisks-2.10.0-mdraid-iochannel-data.patch @@ -0,0 +1,47 @@ +From 0353b5f2f9c586d872750423259b6ef6cc375625 Mon Sep 17 00:00:00 2001 +From: Tomas Bzatek +Date: Fri, 16 Apr 2021 18:22:46 +0200 +Subject: [PATCH 6/8] udiskslinuxmdraidobject: Optimize unused data out from + the g_io_channel_read_to_end() call + +Looking into glib sources the g_io_channel_read_to_end() function +can handle NULL output pointers just fine and since the data is thrown +right away it's pointless to have them assigned. +--- + src/udiskslinuxmdraidobject.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/src/udiskslinuxmdraidobject.c b/src/udiskslinuxmdraidobject.c +index 759ff5f4..20ca89c5 100644 +--- a/src/udiskslinuxmdraidobject.c ++++ b/src/udiskslinuxmdraidobject.c +@@ -503,8 +503,6 @@ attr_changed (GIOChannel *channel, + UDisksLinuxMDRaidObject *object = UDISKS_LINUX_MDRAID_OBJECT (user_data); + gboolean bail = FALSE; + GError *error = NULL; +- gchar *str = NULL; +- gsize len = 0; + + if (cond & ~G_IO_ERR) + goto out; +@@ -518,7 +516,7 @@ attr_changed (GIOChannel *channel, + goto out; + } + +- if (g_io_channel_read_to_end (channel, &str, &len, &error) != G_IO_STATUS_NORMAL) ++ if (g_io_channel_read_to_end (channel, NULL, NULL, &error) != G_IO_STATUS_NORMAL) + { + udisks_debug ("Error reading (uuid %s): %s (%s, %d)", + object->uuid, error->message, g_quark_to_string (error->domain), error->code); +@@ -527,8 +525,6 @@ attr_changed (GIOChannel *channel, + goto out; + } + +- g_free (str); +- + /* synthesize uevent */ + if (object->raid_device != NULL) + udisks_linux_mdraid_object_uevent (object, "change", object->raid_device, FALSE); +-- +2.30.2 + diff --git a/udisks2.spec b/udisks2.spec index 21421ee..6c77fd8 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -22,20 +22,20 @@ %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 # 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 @@ -48,7 +48,7 @@ Name: udisks2 Summary: Disk Manager Version: 2.9.2 -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 @@ -58,6 +58,10 @@ Patch2: udisks-2.10.0-module-names.patch Patch3: udisks-2.10.0-ata_conf_apply_GTask.patch # https://github.com/storaged-project/udisks/pull/847 Patch4: ignore-apple-boot-part.patch +Patch5: udisks-2.10.0-g_mkdtemp-leak.patch +Patch6: udisks-2.10.0-mdraid-iochannel-data.patch +Patch7: udisks-2.10.0-mdraid-g_source_attach.patch +Patch8: udisks-2.10.0-Ignore-Extended-Boot-Loader-GPT-partition.patch BuildRequires: make BuildRequires: glib2-devel >= %{glib2_version} @@ -433,6 +437,10 @@ fi %endif %changelog +* Mon Apr 19 2021 Tomas Bzatek - 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 - 2.9.2-3 - Fix FAT mkfs with dosfstools >= 4.2 - udiskslinuxdriveata: Use GTask to apply configuration in a thread From e8fa33443080f874d88649bb59dff2565771149b Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Fri, 18 Jun 2021 15:19:58 +0200 Subject: [PATCH 27/56] * Fri Jun 18 2021 Tomas Bzatek - 2.9.2-5 - Switch the default encryption to LUKS2 --- udisks2.spec | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/udisks2.spec b/udisks2.spec index 6c77fd8..62d8ead 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -14,7 +14,7 @@ %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) @@ -39,16 +39,11 @@ %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.2 -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 @@ -437,6 +432,9 @@ fi %endif %changelog +* Fri Jun 18 2021 Tomas Bzatek - 2.9.2-5 +- Switch the default encryption to LUKS2 + * Mon Apr 19 2021 Tomas Bzatek - 2.9.2-4 - Fix a couple of issues found by Coverity - Ignore systemd "Extended Boot Loader" GPT partition From 9eaa6ba622e3a09606f2868e64b7ade4bb8d9578 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 19:55:52 +0000 Subject: [PATCH 28/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- udisks2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks2.spec b/udisks2.spec index 62d8ead..9bf7167 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -43,7 +43,7 @@ Name: udisks2 Summary: Disk Manager Version: 2.9.2 -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 @@ -432,6 +432,9 @@ fi %endif %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2.9.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 18 2021 Tomas Bzatek - 2.9.2-5 - Switch the default encryption to LUKS2 From 32406c2c3611d80f05dc336303a8ffc7a1c78241 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Thu, 5 Aug 2021 12:21:23 +0200 Subject: [PATCH 29/56] * Thu Aug 05 2021 Tomas Bzatek - 2.9.3-1 - Version 2.9.3 --- .gitignore | 1 + sources | 2 +- ...e-Extended-Boot-Loader-GPT-partition.patch | 29 ---- udisks-2.10.0-ata_conf_apply_GTask.patch | 60 -------- ...ks-2.10.0-dosfstools_4.2-reread_part.patch | 24 ---- udisks-2.10.0-dosfstools_4.2.patch | 75 ---------- udisks-2.10.0-g_mkdtemp-leak.patch | 32 ----- udisks-2.10.0-mdraid-g_source_attach.patch | 44 ------ udisks-2.10.0-mdraid-iochannel-data.patch | 47 ------ udisks-2.10.0-module-names.patch | 136 ------------------ udisks2.spec | 21 +-- 11 files changed, 8 insertions(+), 463 deletions(-) delete mode 100644 udisks-2.10.0-Ignore-Extended-Boot-Loader-GPT-partition.patch delete mode 100644 udisks-2.10.0-ata_conf_apply_GTask.patch delete mode 100644 udisks-2.10.0-dosfstools_4.2-reread_part.patch delete mode 100644 udisks-2.10.0-dosfstools_4.2.patch delete mode 100644 udisks-2.10.0-g_mkdtemp-leak.patch delete mode 100644 udisks-2.10.0-mdraid-g_source_attach.patch delete mode 100644 udisks-2.10.0-mdraid-iochannel-data.patch delete mode 100644 udisks-2.10.0-module-names.patch diff --git a/.gitignore b/.gitignore index 4e6d3b5..ead2e15 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /udisks-2.9.0.tar.bz2 /udisks-2.9.1.tar.bz2 /udisks-2.9.2.tar.bz2 +/udisks-2.9.3.tar.bz2 diff --git a/sources b/sources index 5d50d1c..35442d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (udisks-2.9.2.tar.bz2) = 73a162bbb0fd6ec1e6a79af2a01185672712d7e94eacdc1a913f559a87fc620a095fe4c8b4dacbaa12bc816f565fc966d28c2f9299104da18581d4879321aee9 +SHA512 (udisks-2.9.3.tar.bz2) = 1ee6e982e599c6872183068dd64f9259a522dea7a91ddc3119f9bc436c9c6bf2911e61f7ae339d67d4851cb6f55ec05b6d9a4cc8c1a9f7c5d35c66b80d5ada42 diff --git a/udisks-2.10.0-Ignore-Extended-Boot-Loader-GPT-partition.patch b/udisks-2.10.0-Ignore-Extended-Boot-Loader-GPT-partition.patch deleted file mode 100644 index 1f98913..0000000 --- a/udisks-2.10.0-Ignore-Extended-Boot-Loader-GPT-partition.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 79eed9aa35fbf1c5131b44b50b407742f68e2f61 Mon Sep 17 00:00:00 2001 -From: Florian Ziegler -Date: Sat, 17 Apr 2021 13:31:31 +0200 -Subject: [PATCH 8/8] Ignore "Extended Boot Loader" GPT partition - ---- - data/80-udisks2.rules | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/data/80-udisks2.rules b/data/80-udisks2.rules -index fb50f48a..39bfa28b 100644 ---- a/data/80-udisks2.rules -+++ b/data/80-udisks2.rules -@@ -135,6 +135,12 @@ ENV{ID_PART_ENTRY_SCHEME}=="gpt", \ - ENV{ID_PART_ENTRY_TYPE}=="c12a7328-f81f-11d2-ba4b-00a0c93ec93b|21686148-6449-6e6f-744e-656564454649|a19d880f-05fc-4d3b-a006-743f0f84911e|e6d6d379-f507-44c2-a23c-238f2a3df928|e3c9e316-0b5c-4db8-817d-f92df00215ae|de94bba4-06d1-4d40-a16a-bfd50179d6ac", \ - ENV{UDISKS_IGNORE}="1" - -+# special Extended Boot Loader partition (XBOOTLDR) -+# see https://systemd.io/BOOT_LOADER_SPECIFICATION/ -+ENV{ID_PART_ENTRY_SCHEME}=="gpt", \ -+ ENV{ID_PART_ENTRY_TYPE}=="bc13c2ff-59e6-4262-a352-b275fd6f7172", \ -+ ENV{UDISKS_IGNORE}="1" -+ - # ZFS member partitions - ENV{ID_PART_ENTRY_SCHEME}=="gpt", \ - ENV{ID_FS_TYPE}=="zfs_member", ENV{ID_PART_ENTRY_TYPE}=="6a898cc3-1dd2-11b2-99a6-080020736631", \ --- -2.30.2 - diff --git a/udisks-2.10.0-ata_conf_apply_GTask.patch b/udisks-2.10.0-ata_conf_apply_GTask.patch deleted file mode 100644 index 077fada..0000000 --- a/udisks-2.10.0-ata_conf_apply_GTask.patch +++ /dev/null @@ -1,60 +0,0 @@ -commit 6ff556afabd490feb6c4b29f9e91e81d64e2c0ed -Author: Tomas Bzatek -Date: Tue Mar 23 12:56:40 2021 +0100 - - udiskslinuxdriveata: Use GTask to apply configuration in a thread - - Should fix a leaking GThread without a need to join or track it anyhow. - -diff --git a/src/udiskslinuxdriveata.c b/src/udiskslinuxdriveata.c -index 5ebdcd76..2de138cd 100644 ---- a/src/udiskslinuxdriveata.c -+++ b/src/udiskslinuxdriveata.c -@@ -1625,10 +1625,13 @@ apply_conf_data_free (ApplyConfData *data) - g_free (data); - } - --static gpointer --apply_configuration_thread_func (gpointer user_data) -+static void -+apply_configuration_thread_func (GTask *task, -+ gpointer source_object, -+ gpointer task_data, -+ GCancellable *cancellable) - { -- ApplyConfData *data = user_data; -+ ApplyConfData *data = task_data; - UDisksDaemon *daemon; - const gchar *device_file = NULL; - gint fd = -1; -@@ -1799,8 +1802,6 @@ apply_configuration_thread_func (gpointer user_data) - out: - if (fd != -1) - close (fd); -- apply_conf_data_free (data); -- return NULL; - } - - /** -@@ -1819,6 +1820,7 @@ udisks_linux_drive_ata_apply_configuration (UDisksLinuxDriveAta *drive, - { - gboolean has_conf = FALSE; - ApplyConfData *data = NULL; -+ GTask *task; - - data = g_new0 (ApplyConfData, 1); - data->ata_pm_standby = -1; -@@ -1862,9 +1864,10 @@ udisks_linux_drive_ata_apply_configuration (UDisksLinuxDriveAta *drive, - /* this can easily take a long time and thus block (the drive may be in standby mode - * and needs to spin up) - so run it in a thread - */ -- g_thread_new ("apply-conf-thread", -- apply_configuration_thread_func, -- data); -+ task = g_task_new (data->object, NULL, NULL, NULL); -+ g_task_set_task_data (task, data, (GDestroyNotify) apply_conf_data_free); -+ g_task_run_in_thread (task, apply_configuration_thread_func); -+ g_object_unref (task); - - data = NULL; /* don't free data below */ - diff --git a/udisks-2.10.0-dosfstools_4.2-reread_part.patch b/udisks-2.10.0-dosfstools_4.2-reread_part.patch deleted file mode 100644 index 414c830..0000000 --- a/udisks-2.10.0-dosfstools_4.2-reread_part.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit d58ebcc32b583371dd73ab7f4c7be5191674ca62 -Author: Tomas Bzatek -Date: Wed Mar 17 18:52:22 2021 +0100 - - udiskslinuxblock: Re-read partition table after creating FAT filesystem - - Might not be needed after reverting mkfs.vfat behaviour back - to the legacy way, added just as a precautionary measure. - -diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c -index 901426ad..69161b61 100644 ---- a/src/udiskslinuxblock.c -+++ b/src/udiskslinuxblock.c -@@ -2913,7 +2913,9 @@ static inline gboolean - need_partprobe_after_mkfs (const gchar *fs_type) - { - /* udftools makes fake MBR since the 2.0 release */ -- return (g_strcmp0 (fs_type, "udf") == 0); -+ /* dosfstools makes fake MBR since the 4.2 release */ -+ return (g_strcmp0 (fs_type, "udf") == 0 || -+ g_strcmp0 (fs_type, "vfat") == 0); - } - - void diff --git a/udisks-2.10.0-dosfstools_4.2.patch b/udisks-2.10.0-dosfstools_4.2.patch deleted file mode 100644 index 2764315..0000000 --- a/udisks-2.10.0-dosfstools_4.2.patch +++ /dev/null @@ -1,75 +0,0 @@ -commit ef1979d8cbfb8ad976de0af21a70f8c0f98fbbe9 -Author: Tomas Bzatek -Date: Wed Mar 17 18:50:19 2021 +0100 - - udiskslinuxfsinfo: Add dosfstools >= 4.2 quirks - - Reverting back the legacy behaviour with no protective (fake) MBR - created while making new FAT filesystem on an unpartitioned block device. - - Added a label clear functionality as well. - -diff --git a/src/udiskslinuxfsinfo.c b/src/udiskslinuxfsinfo.c -index 15af26c8..f18b9b80 100644 ---- a/src/udiskslinuxfsinfo.c -+++ b/src/udiskslinuxfsinfo.c -@@ -21,6 +21,8 @@ - #include - #include - -+#include -+ - #include "config.h" - #include "udiskslinuxfsinfo.h" - #include "udisksconfigmanager.h" -@@ -236,6 +238,19 @@ const FSInfo _fs_info[] = - }, - }; - -+/* workaround for dosfstools >= 4.2 */ -+static const FSInfo vfat_dosfstools_42 = -+ { -+ FS_VFAT, -+ "fatlabel $DEVICE $LABEL", -+ "fatlabel --reset $DEVICE", -+ FALSE, /* supports_online_label_rename */ -+ FALSE, /* supports_owners */ -+ "mkfs.vfat -I -n $LABEL --mbr=n $DEVICE", -+ NULL, -+ NULL, /* option_no_discard */ -+ }; -+ - /** - * get_fs_info: - * -@@ -248,6 +263,7 @@ const FSInfo _fs_info[] = - const FSInfo * - get_fs_info (const gchar *fstype) - { -+ const FSInfo *info = NULL; - guint n; - - g_return_val_if_fail (fstype != NULL, NULL); -@@ -255,10 +271,20 @@ get_fs_info (const gchar *fstype) - for (n = 0; n < sizeof(_fs_info)/sizeof(FSInfo); n++) - { - if (strcmp (_fs_info[n].fstype, fstype) == 0) -- return &_fs_info[n]; -+ { -+ info = &_fs_info[n]; -+ break; -+ } -+ } -+ -+ /* dosfstools >= 4.2 workaround */ -+ if (g_str_equal (fstype, FS_VFAT) && -+ bd_utils_check_util_version ("mkfs.vfat", "4.2", "--help", "mkfs.fat\\s+([\\d\\.]+).+", NULL)) -+ { -+ info = &vfat_dosfstools_42; - } - -- return NULL; -+ return info; - } - - /** diff --git a/udisks-2.10.0-g_mkdtemp-leak.patch b/udisks-2.10.0-g_mkdtemp-leak.patch deleted file mode 100644 index 58d58cd..0000000 --- a/udisks-2.10.0-g_mkdtemp-leak.patch +++ /dev/null @@ -1,32 +0,0 @@ -From fcdec5d58ba2bbe6d7ecf7168ab1a11282763041 Mon Sep 17 00:00:00 2001 -From: Tomas Bzatek -Date: Fri, 16 Apr 2021 18:15:03 +0200 -Subject: [PATCH 5/8] udiskslinuxfilesystemhelpers: Fix leaking string in case - g_mkdtemp() fails - ---- - src/udiskslinuxfilesystemhelpers.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/udiskslinuxfilesystemhelpers.c b/src/udiskslinuxfilesystemhelpers.c -index 74d83152..7c5fc037 100644 ---- a/src/udiskslinuxfilesystemhelpers.c -+++ b/src/udiskslinuxfilesystemhelpers.c -@@ -142,11 +142,11 @@ take_filesystem_ownership (const gchar *device, - else - { - /* device is not mounted, we need to mount it */ -- mountpoint = g_mkdtemp (g_strdup ("/run/udisks2/temp-mount-XXXXXX")); -- if (mountpoint == NULL) -+ mountpoint = g_strdup ("/run/udisks2/temp-mount-XXXXXX"); -+ if (g_mkdtemp (mountpoint) == NULL) - { - g_set_error (error, UDISKS_ERROR, UDISKS_ERROR_FAILED, -- "Cannot create temporary mountpoint."); -+ "Cannot create temporary mountpoint: %m."); - success = FALSE; - goto out; - } --- -2.30.2 - diff --git a/udisks-2.10.0-mdraid-g_source_attach.patch b/udisks-2.10.0-mdraid-g_source_attach.patch deleted file mode 100644 index 9fb9911..0000000 --- a/udisks-2.10.0-mdraid-g_source_attach.patch +++ /dev/null @@ -1,44 +0,0 @@ -From cd458666a93fe9d07f3718e88f3169f01a11a63e Mon Sep 17 00:00:00 2001 -From: Tomas Bzatek -Date: Fri, 16 Apr 2021 18:36:16 +0200 -Subject: [PATCH 7/8] udiskslinuxmdraidobject: Handle source attach failure - gracefully - -Only negligible theoretical chance to hit this, reported by Coverity. ---- - src/udiskslinuxmdraidobject.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/udiskslinuxmdraidobject.c b/src/udiskslinuxmdraidobject.c -index 20ca89c5..828c7058 100644 ---- a/src/udiskslinuxmdraidobject.c -+++ b/src/udiskslinuxmdraidobject.c -@@ -468,7 +468,8 @@ watch_attr (UDisksLinuxDevice *device, - GError *error = NULL; - gchar *path = NULL; - GIOChannel *channel = NULL; -- GSource *ret = NULL;; -+ GSource *ret = NULL; -+ guint source_id; - - g_return_val_if_fail (UDISKS_IS_LINUX_DEVICE (device), NULL); - -@@ -478,9 +479,14 @@ watch_attr (UDisksLinuxDevice *device, - { - ret = g_io_create_watch (channel, G_IO_ERR); - g_source_set_callback (ret, callback, user_data, NULL); -- g_source_attach (ret, g_main_context_get_thread_default ()); -+ source_id = g_source_attach (ret, g_main_context_get_thread_default ()); - g_source_unref (ret); - g_io_channel_unref (channel); /* the keeps a reference to this object */ -+ if (source_id == 0) -+ { -+ /* something bad happened while attaching the source */ -+ ret = NULL; -+ } - } - else - { --- -2.30.2 - diff --git a/udisks-2.10.0-mdraid-iochannel-data.patch b/udisks-2.10.0-mdraid-iochannel-data.patch deleted file mode 100644 index 51daf79..0000000 --- a/udisks-2.10.0-mdraid-iochannel-data.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0353b5f2f9c586d872750423259b6ef6cc375625 Mon Sep 17 00:00:00 2001 -From: Tomas Bzatek -Date: Fri, 16 Apr 2021 18:22:46 +0200 -Subject: [PATCH 6/8] udiskslinuxmdraidobject: Optimize unused data out from - the g_io_channel_read_to_end() call - -Looking into glib sources the g_io_channel_read_to_end() function -can handle NULL output pointers just fine and since the data is thrown -right away it's pointless to have them assigned. ---- - src/udiskslinuxmdraidobject.c | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/src/udiskslinuxmdraidobject.c b/src/udiskslinuxmdraidobject.c -index 759ff5f4..20ca89c5 100644 ---- a/src/udiskslinuxmdraidobject.c -+++ b/src/udiskslinuxmdraidobject.c -@@ -503,8 +503,6 @@ attr_changed (GIOChannel *channel, - UDisksLinuxMDRaidObject *object = UDISKS_LINUX_MDRAID_OBJECT (user_data); - gboolean bail = FALSE; - GError *error = NULL; -- gchar *str = NULL; -- gsize len = 0; - - if (cond & ~G_IO_ERR) - goto out; -@@ -518,7 +516,7 @@ attr_changed (GIOChannel *channel, - goto out; - } - -- if (g_io_channel_read_to_end (channel, &str, &len, &error) != G_IO_STATUS_NORMAL) -+ if (g_io_channel_read_to_end (channel, NULL, NULL, &error) != G_IO_STATUS_NORMAL) - { - udisks_debug ("Error reading (uuid %s): %s (%s, %d)", - object->uuid, error->message, g_quark_to_string (error->domain), error->code); -@@ -527,8 +525,6 @@ attr_changed (GIOChannel *channel, - goto out; - } - -- g_free (str); -- - /* synthesize uevent */ - if (object->raid_device != NULL) - udisks_linux_mdraid_object_uevent (object, "change", object->raid_device, FALSE); --- -2.30.2 - diff --git a/udisks-2.10.0-module-names.patch b/udisks-2.10.0-module-names.patch deleted file mode 100644 index a1a6619..0000000 --- a/udisks-2.10.0-module-names.patch +++ /dev/null @@ -1,136 +0,0 @@ -commit e062c17e3829f3c04c25b5f6fc17ccc4491befa8 -Author: Tomas Bzatek -Date: Tue Mar 23 16:48:08 2021 +0100 - - modules: Limit module name to alphanumeric characters and -_ separators - - A hardening feature as long as the module name is directly involved - in filename creation. - -diff --git a/doc/udisks2-sections.txt.daemon.sections.in b/doc/udisks2-sections.txt.daemon.sections.in -index 16eaf74e..204ca897 100644 ---- a/doc/udisks2-sections.txt.daemon.sections.in -+++ b/doc/udisks2-sections.txt.daemon.sections.in -@@ -312,6 +312,7 @@ udisks_daemon_util_get_free_mdraid_device - udisks_ata_identify_get_word - udisks_daemon_util_trigger_uevent - udisks_daemon_util_trigger_uevent_sync -+udisks_module_validate_name -
- -
-diff --git a/src/udisksconfigmanager.c b/src/udisksconfigmanager.c -index 9558e276..5868e864 100644 ---- a/src/udisksconfigmanager.c -+++ b/src/udisksconfigmanager.c -@@ -26,6 +26,7 @@ - #include "udiskslogging.h" - #include "udisksdaemontypes.h" - #include "udisksconfigmanager.h" -+#include "udisksdaemonutil.h" - - struct _UDisksConfigManager { - GObject parent_instance; -@@ -60,6 +61,8 @@ enum - #define DEFAULTS_GROUP_NAME "defaults" - #define DEFAULTS_ENCRYPTION_KEY "encryption" - -+#define MODULES_ALL_ARG "*" -+ - static void - udisks_config_manager_get_property (GObject *object, - guint property_id, -@@ -170,7 +173,16 @@ parse_config_file (UDisksConfigManager *manager, - { - modules_tmp = modules; - for (module_i = *modules_tmp; module_i; module_i = *++modules_tmp) -- *out_modules = g_list_append (*out_modules, g_strdup (g_strstrip (module_i))); -+ { -+ g_strstrip (module_i); -+ if (! udisks_module_validate_name (module_i) && !g_str_equal (module_i, MODULES_ALL_ARG)) -+ { -+ g_warning ("Invalid module name '%s' specified in the %s config file.", -+ module_i, conf_filename); -+ continue; -+ } -+ *out_modules = g_list_append (*out_modules, g_strdup (module_i)); -+ } - g_strfreev (modules); - } - } -@@ -397,7 +409,7 @@ udisks_config_manager_get_modules_all (UDisksConfigManager *manager) - - parse_config_file (manager, NULL, NULL, &modules); - -- ret = !modules || (g_strcmp0 (modules->data, "*") == 0 && g_list_length (modules) == 1); -+ ret = !modules || (g_strcmp0 (modules->data, MODULES_ALL_ARG) == 0 && g_list_length (modules) == 1); - - g_list_free_full (modules, (GDestroyNotify) g_free); - -diff --git a/src/udisksdaemonutil.c b/src/udisksdaemonutil.c -index 60134765..1695b524 100644 ---- a/src/udisksdaemonutil.c -+++ b/src/udisksdaemonutil.c -@@ -1880,3 +1880,29 @@ udisks_daemon_util_trigger_uevent_sync (UDisksDaemon *daemon, - } - - /* ---------------------------------------------------------------------------------------------------- */ -+ -+/** -+ * udisks_module_validate_name: -+ * @module_name: A udisks2 module name. -+ * -+ * Checks the string for a valid udisks2 module name. Only alphanumeric characters -+ * along with the '-' and '_' separators are permitted. -+ * -+ * Returns: %TRUE if the string is a valid udisks2 module name, %FALSE otherwise. -+ */ -+gboolean -+udisks_module_validate_name (const gchar *module_name) -+{ -+ int i; -+ -+ for (i = 0; module_name[i] != '\0'; i++) -+ /* going ASCII, will disqualify any UTF-* string */ -+ if (! g_ascii_isalnum (module_name[i]) && -+ module_name[i] != '-' && -+ module_name[i] != '_') -+ return FALSE; -+ -+ return TRUE; -+} -+ -+/* ---------------------------------------------------------------------------------------------------- */ -diff --git a/src/udisksdaemonutil.h b/src/udisksdaemonutil.h -index 2d7ac981..df584de4 100644 ---- a/src/udisksdaemonutil.h -+++ b/src/udisksdaemonutil.h -@@ -129,6 +129,8 @@ gchar *udisks_daemon_util_get_free_mdraid_device (void); - - guint16 udisks_ata_identify_get_word (const guchar *identify_data, guint word_number); - -+gboolean udisks_module_validate_name (const gchar *module_name); -+ - /* Utility macro for policy verification. */ - #define UDISKS_DAEMON_CHECK_AUTHORIZATION(daemon, \ - object, \ -diff --git a/src/udiskslinuxmanager.c b/src/udiskslinuxmanager.c -index 8af65d97..26d8a5d7 100644 ---- a/src/udiskslinuxmanager.c -+++ b/src/udiskslinuxmanager.c -@@ -956,6 +956,15 @@ handle_enable_module (UDisksManager *object, - UDisksLinuxManager *manager = UDISKS_LINUX_MANAGER (object); - EnableModulesData *data; - -+ if (! udisks_module_validate_name (arg_name)) -+ { -+ g_dbus_method_invocation_return_error (invocation, -+ G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, -+ "Requested module name '%s' is not a valid udisks2 module name.", -+ arg_name); -+ return TRUE; -+ } -+ - if (! arg_enable) - { - /* TODO: implement proper module unloading */ diff --git a/udisks2.spec b/udisks2.spec index 9bf7167..df16593 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -42,21 +42,12 @@ Name: udisks2 Summary: Disk Manager -Version: 2.9.2 -Release: 6%{?dist} +Version: 2.9.3 +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: udisks-2.10.0-dosfstools_4.2.patch -Patch1: udisks-2.10.0-dosfstools_4.2-reread_part.patch -Patch2: udisks-2.10.0-module-names.patch -Patch3: udisks-2.10.0-ata_conf_apply_GTask.patch -# https://github.com/storaged-project/udisks/pull/847 -Patch4: ignore-apple-boot-part.patch -Patch5: udisks-2.10.0-g_mkdtemp-leak.patch -Patch6: udisks-2.10.0-mdraid-iochannel-data.patch -Patch7: udisks-2.10.0-mdraid-g_source_attach.patch -Patch8: udisks-2.10.0-Ignore-Extended-Boot-Loader-GPT-partition.patch +Patch0: ignore-apple-boot-part.patch BuildRequires: make BuildRequires: glib2-devel >= %{glib2_version} @@ -128,9 +119,6 @@ Requires: ntfsprogs %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 @@ -432,6 +420,9 @@ fi %endif %changelog +* Thu Aug 05 2021 Tomas Bzatek - 2.9.3-1 +- Version 2.9.3 + * Fri Jul 23 2021 Fedora Release Engineering - 2.9.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From acb069045be694e2939a230402b689ae3abd144c Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Mon, 4 Oct 2021 16:51:36 +0200 Subject: [PATCH 30/56] * Mon Oct 04 2021 Tomas Bzatek - 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 - 2.9.4-1 +- Version 2.9.4 +- Fixes CVE-2021-3802 (#2003650) + * Thu Aug 05 2021 Tomas Bzatek - 2.9.3-1 - Version 2.9.3 From 0655c07ec99a6e4771f7044b873110cc9625bdc4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:24:50 +0000 Subject: [PATCH 31/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 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) From 48f9326f04c9b303a2253605b587485be4862a70 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Thu, 3 Mar 2022 12:39:14 +0100 Subject: [PATCH 32/56] * Thu Mar 03 2022 Tomas Bzatek - 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 - 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 From 235d323d233015d360b7ca8a20a634692f9d741f Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Thu, 3 Mar 2022 16:31:00 +0100 Subject: [PATCH 33/56] * Thu Mar 03 2022 Tomas Bzatek - 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 +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 @@ +