Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/r8168-lts/PKGBUILD
	community-testing/evas_generic_loaders-svn/PKGBUILD
	community-testing/gambas2/PKGBUILD
	community-testing/gambas3/PKGBUILD
	community-testing/libextractor/PKGBUILD
	community-testing/pdf2djvu/PKGBUILD
	community-testing/r8168-lts/PKGBUILD
	community-testing/sage-mathematics/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	core/dhcpcd/PKGBUILD
	core/glibc/PKGBUILD
	core/net-tools/PKGBUILD
	cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
	extra/cups/PKGBUILD
	extra/maxima/PKGBUILD
	extra/scim-hangul/PKGBUILD
	extra/speech-dispatcher/PKGBUILD
	extra/subversion/PKGBUILD
	extra/telepathy-idle/PKGBUILD
	extra/x11vnc/PKGBUILD
	multilib-testing/binutils-multilib/PKGBUILD
	multilib-testing/gcc-multilib/PKGBUILD
	multilib-testing/lib32-glibc/PKGBUILD
	multilib/binutils-multilib/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	multilib/lib32-glibc/PKGBUILD
	multilib/lib32-krb5/PKGBUILD
	multilib/lib32-libdrm/PKGBUILD
	multilib/lib32-libxml2/PKGBUILD
	multilib/lib32-libxrandr/PKGBUILD
	multilib/lib32-p11-kit/PKGBUILD
	testing/binutils/PKGBUILD
	testing/calligra/PKGBUILD
	testing/dhcp/PKGBUILD
	testing/gcc/PKGBUILD
	testing/glibc/PKGBUILD
	testing/inkscape/PKGBUILD
	testing/iproute2/PKGBUILD
	testing/libreoffice/PKGBUILD
	testing/libreoffice/PKGBUILD.36
	testing/poppler/PKGBUILD

3 files changed, 56 insertions, 7 deletions

diff --git a/community/multipath-tools/PKGBUILD b/community/multipath-tools/PKGBUILD
index 7b84044d4..3cbac92fc 100644
--- a/community/multipath-tools/PKGBUILD
+++ b/community/multipath-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73313 2012-07-06 07:32:23Z bpiotrowski $
+# $Id: PKGBUILD 75262 2012-08-17 10:00:23Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Thomas S Hatch <thatch45 ar gmail dot com>
 # Contributor: Michael P <ptchinster@archlinux.us>
@@ -6,7 +6,7 @@
 
 pkgname=multipath-tools
 pkgver=0.4.9
-pkgrel=9
+pkgrel=10
 pkgdesc='Multipath tools for Linux'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://christophe.varoqui.free.fr/"
@@ -16,13 +16,14 @@ backup=('etc/multipath.conf' 'etc/multipath.conf.annotated')
 install=multipath-tools.install
 options=(!emptydirs)
 source=(http://christophe.varoqui.free.fr/multipath-tools/$pkgname-$pkgver.tar.bz2
-        multipath.conf multipath.conf.annotated multipathd.rc
+        rc.d service multipath.conf multipath.conf.annotated
         fix-build.patch buffer-overflows.patch log_enquery_overflow.patch
         blacklist-cciss-devices.patch explicitly-include-posix_types.h.patch)
 md5sums=('a6d4b48afc28f1f50f5ee4b1b06d2765'
+         '7c04ef96441363b0d43a2ebb13a87659'
+         '4843e91a83660e4b3acfb2d804fa344e'
          '9324ff0ba8330dcb21b2fcf64988026f'
          'be11462922eeeb9fcd2ba5f3f137b7d9'
-         '7c04ef96441363b0d43a2ebb13a87659'
          '885c0ba9c90b73cc93aa3f78005f81d6'
          'c5aab36777b0304a3525533cdd31bddc'
          '00eae05e02f1b85062e998574ab1b833'
@@ -45,7 +46,8 @@ build() {
 
 package() {
   make LIB='usr/lib' DESTDIR="$pkgdir" bindir='/usr/bin' libudevdir='/usr/lib/udev' install
-  install -D -m 644 multipath.conf "$pkgdir"/etc/multipath.conf
-  install -D -m 644 multipath.conf.annotated "$pkgdir"/etc/multipath.conf.annotated
-  install -D -m 755 multipathd.rc "$pkgdir"/etc/rc.d/multipathd
+  install -Dm644 multipath.conf "$pkgdir"/etc/multipath.conf
+  install -Dm644 multipath.conf.annotated "$pkgdir"/etc/multipath.conf.annotated
+  install -Dm755 rc.d "$pkgdir"/etc/rc.d/multipathd
+  install -Dm644 service "$pkgdir"/usr/lib/systemd/system/multipathd.service
 }
diff --git a/community/multipath-tools/rc.d b/community/multipath-tools/rc.d
new file mode 100644
index 000000000..7f5ef5d6a
--- /dev/null
+++ b/community/multipath-tools/rc.d
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+  start)
+    stat_busy "Starting multipathd"
+    /usr/bin/multipathd
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon multipathd
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping multipathd"
+    [ -f /var/run/multipathd.pid ] && kill `cat /var/run/multipathd.pid` >/dev/null 2>&1 
+      if [ $? -gt 0 ]; then
+        stat_fail
+      else
+        rm_daemon multipathd
+        stat_done
+      fi 
+      ;;
+  restart)
+    $0 stop
+    sleep 2
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/community/multipath-tools/service b/community/multipath-tools/service
new file mode 100644
index 000000000..a70d0ee1f
--- /dev/null
+++ b/community/multipath-tools/service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Device-Mapper Multipath Device Controller
+After=syslog.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/multipathd.pid
+ExecStart=/sbin/multipathd
+ExecReload=/sbin/multipathd reconfigure
+
+[Install]
+WantedBy=multi-user.target