From d0a3af504a400446ce144c72215eae392e5bbbd600ecc2e56b94e6030287e171 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 18 Feb 2014 22:56:16 +0000 Subject: [PATCH] Accepting request 222517 from home:Zaitor:branches:Base:System Update to ver 2.1.2 OBS-URL: https://build.opensuse.org/request/show/222517 OBS-URL: https://build.opensuse.org/package/show/Base:System/udisks2?expand=0&rev=38 --- udisks-2.1.1.tar.bz2 | 3 - udisks-2.1.2.tar.bz2 | 3 + ...131026-removable-devices-polkit-auth.patch | 75 ------------------- udisks2.changes | 14 ++++ udisks2.spec | 7 +- 5 files changed, 19 insertions(+), 83 deletions(-) delete mode 100644 udisks-2.1.1.tar.bz2 create mode 100644 udisks-2.1.2.tar.bz2 delete mode 100644 udisks2-20131026-removable-devices-polkit-auth.patch diff --git a/udisks-2.1.1.tar.bz2 b/udisks-2.1.1.tar.bz2 deleted file mode 100644 index 968b610..0000000 --- a/udisks-2.1.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:013b09ff38aa256b89c01525771f4565cb088724d5c8c79b32e9f811e88086fb -size 837872 diff --git a/udisks-2.1.2.tar.bz2 b/udisks-2.1.2.tar.bz2 new file mode 100644 index 0000000..c74520c --- /dev/null +++ b/udisks-2.1.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:afe928fe7f44086b835257efc3fcbe503e2da7c988a773c997d0291bbab4a637 +size 899694 diff --git a/udisks2-20131026-removable-devices-polkit-auth.patch b/udisks2-20131026-removable-devices-polkit-auth.patch deleted file mode 100644 index bb09003..0000000 --- a/udisks2-20131026-removable-devices-polkit-auth.patch +++ /dev/null @@ -1,75 +0,0 @@ -Index: udisks-2.1.1/doc/html/udisks-polkit-actions.html -=================================================================== ---- udisks-2.1.1.orig/doc/html/udisks-polkit-actions.html 2013-08-21 03:49:57.000000000 +0200 -+++ udisks-2.1.1/doc/html/udisks-polkit-actions.html 2013-10-04 12:10:53.160542373 +0200 -@@ -120,6 +120,14 @@ - If the object is a drive (or a block device that is part of a drive), this is set to the string “true” only if the value of the Drive:Removable property is TRUE. - - -+drive.removable.bus -+If the object is a drive (or a block device that is part of a drive), this is set to the value of the Drive:ConnectionBus property. This variable is set only if the value of the Drive:Removable property is TRUE. -+ -+ -+drive.removable.media -+If the object is a drive (or a block device that is part of a drive), this is set to the value of the Drive:MediaCompatibility property. This variable is set only if the value of the Drive:Removable property is TRUE. -+ -+ - id.type - If the object is a block device, this property is set to the value of the Block:IdType property. - -Index: udisks-2.1.1/doc/udisks2-docs.xml -=================================================================== ---- udisks-2.1.1.orig/doc/udisks2-docs.xml 2013-07-23 08:51:10.000000000 +0200 -+++ udisks-2.1.1/doc/udisks2-docs.xml 2013-10-04 12:01:27.720575739 +0200 -@@ -248,6 +248,14 @@ - drive.removable - If the object is a drive (or a block device that is part of a drive), this is set to the string true only if the value of the Drive:Removable property is TRUE. - -+ -+ drive.removable.bus -+ If the object is a drive (or a block device that is part of a drive), this is set to the value of the Drive:ConnectionBus property. This variable is set only if the value of the Drive:Removable property is TRUE. -+ -+ -+ drive.removable.media -+ If the object is a drive (or a block device that is part of a drive), this is set to the value of the Drive:MediaCompatibility property. This variable is set only if the value of the Drive:Removable property is TRUE. -+ - - - id.type -Index: udisks-2.1.1/src/udisksdaemonutil.c -=================================================================== ---- udisks-2.1.1.orig/src/udisksdaemonutil.c 2013-07-23 08:51:10.000000000 +0200 -+++ udisks-2.1.1/src/udisksdaemonutil.c 2013-10-04 11:37:33.176660391 +0200 -@@ -637,7 +637,31 @@ udisks_daemon_util_check_authorization_s - _safe_polkit_details_insert (details, "drive.model", udisks_drive_get_model (drive)); - _safe_polkit_details_insert (details, "drive.revision", udisks_drive_get_revision (drive)); - if (udisks_drive_get_removable (drive)) -- polkit_details_insert (details, "drive.removable", "true"); -+ { -+ const gchar *const *media_compat; -+ GString *media_compat_str; -+ const gchar *sep = ","; -+ -+ polkit_details_insert (details, "drive.removable", "true"); -+ _safe_polkit_details_insert (details, "drive.removable.bus", udisks_drive_get_connection_bus (drive)); -+ -+ media_compat_str = g_string_new (NULL); -+ media_compat = udisks_drive_get_media_compatibility (drive); -+ if (media_compat) -+ { -+ guint i; -+ -+ for (i = 0; media_compat[i] && strlen(media_compat[i]); i++) -+ { -+ if (i) -+ g_string_append (media_compat_str, sep); -+ g_string_append (media_compat_str, media_compat[i]); -+ } -+ } -+ -+ _safe_polkit_details_insert (details, "drive.removable.media", media_compat_str->str); -+ g_string_free (media_compat_str, TRUE); -+ } - } - - if (block != NULL) diff --git a/udisks2.changes b/udisks2.changes index e848298..2868f40 100644 --- a/udisks2.changes +++ b/udisks2.changes @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Sun Feb 16 22:27:14 UTC 2014 - zaitor@opensuse.org + +- Update to version 2.1.2: + + Add exfat mount options. + + Hide more rescue partitions. + + Build fails due to missing IT_PROG_INTLTOOL macro (fdo#67679). + + Add exfat FS integration test. + + Drop "david" user name from publish make rules. + + Use dosfstools instead of mtools. + + Add polkit authorization variables for removable media. + + Fix crash when waiting for loop device. +- Drop udisks2-20131026-removable-devices-polkit-auth.patch, fixed + upstream. +------------------------------------------------------------------- Tue Dec 10 08:33:56 UTC 2013 - pwieczorkiewicz@suse.com - Added udisks2-20131026-removable-devices-polkit-auth.patch. diff --git a/udisks2.spec b/udisks2.spec index 8c12c66..5785b1e 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -1,7 +1,7 @@ # # spec file for package udisks2 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,15 +20,13 @@ Name: udisks2 %define _name udisks -Version: 2.1.1 +Version: 2.1.2 Release: 0 Summary: Disk Management Service, version 2 License: GPL-2.0+ Group: System Environment/Daemons Url: http://www.freedesktop.org/wiki/Software/udisks Source: http://udisks.freedesktop.org/releases/%{_name}-%{version}.tar.bz2 -# PATCH-FEATURE-UPSTREAM udisks2-20131026-removable-devices-polkit-auth.patch fate#312966 fdo#72122 pwieczorkiewicz@suse.de -- Add polkit authorization variables for removable media. It allows restricting or granting access to removable media using polkit authorization rules. -Patch1: udisks2-20131026-removable-devices-polkit-auth.patch # Needed to build the man pages BuildRequires: docbook-xsl-stylesheets BuildRequires: gobject-introspection-devel @@ -96,7 +94,6 @@ for managing disks and storage devices. %lang_package %prep %setup -q -n %{_name}-%{version} -%patch1 -p1 %build export V=1