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

Conflicts:
	community/apcupsd/PKGBUILD
	community/bmp-musepack/PKGBUILD
	community/bmp-wma/PKGBUILD
	community/bonnie++/PKGBUILD
	community/cantata/PKGBUILD
	community/checkinstall/PKGBUILD
	community/chrootuid/PKGBUILD
	community/compiz-bcop/PKGBUILD
	community/compiz-fusion-plugins-extra/PKGBUILD
	community/compiz-fusion-plugins-main/PKGBUILD
	community/compiz/PKGBUILD
	community/compizconfig-backend-gconf/PKGBUILD
	community/compizconfig-python/PKGBUILD
	community/ekg2/PKGBUILD
	community/emerald/PKGBUILD
	community/fbgetty/PKGBUILD
	community/flumotion/PKGBUILD
	community/leafnode/PKGBUILD
	community/libcompizconfig/PKGBUILD
	community/libdnet/PKGBUILD
	community/libee/PKGBUILD
	community/libtxc_dxtn/PKGBUILD
	community/linux-tools/PKGBUILD
	community/openntpd/PKGBUILD
	community/osiris/PKGBUILD
	community/perl-package-stash-xs/PKGBUILD
	community/perl-params-util/PKGBUILD
	community/procstatd/PKGBUILD
	community/scponly/PKGBUILD
	community/sniffit/PKGBUILD
	community/synergy/PKGBUILD
	community/turbojpeg/PKGBUILD
	community/unbound/PKGBUILD
	community/uucp/PKGBUILD
	core/gawk/PKGBUILD
	core/ifenslave/PKGBUILD
	core/jfsutils/PKGBUILD
	core/openldap/PKGBUILD
	core/rfkill/PKGBUILD
	core/systemd/PKGBUILD
	core/wireless_tools/PKGBUILD
	core/xinetd/PKGBUILD
	extra/avahi/PKGBUILD
	extra/calligra/PKGBUILD
	extra/clutter-gst/PKGBUILD
	extra/flac/PKGBUILD
	extra/hddtemp/PKGBUILD
	extra/libbluray/PKGBUILD
	extra/libdmx/PKGBUILD
	extra/libfs/PKGBUILD
	extra/libjpeg-turbo/PKGBUILD
	extra/libtiff/PKGBUILD
	extra/libxau/PKGBUILD
	extra/libxfixes/PKGBUILD
	extra/licq/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mesa/PKGBUILD
	extra/perl-guard/PKGBUILD
	extra/perl-template-toolkit/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/pigeonhole/PKGBUILD
	extra/poppler/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/python-geoip/PKGBUILD
	extra/python/PKGBUILD
	extra/samba/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/vde2/PKGBUILD
	extra/vim/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xfce4-dict/PKGBUILD
	libre/libquicktime-libre/PKGBUILD
	libre/xscreensaver-libre/PKGBUILD

8 files changed, 29 insertions, 70 deletions

diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD
index 1ceafa35a..8c8d6aa83 100644
--- a/core/mdadm/PKGBUILD
+++ b/core/mdadm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 177952 2013-02-12 12:13:48Z thomas $
+# $Id: PKGBUILD 186140 2013-05-21 09:11:15Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 pkgname=mdadm
 pkgver=3.2.6
-pkgrel=3
+pkgrel=4
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
@@ -13,7 +13,6 @@ conflicts=('mkinitcpio<0.7')
 depends=('glibc')
 backup=('etc/mdadm.conf')
 source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
-        mdadm 
         mdadm.conf 
         mdadm_install
         mdadm_hook
@@ -22,12 +21,24 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
         disable-werror.patch
         mdadm-fix-udev-rules.patch)
 replaces=('raidtools')
+md5sums=('3e255dc71e5144bbcb872788ca647267'
+         '5a37c112aa07dccdde62f9fa5b888607'
+         'af2f73f0094ebee66f503ca4710c7142'
+         'fbfb7d07efcbaf5dc61af424c5f6e352'
+         'b6b0bfd6487c99264578630616dfe5eb'
+         'eb1786b18fa4d13cfd7b71d6b05cfb4f'
+         '4ad87b74a4bc9a34621280abe0e0c3e4'
+         '6c76f2f261c1c3397c7290633f0a9acc')
 
