Sun Jun 3 00:04:13 UTC 2012

19 files changed, 325 insertions, 113 deletions

diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD
index 69238ea13..956361d38 100644
--- a/core/bash/PKGBUILD
+++ b/core/bash/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 158669 2012-05-06 12:13:14Z allan $
+# $Id: PKGBUILD 160448 2012-06-02 03:17:38Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=bash
 _basever=4.2
-_patchlevel=028 #prepare for some patches
+_patchlevel=029 #prepare for some patches
 pkgver=$_basever.$_patchlevel
 pkgrel=1
 pkgdesc="The GNU Bourne Again shell"
@@ -134,4 +134,6 @@ md5sums=('3fb927c7c33022f1c327f14a81c0d4b0'
          'a6ed82daf034587aee2f2581ba5fe829'
          '821620a0389df723644911c56796ca8c'
          'da9265aa2527fd4a7481baa3e0550287'
-         '0043f8b75f46f43608a67b863e300fe8')
+         '0043f8b75f46f43608a67b863e300fe8'
+         'ec444d229e8899fbaaf6fc7de2d82ae6'
+         'b632fca3a4943825bfaf3bd29df6b27d')
diff --git a/core/btrfs-progs/PKGBUILD b/core/btrfs-progs/PKGBUILD
index 4161b1d43..8b3f37ea8 100644
--- a/core/btrfs-progs/PKGBUILD
+++ b/core/btrfs-progs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156058 2012-04-12 15:42:01Z dreisner $
+# $Id: PKGBUILD 160394 2012-06-01 13:21:40Z dreisner $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=btrfs-progs
 pkgver=0.19.20120328
-pkgrel=2
+pkgrel=3
 pkgdesc="btrfs filesystem utilities"
 arch=(i686 x86_64)
 depends=('glibc' 'e2fsprogs')
@@ -16,7 +16,7 @@ source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz
         initcpio-install-btrfs
         initcpio-hook-btrfs)
 md5sums=('f4504e73cf9254779b78d5b2318ac570'
-         'bdaaf6bd339220c63260acec809864d2'
+         '3eae9bf1541e297fa72aa40ebf7320c6'
          'b09688a915a0ec8f40e2f5aacbabc9ad')
 
 build() {
diff --git a/core/btrfs-progs/initcpio-install-btrfs b/core/btrfs-progs/initcpio-install-btrfs
index dbeb47ee8..a70a324ed 100644
--- a/core/btrfs-progs/initcpio-install-btrfs
+++ b/core/btrfs-progs/initcpio-install-btrfs
@@ -1,9 +1,9 @@
 #!/bin/bash
 
 build() {
-    MODULES=$(all_modules btrfs)
-    BINARIES=btrfs
-    SCRIPT=btrfs
+    add_all_modules btrfs
+    add_binary btrfs
+    add_runscript
 }
 
 help() {
diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD
index fedc9ea92..aa12376ec 100644
--- a/core/cryptsetup/PKGBUILD
+++ b/core/cryptsetup/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 159428 2012-05-24 08:14:23Z thomas $
+# $Id: PKGBUILD 160396 2012-06-01 13:21:45Z dreisner $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=cryptsetup
 pkgver=1.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt"
 arch=(i686 x86_64)
 license=('GPL')
@@ -17,8 +17,8 @@ source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
         encrypt_install)
 sha256sums=('1fe80d7b19d24b3f65d2e446decfed859e2c4d17fdf7c19289d82dc7cd60dfe7'
             '4e6dbece8d1baad861479aca70d0cf30887420da9b5eab45d65d064c656893ed'
-            'e4c00e2da274bf4cab3f72a0de779790a11a946d36b83144e74d3791e230b262'
-            'cba1dc38ff6cc4d3740d0badfb2b151bb03d19e8e9fa497569ac2fb6f4196e0e')
+            'e0cbcabb81233b4d465833dca0faf1e762dc3cb6611597a25fe24e5d7209f316'
+            'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae')
 
 build() {
   cd "${srcdir}"/$pkgname-${pkgver}
diff --git a/core/cryptsetup/encrypt_hook b/core/cryptsetup/encrypt_hook
index 0f35782c6..372b7ba57 100644
--- a/core/cryptsetup/encrypt_hook
+++ b/core/cryptsetup/encrypt_hook
@@ -10,20 +10,21 @@ run_hook() {
         IFS=: read ckdev ckarg1 ckarg2 <<EOF
 $cryptkey
 EOF
-        if poll_device "${ckdev}" ${rootdelay}; then
+
+        if resolved=$(resolve_device "${ckdev}" ${rootdelay}); then
             case ${ckarg1} in
                 *[!0-9]*)
                     # Use a file on the device
                     # ckarg1 is not numeric: ckarg1=filesystem, ckarg2=path
                     mkdir /ckey
-                    mount -r -t "$ckarg1" "$ckdev" /ckey
+                    mount -r -t "$ckarg1" "$resolved" /ckey
                     dd if="/ckey/$ckarg2" of="$ckeyfile" >/dev/null 2>&1
                     umount /ckey
                     ;;
                 *)
                     # Read raw data from the block device
                     # ckarg1 is numeric: ckarg1=offset, ckarg2=length
