21 files changed, 253 insertions, 53 deletions
diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD
index 41df57604..718f8b6de 100644
--- a/core/binutils/PKGBUILD
+++ b/core/binutils/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 155399 2012-04-03 11:09:56Z allan $
+# $Id: PKGBUILD 157323 2012-04-27 00:50:16Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 
 pkgname=binutils
 pkgver=2.22
-pkgrel=5
+pkgrel=6
 _date=20120323
 pkgdesc="A set of programs to assemble and manipulate binary and object files"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,8 +16,10 @@ depends=('glibc>=2.15' 'zlib')
 checkdepends=('dejagnu')
 options=('!libtool' '!distcc' '!ccache')
 install=binutils.install
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2)
-md5sums=('de2ac4298732827f8af706fc24020330')
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2
+        binutils-2.22-ld-13621.patch)
+md5sums=('de2ac4298732827f8af706fc24020330'
+         '86d9445914c9d51bfe575ecbac265be0')
 
 mksource() {
   mkdir ${pkgname}-${_date}
@@ -30,6 +32,10 @@ mksource() {
 }
 
 build() {
+  cd ${srcdir}/binutils
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=13621
+  patch -p1 -i $srcdir/binutils-2.22-ld-13621.patch
+
   cd ${srcdir}
   mkdir binutils-build && cd binutils-build
 
diff --git a/core/binutils/binutils-2.22-ld-13621.patch b/core/binutils/binutils-2.22-ld-13621.patch
new file mode 100644
index 000000000..ffb2ab825
--- /dev/null
+++ b/core/binutils/binutils-2.22-ld-13621.patch
@@ -0,0 +1,27 @@
+diff --git a/bfd/linker.c b/bfd/linker.c
+index c51c5df..0404474 100644
+--- a/bfd/linker.c
++++ b/bfd/linker.c
+@@ -3208,6 +3208,12 @@ fix_syms (struct bfd_link_hash_entry *h, void *data)
+ 		op = op1;
+ 	    }
+ 
++	  /* Refuse to choose a section for which we are out of bounds.  */
++	  /* ??? This may make most of the above moot.  */
++	  if (h->u.def.value < op->vma
++	      || h->u.def.value > op->vma + op->size)
++	    op = bfd_abs_section_ptr;
++
+ 	  h->u.def.value -= op->vma;
+ 	  h->u.def.section = op;
+ 	}
+index 95b7ef4..a9c05f9 100644
+--- a/ld/testsuite/ld-elf/warn2.d
++++ b/ld/testsuite/ld-elf/warn2.d
+@@ -13,5 +13,5 @@
+ # construct and that the symbol still appears as expected.
+ 
+ #...
+- +[0-9]+: +[0-9a-f]+ +20 +OBJECT +GLOBAL +DEFAULT +[1-9] Foo
++ +[0-9]+: +[0-9a-f]+ +20 +OBJECT +GLOBAL +DEFAULT +ABS Foo
+ #pass
diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD
index 83f108937..b4a12b532 100644
--- a/core/cryptsetup/PKGBUILD
+++ b/core/cryptsetup/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 146230 2012-01-06 14:32:39Z thomas $
+# $Id: PKGBUILD 157320 2012-04-26 22:51:21Z eric $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=cryptsetup
 pkgver=1.4.1
-pkgrel=1
+pkgrel=3
 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
@@ -18,10 +18,10 @@ source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
 sha256sums=('82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb'
             '71c6506d4b6d0b22b9b6c2a68e604959e4c072af04680ed6acc0126c97bdbc88'
             '811bbea1337106ad811731c746d73ee81039bad00aef52398e3a377ad0766757'
-            'd4380195351b70abf8fcb3cd19461879c55a7a07e4915d1f0365b295b112a573')
+            'ddbbdcb8eff93a3a7622ec633e90d5c0d68e3afbeaf942dc2309adab345047d4')
 build() {
   cd "${srcdir}"/$pkgname-${pkgver}
-  ./configure --prefix=/usr --disable-static --sbindir=/sbin --libdir=/lib
+  ./configure --prefix=/usr --disable-static --sbindir=/sbin
   make
 }
 
@@ -29,9 +29,6 @@ package() {
   cd "${srcdir}"/$pkgname-${pkgver}
   make DESTDIR="${pkgdir}" install
   # install hook
-  install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/lib/initcpio/hooks/encrypt
-  install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/lib/initcpio/install/encrypt
-  # Fix pkgconfig location
-  install -d -m755 "${pkgdir}"/usr/lib
-  mv "${pkgdir}"/lib/pkgconfig "${pkgdir}"/usr/lib/
+  install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt
+  install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt
 }
