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

27 files changed, 531 insertions, 189 deletions

diff --git a/core/acl/PKGBUILD b/core/acl/PKGBUILD
index dd6ffd124..447079d77 100644
--- a/core/acl/PKGBUILD
+++ b/core/acl/PKGBUILD
@@ -1,8 +1,9 @@
-# $Id: PKGBUILD 123916 2011-05-14 10:31:07Z thomas $
+# $Id: PKGBUILD 158574 2012-05-05 00:02:35Z allan $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
+
 pkgname=acl
 pkgver=2.2.51
-pkgrel=1
+pkgrel=2
 pkgdesc="Access control list utilities, libraries and headers"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://savannah.nongnu.org/projects/acl"
@@ -12,23 +13,22 @@ replaces=('xfsacl')
 provides=('xfsacl')
 conflicts=('xfsacl')
 options=('!libtool')
-source=(http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.src.tar.gz)
-sha256sums=('06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225')
+source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.src.tar.gz"{,.sig})
+sha256sums=('06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225'
+            '10893e2a044905acc88e2d98291e739b7b858b36c836ff66a3532909964067ce')
 
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd "$pkgname-$pkgver"
 
-  export INSTALL_USER=root INSTALL_GROUP=root 
-  ./configure --prefix=/usr --libdir=/lib --libexecdir=/usr/lib
-  make 
+  export INSTALL_USER=root INSTALL_GROUP=root
+  ./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib
+  make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DIST_ROOT="${pkgdir}" install install-lib install-dev
+  make -C "$pkgname-$pkgver" DIST_ROOT="$pkgdir" install install-lib install-dev
 
   # tidy up
-  rm -f ${pkgdir}/lib/libacl.a
-  chmod 0755 ${pkgdir}/lib/libacl.so.*.*.*
+  rm -f "$pkgdir"/usr/lib/libacl.a
+  chmod 0755 "$pkgdir"/usr/lib/libacl.so.*.*.*
 }
diff --git a/core/attr/PKGBUILD b/core/attr/PKGBUILD
index af16b61c8..65b5d7545 100644
--- a/core/attr/PKGBUILD
+++ b/core/attr/PKGBUILD
@@ -1,8 +1,9 @@
-# $Id: PKGBUILD 123916 2011-05-14 10:31:07Z thomas $
+# $Id: PKGBUILD 158576 2012-05-05 00:02:37Z allan $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
+
 pkgname=attr
 pkgver=2.4.46
-pkgrel=1
+pkgrel=2
 pkgdesc="Extended attribute support library for ACL support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://savannah.nongnu.org/projects/attr"
@@ -13,25 +14,25 @@ replaces=('xfsattr')
 provides=('xfsattr')
 conflicts=('xfsattr')
 options=('!libtool')
-source=(http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.src.tar.gz)
-sha256sums=('dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f')
+source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.src.tar.gz"{,.sig})
+sha256sums=('dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f'
+            'a8ee37a0d02c0365049b8a06dc6963e6698a448ff2c0a54ed040f0c60f27bca3')
 
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  
+  cd "$pkgname-$pkgver"
+
   export INSTALL_USER=root INSTALL_GROUP=root
-  ./configure --prefix=/usr --libdir=/lib --libexecdir=/usr/lib
+  ./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib
   make
 }
 
 package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-
-  make DIST_ROOT="${pkgdir}" install install-lib install-dev
+  make -C "$pkgname-$pkgver" DIST_ROOT="$pkgdir" install install-lib install-dev
 
   # tidy up
-  rm -f "${pkgdir}"/lib/libattr.a
-  chmod 0755 "${pkgdir}"/lib/libattr.so.*.*.*
+  rm -f "$pkgdir"/usrlib/libattr.a
+  chmod 0755 "$pkgdir"/usr/lib/libattr.so.*.*.*
+
   # remove conflicting manpages
-  rm -rf "${pkgdir}"/usr/share/man/man2
+  rm -rf "$pkgdir"/usr/share/man/man2
 }
diff --git a/core/crda/PKGBUILD b/core/crda/PKGBUILD
index 300107b22..c22889fbf 100644
--- a/core/crda/PKGBUILD
+++ b/core/crda/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 150888 2012-02-23 13:53:54Z allan $
+# $Id: PKGBUILD 158615 2012-05-05 03:17:06Z allan $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=crda
 pkgver=1.1.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Central Regulatory Domain Agent for wireless networks"
 arch=(i686 x86_64 'mips64el')
 url="http://wireless.kernel.org/en/developers/Regulatory/CRDA"