-                    dd if="$ckdev" of="$ckeyfile" bs=1 skip="$ckarg1" count="$ckarg2" >/dev/null 2>&1
+                    dd if="$resolved" of="$ckeyfile" bs=1 skip="$ckarg1" count="$ckarg2" >/dev/null 2>&1
                     ;;
             esac
         fi
@@ -58,13 +59,13 @@ EOF
         esac
     done
 
-    if  poll_device "${cryptdev}" ${rootdelay}; then
-        if cryptsetup isLuks ${cryptdev} >/dev/null 2>&1; then
+    if resolved=$(resolve_device "${cryptdev}" ${rootdelay}); then
+        if cryptsetup isLuks ${resolved} >/dev/null 2>&1; then
             [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated
             dopassphrase=1
             # If keyfile exists, try to use that
             if [ -f ${ckeyfile} ]; then
-                if eval cryptsetup --key-file ${ckeyfile} luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; then
+                if eval cryptsetup --key-file ${ckeyfile} luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; then
                     dopassphrase=0
                 else
                     echo "Invalid keyfile. Reverting to passphrase."
@@ -76,7 +77,7 @@ EOF
                 echo "A password is required to access the ${cryptname} volume:"
 
                 #loop until we get a real password
-                while ! eval cryptsetup luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; do
+                while ! eval cryptsetup luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; do
                     sleep 2;
                 done
             fi
@@ -96,7 +97,7 @@ EOF
                 err "Non-LUKS decryption not attempted..."
                 return 1
             fi
-            exe="cryptsetup create $cryptname $cryptdev $cryptargs"
+            exe="cryptsetup create $cryptname $resolved $cryptargs"
             IFS=: read c_hash c_cipher c_keysize c_offset c_skip <<EOF
 $crypto
 EOF
diff --git a/core/cryptsetup/encrypt_install b/core/cryptsetup/encrypt_install
index 79d2f3e4b..38e5ddc57 100644
--- a/core/cryptsetup/encrypt_install
+++ b/core/cryptsetup/encrypt_install
@@ -1,13 +1,16 @@
 #!/bin/bash
 
 build() {
-    if [ -z "${CRYPTO_MODULES}" ]; then
-        MODULES=" dm-crypt $(all_modules "/crypto/")"
+    local mod
+
+    add_module dm-crypt
+    if [[ $CRYPTO_MODULES ]]; then
+        for mod in $CRYPTO_MODULES; do
+            add_module "$mod"
+        done
     else
-        MODULES=" dm-crypt $CRYPTO_MODULES"
+        add_all_modules '/crypto/'
     fi
-    FILES=""
-    SCRIPT="encrypt"
 
     add_binary "cryptsetup"
     add_binary "dmsetup"
@@ -15,10 +18,12 @@ build() {
     add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
     add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
     add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
+
+    add_runscript
 }
 
 help() {
-  cat <<HELPEOF
+    cat <<HELPEOF
 This hook allows for an encrypted root device. Users should specify the device
 to be unlocked using 'cryptdevice=device:dmname' on the kernel command line,
 where 'device' is the path to the raw device, and 'dmname' is the name given to
diff --git a/core/dmraid/PKGBUILD b/core/dmraid/PKGBUILD
index 5463a65c9..e3496143f 100644
--- a/core/dmraid/PKGBUILD
+++ b/core/dmraid/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 158621 2012-05-05 03:20:12Z dreisner $
+# $Id: PKGBUILD 160390 2012-06-01 13:21:33Z dreisner $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 #Contributor: Urs Wolfer <uwolfer @ fwo.ch>
 
 pkgname=dmraid
 pkgver=1.0.0.rc16.3
-pkgrel=4
+pkgrel=5
 pkgdesc="Device mapper RAID interface"
 url="http://people.redhat.com/~heinzm/sw/dmraid/"
 conflicts=('mkinitcpio<0.7')
@@ -17,7 +17,7 @@ source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2
         dmraid_hook)
 install=dmraid.install
 md5sums=('819338fcef98e8e25819f0516722beeb'
-         '832ed57a0f7ca6ba72adebcba2b17f87'
+         '2297d23cee1aef23ec6ad8d6d1870356'
          'faec669dc85f87187b45b5d3968efe2c')
 
 build() {
diff --git a/core/dmraid/dmraid_install b/core/dmraid/dmraid_install
index c48e6ceaf..d3238c1f7 100644
--- a/core/dmraid/dmraid_install
+++ b/core/dmraid/dmraid_install
@@ -1,17 +1,20 @@
 #!/bin/bash
 
 build() {
-    MODULES=" dm-mod dm-mirror "
-    BINARIES="dmraid dmsetup"
-    SCRIPT="dmraid"
+    add_module 'dm-mod'
+    add_module 'dm-mirror'
 
+    add_binary 'dmraid'
+    add_binary 'dmsetup'
     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"
+
+    add_runscript
 }
 
 help() {
-  cat <<HELPEOF
+    cat <<HELPEOF
 This hook loads the necessary modules for a dmraid root device.
 HELPEOF
 }
diff --git a/core/heirloom-mailx/PKGBUILD b/core/heirloom-mailx/PKGBUILD
index f8c8129dc..d7e82f00c 100644
--- a/core/heirloom-mailx/PKGBUILD
+++ b/core/heirloom-mailx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 142842 2011-11-16 20:25:47Z dan $
+# $Id: PKGBUILD 160422 2012-06-01 20:13:47Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s@arch@gmail.com>
 # Contributor: Andreas Wagner <Andreas.Wagner@em.uni-frankfurt.de>
@@ -47,7 +47,7 @@ build() {
        MAILRC=/etc/mail.rc \
        SENDMAIL=/usr/sbin/sendmail \
        MAILSPOOL=/var/spool/mail \
-       UCBINSTALL=/bin/install > makeflags
+       UCBINSTALL=/usr/bin/install > makeflags
 
   make `cat makeflags` IPv6=-DHAVE_IPv6_FUNCS
 }
diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD
index e70165f98..9cbb8bcf3 100644
--- a/core/lvm2/PKGBUILD
+++ b/core/lvm2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 158638 2012-05-05 04:07:30Z eric $
+# $Id: PKGBUILD 160347 2012-06-01 12:56:44Z dreisner $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
 pkgver=2.02.95
-pkgrel=4
+pkgrel=6
 arch=('i686' 'x86_64')
 url="http://sourceware.org/lvm2/"
 license=('GPL2' 'LGPL2.1')
@@ -16,13 +16,19 @@ source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
         11-dm-initramfs.rules)
 sha1sums=('f61dfbd8e9219291d11de3d70f0b3d20a29fae85'
           '45f5e31045065e7bdf5d6f2e21c857b4978024b4'
-          '08007f13cf1a9caf6e4aca76dd2ed6a4ab037601'
-          '7d63aa838703c9f986531a78164b556f765f5cce'
+          '3e1680f9b76ce9150d08865d99db90fd15532271'
+          'cedc9948123c870f9c5aa3357d0075b41a9c8135'
           'f6a554eea9557c3c236df2943bb6e7e723945c41')
 
 build() {
   cd "${srcdir}/LVM2.${pkgver}"
   unset LDFLAGS
+
+  # libudev.so.1.0.0 compat
+  sed -i 's,udev_get_dev_path([^)]\+),"/dev",' \
+      tools/dmsetup.c \
+      lib/misc/lvm-wrappers.c
+
   ./configure --prefix=/ --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \
     --includedir=/usr/include --with-usrlibdir=/usr/lib  --libdir=/usr/lib --with-udev-prefix=/usr \
     --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \
diff --git a/core/lvm2/lvm2_hook b/core/lvm2/lvm2_hook
index efb104998..e69b3349a 100644
--- a/core/lvm2/lvm2_hook
+++ b/core/lvm2/lvm2_hook
@@ -1,25 +1,24 @@
-# vim:set ft=sh:
-run_hook ()
-{
-    /sbin/modprobe -q dm-mod >/dev/null 2>&1
-    if [ -e "/sys/class/misc/device-mapper" ]; then
-        if [ ! -e "/dev/mapper/control" ]; then
-            local major minor
-            IFS=: read major minor < /sys/class/misc/device-mapper/dev
-            mkdir /dev/mapper
-            mknod "/dev/mapper/control" c ${major} ${minor}
-        fi
+#!/usr/bin/ash
 
-        # If the lvmwait= parameter has been specified on the command line
-        # wait for the device(s) before trying to activate the volume group(s)
-        for pvdev in ${lvmwait//,/ }; do
-            poll_device ${pvdev} ${rootdelay}
-        done
+run_hook() {
+    local pvdev
 
-        [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null"
+    modprobe -q dm-mod >/dev/null 2>&1
 
-        msg "Activating logical volumes..."
-        [ -d /etc/lvm ] && /sbin/lvm vgscan
-        eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET
+    # If the lvmwait= parameter has been specified on the command line
+    # wait for the device(s) before trying to activate the volume group(s)
+    for pvdev in ${lvmwait//,/ }; do
+        poll_device ${pvdev} ${rootdelay}
+    done
+
+    msg "Activating logical volumes..."
+    [ -d /etc/lvm ] && lvm vgscan
+
+    if [ -n "$quiet" ]; then
+      lvm vgchange --sysinit -a y >/dev/null
+    else
+      lvm vgchange --sysinit -a y
     fi
 }
+
+# vim: set ft=sh ts=4 sw=4 et:
diff --git a/core/lvm2/lvm2_install b/core/lvm2/lvm2_install
index 98a995b14..145ce49b2 100644
--- a/core/lvm2/lvm2_install
+++ b/core/lvm2/lvm2_install
@@ -1,11 +1,10 @@
-# vim: set ft=sh:
+#!/bin/bash
 
-build()
-{
-    MODULES=" dm-mod dm-snapshot dm-mirror"
-    BINARIES=""
-    FILES=""
-    SCRIPT="lvm2"
+build() {
+    local mod
+    for mod in dm-mod dm-snapshot dm-mirror; do
+        add_module "$mod"
+    done
 
     add_binary "/sbin/lvm"
     add_binary "/sbin/dmsetup"
@@ -14,16 +13,19 @@ build()
     add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
     add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules"
     add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
+
+    add_runscript
 }
 
-help ()
-{
-cat<<HELPEOF
-  This hook loads the necessary modules for an LVM2 root device.
+help() {
+  cat <<HELPEOF
+This hook loads the necessary modules for an LVM2 root device.
 
-  The optional lvmwait= parameter followed by a comma-separated
-  list of device names can be given on the command line.
-  It will cause the hook to wait until all given devices exist
-  before trying to scan and activate any volume groups.
+The optional lvmwait= parameter followed by a comma-separated
+list of device names can be given on the command line.
+It will cause the hook to wait until all given devices exist
+before trying to scan and activate any volume groups.
 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 0d168a62a..70166e1db 100644
--- a/core/mkinitcpio-nfs-utils/PKGBUILD
+++ b/core/mkinitcpio-nfs-utils/PKGBUILD
@@ -1,16 +1,20 @@
-# $Id: PKGBUILD 158597 2012-05-05 02:34:37Z dreisner $
+# $Id: PKGBUILD 160392 2012-06-01 13:21:36Z dreisner $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=mkinitcpio-nfs-utils
 pkgver=0.3
-pkgrel=2
+pkgrel=3
 pkgdesc="ipconfig and nfsmount tools for NFS root support in mkinitcpio"
 arch=('i686' 'x86_64')
 url="http://www.archlinux.org/"
 license=('GPL2')
 depends=('glibc')
-source=("ftp://ftp.archlinux.org/other/mkinitcpio/$pkgname-$pkgver.tar.xz")
-sha256sums=('d290d489844fae100ca7b848b8eef40078124ff373203086bacc07329d1e8939')
+source=("ftp://ftp.archlinux.org/other/mkinitcpio/$pkgname-$pkgver.tar.xz"
+        'initcpio-install-net'
+        'initcpio-hook-net')
+sha256sums=('d290d489844fae100ca7b848b8eef40078124ff373203086bacc07329d1e8939'
+            '8e5ddaacb0e5751e432f95870958c5fa2e01e1ab3f55b5eca2b8b2d030b5d861'
+            '29a5a4a9ebd61bfa1afbb8dcaf2187e487ee1f34b1979a85a853fa2acbeb510e')
 
 build() {
   make -C "$pkgname-$pkgver"
@@ -18,4 +22,8 @@ build() {
 
 package() {
   make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+
+  # override hooks, they need updates
+  install -m644 "$srcdir/initcpio-install-net" "$pkgdir/usr/lib/initcpio/install/net"
+  install -m644 "$srcdir/initcpio-hook-net" "$pkgdir/usr/lib/initcpio/hooks/net"
 }
diff --git a/core/mkinitcpio-nfs-utils/initcpio-hook-net b/core/mkinitcpio-nfs-utils/initcpio-hook-net
new file mode 100644
index 000000000..4d1ebb956
--- /dev/null
+++ b/core/mkinitcpio-nfs-utils/initcpio-hook-net
@@ -0,0 +1,90 @@
+# vim: set ft=sh:
+run_hook() {
+    local line i net_mac bootif_mac bootif_dev defaultrootpath defaultserver
+    # These variables will be parsed from /tmp/net-*.conf generated by ipconfig
+    local DEVICE
+    local IPV4ADDR IPV4BROADCAST IPV4NETMASK IPV4GATEWAY IPV4DNS0 IPV4DNS1
+    local HOSTNAME DNSDOMAIN NISDOMAIN ROOTSERVER ROOTPATH
+    local filename
+    # /tmp/net-*.conf
+
+    if [ -z "${ip}" -a -n "${nfsaddrs}" ]; then
+        ip="${nfsaddrs}"
+    fi
+
+    if [ -n "${ip}" ]; then
+        if [ -n "${BOOTIF}" ]; then
+            bootif_mac=${BOOTIF#01-}
+            bootif_mac=${bootif_mac//-/:}
+            for i in /sys/class/net/*/address; do
+                read net_mac < ${i}
+                if [ "${bootif_mac}" == "${net_mac}" ]; then
+                    bootif_dev=${i#/sys/class/net/}
+                    bootif_dev=${bootif_dev%/address}
+                    break
+                fi
+            done
+            ip="${ip}::${bootif_dev}"
+        fi
+
+        # setup network and save some values
+        ipconfig "ip=${ip}"
+
+        for conf in /tmp/net-*.conf; do
+            [ -f "$conf" ] && . "$conf"
+        done
+
+        # calculate nfs_server, nfs_path and nfs_option for later nfs mount
+        if [ "${root}" = "/dev/nfs" -o "${nfsroot}" != "" ]; then
+            # parse ROOTPATH if defined by dhcp server
+            if [ -n "${ROOTPATH}" ]; then
+                line="${ROOTPATH}"
+                nfs_server="${line%%:*}"
+                [ "${nfs_server}" = "${line}" ] && nfs_server="${ROOTSERVER}"
+                defaultserver="${nfs_server}"
+                line="${line#*:}"
+                nfs_path="${line}"
+                defaultrootpath="${nfs_path}"
+            else
+                # define a default ROOTPATH
+                if [ "${ROOTPATH}" = "" ]; then
+                    defaultrootpath="/tftpboot/${IPV4ADDR}"
+                fi
+            fi
+
+            # parse nfsroot if present (overrides ROOTPATH)
+            if [ -n "${nfsroot}" ]; then
+                line="${nfsroot}"
+                nfs_server="${line%%:*}"
+                [ -z "${nfs_server}" ] && nfs_server="${defaultserver}"
+                line="${line#*:}"
+                nfs_path="${line%%,*}"
+                line="${line#"${nfs_path}"}"
+                [ -z "${nfs_path}" ] && nfs_path="${defaultrootpath}"
+                nfs_option="${line#","}"
+            fi
+
+            # ensure root and filesystem type are set proper for nfs boot
+            root="/dev/nfs"
+            rootfstype="nfs"
+
+            echo "NFS-Mount: ${nfs_server}:${nfs_path}"
+
+            # set mount handler for NFS
+            mount_handler="nfs_mount_handler"
+        fi
+    fi
+}
+
+nfs_mount_handler() {
+    if [ -z "$nfs_server" -o -z "$nfs_path" ]; then
+        err "Unable to mount root filesystem over NFS: wrong parameters."
+        echo "You are being dropped to a recovery shell"
+        echo "    Type 'exit' to try and continue booting"
+        launch_interactive_shell
+        msg "Trying to continue (this will most likely fail) ..."
+    fi
+    nfsmount ${nfs_option:+-o ${nfs_option}} "${nfs_server}:${nfs_path}" "$1"
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
diff --git a/core/mkinitcpio-nfs-utils/initcpio-install-net b/core/mkinitcpio-nfs-utils/initcpio-install-net
new file mode 100644
index 000000000..7030e2d64
--- /dev/null
+++ b/core/mkinitcpio-nfs-utils/initcpio-install-net
@@ -0,0 +1,107 @@
+#!/bin/bash
+
+build() {
+    add_checked_modules '/drivers/net/'
+
+    add_binary "/usr/lib/initcpio/ipconfig" "/bin/ipconfig"
+    add_binary "/usr/lib/initcpio/nfsmount" "/bin/nfsmount"
+
+    add_runscript
+}
+
+help() {
+    cat <<HELPEOF
+This hook loads the necessary modules for a network device.
+Detection will take place at runtime. To minimize the modules
+in the image, add the autodetect hook too.
+For pcmcia net devices please use pcmcia hook too.
+
+Kernel Parameters:
+An interface spec can be either short form, which is just the name of
+an interface (eth0 or whatever), or long form.  The long form consists
+of up to seven elements, separated by colons:
+
+ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf>
+nfsaddrs= is an alias to ip= and can be used too.
+
+<client-ip>   IP address of the client. If empty, the address will
+              either be determined by RARP/BOOTP/DHCP. What protocol
+              is used de- pends on the <autoconf> parameter. If this
+              parameter is not empty, autoconf will be used.
+
+<server-ip>   IP address of the NFS server. If RARP is used to
+              determine the client address and this parameter is NOT
+              empty only replies from the specified server are
+              accepted. To use different RARP and NFS server,
+              specify your RARP server here (or leave it blank), and
+              specify your NFS server in the 'nfsroot' parameter
+              (see above). If this entry is blank the address of the
+              server is used which answered the RARP/BOOTP/DHCP
+              request.
+
+<gw-ip>       IP address of a gateway if the server is on a different
+              subnet. If this entry is empty no gateway is used and the
+              server is assumed to be on the local network, unless a
+              value has been received by BOOTP/DHCP.
+
+<netmask>     Netmask for local network interface. If this is empty,
+              the netmask is derived from the client IP address assuming
+              classful addressing, unless overridden in BOOTP/DHCP reply.
+
+<hostname>    Name of the client. If empty, the client IP address is
+              used in ASCII notation, or the value received by
+              BOOTP/DHCP.
+
+<device>      Name of network device to use. If this is empty, all
+              devices are used for RARP/BOOTP/DHCP requests, and the
+              first one we receive a reply on is configured. If you
+              have only one device, you can safely leave this blank.
+
+<autoconf>    Method to use for autoconfiguration. If this is either
+              'rarp', 'bootp', or 'dhcp' the specified protocol is
+              used.  If the value is 'both', 'all' or empty, all
+              protocols are used.  'off', 'static' or 'none' means
+              no autoconfiguration.
+Examples:
+ip=127.0.0.1:::::lo:none  --> Enable the loopback interface.
+ip=192.168.1.1:::::eth2:none --> Enable static eth2 interface.
+ip=:::::eth0:dhcp --> Enable dhcp protcol for eth0 configuration.
+
+nfsroot=[<server-ip>:]<root-dir>[,<nfs-options>]
+
+If the 'nfsroot' parameter is NOT given on the command line, the default
+"/tftpboot/%s" will be used.
+
+<server-ip>   Specifies the IP address of the NFS server. If this field
+              is not given, the default address as determined by the
+              'ip' variable (see below) is used. One use of this
+              parameter is for example to allow using different servers
+              for RARP and NFS. Usually you can leave this blank.
+
+<root-dir>    Name of the directory on the server to mount as root. If
+              there is a "%s" token in the string, the token will be
+              replaced by the ASCII-representation of the client's IP
+              address.
+
+<nfs-options> Standard NFS options. All options are separated by commas.
+              If the options field is not given, the following defaults
+              will be used:
+                      port            = as given by server portmap daemon
+                      rsize           = 1024
+                      wsize           = 1024
+                      timeo           = 7
+                      retrans         = 3
+                      acregmin        = 3
+                      acregmax        = 60
+                      acdirmin        = 30
+                      acdirmax        = 60
+                      flags           = hard, nointr, noposix, cto, ac
+
+root=/dev/nfs
+
+If you don't use nfsroot= parameter you need to set root=/dev/nfs
+to boot from a nfs root by autoconfiguration.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
diff --git a/core/procps-ng/PKGBUILD b/core/procps-ng/PKGBUILD
index 5e45ba2e4..28af717d3 100644
--- a/core/procps-ng/PKGBUILD
+++ b/core/procps-ng/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 158584 2012-05-05 00:40:00Z eric $
+# $Id: PKGBUILD 160407 2012-06-01 18:48:22Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=procps-ng
-pkgver=3.3.2
-pkgrel=2
+pkgver=3.3.3
+pkgrel=1
 pkgdesc="Utilities for monitoring your system and processes on your system"
 arch=('i686' 'x86_64')
 url="http://gitorious.org/procps"
@@ -15,28 +15,15 @@ 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')
+source=(procps-ng-${pkgver}.tar.gz::http://gitorious.org/procps/procps/archive-tarball/v${pkgver}
+        sysctl.conf)
+sha1sums=('e78a098f1a3c06722155800cc5cfa0c865af03c0'
+          'ddf0dab2e3612d44903fc02f46316cabbec4651e')
 
 build() {
   cd "${srcdir}/procps-procps"
+  echo ${pkgver} > .tarball-version
   ./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
 }
diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD
index 5b99070d0..eaf765f3f 100644
--- a/core/sudo/PKGBUILD
+++ b/core/sudo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 159265 2012-05-20 05:50:51Z allan $
+# $Id: PKGBUILD 160450 2012-06-02 03:17:41Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sudo
-_ver=1.8.5p1
+_ver=1.8.5p2
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgrel=1
 pkgdesc="Give certain users the ability to run some commands as root"
@@ -15,8 +15,8 @@ backup=('etc/sudoers' 'etc/pam.d/sudo')
 options=('!libtool' '!makeflags')
 source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz{,.sig}
         sudo.pam)
-md5sums=('3b843e60e0bb226a24dd784345cbbba8'
-         '0f789f30462c2658afe9bd16602d76b1'
+md5sums=('dc42ed9f0946d92273762d0ae7314d59'
+         '756d80fc1c996d4f5458deec5a69b5c4'
          '4e7ad4ec8f2fe6a40e12bcb2c0b256e3')
 
 build() {
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index 6760067ad..8d43830fd 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 155728 2012-04-06 00:04:01Z tomegun $
+# $Id: PKGBUILD 160349 2012-06-01 12:56:46Z dreisner $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=util-linux
-pkgver=2.21.1
-pkgrel=2
+pkgver=2.21.2
+pkgrel=1
 pkgdesc="Miscellaneous system utilities for Linux"
 url="http://www.kernel.org/pub/linux/utils/util-linux/"
 arch=('i686' 'x86_64')
 groups=('base')
-depends=('udev')
+depends=('udev' 'pam')
 conflicts=('util-linux-ng')
 provides=("util-linux-ng=${pkgver}")
 license=('GPL2')
 options=('!libtool')
 source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.21/${pkgname}-${pkgver}.tar.xz)
-optdepends=('perl: for chkdupexe support')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -29,7 +28,7 @@ build() {
               --enable-write \
               --enable-raw \
               --disable-wall \
-              --enable-libmount-mount
+              --enable-new-mount
 
   make
 }
@@ -47,7 +46,10 @@ package() {
 
   install -dm755 var/lib/hwclock
 
+  # broken tool, going away in next major release, so just remove it now
+  rm "${pkgdir}"/usr/{bin/chkdupexe,share/man/man1/chkdupexe.1}
+
   # delete stray empty dir, fixed upstream
   rm -r usr/share/man/ru
 }
-md5sums=('ad602dcd528f340b1329cfa6200d8f80')
+md5sums=('54ba880f1d66782c2287ee2c898520e9')
diff --git a/core/vi/PKGBUILD b/core/vi/PKGBUILD
index edb6f7939..0a5c7f815 100644
--- a/core/vi/PKGBUILD
+++ b/core/vi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 142189 2011-11-06 02:27:51Z stephane $
+# $Id: PKGBUILD 160405 2012-06-01 18:35:53Z eric $
 # Maintainer: tobias [ tobias at archlinux org ]
 
 pkgname=vi
@@ -40,7 +40,7 @@ build() {
 package() {
   cd "${srcdir}/ex-${pkgver}"
 
-  make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex INSTALL=/bin/install \
+  make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex INSTALL=/usr/bin/install \
       DESTDIR="$pkgdir" install
 
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"