From 76d8789a8f3dd26cd1a6cea90517d75efa922f40 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 18:01:27 -0600
Subject: udisks: update binary path to /usr/bin refs #961

---
 abs/core/udisks/PKGBUILD          | 33 ++++++++++++++++++++++++++-------
 abs/core/udisks/drop-pci-db.patch | 28 ++++++++++++++++++++++++++++
 abs/core/udisks/udisks.service    | 10 ++++++++++
 3 files changed, 64 insertions(+), 7 deletions(-)
 create mode 100644 abs/core/udisks/drop-pci-db.patch
 create mode 100644 abs/core/udisks/udisks.service

diff --git a/abs/core/udisks/PKGBUILD b/abs/core/udisks/PKGBUILD
index e576d2e..08ab090 100644
--- a/abs/core/udisks/PKGBUILD
+++ b/abs/core/udisks/PKGBUILD
@@ -1,31 +1,50 @@
-# $Id: PKGBUILD 160373 2012-06-01 12:58:48Z dreisner $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 198467 2013-10-30 15:03:09Z allan $
+# Maintainer: Tom Gundersen <teg@jklm.no>
 
 pkgname=udisks
 pkgver=1.0.4
-pkgrel=4
+pkgrel=8
 pkgdesc="Disk Management Service"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/udisks"
 license=('GPL')
-depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'eject')
+depends=('systemd' 'util-linux' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof')
 makedepends=('intltool' 'docbook-xsl')
-options=(!libtool)
-source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz)
-sha256sums=('854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5')
+source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz udisks.service drop-pci-db.patch)
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/udisks --disable-static
+
+  patch -p1 < ../drop-pci-db.patch
+
   make
+  # fix mdadm location
+  sed -i -e 's#/sbin/mdadm#/usr/bin/mdadm#g' \
+            "${srcdir}/${pkgname}-${pkgver}"/data/80-udisks.rules
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make profiledir=/usr/share/bash-completion/completions DESTDIR="${pkgdir}" install
   chmod 644 "${pkgdir}/usr/share/bash-completion/completions/udisks-bash-completion.sh"
+
   # move udev helpers and rules to /usr/lib
   mv "${pkgdir}"/lib/udev "${pkgdir}"/usr/lib/
   rm -r "${pkgdir}"/lib
+
+  # move umount helper to /usr/bin
+  mv "${pkgdir}"/sbin/umount.udisks "${pkgdir}"/usr/bin/
+  rm -r "${pkgdir}"/sbin
+
+  install -Dm644 "$srcdir/udisks.service" "$pkgdir/usr/lib/systemd/system/udisks.service"
+  echo "SystemdService=udisks.service" \
+    >> "$pkgdir/usr/share/dbus-1/system-services/org.freedesktop.UDisks.service"
+
+  # install the /media folder
+  install -d -m 755 $pkgdir/media
 }
+md5sums=('86c63b2b5484f2060499a052b5b6256b'
+         '5d80832b4d4da72beeb45c15b63a1481'
+         '773cccd70afd18ace4332037feff67ec')
diff --git a/abs/core/udisks/drop-pci-db.patch b/abs/core/udisks/drop-pci-db.patch
new file mode 100644
index 0000000..6de6f56
--- /dev/null
+++ b/abs/core/udisks/drop-pci-db.patch
@@ -0,0 +1,28 @@
+commit c73b5ab54378ec6d7df9948c46ce87f98587af9a
+Author: Tom Gundersen <teg@jklm.no>
+Date:   2 days ago
+
+    udev: remove redundant call to deprecated pci-db
+    
+    The binary is no longer shipped with systemd/udev. The functionality
+    is taken over by a builtin, which is ran for all devices, rendering
+    this rule superfluous.
+    
+    Cc: Jan de Groot <jgc@archlinux.org>
+    Signed-off-by: Tom Gundersen <teg@jklm.no>
+
+diff --git a/data/80-udisks.rules b/data/80-udisks.rules
+index d1c8c5d..4bf2b37 100644
+--- a/data/80-udisks.rules
++++ b/data/80-udisks.rules
+@@ -1,10 +1,6 @@
+ # Do not edit this file, it will be overwritten on updates
+ #
+ 
+-# import names for PCI storage controllers
+-#
+-SUBSYSTEM=="pci", ACTION=="add|change", ENV{ID_MODEL_FROM_DATABASE}=="", ATTR{class}=="0x01*", IMPORT{program}="pci-db %p"
+-
+ # Set eSATA port type for known eSATA CardBus adapters - first we want to ensure
+ # the device is on a cardbus controller (upper PCI device) - then we check
+ # vid/pid (lower PCI device)
diff --git a/abs/core/udisks/udisks.service b/abs/core/udisks/udisks.service
new file mode 100644
index 0000000..7105e90
--- /dev/null
+++ b/abs/core/udisks/udisks.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=UDisks
+
+[Service]
+Type=dbus
+BusName=org.freedesktop.UDisks
+ExecStart=/usr/lib/udisks/udisks-daemon
+
+[Install]
+WantedBy=graphical.target
-- 
cgit v0.12

