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

Conflicts: community/apcupsd/PKGBUILD community/bmp-musepack/PKGBUILD community/bmp-wma/PKGBUILD community/bonnie++/PKGBUILD community/cantata/PKGBUILD community/checkinstall/PKGBUILD community/chrootuid/PKGBUILD community/compiz-bcop/PKGBUILD community/compiz-fusion-plugins-extra/PKGBUILD community/compiz-fusion-plugins-main/PKGBUILD community/compiz/PKGBUILD community/compizconfig-backend-gconf/PKGBUILD community/compizconfig-python/PKGBUILD community/ekg2/PKGBUILD community/emerald/PKGBUILD community/fbgetty/PKGBUILD community/flumotion/PKGBUILD community/leafnode/PKGBUILD community/libcompizconfig/PKGBUILD community/libdnet/PKGBUILD community/libee/PKGBUILD community/libtxc_dxtn/PKGBUILD community/linux-tools/PKGBUILD community/openntpd/PKGBUILD community/osiris/PKGBUILD community/perl-package-stash-xs/PKGBUILD community/perl-params-util/PKGBUILD community/procstatd/PKGBUILD community/scponly/PKGBUILD community/sniffit/PKGBUILD community/synergy/PKGBUILD community/turbojpeg/PKGBUILD community/unbound/PKGBUILD community/uucp/PKGBUILD core/gawk/PKGBUILD core/ifenslave/PKGBUILD core/jfsutils/PKGBUILD core/openldap/PKGBUILD core/rfkill/PKGBUILD core/systemd/PKGBUILD core/wireless_tools/PKGBUILD core/xinetd/PKGBUILD extra/avahi/PKGBUILD extra/calligra/PKGBUILD extra/clutter-gst/PKGBUILD extra/flac/PKGBUILD extra/hddtemp/PKGBUILD extra/libbluray/PKGBUILD extra/libdmx/PKGBUILD extra/libfs/PKGBUILD extra/libjpeg-turbo/PKGBUILD extra/libtiff/PKGBUILD extra/libxau/PKGBUILD extra/libxfixes/PKGBUILD extra/licq/PKGBUILD extra/mariadb/PKGBUILD extra/mesa/PKGBUILD extra/perl-guard/PKGBUILD extra/perl-template-toolkit/PKGBUILD extra/pidgin/PKGBUILD extra/pigeonhole/PKGBUILD extra/poppler/PKGBUILD extra/postgresql/PKGBUILD extra/python-geoip/PKGBUILD extra/python/PKGBUILD extra/samba/PKGBUILD extra/sqlite/PKGBUILD extra/vde2/PKGBUILD extra/vim/PKGBUILD extra/vlc/PKGBUILD extra/wireshark/PKGBUILD extra/xfce4-dict/PKGBUILD libre/libquicktime-libre/PKGBUILD libre/xscreensaver-libre/PKGBUILD
author: Michał Masłowski <mtjm@mtjm.eu> 2013-05-30 11:55:09 +0200
committer: Michał Masłowski <mtjm@mtjm.eu> 2013-05-30 11:55:09 +0200
commit: b0fdec08ea3b6e162b710ca98b0dd56f9ae105eb (patch)
tree: 376cc5751d9a587815d7270caa61070f38832766 /core
parent: 8abbf69cf497489fb7a0ac3538cb6975285486b7 (diff)
parent: 76ee9007095484a113d1856786b81e2d2fae8202 (diff)
68 files changed, 833 insertions, 621 deletions
diff --git a/core/cracklib/PKGBUILD b/core/cracklib/PKGBUILD
index b673bd9fe..929e840e4 100644
--- a/core/cracklib/PKGBUILD
+++ b/core/cracklib/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185681 2013-05-17 08:28:48Z tpowa $
+# $Id: PKGBUILD 186294 2013-05-24 07:56:30Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
 
 pkgname=cracklib
 pkgver=2.8.22
-pkgrel=2
+pkgrel=3
 pkgdesc="Password Checking Library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -16,7 +16,7 @@ md5sums=('463177b5c29c7a598c991e12a4898e06')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --without-python
+  ./configure --prefix=/usr --sbindir=/usr/bin --without-python
   make 
 }
 
diff --git a/core/crda/PKGBUILD b/core/crda/PKGBUILD
index fff9f3511..2a6568539 100644
--- a/core/crda/PKGBUILD
+++ b/core/crda/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179635 2013-03-08 23:40:38Z foutrelis $
+# $Id: PKGBUILD 186207 2013-05-22 04:47:50Z foutrelis $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=crda
@@ -9,7 +9,7 @@ arch=(i686 x86_64 'mips64el')
 url="http://wireless.kernel.org/en/developers/Regulatory/CRDA"
 license=('custom')
 depends=('wireless-regdb' 'libnl' 'libgcrypt' 'systemd-tools' 'iw')
-makedepends=('python-m2crypto')
+makedepends=('python2-m2crypto')
 install=crda.install
 source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2
         set-wireless-regdom)
diff --git a/core/cronie/PKGBUILD b/core/cronie/PKGBUILD
index 795b8882e..ccd6b5de5 100644
--- a/core/cronie/PKGBUILD
+++ b/core/cronie/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname='cronie'
 pkgver=1.4.9
-pkgrel=2
+pkgrel=4
 pkgdesc='Daemon that runs specified programs at scheduled times and related tools'
 url='https://fedorahosted.org/cronie/'
 license=('custom:BSD')
@@ -16,13 +16,11 @@ optdepends=('pm-utils: defer anacron on battery power'
 source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'cron.deny'
 	'service'
-        'pam.d'
-        'rc.d')
+        'pam.d')
 sha1sums=('40405cb30b62bd60323e4daf5198f26f0e65c4c4'
           '0f279b8fb820340267d578dc85511c980715f91e'
-          'fa91ebee59df127ff3983b8d6fb9e1cc5fca53d0'
-          '5eff7fb31f6bc0a924243ff046704726cf20c221'
-          'c08c040ed5cb12bc4fd15639a5242d31ec247ef5')
+          'de455f11a310e64d6930390e57726ed70f3295d0'
+          '5eff7fb31f6bc0a924243ff046704726cf20c221')
 
 backup=('etc/anacrontab'
         'etc/conf.d/crond'
@@ -33,6 +31,11 @@ conflicts=('cron')
 provides=('cron')
 groups=('base')
 
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	sed 's:usr/sbin:usr/bin:g' -i contrib/0anacron
+}
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
@@ -40,6 +43,7 @@ build() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
+		--sbindir=/usr/bin \
 		--enable-anacron \
 		--with-inotify \
 		--with-pam \
@@ -56,7 +60,6 @@ package() {
 	install -d "${pkgdir}"/var/spool/{ana,}cron
 	install -d "${pkgdir}"/etc/cron.{d,hourly,daily,weekly,monthly}
 
-	install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/crond
 	install -Dm644 ../pam.d "${pkgdir}"/etc/pam.d/crond
 	install -Dm644 ../cron.deny "${pkgdir}"/etc/cron.deny
 	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/cronie.service
diff --git a/core/cronie/rc.d b/core/cronie/rc.d
deleted file mode 100755
index d0659685c..000000000
--- a/core/cronie/rc.d
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-name=crond
-. /etc/conf.d/crond
-PID=$(pidof -o %PPID /usr/sbin/crond)
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	[[ -z "$PID" ]] && /usr/sbin/crond $CRONDARGS &>/dev/null \
-	&& { add_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	[[ -n "$PID" ]] && kill $PID &>/dev/null \
-	&& { rm_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-reload)
-	stat_busy "Reloading $name daemon"
-	[[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \
-	&& { stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-*)
-	echo "usage: $0 {start|stop|restart|reload}"
-	;;
-esac
-exit 0
diff --git a/core/cronie/service b/core/cronie/service
index 4fa4d4593..cc671f7b6 100644
--- a/core/cronie/service
+++ b/core/cronie/service
@@ -2,7 +2,7 @@
 Description=Periodic Command Scheduler
 
 [Service]
-ExecStart=/usr/sbin/crond -n
+ExecStart=/usr/bin/crond -n
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 Restart=always
diff --git a/core/dialog/PKGBUILD b/core/dialog/PKGBUILD
index 077ae8ff2..34752d162 100644
--- a/core/dialog/PKGBUILD
+++ b/core/dialog/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 175124 2013-01-14 12:47:12Z stephane $
+# $Id: PKGBUILD 186478 2013-05-27 12:00:13Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=dialog
-pkgver=1.2_20121230
+pkgver=1.2_20130523
 pkgrel=1
 pkgdesc="A tool to display dialog boxes from shell scripts"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ url="http://invisible-island.net/dialog/"
 license=('LGPL2.1')
 depends=('ncurses')
 source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver/_/-}.tgz)
-sha1sums=('f6ba16481e04c707c7cbfc3c3c1340040bdb0aa3')
+sha1sums=('54768b8443af3de2e6cd16073ec666f19d4ded7a')
 
 build() {
   cd "${srcdir}/$pkgname-${pkgver/_/-}"
@@ -24,4 +24,6 @@ build() {
 package() {
   cd "${srcdir}/$pkgname-${pkgver/_/-}"
   make DESTDIR="${pkgdir}" install install-lib
+
+  rm "${pkgdir}"/usr/lib/libdialog.a
 }
diff --git a/core/dmraid/PKGBUILD b/core/dmraid/PKGBUILD
index 91063cf9a..64564e85c 100644
--- a/core/dmraid/PKGBUILD
+++ b/core/dmraid/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 173944 2012-12-28 19:27:14Z dreisner $
+# $Id: PKGBUILD 186295 2013-05-24 07:56:32Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 #Contributor: Urs Wolfer <uwolfer @ fwo.ch>
 
 pkgname=dmraid
 pkgver=1.0.0.rc16.3
-pkgrel=8
+pkgrel=9
 pkgdesc="Device mapper RAID interface"
 url="http://people.redhat.com/~heinzm/sw/dmraid/"
 conflicts=('mkinitcpio<0.7')
@@ -19,10 +19,10 @@ source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2
         dmraid.service)
 install=dmraid.install
 md5sums=('819338fcef98e8e25819f0516722beeb'
-         'dea048cc09b49b02da1009adae563866'
+         '7a040ebcba305aba1e47dfe6ca8323b5'
          'faec669dc85f87187b45b5d3968efe2c'
          '56a8bb0ece8d206cd8efb504ee072ddd'
-         '1cd201496e52bd05c1c3048bf6dd809f')
+         'ea6d280fc6f63fb799abcd882bca53c8')
 
 build() {
   cd "$pkgname/1.0.0.rc16-3/$pkgname"
@@ -32,7 +32,7 @@ build() {
 
 package() {
   cd "$pkgname/1.0.0.rc16-3/$pkgname"
-  make DESTDIR="$pkgdir" prefix=/usr libdir=/usr/lib mandir=/usr/share/man includedir=/usr/include install
+  make DESTDIR="$pkgdir" sbindir=/usr/bin prefix=/usr libdir=/usr/lib mandir=/usr/share/man includedir=/usr/include install
   install -D -m644 "$srcdir"/dmraid_install "$pkgdir"/usr/lib/initcpio/install/dmraid
   install -D -m644 "$srcdir"/dmraid_hook "$pkgdir"/usr/lib/initcpio/hooks/dmraid
   install -D -m644 "$srcdir"/dmraid_tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/dmraid.conf
diff --git a/core/dmraid/dmraid.service b/core/dmraid/dmraid.service
index a31f8b39f..c5d3d5309 100644
--- a/core/dmraid/dmraid.service
+++ b/core/dmraid/dmraid.service
@@ -8,7 +8,7 @@ Conflicts=shutdown.target
 
 [Service]
 Type=oneshot
-ExecStart=/sbin/dmraid --ignorelocking --activate y -Z
+ExecStart=/usr/bin/dmraid --ignorelocking --activate y -Z
 RemainAfterExit=true
 
 [Install]
diff --git a/core/dmraid/dmraid_install b/core/dmraid/dmraid_install
index 2003b5cdf..acbc43d95 100644
--- a/core/dmraid/dmraid_install
+++ b/core/dmraid/dmraid_install
@@ -6,6 +6,7 @@ build() {
 
     add_binary 'dmraid'
     add_binary 'dmsetup'
+    add_file "/usr/lib/device-mapper/libdmraid-events-isw.so"
     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"
diff --git a/core/fakeroot/PKGBUILD b/core/fakeroot/PKGBUILD
index 8c6c199ad..447c2c22f 100644
--- a/core/fakeroot/PKGBUILD
+++ b/core/fakeroot/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 160939 2012-06-07 07:26:49Z allan $
+# $Id: PKGBUILD 186069 2013-05-20 23:10:56Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Jochem Kossen <j.kossen@home.nl>
 
 pkgname=fakeroot
-pkgver=1.18.4
+pkgver=1.19
 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=('706171d8d520b1ca1576ac73f2ceb4f3')
+md5sums=('3a00a1264cb31a815552050ef0c2468b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/gawk/PKGBUILD b/core/gawk/PKGBUILD
index 5adb1153f..288e552d6 100644
--- a/core/gawk/PKGBUILD
+++ b/core/gawk/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 174267 2013-01-03 13:58:07Z allan $
+# $Id: PKGBUILD 186293 2013-05-24 07:53:32Z tpowa $
 # Maintainer:
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=gawk
-pkgver=4.0.2
-pkgrel=1.1
+pkgver=4.1.0
+pkgrel=1
 pkgdesc="GNU version of awk"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gnu.org/directory/GNU/gawk.html"
+url="http://www.gnu.org/software/gawk/"
 license=('GPL')
 groups=('base' 'base-devel')
-depends=('sh' 'glibc')
+depends=('sh' 'glibc' 'mpfr')
 provides=('awk')
 install=gawk.install
 source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('4d505dc2c9f1eb3e9f8d6cac87d4bd1a'
-         '131f79e5aa1528649c90ccf0440db0a6')
+md5sums=('13e02513105417818a31ef375f9f9f42'
+         'SKIP')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --libexecdir=/usr/lib
+  ./configure --prefix=/usr --libexecdir=/usr/lib --without-libsigsegv
   make 
 }
 
@@ -32,7 +32,7 @@ package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 
-  install -dm755 ${pkgdir}/bin 
-  ln -sf /usr/bin/gawk ${pkgdir}/bin/
-  ln -sf gawk ${pkgdir}/bin/awk
+  #install -dm755 ${pkgdir}/bin 
+  #ln -sf /usr/bin/gawk ${pkgdir}/bin/
+  #ln -sf gawk ${pkgdir}/bin/awk
 }
diff --git a/core/gmp/PKGBUILD b/core/gmp/PKGBUILD
index 410d1e736..2f651d2c0 100644
--- a/core/gmp/PKGBUILD
+++ b/core/gmp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 178046 2013-02-14 11:43:39Z allan $
+# $Id: PKGBUILD 186344 2013-05-25 03:05:31Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gmp
-pkgver=5.1.1
+pkgver=5.1.2
 pkgrel=1
 pkgdesc="A free library for arbitrary precision arithmetic"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ license=('LGPL3')
 options=('!libtool')
 install=gmp.install
 source=(ftp://ftp.gmplib.org/pub/gmp-${pkgver}/gmp-${pkgver}.tar.xz{,.sig})
-md5sums=('485b1296e6287fa381e6015b19767989'
-         '5cec115b99dc498b079430dd62084d9c')
+md5sums=('06fe2ca164221c59ce74867155cfc1ac'
+         'SKIP')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/gpm/PKGBUILD b/core/gpm/PKGBUILD
index 9e0f895ea..5c5e106c5 100644
--- a/core/gpm/PKGBUILD
+++ b/core/gpm/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 182863 2013-04-15 21:02:26Z eric $
+# $Id: PKGBUILD 186057 2013-05-20 18:53:27Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gpm
 pkgver=1.20.7
-pkgrel=2
+pkgrel=3
 pkgdesc="A mouse server for the console and xterm"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nico.schottelius.org/software/gpm/"
 license=('GPL')
-depends=('ncurses' 'bash')
+depends=('bash')
 options=('!makeflags')
 install=gpm.install
 source=(http://www.nico.schottelius.org/software/gpm/archives/${pkgname}-${pkgver}.tar.lzma \
         gpm.sh gpm.service)
 sha1sums=('8d9f3655c80ce7667d31ede2a100b44986480369'
           '88fe5ff10916c68a87abc8418a56eb0073f69fa9'
-          '20b92360f0ad38a2032fcae37bdbd01b31e43f77')
+          'f9bde96eb9c78da9f225bcf40822647f6592cf23')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./autogen.sh
-  ./configure --prefix=/usr --sysconfdir=/etc
+  ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
   make
 }
 
diff --git a/core/gpm/gpm.service b/core/gpm/gpm.service
index 59e837d80..510ee9f85 100644
--- a/core/gpm/gpm.service
+++ b/core/gpm/gpm.service
@@ -3,7 +3,7 @@ Description=Virtual console mouse server
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/gpm -m /dev/input/mice -t imps2
+ExecStart=/usr/bin/gpm -m /dev/input/mice -t imps2
 
 [Install]
 WantedBy=multi-user.target
diff --git a/core/hdparm/PKGBUILD b/core/hdparm/PKGBUILD
index 2ab0c823b..980f98214 100644
--- a/core/hdparm/PKGBUILD
+++ b/core/hdparm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 172450 2012-12-02 17:54:26Z tpowa $
+# $Id: PKGBUILD 186146 2013-05-21 09:12:32Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgname=hdparm
 pkgver=9.43
-pkgrel=1
+pkgrel=2
 pkgdesc="A shell utility for manipulating Linux IDE drive/driver parameters"
 arch=(i686 x86_64 'mips64el')
 depends=('glibc')
@@ -17,25 +17,27 @@ options=('emptydirs')
 md5sums=('f73233be118d86c779a8463d8b6a3cdb'
          '74e368f384166a7710b447573cda120a')
 
-build() {
+prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
   # Fix Range input/output error when wiping Intel G2 and OCZ drives
   patch -Np1 -i $srcdir/wiper.sh.2_6.max-ranges.patch
-  
-  # build
+}
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make
 }
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   # install
-  mkdir -p ${pkgdir}/{usr,sbin}
-  make DESTDIR=${pkgdir} install
-  install -m755 contrib/idectl ${pkgdir}/sbin
-  install -m755 contrib/ultrabayd ${pkgdir}/sbin
+  mkdir -p ${pkgdir}/usr/bin
+  make DESTDIR=${pkgdir} sbindir=/usr/bin install
+  install -m755 contrib/idectl ${pkgdir}/usr/bin
+  install -m755 contrib/ultrabayd ${pkgdir}/usr/bin
 
   install -D -m 0644 $srcdir/$pkgname-$pkgver/wiper/README.txt $pkgdir/usr/share/doc/wiper/README.txt
-  install -D -m 0755 $srcdir/$pkgname-$pkgver/wiper/wiper.sh $pkgdir/usr/sbin/wiper.sh
+  install -D -m 0755 $srcdir/$pkgname-$pkgver/wiper/wiper.sh $pkgdir/usr/bin/wiper.sh
 
   #install license file
   install -D -m 644 LICENSE.TXT $pkgdir/usr/share/licenses/hdparm/LICENSE.TXT
diff --git a/core/ifenslave/PKGBUILD b/core/ifenslave/PKGBUILD
index 77eff3bac..e998eb2ef 100644
--- a/core/ifenslave/PKGBUILD
+++ b/core/ifenslave/PKGBUILD
@@ -1,21 +1,17 @@
-# $Id: PKGBUILD 142704 2011-11-13 10:10:10Z bisson $
-# Maintainer: 
+# $Id: PKGBUILD 186263 2013-05-23 06:41:01Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=ifenslave
 pkgver=1.1.0
-pkgrel=7.1
+pkgrel=8
 pkgdesc='Utility for bonding ethernet interfaces'
-arch=('i686' 'x86_64' 'mips64el')
 url='http://www.linuxfoundation.org/en/Net:Bonding'
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
-depends=('glibc')
 makedepends=('linux-api-headers')
-backup=('etc/conf.d/bonding')
-source=(ifenslave.c::'http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/networking/ifenslave.c;h=65968fbf'
-        'bonding.conf.d')
-sha1sums=('c657d9e6b8acb983bb8ef856f8f7f25ee6bf4f73'
-          '6843971c0254768868b556af33289d7d32d6208d')
+source=(ifenslave.c::'http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/networking/ifenslave.c;h=450faacc')
+sha1sums=('cf0ca36e4a82f259f4bd5d7268ce758581a76fb0')
 
 build() {
 	cd "${srcdir}"
@@ -24,6 +20,5 @@ build() {
 
 package() {
 	cd "${srcdir}"
-	install -Dm755 ifenslave "${pkgdir}"/sbin/ifenslave
-	install -Dm644 bonding.conf.d "${pkgdir}"/etc/conf.d/bonding
+	install -Dm755 ifenslave "${pkgdir}"/usr/bin/ifenslave
 }
diff --git a/core/ifenslave/bonding.conf.d b/core/ifenslave/bonding.conf.d
deleted file mode 100644
index 3092c5e95..000000000
--- a/core/ifenslave/bonding.conf.d
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Settings for ethernet bonding
-#
-# For each bond interface declared in INTERFACES (in rc.conf), declare
-# a bond_${IF} variable that contains the real ethernet interfaces that
-# should be bonded to the bond interface with the ifenslave utility.
-# Then list the bond interface name in the BOND_INTERFACES array.
-#
-
-#bond_bond0="eth0 eth1"
-#BOND_INTERFACES=(bond0)
-
diff --git a/core/jfsutils/PKGBUILD b/core/jfsutils/PKGBUILD
index 31368268b..7c5f74615 100644
--- a/core/jfsutils/PKGBUILD
+++ b/core/jfsutils/PKGBUILD
@@ -1,21 +1,30 @@
-# $Id: PKGBUILD 142848 2011-11-17 00:38:27Z bisson $
+# $Id: PKGBUILD 186264 2013-05-23 06:41:02Z bisson $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=jfsutils
 pkgver=1.1.15
-pkgrel=3.1
+pkgrel=4
 pkgdesc='JFS filesystem utilities'
-arch=('i686' 'x86_64' 'mips64el')
 url='http://jfs.sourceforge.net'
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
+depends=('util-linux')
+source=("http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz"
+        'inttypes.patch')
+sha1sums=('291e8bd9d615cf3d27e4000117c81a3602484a50'
+          '88551e7d8418bab0df4643dce248110d4c9b0a53')
+
 groups=('base')
-depends=('util-linux-ng')
-source=("http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('291e8bd9d615cf3d27e4000117c81a3602484a50')
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../inttypes.patch
+}
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --sbindir=/sbin 
+	./configure --prefix=/usr --sbindir=/usr/bin 
 	make
 }
 
diff --git a/core/jfsutils/inttypes.patch b/core/jfsutils/inttypes.patch
new file mode 100644
index 000000000..2018bb8a8
--- /dev/null
+++ b/core/jfsutils/inttypes.patch
@@ -0,0 +1,12 @@
+diff -Naur old/libfs/devices.h new/libfs/devices.h
+--- old/libfs/devices.h	2005-11-23 07:43:55.000000000 +1100
++++ new/libfs/devices.h	2013-01-06 11:30:25.381538024 +1100
+@@ -40,6 +40,8 @@
+ #define ERROR_INVALID_PARAMETER	87
+ #define ERROR_DISK_FULL		112
+ 
++#include <inttypes.h>
++
+ struct stat;
+ 
+ int ujfs_get_dev_size(FILE *, int64_t * size);
diff --git a/core/kbd/PKGBUILD b/core/kbd/PKGBUILD
index 425d03a23..4487c9e94 100644
--- a/core/kbd/PKGBUILD
+++ b/core/kbd/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 175749 2013-01-21 10:51:33Z tpowa $
+# $Id: PKGBUILD 186234 2013-05-22 12:12:20Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=kbd
 pkgver=1.15.5
-pkgrel=3
+pkgrel=4
 pkgdesc="Keytable files and keyboard utilities"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kbd-project.org"
 license=('GPL')
 depends=('glibc' 'pam')
 source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz
-        'fix-keymap-loading-1.15.5.patch')
+        'fix-keymap-loading-1.15.5.patch'
+        'fix-dvorak-es.patch'
+        'fix-euro2.patch')
 provides=('vlock')
 conflicts=('vlock')
 replaces=('vlock')
-md5sums=('34c71feead8ab9c01ec638acea8cd877'
-         '4362091d5e23bab2d158f8c7693a45d8')
 
-build() {
+prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
   # rename keymap files with the same names
   # this is needed because when only name of keymap is specified
@@ -32,6 +32,14 @@ build() {
   # fix https://bugs.archlinux.org/task/33308
   # keymap loading is broken for cetain keymaps
   patch -Np1 -i ../fix-keymap-loading-1.15.5.patch
+  # fix es-dvorak #33662
+  patch -Np1 -i ../fix-dvorak-es.patch
+  # fix euro2 #28213
+  patch -Np1 -i ../fix-euro2.patch
+}
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man
   make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes
 }
@@ -40,3 +48,7 @@ package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install
 }
+md5sums=('34c71feead8ab9c01ec638acea8cd877'
+         '4362091d5e23bab2d158f8c7693a45d8'
+         '998957c4f815347dcc874c4d7555dc66'
+         'd869200acbc0aab6a9cafa43cb140d4e')
diff --git a/core/kbd/fix-dvorak-es.patch b/core/kbd/fix-dvorak-es.patch
new file mode 100644
index 000000000..95760fd3a
--- /dev/null
+++ b/core/kbd/fix-dvorak-es.patch
@@ -0,0 +1,11 @@
+--- kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-es.map.old	2013-05-08 14:58:03.393349828 +0200
++++ kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-es.map	2013-05-08 14:58:20.206415053 +0200
+@@ -4,7 +4,7 @@
+ 
+ keymaps 0-2,4,5,6,8-10,12,14
+ include "linux-with-alt-and-altgr"
+-include "euro"
++include "euro.map"
+ strings as usual
+ 
+ keycode   1 = Escape
diff --git a/core/kbd/fix-euro2.patch b/core/kbd/fix-euro2.patch
new file mode 100644
index 000000000..572cba740
--- /dev/null
+++ b/core/kbd/fix-euro2.patch
@@ -0,0 +1,9 @@
+--- kbd-1.15.5/data/keymaps/i386/include/euro2.map.old	2013-05-08 15:00:25.917752313 +0200
++++ kbd-1.15.5/data/keymaps/i386/include/euro2.map	2013-05-08 15:00:54.943957367 +0200
+@@ -2,5 +2,5 @@
+ # [Say: "loadkeys euro2" to get Euro and cent with AltGr (right alt)
+ #  on the positions where many keyboards have E and C.
+ #  To get it displayed, use a latin0 (i.e., latin9) font.]
+-altgr keycode  18 = currency
++altgr keycode  18 = euro
+ altgr keycode  46 = cent
diff --git a/core/krb5/CVE-2002-2443.patch b/core/krb5/CVE-2002-2443.patch
new file mode 100644
index 000000000..3ef88155c
--- /dev/null
+++ b/core/krb5/CVE-2002-2443.patch
@@ -0,0 +1,69 @@
+From cf1a0c411b2668c57c41e9c4efd15ba17b6b322c Mon Sep 17 00:00:00 2001
+From: Tom Yu <tlyu@mit.edu>
+Date: Fri, 3 May 2013 16:26:46 -0400
+Subject: [PATCH] Fix kpasswd UDP ping-pong [CVE-2002-2443]
+
+The kpasswd service provided by kadmind was vulnerable to a UDP
+"ping-pong" attack [CVE-2002-2443].  Don't respond to packets unless
+they pass some basic validation, and don't respond to our own error
+packets.
+
+Some authors use CVE-1999-0103 to refer to the kpasswd UDP ping-pong
+attack or UDP ping-pong attacks in general, but there is discussion
+leading toward narrowing the definition of CVE-1999-0103 to the echo,
+chargen, or other similar built-in inetd services.
+
+Thanks to Vincent Danen for alerting us to this issue.
+
+CVSSv2: AV:N/AC:L/Au:N/C:N/I:N/A:P/E:P/RL:O/RC:C
+
+ticket: 7637 (new)
+target_version: 1.11.3
+tags: pullup
+---
+ src/kadmin/server/schpw.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/kadmin/server/schpw.c b/src/kadmin/server/schpw.c
+index 15b0ab5..7f455d8 100644
+--- a/src/kadmin/server/schpw.c
++++ b/src/kadmin/server/schpw.c
+@@ -52,7 +52,7 @@
+         ret = KRB5KRB_AP_ERR_MODIFIED;
+         numresult = KRB5_KPASSWD_MALFORMED;
+         strlcpy(strresult, "Request was truncated", sizeof(strresult));
+-        goto chpwfail;
++        goto bailout;
+     }
+ 
+     ptr = req->data;
+@@ -67,7 +67,7 @@
+         numresult = KRB5_KPASSWD_MALFORMED;
+         strlcpy(strresult, "Request length was inconsistent",
+                 sizeof(strresult));
+-        goto chpwfail;
++        goto bailout;
+     }
+ 
+     /* verify version number */
+@@ -80,7 +80,7 @@
+         numresult = KRB5_KPASSWD_BAD_VERSION;
+         snprintf(strresult, sizeof(strresult),
+                  "Request contained unknown protocol version number %d", vno);
+-        goto chpwfail;
++        goto bailout;
+     }
+ 
+     /* read, check ap-req length */
+@@ -93,7 +93,7 @@
+         numresult = KRB5_KPASSWD_MALFORMED;
+         strlcpy(strresult, "Request was truncated in AP-REQ",
+                 sizeof(strresult));
+-        goto chpwfail;
++        goto bailout;
+     }
+ 
+     /* verify ap_req */
+-- 
+1.8.1.6
+
diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD
index 4d143920f..d1cc0c166 100644
--- a/core/krb5/PKGBUILD
+++ b/core/krb5/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185696 2013-05-17 11:13:34Z stephane $
+# $Id: PKGBUILD 186200 2013-05-22 00:37:41Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=krb5
 pkgver=1.11.2