diff --git a/core/cryptsetup/encrypt_install b/core/cryptsetup/encrypt_install
index 13174ec06..9ed50e863 100644
--- a/core/cryptsetup/encrypt_install
+++ b/core/cryptsetup/encrypt_install
@@ -12,10 +12,10 @@ build()
     [ -f "/sbin/cryptsetup" ] && add_binary "/sbin/cryptsetup" "/sbin/cryptsetup"
     [ -f "/usr/sbin/cryptsetup" ] && add_binary "/usr/sbin/cryptsetup" "/sbin/cryptsetup"
     add_binary "/sbin/dmsetup"
-    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 "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.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"
+    add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
 }
 
 help ()
diff --git a/core/fakeroot/PKGBUILD b/core/fakeroot/PKGBUILD
index d3fd6f97d..574159c6b 100644
--- a/core/fakeroot/PKGBUILD
+++ b/core/fakeroot/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 144854 2011-12-08 12:17:14Z allan $
+# $Id: PKGBUILD 157325 2012-04-27 00:50:20Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Jochem Kossen <j.kossen@home.nl>
 
 pkgname=fakeroot
-pkgver=1.18.2
+pkgver=1.18.3
 pkgrel=1
 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ install=fakeroot.install
 depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh')
 options=('!libtool')
 source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2)
-md5sums=('79f32331358ad58499704ea5e19fd0ae')
+md5sums=('99c6ba2eb0005086144ee9f1f6fd63f4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/grep/PKGBUILD b/core/grep/PKGBUILD
index 2a2fda2cf..6d4d76ad7 100644
--- a/core/grep/PKGBUILD
+++ b/core/grep/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 153418 2012-03-13 08:24:31Z allan $
+# $Id: PKGBUILD 157327 2012-04-27 00:50:23Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=grep
-pkgver=2.11
-pkgrel=2
+pkgver=2.12
+pkgrel=1
 pkgdesc="A string search utility"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
@@ -13,15 +13,12 @@ groups=('base')
 depends=('glibc' 'pcre' 'sh')
 makedepends=('texinfo')
 install=${pkgname}.install
-source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
-        grep-2.11-exclude-dir-crash.patch)
-md5sums=('ad9c6dbdeab93e50d2bc380f10ed3643'
-         'e4fea5e355973c951f93f48bc86f92fa'
-         'e882644cf8c1a4e37da7ba8c0867e70b')
+source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
+md5sums=('8d2f0346d08b13c18afb81f0e8aa1e2f'
+         '7a25f2ece647b8637f4ae1de474712e7')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p1 -i $srcdir/grep-2.11-exclude-dir-crash.patch
   ./configure --prefix=/usr --without-included-regex
   make
 }
diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD
index 48435da86..f892eeabc 100644
--- a/core/lvm2/PKGBUILD
+++ b/core/lvm2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 153950 2012-03-21 02:16:27Z eric $
+# $Id: PKGBUILD 157318 2012-04-26 22:51:18Z eric $
 # 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=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceware.org/lvm2/"
 license=('GPL2' 'LGPL2.1')
@@ -16,18 +16,16 @@ source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
         11-dm-initramfs.rules)
 sha1sums=('f61dfbd8e9219291d11de3d70f0b3d20a29fae85'
           '45f5e31045065e7bdf5d6f2e21c857b4978024b4'
-          '7f108b2f2056eb050fc898bf5190ecf9145aed8a'
+          '08007f13cf1a9caf6e4aca76dd2ed6a4ab037601'
           '7d63aa838703c9f986531a78164b556f765f5cce'
           'f6a554eea9557c3c236df2943bb6e7e723945c41')
 
 build() {
   cd "${srcdir}/LVM2.${pkgver}"
-  sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh
   unset LDFLAGS
-  ./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \
-    --includedir=/usr/include --with-usrlibdir=/usr/lib \
+  ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --localstatedir=/var \
     --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \
-    --with-udevdir=/lib/udev/rules.d/ --enable-udev_sync --enable-udev_rules
+    --enable-udev_sync --enable-udev_rules
   make
 }
 
@@ -39,7 +37,7 @@ package_device-mapper() {
   cd "${srcdir}/LVM2.${pkgver}"
   make DESTDIR="${pkgdir}" install_device-mapper
   # extra udev rule for device-mapper in initramfs
-  install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/lib/initcpio/udev/11-dm-initramfs.rules"
+  install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/usr/lib/initcpio/udev/11-dm-initramfs.rules"
 }
 
 package_lvm2() {
@@ -56,6 +54,6 @@ package_lvm2() {
   # /etc directories
   install -d "${pkgdir}"/etc/lvm/{archive,backup}
   # mkinitcpio hook
-  install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/lib/initcpio/hooks/lvm2"
-  install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/lib/initcpio/install/lvm2"
+  install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/lvm2"
+  install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2"
 }
diff --git a/core/lvm2/lvm2_install b/core/lvm2/lvm2_install
index 94175b523..98a995b14 100644
--- a/core/lvm2/lvm2_install
+++ b/core/lvm2/lvm2_install
@@ -9,11 +9,11 @@ build()
 
     add_binary "/sbin/lvm"
     add_binary "/sbin/dmsetup"
-    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 "/lib/udev/rules.d/11-dm-lvm.rules"
-    add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.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"
+    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"
 }
 
 help ()
diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD
index 7ee8f4942..cfd4a0bb5 100644
--- a/core/nfs-utils/PKGBUILD
+++ b/core/nfs-utils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 152724 2012-03-09 12:06:10Z tpowa $
+# $Id: PKGBUILD 157236 2012-04-26 13:06:19Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
@@ -7,12 +7,12 @@
 
 pkgname=nfs-utils
 pkgver=1.2.5
-pkgrel=2
+pkgrel=4
 pkgdesc="Support programs for Network File Systems"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://nfs.sourceforge.net'
 license=('GPL')
-backup=(etc/{exports,idmapd.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf})
+backup=(etc/{exports,idmapd.conf,nfsmount.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf})
 depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue' 'device-mapper')
 makedepends=('pkgconfig' 'autoconf' 'automake')
 source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2
@@ -23,8 +23,18 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn
 	exports
 	idmapd.conf
 	start-statd.patch
+        nfs
 	nfs-utils-1.1.4-mtab-sym.patch
-	nfs-utils-1.1.4-no-exec.patch)
+	nfs-utils-1.1.4-no-exec.patch
+	rpc-gssd.service
+	rpc-mountd.service
+	rpc-svcgssd.service
+	rpc-idmapd.service
+	rpc-statd.service
+	nfsd.service
+	var-lib-nfs-rpc_pipefs.mount
+	proc-fs-nfsd.mount
+	nfs-utils.conf)
 install=nfs-utils.install
 md5sums=('8395ac770720b83c5c469f88306d7765'
          'dd0d65fc6e8f422fa12520813098264b'
@@ -34,8 +44,18 @@ md5sums=('8395ac770720b83c5c469f88306d7765'
          'ff585faf410a62c4333a027c50b56bae'
          'eb4f4027fab6fc1201f1ca04f5954c76'
          'e9144277a89a620d9bc80413158a7d27'
+         'f5e7bba09a46c5c5d7007cac6eff9df5'
          '7674106eaaa4c149bccd4f05fe3604e9'
-         '4f4827dfc93008dfadd0a530ad0872b2')
+         '4f4827dfc93008dfadd0a530ad0872b2'
+         '38855936dc55a5afe37d84edc0f11066'
+         '8d888de677a217c5e5f7244a2e3a2d3a'
+         'e05705d9ccccaeaeb1ecaee20adc05bc'
+         'd7df7bc311fd95c5b80017dd1741570d'
+         '2e72ee082cba5d3ec6f51d2a105664da'
+         '5d33d2e754fd37280365b287603bac90'
+         '1cd65909fa0983047f3f06a3ab352401'
+         '02a34835aa077146a90eb7d191e612d0'
+         '8ac484023d786766d287ccbe878ae4ba')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver}
@@ -44,9 +64,10 @@ build() {
   # arch specific patch
   patch -Np0 -i $srcdir/start-statd.patch
 
-  ./configure --prefix=/usr --enable-nfsv3 --enable-nfsv4 --enable-gss \
+  ./configure --prefix=/usr --enable-nfsv4 --enable-nfsv41 --enable-gss \
               --without-tcp-wrappers --with-statedir=/var/lib/nfs \
-              --enable-ipv6 --sysconfdir=/etc --enable-libmount-mount
+              --enable-ipv6 --sysconfdir=/etc --enable-libmount-mount \
+              --enable-mountconfig
 
   make 
 }
@@ -66,6 +87,13 @@ package() {
   install -D -m 644 ../idmapd.conf "$pkgdir/"etc/idmapd.conf
   install -D -m 644 ../nfs-common.conf "$pkgdir/"etc/conf.d/nfs-common.conf
   install -D -m 644 ../nfs-server.conf "$pkgdir/"etc/conf.d/nfs-server.conf
+  install -D -m 644 ../nfs "$pkgdir/"etc/conf.d/nfs
+  install -D -m 644 utils/mount/nfsmount.conf "$pkgdir/"etc/nfsmount.conf
+  # systemd files
+  for i in ${srcdir}/*.{service,mount}; do
+    install -D -m 644 $i "$pkgdir/"usr/lib/systemd/system/$(basename $i)
+  done
+  install -D -m 644 ../nfs-utils.conf "$pkgdir/"usr/lib/modules-load.d/nfs-utils.conf
   # directories
   mkdir "$pkgdir/"etc/exports.d
   mkdir "$pkgdir/"var/lib/nfs/rpc_pipefs
diff --git a/core/nfs-utils/nfs b/core/nfs-utils/nfs
new file mode 100644
index 000000000..2d33cf3d4
--- /dev/null
+++ b/core/nfs-utils/nfs
@@ -0,0 +1,40 @@
+#
+# Optinal options passed to rquotad
+RPCRQUOTADOPTS=""
+#
+# Optional arguments passed to in-kernel lockd
+#LOCKDARG=
+# TCP port rpc.lockd should listen on.
+#LOCKD_TCPPORT=32803
+# UDP port rpc.lockd should listen on.
+#LOCKD_UDPPORT=32769
+#
+# Optional arguments passed to rpc.nfsd. See rpc.nfsd(8)
+RPCNFSDARGS=""
+# Number of nfs server processes to be started.
+# The default is 8. 
+RPCNFSDCOUNT=8
+# Set V4 grace period in seconds
+#NFSD_V4_GRACE=90
+#
+# Optional arguments passed to rpc.mountd. See rpc.mountd(8)
+RPCMOUNTDOPTS=""
+#
+# Optional arguments passed to rpc.statd. See rpc.statd(8)
+STATDARG=""
+#
+# Optional arguments passed to rpc.idmapd. See rpc.idmapd(8)
+RPCIDMAPDARGS=""
+#
+# Optional arguments passed to rpc.gssd. See rpc.gssd(8)
+RPCGSSDARGS=""
+#
+# Optional arguments passed to rpc.svcgssd. See rpc.svcgssd(8)
+RPCSVCGSSDARGS=""
+#
+# To enable RDMA support on the server by setting this to
+# the port the server should listen on
+#RDMA_PORT=20049 
+#
+# Optional arguments passed to blkmapd. See blkmapd(8)
+BLKMAPDARGS=""
diff --git a/core/nfs-utils/nfs-utils.conf b/core/nfs-utils/nfs-utils.conf
new file mode 100644
index 000000000..33c97b838
--- /dev/null
+++ b/core/nfs-utils/nfs-utils.conf
@@ -0,0 +1 @@
+nfs
diff --git a/core/nfs-utils/nfsd.service b/core/nfs-utils/nfsd.service
new file mode 100644
index 000000000..e5481c3d1
--- /dev/null
+++ b/core/nfs-utils/nfsd.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=NFS server
+After=rpcbind.service
+Requires=rpcbind.service
+
+[Service]
+Type=oneshot
+EnvironmentFile=/etc/conf.d/nfs-server.conf
+ExecStart=/usr/sbin/rpc.nfsd $NFSD_OPTS $NFSD_COUNT
+ExecStartPost=/usr/sbin/exportfs -a
+ExecStop=/usr/sbin/rpc.nfsd 0
+ExecStopPost=/usr/sbin/exportfs -a -u
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/core/nfs-utils/proc-fs-nfsd.mount b/core/nfs-utils/proc-fs-nfsd.mount
new file mode 100644
index 000000000..f8664a8be
--- /dev/null
+++ b/core/nfs-utils/proc-fs-nfsd.mount
@@ -0,0 +1,8 @@
+[Unit]
+Description=RPC Pipe File System 
+DefaultDependencies=no
+
+[Mount]
+What=sunrpc
+Where=/proc/fs/nfsd
+Type=rpc_pipefs
diff --git a/core/nfs-utils/rpc-gssd.service b/core/nfs-utils/rpc-gssd.service
new file mode 100644
index 000000000..446864d18
--- /dev/null
+++ b/core/nfs-utils/rpc-gssd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=RPC GSS-API client-side daemon
+After=rpcbind.service var-lib-nfs-rpc_pipefs.mount
+Requires=rpcbind.service var-lib-nfs-rpc_pipefs.mount
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/nfs-common.conf
+ExecStart=/usr/sbin/rpc.gssd $GSSD_OPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/core/nfs-utils/rpc-idmapd.service b/core/nfs-utils/rpc-idmapd.service
new file mode 100644
index 000000000..72cd26a93
--- /dev/null
+++ b/core/nfs-utils/rpc-idmapd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=NFSv4 ID-name mapping daemon
+After=var-lib-nfs-rpc_pipefs.mount nfsd.service
+Requires=var-lib-nfs-rpc_pipefs.mount
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/nfs-common.conf
+ExecStart=/usr/sbin/rpc.idmapd $IDMAPD_OPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/core/nfs-utils/rpc-mountd.service b/core/nfs-utils/rpc-mountd.service
new file mode 100644
index 000000000..917e1b444
--- /dev/null
+++ b/core/nfs-utils/rpc-mountd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=NFSv2/3 Mount Daemon
+After=rpcbind.service nfsd.service
+Requires=rpcbind.service nfsd.service
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/nfs-server.conf
+ExecStart=/usr/sbin/rpc.mountd $MOUNTD_OPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/core/nfs-utils/rpc-statd.service b/core/nfs-utils/rpc-statd.service
new file mode 100644
index 000000000..983b4044f
--- /dev/null
+++ b/core/nfs-utils/rpc-statd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=NFSv2/3 Network Status Monitor Daemon
+After=rpcbind.service
+Requires=rpcbind.service
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/nfs-common.conf
+ExecStart=/usr/sbin/rpc.statd $STATD_OPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/core/nfs-utils/rpc-svcgssd.service b/core/nfs-utils/rpc-svcgssd.service
new file mode 100644
index 000000000..8152e8338
--- /dev/null
+++ b/core/nfs-utils/rpc-svcgssd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=RPC GSS-API server-side daemon
+After=rpcbind.service
+Requires=rpcbind.service
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/nfs-server.conf
+ExecStart=/usr/sbin/rpc.svcgssd $SVCGSSD_OPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/core/nfs-utils/var-lib-nfs-rpc_pipefs.mount b/core/nfs-utils/var-lib-nfs-rpc_pipefs.mount
new file mode 100644
index 000000000..4bd440f24
--- /dev/null
+++ b/core/nfs-utils/var-lib-nfs-rpc_pipefs.mount
@@ -0,0 +1,7 @@
+[Unit]
+Description=RPC pipe filesystem
+
+[Mount]
+What=rpc_pipefs
+Where=/var/lib/nfs/rpc_pipefs
+Type=rpc_pipefs
diff --git a/core/rpcbind/PKGBUILD b/core/rpcbind/PKGBUILD
index c38f302fd..c24a915bd 100644
--- a/core/rpcbind/PKGBUILD
+++ b/core/rpcbind/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 146812 2012-01-18 17:16:35Z tpowa $
+# $Id: PKGBUILD 157234 2012-04-26 13:06:13Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=rpcbind
 pkgver=0.2.0
-pkgrel=6
+pkgrel=8
 pkgdesc="portmap replacement which supports RPC over various protocols"
 arch=(i686 x86_64 'mips64el')
 depends=('bash' 'glibc' 'libtirpc')
@@ -12,9 +12,11 @@ license=('custom')
 replaces=('portmap')
 source=(http://downloads.sourceforge.net/sourceforge/rpcbind/rpcbind-0.2.0.tar.bz2
         rpcbind-sunrpc.patch
+        rpcbind.service
         rpcbind)
 md5sums=('1a77ddb1aaea8099ab19c351eeb26316'
          'c02ac36a98baac70b8a26190524b7b73'
+         'd2615f4c0d58f154aab6e294997ac9be'
          '78a963654f57cbb209e228884767836e')
 
 build() {
@@ -37,6 +39,8 @@ package() {
   install -m644 man/rpcinfo.8 $pkgdir/usr/share/man/man8/
   # install daemon 
   install -D -m755 $srcdir/rpcbind $pkgdir/etc/rc.d/rpcbind
+  # install systemd service file
+  install -D -m644 $srcdir/rpcbind.service $pkgdir/usr/lib/systemd/system/rpcbind.service
   # install license
   install -D -m644 COPYING $pkgdir/usr/share/licenses/rpcbind/COPYING
 }
diff --git a/core/rpcbind/rpcbind.service b/core/rpcbind/rpcbind.service
new file mode 100644
index 000000000..418ba1e05
--- /dev/null
+++ b/core/rpcbind/rpcbind.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=RPC Bind
+Requires=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/rpcbind
+Restart=always
+
+[Install]
+WantedBy=multi-user.target