Update to release 1.92.0

This commit is contained in:
David Zeuthen 2012-02-23 13:40:07 -05:00
parent 3289adf064
commit b6f1c70a78
4 changed files with 13 additions and 46 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/udisks-1.90.0.git20111128.tar.bz2 /udisks-1.90.0.git20111128.tar.bz2
/udisks-1.90.0.tar.bz2 /udisks-1.90.0.tar.bz2
/udisks-1.91.0.tar.bz2 /udisks-1.91.0.tar.bz2
/udisks-1.92.0.tar.bz2

View File

@ -1,35 +0,0 @@
From ffbee04d8f48ec153dba45b5392882413e3550ca Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz@redhat.com>
Date: Wed, 22 Feb 2012 10:34:16 -0500
Subject: [PATCH] Avoid using $XDG_RUNTIME_DIR/media for now
Needs a bit more thought on the security side.
Signed-off-by: David Zeuthen <davidz@redhat.com>
---
src/udiskslinuxfilesystem.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/udiskslinuxfilesystem.c b/src/udiskslinuxfilesystem.c
index 9b2469a..4852357 100644
--- a/src/udiskslinuxfilesystem.c
+++ b/src/udiskslinuxfilesystem.c
@@ -652,6 +652,7 @@ calculate_mount_point (UDisksBlock *block,
uuid = udisks_block_get_id_uuid (block);
}
+#if 0 /* $XDG_RUNTIME_DIR/media turned off for now, may have security issues */
/* try mounting in user's $XDG_RUNTIME_DIR/media first - have to create it on demand... */
if (user_name != NULL)
{
@@ -683,6 +684,7 @@ calculate_mount_point (UDisksBlock *block,
}
g_free (s);
}
+#endif
/* fall back to mounting in /media */
if (mount_dir == NULL)
mount_dir = g_strdup ("/media");
--
1.7.9.1

View File

@ -1 +1 @@
c8ed6a9be8cd6eafba747121c8cb0d87 udisks-1.91.0.tar.bz2 44942b894bc25a35ffabdb63d00237c6 udisks-1.92.0.tar.bz2

View File

@ -7,8 +7,8 @@
Summary: Disk Manager Summary: Disk Manager
Name: udisks2 Name: udisks2
Version: 1.91.0 Version: 1.92.0
Release: 2%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.freedesktop.org/wiki/Software/udisks URL: http://www.freedesktop.org/wiki/Software/udisks
@ -46,12 +46,11 @@ Requires: parted
Requires: gdisk Requires: gdisk
# for LUKS devices # for LUKS devices
Requires: cryptsetup-luks Requires: cryptsetup-luks
Requires: acl
# for /proc/self/mountinfo, only available in 2.6.26 or higher # for /proc/self/mountinfo, only available in 2.6.26 or higher
Conflicts: kernel < 2.6.26 Conflicts: kernel < 2.6.26
Patch0: 0001-Avoid-using-XDG_RUNTIME_DIR-media-for-now.patch
%description %description
udisks provides a daemon, D-Bus API and command line tools for udisks provides a daemon, D-Bus API and command line tools for
managing disks and storage devices. This package is for the udisks 2.x managing disks and storage devices. This package is for the udisks 2.x
@ -81,7 +80,6 @@ daemon. This package is for the udisks 2.x series.
%prep %prep
%setup -q -n udisks-%{version} %setup -q -n udisks-%{version}
%patch0 -p1
%build %build
%configure --enable-gtk-doc %configure --enable-gtk-doc
@ -104,12 +102,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
%{_sysconfdir}/dbus-1/system.d/org.freedesktop.UDisks2.conf %{_sysconfdir}/dbus-1/system.d/org.freedesktop.UDisks2.conf
%{_sysconfdir}/bash_completion.d/udisksctl-bash-completion.sh %{_sysconfdir}/bash_completion.d/udisksctl-bash-completion.sh
/usr/lib/systemd/system/udisks2.service %{_prefix}/lib/systemd/system/udisks2.service
/lib/udev/rules.d/80-udisks2.rules %{_prefix}/lib/udev/rules.d/80-udisks2.rules
/sbin/umount.udisks2 %{_sbindir}/umount.udisks2
%dir /lib/udisks2 %dir %{_prefix}/lib/udisks2
/lib/udisks2/udisksd %{_prefix}/lib/udisks2/udisksd
%{_bindir}/udisksctl %{_bindir}/udisksctl
@ -139,6 +137,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
# Note: please don't forget the %{?dist} in the changelog. Thanks # Note: please don't forget the %{?dist} in the changelog. Thanks
%changelog %changelog
* Thu Feb 23 2012 David Zeuthen <davidz@redhat.com> - 1.92.0-1%{?dist}
- Update to release 1.92.0
* Wed Feb 22 2012 David Zeuthen <davidz@redhat.com> - 1.91.0-2%{?dist} * Wed Feb 22 2012 David Zeuthen <davidz@redhat.com> - 1.91.0-2%{?dist}
- Avoid using $XDG_RUNTIME_DIR/media for now - Avoid using $XDG_RUNTIME_DIR/media for now