Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/rtorrent/PKGBUILD
	core/libcap/PKGBUILD
	extra/samba/PKGBUILD
	extra/systemd/PKGBUILD
	extra/usbmuxd/PKGBUILD
	testing/glib2/PKGBUILD

3 files changed, 34 insertions, 39 deletions

diff --git a/core/dmraid/PKGBUILD b/core/dmraid/PKGBUILD
index b15879ebf..7ac53da1b 100644
--- a/core/dmraid/PKGBUILD
+++ b/core/dmraid/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 129977 2011-06-30 18:03:08Z thomas $
+# $Id: PKGBUILD 158621 2012-05-05 03:20:12Z dreisner $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 #Contributor: Urs Wolfer <uwolfer @ fwo.ch>
 
 pkgname=dmraid
 pkgver=1.0.0.rc16.3
-pkgrel=2
+pkgrel=4
 pkgdesc="Device mapper RAID interface"
 url="http://people.redhat.com/~heinzm/sw/dmraid/"
 conflicts=('mkinitcpio<0.7')
@@ -17,23 +17,23 @@ source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2
         dmraid_hook)
 install=dmraid.install
 md5sums=('819338fcef98e8e25819f0516722beeb'
-         'bf6c61a11dbbb40d5152835075c9f438'
-         '2a1ef82fb32f065ee560dceef736475e')
+         '832ed57a0f7ca6ba72adebcba2b17f87'
+         'faec669dc85f87187b45b5d3968efe2c')
 
 build() {
-  cd "$srcdir"/$pkgname/1.0.0.rc16-3/$pkgname
+  cd "$pkgname/1.0.0.rc16-3/$pkgname"
   ./configure --enable-led --enable-intel_led
   make
 }
 
 package() {
-  cd "$srcdir"/$pkgname/1.0.0.rc16-3/$pkgname
-  make DESTDIR="$pkgdir" prefix=/ libdir=/lib mandir=/usr/share/man includedir=/usr/include install
+  cd "$pkgname/1.0.0.rc16-3/$pkgname"
+  make DESTDIR="$pkgdir" prefix=/usr libdir=/usr/lib mandir=/usr/share/man includedir=/usr/include install
   mkdir -p "$pkgdir"/var/lock/dmraid
   chmod 1777 "$pkgdir"/var/lock/
-  install -D -m644 "$srcdir"/dmraid_install "$pkgdir"/lib/initcpio/install/dmraid
-  install -D -m644 "$srcdir"/dmraid_hook "$pkgdir"/lib/initcpio/hooks/dmraid
+  install -D -m644 "$srcdir"/dmraid_install "$pkgdir"/usr/lib/initcpio/install/dmraid
+  install -D -m644 "$srcdir"/dmraid_hook "$pkgdir"/usr/lib/initcpio/hooks/dmraid
   # fix permissions
-  chmod 644 "$pkgdir"/lib/libdmraid.a
+  chmod 644 "$pkgdir"/usr/lib/libdmraid.a
   chmod 644 "$pkgdir"/usr/include/dmraid/*
 }
diff --git a/core/dmraid/dmraid_hook b/core/dmraid/dmraid_hook
index 6219a718a..37283e83e 100644
--- a/core/dmraid/dmraid_hook
+++ b/core/dmraid/dmraid_hook
@@ -1,19 +1,14 @@
-# vim: set ft=sh:
-run_hook ()
-{
-    /sbin/modprobe -q dm-mod >/dev/null 2>&1
-    /sbin/modprobe -q dm-mirror >/dev/null 2>&1
-    if [ -e "/sys/class/misc/device-mapper" ]; then
-        if [ ! -e "/dev/mapper/control" ]; then
-            mkdir /dev/mapper
-            mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |')
-        fi
-        msg ":: Activating dmraid arrays..."
-	# prevent any event monitoring calls with -I
-        if [ "${quiet}" = "y" ]; then
-            /sbin/dmraid -ay -I -Z >/dev/null
-        else
-            /sbin/dmraid -ay -I -Z
-        fi
+#!/usr/bin/ash
+
+run_hook() {
+    modprobe -a -q dm-mod dm-mirror >/dev/null 2>&1
+    msg ":: Activating dmraid arrays..."
+    # prevent any event monitoring calls with -I
+    if [ "$quiet" = "y" ]; then
+        dmraid -ay -I -Z >/dev/null
+    else
+        dmraid -ay -I -Z
     fi
 }
+
+# vim: set ft=sh ts=4 sw=4 et:
diff --git a/core/dmraid/dmraid_install b/core/dmraid/dmraid_install
index eeb9e0893..c48e6ceaf 100644
--- a/core/dmraid/dmraid_install
+++ b/core/dmraid/dmraid_install
@@ -1,19 +1,19 @@
-# vim: set ft=sh:
+#!/bin/bash
 
-build()
-{
+build() {
     MODULES=" dm-mod dm-mirror "
-    BINARIES="/sbin/dmraid /sbin/dmsetup"
-    FILES=""
+    BINARIES="dmraid dmsetup"
     SCRIPT="dmraid"
-    add_file "/lib/udev/rules.d/10-dm.rules"
-    add_file "/lib/udev/rules.d/13-dm-disk.rules"
-    add_file "/lib/udev/rules.d/95-dm-notify.rules"
+
+    add_file "/usr/lib/udev/rules.d/10-dm.rules"
+    add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
+    add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
 }
 
-help ()
-{
-cat<<HELPEOF
-  This hook loads the necessary modules for a dmraid root device.
+help() {
+  cat <<HELPEOF
+This hook loads the necessary modules for a dmraid root device.
 HELPEOF
 }
+
+# vim: set ft=sh ts=4 sw=4 et: