import udisks2-2.8.3-2.el8
This commit is contained in:
commit
149c00d470
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
SOURCES/udisks-2.8.3.tar.bz2
|
1
.udisks2.metadata
Normal file
1
.udisks2.metadata
Normal file
@ -0,0 +1 @@
|
|||||||
|
47a9d8bc386271bbbb8d77999e0a0c8bb8e38f84 SOURCES/udisks-2.8.3.tar.bz2
|
@ -0,0 +1,70 @@
|
|||||||
|
From ffa52f4c674477795a756bbe5983b5a20929ce94 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Tomas Bzatek <tbzatek@redhat.com>
|
||||||
|
Date: Fri, 14 Jun 2019 16:03:49 +0200
|
||||||
|
Subject: [PATCH 1/2] tests: Reflect new location of D-Bus service files
|
||||||
|
|
||||||
|
Related to the following change:
|
||||||
|
|
||||||
|
commit f9d9b4e89915fdc87f8d9b56269def24f709b2da
|
||||||
|
Author: Michael Biebl <biebl@debian.org>
|
||||||
|
Date: Tue Nov 27 00:48:15 2018 +0100
|
||||||
|
|
||||||
|
Move D-Bus policy file to /usr/share/dbus-1/system.d/
|
||||||
|
|
||||||
|
To better support stateless systems with an empty /etc, the old location
|
||||||
|
in /etc/dbus-1/system.d/ should only be used for local admin changes.
|
||||||
|
Package provided D-Bus policy files are supposed to be installed in
|
||||||
|
/usr/share/dbus-1/system.d/.
|
||||||
|
|
||||||
|
This is supported since dbus 1.9.18.
|
||||||
|
|
||||||
|
https://lists.freedesktop.org/archives/dbus/2015-July/016746.html
|
||||||
|
---
|
||||||
|
README.md | 2 +-
|
||||||
|
src/tests/dbus-tests/run_tests.py | 2 +-
|
||||||
|
src/tests/install-udisks/runtest.sh | 2 +-
|
||||||
|
src/tests/integration-test | 2 +-
|
||||||
|
4 files changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/README.md b/README.md
|
||||||
|
index b4fa385c..cf2207cf 100644
|
||||||
|
--- a/README.md
|
||||||
|
+++ b/README.md
|
||||||
|
@@ -88,7 +88,7 @@ Please report bugs via the GitHub's issues tracker at
|
||||||
|
sudo cp data/*.policy /usr/share/polkit-1/actions/
|
||||||
|
sudo cp modules/*/data/*.policy /usr/share/polkit-1/actions/
|
||||||
|
|
||||||
|
- sudo cp data/org.freedesktop.UDisks2.conf /etc/dbus-1/system.d/
|
||||||
|
+ sudo cp data/org.freedesktop.UDisks2.conf /usr/share/dbus-1/system.d/
|
||||||
|
|
||||||
|
sudo cp data/80-udisks2.rules /usr/lib/udev/rules.d/
|
||||||
|
```
|
||||||
|
diff --git a/src/tests/dbus-tests/run_tests.py b/src/tests/dbus-tests/run_tests.py
|
||||||
|
index e730346a..3dc3c631 100755
|
||||||
|
--- a/src/tests/dbus-tests/run_tests.py
|
||||||
|
+++ b/src/tests/dbus-tests/run_tests.py
|
||||||
|
@@ -96,7 +96,7 @@ def install_config_files(projdir, tmpdir):
|
||||||
|
|
||||||
|
# dbus config files
|
||||||
|
copied.extend(_copy_files((os.path.join(projdir, 'data/org.freedesktop.UDisks2.conf'),),
|
||||||
|
- '/etc/dbus-1/system.d/', tmpdir))
|
||||||
|
+ '/usr/share/dbus-1/system.d/', tmpdir))
|
||||||
|
|
||||||
|
# polkit policies
|
||||||
|
policies = glob.glob(projdir + '/data/*.policy') + glob.glob(projdir + '/modules/*/data/*.policy')
|
||||||
|
diff --git a/src/tests/integration-test b/src/tests/integration-test
|
||||||
|
index 19087bbc..2bc78a2b 100755
|
||||||
|
--- a/src/tests/integration-test
|
||||||
|
+++ b/src/tests/integration-test
|
||||||
|
@@ -1866,7 +1866,7 @@ def install_config_files(projdir, tmpdir):
|
||||||
|
|
||||||
|
# dbus config files
|
||||||
|
copied.extend(_copy_files((os.path.join(projdir, 'data/org.freedesktop.UDisks2.conf'),),
|
||||||
|
- '/etc/dbus-1/system.d/', tmpdir))
|
||||||
|
+ '/usr/share/dbus-1/system.d/', tmpdir))
|
||||||
|
|
||||||
|
# polkit policies
|
||||||
|
policies = glob(projdir + '/data/*.policy') + glob(projdir + '/modules/*/data/*.policy')
|
||||||
|
--
|
||||||
|
2.21.0
|
||||||
|
|
@ -0,0 +1,25 @@
|
|||||||
|
From 9c87ed1f7a5daab0864b22be89ff58ffde51b5af Mon Sep 17 00:00:00 2001
|
||||||
|
From: Tomas Bzatek <tbzatek@redhat.com>
|
||||||
|
Date: Fri, 14 Jun 2019 17:11:16 +0200
|
||||||
|
Subject: [PATCH] udiskslinuxpartition: Fix potential NULL dereference
|
||||||
|
|
||||||
|
---
|
||||||
|
src/udiskslinuxpartition.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/udiskslinuxpartition.c b/src/udiskslinuxpartition.c
|
||||||
|
index c29cf0fa..d00e6519 100644
|
||||||
|
--- a/src/udiskslinuxpartition.c
|
||||||
|
+++ b/src/udiskslinuxpartition.c
|
||||||
|
@@ -198,7 +198,7 @@ static void update_partitions_list (UDisksObject *disk_object,
|
||||||
|
/* this partition is already in the property */
|
||||||
|
goto out;
|
||||||
|
|
||||||
|
- num_parts = g_strv_length (partitions);
|
||||||
|
+ num_parts = partitions ? g_strv_length (partitions) : 0;
|
||||||
|
partitions = g_realloc (partitions, (num_parts + 2) * sizeof (gchar *));
|
||||||
|
partitions[num_parts] = g_strdup (object_path);
|
||||||
|
partitions[num_parts + 1] = NULL;
|
||||||
|
--
|
||||||
|
2.21.0
|
||||||
|
|
@ -0,0 +1,46 @@
|
|||||||
|
From 6e4fdd7d353b9171d164dcee2ec434a1b55c7e27 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Tomas Bzatek <tbzatek@redhat.com>
|
||||||
|
Date: Fri, 14 Jun 2019 16:36:34 +0200
|
||||||
|
Subject: [PATCH 2/2] integration-test: Do not copy config files when testing
|
||||||
|
system instance
|
||||||
|
|
||||||
|
---
|
||||||
|
src/tests/integration-test | 15 +++++++--------
|
||||||
|
1 file changed, 7 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/tests/integration-test b/src/tests/integration-test
|
||||||
|
index 2bc78a2b..4652a8c2 100755
|
||||||
|
--- a/src/tests/integration-test
|
||||||
|
+++ b/src/tests/integration-test
|
||||||
|
@@ -129,6 +129,13 @@ class UDisksTestCase(unittest.TestCase):
|
||||||
|
if (os.access(cls.daemon_path, os.X_OK)):
|
||||||
|
print('Testing binaries from local build tree')
|
||||||
|
cls.check_build_tree_config()
|
||||||
|
+ # copy required system files
|
||||||
|
+ testdir = os.path.abspath(os.path.dirname(__file__))
|
||||||
|
+ projdir = os.path.abspath(os.path.normpath(os.path.join(testdir, '..', '..')))
|
||||||
|
+ tmpdir = tempfile.mkdtemp(prefix='udisks-tst-')
|
||||||
|
+ atexit.register(shutil.rmtree, tmpdir)
|
||||||
|
+ files_to_restore = install_config_files(projdir, tmpdir)
|
||||||
|
+ atexit.register(restore_files, files_to_restore, tmpdir)
|
||||||
|
else:
|
||||||
|
print('Testing installed system binaries')
|
||||||
|
cls.daemon_path = None
|
||||||
|
@@ -1899,14 +1906,6 @@ if __name__ == '__main__':
|
||||||
|
help='name of test class or method (e. g. "Drive", "FS.test_ext2")')
|
||||||
|
cli_args = argparser.parse_args()
|
||||||
|
|
||||||
|
- testdir = os.path.abspath(os.path.dirname(__file__))
|
||||||
|
- projdir = os.path.abspath(os.path.normpath(os.path.join(testdir, '..', '..')))
|
||||||
|
- tmpdir = tempfile.mkdtemp(prefix='udisks-tst-')
|
||||||
|
- atexit.register(shutil.rmtree, tmpdir)
|
||||||
|
-
|
||||||
|
- files_to_restore = install_config_files(projdir, tmpdir)
|
||||||
|
- atexit.register(restore_files, files_to_restore, tmpdir)
|
||||||
|
-
|
||||||
|
UDisksTestCase.init(logfile=cli_args.logfile)
|
||||||
|
if cli_args.testname:
|
||||||
|
tests = unittest.TestLoader().loadTestsFromNames(
|
||||||
|
--
|
||||||
|
2.21.0
|
||||||
|
|
602
SPECS/udisks2.spec
Normal file
602
SPECS/udisks2.spec
Normal file
@ -0,0 +1,602 @@
|
|||||||
|
%global glib2_version 2.36
|
||||||
|
%global gobject_introspection_version 1.30.0
|
||||||
|
%global polkit_version 0.102
|
||||||
|
%global systemd_version 208
|
||||||
|
%global libatasmart_version 0.17
|
||||||
|
%global dbus_version 1.4.0
|
||||||
|
%global with_gtk_doc 1
|
||||||
|
%global libblockdev_version 2.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
|
||||||
|
|
||||||
|
|
||||||
|
# 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.8.3
|
||||||
|
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
|
||||||
|
Patch0: 0001-tests-Reflect-new-location-of-D-Bus-service-files.patch
|
||||||
|
Patch1: 0002-integration-test-Do-not-copy-config-files-when-testi.patch
|
||||||
|
Patch2: 0001-udiskslinuxpartition-Fix-potential-NULL-dereference.patch
|
||||||
|
|
||||||
|
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: libacl-devel
|
||||||
|
BuildRequires: chrpath
|
||||||
|
BuildRequires: gtk-doc
|
||||||
|
BuildRequires: gettext-devel
|
||||||
|
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: libmount-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}
|
||||||
|
|
||||||
|
# Needed for the systemd-related macros used in this file
|
||||||
|
%{?systemd_requires}
|
||||||
|
BuildRequires: systemd
|
||||||
|
|
||||||
|
# Needed to pull in the system bus daemon
|
||||||
|
Requires: dbus >= %{dbus_version}
|
||||||
|
# Needed to pull in the udev daemon
|
||||||
|
Requires: udev >= %{systemd_version}
|
||||||
|
# We need at least this version for bugfixes/features etc.
|
||||||
|
Requires: libatasmart >= %{libatasmart_version}
|
||||||
|
# For mount, umount, mkswap
|
||||||
|
Requires: util-linux
|
||||||
|
# For mkfs.ext3, mkfs.ext3, e2label
|
||||||
|
Requires: e2fsprogs
|
||||||
|
# For mkfs.xfs, xfs_admin
|
||||||
|
Requires: xfsprogs
|
||||||
|
# For mkfs.vfat
|
||||||
|
Requires: dosfstools
|
||||||
|
Requires: gdisk
|
||||||
|
# For ejecting removable disks
|
||||||
|
Requires: eject
|
||||||
|
# For utab monitor
|
||||||
|
Requires: libmount
|
||||||
|
|
||||||
|
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
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# For /proc/self/mountinfo, only available in 2.6.26 or higher
|
||||||
|
Conflicts: kernel < 2.6.26
|
||||||
|
|
||||||
|
Provides: storaged = %{version}-%{release}
|
||||||
|
Obsoletes: storaged
|
||||||
|
|
||||||
|
%description
|
||||||
|
The Udisks project provides a daemon, tools and libraries to access and
|
||||||
|
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
|
||||||
|
|
||||||
|
%description -n lib%{name}
|
||||||
|
This package contains the dynamic library, which provides
|
||||||
|
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
|
||||||
|
BuildRequires: iscsi-initiator-utils-devel
|
||||||
|
Provides: 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: LGPLv2+
|
||||||
|
Requires: lvm2
|
||||||
|
Requires: libblockdev-lvm >= %{libblockdev_version}
|
||||||
|
BuildRequires: lvm2-devel
|
||||||
|
BuildRequires: libblockdev-lvm-devel >= %{libblockdev_version}
|
||||||
|
Provides: storaged-lvm2 = %{version}-%{release}
|
||||||
|
Obsoletes: storaged-lvm2
|
||||||
|
|
||||||
|
%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: LGPLv2+
|
||||||
|
Provides: 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.
|
||||||
|
|
||||||
|
%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}
|
||||||
|
BuildRequires: libblockdev-kbd-devel >= %{libblockdev_version}
|
||||||
|
Provides: storaged-bcache = %{version}-%{release}
|
||||||
|
Obsoletes: storaged-bcache
|
||||||
|
|
||||||
|
%description -n %{name}-bcache
|
||||||
|
This package contains module for Bcache configuration.
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?with_btrfs}
|
||||||
|
%package -n %{name}-btrfs
|
||||||
|
Summary: Module for BTRFS
|
||||||
|
Group: System Environment/Libraries
|
||||||
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
|
License: LGPLv2+
|
||||||
|
Requires: libblockdev-btrfs >= %{libblockdev_version}
|
||||||
|
BuildRequires: libblockdev-btrfs-devel >= %{libblockdev_version}
|
||||||
|
Provides: 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: LGPLv2+
|
||||||
|
Requires: libstoragemgmt
|
||||||
|
BuildRequires: libstoragemgmt-devel
|
||||||
|
BuildRequires: libconfig-devel
|
||||||
|
Provides: storaged-lsm = %{version}-%{release}
|
||||||
|
Obsoletes: storaged-lsm
|
||||||
|
|
||||||
|
%description -n %{name}-lsm
|
||||||
|
This package contains module for LSM configuration.
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?with_zram}
|
||||||
|
%package -n %{name}-zram
|
||||||
|
Summary: Module for ZRAM
|
||||||
|
Group: System Environment/Libraries
|
||||||
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
|
License: LGPLv2+
|
||||||
|
Requires: libblockdev-kbd >= %{libblockdev_version}
|
||||||
|
Requires: libblockdev-swap >= %{libblockdev_version}
|
||||||
|
BuildRequires: libblockdev-kbd-devel >= %{libblockdev_version}
|
||||||
|
BuildRequires: libblockdev-swap-devel
|
||||||
|
Provides: storaged-zram = %{version}-%{release}
|
||||||
|
Obsoletes: storaged-zram
|
||||||
|
|
||||||
|
%description -n %{name}-zram
|
||||||
|
This package contains module for ZRAM configuration.
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%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}
|
||||||
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
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}
|
||||||
|
--enable-gtk-doc \
|
||||||
|
%else
|
||||||
|
--disable-gtk-doc \
|
||||||
|
%endif
|
||||||
|
%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
|
||||||
|
make install DESTDIR=%{buildroot}
|
||||||
|
%if %{with_gtk_doc} == 0
|
||||||
|
rm -fr %{buildroot}/%{_datadir}/gtk-doc/html/udisks2
|
||||||
|
%endif
|
||||||
|
|
||||||
|
find %{buildroot} -name \*.la -o -name \*.a | xargs rm
|
||||||
|
|
||||||
|
chrpath --delete %{buildroot}/%{_sbindir}/umount.udisks2
|
||||||
|
chrpath --delete %{buildroot}/%{_bindir}/udisksctl
|
||||||
|
chrpath --delete %{buildroot}/%{_libexecdir}/udisks2/udisksd
|
||||||
|
|
||||||
|
%find_lang udisks2
|
||||||
|
|
||||||
|
%post -n %{name}
|
||||||
|
%systemd_post udisks2.service
|
||||||
|
%systemd_post clean-mount-point@.service
|
||||||
|
udevadm control --reload
|
||||||
|
udevadm trigger
|
||||||
|
|
||||||
|
%preun -n %{name}
|
||||||
|
%systemd_preun udisks2.service
|
||||||
|
%systemd_preun clean-mount-point@.service
|
||||||
|
|
||||||
|
%postun -n %{name}
|
||||||
|
%systemd_postun_with_restart udisks2.service
|
||||||
|
%systemd_postun clean-mount-point@.service
|
||||||
|
|
||||||
|
%ldconfig_scriptlets -n lib%{name}
|
||||||
|
|
||||||
|
%if 0%{?with_zram}
|
||||||
|
%post -n %{name}-zram
|
||||||
|
%systemd_post zram-setup@.service
|
||||||
|
|
||||||
|
%preun -n %{name}-zram
|
||||||
|
%systemd_preun zram-setup@.service
|
||||||
|
|
||||||
|
%postun -n %{name}-zram
|
||||||
|
%systemd_postun zram-setup@.service
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%files -f udisks2.lang
|
||||||
|
%doc README.md AUTHORS NEWS HACKING
|
||||||
|
%license COPYING
|
||||||
|
|
||||||
|
%dir %{_sysconfdir}/udisks2
|
||||||
|
%if %{is_fedora}
|
||||||
|
%dir %{_sysconfdir}/udisks2/modules.conf.d
|
||||||
|
%endif
|
||||||
|
%{_sysconfdir}/udisks2/udisks2.conf
|
||||||
|
|
||||||
|
%{_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
|
||||||
|
|
||||||
|
|
||||||
|
%dir %{_libdir}/udisks2
|
||||||
|
%dir %{_libdir}/udisks2/modules
|
||||||
|
%dir %{_libexecdir}/udisks2
|
||||||
|
%{_libexecdir}/udisks2/udisksd
|
||||||
|
|
||||||
|
%{_bindir}/udisksctl
|
||||||
|
|
||||||
|
%{_mandir}/man1/udisksctl.1*
|
||||||
|
%{_mandir}/man5/udisks2.conf.5*
|
||||||
|
%{_mandir}/man8/udisksd.8*
|
||||||
|
%{_mandir}/man8/udisks.8*
|
||||||
|
%{_mandir}/man8/umount.udisks2.8*
|
||||||
|
|
||||||
|
%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.policy
|
||||||
|
%{_datadir}/dbus-1/system-services/org.freedesktop.UDisks2.service
|
||||||
|
|
||||||
|
# Permissions for local state data are 0700 to avoid leaking information
|
||||||
|
# about e.g. mounts to unprivileged users
|
||||||
|
%attr(0700,root,root) %dir %{_localstatedir}/lib/udisks2
|
||||||
|
|
||||||
|
%files -n lib%{name}
|
||||||
|
%{_libdir}/libudisks2.so.*
|
||||||
|
%{_libdir}/girepository-1.0/UDisks-2.0.typelib
|
||||||
|
|
||||||
|
%files -n %{name}-lvm2
|
||||||
|
%{_libdir}/udisks2/modules/libudisks2_lvm2.so
|
||||||
|
%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.lvm2.policy
|
||||||
|
|
||||||
|
%files -n %{name}-iscsi
|
||||||
|
%{_libdir}/udisks2/modules/libudisks2_iscsi.so
|
||||||
|
%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.iscsi.policy
|
||||||
|
|
||||||
|
%files -n lib%{name}-devel
|
||||||
|
%{_libdir}/libudisks2.so
|
||||||
|
%dir %{_includedir}/udisks2
|
||||||
|
%dir %{_includedir}/udisks2/udisks
|
||||||
|
%{_includedir}/udisks2/udisks/*.h
|
||||||
|
%{_datadir}/gir-1.0/UDisks-2.0.gir
|
||||||
|
%if %{with_gtk_doc}
|
||||||
|
%dir %{_datadir}/gtk-doc/html/udisks2
|
||||||
|
%{_datadir}/gtk-doc/html/udisks2/*
|
||||||
|
%endif
|
||||||
|
%{_libdir}/pkgconfig/udisks2.pc
|
||||||
|
|
||||||
|
%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
|
||||||
|
%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.zram.policy
|
||||||
|
%{_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
|
||||||
|
* Fri Jun 14 2019 Tomas Bzatek <tbzatek@redhat.com> - 2.8.3-2
|
||||||
|
- Minor test fixes
|
||||||
|
- Fix potential NULL dereference in UDisksLinuxPartition
|
||||||
|
|
||||||
|
* Thu Jun 13 2019 Tomas Bzatek <tbzatek@redhat.com> - 2.8.3-1
|
||||||
|
- Rebased to upstream 2.8.3 release (#1685210)
|
||||||
|
- Fix leaking filedescriptors (#1614774)
|
||||||
|
- Fix udisksctl pager scrolling (#1662336)
|
||||||
|
- Fix LVM2 plugin CreateSnapshot() error (#1668291)
|
||||||
|
- Add ISCSI plugin GetInitiatorNameRaw() method (#1710257)
|
||||||
|
|
||||||
|
* Mon Oct 08 2018 Vojtech Trefny <vtrefny@redhat.com> - 2.8.0-2
|
||||||
|
- Fix string format vulnerability
|
||||||
|
Resolves: rhbz#1632831
|
||||||
|
|
||||||
|
* 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
|
||||||
|
- Do not try to remove changed_blacklist hash table in finalize
|
||||||
|
|
||||||
|
* Mon Jun 19 2017 Vojtech Trefny <vtrefny@redhat.com> - 2.7.0-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
|
||||||
|
|
||||||
|
* Tue Mar 14 2017 Vojtech Trefny <vtrefny@redhat.com> - 2.6.4-1
|
||||||
|
- Version 2.6.4
|
||||||
|
|
||||||
|
* Mon Nov 14 2016 Tomas Smetana <tsmetana@redhat.com> - 2.6.3-1
|
||||||
|
- Version 2.6.3
|
||||||
|
|
||||||
|
* Thu Jun 16 2016 Tomas Smetana <tsmetana@redhat.com> - 2.6.2-1
|
||||||
|
- Version 2.6.2; aimed to replace udisks2
|
||||||
|
|
||||||
|
* Wed Apr 27 2016 Peter Hatina <phatina@redhat.com> - 2.6.0-3
|
||||||
|
- Add support for libblockdev-part plugin which replaces
|
||||||
|
parted calls
|
||||||
|
|
||||||
|
* Wed Mar 16 2016 Peter Hatina <phatina@redhat.com> - 2.6.0-2
|
||||||
|
- Fix permissions set for storaged_lsm.conf so it is readable only by root
|
||||||
|
|
||||||
|
* Mon Mar 14 2016 Peter Hatina <phatina@redhat.com> - 2.6.0-1
|
||||||
|
- Upgrade to 2.6.0
|
||||||
|
|
||||||
|
* Wed Feb 10 2016 Peter Hatina <phatina@redhat.com> - 2.5.0-3
|
||||||
|
- Package template zram-setup@.service file
|
||||||
|
|
||||||
|
* Wed Feb 10 2016 Peter Hatina <phatina@redhat.com> - 2.5.0-2
|
||||||
|
- Add udisksd configuration file and its man page
|
||||||
|
|
||||||
|
* Thu Jan 28 2016 Peter Hatina <phatina@redhat.com> - 2.5.0-1
|
||||||
|
- UDisks2 drop-in replacement
|
||||||
|
|
||||||
|
* Thu Jan 21 2016 Peter Hatina <phatina@redhat.com> - 2.4.0-3
|
||||||
|
- Redesign subpackage dependencies
|
||||||
|
- Make GTK documentation generation configurable
|
||||||
|
|
||||||
|
* Wed Jan 20 2016 Peter Hatina <phatina@redhat.com> - 2.4.0-2
|
||||||
|
- Reload udev rules and trigger events when installed
|
||||||
|
|
||||||
|
* Wed Jan 13 2016 Peter Hatina <phatina@redhat.com> - 2.4.0-1
|
||||||
|
- Upgrade to 2.4.0
|
||||||
|
|
||||||
|
* Wed Sep 30 2015 Peter Hatina <phatina@redhat.com> - 2.3.0-2
|
||||||
|
- Add Fedora/RHEL package configuration options
|
||||||
|
|
||||||
|
* Mon Sep 14 2015 Peter Hatina <phatina@redhat.com> - 2.3.0-1
|
||||||
|
- Change BuildRequires from pkgconfig macro to -devel packages
|
||||||
|
- Upgrade to 2.3.0
|
||||||
|
|
||||||
|
* Mon Aug 24 2015 Peter Hatina <phatina@redhat.com> - 2.2.0-1
|
||||||
|
- Upgrade to 2.2.0
|
||||||
|
|
||||||
|
* Fri Jul 3 2015 Peter Hatina <phatina@redhat.com> - 2.1.1-1
|
||||||
|
- Upgrade to 2.1.1
|
||||||
|
|
||||||
|
* Wed Jun 24 2015 Peter Hatina <phatina@redhat.com> - 2.1.0-4
|
||||||
|
- Add Requires for storaged modules
|
||||||
|
|
||||||
|
* Wed Jun 24 2015 Peter Hatina <phatina@redhat.com> - 2.1.0-3
|
||||||
|
- Changes for EPEL-7
|
||||||
|
- Lower systemd required version to 208
|
||||||
|
- Rewrite BuildRequires for systemd-devel
|
||||||
|
|
||||||
|
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jun 11 2015 Peter Hatina <phatina@redhat.com> - 2.1.0-1
|
||||||
|
- Update to upstream 2.1.0
|
||||||
|
|
||||||
|
* Thu Apr 02 2015 Peter Hatina <phatina@redhat.com> - 2.0.0-1
|
||||||
|
- Rebase to the new Storaged implementation
|
||||||
|
- Upstream: https://storaged.org
|
||||||
|
|
||||||
|
* Tue Sep 16 2014 Stef Walter <stefw@redhat.com> - 0.3.1-1
|
||||||
|
- Update to upstream 0.3.1
|
||||||
|
|
||||||
|
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.0-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Apr 08 2014 Patrick Uiterwijk <puiterwijk@redhat.com> - 0.3.0-1
|
||||||
|
- Update to upstream 0.3.0
|
||||||
|
|
||||||
|
* Fri Jan 31 2014 Patrick Uiterwijk <puiterwijk@redhat.com> - 0.2.0-1
|
||||||
|
- Update to upstream 0.2.0
|
||||||
|
|
||||||
|
* Thu Jan 16 2014 Patrick Uiterwijk <puiterwijk@redhat.com> - 0.1.0-2
|
||||||
|
- Removed double systemd BuildRequire
|
||||||
|
- Rewritten summary and description
|
||||||
|
|
||||||
|
* Sun Jan 12 2014 Patrick Uiterwijk <puiterwijk@redhat.com> - 0.1.0-1
|
||||||
|
- Rename from udisks2-lvm
|
Loading…
Reference in New Issue
Block a user