Compare commits
5 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
ed422951e3 | ||
|
|
163d991fc1 | ||
|
|
918d28fd93 | ||
|
|
8041e64080 | ||
|
|
ee180b4c2a |
6 changed files with 274 additions and 367 deletions
24
.gitignore
vendored
24
.gitignore
vendored
|
|
@ -1,26 +1,2 @@
|
|||
/udisks-2.6.4.tar.bz2
|
||||
/udisks-2.6.5.tar.bz2
|
||||
/udisks-2.7.0.tar.bz2
|
||||
/udisks-2.7.1.tar.bz2
|
||||
/udisks-2.7.2.tar.bz2
|
||||
/udisks-2.7.3.tar.bz2
|
||||
/udisks-2.7.4.tar.bz2
|
||||
/udisks-2.7.5.tar.bz2
|
||||
/udisks-2.7.6.tar.bz2
|
||||
/udisks-2.7.7.tar.bz2
|
||||
/udisks-2.8.0.tar.bz2
|
||||
/udisks-2.8.1.tar.bz2
|
||||
/udisks-2.8.2.tar.bz2
|
||||
/udisks-2.8.4.tar.bz2
|
||||
/udisks-2.9.0.tar.bz2
|
||||
/udisks-2.9.1.tar.bz2
|
||||
/udisks-2.9.2.tar.bz2
|
||||
/udisks-2.9.3.tar.bz2
|
||||
/udisks-2.9.4.tar.bz2
|
||||
/udisks-2.10.0.tar.bz2
|
||||
/udisks-2.10.1.tar.bz2
|
||||
/udisks-2.10.90.tar.bz2
|
||||
/udisks-2.10.91.tar.bz2
|
||||
/udisks-2.11.0.tar.bz2
|
||||
/udisks-2.11.1.tar.bz2
|
||||
/udisks-2.11.2.tar.bz2
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (udisks-2.11.2.tar.bz2) = 3996ac935cb330eb7f286f25a716da52ca374b14cc7b4f2e60a7e4b0b0745559607fa8c6d1e96e777b44eb8e07eb16e1ad6bc00b3051adea14e865df3efa2662
|
||||
SHA512 (udisks-2.6.5.tar.bz2) = 19e375aebe63d85c036d231c78dc3d7fb9511da71415e60109da12d7b7c6a687be065e3b98545691d99573cc017c9f964d2dec5301919cce6937fd8c1709b9d5
|
||||
|
|
|
|||
|
|
@ -0,0 +1,37 @@
|
|||
From c6fab8ce4149496eb03205f7ce5fe15ca72c8bb7 Mon Sep 17 00:00:00 2001
|
||||
From: Vojtech Trefny <vtrefny@redhat.com>
|
||||
Date: Mon, 19 Jun 2017 13:37:16 +0200
|
||||
Subject: [PATCH] UDisksClient: Do not try remove changed_blacklist hash table
|
||||
in finalize
|
||||
|
||||
"changed_blacklist" table is a class member and we really don't
|
||||
want to destroy it when destroying one instance of the UDisksClient.
|
||||
---
|
||||
udisks/udisksclient.c | 7 -------
|
||||
1 file changed, 7 deletions(-)
|
||||
|
||||
diff --git a/udisks/udisksclient.c b/udisks/udisksclient.c
|
||||
index e2cd9a38..e961c655 100644
|
||||
--- a/udisks/udisksclient.c
|
||||
+++ b/udisks/udisksclient.c
|
||||
@@ -127,7 +127,6 @@ static void
|
||||
udisks_client_finalize (GObject *object)
|
||||
{
|
||||
UDisksClient *client = UDISKS_CLIENT (object);
|
||||
- UDisksClientClass *client_class = UDISKS_CLIENT_GET_CLASS (client);
|
||||
|
||||
if (client->changed_timeout_source != NULL)
|
||||
g_source_destroy (client->changed_timeout_source);
|
||||
@@ -135,12 +134,6 @@ udisks_client_finalize (GObject *object)
|
||||
if (client->initialization_error != NULL)
|
||||
g_clear_error (&(client->initialization_error));
|
||||
|
||||
- if (client_class->changed_blacklist != NULL)
|
||||
- {
|
||||
- g_hash_table_destroy (client_class->changed_blacklist);
|
||||
- client_class->changed_blacklist = NULL;
|
||||
- }
|
||||
-
|
||||
/* might be NULL if failing early in the constructor */
|
||||
if (client->object_manager != NULL)
|
||||
{
|
||||
35
udisks-2.6.5-fix-changed-signal-filtering.patch
Normal file
35
udisks-2.6.5-fix-changed-signal-filtering.patch
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
From 192a17d1a89d098a8df7e8b6d1e23c1005597fd5 Mon Sep 17 00:00:00 2001
|
||||
From: Vratislav Podzimek <vpodzime@redhat.com>
|
||||
Date: Fri, 16 Jun 2017 11:59:57 +0200
|
||||
Subject: [PATCH] Fix how UDisksClient filters property changes
|
||||
|
||||
The value returned from g_strcmp0() is not a boolean. And a
|
||||
GVariantIter has to be initialized before use.
|
||||
---
|
||||
udisks/udisksclient.c | 9 +++++----
|
||||
1 file changed, 5 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/udisks/udisksclient.c b/udisks/udisksclient.c
|
||||
index ae9364d6..e2cd9a38 100644
|
||||
--- a/udisks/udisksclient.c
|
||||
+++ b/udisks/udisksclient.c
|
||||
@@ -1566,14 +1566,15 @@ on_interface_proxy_properties_changed (GDBusObjectManagerClient *manager,
|
||||
UDisksClient *client = UDISKS_CLIENT (user_data);
|
||||
UDisksClientClass *client_class = UDISKS_CLIENT_GET_CLASS (client);
|
||||
|
||||
- GVariantIter *iter = NULL;
|
||||
- const gchar *property_name = NULL;
|
||||
+ GVariantIter iter;
|
||||
+ gchar *property_name = NULL;
|
||||
|
||||
/* never emit the change signal for Job objects */
|
||||
- if (g_strcmp0 (g_dbus_proxy_get_interface_name (interface_proxy), "org.freedesktop.UDisks2.Drive.Job"))
|
||||
+ if (g_strcmp0 (g_dbus_proxy_get_interface_name (interface_proxy), "org.freedesktop.UDisks2.Drive.Job") == 0)
|
||||
return;
|
||||
|
||||
- while (g_variant_iter_next (iter, "{&sv}", &property_name, NULL))
|
||||
+ g_variant_iter_init (&iter, changed_properties);
|
||||
+ while (g_variant_iter_next (&iter, "{&sv}", &property_name, NULL))
|
||||
{
|
||||
if (! g_hash_table_contains (client_class->changed_blacklist, property_name))
|
||||
{
|
||||
60
udisks-2.6.5-fix-crypttab-name-open.patch
Normal file
60
udisks-2.6.5-fix-crypttab-name-open.patch
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
From fe99b1f8e790e0f4c466ad027a9d1a017b842d01 Mon Sep 17 00:00:00 2001
|
||||
From: Vojtech Trefny <vtrefny@redhat.com>
|
||||
Date: Mon, 4 Dec 2017 14:53:14 +0100
|
||||
Subject: [PATCH] Always try to read configuration from crypttab in
|
||||
handle_unlock
|
||||
|
||||
Even if we have passphrase from user, we still need to check
|
||||
crypttab for name and options.
|
||||
---
|
||||
src/udiskslinuxencrypted.c | 27 ++++++++++++++-------------
|
||||
1 file changed, 14 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/src/udiskslinuxencrypted.c b/src/udiskslinuxencrypted.c
|
||||
index 5789eff..16a404d 100644
|
||||
--- a/src/udiskslinuxencrypted.c
|
||||
+++ b/src/udiskslinuxencrypted.c
|
||||
@@ -325,6 +325,20 @@ handle_unlock (UDisksEncrypted *encrypted,
|
||||
goto out;
|
||||
}
|
||||
|
||||
+ /* check if in crypttab file */
|
||||
+ error = NULL;
|
||||
+ if (!check_crypttab (block,
|
||||
+ TRUE,
|
||||
+ &is_in_crypttab,
|
||||
+ &crypttab_name,
|
||||
+ &crypttab_passphrase,
|
||||
+ &crypttab_options,
|
||||
+ &error))
|
||||
+ {
|
||||
+ g_dbus_method_invocation_take_error (invocation, error);
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
/* we need the uid of the caller for the unlocked-luks file */
|
||||
error = NULL;
|
||||
if (!udisks_daemon_util_get_caller_uid_sync (daemon, invocation, NULL /* GCancellable */, &caller_uid, NULL, NULL, &error))
|
||||
@@ -345,19 +359,6 @@ handle_unlock (UDisksEncrypted *encrypted,
|
||||
}
|
||||
else
|
||||
{
|
||||
- /* check if in crypttab file */
|
||||
- error = NULL;
|
||||
- if (!check_crypttab (block,
|
||||
- TRUE,
|
||||
- &is_in_crypttab,
|
||||
- &crypttab_name,
|
||||
- &crypttab_passphrase,
|
||||
- &crypttab_options,
|
||||
- &error))
|
||||
- {
|
||||
- g_dbus_method_invocation_take_error (invocation, error);
|
||||
- goto out;
|
||||
- }
|
||||
if (is_in_crypttab && crypttab_passphrase != NULL && strlen (crypttab_passphrase) > 0)
|
||||
{
|
||||
effective_passphrase = g_string_new (crypttab_passphrase);
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
483
udisks2.spec
483
udisks2.spec
|
|
@ -1,116 +1,83 @@
|
|||
%global glib2_version 2.68
|
||||
%global glib2_version 2.36
|
||||
%global gobject_introspection_version 1.30.0
|
||||
%global polkit_version 0.102
|
||||
%global systemd_version 208
|
||||
%global libatasmart_version 0.17
|
||||
%global dbus_version 1.4.0
|
||||
%global with_gtk_doc 1
|
||||
%global libblockdev_version 3.4
|
||||
|
||||
%define with_btrfs 1
|
||||
%ifnarch %{ix86}
|
||||
%define with_lsm 1
|
||||
%endif
|
||||
%global with_libblockdev_part 1
|
||||
%global libblockdev_version 2.1
|
||||
|
||||
%define is_fedora 0%{?rhel} == 0
|
||||
%define is_git %(git show > /dev/null 2>&1 && echo 1 || echo 0)
|
||||
%define git_hash %(git log -1 --pretty=format:"%h" || true)
|
||||
%define build_date %(date '+%Y%m%d')
|
||||
|
||||
# btrfs is not available on RHEL
|
||||
%if 0%{?rhel}
|
||||
%define with_btrfs 0
|
||||
%endif
|
||||
|
||||
|
||||
Name: udisks2
|
||||
Summary: Disk Manager
|
||||
Version: 2.11.2
|
||||
Release: 1%{?dist}
|
||||
License: GPL-2.0-or-later
|
||||
Version: 2.6.5
|
||||
Release: 4%{?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
|
||||
Patch0: udisks-2.6.5-fix-changed-signal-filtering.patch
|
||||
Patch1: udisks-2.6.5-do-not-try-remove-changed_blacklist-hashtable.patch
|
||||
Patch2: udisks-2.6.5-fix-crypttab-name-open.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: glib2-devel >= %{glib2_version}
|
||||
BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
|
||||
BuildRequires: libgudev1-devel >= %{systemd_version}
|
||||
BuildRequires: libatasmart-devel >= %{libatasmart_version}
|
||||
BuildRequires: polkit-devel >= %{polkit_version}
|
||||
BuildRequires: systemd >= %{systemd_version}
|
||||
BuildRequires: systemd-devel >= %{systemd_version}
|
||||
BuildRequires: systemd-rpm-macros
|
||||
BuildRequires: gnome-common
|
||||
BuildRequires: libacl-devel
|
||||
BuildRequires: chrpath
|
||||
BuildRequires: gtk-doc
|
||||
BuildRequires: gettext-devel
|
||||
BuildRequires: intltool
|
||||
BuildRequires: redhat-rpm-config
|
||||
BuildRequires: libblockdev-devel >= %{libblockdev_version}
|
||||
BuildRequires: libblockdev-part-devel >= %{libblockdev_version}
|
||||
BuildRequires: libblockdev-loop-devel >= %{libblockdev_version}
|
||||
BuildRequires: libblockdev-swap-devel >= %{libblockdev_version}
|
||||
BuildRequires: libblockdev-mdraid-devel >= %{libblockdev_version}
|
||||
BuildRequires: libblockdev-fs-devel >= %{libblockdev_version}
|
||||
BuildRequires: libblockdev-crypto-devel >= %{libblockdev_version}
|
||||
BuildRequires: libblockdev-nvme-devel >= %{libblockdev_version}
|
||||
BuildRequires: libblockdev-smart-devel >= %{libblockdev_version}
|
||||
BuildRequires: libmount-devel
|
||||
BuildRequires: libuuid-devel
|
||||
|
||||
Requires: libblockdev >= %{libblockdev_version}
|
||||
Requires: libblockdev-part >= %{libblockdev_version}
|
||||
Requires: libblockdev-loop >= %{libblockdev_version}
|
||||
Requires: libblockdev-swap >= %{libblockdev_version}
|
||||
Requires: libblockdev-mdraid >= %{libblockdev_version}
|
||||
Requires: libblockdev-fs >= %{libblockdev_version}
|
||||
Requires: libblockdev-crypto >= %{libblockdev_version}
|
||||
Requires: libblockdev-nvme >= %{libblockdev_version}
|
||||
Requires: libblockdev-smart >= %{libblockdev_version}
|
||||
|
||||
Requires: lib%{name}%{?_isa} = %{version}-%{release}
|
||||
BuildRequires: libblockdev-part-devel >= %{libblockdev_version}
|
||||
BuildRequires: libblockdev-btrfs-devel >= %{libblockdev_version}
|
||||
BuildRequires: libblockdev-kbd-devel >= %{libblockdev_version}
|
||||
BuildRequires: libblockdev-swap-devel >= %{libblockdev_version}
|
||||
|
||||
# Needed to pull in the system bus daemon
|
||||
Requires: dbus >= %{dbus_version}
|
||||
# Needed to pull in the udev daemon
|
||||
Requires: udev >= %{systemd_version}
|
||||
Requires: systemd >= %{systemd_version}
|
||||
# We need at least this version for bugfixes/features etc.
|
||||
Requires: libatasmart >= %{libatasmart_version}
|
||||
# For mount, umount, mkswap
|
||||
Requires: util-linux
|
||||
# For mkfs.ext3, mkfs.ext3, e2label
|
||||
Recommends: e2fsprogs
|
||||
Requires: e2fsprogs
|
||||
# For mkfs.xfs, xfs_admin
|
||||
Recommends: xfsprogs
|
||||
Requires: xfsprogs
|
||||
# For mkfs.vfat
|
||||
Recommends: dosfstools
|
||||
# For exfat
|
||||
Recommends: exfatprogs
|
||||
# For UDF
|
||||
Recommends: udftools
|
||||
Requires: dosfstools
|
||||
Requires: gdisk
|
||||
# For LUKS devices
|
||||
Requires: cryptsetup-luks
|
||||
# For ejecting removable disks
|
||||
Recommends: eject
|
||||
# For utab monitor
|
||||
Requires: libmount
|
||||
# The actual polkit agent
|
||||
Requires: polkit >= %{polkit_version}
|
||||
Requires: eject
|
||||
# For MD-RAID
|
||||
Requires: mdadm
|
||||
|
||||
# For mkntfs (not available on rhel or on ppc/ppc64) and f2fs
|
||||
%if %{is_fedora}
|
||||
Recommends: f2fs-tools
|
||||
Recommends: nilfs-utils
|
||||
Requires: lib%{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
# For mkntfs (not available on rhel or on ppc/ppc64)
|
||||
%if ! 0%{?rhel}
|
||||
%ifnarch ppc ppc64
|
||||
Recommends: ntfsprogs
|
||||
Requires: ntfsprogs
|
||||
%endif
|
||||
%endif
|
||||
Recommends: ntfs-3g
|
||||
|
||||
# btrfs
|
||||
%if 0%{?with_btrfs}
|
||||
Recommends: btrfs-progs
|
||||
%endif
|
||||
|
||||
|
||||
# For /proc/self/mountinfo, only available in 2.6.26 or higher
|
||||
Conflicts: kernel < 2.6.26
|
||||
|
||||
Provides: storaged = %{version}-%{release}
|
||||
Obsoletes: storaged < %{version}-%{release}
|
||||
Obsoletes: storaged
|
||||
|
||||
%description
|
||||
The Udisks project provides a daemon, tools and libraries to access and
|
||||
|
|
@ -118,9 +85,10 @@ manipulate disks, storage devices and technologies.
|
|||
|
||||
%package -n lib%{name}
|
||||
Summary: Dynamic library to access the udisksd daemon
|
||||
License: LGPL-2.0-or-later
|
||||
Group: System Environment/Libraries
|
||||
License: LGPLv2+
|
||||
Provides: libstoraged = %{version}-%{release}
|
||||
Obsoletes: libstoraged < %{version}-%{release}
|
||||
Obsoletes: libstoraged
|
||||
|
||||
%description -n lib%{name}
|
||||
This package contains the dynamic library, which provides
|
||||
|
|
@ -128,95 +96,120 @@ access to the udisksd daemon.
|
|||
|
||||
%package -n %{name}-iscsi
|
||||
Summary: Module for iSCSI
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
License: LGPL-2.0-or-later
|
||||
License: LGPLv2+
|
||||
Requires: iscsi-initiator-utils
|
||||
BuildRequires: iscsi-initiator-utils-devel
|
||||
Provides: storaged-iscsi = %{version}-%{release}
|
||||
Obsoletes: storaged-iscsi < %{version}-%{release}
|
||||
Obsoletes: storaged-iscsi
|
||||
|
||||
%description -n %{name}-iscsi
|
||||
This package contains module for iSCSI configuration.
|
||||
|
||||
%package -n %{name}-lvm2
|
||||
Summary: Module for LVM2
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
License: LGPL-2.0-or-later
|
||||
License: LGPLv2+
|
||||
Requires: lvm2
|
||||
Requires: libblockdev-lvm >= %{libblockdev_version}
|
||||
BuildRequires: libblockdev-lvm-devel >= %{libblockdev_version}
|
||||
BuildRequires: lvm2-devel
|
||||
Provides: storaged-lvm2 = %{version}-%{release}
|
||||
Obsoletes: storaged-lvm2 < %{version}-%{release}
|
||||
Obsoletes: storaged-lvm2
|
||||
|
||||
%description -n %{name}-lvm2
|
||||
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: LGPL-2.0-or-later
|
||||
License: LGPLv2+
|
||||
Provides: libstoraged-devel = %{version}-%{release}
|
||||
Obsoletes: libstoraged-devel < %{version}-%{release}
|
||||
Obsoletes: libstoraged-devel
|
||||
|
||||
%description -n lib%{name}-devel
|
||||
This package contains the development files for the library lib%{name},
|
||||
a dynamic library, which provides access to the udisksd daemon.
|
||||
This package contains the development files for the library lib%{name}, a
|
||||
dynamic library, which provides access to the udisksd daemon.
|
||||
|
||||
%if %{is_fedora}
|
||||
%package -n %{name}-bcache
|
||||
Summary: Module for Bcache
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
License: LGPLv2+
|
||||
Requires: libblockdev-kbd
|
||||
BuildRequires: libblockdev-kbd-devel
|
||||
Provides: storaged-bcache = %{version}-%{release}
|
||||
Obsoletes: storaged-bcache
|
||||
|
||||
%description -n %{name}-bcache
|
||||
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: LGPL-2.0-or-later
|
||||
Requires: libblockdev-btrfs >= %{libblockdev_version}
|
||||
BuildRequires: libblockdev-btrfs-devel >= %{libblockdev_version}
|
||||
License: LGPLv2+
|
||||
Requires: libblockdev-btrfs
|
||||
BuildRequires: libblockdev-btrfs-devel
|
||||
Provides: storaged-btrfs = %{version}-%{release}
|
||||
Obsoletes: storaged-btrfs < %{version}-%{release}
|
||||
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
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
License: LGPL-2.0-or-later
|
||||
License: LGPLv2+
|
||||
Requires: libstoragemgmt
|
||||
BuildRequires: libstoragemgmt-devel
|
||||
BuildRequires: libconfig-devel
|
||||
Provides: storaged-lsm = %{version}-%{release}
|
||||
Obsoletes: storaged-lsm < %{version}-%{release}
|
||||
Obsoletes: storaged-lsm
|
||||
|
||||
%description -n %{name}-lsm
|
||||
This package contains module for LSM configuration.
|
||||
|
||||
%package -n %{name}-zram
|
||||
Summary: Module for ZRAM
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
License: LGPLv2+
|
||||
Requires: libblockdev-kbd
|
||||
Requires: libblockdev-swap
|
||||
BuildRequires: libblockdev-kbd-devel
|
||||
BuildRequires: libblockdev-swap-devel
|
||||
Provides: storaged-zram = %{version}-%{release}
|
||||
Obsoletes: storaged-zram
|
||||
|
||||
%description -n %{name}-zram
|
||||
This package contains module for ZRAM configuration.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n udisks-%{version}
|
||||
rm -f src/tests/dbus-tests/config_h.py
|
||||
rm -f src/udisks-daemon-resources.{c,h}
|
||||
# default to ntfs-3g (#2182206)
|
||||
sed -i data/builtin_mount_options.conf -e 's/ntfs_drivers=ntfs3,ntfs/ntfs_drivers=ntfs,ntfs3/'
|
||||
sed -i data/builtin_mount_options.conf -e 's/exfat_defaults=uid=\$UID,gid=\$GID,iocharset=utf8,errors=remount-ro/exfat_defaults=uid=\$UID,gid=\$GID,iocharset=utf8,errors=remount-ro,sys_tz/'
|
||||
%setup -q -n udisks-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
# autoreconf -ivf
|
||||
# modules need to be explicitly enabled
|
||||
autoreconf -ivf
|
||||
%configure \
|
||||
--sysconfdir=/etc \
|
||||
%if %{with_gtk_doc}
|
||||
--enable-gtk-doc \
|
||||
%else
|
||||
--disable-gtk-doc \
|
||||
%endif
|
||||
--enable-smart \
|
||||
%if 0%{?with_btrfs}
|
||||
--enable-btrfs \
|
||||
%if %{is_fedora}
|
||||
--enable-modules
|
||||
%else
|
||||
--enable-iscsi \
|
||||
--enable-lvm2
|
||||
%endif
|
||||
%if 0%{?with_lsm}
|
||||
--enable-lsm \
|
||||
%endif
|
||||
--enable-lvm2 \
|
||||
--enable-iscsi
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
|
|
@ -225,9 +218,6 @@ make install DESTDIR=%{buildroot}
|
|||
rm -fr %{buildroot}/%{_datadir}/gtk-doc/html/udisks2
|
||||
%endif
|
||||
|
||||
# not created if lsm is disabled
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/udisks2/modules.conf.d
|
||||
|
||||
find %{buildroot} -name \*.la -o -name \*.a | xargs rm
|
||||
|
||||
chrpath --delete %{buildroot}/%{_sbindir}/umount.udisks2
|
||||
|
|
@ -237,21 +227,14 @@ chrpath --delete %{buildroot}/%{_libexecdir}/udisks2/udisksd
|
|||
%find_lang udisks2
|
||||
|
||||
%post -n %{name}
|
||||
%systemd_post udisks2.service
|
||||
# skip retriggering if udevd isn't even accessible, e.g. containers or
|
||||
# rpm-ostree-based systems
|
||||
if [ -S /run/udev/control ]; then
|
||||
udevadm control --reload
|
||||
udevadm trigger
|
||||
fi
|
||||
udevadm control --reload
|
||||
udevadm trigger
|
||||
# Restart udisks2, if it's running...
|
||||
systemctl try-restart udisks2
|
||||
|
||||
%preun -n %{name}
|
||||
%systemd_preun udisks2.service
|
||||
%post -n lib%{name} -p /sbin/ldconfig
|
||||
|
||||
%postun -n %{name}
|
||||
%systemd_postun_with_restart udisks2.service
|
||||
|
||||
%ldconfig_scriptlets -n lib%{name}
|
||||
%postun -n lib%{name} -p /sbin/ldconfig
|
||||
|
||||
%files -f udisks2.lang
|
||||
%doc README.md AUTHORS NEWS HACKING
|
||||
|
|
@ -262,20 +245,14 @@ 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
|
||||
%{_sysconfdir}/dbus-1/system.d/org.freedesktop.UDisks2.conf
|
||||
%{_datadir}/bash-completion/completions/udisksctl
|
||||
%{_datadir}/zsh/site-functions/_udisks2
|
||||
%{_tmpfilesdir}/%{name}.conf
|
||||
%{_unitdir}/udisks2.service
|
||||
%{_udevrulesdir}/80-udisks2.rules
|
||||
%{_prefix}/lib/systemd/system/udisks2.service
|
||||
%{_prefix}/lib/udev/rules.d/80-udisks2.rules
|
||||
%{_sbindir}/umount.udisks2
|
||||
|
||||
|
||||
%dir %{_libdir}/udisks2
|
||||
%dir %{_libdir}/udisks2/modules
|
||||
%dir %{_libexecdir}/udisks2
|
||||
%dir %{_prefix}/lib/udisks2
|
||||
%{_libexecdir}/udisks2/udisksd
|
||||
|
||||
%{_bindir}/udisksctl
|
||||
|
|
@ -298,10 +275,19 @@ fi
|
|||
%{_libdir}/girepository-1.0/UDisks-2.0.typelib
|
||||
|
||||
%files -n %{name}-lvm2
|
||||
%dir %{_prefix}/lib/udisks2
|
||||
%dir %{_libdir}/udisks2
|
||||
%dir %{_libdir}/udisks2/lvm-nolocking
|
||||
%dir %{_libdir}/udisks2/modules
|
||||
%{_prefix}/lib/udisks2/udisks-lvm
|
||||
%{_libdir}/udisks2/lvm-nolocking/lvm.conf
|
||||
%{_libdir}/udisks2/modules/libudisks2_lvm2.so
|
||||
%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.lvm2.policy
|
||||
%{_mandir}/man8/udisks-lvm.8*
|
||||
|
||||
%files -n %{name}-iscsi
|
||||
%dir %{_libdir}/udisks2
|
||||
%dir %{_libdir}/udisks2/modules
|
||||
%{_libdir}/udisks2/modules/libudisks2_iscsi.so
|
||||
%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.iscsi.policy
|
||||
|
||||
|
|
@ -316,235 +302,48 @@ fi
|
|||
%{_datadir}/gtk-doc/html/udisks2/*
|
||||
%endif
|
||||
%{_libdir}/pkgconfig/udisks2.pc
|
||||
%{_libdir}/pkgconfig/udisks2-lvm2.pc
|
||||
%{_libdir}/pkgconfig/udisks2-iscsi.pc
|
||||
%if 0%{?with_btrfs}
|
||||
%{_libdir}/pkgconfig/udisks2-btrfs.pc
|
||||
%endif
|
||||
%if 0%{?with_lsm}
|
||||
%{_libdir}/pkgconfig/udisks2-lsm.pc
|
||||
%endif
|
||||
|
||||
%if 0%{?with_btrfs}
|
||||
%if %{is_fedora}
|
||||
%files -n %{name}-bcache
|
||||
%dir %{_libdir}/udisks2
|
||||
%dir %{_libdir}/udisks2/modules
|
||||
%{_libdir}/udisks2/modules/libudisks2_bcache.so
|
||||
%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.bcache.policy
|
||||
|
||||
%files -n %{name}-btrfs
|
||||
%dir %{_libdir}/udisks2
|
||||
%dir %{_libdir}/udisks2/modules
|
||||
%{_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 %{_libdir}/udisks2
|
||||
%dir %{_libdir}/udisks2/modules
|
||||
%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
|
||||
|
||||
%files -n %{name}-zram
|
||||
%dir %{_libdir}/udisks2
|
||||
%dir %{_libdir}/udisks2/modules
|
||||
%dir %{_sysconfdir}/udisks2/modules.conf.d
|
||||
%{_libdir}/udisks2/modules/libudisks2_zram.so
|
||||
%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.zram.policy
|
||||
%{_prefix}/lib/systemd/system/zram-setup@.service
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Aug 06 2026 Tomas Bzatek <tbzatek@redhat.com> - 2.11.2-1
|
||||
- Version 2.11.2
|
||||
* Mon Dec 04 2017 Vojtech Trefny <vtrefny@redhat.com> - 2.6.5-4
|
||||
- Always try to read configuration from crypttab in handle_unlock
|
||||
|
||||
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
|
||||
|
||||
* Wed Apr 01 2026 Tomas Bzatek <tbzatek@redhat.com> - 2.11.1-2
|
||||
- Use 'sys_tz' exfat mount option by default (#2403452)
|
||||
|
||||
* Wed Feb 25 2026 Tomas Bzatek <tbzatek@redhat.com> - 2.11.1-1
|
||||
- Version 2.11.1 (#2442584,#2442588)
|
||||
|
||||
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Wed Dec 17 2025 Tom Callaway <spot@fedoraproject.org> - 2.11.0-2
|
||||
- rebuild for new libconfig
|
||||
|
||||
* Thu Nov 06 2025 Tomas Bzatek <tbzatek@redhat.com> - 2.11.0-1
|
||||
- Version 2.11.0
|
||||
|
||||
* Fri Aug 29 2025 Tomas Bzatek <tbzatek@redhat.com> - 2.10.91-1
|
||||
- Version 2.10.91
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.90-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Thu Jun 19 2025 Tomas Bzatek <tbzatek@redhat.com> - 2.10.90-3
|
||||
- Harden temporary private mounts (#2373301)
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.90-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Wed Oct 02 2024 Tomas Bzatek <tbzatek@redhat.com> - 2.10.90-1
|
||||
- Version 2.10.90
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Fri Mar 01 2024 Tomas Bzatek <tbzatek@redhat.com> - 2.10.1-5
|
||||
- udiskslinuxblock: Survive a missing /etc/fstab (#2264922)
|
||||
|
||||
* Mon Feb 12 2024 Tomas Bzatek <tbzatek@redhat.com> - 2.10.1-4
|
||||
- Use SPDX license tags for subpackages
|
||||
|
||||
* Mon Feb 12 2024 Tomas Bzatek <tbzatek@redhat.com> - 2.10.1-3
|
||||
- Use a SPDX license tag
|
||||
- udiskslinuxblockobject: Try issuing BLKRRPART ioctl harder
|
||||
- udiskslinuxmanager: Fix use after free
|
||||
- tests: Fix targetcli_config.json
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Thu Sep 07 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.10.1-1
|
||||
- Version 2.10.1
|
||||
- Default to ntfs-3g for stability reasons (#2182206)
|
||||
- Use Recommends: for filesystem tools (#2169848)
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Thu Jun 29 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.10.0-1
|
||||
- Version 2.10.0
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.4-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.4-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Thu Mar 03 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.9.4-4
|
||||
- Fix gtk-doc annotations
|
||||
|
||||
* Thu Mar 03 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.9.4-3
|
||||
- Require ntfs-3g (#2058506)
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.4-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Mon Oct 04 2021 Tomas Bzatek <tbzatek@redhat.com> - 2.9.4-1
|
||||
- Version 2.9.4
|
||||
- Fixes CVE-2021-3802 (#2003650)
|
||||
|
||||
* Thu Aug 05 2021 Tomas Bzatek <tbzatek@redhat.com> - 2.9.3-1
|
||||
- Version 2.9.3
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.2-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Fri Jun 18 2021 Tomas Bzatek <tbzatek@redhat.com> - 2.9.2-5
|
||||
- Switch the default encryption to LUKS2
|
||||
|
||||
* Mon Apr 19 2021 Tomas Bzatek <tbzatek@redhat.com> - 2.9.2-4
|
||||
- Fix a couple of issues found by Coverity
|
||||
- Ignore systemd "Extended Boot Loader" GPT partition
|
||||
|
||||
* Fri Mar 26 2021 Tomas Bzatek <tbzatek@redhat.com> - 2.9.2-3
|
||||
- Fix FAT mkfs with dosfstools >= 4.2
|
||||
- udiskslinuxdriveata: Use GTask to apply configuration in a thread
|
||||
- Limit allowed module names
|
||||
- 80-udisks2.rules: Ignore Apple boot partition from livecd-tools
|
||||
|
||||
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.9.2-2
|
||||
- Rebuilt for updated systemd-rpm-macros
|
||||
See https://pagure.io/fesco/issue/2583.
|
||||
|
||||
* Thu Feb 04 2021 Tomas Bzatek <tbzatek@redhat.com> - 2.9.2-1
|
||||
- Version 2.9.2
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Mon Sep 07 2020 Neal Gompa <ngompa13@gmail.com> - 2.9.1-2
|
||||
- Fix conditional around polkit Recommends for building on EL7
|
||||
|
||||
* Wed Aug 12 2020 Tomas Bzatek <tbzatek@redhat.com> - 2.9.1-1
|
||||
- Version 2.9.1
|
||||
- Renamed zram-setup@.service to udisks2-zram-setup@.service
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue May 26 2020 Tomas Bzatek <tbzatek@redhat.com> - 2.9.0-1
|
||||
- Version 2.9.0
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.4-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Tue Oct 01 2019 Jonathan Lebon <jonathan@jlebon.com> - 2.8.4-3
|
||||
- Don't trigger udev if socket is not accessible
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.4-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Mon Jul 22 2019 Tomas Bzatek <tbzatek@redhat.com> - 2.8.4-1
|
||||
- Version 2.8.4
|
||||
|
||||
* Thu Jun 13 2019 Tomas Bzatek <tbzatek@redhat.com> - 2.8.3-1
|
||||
- Version 2.8.3
|
||||
|
||||
* Fri Mar 15 2019 Debarshi Ray <rishi@fedoraproject.org> - 2.8.2-2
|
||||
- Update for tmpfiles.d snippet
|
||||
|
||||
* Mon Mar 04 2019 Tomas Bzatek <tbzatek@redhat.com> - 2.8.2-1
|
||||
- Version 2.8.2
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Wed Sep 26 2018 Vojtech Trefny <vtrefny@redhat.com> - 2.8.1-1
|
||||
- Version 2.8.1
|
||||
|
||||
* Fri Sep 14 2018 Adam Williamson <awilliam@redhat.com> - 2.8.0-2
|
||||
- Backport PR #576 to fix udev multipath device check (see RHBZ#1628192)
|
||||
|
||||
* Mon Aug 13 2018 Tomas Bzatek <tbzatek@redhat.com> - 2.8.0-1
|
||||
- Version 2.8.0
|
||||
|
||||
* Tue Jul 24 2018 Adam Williamson <awilliam@redhat.com> - 2.7.7-3
|
||||
- Rebuild for new libconfig
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.7-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Jul 04 2018 Vojtech Trefny <vtrefny@redhat.com> - 2.7.7-1
|
||||
- Version 2.7.7
|
||||
|
||||
* Thu Feb 08 2018 Vojtech Trefny <vtrefny@redhat.com> - 2.7.6-1
|
||||
- Version 2.7.6
|
||||
|
||||
* Fri Feb 02 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.7.5-2
|
||||
- Switch to %%ldconfig_scriptlets
|
||||
|
||||
* Mon Dec 04 2017 Vojtech Trefny <vtrefny@redhat.com> - 2.7.5-1
|
||||
- Version 2.7.5
|
||||
|
||||
* Wed Nov 01 2017 Vojtech Trefny <vtrefny@redhat.com> - 2.7.4-1
|
||||
- Version 2.7.4
|
||||
|
||||
* Thu Aug 31 2017 Vojtech Trefny <vtrefny@redhat.com> - 2.7.3-1
|
||||
- Version 2.7.3
|
||||
|
||||
* Thu Aug 03 2017 Vojtech Trefny <vtrefny@redhat.com> - 2.7.2-1
|
||||
- Version 2.7.2
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Mon Jul 03 2017 Vojtech Trefny <vtrefny@redhat.com> - 2.7.1-1
|
||||
- Version 2.7.1
|
||||
|
||||
* Tue Jun 20 2017 Vojtech Trefny <vtrefny@redhat.com> - 2.7.0-3
|
||||
* Tue Jun 20 2017 Vojtech Trefny <vtrefny@redhat.com> - 2.6.5-3
|
||||
- Do not try to remove changed_blacklist hash table in finalize
|
||||
|
||||
* Mon Jun 19 2017 Vojtech Trefny <vtrefny@redhat.com> - 2.7.0-2
|
||||
* Mon Jun 19 2017 Vojtech Trefny <vtrefny@redhat.com> - 2.6.5-2
|
||||
- Fix how UDisksClient filters property changes
|
||||
|
||||
* Fri Jun 02 2017 Vojtech Trefny <vtrefny@redhat.com> - 2.7.0-1
|
||||
- Version 2.7.0
|
||||
|
||||
* Mon May 15 2017 Vojtech Trefny <vtrefny@redhat.com> - 2.6.5-1
|
||||
- Version 2.6.5
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue