Use /tmp instead of /var/run/udisks wrt #333893 by Diego Elio Pettenò.

(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)

3 files changed, 103 insertions, 1 deletions

diff --git a/sys-fs/udisks/ChangeLog b/sys-fs/udisks/ChangeLog
index 00ad150753de..91d46fecc839 100644
--- a/sys-fs/udisks/ChangeLog
+++ b/sys-fs/udisks/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/udisks
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.44 2011/06/30 00:18:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.45 2011/07/05 10:14:12 ssuominen Exp $
+
+*udisks-1.0.3-r1 (05 Jul 2011)
+
+  05 Jul 2011; Samuli Suominen <ssuominen@gentoo.org> +udisks-1.0.3-r1.ebuild,
+  +files/udisks-1.0.3-mkfs-tempdir.patch:
+  Use /tmp instead of /var/run/udisks wrt #333893 by Diego Elio Pettenò.
 
 *udisks-1.0.3 (30 Jun 2011)
 
diff --git a/sys-fs/udisks/files/udisks-1.0.3-mkfs-tempdir.patch b/sys-fs/udisks/files/udisks-1.0.3-mkfs-tempdir.patch
new file mode 100644
index 000000000000..cc49c061065e
--- /dev/null
+++ b/sys-fs/udisks/files/udisks-1.0.3-mkfs-tempdir.patch
@@ -0,0 +1,17 @@
+The daemon doesn't create /var/run/udisks
+
+http://bugs.gentoo.org/show_bug.cgi?id=333893
+http://bugs.freedesktop.org/show_bug.cgi?id=24265
+http://bugs.freedesktop.org/show_bug.cgi?id=36589
+
+--- src/helpers/job-mkfs.c
++++ src/helpers/job-mkfs.c
+@@ -546,7 +546,7 @@
+   /* take ownership of the device if requested */
+   if (take_ownership_uid != 0 || take_ownership_gid != 0)
+     {
+-      char dir[256] = PACKAGE_LOCALSTATE_DIR "/run/udisks/job-mkfs-XXXXXX";
++      char dir[256] = "/tmp/job-mkfs-XXXXXX";
+ 
+       if (mkdtemp (dir) == NULL)
+         {
diff --git a/sys-fs/udisks/udisks-1.0.3-r1.ebuild b/sys-fs/udisks/udisks-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..1c5c39c736b3
--- /dev/null
+++ b/sys-fs/udisks/udisks-1.0.3-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.0.3-r1.ebuild,v 1.1 2011/07/05 10:14:12 ssuominen Exp $
+
+EAPI=4
+inherit eutils bash-completion linux-info
+
+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 ~sh ~sparc ~x86"
+IUSE="debug doc nls remote-access"
+
+COMMON_DEPEND="
+	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] )
+	>=dev-libs/glib-2.16.1:2
+	>=sys-apps/dbus-1.4.0
+	>=dev-libs/dbus-glib-0.92
+	>=sys-auth/polkit-0.97
+	>=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}
+	virtual/eject
+	remote-access? ( net-dns/avahi )"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.0
+	dev-util/pkgconfig
+	doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.1.2 )"
+
+RESTRICT="test" # this would need running dbus and sudo available
+
+pkg_setup() {
+	DOCS=( AUTHORS HACKING NEWS README )
+
+	if use amd64 || use x86; then
+		CONFIG_CHECK="~USB_SUSPEND ~!IDE"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.0.2-ntfs-3g.patch \
+		"${FILESDIR}"/${PN}-1.0.3-mkfs-tempdir.patch
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--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() {
+	default
+
+	rm -f "${ED}"/etc/profile.d/udisks-bash-completion.sh
+	dobashcompletion tools/udisks-bash-completion.sh ${PN}
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	keepdir /media
+
+	rm -rf "${ED}"/var/run # See -mkfs-tempdir.patch
+}