Enable hardened build (#983622)

.gitignore

@@ -10,3 +10,4 @@
 /udisks-1.98.0.tar.bz2
 /udisks-1.99.0.tar.bz2
 /udisks-2.0.0.tar.bz2
+/udisks-2.0.1.tar.bz2

sources

@@ -1 +1 @@
-79fb343fbec6ed6b9e76fbe828622d38  udisks-2.0.0.tar.bz2
+c9e3e2031e775d6d7d935efc85c272bb  udisks-2.0.1.tar.bz2

udisks-2.1.1-firewire-ident.patch

@@ -0,0 +1,26 @@
+From b841e30a98459816dfc49a735d3db4355a88edcd Mon Sep 17 00:00:00 2001
+From: David Zeuthen <zeuthen@gmail.com>
+Date: Tue, 19 Mar 2013 04:31:40 +0000
+Subject: Properly identify firewire devices as non-system devices
+
+This was reported in bug 62077.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=62077
+
+Signed-off-by: David Zeuthen <zeuthen@gmail.com>
+---
+diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c
+index a1781cf..d619850 100644
+--- a/src/udiskslinuxblock.c
++++ b/src/udiskslinuxblock.c
+@@ -354,7 +354,7 @@ update_hints (UDisksLinuxBlock  *block,
+       connection_bus = udisks_drive_get_connection_bus (drive);
+       removable = udisks_drive_get_media_removable (drive);
+       if (removable ||
+-          (g_strcmp0 (connection_bus, "usb") == 0 || g_strcmp0 (connection_bus, "firewire") == 0) ||
++          (g_strcmp0 (connection_bus, "usb") == 0 || g_strcmp0 (connection_bus, "ieee1394") == 0) ||
+           (g_str_has_prefix (device_file, "/dev/mmcblk") || g_str_has_prefix (device_file, "/dev/mspblk")))
+         {
+           hint_system = FALSE;
+--
+cgit v0.9.0.2-2-gbebe

udisks2.spec

@@ -1,3 +1,5 @@
+%global _hardened_build 1
+
 %define glib2_version                   2.31.13
 %define gobject_introspection_version   1.30.0
 %define polkit_version                  0.101
@@ -7,8 +9,8 @@
 
 Summary: Disk Manager
 Name: udisks2
-Version: 2.0.0
-Release: 1%{?dist}
+Version: 2.0.1
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/wiki/Software/udisks
@@ -60,6 +62,12 @@ Requires: ntfsprogs
 # for /proc/self/mountinfo, only available in 2.6.26 or higher
 Conflicts: kernel < 2.6.26
 
+
+# Cannot mount external firewire hard drive or usb thumb drive as normal user, root required
+# https://bugzilla.redhat.com/show_bug.cgi?id=909010
+Patch0: udisks-2.1.1-firewire-ident.patch
+
+
 %description
 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
@@ -89,6 +97,7 @@ daemon. This package is for the udisks 2.x series.
 
 %prep
 %setup -q -n udisks-%{version}
+%patch0 -p1 -b .firewire-ident
 
 %build
 %configure --enable-gtk-doc
@@ -148,6 +157,15 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Thu Jul 25 2013 Tomas Bzatek <tbzatek@redhat.com> - 2.0.1-3%{?dist}
+- Enable hardened build (#983622)
+
+* Thu Mar 28 2013 Tomas Bzatek <tbzatek@redhat.com> - 2.0.1-2%{?dist}
+- Fix firewire drives identification (#909010)
+
+* Mon Dec 17 2012 David Zeuthen <davidz@redhat.com> - 2.0.1-1%{?dist}
+- Update to release 2.0.1 (fixes #887979)
+
 * Fri Oct 02 2012 David Zeuthen <davidz@redhat.com> - 2.0.0-1%{?dist}
 - Update to release 2.0.0