@@ -18,7 +18,6 @@ md5sums=('5226f65aebacf94baaf820f8b4e06df4'
          'c1f7aff29f15a0364ae6f7905a1d4ae6')
                   
 build() {
-  msg "Compiling crda ..."
   cd "${srcdir}"/${pkgname}-${pkgver}
   patch -Np1 -i "$srcdir/libnl32.patch"
   sed 's|^#!/usr/bin/env python|#!/usr/bin/python2|' -i utils/key2pub.py
@@ -27,15 +26,12 @@ build() {
 
 package() {
   # Install crda, regdbdump and udev rules
-  msg "Installing crda ..."
   cd "${srcdir}"/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" UDEV_RULE_DIR=/usr/lib/udev/rules.d/ install
   # This rule automatically sets the regulatory domain when cfg80211 is loaded
-  echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/etc/rc.d/wireless-regdom start >/dev/null"' >> "${pkgdir}"/lib/udev/rules.d/85-regulatory.rules
+  echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/etc/rc.d/wireless-regdom start >/dev/null"' >> "${pkgdir}"/usr/lib/udev/rules.d/85-regulatory.rules
 
-  msg "Installing license ..."
   install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/crda/LICENSE
   
-  msg "Installing boot script ..."
   install -D -m755 "${srcdir}"/crda.rc "${pkgdir}"/etc/rc.d/wireless-regdom
 }
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:
diff --git a/core/libcap/PKGBUILD b/core/libcap/PKGBUILD
index 5cbe23582..cd7b32b4e 100644
--- a/core/libcap/PKGBUILD
+++ b/core/libcap/PKGBUILD
@@ -1,10 +1,10 @@
-#$Id: PKGBUILD 151511 2012-02-27 01:00:35Z allan $
+#$Id: PKGBUILD 158556 2012-05-04 23:56:45Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=libcap
 pkgver=2.22
-pkgrel=2.1
+pkgrel=3
 pkgdesc="POSIX 1003.1e capabilities"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sites.google.com/site/fullycapable/"
@@ -21,7 +21,11 @@ build() {
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  make prefix=/usr DESTDIR=${pkgdir} LIBDIR=${pkgdir}/lib RAISE_SETFCAP=no install
-  rm ${pkgdir}/lib/*.a
-  chmod 755 ${pkgdir}/lib/libcap.so.${pkgver}
+  make prefix=/usr DESTDIR=${pkgdir} RAISE_SETFCAP=no install
+  
+  chmod 755 ${pkgdir}/usr/lib/libcap.so.${pkgver}
+  rm ${pkgdir}/usr/lib/libcap.a
+  
+  install -Dm644 pam_cap/capability.conf \
+    $pkgdir/usr/share/doc/$pkgname/capability.conf.example
 }
diff --git a/core/linux-atm/PKGBUILD b/core/linux-atm/PKGBUILD
index 5134874b1..e84fe6afc 100644
--- a/core/linux-atm/PKGBUILD
+++ b/core/linux-atm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142964 2011-11-19 08:22:13Z tpowa $
+# $Id: PKGBUILD 158611 2012-05-05 03:12:24Z dreisner $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Surain Mallawa Arachchi <mas@crc32.net>
 
 pkgname=linux-atm
 pkgver=2.5.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Drivers and tools to support ATM networking under Linux."
 arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc')
@@ -19,6 +19,10 @@ md5sums=('d49499368c3cf15f73a05d9bce8824a8'
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i ../man-pages.patch
+
+  # install firmware in /usr/lib
+  sed -i "s#/lib/firmware#/usr/lib/firmware#" src/extra/Makefile.in
+
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD
index d80e88886..b527ea833 100644
--- a/core/mdadm/PKGBUILD
+++ b/core/mdadm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157942 2012-04-30 07:17:54Z tpowa $
+# $Id: PKGBUILD 158626 2012-05-05 03:23:11Z dreisner $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 pkgname=mdadm
 pkgver=3.2.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
@@ -19,16 +19,7 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
         mdadm_hook
         mdadm_udev_install
         disable-werror.patch)
-
-install=mdadm.install
 replaces=('raidtools')
-md5sums=('d789d6ecb9c1d5ebcc64f0fc52bca92f'
-         '6df172c8f77b280018cf87eb3d313f29'
-         '00cbed931db4f15b6ce49e3e7d433966'
-         '9b01e96b6c3c218fb61628c9281fe688'
-         'c8c0713f5c7da51822ee6f3911473a1c'
-         'cd258e1bf430c02a25f40b4329df9f57'
-         '4ad87b74a4bc9a34621280abe0e0c3e4')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -50,4 +41,14 @@ package() {
   install -D -m644 ../mdadm_udev_install $pkgdir/usr/lib/initcpio/install/mdadm_udev
   # symlink for backward compatibility
   ln -sf /usr/lib/initcpio/hooks/mdadm  $pkgdir/usr/lib/initcpio/hooks/raid
+  # move /lib/* to /usr/lib/
+  mv $pkgdir/lib/udev $pkgdir/usr/lib/
+  rm -rf $pkgdir/lib
 }
+md5sums=('d789d6ecb9c1d5ebcc64f0fc52bca92f'
+         '8333d405f550317c2bacd5510bf1cb60'
+         '00cbed931db4f15b6ce49e3e7d433966'
+         '9b01e96b6c3c218fb61628c9281fe688'
+         'fbb5542d9bdf87441a11dd7e7a0a17f8'
+         '2318b99701dba9b01a6891c62be7bc1c'
+         '4ad87b74a4bc9a34621280abe0e0c3e4')
diff --git a/core/mdadm/mdadm b/core/mdadm/mdadm
index e196f3642..9bf468e98 100755
--- a/core/mdadm/mdadm
+++ b/core/mdadm/mdadm
@@ -3,28 +3,33 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-PID=`pidof -o %PPID /sbin/mdadm`
-case "$1" in
+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" ]; then 
-       /sbin/mdadm --monitor --scan -i /var/run/mdadm.pid -f
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
+    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"
-    [ ! -z "$PID" ] && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
+    if [[ $PID ]] && kill "$PID" &>/dev/null; then
       rm_daemon mdadm
       stat_done
+    else
+      stat_fail
     fi
     ;;
   restart)
@@ -33,5 +38,5 @@ case "$1" in
     $0 start
     ;;
   *)
-    echo "usage: $0 {start|stop|restart}"  
+    echo "usage: $0 {start|stop|restart}"
 esac
diff --git a/core/mdadm/mdadm_hook b/core/mdadm/mdadm_hook
index 7b2dc1ad1..787be5d0c 100755
--- a/core/mdadm/mdadm_hook
+++ b/core/mdadm/mdadm_hook
@@ -1,44 +1,49 @@
-# vim: set ft=sh:
-run_hook ()
-{
-    input="$(cat /proc/cmdline)"
-    mdconfig="/etc/mdadm.conf"
+#!/usr/bin/ash
+
+run_hook() {
+    local i= mdconfig=/etc/mdadm.conf
+
     # for partitionable raid, we need to load md_mod first!
     modprobe md_mod 2>/dev/null
-    # If md is specified on commandline, create config file from those parameters.
-    if [ "$(echo $input | grep "md=")" ]; then
-        #Create initial mdadm.conf
-        # scan all devices in /proc/partitions
-        echo DEVICE partitions > $mdconfig
-        for i in $input; do 
+
+    if [ -n "$md" ]; then
+        echo 'DEVICE partitions' >"$mdconfig"
+        for i in $(cat /proc/cmdline); do
             case $i in
-                # raid 
+                # raid
                 md=[0-9]*,/*)
-                    device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=||g')"
-                    array="$(echo $i | cut -d, -f2-)"
-                    echo "ARRAY /dev/$device devices=$array" >> $mdconfig
+                    device=${i%%,*}
+                    device=${device/=/}
+                    array=${i#*,}
+                    echo "ARRAY /dev/$device devices=$array"
                     ;;
                 # partitionable raid
                 md=d[0-9]*,/*)
-                    device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=|_|g')"
-                    array="$(echo $i | cut -d, -f2-)"
-                    echo "ARRAY /dev/$device devices=$array" >> $mdconfig
+                    device=${i%%,*}
+                    device=${device/=/_}
+                    array=${i#*,}
+                    echo "ARRAY /dev/$device devices=$array"
                     ;;
-                # raid UUID 
-                md=[0-9]*,[0-9,a-z]*)
-                    device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=||g')"
-                    array="$(echo $i | cut -d, -f2-)"
-                    echo "ARRAY /dev/$device UUID=$array" >> $mdconfig
+                # raid UUID
+                md=[0-9]*,[0-9,a-fA-F]*)
+                    device=${i%%,*}
+                    device=${device/=/}
+                    array=${i#*,}
+                    echo "ARRAY /dev/$device UUID=$array"
                     ;;
                 # partitionable raid UUID
-                md=d[0-9]*,[0-9,a-z]*)
-                    device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=|_|g')"
-                    array="$(echo $i | cut -d, -f2-)"
-                    echo "ARRAY /dev/$device UUID=$array" >> $mdconfig
+                md=d[0-9]*,[0-9,a-fA-F]*)
+                    device=${i%%,*}
+                    device=${device/=/_}
+                    array=${i#*,}
+                    echo "ARRAY /dev/$device UUID=$array"
                     ;;
-            esac 
-        done
+            esac
+        done >>"$mdconfig"
     fi
+
     # assemble everything
-    [ -e $mdconfig ] && /sbin/mdassemble
+    [ -s "$mdconfig" ] && /sbin/mdassemble
 }
+
+# vim: set ft=sh ts=4 sw=4 et:
diff --git a/core/mdadm/mdadm_udev_install b/core/mdadm/mdadm_udev_install
index 9fc161624..be653fc74 100644
--- a/core/mdadm/mdadm_udev_install
+++ b/core/mdadm/mdadm_udev_install
@@ -1,23 +1,22 @@
-# vim: set ft=sh:
+#!/bin/bash
+
+build() {
+    MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-")"
 
-build()
-{
-    MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") "
-    BINARIES=""
-    FILES=""
-    SCRIPT=""
     # check if a custom mdadm.conf exists
-    if grep -q ^ARRAY /etc/mdadm.conf; then
+    if grep -qw ^ARRAY "$BASEDIR/etc/mdadm.conf"; then
         echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays."
         add_file "/etc/mdadm.conf"
     fi
-    add_binary "/sbin/mdadm"
-    add_file "/lib/udev/rules.d/64-md-raid.rules"
+
+    add_binary "mdadm"
+    add_file "/usr/lib/udev/rules.d/64-md-raid.rules"
 }
 
-help ()
-{
-cat<<HELPEOF
+help() {
+  cat <<HELPEOF
   This hook loads raid arrays with udev.
 HELPEOF
 }
+
+# vim: set ft=sh ts=4 sw=4 et:
diff --git a/core/mkinitcpio-nfs-utils/PKGBUILD b/core/mkinitcpio-nfs-utils/PKGBUILD
index 69b494888..d9d2bd5dc 100644
--- a/core/mkinitcpio-nfs-utils/PKGBUILD
+++ b/core/mkinitcpio-nfs-utils/PKGBUILD
@@ -1,23 +1,21 @@
-# $Id: PKGBUILD 138224 2011-09-19 12:04:53Z pierre $
+# $Id: PKGBUILD 158597 2012-05-05 02:34:37Z dreisner $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=mkinitcpio-nfs-utils
-pkgver=0.2
+pkgver=0.3
 pkgrel=2
 pkgdesc="ipconfig and nfsmount tools for NFS root support in mkinitcpio"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.archlinux.org/"
 license=('GPL2')
 depends=('glibc')
-source=(ftp://ftp.archlinux.org/other/mkinitcpio/${pkgname}-${pkgver}.tar.gz)
-sha256sums=('3f2839f21a420cd732d34e58f84534acdb7fc29f69381dbba3f00e3424201cd3')
+source=("ftp://ftp.archlinux.org/other/mkinitcpio/$pkgname-$pkgver.tar.xz")
+sha256sums=('d290d489844fae100ca7b848b8eef40078124ff373203086bacc07329d1e8939')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make
+  make -C "$pkgname-$pkgver"
 }
 
 package() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
 }
diff --git a/core/nilfs-utils/PKGBUILD b/core/nilfs-utils/PKGBUILD
index 79316346d..71eaa9b30 100644
--- a/core/nilfs-utils/PKGBUILD
+++ b/core/nilfs-utils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 147682 2012-01-26 19:27:33Z ibiru $
+# $Id: PKGBUILD 158619 2012-05-05 03:17:23Z dreisner $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 
 pkgname=nilfs-utils
 pkgver=2.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nilfs.org/"
@@ -17,11 +17,11 @@ md5sums=('caa7d8b7121311bd978120e2f0c45d81')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  ./configure --libdir=/lib --enable-libmount
+  ./configure --enable-libmount
   make
 }
 
 package() {
-   cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install LDCONFIG=/bin/true
 }
diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD
index 21e9088b8..eb714c6be 100644
--- a/core/pam/PKGBUILD
+++ b/core/pam/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 146453 2012-01-11 15:21:11Z stephane $
+# $Id: PKGBUILD 158558 2012-05-04 23:56:48Z allan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=pam
 pkgver=1.1.5
-pkgrel=2
+pkgrel=3
 pkgdesc="PAM (Pluggable Authentication Modules) library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
@@ -23,20 +23,24 @@ md5sums=('927ee5585bdec5256c75117e9348aa47'
 
 build() {
   cd $srcdir/Linux-PAM-$pkgver
-  ./configure --sysconfdir=/etc DESTDIR=$pkgdir --libdir=/lib
+  ./configure --libdir=/usr/lib
+  make
+
+  cd $srcdir/pam_unix2-2.6
+  ./configure --libdir=/usr/lib
   make
 }
 
 package() {
   cd $srcdir/Linux-PAM-$pkgver
-  make INSTALL=/bin/install DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir install
   install -D -m644 ../other $pkgdir/etc/pam.d/other
+
   # build pam_unix2 module
   # source ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2
   cd $srcdir/pam_unix2-2.6
-  ./configure
-  make
   make DESTDIR=$pkgdir install
+
   # add the realtime permissions for audio users
   sed -i 's|# End of file||' $pkgdir/etc/security/limits.conf
   cat >>$pkgdir/etc/security/limits.conf <<_EOT
@@ -46,12 +50,14 @@ package() {
 @audio          -       nice           -10
 @audio          -       memlock         40000
 _EOT
+
   # fix some missing symlinks from old pam for compatibility
-  cd $pkgdir/lib/security
+  cd $pkgdir/usr/lib/security
   ln -s pam_unix.so pam_unix_acct.so
   ln -s pam_unix.so pam_unix_auth.so
   ln -s pam_unix.so pam_unix_passwd.so
   ln -s pam_unix.so pam_unix_session.so
+
   # set unix_chkpwd uid
   chmod +s $pkgdir/sbin/unix_chkpwd
 }
diff --git a/core/procps-ng/PKGBUILD b/core/procps-ng/PKGBUILD
new file mode 100644
index 000000000..5e45ba2e4
--- /dev/null
+++ b/core/procps-ng/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id: PKGBUILD 158584 2012-05-05 00:40:00Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgname=procps-ng
+pkgver=3.3.2
+pkgrel=2
+pkgdesc="Utilities for monitoring your system and processes on your system"
+arch=('i686' 'x86_64')
+url="http://gitorious.org/procps"
+license=('GPL' 'LGPL')
+groups=('base')
+depends=('ncurses')
+conflicts=('procps')
+provides=('procps')
+replaces=('procps')
+backup=('etc/sysctl.conf')
+options=('!libtool')
+source=(http://gitorious.org/procps/procps/archive-tarball/v${pkgver} sysctl.conf
+        sysctl_man.patch includes_restrict.patch gnu-kbsd-version.patch
+        complain_unmounted_proc.patch sig_printf_literal.patch
+        makefile_watch_ncurses.patch)
+sha1sums=('889692f891e790ea035315ec321cce92d00a8db2'
+          'ddf0dab2e3612d44903fc02f46316cabbec4651e'
+          '39d6562b83389ec4893de88ec88222f7169fa732'
+          'd588825497fef0b057491377421fd8f68730d181'
+          '9eb2bb32a13656b5d671f9cffed3094399a26048'
+          'bf57f5a1f54a0f4a6d9e99d66b8e447225c3371d'
+          '25be10b456d56b8bdf6260276c60738a7d76a34d'
+          '9fc24e48f902c19315e2557e4deea5592bbfad7e')
+
+build() {
+  cd "${srcdir}/procps-procps"
+  ./autogen.sh
+  patch -p1 < ../sysctl_man.patch
+  patch -p1 < ../includes_restrict.patch
+  patch -p1 < ../gnu-kbsd-version.patch
+  patch -p1 < ../complain_unmounted_proc.patch
+  patch -p1 < ../sig_printf_literal.patch
+  patch -p1 < ../makefile_watch_ncurses.patch
+  ./configure --exec-prefix=/ --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib
+  make
+}
+
+package() {
+  cd "${srcdir}/procps-procps"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 "${srcdir}/sysctl.conf" "${pkgdir}/etc/sysctl.conf"
+}
diff --git a/core/procps-ng/complain_unmounted_proc.patch b/core/procps-ng/complain_unmounted_proc.patch
new file mode 100644
index 000000000..ed932dbba
--- /dev/null
+++ b/core/procps-ng/complain_unmounted_proc.patch
@@ -0,0 +1,17 @@
+Author: <hesso@hesso.pool.math.tu-berlin.de>
+Description: Complain when /proc/version cannot be found instead of
+exiting silently.
+--- a/proc/version.c
++++ b/proc/version.c
+@@ -33,8 +33,10 @@
+     char buf[256];
+     int version_string_depth;
+     
+-    if ( (fp=fopen("/proc/version","r")) == NULL) /* failure implies impending death */
++    if ( (fp=fopen("/proc/version","r")) == NULL) {
++      fprintf(stderr, "Cannot find /proc/version - is /proc mounted?\n");
+       exit(1);
++    }
+     if (fgets(buf, 256, fp) == NULL) {
+       fprintf(stderr, "Cannot read kernel version from /proc/version\n");
+       fclose(fp);
diff --git a/core/procps-ng/gnu-kbsd-version.patch b/core/procps-ng/gnu-kbsd-version.patch
new file mode 100644
index 000000000..f310a4c93
--- /dev/null
+++ b/core/procps-ng/gnu-kbsd-version.patch
@@ -0,0 +1,38 @@
+Author: <csmall@debian.org>
+Description: Rework version parsing so its ok with other OSes
+--- a/proc/version.c
++++ b/proc/version.c
+@@ -28,20 +28,26 @@
+ int linux_version_code;
+ 
+ void init_Linux_version(void) {
+-    static struct utsname uts;
+     int x = 0, y = 0, z = 0;	/* cleared in case sscanf() < 3 */
++    FILE *fp;
++    char buf[256];
+     int version_string_depth;
+     
+-    if (uname(&uts) == -1)	/* failure implies impending death */
+-	exit(1);
+-
+-    version_string_depth = sscanf(uts.release, "%d.%d.%d", &x, &y, &z);
++    if ( (fp=fopen("/proc/version","r")) == NULL) /* failure implies impending death */
++      exit(1);
++    if (fgets(buf, 256, fp) == NULL) {
++      fprintf(stderr, "Cannot read kernel version from /proc/version\n");
++      fclose(fp);
++      exit(1);
++    }
++    fclose(fp);
++    version_string_depth = sscanf(buf, "Linux version %d.%d.%d", &x, &y, &z);
+ 	
+     if ((version_string_depth < 2) ||		 /* Non-standard for all known kernels */
+        ((version_string_depth < 3) && (x < 3))) /* Non-standard for 2.x.x kernels */
+ 	fprintf(stderr,		/* *very* unlikely to happen by accident */
+ 		"Non-standard uts for running kernel:\n"
+-		"release %s=%d.%d.%d gives version code %d\n",
+-		uts.release, x, y, z, LINUX_VERSION(x,y,z));
++		"%s=%d.%d.%d gives version code %d\n",
++		buf, x, y, z, LINUX_VERSION(x,y,z));
+     linux_version_code = LINUX_VERSION(x, y, z);
+ }
diff --git a/core/procps-ng/includes_restrict.patch b/core/procps-ng/includes_restrict.patch
new file mode 100644
index 000000000..417e93223
--- /dev/null
+++ b/core/procps-ng/includes_restrict.patch
@@ -0,0 +1,144 @@
+Author: Craig Small <csmall@debian.org>
+Description: Change restrict to __restrict
+ procps automake defines restrict which means the binaries for procps
+ binaries compile. However external programs may not of defined
+ restrict. includes from libc6 use __restrict and if is good enough for
+ them, its good enough for us.
+
+--- a/proc/devname.h
++++ b/proc/devname.h
+@@ -10,9 +10,9 @@
+ #define ABBREV_TTY  2     /* remove tty           */
+ #define ABBREV_PTS  4     /* remove pts/          */
+ 
+-extern unsigned dev_to_tty(char *restrict ret, unsigned chop, dev_t dev_t_dev, int pid, unsigned int flags);
++extern unsigned dev_to_tty(char *__restrict ret, unsigned chop, dev_t dev_t_dev, int pid, unsigned int flags);
+ 
+-extern int tty_to_dev(const char *restrict const name);
++extern int tty_to_dev(const char *__restrict const name);
+ 
+ EXTERN_C_END
+ #endif
+--- a/proc/escape.h
++++ b/proc/escape.h
+@@ -14,10 +14,10 @@
+ #define ESC_BRACKETS 0x2  // if using cmd, put '[' and ']' around it
+ #define ESC_DEFUNCT  0x4  // mark zombies with " <defunct>"
+ 
+-extern int escape_strlist(char *restrict dst, char *restrict const *restrict src, size_t n, int *cells);
+-extern int escape_str(char *restrict dst, const char *restrict src, int bufsize, int *maxcells);
+-extern int escape_command(char *restrict const outbuf, const proc_t *restrict const pp, int bytes, int *cells, unsigned flags);
+-extern int escaped_copy(char *restrict dst, const char *restrict src, int bufsize, int *maxroom);
++extern int escape_strlist(char *__restrict dst, char *__restrict const *__restrict src, size_t n, int *cells);
++extern int escape_str(char *__restrict dst, const char *__restrict src, int bufsize, int *maxcells);
++extern int escape_command(char *__restrict const outbuf, const proc_t *__restrict const pp, int bytes, int *cells, unsigned flags);
++extern int escaped_copy(char *__restrict dst, const char *__restrict src, int bufsize, int *maxroom);
+ 
+ EXTERN_C_END
+ #endif
+--- a/proc/procps.h
++++ b/proc/procps.h
+@@ -103,6 +103,6 @@
+ #endif
+ 
+ 
+-typedef void (*message_fn)(const char *restrict, ...) __attribute__((format(printf,1,2)));
++typedef void (*message_fn)(const char *__restrict, ...) __attribute__((format(printf,1,2)));
+ 
+ #endif
+--- a/proc/readproc.h
++++ b/proc/readproc.h
+@@ -173,10 +173,10 @@
+ //    char deBug1[64];
+     pid_t	taskdir_user;  // for threads
+     int         did_fake; // used when taskdir is missing
+-    int(*finder)(struct PROCTAB *restrict const, proc_t *restrict const);
+-    proc_t*(*reader)(struct PROCTAB *restrict const, proc_t *restrict const);
+-    int(*taskfinder)(struct PROCTAB *restrict const, const proc_t *restrict const, proc_t *restrict const, char *restrict const);
+-    proc_t*(*taskreader)(struct PROCTAB *restrict const, const proc_t *restrict const, proc_t *restrict const, char *restrict const);
++    int(*finder)(struct PROCTAB *__restrict const, proc_t *__restrict const);
++    proc_t*(*reader)(struct PROCTAB *__restrict const, proc_t *__restrict const);
++    int(*taskfinder)(struct PROCTAB *__restrict const, const proc_t *__restrict const, proc_t *__restrict const, char *__restrict const);
++    proc_t*(*taskreader)(struct PROCTAB *__restrict const, const proc_t *__restrict const, proc_t *__restrict const, char *__restrict const);
+     pid_t*	pids;	// pids of the procs
+     uid_t*	uids;	// uids of procs
+     int		nuid;	// cannot really sentinel-terminate unsigned short[]
+@@ -200,8 +200,8 @@
+     int ntask;                //  *  readproctab2
+ } proc_data_t;                //  *  when PROC_LOOSE_TASKS set
+ 
+-extern proc_data_t *readproctab2(int(*want_proc)(proc_t *buf), int(*want_task)(proc_t *buf), PROCTAB *restrict const PT);
+-extern proc_data_t *readproctab3(int(*want_task)(proc_t *buf), PROCTAB *restrict const PT);
++extern proc_data_t *readproctab2(int(*want_proc)(proc_t *buf), int(*want_task)(proc_t *buf), PROCTAB *__restrict const PT);
++extern proc_data_t *readproctab3(int(*want_task)(proc_t *buf), PROCTAB *__restrict const PT);
+ 
+ // Convenient wrapper around openproc and readproc to slurp in the whole process
+ // table subset satisfying the constraints of flags and the optional PID list.
+@@ -222,12 +222,12 @@
+ //       only before first use.  Thereafter, the library will manage such
+ //       a passed proc_t, freeing any additional acquired memory associated
+ //       with the previous process or thread.
+-extern proc_t* readproc(PROCTAB *restrict const PT, proc_t *restrict p);
+-extern proc_t* readtask(PROCTAB *restrict const PT, const proc_t *restrict const p, proc_t *restrict t);
+-extern proc_t* readeither(PROCTAB *restrict const PT, proc_t *restrict x);
++extern proc_t* readproc(PROCTAB *__restrict const PT, proc_t *__restrict p);
++extern proc_t* readtask(PROCTAB *__restrict const PT, const proc_t *__restrict const p, proc_t *__restrict t);
++extern proc_t* readeither(PROCTAB *__restrict const PT, proc_t *__restrict x);
+ 
+ // warning: interface may change
+-extern int read_cmdline(char *restrict const dst, unsigned sz, unsigned pid);
++extern int read_cmdline(char *__restrict const dst, unsigned sz, unsigned pid);
+ 
+ extern void look_up_our_self(proc_t *p);
+ 
+--- a/proc/sig.h
++++ b/proc/sig.h
+@@ -16,13 +16,13 @@
+ EXTERN_C_BEGIN
+ 
+ /* return -1 on failure */
+-extern int signal_name_to_number(const char *restrict name);
++extern int signal_name_to_number(const char *__restrict name);
+ 
+ extern const char *signal_number_to_name(int signo);
+ 
+-extern int print_given_signals(int argc, const char *restrict const *restrict argv, int max_line);
++extern int print_given_signals(int argc, const char *__restrict const *__restrict argv, int max_line);
+ 
+-extern char *strtosig(const char *restrict s);
++extern char *strtosig(const char *__restrict s);
+ 
+ extern void pretty_print_signals(void);
+ 
+--- a/proc/sysinfo.h
++++ b/proc/sysinfo.h
+@@ -57,11 +57,11 @@
+ 
+ #define BUFFSIZE (64*1024)
+ typedef unsigned long long jiff;
+-extern void getstat(jiff *restrict cuse, jiff *restrict cice, jiff *restrict csys, jiff *restrict cide, jiff *restrict ciow, jiff *restrict cxxx, jiff *restrict cyyy, jiff *restrict czzz,
+-	     unsigned long *restrict pin, unsigned long *restrict pout, unsigned long *restrict s_in, unsigned long *restrict sout,
+-	     unsigned *restrict intr, unsigned *restrict ctxt,
+-	     unsigned int *restrict running, unsigned int *restrict blocked,
+-	     unsigned int *restrict btime, unsigned int *restrict processes);
++extern void getstat(jiff *__restrict cuse, jiff *__restrict cice, jiff *__restrict csys, jiff *__restrict cide, jiff *__restrict ciow, jiff *__restrict cxxx, jiff *__restrict cyyy, jiff *__restrict czzz,
++	     unsigned long *__restrict pin, unsigned long *__restrict pout, unsigned long *__restrict s_in, unsigned long *__restrict sout,
++	     unsigned *__restrict intr, unsigned *__restrict ctxt,
++	     unsigned int *__restrict running, unsigned int *__restrict blocked,
++	     unsigned int *__restrict btime, unsigned int *__restrict processes);
+ 
+ extern void meminfo(void);
+ 
+--- a/proc/wchan.h
++++ b/proc/wchan.h
+@@ -6,8 +6,8 @@
+ EXTERN_C_BEGIN
+ 
+ extern const char * lookup_wchan(unsigned KLONG address, unsigned pid);
+-extern int   open_psdb(const char *restrict override);
+-extern int   open_psdb_message(const char *restrict override, message_fn message);
++extern int   open_psdb(const char *__restrict override);
++extern int   open_psdb_message(const char *__restrict override, message_fn message);
+ 
+ EXTERN_C_END
+ 
diff --git a/core/procps-ng/makefile_watch_ncurses.patch b/core/procps-ng/makefile_watch_ncurses.patch
new file mode 100644
index 000000000..08d70bdc7
--- /dev/null
+++ b/core/procps-ng/makefile_watch_ncurses.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -383,7 +383,7 @@
+ @WITH_NCURSES_TRUE@slabtop_SOURCES = slabtop.c $(top_srcdir)/lib/strutils.c
+ @WITH_NCURSES_TRUE@slabtop_LDADD = @NCURSES_LIBS@
+ @WITH_NCURSES_TRUE@watch_SOURCES = watch.c $(top_srcdir)/lib/strutils.c
+-@WITH_NCURSES_TRUE@watch_LDADD = @NCURSES_LIBS@
++@WITH_NCURSES_TRUE@watch_LDADD = @WATCH_NCURSES_LIBS@
+ kill_SOURCES = skill.c $(top_srcdir)/lib/strutils.c
+ skill_SOURCES = skill.c $(top_srcdir)/lib/strutils.c
+ snice_SOURCES = skill.c $(top_srcdir)/lib/strutils.c
diff --git a/core/procps-ng/sig_printf_literal.patch b/core/procps-ng/sig_printf_literal.patch
new file mode 100644
index 000000000..2140abf0d
--- /dev/null
+++ b/core/procps-ng/sig_printf_literal.patch
@@ -0,0 +1,11 @@
+--- a/proc/sig.c
++++ b/proc/sig.c
+@@ -257,7 +257,7 @@
+   while(++i <= number_of_signals){
+     int n;
+     n = printf("%2d %s", i, signal_number_to_name(i));
+-    if(n>0 && i%7) printf("           \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + n);
++    if(n>0 && i%7) printf("%s", "           \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + n);
+     else printf("\n");
+   }
+   if((i-1)%7) printf("\n");
diff --git a/core/procps-ng/sysctl.conf b/core/procps-ng/sysctl.conf
new file mode 100644
index 000000000..44906a21a
--- /dev/null
+++ b/core/procps-ng/sysctl.conf
@@ -0,0 +1,42 @@
+# /etc/sysctl.conf - Configuration file for setting system variables
+# See sysctl.conf (5) for information.
+
+# you can have the CD-ROM close when you use it, and open
+# when you are done.
+#dev.cdrom.autoeject = 1
+#dev.cdrom.autoclose = 1
+
+# protection from the SYN flood attack
+net.ipv4.tcp_syncookies = 1
+
+# see the evil packets in your log files
+#net.ipv4.conf.all.log_martians = 1
+
+# if not functioning as a router, there is no need to accept redirects or source routes
+#net.ipv4.conf.all.accept_redirects = 0
+#net.ipv4.conf.all.accept_source_route = 0
+#net.ipv6.conf.all.accept_redirects = 0
+#net.ipv6.conf.all.accept_source_route = 0
+
+# Disable packet forwarding
+net.ipv4.ip_forward = 0
+net.ipv6.conf.all.forwarding = 0
+
+# sets the port range used for outgoing connections
+#net.ipv4.ip_local_port_range = 32768    61000
+
+# Swapping too much or not enough? Disks spinning up when you'd
+# rather they didn't? Tweak these.
+#vm.vfs_cache_pressure = 100
+#vm.laptop_mode = 0
+#vm.swappiness = 60
+
+#kernel.printk_ratelimit_burst = 10
+#kernel.printk_ratelimit = 5
+#kernel.panic_on_oops = 0
+
+# Reboot 600 seconds after a panic
+#kernel.panic = 600
+
+# Disable SysRq key (note: console security issues)
+kernel.sysrq = 0
diff --git a/core/procps-ng/sysctl_man.patch b/core/procps-ng/sysctl_man.patch
new file mode 100644
index 000000000..d6023edfb
--- /dev/null
+++ b/core/procps-ng/sysctl_man.patch
@@ -0,0 +1,20 @@
+--- a/sysctl.8
++++ b/sysctl.8
+@@ -55,7 +55,7 @@
+ \fB\-w\fR, \fB\-\-write\fR
+ Use this option when you want to change a sysctl setting.
+ .TP
+-\fB\-p\fR, \fB\-\-load\fR[=\fIFILE\fR]
++\fB\-p\fR[\fIFILE\fR], \fB\-\-load\fR[=\fIFILE\fR]
+ Load in sysctl settings from the file specified or /etc/sysctl.conf if none
+ given.  Specifying \- as filename means reading data from standard input.
+ .TP
+@@ -117,7 +117,7 @@
+ .br
+ /sbin/sysctl \-w kernel.domainname="example.com"
+ .br
+-/sbin/sysctl \-p /etc/sysctl.conf
++/sbin/sysctl \-p/etc/sysctl.conf
+ .br
+ /sbin/sysctl \-a \-\-pattern forward
+ .br
diff --git a/core/sysfsutils/PKGBUILD b/core/sysfsutils/PKGBUILD
index 0d725bfb3..a76eb10bf 100644
--- a/core/sysfsutils/PKGBUILD
+++ b/core/sysfsutils/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 142543 2011-11-11 21:17:05Z tpowa $
+# $Id: PKGBUILD 158624 2012-05-05 03:20:18Z dreisner $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=sysfsutils
 pkgver=2.1.0
-pkgrel=7
+pkgrel=8
 pkgdesc="System Utilities Based on Sysfs"
 arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
@@ -15,22 +15,18 @@ md5sums=('14e7dcd0436d2f49aa403f67e1ef7ddc')
 options=(!libtool)
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}" 
+  cd "$pkgname-$pkgver"
   ./configure --prefix=/usr --mandir=/usr/share/man
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$pkgname-$pkgver"
   make check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}" 
-  make DESTDIR="${pkgdir}" install
-
-  cd "${pkgdir}"
-  mkdir -v lib
-  mv -v usr/lib/libsysfs.so.2* lib/
-  ln -svf ../../lib/libsysfs.so.2 usr/lib/libsysfs.so
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  rm "$pkgdir/usr/lib/libsysfs.a"
 }
diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD
index c7b4d62e5..e859ab6f7 100644
--- a/core/udev/PKGBUILD
+++ b/core/udev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 156062 2012-04-12 15:54:20Z tomegun $
+# $Id: PKGBUILD 158599 2012-05-05 02:34:43Z dreisner $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=udev
 pkgver=182
-pkgrel=1
+pkgrel=2
 pkgdesc="The userspace dev tools (udev)"
 depends=('util-linux' 'glib2' 'kmod' 'pciutils' 'usbutils' 'bash' 'acl')
 install=udev.install
@@ -52,9 +52,6 @@ package() {
 
   # udevd moved, symlink to make life easy for restarting udevd manually
   ln -s ../lib/udev/udevd ${pkgdir}/usr/bin/udevd
-  # and for users of the old /lib location (to go away soon)
-  mkdir -p ${pkgdir}/lib/udev
-  ln -s ../../usr/lib/udev/udevd ${pkgdir}/lib/udev/udevd
 
   # the path to udevadm is hardcoded in some places
   install -d ${pkgdir}/sbin
diff --git a/core/xfsprogs/PKGBUILD b/core/xfsprogs/PKGBUILD
index f3b848d07..334c3c4a9 100644
--- a/core/xfsprogs/PKGBUILD
+++ b/core/xfsprogs/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 156218 2012-04-16 08:21:43Z tpowa $
-# Maintainer: Paul Mattal <paul@archlinux.org>
+# $Id: PKGBUILD 158617 2012-05-05 03:17:20Z dreisner $
+#
 pkgname=xfsprogs
 pkgver=3.1.8
-pkgrel=1
+pkgrel=2
 pkgdesc="XFS filesystem utilities"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://oss.sgi.com/projects/xfs/"
 groups=('base')
-depends=('util-linux-ng>=2.16')
+depends=('util-linux')
 options=('!makeflags' '!libtool')
 # We mirror the sources as upstream tends to move them once a new release is out
 source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz")
@@ -19,6 +19,7 @@ build() {
   export OPTIMIZER="-march=${CARCH/_/-} -O1"
   [ "$CARCH" = "mips64el" ] && export OPTIMIZER="-mabi=n32 -march=loongson2f -O1"
   export DEBUG=-DNDEBUG
+  ./configure --prefix=/usr
   make
 }
 
@@ -27,4 +28,7 @@ package() {
   make DIST_ROOT="${pkgdir}" install install-dev
   chown -R root $pkgdir
   chgrp -R root $pkgdir
+  # add hack as we cannot set rootlibdir
+  mv "${pkgdir}"/lib/libhandle.so* "${pkgdir}/usr/lib/"
+  rm -rf "${pkgdir}/lib"
 }
diff --git a/core/zlib/PKGBUILD b/core/zlib/PKGBUILD
index f96090f18..dc3e18b8a 100644
--- a/core/zlib/PKGBUILD
+++ b/core/zlib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 148444 2012-01-31 23:47:55Z pierre $
+# $Id: PKGBUILD 158552 2012-05-04 22:14:53Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=zlib
-pkgver=1.2.6
+pkgver=1.2.7
 pkgrel=1
 pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP'
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,7 +10,7 @@ license=('custom')
 url="http://www.zlib.net/"
 depends=('glibc')
 source=("http://zlib.net/current/zlib-${pkgver}.tar.gz")
-md5sums=('618e944d7c7cd6521551e30b32322f4a')
+md5sums=('60df6a37c56e7c1366cca812414f7b85')
 
 build() {
 	cd ${srcdir}/zlib-$pkgver