Compare commits

...
Sign in to create a new pull request.

85 commits

Author SHA1 Message Date
Dan Horák
5e111e46bd - rebuilt for sg3_utils 1.49 2026-08-20 16:15:22 +02:00
Fedora Release Engineering
a1ed702bc1 Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 08:06:39 +00:00
6af4eb7150 Use the %_sbindir macro for location of umount.udisks
This way, it'll be moved to /usr/bin on systems where %_sbindir is
configured so. It'll still be accessible through the old location
thanks to the magic of symlinks. Moving of the file is important to
let the merge of /usr/sbin to be finished on upgraded systems.

While at it, stop using a glob for files in /usr/bin. Globs are
frowned upon for files in shared directories.
2026-06-08 11:59:08 +01:00
Fedora Release Engineering
aa846f4aaa Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 19:32:30 +00:00
Fedora Release Engineering
ef535b8d0b Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 19:42:58 +00:00
Fedora Release Engineering
67e51962dc Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 13:37:17 +00:00
Miroslav Suchý
40bcf6c53b convert GPLv2+ license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-07-26 03:26:31 +02:00
Fedora Release Engineering
afaad5f5c1 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 08:08:30 +00:00
Software Management Team
9ec3169e61 Eliminate use of obsolete %patchN syntax (#2283636) 2024-05-30 12:46:49 +02:00
Dan Horák
9f2737416d - rebuilt for sg3_utils 1.48 2024-02-09 19:17:05 +01:00
Fedora Release Engineering
52adc6c3c9 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 06:59:26 +00:00
Fedora Release Engineering
66c6dffef1 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 16:59:56 +00:00
Fedora Release Engineering
36eb029508 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-21 05:41:14 +00:00
Fedora Release Engineering
eccd7192ee Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 11:16:21 +00:00
Fedora Release Engineering
3f8f59176d - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-22 03:24:41 +00:00
Fedora Release Engineering
daec937307 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 19:55:44 +00:00
Tomas Bzatek
b79be836f1 - rebuilt for sg3_utils 1.46 2021-04-07 14:17:50 +02:00
2f6d8b61e9 Rebuilt for updated systemd-rpm-macros
See https://pagure.io/fesco/issue/2583.
2021-03-02 16:12:06 +01:00
Fedora Release Engineering
341371d100 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-27 22:34:17 +00:00
Tom Stellard
dc6afbe0fb Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2021-01-09 00:18:30 +00:00
Fedora Release Engineering
345a2e59c6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-29 13:10:38 +00:00
Dan Horák
5d214083b1 - rebuilt for sg3_utils 1.45 (#1809392) 2020-04-20 16:56:00 +02:00
Fedora Release Engineering
cda131c717 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-31 02:27:02 +00:00
Fedora Release Engineering
8c3fd4039c - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-27 02:20:16 +00:00
David King
35b1f4879f Fix build failure (#1676172) 2019-04-27 08:37:07 +01:00
Fedora Release Engineering
1d97f9d34f - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-03 10:40:40 +00:00
81a394a7ec Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:24:53 +01:00
Fedora Release Engineering
bbcdd02f9a - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-14 08:09:01 +00:00
Fedora Release Engineering
22c7595245 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-09 19:53:04 +00:00
Fedora Release Engineering
a57ad690e8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 09:43:00 +00:00
Fedora Release Engineering
8ec7abdd2b - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 20:53:23 +00:00
Fedora Release Engineering
2380070740 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-11 16:37:38 +00:00
David King
5738f84ae7 Do not own bash completion directory (#1303443) 2016-09-14 08:42:16 +02:00
Fedora Release Engineering
902521ff37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-05 02:15:04 +00:00
David King
e87cd2dbc3 Remove needless use of defattr
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/KEO7AX3JXR2TY6OVL4M7HDISZ6YIJNKU/
2016-01-26 08:20:21 +00:00
David King
26b4059d39 Use systemd scriptlet snippets
https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Systemd
2015-07-02 14:15:47 +01:00
David King
d107ee165a Fix systemd service file (#1238664) 2015-07-02 14:15:45 +01:00
David King
23bb854ecb Update man page globs in files section
https://fedoraproject.org/wiki/Packaging:Guidelines#Manpages
2015-06-04 12:30:26 +01:00
David King
4ade574b7a Preserve timestamps during install 2015-06-04 12:26:26 +01:00
David King
0a959ae2db Use SMP flags when building 2015-06-04 12:25:34 +01:00
David King
9a07b3300c Use pkgconfig for BuildRequires
https://fedoraproject.org/wiki/Packaging:PkgConfigBuildRequires
2015-06-04 12:22:38 +01:00
David King
9b8a4517f1 Use license macro for COPYING
https://fedoraproject.org/wiki/Packaging:LicensingGuidelines#License_Text
2015-06-04 12:05:07 +01:00
David King
78e8f9a1e1 Update to 1.0.5 (#1075003) 2015-06-04 12:03:29 +01:00
Till Maas
38ae0ae0cb Rebuilt for Fedora 23 Change
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
2015-02-21 22:23:53 +01:00
bfeb2c348b - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-18 06:43:34 +00:00
Dennis Gilmore
7a090576f9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-07 21:32:18 -05:00
Huzaifa Sidhpurwala
1bd17e4406 Resolves: 1074458 2014-03-14 10:57:14 +05:30
Dennis Gilmore
78f10471a1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild 2013-08-04 00:22:38 -05:00
Ville Skyttä
c73b5dea0d Move bash completion to %{_sysconfdir}/bash_completion.d (#584569). 2013-02-26 21:22:45 +02:00
Dan Mashal
78a40e8635 update specfile/changelog 2013-02-24 19:48:02 -08:00
Dan Mashal
57b2da3304 fix changelog dates 2013-02-24 19:45:20 -08:00
Dan Mashal
1669fb918b update changelog dates 2013-02-24 19:43:54 -08:00
Dan Mashal
48f574a58f add patch to fix bash completion 2013-02-24 19:42:11 -08:00
Dennis Gilmore
6ba7bb413d - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild 2013-02-14 20:21:49 -06:00
Dennis Gilmore
c1c2b4ad81 Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild 2012-07-27 03:55:25 -05:00
Adam Jackson
9dccbc1466 Rebuild for new libudev
- Conditional BuildReqs for {libudev,systemd}-devel
2012-06-05 11:52:20 -04:00
Peter Robinson
74f9aae130 Add dependency on eject - fixes RHBZ 810882 2012-04-14 09:38:10 +01:00
2639ddf035 rebuild (parted) 2012-03-15 11:16:07 -05:00
Dennis Gilmore
0536c9e653 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild 2012-01-14 01:26:20 -06:00
Peter Robinson
06eb036969 update util-linux-ng -> util-linux 2011-12-29 16:28:53 +00:00
Dennis Gilmore
09f9e1c8f8 - Rebuilt for glibc bug#747377 2011-10-26 19:27:52 -05:00
David Zeuthen
5bde906756 Add patch to neuter the annoying systemd behavior where stdout/stderr
is sent to the system logs (#743344)

Signed-off-by: David Zeuthen <davidz@redhat.com>
2011-10-18 13:21:22 -04:00
David Zeuthen
9da39b7e7b Update 1.0.4
Signed-off-by: David Zeuthen <davidz@redhat.com>
2011-08-26 11:57:36 -04:00
David Zeuthen
29c55a9c01 Use tmpfiles.d for /var/run dir (#733161)
Signed-off-by: David Zeuthen <davidz@redhat.com>
2011-08-25 11:35:17 -04:00
Dan Horák
6345bbdc9e rebuilt for sg3_utils 1.31 2011-07-18 12:50:31 +02:00
David Zeuthen
69aa313e20 Update to 1.0.3
Signed-off-by: David Zeuthen <davidz@redhat.com>
2011-07-11 11:52:08 -04:00
Christopher Aillon
a6778821f6 Bump release to match what's in Fedora 14 2011-04-09 19:42:00 -07:00
Christopher Aillon
eebe5d330c drop unused patch udisks-1.0.1-Update-to-latest-LVM2-API.patch 2011-04-09 19:41:24 -07:00
Matthias Clasen
bb5374563a drop obsolete patch 2011-04-07 17:03:33 -04:00
Matthias Clasen
3b4e4b473c Fix merge conflicts 2011-04-07 17:01:02 -04:00
Matthias Clasen
3234bc1c0a Pull changes from the f14 branch 2011-04-07 14:53:16 -04:00
Matthias Clasen
8bc404bb66 1.0.2 2011-04-07 14:49:06 -04:00
Dennis Gilmore
82769bd58b - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild 2011-02-07 18:00:42 -06:00
Matthias Clasen
eb52d856db %ghost /var/run 2011-01-28 14:01:26 -05:00
Matthias Clasen
4ba4532caf Fix BRs 2011-01-25 19:33:54 -05:00
Matthias Clasen
e6453c4fcb Rebuild 2011-01-25 19:33:12 -05:00
Matthias Clasen
449ed96b31 drop gtk-doc dep 2010-08-23 15:58:15 -04:00
Fedora Release Engineering
46828b93ac dist-git conversion 2010-07-29 14:39:08 +00:00
David Zeuthen
3789c25b64 - Actually make udisks work with latest liblvm2app 2010-05-19 17:14:02 +00:00
Adam Tkac
0d26f58db8 - rebuilt against new lvm2 libraries 2010-05-03 07:53:56 +00:00
0cf6522c81 - rebuilt for sg3_utils 1.29 2010-04-13 10:19:30 +00:00
David Zeuthen
24c6284f23 - Update to release 1.0.1 (CVE-2010-1149 ,fdo #27494) 2010-04-09 15:59:02 +00:00
f03a83500e Bump release and rebuild so we link to the new libparted. 2010-03-30 20:38:39 +00:00
David Zeuthen
02d5fc4f2e - Update to release 1.0.0 2010-03-15 23:35:42 +00:00
David Zeuthen
ff30b0f3ab - Update to new git snapshot 2010-02-23 18:17:50 +00:00
11 changed files with 464 additions and 168 deletions

View file

@ -1,4 +0,0 @@
udisks.spec
udisks-1.0.0.git20091202.tar.gz
udisks-1.0.0.git20100115.tar.gz
udisks-1.0.0.git20100215.tar.gz

12
.gitignore vendored Normal file
View file

@ -0,0 +1,12 @@
udisks.spec
udisks-1.0.0.git20091202.tar.gz
udisks-1.0.0.git20100115.tar.gz
udisks-1.0.0.git20100215.tar.gz
udisks-1.0.0-0.git20100223_1311.tar.gz
udisks-1.0.0.tar.gz
udisks-1.0.1.tar.gz
/udisks-1.0.2.tar.gz
/udisks-1.0.3.tar.gz
/udisks-1.0.4.tar.gz
/buffer-overflow.patch
/udisks-1.0.5.tar.gz

View file

@ -1,71 +0,0 @@
From 61ddf6fee803a9d3ad275f36e623cf9e9d11a189 Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz@redhat.com>
Date: Tue, 16 Feb 2010 14:24:27 -0500
Subject: [PATCH] Update for new liblvm2app library
Several things changed in liblvm2app
- sizes are now reported in bytes instead of sectors
- a couple of new functions were added
You will need lvm2 version 2.02.61 or later (on Fedora Rawhide, this
is available as lvm2-2.02.61-1.fc13.x86_64). Unfortunately the liblvm2
pc version number is stuck at 2.1 so we can't require this version in
configure.in. I've asked the LVM team to fix that.
---
src/probers/udisks-lvm-pv-export.c | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/probers/udisks-lvm-pv-export.c b/src/probers/udisks-lvm-pv-export.c
index 6ab9625..5675fb8 100644
--- a/src/probers/udisks-lvm-pv-export.c
+++ b/src/probers/udisks-lvm-pv-export.c
@@ -85,9 +85,9 @@ print_vg (vg_t vg)
s = lvm_vg_get_uuid (vg); g_print ("UDISKS_LVM2_PV_VG_UUID=%s\n", s); dm_free (s);
s = lvm_vg_get_name (vg); g_print ("UDISKS_LVM2_PV_VG_NAME=%s\n", s); dm_free (s);
- g_print ("UDISKS_LVM2_PV_VG_SIZE=%" G_GUINT64_FORMAT "\n", lvm_vg_get_size (vg) * 512); /* TODO */
- g_print ("UDISKS_LVM2_PV_VG_FREE_SIZE=%" G_GUINT64_FORMAT "\n", lvm_vg_get_free_size (vg) * 512); /* TODO */
- g_print ("UDISKS_LVM2_PV_VG_EXTENT_SIZE=%" G_GUINT64_FORMAT "\n", lvm_vg_get_extent_size (vg) * 512); /* TODO */
+ g_print ("UDISKS_LVM2_PV_VG_SIZE=%" G_GUINT64_FORMAT "\n", lvm_vg_get_size (vg));
+ g_print ("UDISKS_LVM2_PV_VG_FREE_SIZE=%" G_GUINT64_FORMAT "\n", lvm_vg_get_free_size (vg));
+ g_print ("UDISKS_LVM2_PV_VG_EXTENT_SIZE=%" G_GUINT64_FORMAT "\n", lvm_vg_get_extent_size (vg));
g_print ("UDISKS_LVM2_PV_VG_EXTENT_COUNT=%" G_GUINT64_FORMAT "\n", lvm_vg_get_extent_count (vg));
g_print ("UDISKS_LVM2_PV_VG_SEQNUM=%" G_GUINT64_FORMAT "\n", lvm_vg_get_seqno (vg));
@@ -118,15 +118,22 @@ print_vg (vg_t vg)
dm_list_iterate_items (pv_list, pvs)
{
char *uuid;
+ guint64 size;
+ guint64 free_size;
pv_t pv = pv_list->pv;
uuid = lvm_pv_get_uuid (pv);
if (uuid != NULL)
{
g_string_append_printf (str, "uuid=%s", uuid);
- g_string_append_c (str, ' ');
dm_free (uuid);
}
+ size = lvm_pv_get_size (pv);
+ g_string_append_printf (str, ";size=%" G_GUINT64_FORMAT, size);
+ free_size = lvm_pv_get_free (pv);
+ g_string_append_printf (str, ";allocated_size=%" G_GUINT64_FORMAT, size - free_size);
+
+ g_string_append_c (str, ' ');
}
g_print ("UDISKS_LVM2_PV_VG_PV_LIST=%s\n", str->str);
g_string_free (str, TRUE);
@@ -174,7 +181,7 @@ print_vg (vg_t vg)
uuid = lvm_lv_get_uuid (lv);
name = lvm_lv_get_name (lv);
- size = lvm_lv_get_size (lv) * 512;
+ size = lvm_lv_get_size (lv);
is_active = lvm_lv_is_active (lv) != 0 ? 1 : 0;
if (uuid != NULL && name != NULL)
--
1.6.6.1

View file

@ -1,21 +0,0 @@
# Makefile for source rpm: udisks
# $Id$
NAME := udisks
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)

11
fix_bash_completion.patch Normal file
View file

@ -0,0 +1,11 @@
diff -uNrp b/tools/udisks-bash-completion.sh a/tools/udisks-bash-completion.sh
--- b/tools/udisks-bash-completion.sh 2011-08-25 11:27:33.000000000 -0700
+++ a/tools/udisks-bash-completion.sh 2013-02-24 19:39:41.968418728 -0800
@@ -1,6 +1,6 @@
# Check for bash
-[ -z "$BASH_VERSION" ] && return
+[ -z "$BASH_VERSION" -o -z "$PS1" ] && return
####################################################################################################

13
sbindirinstall.diff Normal file
View file

@ -0,0 +1,13 @@
diff --git udisks-1.0.5/tools/Makefile.am~ udisks-1.0.5/tools/Makefile.am
index 18325f7358..0aaec111ca 100644
--- udisks-1.0.5/tools/Makefile.am~
+++ udisks-1.0.5/tools/Makefile.am
@@ -54,7 +54,7 @@ udisks_LDADD = \
$(DBUS_GLIB_LIBS) \
$(POLKIT_DBUS_LIBS)
-slashsbin_PROGRAMS = umount.udisks
+sbin_PROGRAMS = umount.udisks
umount_udisks_SOURCES = umount-udisks.c
umount_udisks_LDADD = $(DBUS_GLIB_LIBS) $(POLKIT_DBUS_LIBS)

View file

@ -1 +1 @@
8c3c20ef2a15e67770e1f0ad4bf68b6c udisks-1.0.0.git20100215.tar.gz
70d48dcfe523a74cd7c7fbbc2847fcdd udisks-1.0.5.tar.gz

View file

@ -0,0 +1,25 @@
From 0aa652a7b257f98f9e8e7dc7b0ddc9bc62377d09 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Fri, 29 May 2015 21:09:39 -0400
Subject: [PATCH] Bug 90778 - fix build with newer glibc versions
https://bugs.freedesktop.org/show_bug.cgi?id=90778
---
src/helpers/job-drive-detach.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/helpers/job-drive-detach.c b/src/helpers/job-drive-detach.c
index eeafcab..d122a1f 100644
--- a/src/helpers/job-drive-detach.c
+++ b/src/helpers/job-drive-detach.c
@@ -18,6 +18,7 @@
*
*/
+#include <sys/stat.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
--
2.4.2

View file

@ -0,0 +1,77 @@
From b0fe2367874fa0e84f4b91497c374ad7898df731 Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Sat, 27 Apr 2019 08:27:12 +0100
Subject: [PATCH] Fix build with newer glibc versions
makedev() requires that sys/sysmacros.h is included.
---
src/daemon.c | 1 +
src/device.c | 1 +
src/mount-monitor.c | 1 +
tools/udisks.c | 1 +
tools/umount-udisks.c | 1 +
5 files changed, 5 insertions(+)
diff --git a/src/daemon.c b/src/daemon.c
index fafcf9a..ada2964 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -43,6 +43,7 @@
#include <sys/time.h>
#include <sys/resource.h>
#include <sys/socket.h>
+#include <sys/sysmacros.h>
#include <sys/un.h>
#include <sys/utsname.h>
#include <net/if_arp.h>
diff --git a/src/device.c b/src/device.c
index 2ae7f38..20920df 100644
--- a/src/device.c
+++ b/src/device.c
@@ -33,6 +33,7 @@
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/resource.h>
+#include <sys/sysmacros.h>
#include <fcntl.h>
#include <pwd.h>
#include <grp.h>
diff --git a/src/mount-monitor.c b/src/mount-monitor.c
index 573a69c..0cfa167 100644
--- a/src/mount-monitor.c
+++ b/src/mount-monitor.c
@@ -29,6 +29,7 @@
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/sysmacros.h>
#include <mntent.h>
#include <glib.h>
diff --git a/tools/udisks.c b/tools/udisks.c
index 97e80d7..599d469 100644
--- a/tools/udisks.c
+++ b/tools/udisks.c
@@ -30,6 +30,7 @@
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/sysmacros.h>
#include <sys/wait.h>
#include <fcntl.h>
#include <pwd.h>
diff --git a/tools/umount-udisks.c b/tools/umount-udisks.c
index 2813fe0..d915660 100644
--- a/tools/umount-udisks.c
+++ b/tools/umount-udisks.c
@@ -30,6 +30,7 @@
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/sysmacros.h>
#include <fcntl.h>
#include <pwd.h>
#include <grp.h>
--
2.21.0

View file

@ -0,0 +1,29 @@
From 7d61ad048856ee239870b917d6933e3ad63f0789 Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Thu, 2 Jul 2015 13:49:22 +0100
Subject: [PATCH] Fix systemd service file
udisks-daemon is installed to $(libexecdir), not $(prefix)/lib/udisks.
https://bugzilla.redhat.com/show_bug.cgi?id=1238664
https://bugs.freedesktop.org/show_bug.cgi?id=91191
---
data/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/Makefile.am b/data/Makefile.am
index 411ea0f..08af5f4 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -31,7 +31,7 @@ systemdservicedir = $(systemdsystemunitdir)
systemdservice_DATA = $(systemdservice_in_files:.service.in=.service)
$(systemdservice_DATA): $(systemdservice_in_files) Makefile
- @sed -e "s|\@libexecdir\@|$(prefix)/lib/udisks|" $< > $@
+ @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
endif
udevrulesdir = $(slashlibdir)/udev/rules.d
--
2.4.5

View file

@ -1,38 +1,53 @@
%define glib2_version 2.6.0
%define dbus_version 1.2
%define dbus_glib_version 0.82
%define polkit_version 0.92
%define parted_version 1.8.8
%define udev_version 145
%define mdadm_version 2.6.7
%define device_mapper_version 1.02
%define libatasmart_version 0.12
%define sg3_utils_version 1.27
%define smp_utils_version 0.94
%define lvm2_version 2.02.61
%global dbus_version 1.2
%global dbus_glib_version 0.82
%global glib2_version 2.15.0
%global gudev_version 147
%global polkit_version 0.97
%global parted_version 1.8.8
%global udev_version 143
%global mdadm_version 2.6.7
%global device_mapper_version 1.02
%global libatasmart_version 0.14
%global sg3_utils_version 1.27
%global smp_utils_version 0.94
%global systemd_version 185
Summary: Storage Management Service
Name: udisks
Version: 1.0.0
Release: 0.git20100215.3%{?dist}
License: GPLv2+
Group: System Environment/Libraries
Version: 1.0.5
Release: 34%{?dist}
# Automatically converted from old format: GPLv2+ - review is highly recommended.
License: GPL-2.0-or-later
URL: http://www.freedesktop.org/wiki/Software/udisks
# TODO: when fd.o #22578 is resolved, update URL to proper location
Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.git20100215.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: dbus-devel >= %{dbus_version}
BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
BuildRequires: polkit-devel >= %{polkit_version}
Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
# https://bugs.freedesktop.org/show_bug.cgi?id=90778
Patch0: udisks-1.0.5-fix-build-with-glibc-2.20.patch
Patch1: fix_bash_completion.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1238664
Patch2: udisks-1.0.5-fix-service-file.patch
Patch3: udisks-1.0.5-fix-makedev-failure.patch
Patch4: sbindirinstall.diff
BuildRequires: make
BuildRequires: pkgconfig(gio-unix-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(dbus-1) >= %{dbus_version}
BuildRequires: pkgconfig(dbus-glib-1) >= %{dbus_glib_version}
BuildRequires: pkgconfig(polkit-gobject-1) >= %{polkit_version}
BuildRequires: parted-devel >= %{parted_version}
BuildRequires: device-mapper-devel >= %{device_mapper_version}
BuildRequires: pkgconfig(devmapper) >= %{device_mapper_version}
BuildRequires: pkgconfig(libudev) >= %{udev_version}
BuildRequires: intltool
BuildRequires: libatasmart-devel >= %{libatasmart_version}
BuildRequires: libgudev1-devel >= %{udev_version}
BuildRequires: libudev-devel >= %{udev_version}
BuildRequires: pkgconfig(libatasmart) >= %{libatasmart_version}
BuildRequires: pkgconfig(gudev-1.0) >= %{gudev_version}
%if 0%{?fedora} > 17 || 0%{?rhel} > 6
BuildRequires: pkgconfig(systemd) >= %{systemd_version}
%else
BuildRequires: pkgconfig(libudev) >= %{udev_version}
%endif
BuildRequires: sg3_utils-devel >= %{sg3_utils_version}
BuildRequires: lvm2-devel >= %{lvm2_version}
BuildRequires: gtk-doc
# Needed for patch 3.
BuildRequires: autoconf automake libtool
BuildRequires: systemd
# needed to pull in the system bus daemon
Requires: dbus >= %{dbus_version}
# needed to pull in the udev daemon
@ -43,7 +58,7 @@ Requires: mdadm >= %{mdadm_version}
# for smp_rep_manufacturer
Requires: smp_utils >= %{smp_utils_version}
# for mount, umount, mkswap
Requires: util-linux-ng
Requires: util-linux
# for mkfs.ext3, mkfs.ext3, e2label
Requires: e2fsprogs
# for mkfs.xfs, xfs_admin
@ -52,22 +67,19 @@ Requires: xfsprogs
Requires: dosfstools
# for mlabel
Requires: mtools
# For ejecting removable disks
Requires: eject
# for mkntfs - no ntfsprogs on ppc, though
%ifnarch ppc ppc64
Requires: ntfsprogs
%endif
Patch0: 0001-Update-for-new-liblvm2app-library.patch
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
# for /proc/self/mountinfo, only available in 2.6.26 or higher
Conflicts: kernel < 2.6.26
# we need liblvm2app at least this recent since the ABI changed (sizes
# reported in number of bytes instead of number of sectors) without
# the sonumber changing
#
Requires: lvm2-libs >= %{lvm2_version}
# Obsolete and Provide DeviceKit-disks - udisks provides exactly the same
# ABI just with a different name and versioning-scheme
#
@ -80,9 +92,7 @@ for managing disks and storage devices.
%package devel
Summary: D-Bus interface definitions for udisks
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: gtk-doc
# See comment above
#
@ -94,23 +104,28 @@ D-Bus interface definitions and documentation for udisks.
%prep
%setup -q
%patch0 -p1 -b .lvm2app-additions
%patch -P0 -p1
%patch -P1 -p1
%patch -P2 -p1
%patch -P3 -p1
%patch -P4 -p1
# https://bugzilla.redhat.com/show_bug.cgi?id=673544#c15
rm -f src/*-glue.h tools/*-glue.h
autoreconf --force --install
%build
%configure --enable-gtk-doc
make
%make_build
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/polkit-1/extensions/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/polkit-1/extensions/*.a
# for now, include a compat symlink for the command-line tool
# and man page
ln -s udisks $RPM_BUILD_ROOT%{_bindir}/devkit-disks
@ -118,57 +133,267 @@ ln -s udisks.1 $RPM_BUILD_ROOT%{_datadir}/man/man1/devkit-disks.1
# TODO: should be fixed upstream
chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \
$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
%post
%systemd_post udisks.service
%preun
%systemd_preun udisks.service
%postun
%systemd_postun_with_restart udisks.service
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc README AUTHORS NEWS COPYING HACKING doc/TODO
%doc README AUTHORS NEWS HACKING doc/TODO
%license COPYING
%{_sysconfdir}/avahi/services/udisks.service
%{_sysconfdir}/bash_completion.d/udisks-bash-completion.sh
%{_sysconfdir}/dbus-1/system.d/*.conf
%{_sysconfdir}/profile.d/*.sh
/lib/udev/rules.d/*.rules
/lib/udev/udisks-part-id
/lib/udev/udisks-dm-export
/lib/udev/udisks-probe-ata-smart
/lib/udev/udisks-probe-sas-expander
/lib/udev/udisks-lvm-pv-export
/sbin/umount.udisks
%{_sbindir}/umount.udisks
%{_bindir}/*
%{_bindir}/devkit-disks
%{_bindir}/udisks
%{_bindir}/udisks-tcp-bridge
%{_libexecdir}/*
%{_mandir}/man1/*
%{_mandir}/man7/*
%{_mandir}/man8/*
%{_mandir}/man1/*.1*
%{_mandir}/man7/%{name}.7*
%{_mandir}/man8/%{name}-daemon.8*
%{_datadir}/polkit-1/actions/*.policy
%{_libdir}/polkit-1/extensions/*.so
%{_datadir}/dbus-1/system-services/*.service
%{_unitdir}/udisks.service
%attr(0700,root,root) %dir %{_localstatedir}/run/udisks
%attr(0700,root,root) %dir %{_localstatedir}/lib/udisks
%files devel
%defattr(-,root,root,-)
%{_datadir}/dbus-1/interfaces/*.xml
%{_datadir}/pkgconfig/udisks.pc
%{_datadir}/gtk-doc
%dir %{_datadir}/gtk-doc/html/udisks
%{_datadir}/gtk-doc/html/udisks/*
# Note: please don't forget the %{?dist} in the changelog. Thanks
#
%changelog
* Thu Aug 20 2026 Dan Horák <dan@danny.cz> - 1.0.5-34
- rebuilt for sg3_utils 1.49
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Mon Jun 08 2026 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.0.5-32
- Move umount.udisks to /usr/bin
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 1.0.5-28
- convert license to SPDX
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Fri Feb 09 2024 Dan Horák <dan@danny.cz> - 1.0.5-26
- rebuilt for sg3_utils 1.48
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Apr 07 2021 Tomas Bzatek <tbzatek@redhat.com> - 1.0.5-19
- rebuilt for sg3_utils 1.46
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.0.5-18
- Rebuilt for updated systemd-rpm-macros
See https://pagure.io/fesco/issue/2583.
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Apr 20 2020 Dan Horák <dan@danny.cz> - 1.0.5-15
- rebuilt for sg3_utils 1.45 (#1809392)
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sat Apr 27 2019 David King <amigadave@amigadave.com> - 1.0.5-12
- Fix build failure (#1676172)
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Tue Sep 13 2016 David King <amigadave@amigadave.com> - 1.0.5-5
- Do not own bash completion directory (#1303443)
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Tue Jan 26 2016 David King <amigadave@amigadave.com> - 1.0.5-3
- Remove needless use of defattr
* Thu Jul 02 2015 David King <amigadave@amigadave.com> - 1.0.5-2
- Fix systemd service file (#1238664)
- Use systemd scriptlet snippets
* Thu Jun 04 2015 David King <amigadave@amigadave.com> - 1.0.5-1
- Update to 1.0.5 (#1075003)
- Use license macro for COPYING
- Use pkgconfig for BuildRequires
- Use SMP flags when building
- Preserve timestamps during install
- Update man page globs in files section
* Sat Feb 21 2015 Till Maas <opensource@till.name> - 1.0.4-16
- Rebuilt for Fedora 23 Change
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.4-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.4-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Fri Mar 14 2014 Huzaifa Sidhpurwala <huzaifas@redhat.com> - 1.0.4-13
- fix CVE-2014-0004
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.4-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Tue Feb 26 2013 Ville Skyttä <ville.skytta@iki.fi> - 1.0.4-11
- Move bash completion to %%{_sysconfdir}/bash_completion.d (#584569).
* Sun Feb 24 2013 Dan Mashal <dan.mashal@fedoraproject.org> 1.0.4-10
- Fix bash completion as per RHBZ 584569
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.4-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Fri Jul 27 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.4-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Tue Jun 05 2012 Adam Jackson <ajax@redhat.com> 1.0.4-7%{?dist}
- Rebuild for new libudev
- Conditional BuildReqs for {libudev,systemd}-devel
* Sat Apr 14 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 1.0.4-6
- Add dependency on eject - fixes RHBZ 810882
* Thu Mar 15 2012 Rex Dieter <rdieter@fedoraproject.org> 1.0.4-5
- rebuild (parted)
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Wed Oct 26 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.4-3
- Rebuilt for glibc bug#747377
* Tue Oct 18 2011 David Zeuthen <davidz@redhat.com> - 1.0.4-2%{?dist}
- Add patch to neuter the annoying systemd behavior where stdout/stderr
is sent to the system logs (#743344)
* Fri Aug 26 2011 David Zeuthen <davidz@redhat.com> - 1.0.4-1%{?dist}
- Update to release 1.0.4 and update BR + files to reflect that lvm2 is no
longer enabled given recommendations from upstream (lvm2 support in
udisks never worked well and caused a lot more problems than it solved)
- Remove /etc/tmpfiles.d/udisks.conf hack since this is now created on demand
* Thu Aug 25 2011 David Zeuthen <davidz@redhat.com> - 1.0.3-3%{?dist}
- Use tmpfiles.d for /var/run dir (#733161)
* Mon Jul 18 2011 Dan Horák <dan@danny.cz> - 1.0.3-2%{?dist}
- rebuilt for sg3_utils 1.31
* Mon Jul 11 2011 David Zeuthen <davidz@redhat.com> - 1.0.3-1%{?dist}
- Update to 1.0.3
* Sat Apr 9 2011 Christopher Aillon <caillon@redhat.com> 1.0.2-4%{?dist}
- Bump release to match what's in Fedora 14
* Thu Apr 7 2011 Matthias Clasen <mclasen@redhat.com> 1.0.2-1%{?dist}
- Update to 1.0.2
- Nuke generated D-Bus code to force regeneration and avoid potential
dbus-glib bug. Credit goes to Tomáš Trnka <tomastrnka@gmx.com> for
figuring this out (#673544 comment 15)
* Fri Jan 28 2011 Matthias Clasen <mclasen@redhat.com> - 1.0.1-7%{?dist}
- %%ghost /var/run content (#656709)
* Tue Jan 25 2011 Matthias Clasen <mclasen@redhat.com> - 1.0.1-6%{?dist}
- BR gtk-doc
* Mon Aug 23 2010 Matthias Clasen <mclasen@redhat.com> - 1.0.1-5%{?dist}
- Co-own /usr/share/gtk-doc (#604420)
- Some other packaging cleanups
* Wed May 19 2010 David Zeuthen <davidz@redhat.com> - 1.0.1-4%{?dist}
- Actually make udisks work with latest liblvm2app
* Wed May 05 2010 Adam Tkac <atkac redhat com> - 1.0.1-3%{?dist}
- rebuilt against new lvm2 libraries
* Tue Apr 13 2010 Dan Horák <dan@danny.cz> - 1.0.1-2%{?dist}
- rebuilt for sg3_utils 1.29
* Fri Apr 09 2010 David Zeuthen <davidz@redhat.com> - 1.0.1-1%{?dist}
- Update to release 1.0.1 (CVE-2010-1149 ,fdo #27494)
* Tue Mar 30 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.0-2%{?dist}
- Bump release and rebuild so we link to the new libparted.
* Mon Mar 15 2010 David Zeuthen <davidz@redhat.com> - 1.0.0-1%{?dist}
- Update to release 1.0.0
* Tue Feb 23 2010 David Zeuthen <davidz@redhat.com> - 1.0.0-0.git20100223.1%{?dist}
- Update to new git snapshot
* Tue Feb 16 2010 David Zeuthen <davidz@redhat.com> - 1.0.0-0.git20100215.3%{?dist}
- Require lvm2-libs >= 2.02.61 to get the right ABI for liblvm2app