-build() {
+prepare() {
   cd $srcdir/$pkgname-$pkgver
   patch -Np0 -i ../disable-werror.patch
   patch -p1 -i ../mdadm-fix-udev-rules.patch
-  make CXFLAGS="$CFLAGS"
+}
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  make CXFLAGS="$CFLAGS" BINDIR=/usr/bin
   # build static mdassemble for Arch's initramfs
   make MDASSEMBLE_AUTO=1 mdassemble
   
@@ -35,22 +46,12 @@ build() {
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  make INSTALL=/usr/bin/install DESTDIR=$pkgdir install
-  install -D -m755 mdassemble $pkgdir/sbin/mdassemble
+  make INSTALL=/usr/bin/install BINDIR=/usr/bin DESTDIR=$pkgdir install
+  install -D -m755 mdassemble $pkgdir/usr/bin/mdassemble
   install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf
-  install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm
   install -D -m644 ../mdadm_install $pkgdir/usr/lib/initcpio/install/mdadm
   install -D -m644 ../mdadm_hook $pkgdir/usr/lib/initcpio/hooks/mdadm
   install -D -m644 ../mdadm_udev_install $pkgdir/usr/lib/initcpio/install/mdadm_udev
   # systemd service file
   install -D -m644 $srcdir/mdadm.service $pkgdir/usr/lib/systemd/system/mdadm.service
 }
-md5sums=('3e255dc71e5144bbcb872788ca647267'
-         '8333d405f550317c2bacd5510bf1cb60'
-         '00cbed931db4f15b6ce49e3e7d433966'
-         '815245a3af16a73ec1c5e5989fb892e9'
-         'fbb5542d9bdf87441a11dd7e7a0a17f8'
-         '0e35422d0cc007c3654a5e2591a9f9b5'
-         'aafb5f9ac8437a284cbf948b9b13b179'
-         '4ad87b74a4bc9a34621280abe0e0c3e4'
-         '0bf45d6dcb3ea14facddbb10b3303806')
diff --git a/core/mdadm/mdadm b/core/mdadm/mdadm
deleted file mode 100755
index 9bf468e98..000000000
--- a/core/mdadm/mdadm
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-pidfile=/run/mdadm.pid
-if [[ -r $pidfile ]]; then
-  read -r PID <"$pidfile"
-  if [[ $PID && ! -d /proc/$PID ]]; then
-    # stale pidfile
-    unset PID
-    rm -f "$pidfile"
-  fi
-fi
-
-case $1 in
-  start)
-    stat_busy "Starting mdadm RAID Monitor"
-    if [[ -z $PID ]] && mdadm --monitor --scan -i "$pidfile" -f; then
-      add_daemon mdadm
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping mdadm RAID Monitor"
-    if [[ $PID ]] && kill "$PID" &>/dev/null; then
-      rm_daemon mdadm
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/core/mdadm/mdadm-fix-udev-rules.patch b/core/mdadm/mdadm-fix-udev-rules.patch
index 60f5ae131..941cadf3a 100644
--- a/core/mdadm/mdadm-fix-udev-rules.patch
+++ b/core/mdadm/mdadm-fix-udev-rules.patch
@@ -39,7 +39,7 @@ index 0000000..883ee4d
 +ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0", GOTO="md_end"
 +LABEL="md_ignore_state"
 +
-+IMPORT{program}="/sbin/mdadm --detail --export $devnode"
++IMPORT{program}="/usr/bin/mdadm --detail --export $devnode"
 +ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace"
 +ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}"
 +ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}"
@@ -75,9 +75,9 @@ index 0000000..b89775e
 +
 +# remember you can limit what gets auto/incrementally assembled by
 +# mdadm.conf(5)'s 'AUTO' and selectively whitelist using 'ARRAY'