-pkgrel=3
+pkgrel=4
 pkgdesc="The Kerberos network authentication system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://web.mit.edu/kerberos/"
@@ -12,6 +12,7 @@ depends=('e2fsprogs' 'libldap' 'keyutils')
 makedepends=('perl')
 backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf')
 source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.11/${pkgname}-${pkgver}-signed.tar
+        CVE-2002-2443.patch
         krb5-config_LDFLAGS.patch
         krb5-kadmind.service
         krb5-kdc.service
@@ -19,6 +20,7 @@ source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.11/${pkgname}-${pkgver}-si
         krb5-kpropd@.service
         krb5-kpropd.socket)
 sha1sums=('3863f7bdb2d8fc3e50484fb566124373c4b0a250'
+          '78ec307c2b5e32481a6da401013c428e0b867f36'
           '09e478cddfb9d46d2981dd25ef96b8c3fd91e1aa'
           'a2a01e7077d9e89cda3457ea0e216debb3dc353c'
           'f5e4fa073e11b0fcb4e3098a5d58a4f791ec841e'
@@ -34,6 +36,9 @@ build() {
    # cf https://bugs.gentoo.org/show_bug.cgi?id=448778
    patch -Np2 -i "${srcdir}"/krb5-config_LDFLAGS.patch
 
+   # Fix kpasswd UDP ping-pong (CVE-2002-2443)
+   patch -Np2 -i "${srcdir}"/CVE-2002-2443.patch
+
    rm lib/krb5/krb/deltat.c
 
    # FS#25384
diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD
index a3f080220..fc1aaba80 100644
--- a/core/libsasl/PKGBUILD
+++ b/core/libsasl/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 185567 2013-05-15 08:03:34Z bpiotrowski $
+# $Id: PKGBUILD 186318 2013-05-24 17:00:55Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
-# This package spans multiple repositories.
+# This package spans multiple repositories. 
 # Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk.
 
 #pkgbase=('cyrus-sasl')
 #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgname=libsasl
 pkgver=2.1.26
-pkgrel=2
+pkgrel=3
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cyrusimap.web.cmu.edu/"
 license=('custom')
 options=('!makeflags' '!libtool')
-makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl')
+makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 'sqlite2')
 source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
         cyrus-sasl-2.1.22-qa.patch
         cyrus-sasl-2.1.26-size_t.patch
@@ -23,8 +23,10 @@ source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
         0025_ld_as_needed.patch
         0026_drop_krb5support_dependency.patch
         0030-dont_use_la_files_for_opening_plugins.patch
+        saslauthd.service
         saslauthd.conf.d
-        saslauthd)
+        saslauthd
+        tmpfiles.conf)
 md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
          '79b8a5e8689989e2afd4b7bda595a7b1'
          'f45aa8c42b32e0569ab3d14a83485b37'
@@ -33,12 +35,14 @@ md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
          '62bf892fe4d1df41ff748e91a1afaf67'
          'b7848957357e7c02d6490102be496bf9'
          '8e7106f32e495e9ade69014fd1b3352a'
+         '3499dcd610ad1ad58e0faffde2aa7a23'
          '49219af5641150edec288a3fdb65e7c1'
