From 7711090cdb7398428536b177e55cabea219258d5 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 23 Sep 2011 09:16:37 +0000
Subject: main/udisk: fix mounting with busybox mount

busybox mount does not support the uhelper= mount option and util-linux
appears to just ignore it. Rather than adding code that does nothing
to busybox mount we just drop the uhelper=udisks from udisks side.

Reported upstream:
https://bugs.freedesktop.org/show_bug.cgi?id=41142
---
 main/udisks/APKBUILD             |  6 ++++--
 main/udisks/udisks-uhelper.patch | 11 +++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 main/udisks/udisks-uhelper.patch

diff --git a/main/udisks/APKBUILD b/main/udisks/APKBUILD
index ca55fbdbb..4366394b7 100644
--- a/main/udisks/APKBUILD
+++ b/main/udisks/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=udisks
 pkgver=1.0.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Disk Management Service"
 url="http://www.freedesktop.org/wiki/Software/udisks"
 arch="all"
@@ -14,6 +14,7 @@ makedepends="glib-dev polkit-dev parted-dev udev-dev sg3_utils-dev
 install=
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz
+	udisks-uhelper.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -47,4 +48,5 @@ package() {
 	mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib/
 }
 
-md5sums="86c63b2b5484f2060499a052b5b6256b  udisks-1.0.4.tar.gz"
+md5sums="86c63b2b5484f2060499a052b5b6256b  udisks-1.0.4.tar.gz
+8d522b2bf6e63c981ece6120f93cc201  udisks-uhelper.patch"
diff --git a/main/udisks/udisks-uhelper.patch b/main/udisks/udisks-uhelper.patch
new file mode 100644
index 000000000..b04d04836
--- /dev/null
+++ b/main/udisks/udisks-uhelper.patch
@@ -0,0 +1,11 @@
+--- ./src/device.c.orig
++++ ./src/device.c
+@@ -6480,7 +6480,7 @@
+   options = prepend_default_mount_options (device, fsmo, caller_uid, given_options);
+ 
+   /* validate mount options and check for authorizations */
+-  s = g_string_new ("uhelper=udisks,nodev,nosuid");
++  s = g_string_new ("nodev,nosuid");
+   for (n = 0; options[n] != NULL; n++)
+     {
+       const char *option = options[n];
-- 
cgit v1.2.3