From 2ee78fca6483ad007feeb383e33b99f7c7a7099d Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Wed, 26 Sep 2018 09:59:01 +0200 Subject: [PATCH 1/3] 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 3ecb867131e73fad2addf09c2d31450dc4b16321 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Mon, 4 Mar 2019 17:18:23 +0100 Subject: [PATCH 2/3] Update to upstream 2.8.2 release --- sources | 2 +- udisks2.spec | 20 ++++++-------------- 2 files changed, 7 insertions(+), 15 deletions(-) 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 e9b5eb4..95cd5a8 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -58,10 +58,9 @@ Name: udisks2 Summary: Disk Manager -Version: 2.8.1 +Version: 2.8.2 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 @@ -71,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} @@ -139,7 +137,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 +147,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 +159,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 +173,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 +185,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 +199,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 +213,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 +228,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 +244,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 @@ -352,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 @@ -440,6 +429,9 @@ udevadm trigger %endif %changelog +* Mon Mar 04 2019 Tomas Bzatek - 2.8.2-1 +- Version 2.8.2 + * Wed Sep 26 2018 Vojtech Trefny - 2.8.1-1 - Version 2.8.1 From 3bfb0bfcba28c608b1742e3ded9104949969b4e9 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Tue, 23 Jul 2019 15:49:07 +0200 Subject: [PATCH 3/3] * Mon Jul 22 2019 Tomas Bzatek - 2.8.4-1 - Version 2.8.4 --- sources | 2 +- udisks2.spec | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) 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 95cd5a8..3a0d760 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 @@ -262,7 +263,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 @@ -343,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 @@ -429,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