-+ACTION=="add", RUN+="/sbin/mdadm --incremental $devnode --offroot"
-+ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/sbin/mdadm -If $name --path $env{ID_PATH}"
-+ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/sbin/mdadm -If $name"
++ACTION=="add", RUN+="/usr/bin/mdadm --incremental $devnode --offroot"
++ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/usr/bin/mdadm -If $name --path $env{ID_PATH}"
++ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/usr/bin/mdadm -If $name"
 +
 +LABEL="md_inc_end"
 diff --git a/udev-md-raid.rules b/udev-md-raid.rules
diff --git a/core/mdadm/mdadm.conf b/core/mdadm/mdadm.conf
index 57bd4c683..36eaa0cc0 100644
--- a/core/mdadm/mdadm.conf
+++ b/core/mdadm/mdadm.conf
@@ -59,8 +59,8 @@ DEVICE partitions
 
 
 # When used in --follow (aka --monitor) mode, mdadm needs a
-# mail address and/or a program.  To start mdadm's monitor mode, add
-# "mdadm" to your DAEMONS array in /etc/rc.conf
+# mail address and/or a program.  To start mdadm's monitor mode, enable
+# mdadm.service in systemd.
 #
 # If the lines are not found, mdadm will exit quietly
 #MAILADDR root@mydomain.tld
diff --git a/core/mdadm/mdadm.service b/core/mdadm/mdadm.service
index 8389715e8..b3ca5f7a7 100644
--- a/core/mdadm/mdadm.service
+++ b/core/mdadm/mdadm.service
@@ -2,7 +2,7 @@
 Description=MDADM Event Monitor
 
 [Service]
-ExecStart=/sbin/mdadm --monitor --scan
+ExecStart=/usr/bin/mdadm --monitor --scan
 
 [Install]
 WantedBy=multi-user.target
diff --git a/core/mdadm/mdadm_hook b/core/mdadm/mdadm_hook
index 787be5d0c..5371baaca 100755
--- a/core/mdadm/mdadm_hook
+++ b/core/mdadm/mdadm_hook
@@ -43,7 +43,7 @@ run_hook() {
     fi
 
     # assemble everything
-    [ -s "$mdconfig" ] && /sbin/mdassemble
+    [ -s "$mdconfig" ] && /usr/bin/mdassemble
 }
 
 # vim: set ft=sh ts=4 sw=4 et:
diff --git a/core/mdadm/mdadm_install b/core/mdadm/mdadm_install
index 36b37fd0b..7390509fa 100644
--- a/core/mdadm/mdadm_install
+++ b/core/mdadm/mdadm_install
@@ -8,7 +8,7 @@ build() {
         echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays."
         add_file "/etc/mdadm.conf"
     fi
-    add_binary "/sbin/mdassemble"
+    add_binary "/usr/bin/mdassemble"
     add_file "/usr/lib/udev/rules.d/63-md-raid-arrays.rules"
 
     add_runscript
diff --git a/core/mdadm/mdadm_udev_install b/core/mdadm/mdadm_udev_install
index 5635b8f63..c01cbaf24 100644
--- a/core/mdadm/mdadm_udev_install
+++ b/core/mdadm/mdadm_udev_install
@@ -9,7 +9,7 @@ build() {
         add_file "/etc/mdadm.conf"
     fi
 
-    add_binary "mdadm"
+    add_binary "/usr/bin/mdadm"
     add_file "/usr/lib/udev/rules.d/63-md-raid-arrays.rules"
     add_file "/usr/lib/udev/rules.d/64-md-raid-assembly.rules"
 }
@@ -17,7 +17,7 @@ build() {
 help() {
   cat <<HELPEOF
 This hook loads the necessary modules for a RAID array and uses incremental
-assembly via udev at runtime to create the devices. This hook with NOT work
+assembly via udev at runtime to create the devices. This hook will NOT work
 without the udev hook included on the image.
 HELPEOF
 }