Fix long hangs on probing nonexistant floppies.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 107 insertions, 2 deletions

diff --git a/sys-fs/udisks/ChangeLog b/sys-fs/udisks/ChangeLog
index 1d3e9b42f814..3ed98f3dd956 100644
--- a/sys-fs/udisks/ChangeLog
+++ b/sys-fs/udisks/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/udisks
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.15 2010/08/20 17:08:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.16 2010/08/21 09:17:06 ssuominen Exp $
+
+*udisks-1.0.1-r2 (21 Aug 2010)
+
+  21 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +udisks-1.0.1-r2.ebuild, +files/udisks-1.0.1-no-floppy.patch:
+  Fix long hangs on probing nonexistant floppies.
 
   20 Aug 2010; Jeroen Roovers <jer@gentoo.org> udisks-1.0.1-r1.ebuild:
   Move from sys-apps/parted to sys-block/parted.
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 82a29f2e5fb6..7884b65b1210 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,5 +1,7 @@
 AUX udisks-1.0.1-lvm2_api_support.patch 3825 RMD160 c5565b5b2a4152c39711b6588484340abb3d4aa5 SHA1 2c2da4d72713b9930dcb8f814336c566ff1e151c SHA256 0c4499285a6d0005c3a8633cb16cc8914bbdeeafc39e656b669e64faea9b04c8
+AUX udisks-1.0.1-no-floppy.patch 1131 RMD160 0cc4a99571a503879f7794e3ffe4f426b0a1a68f SHA1 eb302b22266b63bac6baa398ec5f819a7c6c02f3 SHA256 14965d91ade4eb9ea3165edffe83c9446c7a9048e97f6fae937c87e60fda9135
 DIST udisks-1.0.1.tar.gz 714246 RMD160 f1583b73a0a7ca4a8b4fddf68813f2bb1321b2bb SHA1 ad3e2a79a2638b75448116b292262cfa1e909518 SHA256 d9bf1ab56667dfa12e99461c503736e3964cf94dd41f30a1229a0e173429b841
 EBUILD udisks-1.0.1-r1.ebuild 1830 RMD160 f75ffc12e7b81ee0083f34ebbde126c859775602 SHA1 448cece83bd9c8f23ac42657dce4b77c6eaa4b4a SHA256 07d26c661a4f5a9d650777767da1e7c249bb55799e4b0832d88b871b557b71f3
-MISC ChangeLog 2389 RMD160 08578111974a53041449d6e61c8503c2f13a637f SHA1 715a0380ad31224e8825fe3f2f78d4a70b101f3a SHA256 16808481cffdcd821c0c8dc212c7095bbac34eeef8409959c83caa1041fc3d1e
+EBUILD udisks-1.0.1-r2.ebuild 1878 RMD160 1100754f14877e80dd3525b26073c73aea92feb0 SHA1 2c28b14222be1aff28fef29cb54feba592081498 SHA256 6bf18469122a5ab62c1b73dcf8fc80fb1b408a6eddabd0e0cb13c5d7ece277bb
+MISC ChangeLog 2596 RMD160 e810d90c4c08570214e106914444fcc343a139ae SHA1 9a19da1cc30f9c77c5dbd1bc961837c5bf63a4a8 SHA256 bba6edcd98a7a9b279262d131d20051d8ff8ef64375b4715c461b8e34a83b33d
 MISC metadata.xml 367 RMD160 3cc82714647236fdce4606ef9e8432ef2753a553 SHA1 6fd0b25ca51d565fdc6c40b9d1fc90ebff4ddb22 SHA256 9da91cf204d0f5616ca669618f4eed4c477140aef9f7f9218217e63e7d88d051
diff --git a/sys-fs/udisks/files/udisks-1.0.1-no-floppy.patch b/sys-fs/udisks/files/udisks-1.0.1-no-floppy.patch
new file mode 100644
index 000000000000..1d69d1cbc89d
--- /dev/null
+++ b/sys-fs/udisks/files/udisks-1.0.1-no-floppy.patch
@@ -0,0 +1,30 @@
+From ca93d4e2d9e7f483b2fde1725da086e2cca44164 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Wed, 02 Jun 2010 13:56:07 +0000
+Subject: Fix long hangs on probing nonexistant floppy drives
+
+A lot of modern machines do not have a floppy drive any more, but still have a
+floppy controller somewhere (or at least the BIOS pretends to). Trying to
+open(/dev/fd0) on these machines causes long hangs, which lead to long desktop
+startup times.
+
+To fix this, avoid probing floppies for media in update_info().
+
+https://launchpad.net/bugs/539515
+---
+diff --git a/src/device.c b/src/device.c
+index 763385c..0e87f1d 100644
+--- a/src/device.c
++++ b/src/device.c
+@@ -4471,7 +4471,8 @@ update_info (Device *device)
+     {
+       media_available = FALSE;
+ 
+-      if (!g_udev_device_get_property_as_boolean (device->priv->d, "ID_CDROM"))
++      if (!g_udev_device_get_property_as_boolean (device->priv->d, "ID_CDROM") &&
++          !g_udev_device_get_property_as_boolean (device->priv->d, "ID_DRIVE_FLOPPY"))
+         {
+           int fd;
+           fd = open (device->priv->device_file, O_RDONLY);
+--
+cgit v0.8.3-6-g21f6
diff --git a/sys-fs/udisks/udisks-1.0.1-r2.ebuild b/sys-fs/udisks/udisks-1.0.1-r2.ebuild
new file mode 100644
index 000000000000..7986c136265b
--- /dev/null
+++ b/sys-fs/udisks/udisks-1.0.1-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.0.1-r2.ebuild,v 1.1 2010/08/21 09:17:06 ssuominen Exp $
+
+EAPI=3
+inherit eutils bash-completion
+
+DESCRIPTION="Daemon providing interfaces to work with storage devices"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/udisks"
+SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug doc nls remote-access"
+
+COMMON_DEPEND=">=sys-fs/udev-147[extras]
+	>=dev-libs/glib-2.16.1:2
+	>=sys-apps/dbus-1
+	>=dev-libs/dbus-glib-0.82
+	>=sys-auth/polkit-0.92
+	>=sys-block/parted-1.8.8[device-mapper]
+	>=sys-fs/lvm2-2.02.66
+	>=dev-libs/libatasmart-0.14
+	>=sys-apps/sg3_utils-1.27.20090411
+	!sys-apps/devicekit-disks"
+RDEPEND="${COMMON_DEPEND}
+	remote-access? ( net-dns/avahi )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.1.2 )
+	nls? ( >=dev-util/intltool-0.40.0 )"
+
+# This would require running dbus and also sudo.
+RESTRICT="test"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-lvm2_api_support.patch \
+		"${FILESDIR}"/${P}-no-floppy.patch
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		--disable-dependency-tracking \
+		--disable-static \
+		$(use_enable debug verbose-mode) \
+		--enable-man-pages \
+		$(use_enable doc gtk-doc) \
+		$(use_enable remote-access) \
+		$(use_enable nls) \
+		--with-html-dir="${EPREFIX}/usr/share/doc/${PF}/html"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS HACKING NEWS README
+
+	rm -f "${ED}"/etc/profile.d/udisks-bash-completion.sh
+	dobashcompletion tools/udisks-bash-completion.sh ${PN}
+
+	find "${ED}" -name '*.la' -delete
+	keepdir /media
+}