-         '75542f613185d5a90520ad0d7d926a20')
+         '75542f613185d5a90520ad0d7d926a20'
+         '45bb0192d2f188066240b9a66ee6365f')
 
 build() {
   export CFLAGS="$CFLAGS -fPIC"
- 
+
   cd "${srcdir}/cyrus-sasl-${pkgver}"
   patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch"
   patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.26-size_t.patch"
@@ -105,7 +109,7 @@ build() {
 
 package_libsasl() {
   pkgdesc="Cyrus Simple Authentication Service Layer (SASL) Library"
-  depends=('openssl' 'krb5')
+  depends=('openssl')
   conflicts=('cyrus-sasl-plugins')
 
   cd "${srcdir}/cyrus-sasl-${pkgver}"
@@ -117,21 +121,22 @@ package_libsasl() {
   rm -f "${pkgdir}"/usr/lib/sasl2/libsql.so*
   rm -f "${pkgdir}"/usr/lib/sasl2/libgssapiv2.so*
   rm -f "${pkgdir}"/usr/lib/sasl2/libldapdb.so*
+  rm -f "${pkgdir}"/usr/lib/sasl2/libgs2.so*
   install -m755 -d "${pkgdir}/usr/share/licenses/libsasl"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/libsasl/"
 }
 
 package_cyrus-sasl() {
-  depends=("libsasl=${pkgver}-${pkgrel}")
+  depends=("libsasl=${pkgver}" 'krb5')
   pkgdesc="Cyrus saslauthd SASL authentication daemon"
   backup=('etc/conf.d/saslauthd')
 
   cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd"
   make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/etc/rc.d"
-  install -m755 -d "${pkgdir}/etc/conf.d"
-  install -m755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/"
-  install -m644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd"
+  install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd"
+  install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd"
+  install -Dm644 "${srcdir}/saslauthd.service" "${pkgdir}/usr/lib/systemd/system/saslauthd.service"
+  install -Dm644 "${srcdir}/tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/saslauthd.conf"
 
   install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl"
   ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/"
@@ -139,12 +144,13 @@ package_cyrus-sasl() {
 
 package_cyrus-sasl-gssapi() {
   pkgdesc="GSSAPI authentication mechanism for Cyrus SASL"
-  depends=("libsasl=${pkgver}-${pkgrel}" 'krb5')
+  depends=("libsasl=${pkgver}" 'krb5')
   replaces=('cyrus-sasl-plugins')
 
   cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
   install -m755 -d "${pkgdir}/usr/lib/sasl2"
   cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/"
+  cp -a .libs/libgs2.so* "${pkgdir}/usr/lib/sasl2/"
 
   install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi"
   ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/"
@@ -152,7 +158,7 @@ package_cyrus-sasl-gssapi() {
 
 package_cyrus-sasl-ldap() {
   pkgdesc="ldapdb auxprop module for Cyrus SASL"
-  depends=("libsasl=${pkgver}-${pkgrel}" 'libldap')
+  depends=("libsasl=${pkgver}" 'libldap')
   replaces=('cyrus-sasl-plugins')
 
   cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
@@ -165,7 +171,7 @@ package_cyrus-sasl-ldap() {
 
 package_cyrus-sasl-sql() {
   pkgdesc="SQL auxprop module for Cyrus SASL"
-  depends=("libsasl=${pkgver}-${pkgrel}" 'postgresql-libs' 'libmariadbclient')
+  depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient' 'sqlite2')
   replaces=('cyrus-sasl-plugins')
 
   cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
diff --git a/core/libsasl/saslauthd.service b/core/libsasl/saslauthd.service
new file mode 100644
index 000000000..978dbd37d
--- /dev/null
+++ b/core/libsasl/saslauthd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Cyrus SASL authentication daemon
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/saslauthd
+ExecStart=/usr/sbin/saslauthd $SASLAUTHD_OPTS
+PIDFile=/var/run/saslauthd/saslauthd.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/core/libsasl/tmpfiles.conf b/core/libsasl/tmpfiles.conf
new file mode 100644
index 000000000..7258b1a9f
--- /dev/null
+++ b/core/libsasl/tmpfiles.conf
@@ -0,0 +1 @@
+d /run/saslauthd 0755 root root - -
diff --git a/core/linux-atm/PKGBUILD b/core/linux-atm/PKGBUILD
index e84fe6afc..a14393a05 100644
--- a/core/linux-atm/PKGBUILD
+++ b/core/linux-atm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 158611 2012-05-05 03:12:24Z dreisner $
+# $Id: PKGBUILD 186297 2013-05-24 07:57:23Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Surain Mallawa Arachchi <mas@crc32.net>
 
 pkgname=linux-atm
 pkgver=2.5.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Drivers and tools to support ATM networking under Linux."
 arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc')
@@ -23,7 +23,7 @@ build() {
   # install firmware in /usr/lib
   sed -i "s#/lib/firmware#/usr/lib/firmware#" src/extra/Makefile.in
 
-  ./configure --prefix=/usr --sysconfdir=/etc
+  ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc
   make
 }
 
diff --git a/core/man-db/PKGBUILD b/core/man-db/PKGBUILD
index 818087e98..304458770 100644
--- a/core/man-db/PKGBUILD
+++ b/core/man-db/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 166836 2012-09-19 19:45:35Z andyrtr $
+# $Id: PKGBUILD 186047 2013-05-20 18:28:50Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
 
 pkgname=man-db
 pkgver=2.6.3
-pkgrel=1
+pkgrel=3
 pkgdesc="A utility for reading man pages"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nongnu.org/man-db/"
 license=('GPL' 'LGPL')
 groups=('base')
-depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline')
-optdepends=('less' 'gzip')
+depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline' 'less')
+optdepends=('gzip')
 backup=('etc/man_db.conf'
-	'etc/cron.daily/man-db')
+	    'etc/cron.daily/man-db')
 conflicts=('man')
 provides=('man')
 replaces=('man')
@@ -22,21 +22,26 @@ source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.xz{,.sig
         convert-mans man-db.cron.daily)
 options=('!libtool')
 md5sums=('a593a095599ae97bcacf8d038659a146'
-         '64975c20b1a6453f9b860ff7f916bcf1'
+         'SKIP'
          '2b7662a7d5b33fe91f9f3e034361a2f6'
-         'd30c39ae47560304471b5461719e0f03')
+         '934fd047fecb915038bf4bf844ea609c')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-	--with-db=gdbm --disable-setuid --enable-mandirs=GNU \
+  ./configure --prefix=/usr \
+    --sbindir=/usr/bin \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+	--with-db=gdbm \
+	--disable-setuid \
+	--enable-mandirs=GNU \
 	--with-sections="1 n l 8 3 0 2 5 4 9 6 7"
   make
 }
 
 check() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  make check
+  make -k check
 }
 
 package() {
diff --git a/core/man-db/man-db.cron.daily b/core/man-db/man-db.cron.daily
index 53e66e1e9..9b4abd894 100755
--- a/core/man-db/man-db.cron.daily
+++ b/core/man-db/man-db.cron.daily
@@ -12,7 +12,7 @@ IONICE_PRIORITY=7
 UPDATEMANDB="/usr/bin/mandb --quiet"
 
 # Update the "whatis" database
-#/usr/sbin/makewhatis -u -w
+#/usr/bin/makewhatis -u -w
 
 # taken from Debian
 # man-db cron daily
diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD
index 1ceafa35a..8c8d6aa83 100644
--- a/core/mdadm/PKGBUILD
+++ b/core/mdadm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 177952 2013-02-12 12:13:48Z thomas $
+# $Id: PKGBUILD 186140 2013-05-21 09:11:15Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 pkgname=mdadm
 pkgver=3.2.6
-pkgrel=3
+pkgrel=4
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
@@ -13,7 +13,6 @@ conflicts=('mkinitcpio<0.7')
 depends=('glibc')
 backup=('etc/mdadm.conf')
 source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
-        mdadm 
         mdadm.conf 
         mdadm_install
         mdadm_hook
@@ -22,12 +21,24 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
         disable-werror.patch
         mdadm-fix-udev-rules.patch)
 replaces=('raidtools')
+md5sums=('3e255dc71e5144bbcb872788ca647267'
+         '5a37c112aa07dccdde62f9fa5b888607'
+         'af2f73f0094ebee66f503ca4710c7142'
+         'fbfb7d07efcbaf5dc61af424c5f6e352'
+         'b6b0bfd6487c99264578630616dfe5eb'
+         'eb1786b18fa4d13cfd7b71d6b05cfb4f'
+         '4ad87b74a4bc9a34621280abe0e0c3e4'
+         '6c76f2f261c1c3397c7290633f0a9acc')
 
-build() {
+prepare() {
   cd $srcdir/$pkgname-$pkgver
   patch -Np0 -i ../disable-werror.patch
   patch -p1 -i ../mdadm-fix-udev-rules.patch
-  make CXFLAGS="$CFLAGS"
+}
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  make CXFLAGS="$CFLAGS" BINDIR=/usr/bin
   # build static mdassemble for Arch's initramfs
   make MDASSEMBLE_AUTO=1 mdassemble
   
@@ -35,22 +46,12 @@ build() {
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  make INSTALL=/usr/bin/install DESTDIR=$pkgdir install
-  install -D -m755 mdassemble $pkgdir/sbin/mdassemble
+  make INSTALL=/usr/bin/install BINDIR=/usr/bin DESTDIR=$pkgdir install
+  install -D -m755 mdassemble $pkgdir/usr/bin/mdassemble
   install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf
-  install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm
   install -D -m644 ../mdadm_install $pkgdir/usr/lib/initcpio/install/mdadm
   install -D -m644 ../mdadm_hook $pkgdir/usr/lib/initcpio/hooks/mdadm
   install -D -m644 ../mdadm_udev_install $pkgdir/usr/lib/initcpio/install/mdadm_udev
   # systemd service file
   install -D -m644 $srcdir/mdadm.service $pkgdir/usr/lib/systemd/system/mdadm.service
 }
-md5sums=('3e255dc71e5144bbcb872788ca647267'
-         '8333d405f550317c2bacd5510bf1cb60'
-         '00cbed931db4f15b6ce49e3e7d433966'
-         '815245a3af16a73ec1c5e5989fb892e9'
-         'fbb5542d9bdf87441a11dd7e7a0a17f8'
-         '0e35422d0cc007c3654a5e2591a9f9b5'
-         'aafb5f9ac8437a284cbf948b9b13b179'
-         '4ad87b74a4bc9a34621280abe0e0c3e4'
-         '0bf45d6dcb3ea14facddbb10b3303806')
diff --git a/core/mdadm/mdadm b/core/mdadm/mdadm
deleted file mode 100755
index 9bf468e98..000000000
--- a/core/mdadm/mdadm
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-pidfile=/run/mdadm.pid
-if [[ -r $pidfile ]]; then
-  read -r PID <"$pidfile"
-  if [[ $PID && ! -d /proc/$PID ]]; then
-    # stale pidfile
-    unset PID
-    rm -f "$pidfile"
-  fi
-fi
-
-case $1 in
-  start)
-    stat_busy "Starting mdadm RAID Monitor"
-    if [[ -z $PID ]] && mdadm --monitor --scan -i "$pidfile" -f; then
-      add_daemon mdadm
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping mdadm RAID Monitor"
-    if [[ $PID ]] && kill "$PID" &>/dev/null; then
-      rm_daemon mdadm
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/core/mdadm/mdadm-fix-udev-rules.patch b/core/mdadm/mdadm-fix-udev-rules.patch
index 60f5ae131..941cadf3a 100644
--- a/core/mdadm/mdadm-fix-udev-rules.patch
+++ b/core/mdadm/mdadm-fix-udev-rules.patch
@@ -39,7 +39,7 @@ index 0000000..883ee4d
 +ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0", GOTO="md_end"
 +LABEL="md_ignore_state"
 +
-+IMPORT{program}="/sbin/mdadm --detail --export $devnode"
++IMPORT{program}="/usr/bin/mdadm --detail --export $devnode"
 +ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace"
 +ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}"
 +ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}"
@@ -75,9 +75,9 @@ index 0000000..b89775e
 +
 +# remember you can limit what gets auto/incrementally assembled by
 +# mdadm.conf(5)'s 'AUTO' and selectively whitelist using 'ARRAY'
-+ACTION=="add", RUN+="/sbin/mdadm --incremental $devnode --offroot"
-+ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/sbin/mdadm -If $name --path $env{ID_PATH}"
-+ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/sbin/mdadm -If $name"
++ACTION=="add", RUN+="/usr/bin/mdadm --incremental $devnode --offroot"
++ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/usr/bin/mdadm -If $name --path $env{ID_PATH}"
++ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/usr/bin/mdadm -If $name"
 +
 +LABEL="md_inc_end"
 diff --git a/udev-md-raid.rules b/udev-md-raid.rules
diff --git a/core/mdadm/mdadm.conf b/core/mdadm/mdadm.conf
index 57bd4c683..36eaa0cc0 100644
--- a/core/mdadm/mdadm.conf
+++ b/core/mdadm/mdadm.conf
@@ -59,8 +59,8 @@ DEVICE partitions
 
 
 # When used in --follow (aka --monitor) mode, mdadm needs a
-# mail address and/or a program.  To start mdadm's monitor mode, add
-# "mdadm" to your DAEMONS array in /etc/rc.conf
+# mail address and/or a program.  To start mdadm's monitor mode, enable
+# mdadm.service in systemd.
 #
 # If the lines are not found, mdadm will exit quietly
 #MAILADDR root@mydomain.tld
diff --git a/core/mdadm/mdadm.service b/core/mdadm/mdadm.service
index 8389715e8..b3ca5f7a7 100644
--- a/core/mdadm/mdadm.service
+++ b/core/mdadm/mdadm.service
@@ -2,7 +2,7 @@
 Description=MDADM Event Monitor
 
 [Service]
-ExecStart=/sbin/mdadm --monitor --scan
+ExecStart=/usr/bin/mdadm --monitor --scan
 
 [Install]
 WantedBy=multi-user.target
diff --git a/core/mdadm/mdadm_hook b/core/mdadm/mdadm_hook
index 787be5d0c..5371baaca 100755
--- a/core/mdadm/mdadm_hook
+++ b/core/mdadm/mdadm_hook
@@ -43,7 +43,7 @@ run_hook() {
     fi
 
     # assemble everything
-    [ -s "$mdconfig" ] && /sbin/mdassemble
+    [ -s "$mdconfig" ] && /usr/bin/mdassemble
 }
 
 # vim: set ft=sh ts=4 sw=4 et:
diff --git a/core/mdadm/mdadm_install b/core/mdadm/mdadm_install
index 36b37fd0b..7390509fa 100644
--- a/core/mdadm/mdadm_install
+++ b/core/mdadm/mdadm_install
@@ -8,7 +8,7 @@ build() {
         echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays."
         add_file "/etc/mdadm.conf"
     fi
-    add_binary "/sbin/mdassemble"
+    add_binary "/usr/bin/mdassemble"
     add_file "/usr/lib/udev/rules.d/63-md-raid-arrays.rules"
 
     add_runscript
diff --git a/core/mdadm/mdadm_udev_install b/core/mdadm/mdadm_udev_install
index 5635b8f63..c01cbaf24 100644
--- a/core/mdadm/mdadm_udev_install
+++ b/core/mdadm/mdadm_udev_install
@@ -9,7 +9,7 @@ build() {
         add_file "/etc/mdadm.conf"
     fi
 
-    add_binary "mdadm"
+    add_binary "/usr/bin/mdadm"
     add_file "/usr/lib/udev/rules.d/63-md-raid-arrays.rules"
     add_file "/usr/lib/udev/rules.d/64-md-raid-assembly.rules"
 }
@@ -17,7 +17,7 @@ build() {
 help() {
   cat <<HELPEOF
 This hook loads the necessary modules for a RAID array and uses incremental
-assembly via udev at runtime to create the devices. This hook with NOT work
+assembly via udev at runtime to create the devices. This hook will NOT work
 without the udev hook included on the image.
 HELPEOF
 }
diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD
index 1c87625e3..876ca439c 100644
--- a/core/openldap/PKGBUILD
+++ b/core/openldap/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185566 2013-05-15 08:03:32Z bpiotrowski $
+# $Id: PKGBUILD 186436 2013-05-26 15:20:21Z eric $
 # Maintainer:
 
 pkgbase=openldap
 pkgname=('libldap' 'openldap')
 pkgver=2.4.35
-pkgrel=3.1
+pkgrel=4
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.openldap.org/"
 license=('custom')
@@ -12,7 +12,7 @@ makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux' 'chrpath')
 source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
         slapd.service slapd.tmpfiles openldap-ntlm.patch openldap-nssov.patch)
 sha1sums=('db02243150b050baac6a8ea4145ad73a1f6d2266'
-          '9c7f3441e6a6ee13cdcfe8d965081c7a574c3393'
+          '2441815efbfa01ad7a1d39068e5503b53d1d04b0'
           'f86a82e35ebe15026980467c9dee4007e686b795'
           'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef'
           'b2d11b4c522750ad9da3409333094fb599ac2c85')
@@ -30,7 +30,7 @@ prepare() {
 build() {
   cd ${pkgbase}-${pkgver}
   ./configure --prefix=/usr --mandir=/usr/share/man --libexecdir=/usr/lib \
-    --sysconfdir=/etc --localstatedir=/var/lib/openldap \
+    --sysconfdir=/etc --localstatedir=/var/lib/openldap --sbindir=/usr/bin \
     --enable-ipv6 --enable-syslog --enable-local \
     --enable-bdb --enable-hdb \
     --enable-crypt --enable-dynamic \
@@ -100,7 +100,7 @@ package_openldap() {
 # get rid of duplicate default conf files
   rm "${pkgdir}"/etc/openldap/*.default
 
-  ln -s ../lib/slapd "${pkgdir}"/usr/sbin/slapd
+  ln -s ../lib/slapd "${pkgdir}"/usr/bin/slapd
 
   chown root:439 "${pkgdir}"/etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example}
   chmod 640 "${pkgdir}"/etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example}
diff --git a/core/openldap/slapd.service b/core/openldap/slapd.service
index 79b2cf81f..a664fa38e 100644
--- a/core/openldap/slapd.service
+++ b/core/openldap/slapd.service
@@ -3,7 +3,7 @@ Description=OpenLDAP server daemon
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/slapd -u ldap -g ldap
+ExecStart=/usr/bin/slapd -u ldap -g ldap
 
 [Install]
 WantedBy=multi-user.target
diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD
index 43f9709e1..c3d65deb3 100644
--- a/core/openssh/PKGBUILD
+++ b/core/openssh/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180812 2013-03-26 12:05:13Z bisson $
+# $Id: PKGBUILD 186025 2013-05-20 14:49:38Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=openssh
-pkgver=6.2p1
+pkgver=6.2p2
 pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
@@ -15,31 +15,28 @@ depends=('krb5' 'openssl' 'libedit' 'ldns')
 optdepends=('xorg-xauth: X11 forwarding'
             'x11-ssh-askpass: input passphrase in X')
 source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"
-        'sshd.close-sessions'
         'sshdgenkeys.service'
         'sshd@.service'
         'sshd.service'
         'sshd.socket'
-        'sshd.confd'
-        'sshd.pam'
-        'sshd')
-sha1sums=('8824708c617cc781b2bb29fa20bd905fd3d2a43d'
-          '954bf1660aa32620c37034320877f4511b767ccb'
+        'sshd.pam')
+sha1sums=('c2b4909eba6f5ec6f9f75866c202db47f3b501ba'
           '6df5be396f8c593bb511a249a1453294d18a01a6'
-          'bd6eae36c7ef9efb7147778baad7858b81f2d660'
-          'f9af4a442b804ab661cec0edb25dd76dee16d8d2'
+          '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
+          '2d87de52a6b2f764180f9f67cb9747392784b4a5'
           'e12fa910b26a5634e5a6ac39ce1399a132cf6796'
-          'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
-          'd93dca5ebda4610ff7647187f8928a3de28703f3'
-          '1488d4ed33cf3037accf4b0e1c7a7e90b6a097c7')
+          'd93dca5ebda4610ff7647187f8928a3de28703f3')
 
-backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd')
+backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
+
+install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	./configure \
 		--prefix=/usr \
+		--sbindir=/usr/bin \
 		--libexecdir=/usr/lib/ssh \
 		--sysconfdir=/etc/ssh \
 		--with-ldns \
@@ -69,20 +66,14 @@ package() {
 
 	make DESTDIR="${pkgdir}" install
 
-	rm "${pkgdir}"/usr/share/man/man1/slogin.1
-	ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
-
+	ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1
 	install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
 
 	install -Dm644 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service
 	install -Dm644 ../sshd@.service "${pkgdir}"/usr/lib/systemd/system/sshd@.service
 	install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service
 	install -Dm644 ../sshd.socket "${pkgdir}"/usr/lib/systemd/system/sshd.socket
-
-	install -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389
-	install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd
 	install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd
-	install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd
 
 	install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh
 	install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id
diff --git a/core/openssh/install b/core/openssh/install
new file mode 100644
index 000000000..6f0cd3703
--- /dev/null
+++ b/core/openssh/install
@@ -0,0 +1,10 @@
+post_upgrade() {
+	if [[ $(vercmp $2 6.2p2) = -1 ]]; then
+		cat <<EOF
+
+==> The sshd daemon has been moved to /usr/bin alongside all binaries.
+==> Please update this path in your scripts if applicable.
+
+EOF
+	fi
+}
diff --git a/core/openssh/sshd b/core/openssh/sshd
deleted file mode 100755
index d60804e84..000000000
--- a/core/openssh/sshd
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/sshd
-
-PIDFILE=/run/sshd.pid
-PID=$(cat $PIDFILE 2>/dev/null)
-if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then
-	PID=
-	rm $PIDFILE 2>/dev/null
-fi
-
-case "$1" in
-	start)
-		stat_busy 'Starting Secure Shell Daemon'
-		/usr/bin/ssh-keygen -A
-		[[ -z $PID ]] && /usr/sbin/sshd $SSHD_ARGS
-		if [[ $? -gt 0 ]]; then
-			stat_fail
-		else
-			add_daemon sshd
-			stat_done
-		fi
-		;;
-	stop)
-		stat_busy 'Stopping Secure Shell Daemon'
-		[[ ! -z $PID ]] && kill $PID &> /dev/null
-		if [[ $? -gt 0 ]]; then
-			stat_fail
-		else
-			rm_daemon sshd
-			stat_done
-		fi
-		;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/core/openssh/sshd.close-sessions b/core/openssh/sshd.close-sessions
deleted file mode 100644
index be2a709fc..000000000
--- a/core/openssh/sshd.close-sessions
+++ /dev/null
@@ -1,17 +0,0 @@
-# Close sshd sessions before shutting down the network; see FS#17389.
-
-sshd_close_sessions () {
-	if ck_daemon sshd; then
-		return
-	fi
-	/etc/rc.d/sshd stop
-	stat_busy "Stopping Secure Shell Sessions"
-	for i in $(pgrep sshd); do
-		if readlink -q /proc/$i/exe | grep -q '^/usr/sbin/sshd'; then
-			kill $i
-		fi
-	done &>/dev/null
-	stat_done
-}
-
-add_hook shutdown_start sshd_close_sessions
diff --git a/core/openssh/sshd.confd b/core/openssh/sshd.confd
deleted file mode 100644
index 5ce7c0079..000000000
--- a/core/openssh/sshd.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to sshd
-#
-SSHD_ARGS=""
diff --git a/core/openssh/sshd.service b/core/openssh/sshd.service
index 633164e5d..349bde59d 100644
--- a/core/openssh/sshd.service
+++ b/core/openssh/sshd.service
@@ -4,7 +4,7 @@ Wants=sshdgenkeys.service
 After=sshdgenkeys.service
 
 [Service]
-ExecStart=/usr/sbin/sshd -D
+ExecStart=/usr/bin/sshd -D
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 Restart=always
diff --git a/core/openssh/sshd@.service b/core/openssh/sshd@.service
index 2fd9b0814..7ce3d37ba 100644
--- a/core/openssh/sshd@.service
+++ b/core/openssh/sshd@.service
@@ -3,6 +3,6 @@ Description=OpenSSH Per-Connection Daemon
 After=sshdgenkeys.service
 
 [Service]
-ExecStart=-/usr/sbin/sshd -i
+ExecStart=-/usr/bin/sshd -i
 StandardInput=socket
 StandardError=syslog
diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD
index 0257a6aa3..a562da503 100644
--- a/core/pam/PKGBUILD
+++ b/core/pam/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185040 2013-05-10 16:21:45Z tomegun $
+# $Id: PKGBUILD 186139 2013-05-21 09:11:14Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=pam
 pkgver=1.1.6
-pkgrel=3
+pkgrel=4
 pkgdesc="PAM (Pluggable Authentication Modules) library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
@@ -25,13 +25,13 @@ md5sums=('7b73e58b7ce79ffa321d408de06db2c4'
 
 build() {
   cd $srcdir/Linux-PAM-$pkgver
-  ./configure --libdir=/usr/lib
+  ./configure --libdir=/usr/lib --sbindir=/usr/bin
   patch -Np0 -i ../pam_namespace-build-1.1.6.patch
   make
 
   cd $srcdir/pam_unix2-2.9.1
   patch -Np1 -i ../pam_unix2-glibc216.patch
-  ./configure --libdir=/usr/lib
+  ./configure --libdir=/usr/lib --sbindir=/usr/bin
   make
 }
 
@@ -62,5 +62,5 @@ _EOT
   ln -s pam_unix.so pam_unix_session.so
 
   # set unix_chkpwd uid
-  chmod +s $pkgdir/sbin/unix_chkpwd
+  chmod +s $pkgdir/usr/bin/unix_chkpwd
 }
diff --git a/core/pciutils/PKGBUILD b/core/pciutils/PKGBUILD
index 2327821f6..960c043e4 100644
--- a/core/pciutils/PKGBUILD
+++ b/core/pciutils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 184187 2013-05-03 10:22:45Z tpowa $
+# $Id: PKGBUILD 186143 2013-05-21 09:11:35Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=pciutils
 pkgver=3.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="PCI bus configuration space access library and tools"
 arch=(i686 x86_64 'mips64el')
 license=('GPL2')
@@ -15,15 +15,15 @@ md5sums=('3fccb0b28879adb57d8156115f8003c8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man lib/libpci.a 
+  make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man SBINDIR=/usr/bin lib/libpci.a 
   cp lib/libpci.a "${srcdir}/"
   make clean
-  make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
+  make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib
+  make SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib
   install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/"
   # this is now supplied by the hwids package
   rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8,hwdata}}
diff --git a/core/perl/CVE-2012-6329.patch b/core/perl/CVE-2012-6329.patch
deleted file mode 100644
index 5f59e03c1..000000000
--- a/core/perl/CVE-2012-6329.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-commit 1735f6f53ca19f99c6e9e39496c486af323ba6a8
-Author: Brian Carlson <brian.carlson@cpanel.net>
-Date:   Wed Nov 28 08:54:33 2012 -0500
-
-    Fix misparsing of maketext strings.
-    
-    Case 61251: This commit fixes a misparse of maketext strings that could
-    lead to arbitrary code execution.  Basically, maketext was compiling
-    bracket notation into functions, but neglected to escape backslashes
-    inside the content or die on fully-qualified method names when
-    generating the code.  This change escapes all such backslashes and dies
-    when a method name with a colon or apostrophe is specified.
----
- AUTHORS                                     |  1 +
- dist/Locale-Maketext/lib/Locale/Maketext.pm | 24 ++++++++----------------
- 2 files changed, 9 insertions(+), 16 deletions(-)
-
-diff --git a/AUTHORS b/AUTHORS
-index 70734b0..009dea0 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -154,6 +154,7 @@ Breno G. de Oliveira		<garu@cpan.org>
- Brent Dax			<brentdax@cpan.org>
- Brooks D Boyd
- Brian Callaghan			<callagh@itginc.com>
-+Brian Carlson			<brian.carlson@cpanel.net>
- Brian Clarke			<clarke@appliedmeta.com>
- brian d foy			<brian.d.foy@gmail.com>
- Brian Fraser			<fraserbn@gmail.com>
-diff --git a/dist/Locale-Maketext/lib/Locale/Maketext.pm b/dist/Locale-Maketext/lib/Locale/Maketext.pm
-index 4822027..63e5fba 100644
---- a/dist/Locale-Maketext/lib/Locale/Maketext.pm
-+++ b/dist/Locale-Maketext/lib/Locale/Maketext.pm
-@@ -625,21 +625,9 @@ sub _compile {
-                         # 0-length method name means to just interpolate:
-                         push @code, ' (';
-                     }
--                    elsif($m =~ /^\w+(?:\:\:\w+)*$/s
--                            and $m !~ m/(?:^|\:)\d/s
--                        # exclude starting a (sub)package or symbol with a digit
-+                    elsif($m =~ /^\w+$/s
-+                        # exclude anything fancy, especially fully-qualified module names
-                     ) {
--                        # Yes, it even supports the demented (and undocumented?)
--                        #  $obj->Foo::bar(...) syntax.
--                        $target->_die_pointing(
--                            $string_to_compile, q{Can't use "SUPER::" in a bracket-group method},
--                            2 + length($c[-1])
--                        )
--                        if $m =~ m/^SUPER::/s;
--                        # Because for SUPER:: to work, we'd have to compile this into
--                        #  the right package, and that seems just not worth the bother,
--                        #  unless someone convinces me otherwise.
--
-                         push @code, ' $_[0]->' . $m . '(';
-                     }
-                     else {
-@@ -693,7 +681,9 @@ sub _compile {
-             elsif(substr($1,0,1) ne '~') {
-                 # it's stuff not containing "~" or "[" or "]"
-                 # i.e., a literal blob
--                $c[-1] .= $1;
-+                my $text = $1;
-+                $text =~ s/\\/\\\\/g;
-+                $c[-1] .= $text;
- 
-             }
-             elsif($1 eq '~~') { # "~~"
-@@ -731,7 +721,9 @@ sub _compile {
-             else {
-                 # It's a "~X" where X is not a special character.
-                 # Consider it a literal ~ and X.
--                $c[-1] .= $1;
-+                my $text = $1;
-+                $text =~ s/\\/\\\\/g;
-+                $c[-1] .= $text;
-             }
-         }
-     }
diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD
index 59542f137..039a7c240 100644
--- a/core/perl/PKGBUILD
+++ b/core/perl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183473 2013-04-21 22:15:16Z bluewind $
+# $Id: PKGBUILD 186370 2013-05-26 09:24:10Z bluewind $
 # Maintainer: Florian Pritz <bluewind@xinu.at>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: kevin <kevin.archlinux.org>
@@ -6,8 +6,8 @@
 # Contributor: francois <francois.archlinux.org>
 
 pkgname=perl
-pkgver=5.16.3
-pkgrel=3
+pkgver=5.18.0
+pkgrel=1
 pkgdesc="A highly capable, feature-rich programming language"
 arch=(i686 x86_64 'mips64el')
 license=('GPL' 'PerlArtistic')
@@ -15,32 +15,27 @@ url="http://www.perl.org"
 groups=('base')
 depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh')
 source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2
-        cgi-cr-escaping.diff
         perlbin.sh
         perlbin.csh
-		CVE-2012-6329.patch
         provides.pl)
 install=perl.install
 options=('makeflags' '!purge')
-md5sums=('025102de0e4a597cf541e57da80c6aa3'
-         '0486659c9eefe682364a3e364d814296'
+md5sums=('a832e928adfd36d162d2a5d3b631265c'
          '5ed2542fdb9a60682f215bd33701e61a'
          '1f0cbbee783e8a6d32f01be5118e0d5e'
-         '5dc374e095d896fb30618e414aeb9017'
          '999c3eea6464860704abbb055a0f0896')
+
 # workaround to let the integrity check find the correct provides array
 if [[ ${0##*/} = "parse_pkgbuilds.sh" ]]; then
 	true && provides=($(bsdtar -q -O -xf "/srv/ftp/pool/packages/$pkgname-$pkgver-$pkgrel-$CARCH.pkg.tar.xz" .PKGINFO | sed -rn 's#^provides = (.*)#\1#p'))
 fi
 
-build() {
+prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
+}
 
-  patch -i "$srcdir/cgi-cr-escaping.diff" -p1
-  patch -i "$srcdir/CVE-2012-6329.patch" -p1
-
-  # Fix FS#34531; in perl upstream >= 5.17.9
-  sed -i "s/Is_dos/is_dos/" cpan/Pod-Perldoc/lib/Pod/Perldoc.pm
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
 
   if [ "${CARCH}" != "i686" ]; then
     # for x86_64
@@ -69,7 +64,7 @@ build() {
 
 check() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  TEST_JOBS=$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/') make test_harness
+  TEST_JOBS=$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/') make test_harness || true
 #  make test
 }
 
diff --git a/core/perl/cgi-cr-escaping.diff b/core/perl/cgi-cr-escaping.diff
deleted file mode 100644
index 51adf7231..000000000
--- a/core/perl/cgi-cr-escaping.diff
+++ /dev/null
@@ -1,75 +0,0 @@
-From 18b607e4544c0cffc85207a8f9901ba37ac917d9 Mon Sep 17 00:00:00 2001
-From: Ryo Anazawa <anazawa@cpan.org>
-Date: Wed, 14 Nov 2012 09:47:32 +0900
-Subject: CR escaping for P3P and Set-Cookie headers
-
-Bug: https://github.com/markstos/CGI.pm/pull/23
-Bug-Debian: http://bugs.debian.org/693420
-Origin: https://github.com/markstos/CGI.pm/commit/cb39938b45206093a363e36fd104e4a0f26deecb
-Patch-Name: fixes/cgi-cr-escaping.diff
----
- cpan/CGI/lib/CGI.pm  |   24 ++++++++++++------------
- cpan/CGI/t/headers.t |    6 ++++++
- 2 files changed, 18 insertions(+), 12 deletions(-)
-
-diff --git a/cpan/CGI/lib/CGI.pm b/cpan/CGI/lib/CGI.pm
-index 1a52c70..c70e9c1 100644
---- a/cpan/CGI/lib/CGI.pm
-+++ b/cpan/CGI/lib/CGI.pm
-@@ -1550,8 +1550,17 @@ sub header {
-                             'EXPIRES','NPH','CHARSET',
-                             'ATTACHMENT','P3P'],@p);
- 
-+    # Since $cookie and $p3p may be array references,
-+    # we must stringify them before CR escaping is done.
-+    my @cookie;
-+    for (ref($cookie) eq 'ARRAY' ? @{$cookie} : $cookie) {
-+        my $cs = UNIVERSAL::isa($_,'CGI::Cookie') ? $_->as_string : $_;
-+        push(@cookie,$cs) if defined $cs and $cs ne '';
-+    }
-+    $p3p = join ' ',@$p3p if ref($p3p) eq 'ARRAY';
-+
-     # CR escaping for values, per RFC 822
--    for my $header ($type,$status,$cookie,$target,$expires,$nph,$charset,$attachment,$p3p,@other) {
-+    for my $header ($type,$status,@cookie,$target,$expires,$nph,$charset,$attachment,$p3p,@other) {
-         if (defined $header) {
-             # From RFC 822:
-             # Unfolding  is  accomplished  by regarding   CRLF   immediately
-@@ -1595,18 +1604,9 @@ sub header {
- 
-     push(@header,"Status: $status") if $status;
-     push(@header,"Window-Target: $target") if $target;
--    if ($p3p) {
--       $p3p = join ' ',@$p3p if ref($p3p) eq 'ARRAY';
--       push(@header,qq(P3P: policyref="/w3c/p3p.xml", CP="$p3p"));
--    }
-+    push(@header,"P3P: policyref=\"/w3c/p3p.xml\", CP=\"$p3p\"") if $p3p;
-     # push all the cookies -- there may be several
--    if ($cookie) {
--	my(@cookie) = ref($cookie) && ref($cookie) eq 'ARRAY' ? @{$cookie} : $cookie;
--	for (@cookie) {
--            my $cs = UNIVERSAL::isa($_,'CGI::Cookie') ? $_->as_string : $_;
--	    push(@header,"Set-Cookie: $cs") if $cs ne '';
--	}
--    }
-+    push(@header,map {"Set-Cookie: $_"} @cookie);
-     # if the user indicates an expiration time, then we need
-     # both an Expires and a Date header (so that the browser is
-     # uses OUR clock)
-diff --git a/cpan/CGI/t/headers.t b/cpan/CGI/t/headers.t
-index 661b74b..4b4922c 100644
---- a/cpan/CGI/t/headers.t
-+++ b/cpan/CGI/t/headers.t
-@@ -22,6 +22,12 @@ like($@,qr/contains a newline/,'invalid header blows up');
- like $cgi->header( -type => "text/html".$CGI::CRLF." evil: stuff " ),
-     qr#Content-Type: text/html evil: stuff#, 'known header, with leading and trailing whitespace on the continuation line';
- 
-+eval { $cgi->header( -p3p => ["foo".$CGI::CRLF."bar"] ) };
-+like($@,qr/contains a newline/,'P3P header with CRLF embedded blows up');
-+
-+eval { $cgi->header( -cookie => ["foo".$CGI::CRLF."bar"] ) };
-+like($@,qr/contains a newline/,'Set-Cookie header with CRLF embedded blows up');
-+
- eval { $cgi->header( -foobar => "text/html".$CGI::CRLF."evil: stuff" ) };
- like($@,qr/contains a newline/,'unknown header with CRLF embedded blows up');
- 
diff --git a/core/popt/PKGBUILD b/core/popt/PKGBUILD
index 504665858..1f65bae8d 100644
--- a/core/popt/PKGBUILD
+++ b/core/popt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 156453 2012-04-18 12:20:42Z stephane $
+# $Id: PKGBUILD 186305 2013-05-24 13:04:43Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=popt
 pkgver=1.16
-pkgrel=5
+pkgrel=6
 pkgdesc="A commandline option parser"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://rpm5.org"
@@ -20,7 +20,7 @@ sha1sums=('cfe94a15a2404db85858a81ff8de27c8ff3e235e')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --disable-static
   make
 }
 
diff --git a/core/procps-ng/PKGBUILD b/core/procps-ng/PKGBUILD
index dfcaa3ea3..e59222069 100644
--- a/core/procps-ng/PKGBUILD
+++ b/core/procps-ng/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180917 2013-03-28 02:20:12Z bisson $
+# $Id: PKGBUILD 186026 2013-05-20 14:49:45Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Eric Bélanger <eric@archlinux.org>
 
 pkgname=procps-ng
 pkgver=3.3.7
-pkgrel=1
+pkgrel=2
 pkgdesc='Utilities for monitoring your system and its processes'
 url='http://gitorious.org/procps'
 license=('GPL' 'LGPL')
@@ -23,11 +23,22 @@ replaces=('procps')
 
 options=('!libtool')
 
-build() {
+prepare() {
 	cd "${srcdir}/procps-procps"
 	echo ${pkgver} > .tarball-version
 	./autogen.sh
-	./configure --exec-prefix=/ --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib
+}
+
+build() {
+	cd "${srcdir}/procps-procps"
+	./configure \
+		--prefix=/usr \
+		--exec-prefix=/ \
+		--sysconfdir=/etc \
+		--libdir=/usr/lib \
+		--bindir=/usr/bin \
+		--sbindir=/usr/bin \
+		--disable-static
 	make
 }
 
@@ -37,6 +48,6 @@ package() {
 	install -D -m644 ../sysctl.conf "${pkgdir}/etc/sysctl.conf"
 
 	# provided by util-linux
-	rm "${pkgdir}/bin/kill"
+	rm "${pkgdir}/usr/bin/kill"
 	rm "${pkgdir}/usr/share/man/man1/kill.1"
 }
diff --git a/core/reiserfsprogs/PKGBUILD b/core/reiserfsprogs/PKGBUILD
index bac2a687a..a3c94bdf1 100644
--- a/core/reiserfsprogs/PKGBUILD
+++ b/core/reiserfsprogs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 176315 2013-01-29 16:20:21Z andrea $
+# $Id: PKGBUILD 186498 2013-05-27 20:01:02Z tpowa $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=reiserfsprogs
 pkgver=3.6.22
-pkgrel=1
+pkgrel=2
 pkgdesc="Reiserfs utilities"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kernel.org/"
@@ -16,7 +16,7 @@ md5sums=('91d2fdb5eeaa15c8afcc9e815179690d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sbindir=/sbin
+  ./configure --prefix=/usr --sbindir=/usr/bin
   make
 }
 
diff --git a/core/rfkill/PKGBUILD b/core/rfkill/PKGBUILD
index 580296392..32e24b430 100644
--- a/core/rfkill/PKGBUILD
+++ b/core/rfkill/PKGBUILD
@@ -1,29 +1,23 @@
-# $Id: PKGBUILD 175740 2013-01-21 04:49:48Z bisson $
+# $Id: PKGBUILD 186265 2013-05-23 06:41:04Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Thomas Bächler <thomas@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=rfkill
-pkgver=0.4
-pkgrel=7
+pkgver=0.5
+pkgrel=1
 pkgdesc='Tool for enabling and disabling wireless devices'
-url='http://linuxwireless.org/en/users/Documentation/rfkill'
+url='http://wireless.kernel.org/en/users/Documentation/rfkill'
 license=('custom')
 arch=('i686' 'x86_64' 'mips64el')
-source=("http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+source=("https://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${pkgver}.tar.xz"
         'service.unblock'
         'service.block'
-        'rules.d'
-        'conf.d'
-        'rc.d')
-sha1sums=('fccabf5a272ac2891f24dc35449dc6f4c45ff44b'
-          '4d0ef151891c32c882dcec8b03ab7204f015d0d1'
-          'c44581c4cc19509f53afd0abea1341cc30751fe2'
-          '6390eaa793b473098aaa11b13c5254d611a4c13a'
-          'd969fe927a9fb2926af43a311a7c1fa126fe59a9'
-          '380af0b002f51543557306ed68a27f0059fd5a6f')
-
-backup=('etc/conf.d/rfkill')
+        'rules.d')
+sha1sums=('03025d4ae285c40d5c19ec99ef7b317afda9d900'
+          '5f4a04a434df2ca28ca6687326c67c1f125aa3d4'
+          '6cc294af37232469cd5ba63455b571fe258e1cc6'
+          '6390eaa793b473098aaa11b13c5254d611a4c13a')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
@@ -32,11 +26,9 @@ build() {
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
+	make SBINDIR=/usr/bin DESTDIR="${pkgdir}" install
 	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 	install -Dm644 ../rules.d "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules"
 	install -Dm644 ../service.block "${pkgdir}/usr/lib/systemd/system/rfkill-block@.service"
 	install -Dm644 ../service.unblock "${pkgdir}/usr/lib/systemd/system/rfkill-unblock@.service"
-	install -Dm644 ../conf.d "${pkgdir}/etc/conf.d/rfkill"
-	install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/rfkill"
 }
diff --git a/core/rfkill/conf.d b/core/rfkill/conf.d
deleted file mode 100644
index 4483da26c..000000000
--- a/core/rfkill/conf.d
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# /etc/conf.d/rfkill
-# Configuration for the rfkill startup script
-#
-
-# List of devices to block on startup (space-separated)
-RFKILL_BLOCK=""
-
-# List of devices to unblock on startup (space-separated)
-RFKILL_UNBLOCK="all"
-
-# Supported device names are: all, wifi, bluetooth, umb, wimax, wwan, gps and specific device names like phy0, hci0, ...
-# See "rfkill list" for available devices
-# Examples:
-#
-# Block all bluetooth devices:
-# RFKILL_BLOCK="bluetooth"
-#
-# Unblock the phy0 wifi device and all wwan devices:
-# RFKILL_UNBLOCK="phy0 wwan"
diff --git a/core/rfkill/rc.d b/core/rfkill/rc.d
deleted file mode 100755
index ce90ee150..000000000
--- a/core/rfkill/rc.d
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/rfkill
-
-case "$1" in
-  start)
-    for device in ${RFKILL_BLOCK}; do
-      stat_busy "Blocking rfkill device: ${device}"
-      /usr/sbin/rfkill block ${device}
-      if [ $? -eq 0 ]; then
-        stat_done
-      else
-        stat_fail
-      fi
-    done
-    for device in ${RFKILL_UNBLOCK}; do
-      stat_busy "Unblocking rfkill device: ${device}"
-      /usr/sbin/rfkill unblock ${device}
-      if [ $? -eq 0 ]; then
-        stat_done
-      else
-        stat_fail
-      fi
-    done
-    ;;
-  stop)
-    ;;
-  restart)
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start}"
-    exit 1
-    ;;
-esac
-exit 0
diff --git a/core/rfkill/service.block b/core/rfkill/service.block
index 420272c5d..ede74d12d 100644
--- a/core/rfkill/service.block
+++ b/core/rfkill/service.block
@@ -4,7 +4,7 @@ After=rfkill-unblock@all.service
 
 [Service]
 Type=oneshot
-ExecStart=/usr/sbin/rfkill block %I
+ExecStart=/usr/bin/rfkill block %I
 
 [Install]
 WantedBy=multi-user.target
diff --git a/core/rfkill/service.unblock b/core/rfkill/service.unblock
index 40f4e3244..94ebf35af 100644
--- a/core/rfkill/service.unblock
+++ b/core/rfkill/service.unblock
@@ -4,7 +4,7 @@ After=rfkill-block@all.service
 
 [Service]
 Type=oneshot
-ExecStart=/usr/sbin/rfkill unblock %I
+ExecStart=/usr/bin/rfkill unblock %I
 
 [Install]
 WantedBy=multi-user.target
diff --git a/core/systemd/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch b/core/systemd/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch
new file mode 100644
index 000000000..84cce7121
--- /dev/null
+++ b/core/systemd/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch
@@ -0,0 +1,255 @@
+From 3f92e4b4b61042391bd44de4dceb18177df0dd57 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Thu, 16 May 2013 00:19:03 +0200
+Subject: [PATCH] utmp: turn systemd-update-utmp-shutdown.service into a normal
+ runtime service
+
+With this change systemd-update-utmp-shutdown.service is replaced by
+systemd-update-utmp.service which is started at boot and stays around
+until shutdown. This allows us to properly order the unit against both
+/var/log and auditd.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=853104
+https://bugs.freedesktop.org/show_bug.cgi?id=64365
+---
+ Makefile-man.am                                     | 12 ++++++------
+ Makefile.am                                         |  8 ++++----
+ ....service.xml => systemd-update-utmp.service.xml} | 16 ++++++++--------
+ src/update-utmp/update-utmp.c                       |  2 +-
+ units/.gitignore                                    |  2 +-
+ units/systemd-update-utmp-runlevel.service.in       |  8 +++++---
+ units/systemd-update-utmp-shutdown.service.in       | 19 -------------------
+ units/systemd-update-utmp.service.in                | 21 +++++++++++++++++++++
+ 8 files changed, 46 insertions(+), 42 deletions(-)
+ rename man/{systemd-update-utmp-runlevel.service.xml => systemd-update-utmp.service.xml} (82%)
+ delete mode 100644 units/systemd-update-utmp-shutdown.service.in
+ create mode 100644 units/systemd-update-utmp.service.in
+
+diff --git a/Makefile-man.am b/Makefile-man.am
+index 7d62094..5888158 100644
+--- a/Makefile-man.am
++++ b/Makefile-man.am
+@@ -72,7 +72,7 @@ MANPAGES += \
+ 	man/systemd-tmpfiles.8 \
+ 	man/systemd-tty-ask-password-agent.1 \
+ 	man/systemd-udevd.service.8 \
+-	man/systemd-update-utmp-runlevel.service.8 \
++	man/systemd-update-utmp.service.8 \
+ 	man/systemd.1 \
+ 	man/systemd.automount.5 \
+ 	man/systemd.device.5 \
+@@ -191,7 +191,7 @@ MANPAGES_ALIAS += \
+ 	man/systemd-udevd-control.socket.8 \
+ 	man/systemd-udevd-kernel.socket.8 \
+ 	man/systemd-udevd.8 \
+-	man/systemd-update-utmp-shutdown.service.8 \
++	man/systemd-update-utmp-runlevel.service.8 \
+ 	man/systemd-update-utmp.8 \
+ 	man/systemd-user.conf.5
+ man/SD_ALERT.3: man/sd-daemon.3
+@@ -289,8 +289,8 @@ man/systemd-tmpfiles-setup.service.8: man/systemd-tmpfiles.8
+ man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8
+ man/systemd-udevd-kernel.socket.8: man/systemd-udevd.service.8
+ man/systemd-udevd.8: man/systemd-udevd.service.8
+-man/systemd-update-utmp-shutdown.service.8: man/systemd-update-utmp-runlevel.service.8
+-man/systemd-update-utmp.8: man/systemd-update-utmp-runlevel.service.8
++man/systemd-update-utmp-runlevel.service.8: man/systemd-update-utmp.service.8
++man/systemd-update-utmp.8: man/systemd-update-utmp.service.8
+ man/systemd-user.conf.5: man/systemd-system.conf.5
+ man/SD_ALERT.html: man/sd-daemon.html
+ 	$(html-alias)
+@@ -577,10 +577,10 @@ man/systemd-udevd-kernel.socket.html: man/systemd-udevd.service.html
+ man/systemd-udevd.html: man/systemd-udevd.service.html
+ 	$(html-alias)
+ 
+-man/systemd-update-utmp-shutdown.service.html: man/systemd-update-utmp-runlevel.service.html
++man/systemd-update-utmp-runlevel.service.html: man/systemd-update-utmp.service.html
+ 	$(html-alias)
+ 
+-man/systemd-update-utmp.html: man/systemd-update-utmp-runlevel.service.html
++man/systemd-update-utmp.html: man/systemd-update-utmp.service.html
+ 	$(html-alias)
+ 
+ man/systemd-user.conf.html: man/systemd-system.conf.html
+diff --git a/Makefile.am b/Makefile.am
+index 8d8139c..4c5e6fc 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -417,8 +417,8 @@ nodist_systemunit_DATA = \
+ 	units/systemd-initctl.service \
+ 	units/systemd-shutdownd.service \
+ 	units/systemd-remount-fs.service \
++	units/systemd-update-utmp.service \
+ 	units/systemd-update-utmp-runlevel.service \
+-	units/systemd-update-utmp-shutdown.service \
+ 	units/systemd-tmpfiles-setup-dev.service \
+ 	units/systemd-tmpfiles-setup.service \
+ 	units/systemd-tmpfiles-clean.service \
+@@ -463,8 +463,8 @@ EXTRA_DIST += \
+ 	units/systemd-initctl.service.in \
+ 	units/systemd-shutdownd.service.in \
+ 	units/systemd-remount-fs.service.in \
++	units/systemd-update-utmp.service.in \
+ 	units/systemd-update-utmp-runlevel.service.in \
+-	units/systemd-update-utmp-shutdown.service.in \
+ 	units/systemd-tmpfiles-setup-dev.service.in \
+ 	units/systemd-tmpfiles-setup.service.in \
+ 	units/systemd-tmpfiles-clean.service.in \
+@@ -4070,8 +4070,8 @@ RUNLEVEL4_TARGET_WANTS += \
+ RUNLEVEL5_TARGET_WANTS += \
+ 	systemd-update-utmp-runlevel.service
+ endif
+-SHUTDOWN_TARGET_WANTS += \
+-	systemd-update-utmp-shutdown.service
++SYSINIT_TARGET_WANTS += \
++	systemd-update-utmp.service
+ LOCAL_FS_TARGET_WANTS += \
+ 	systemd-remount-fs.service \
+ 	systemd-fsck-root.service \
+diff --git a/man/systemd-update-utmp-runlevel.service.xml b/man/systemd-update-utmp.service.xml
+similarity index 82%
+rename from man/systemd-update-utmp-runlevel.service.xml
+rename to man/systemd-update-utmp.service.xml
+index 867b958..846fc95 100644
+--- a/man/systemd-update-utmp-runlevel.service.xml
++++ b/man/systemd-update-utmp.service.xml
+@@ -19,10 +19,10 @@
+   You should have received a copy of the GNU Lesser General Public License
+   along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ -->
+-<refentry id="systemd-update-utmp-runlevel.service">
++<refentry id="systemd-update-utmp.service">
+ 
+         <refentryinfo>
+-                <title>systemd-update-utmp-runlevel.service</title>
++                <title>systemd-update-utmp.service</title>
+                 <productname>systemd</productname>
+ 
+                 <authorgroup>
+@@ -36,21 +36,21 @@
+         </refentryinfo>
+ 
+         <refmeta>
+-                <refentrytitle>systemd-update-utmp-runlevel.service</refentrytitle>
++                <refentrytitle>systemd-update-utmp.service</refentrytitle>
+                 <manvolnum>8</manvolnum>
+         </refmeta>
+ 
+         <refnamediv>
++                <refname>systemd-update-utmp.service</refname>
+                 <refname>systemd-update-utmp-runlevel.service</refname>
+-                <refname>systemd-update-utmp-shutdown.service</refname>
+                 <refname>systemd-update-utmp</refname>
+-                <refpurpose>Write audit and utmp updates at runlevel
++                <refpurpose>Write audit and utmp updates at bootup, runlevel
+                 changes and shutdown</refpurpose>
+         </refnamediv>
+ 
+         <refsynopsisdiv>
++                <para><filename>systemd-update-utmp.service</filename></para>
+                 <para><filename>systemd-update-utmp-runlevel.service</filename></para>
+-                <para><filename>systemd-update-utmp-shutdown.service</filename></para>
+                 <para><filename>/usr/lib/systemd/systemd-update-utmp</filename></para>
+         </refsynopsisdiv>
+ 
+@@ -60,8 +60,8 @@
+                 <para><filename>systemd-update-utmp-runlevel.service</filename>
+                 is a service that writes SysV runlevel changes to utmp
+                 and wtmp, as well as the audit logs, as they
+-                occur. <filename>systemd-update-utmp-shutdown.service</filename>
+-                does the same for shut-down requests.</para>
++                occur. <filename>systemd-update-utmp.service</filename>
++                does the same for system reboots and shut-down requests.</para>
+         </refsect1>
+ 
+         <refsect1>
+diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c
+index 9184025..202aa98 100644
+--- a/src/update-utmp/update-utmp.c
++++ b/src/update-utmp/update-utmp.c
+@@ -104,7 +104,7 @@ static int get_current_runlevel(Context *c) {
+                 { '3', SPECIAL_RUNLEVEL3_TARGET },
+                 { '4', SPECIAL_RUNLEVEL4_TARGET },
+                 { '2', SPECIAL_RUNLEVEL2_TARGET },
+-                { 'S', SPECIAL_RESCUE_TARGET },
++                { '1', SPECIAL_RESCUE_TARGET },
+         };
+         const char
+                 *interface = "org.freedesktop.systemd1.Unit",
+diff --git a/units/systemd-update-utmp-runlevel.service.in b/units/systemd-update-utmp-runlevel.service.in
+index 27fae2c..99783e2 100644
+--- a/units/systemd-update-utmp-runlevel.service.in
++++ b/units/systemd-update-utmp-runlevel.service.in
+@@ -7,12 +7,14 @@
+ 
+ [Unit]
+ Description=Update UTMP about System Runlevel Changes
+-Documentation=man:systemd-update-utmp-runlevel.service(8) man:utmp(5)
++Documentation=man:systemd-update-utmp.service(8) man:utmp(5)
+ DefaultDependencies=no
+ RequiresMountsFor=/var/log/wtmp
+-After=systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service
++Conflicts=shutdown.target
++Requisite=systemd-update-utmp.service
++After=systemd-update-utmp.service
+ After=runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target
+-Before=final.target
++Before=shutdown.target
+ 
+ [Service]
+ Type=oneshot
+diff --git a/units/systemd-update-utmp-shutdown.service.in b/units/systemd-update-utmp-shutdown.service.in
+deleted file mode 100644
+index aa93562..0000000
+--- a/units/systemd-update-utmp-shutdown.service.in
++++ /dev/null
+@@ -1,19 +0,0 @@
+-#  This file is part of systemd.
+-#
+-#  systemd is free software; you can redistribute it and/or modify it
+-#  under the terms of the GNU Lesser General Public License as published by
+-#  the Free Software Foundation; either version 2.1 of the License, or
+-#  (at your option) any later version.
+-
+-[Unit]
+-Description=Update UTMP about System Shutdown
+-Documentation=man:systemd-update-utmp-runlevel.service(8) man:utmp(5)
+-DefaultDependencies=no
+-RequiresMountsFor=/var/log/wtmp
+-After=systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service
+-After=systemd-update-utmp-runlevel.service
+-Before=final.target
+-
+-[Service]
+-Type=oneshot
+-ExecStart=@rootlibexecdir@/systemd-update-utmp shutdown
+diff --git a/units/systemd-update-utmp.service.in b/units/systemd-update-utmp.service.in
+new file mode 100644
+index 0000000..e7c20a5
+--- /dev/null
++++ b/units/systemd-update-utmp.service.in
+@@ -0,0 +1,21 @@
++#  This file is part of systemd.
++#
++#  systemd is free software; you can redistribute it and/or modify it
++#  under the terms of the GNU Lesser General Public License as published by
++#  the Free Software Foundation; either version 2.1 of the License, or
++#  (at your option) any later version.
++
++[Unit]
++Description=Update UTMP about System Reboot/Shutdown
++Documentation=man:systemd-update-utmp.service(8) man:utmp(5)
++DefaultDependencies=no
++RequiresMountsFor=/var/log/wtmp
++Conflicts=shutdown.target
++After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service
++Before=sysinit.target shutdown.target
++
++[Service]
++Type=oneshot
++RemainAfterExit=yes
++ExecStart=@rootlibexecdir@/systemd-update-utmp reboot
++ExecStop=@rootlibexecdir@/systemd-update-utmp shutdown
+-- 
+1.8.2.3
+
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 1a106b14e..d26c533fb 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
 pkgver=204
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2' 'LGPL2.1' 'MIT')
@@ -13,11 +13,13 @@ makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection
              'linux-api-headers' 'pam' 'python' 'quota-tools' 'xz')
 options=('!libtool' '!distcc')
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
+        0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch
         'initcpio-hook-udev'
         'initcpio-install-udev'
         'initcpio-install-timestamp'
         'use-split-usr-path.patch')
 md5sums=('a07619bb19f48164fbf0761d12fd39a8'
+         '7f39f9fde1ff7b48293ed1e3d0a6c213'
          'e99e9189aa2f6084ac28b8ddf605aeb8'
          'fb37e34ea006c79be1c54cbb0f803414'
          'df69615503ad293c9ddf9d8b7755282d'
@@ -28,6 +30,9 @@ prepare() {
 
   # hang onto this until we do the /{,s}bin merge
   patch -Np1 <"$srcdir/use-split-usr-path.patch"
+
+  patch -Np1 <"$srcdir/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch"
+  autoreconf
 }
 
 build() {
@@ -102,9 +107,6 @@ package_systemd() {
   install -d "$pkgdir/sbin"
   ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm"
 
-  # udevd is no longer udevd because systemd. why isn't udevadm now udevctl?
-  ln -s ../lib/systemd/systemd-udevd "$pkgdir/usr/bin/udevd"
-
   # add back tmpfiles.d/legacy.conf
   install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
 
diff --git a/core/util-linux/0001-libfdisk-do-not-use-va_list-in-the-Ask-API.patch b/core/util-linux/0001-libfdisk-do-not-use-va_list-in-the-Ask-API.patch
new file mode 100644
index 000000000..86bb6e572
--- /dev/null
+++ b/core/util-linux/0001-libfdisk-do-not-use-va_list-in-the-Ask-API.patch
@@ -0,0 +1,163 @@
+From 4fb18cde32a6cb672090762c785d89a6ed02ef57 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 9 May 2013 13:06:02 +0200
+Subject: [PATCH] libfdisk: do not use va_list in the Ask API
+
+  # fdisk /dev/sda
+  Welcome to fdisk (util-linux 2.23).
+
+  [...]
+
+  Command (m for help): a
+  Segmentation fault (core dumped)
+
+It's too fragile, the va_list implementation is architecture specific
+and it seems we need such thing in libfdisk at all.
+
+Reported-by: "Gabor Z. Papp" <gzp@papp.hu>
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ fdisks/fdisk-ask.c      | 13 +++----------
+ libfdisk/src/ask.c      | 35 +++++++++--------------------------
+ libfdisk/src/fdiskP.h   |  2 --
+ libfdisk/src/libfdisk.h |  2 --
+ 4 files changed, 12 insertions(+), 40 deletions(-)
+
+diff --git a/fdisks/fdisk-ask.c b/fdisks/fdisk-ask.c
+index 7495d85..61dc0c2 100644
+--- a/fdisks/fdisk-ask.c
++++ b/fdisks/fdisk-ask.c
+@@ -167,7 +167,6 @@ static int ask_offset(struct fdisk_context *cxt,
+ int ask_callback(struct fdisk_context *cxt, struct fdisk_ask *ask,
+ 		    void *data __attribute__((__unused__)))
+ {
+-	va_list ap;
+ 	int rc = 0;
+ 	char buf[BUFSIZ];
+ 
+@@ -180,23 +179,17 @@ int ask_callback(struct fdisk_context *cxt, struct fdisk_ask *ask,
+ 	case FDISK_ASKTYPE_OFFSET:
+ 		return ask_offset(cxt, ask, buf, sizeof(buf));
+ 	case FDISK_ASKTYPE_INFO:
+-		fdisk_ask_print_get_va(ask, ap);
+-		vfprintf(stdout, fdisk_ask_print_get_mesg(ask), ap);
++		fputs(fdisk_ask_print_get_mesg(ask), stdout);
+ 		fputc('\n', stdout);
+-		va_end(ap);
+ 		break;
+ 	case FDISK_ASKTYPE_WARNX:
+-		fdisk_ask_print_get_va(ask, ap);
+-		vfprintf(stderr, fdisk_ask_print_get_mesg(ask), ap);
++		fputs(fdisk_ask_print_get_mesg(ask), stderr);
+ 		fputc('\n', stderr);
+-		va_end(ap);
+ 		break;
+ 	case FDISK_ASKTYPE_WARN:
+-		fdisk_ask_print_get_va(ask, ap);
+-		vfprintf(stderr, fdisk_ask_print_get_mesg(ask), ap);
++		fputs(fdisk_ask_print_get_mesg(ask), stderr);
+ 		errno = fdisk_ask_print_get_errno(ask);
+ 		fprintf(stderr, ": %m\n");
+-		va_end(ap);
+ 		break;
+ 	case FDISK_ASKTYPE_YESNO:
+ 		fputc('\n', stdout);
+diff --git a/libfdisk/src/ask.c b/libfdisk/src/ask.c
+index d2325d5..cdb4d01 100644
+--- a/libfdisk/src/ask.c
++++ b/libfdisk/src/ask.c
+@@ -18,11 +18,6 @@ void fdisk_reset_ask(struct fdisk_ask *ask)
+ 	case FDISK_ASKTYPE_NUMBER:
+ 		free(ask->data.num.range);
+ 		break;
+-	case FDISK_ASKTYPE_WARNX:
+-	case FDISK_ASKTYPE_WARN:
+-		if (ask->data.print.has_va)
+-			va_end(ask->data.print.va);
+-		break;
+ 	default:
+ 		break;
+ 	}
+@@ -452,44 +447,32 @@ int fdisk_ask_print_set_mesg(struct fdisk_ask *ask, const char *mesg)
+ 	return 0;
+ }
+ 
+-/* caller has to call va_end(ap) */
+-int fdisk_ask_print_get_va(struct fdisk_ask *ask, va_list ap)
+-{
+-	assert(ask);
+-	assert(is_print_ask(ask));
+-	va_copy(ap, ask->data.print.va);
+-	return 0;
+-}
+-
+-/* note that fdisk_free_ask() calls va_end() to free the private va list. */
+-int fdisk_ask_print_set_va(struct fdisk_ask *ask, va_list ap)
+-{
+-	assert(ask);
+-	va_copy(ask->data.print.va, ap);
+-	ask->data.print.has_va = 1;
+-	return 0;
+-}
+-
+ static int do_vprint(struct fdisk_context *cxt, int errnum, int type,
+ 		 const char *fmt, va_list va)
+ {
+ 	struct fdisk_ask *ask;
+ 	int rc;
++	char *mesg;
+ 
+ 	assert(cxt);
+ 
++	if (vasprintf(&mesg, fmt, va) < 0)
++		return -ENOMEM;
++
+ 	ask = fdisk_new_ask();
+-	if (!ask)
++	if (!ask) {
++		free(mesg);
+ 		return -ENOMEM;
++	}
+ 
+ 	fdisk_ask_set_type(ask, type);
+-	fdisk_ask_print_set_mesg(ask, fmt);
+-	fdisk_ask_print_set_va(ask, va);
++	fdisk_ask_print_set_mesg(ask, mesg);
+ 	if (errnum >= 0)
+ 		fdisk_ask_print_set_errno(ask, errnum);
+ 	rc = fdisk_do_ask(cxt, ask);
+ 
+ 	fdisk_free_ask(ask);
++	free(mesg);
+ 	return rc;
+ }
+ 
+diff --git a/libfdisk/src/fdiskP.h b/libfdisk/src/fdiskP.h
+index 570108c..ce42860 100644
+--- a/libfdisk/src/fdiskP.h
++++ b/libfdisk/src/fdiskP.h
+@@ -231,8 +231,6 @@ struct fdisk_ask {
+ 		/* FDISK_ASKTYPE_{WARN,WARNX,..} */
+ 		struct ask_print {
+ 			const char	*mesg;
+-			va_list		va;
+-			unsigned int	has_va:1;
+ 			int		errnum;		/* errno */
+ 		} print;
+ 		/* FDISK_ASKTYPE_YESNO */
+diff --git a/libfdisk/src/libfdisk.h b/libfdisk/src/libfdisk.h
+index 0a23236..8a44067 100644
+--- a/libfdisk/src/libfdisk.h
++++ b/libfdisk/src/libfdisk.h
+@@ -182,8 +182,6 @@ extern int fdisk_ask_print_get_errno(struct fdisk_ask *ask);
+ extern int fdisk_ask_print_set_errno(struct fdisk_ask *ask, int errnum);
+ extern const char *fdisk_ask_print_get_mesg(struct fdisk_ask *ask);
+ extern int fdisk_ask_print_set_mesg(struct fdisk_ask *ask, const char *mesg);
+-extern int fdisk_ask_print_get_va(struct fdisk_ask *ask, va_list ap);
+-extern int fdisk_ask_print_set_va(struct fdisk_ask *ask, va_list ap);
+ 
+ #ifdef __cplusplus
+ }
+-- 
+1.8.2.3
+
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index 9143a4872..2172701f9 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185607 2013-05-15 22:53:31Z tomegun $
+# $Id: PKGBUILD 186531 2013-05-28 12:25:50Z dreisner $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=util-linux
 pkgver=2.23
-pkgrel=2
+pkgrel=3
 pkgdesc="Miscellaneous system utilities for Linux"
 url="http://www.kernel.org/pub/linux/utils/util-linux/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,6 +19,7 @@ options=('!libtool')
 source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.23/$pkgname-$pkgver.tar.xz"
         0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch
         0001-losetup-use-warn_size-for-regular-files-only.patch
+        0001-libfdisk-do-not-use-va_list-in-the-Ask-API.patch
         uuidd.tmpfiles
         pam-login
         pam-common
@@ -32,6 +33,7 @@ install=util-linux.install
 md5sums=('cf5e9bb402371beaaffc3a5f276d5783'
          'fdb627fbb3d6a42e0b36978649b4c064'
          'de0ba450945a60f27c5df86e64523d57'
+         'df949d15dbff01fe9fcda5d999a35b15'
          'a39554bfd65cccfd8254bb46922f4a67'
          '4368b3f98abd8a32662e094c54e7f9b1'
          'a31374fef2cba0ca34dfc7078e2969e4'
@@ -42,6 +44,7 @@ prepare() {
 
   patch -Np1 <"$srcdir"/0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch
   patch -Np1 <"$srcdir"/0001-losetup-use-warn_size-for-regular-files-only.patch
+  patch -Np1 <"$srcdir"/0001-libfdisk-do-not-use-va_list-in-the-Ask-API.patch
 }
 
 build() {
diff --git a/core/wireless_tools/PKGBUILD b/core/wireless_tools/PKGBUILD
index 92d2f15d0..8a6b6cb41 100644
--- a/core/wireless_tools/PKGBUILD
+++ b/core/wireless_tools/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 165574 2012-08-25 15:33:20Z bisson $
+# $Id: PKGBUILD 186266 2013-05-23 06:41:05Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jason Chu <jchu@xentac.net>
 
 pkgname=wireless_tools
 pkgver=29
-pkgrel=7.1
+pkgrel=8
 pkgdesc='Tools allowing to manipulate the Wireless Extensions'
 url='http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html'
 license=('GPL')
@@ -15,16 +15,20 @@ source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgve
 sha1sums=('22040ac1497f4c5f8ddeca365591b01ae3475710'
           '5c297c7dff1ec1d2a3d918c20622ab3c6daf5b72')
 
-build() {
+prepare() {
 	cd "${srcdir}/${pkgname}.${pkgver}"
 	patch -p1 -i ../dense.patch # FS#15363
+}
+
+build() {
+	cd "${srcdir}/${pkgname}.${pkgver}"
 	make CFLAGS="${CFLAGS} -I." LDFLAGS="${LDFLAGS}"
 }
 
 package() {
 	cd "${srcdir}/${pkgname}.${pkgver}"
 	make \
-		INSTALL_DIR="${pkgdir}/usr/sbin" \
+		INSTALL_DIR="${pkgdir}/usr/bin" \
 		INSTALL_LIB="${pkgdir}/usr/lib" \
 		INSTALL_INC="${pkgdir}/usr/include" \
 		INSTALL_MAN="${pkgdir}/usr/share/man" \
diff --git a/core/xfsprogs/PKGBUILD b/core/xfsprogs/PKGBUILD
index c56832ad2..eeb8d3b10 100644
--- a/core/xfsprogs/PKGBUILD
+++ b/core/xfsprogs/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 175120 2013-01-14 07:38:18Z tpowa $
+# $Id: PKGBUILD 186296 2013-05-24 07:56:54Z tpowa $
 #
 pkgname=xfsprogs
-pkgver=3.1.10
+pkgver=3.1.11
 pkgrel=1
 pkgdesc="XFS filesystem utilities"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,20 +12,20 @@ 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")
-md5sums=('d6159f7a664d95b4c150d580399d4400')
+md5sums=('de9f1f45026c2f4e0776058d429ff4b6')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   export OPTIMIZER="-march=${CARCH/_/-} -O1"
   [ "$CARCH" = "mips64el" ] && export OPTIMIZER="-mabi=n32 -march=mips3 -mtune=loongson2f -O1"
   export DEBUG=-DNDEBUG
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sbindir=/usr/bin
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DIST_ROOT="${pkgdir}" install install-dev
+  make DIST_ROOT="${pkgdir}" PKG_ROOT_SBIN_DIR="/usr/bin" install install-dev
   chown -R root $pkgdir
   chgrp -R root $pkgdir
   # add hack as we cannot set rootlibdir
diff --git a/core/xinetd/PKGBUILD b/core/xinetd/PKGBUILD
index 5bee80902..fbdf3d48d 100644
--- a/core/xinetd/PKGBUILD
+++ b/core/xinetd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 162234 2012-06-24 05:44:41Z tpowa $
+# $Id: PKGBUILD 186292 2013-05-24 07:53:31Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Judd <jvinet@zeroflux.org>
 
 pkgname=xinetd
 pkgver=2.3.15
-pkgrel=2
+pkgrel=3
 pkgdesc="A secure replacement for inetd"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xinetd.org/"
@@ -13,30 +13,31 @@ optdepends=('perl: for xconv.pl script')
 backup=('etc/xinetd.conf' 'etc/xinetd.d/servers' 'etc/xinetd.d/services')
 source=(http://www.xinetd.org/xinetd-$pkgver.tar.gz
         xinetd.conf
-        xinetd
         servers
         services
         xinetd.service)
 md5sums=('77358478fd58efa6366accae99b8b04c'
          'f109f699a07bc8cfb5791060f5e87f9e'
-         'ea37a2794f202e6b953d9b6956dad16a'
          '21f47b4aa20921cfaddddd9f9a407f81'
          '9fa2061dc7dd738c8424251deb86f81e'
-         '08466ed714ea8ba42ad81f6fb3aa62e7')
+         '38be35b6e7146dc59902e243d9063b4c')
 
-build() {
+prepare() {
   cd $srcdir/$pkgname-$pkgver
   sed -i "s#${prefix}/man#${prefix}/share/man#" configure
-  ./configure --prefix=/usr --without-libwrap \
+}
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr --sbindir=/usr/bin --without-libwrap \
               --build=${CHOST} --host=${CHOST}
   make
 }
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  make prefix=$pkgdir/usr install
+  make prefix=$pkgdir/usr DAEMONDIR=$pkgdir/usr/bin install
   
-  install -Dm755 $srcdir/xinetd $pkgdir/etc/rc.d/xinetd
   install -Dm644 $srcdir/xinetd.conf $pkgdir/etc/xinetd.conf
   install -Dm644 $srcdir/servers $pkgdir/etc/xinetd.d/servers
   install -Dm644 $srcdir/services $pkgdir/etc/xinetd.d/services
diff --git a/core/xinetd/xinetd.service b/core/xinetd/xinetd.service
index c6f6271fd..1c587e291 100644
--- a/core/xinetd/xinetd.service
+++ b/core/xinetd/xinetd.service
@@ -3,7 +3,7 @@ Description=A secure replacement for inetd
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/xinetd -dontfork
+ExecStart=/usr/bin/xinetd -dontfork
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
author	Michał Masłowski <mtjm@mtjm.eu>	2013-05-30 11:55:09 +0200
committer	Michał Masłowski <mtjm@mtjm.eu>	2013-05-30 11:55:09 +0200
commit	b0fdec08ea3b6e162b710ca98b0dd56f9ae105eb (patch)
tree	376cc5751d9a587815d7270caa61070f38832766 /core
parent	8abbf69cf497489fb7a0ac3538cb6975285486b7 (diff)
parent	76ee9007095484a113d1856786b81e2d2fae8202 (diff)