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

Conflicts:
	community/collectd/PKGBUILD
	community/drivel/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/gnomesu/PKGBUILD
	community/gnuchess/PKGBUILD
	community/gphpedit/PKGBUILD
	community/gsql/PKGBUILD
	community/libmatchbox/PKGBUILD
	community/lockfile-progs/PKGBUILD
	community/opencc/PKGBUILD
	community/roxterm/PKGBUILD
	community/uriparser/PKGBUILD
	community/xcircuit/PKGBUILD
	core/bison/PKGBUILD
	core/curl/PKGBUILD
	core/expat/PKGBUILD
	core/gcc/PKGBUILD
	core/gpm/PKGBUILD
	core/m4/PKGBUILD
	core/systemd/PKGBUILD
	core/tar/PKGBUILD
	extra/alsa-lib/PKGBUILD
	extra/alsa-utils/PKGBUILD
	extra/bitlbee/PKGBUILD
	extra/chkrootkit/PKGBUILD
	extra/fakechroot/PKGBUILD
	extra/farstream/PKGBUILD
	extra/freeglut/PKGBUILD
	extra/gob2/PKGBUILD
	extra/libcdio-paranoia/PKGBUILD
	extra/liblqr/PKGBUILD
	extra/libnl1/PKGBUILD
	extra/libpst/PKGBUILD
	extra/libwpd/PKGBUILD
	extra/xorg-server/PKGBUILD

27 files changed, 595 insertions, 163 deletions

diff --git a/core/bison/PKGBUILD b/core/bison/PKGBUILD
index 8d21f88d8..a678f7548 100644
--- a/core/bison/PKGBUILD
+++ b/core/bison/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 173327 2012-12-19 01:16:33Z allan $
+# $Id: PKGBUILD 183046 2013-04-17 02:02:01Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 
 pkgname=bison
-pkgver=2.7
-pkgrel=1.1
+pkgver=2.7.1
+pkgrel=1
 pkgdesc="The GNU general-purpose parser generator"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
@@ -13,8 +13,8 @@ depends=('glibc' 'm4' 'sh')
 groups=('base-devel')
 install=bison.install
 source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('234cdfac99257cf99ac4a03c898f37b9'
-         '853204af1f9a5602d84989b4852e317e')
+md5sums=('7be02eb973eccf388f1ae750fc09eed0'
+         'SKIP')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}  
diff --git a/core/curl/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch b/core/curl/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch
deleted file mode 100644
index aaedc27c6..000000000
--- a/core/curl/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From da3fc1ee91de656a30f3a12de394bcba55119872 Mon Sep 17 00:00:00 2001
-From: Linus Nielsen Feltzing <linus@haxx.se>
-Date: Sun, 10 Feb 2013 22:57:58 +0100
-Subject: [PATCH] Fix NULL pointer reference when closing an unused multi
- handle.
-
----
- lib/multi.c                |  8 +++++---
- tests/data/Makefile.am     |  1 +
- tests/data/test1508        | 31 +++++++++++++++++++++++++++++
- tests/libtest/Makefile.inc |  6 +++++-
- tests/libtest/lib1508.c    | 49 ++++++++++++++++++++++++++++++++++++++++++++++
- 5 files changed, 91 insertions(+), 4 deletions(-)
- create mode 100644 tests/data/test1508
- create mode 100644 tests/libtest/lib1508.c
-
-diff --git a/lib/multi.c b/lib/multi.c
-index fa0afb9..706df23 100644
---- a/lib/multi.c
-+++ b/lib/multi.c
-@@ -1773,10 +1773,12 @@ CURLMcode curl_multi_cleanup(CURLM *multi_handle)
-     /* Close all the connections in the connection cache */
-     close_all_connections(multi);
- 
--    multi->closure_handle->dns.hostcache = multi->hostcache;
--    Curl_hostcache_clean(multi->closure_handle);
-+    if(multi->closure_handle) {
-+      multi->closure_handle->dns.hostcache = multi->hostcache;
-+      Curl_hostcache_clean(multi->closure_handle);
- 
--    Curl_close(multi->closure_handle);
-+      Curl_close(multi->closure_handle);
-+    }
-     multi->closure_handle = NULL;
- 
-     Curl_hash_destroy(multi->sockhash);
--- 
-1.8.1.3
-
diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD
index 87f4208bd..a8089f496 100644
--- a/core/curl/PKGBUILD
+++ b/core/curl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 177958 2013-02-12 13:57:28Z dreisner $
+# $Id: PKGBUILD 182802 2013-04-15 12:46:55Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
@@ -6,8 +6,8 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=curl
-pkgver=7.29.0
-pkgrel=2
+pkgver=7.30.0
+pkgrel=1
 pkgdesc="An URL retrieval utility and library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://curl.haxx.se"
@@ -15,30 +15,14 @@ license=('MIT')
 depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
 options=('!libtool')
 source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
-        0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch
         curlbuild.h)
-md5sums=('4f57d3b4a3963038bd5e04dbff385390'
-         '6283fbb36933cf8720acc34c43169f1d'
-         '5bfd1899e8b19cfdd78774f6337f8b47'
+md5sums=('60bb6ff558415b73ba2f00163fd307c5'
+         'SKIP'
          '751bd433ede935c8fae727377625a8ae')
 
-ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d')
-case $ptrsize in
-  8) _curlbuild=curlbuild-64.h ;;
-  4) _curlbuild=curlbuild-32.h ;;
-  *) error "unknown pointer size for architecture: %s bytes" "$ptrsize"
-    exit 1
-    ;;
-esac
-
 build() {
   cd "$pkgname-$pkgver"
 
-  # We have the same CFLAGS as Arch, this should be fixed upstream.
-  sed -i 's/xc_bad_var_cflags=yes/xc_bad_var_cflags=no/' configure
-
-  patch -Np1 <"$srcdir/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch"
-
   ./configure \
       --prefix=/usr \
       --mandir=/usr/share/man \
@@ -61,6 +45,15 @@ package() {
 
   make DESTDIR="$pkgdir" install
 
+  local ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d')
+  case $ptrsize in
+    8) _curlbuild=curlbuild-64.h ;;
+    4) _curlbuild=curlbuild-32.h ;;
+    *) error "unknown pointer size for architecture: %s bytes" "$ptrsize"
+      exit 1
+      ;;
+  esac
+
   # license
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 
diff --git a/core/expat/PKGBUILD b/core/expat/PKGBUILD
index 276116661..bd0571dfa 100644
--- a/core/expat/PKGBUILD
+++ b/core/expat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156201 2012-04-16 03:41:12Z allan $
+# $Id: PKGBUILD 183047 2013-04-17 02:02:02Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=expat
 pkgver=2.1.0
-pkgrel=1.1
+pkgrel=2
 pkgdesc="An XML parser library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://expat.sourceforge.net/"
@@ -16,7 +16,7 @@ md5sums=('dd7dab7a5fea97d2a6a43f511449b7cd')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --mandir=/usr/share/man
+  ./configure --prefix=/usr #--mandir=/usr/share/man
   make
 }
 
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index ea2135b2a..4e3f60f67 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 181166 2013-04-02 06:48:56Z allan $
+# $Id: PKGBUILD 182769 2013-04-15 01:13:43Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -10,19 +10,19 @@ else
     pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc')
 fi
 pkgver=4.8.0
-pkgrel=1
-#_snapshot=4.7-20120721
+pkgrel=2
+_snapshot=4.8-20130411
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL' 'custom')
 url="http://gcc.gnu.org"
 makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'doxygen')
 [[ "$CARCH" != "mips64el" ]] && makedepends+=('gcc-ada')
-checkdepends=('dejagnu')
+checkdepends=('dejagnu' 'inetutils')
 options=('!libtool' '!emptydirs')
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2)
-	#ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
-md5sums=('e6040024eb9e761c3bea348d1fa5abb0')
+source=(ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2)
+        #ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
+md5sums=('cb529205469260f0d56adc01088c4850')
 
 if [ -n "${_snapshot}" ]; then
   _basedir=gcc-${_snapshot}
@@ -30,7 +30,7 @@ else
   _basedir=gcc-${pkgver}
 fi
 
-build() {
+prepare() {
   cd ${srcdir}/${_basedir}
 
   # Do not run fixincludes
@@ -42,14 +42,20 @@ build() {
 
   echo ${pkgver} > gcc/BASE-VER
 
+  # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
+  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
+
+  mkdir ${srcdir}/gcc-build
+}
+
+build() {
+  cd ${srcdir}/gcc-build
+
   # using -pipe causes spurious test-suite failures
   # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565
   CFLAGS=${CFLAGS/-pipe/}
   CXXFLAGS=${CXXFLAGS/-pipe/}
 
-  cd ${srcdir}
-  mkdir gcc-build && cd gcc-build
-
   # Use our CFLAGS, CXXFLAGS and LDFLAGS for the binaries built.
   export BOOT_CFLAGS="$CFLAGS"
   export CFLAGS_FOR_BUILD="$CFLAGS"
@@ -157,20 +163,17 @@ package_gcc()
   mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.18-gdb.py
 
   # unfortunately it is much, much easier to install the lot and clean-up the mess...
-  # -f makes rm return 0 if the archive doesn't exist
   rm -f $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
   rm -f $pkgdir/usr/lib/*.so*
-  rm -f $pkgdir/usr/lib/lib{atomic,ffi,gfortran,go{,begin},iberty,objc}.a
+  rm -f $pkgdir/usr/lib/lib{atomic,gfortran,go{,begin},iberty,objc}.a
   rm -f $pkgdir/usr/lib/libgfortran.spec
-  rm -fr $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}
-  rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/ffi{,target}.h
+  rm -rf $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}
   rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1}
   rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{libcaf_single,libgfortranbegin}.a
-  rm -fr $pkgdir/usr/lib/go
-  rm -f $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libffi,libgomp,libquadmath,libitm}.info
+  rm -rf $pkgdir/usr/lib/go
+  rm -f $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.info
   rm -f $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
   rm -f $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
-  rm -f $pkgdir/usr/share/man/man3/ffi*
 
   # many packages expect this symlinks
   ln -s gcc ${pkgdir}/usr/bin/cc
diff --git a/core/gpm/PKGBUILD b/core/gpm/PKGBUILD
index 5d8cc3348..9e0f895ea 100644
--- a/core/gpm/PKGBUILD
+++ b/core/gpm/PKGBUILD
@@ -1,22 +1,19 @@
-# $Id: PKGBUILD 170033 2012-10-31 05:23:26Z eric $
+# $Id: PKGBUILD 182863 2013-04-15 21:02:26Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gpm
 pkgver=1.20.7
-pkgrel=1.1
+pkgrel=2
 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')
-backup=('etc/conf.d/gpm')
 options=('!makeflags')
 install=gpm.install
 source=(http://www.nico.schottelius.org/software/gpm/archives/${pkgname}-${pkgver}.tar.lzma \
-        gpm gpm.conf.d gpm.sh gpm.service)
+        gpm.sh gpm.service)
 sha1sums=('8d9f3655c80ce7667d31ede2a100b44986480369'
-          '19e1feb1493373512a77801699df012d186336ea'
-          '4c31cb7dd51cee4d16d3f7a8956e6d87fac1ad86'
           '88fe5ff10916c68a87abc8418a56eb0073f69fa9'
           '20b92360f0ad38a2032fcae37bdbd01b31e43f77')
 
@@ -30,8 +27,6 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  install -D -m755 ../gpm "${pkgdir}/etc/rc.d/gpm"
-  install -D -m644 ../gpm.conf.d "${pkgdir}/etc/conf.d/gpm"
   install -D -m755 ../gpm.sh "${pkgdir}/etc/profile.d/gpm.sh"
   install -D -m644 ../gpm.service "${pkgdir}/usr/lib/systemd/system/gpm.service"
 
diff --git a/core/gpm/gpm b/core/gpm/gpm
deleted file mode 100755
index 7b5213dd7..000000000
--- a/core/gpm/gpm
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-GPM_ARGS=
-[ -f /etc/conf.d/gpm ] && . /etc/conf.d/gpm
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/sbin/gpm)
-case "$1" in
-  start)
-    stat_busy "Starting GPM Daemon"
-    [ -z "$PID" ] && /usr/sbin/gpm ${GPM_ARGS}
-    PID=$(pidof -o %PPID /usr/sbin/gpm)
-    if [ -z "$PID" ]; then
-      stat_fail
-    else
-      add_daemon gpm
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping GPM Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon gpm
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/core/gpm/gpm.conf.d b/core/gpm/gpm.conf.d
deleted file mode 100644
index ab43bb7eb..000000000
--- a/core/gpm/gpm.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to gpm
-#
-GPM_ARGS="-m /dev/input/mice -t imps2"
diff --git a/core/isl/PKGBUILD b/core/isl/PKGBUILD
index 6d6721b47..3a94e7e06 100644
--- a/core/isl/PKGBUILD
+++ b/core/isl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 182142 2013-04-08 05:56:24Z allan $
+# $Id: PKGBUILD 182768 2013-04-15 01:13:42Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 pkgname=isl
-pkgver=0.11.1
-pkgrel=2
+pkgver=0.11.2
+pkgrel=1
 pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kotnet.org/~skimo/isl/"
@@ -11,7 +11,7 @@ depends=('gmp')
 license=('MIT')
 options=('!libtool')
 source=(http://www.kotnet.org/~skimo/isl/$pkgname-$pkgver.tar.bz2)
-md5sums=('bce1586384d8635a76d2f017fb067cd2')
+md5sums=('c40daa17d2995d1c98a0c1aca607541f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -29,7 +29,7 @@ package() {
   make -j1 DESTDIR="$pkgdir/" install
 
   install -dm755 $pkgdir/usr/share/gdb/auto-load/usr/lib/
-  mv $pkgdir/{,/usr/share/gdb/auto-load/}usr/lib/libisl.so.10.1.1-gdb.py
+  mv $pkgdir/{,/usr/share/gdb/auto-load/}usr/lib/libisl.so.10.1.2-gdb.py
   
   install -Dm644 LICENSE $pkgdir/usr/share/licenses/isl/LICENSE
 }
diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD
index e76d9c5d3..a90ed343b 100644
--- a/core/krb5/PKGBUILD
+++ b/core/krb5/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 179909 2013-03-11 19:50:37Z stephane $
+# $Id: PKGBUILD 183174 2013-04-18 12:38:02Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=krb5
-pkgver=1.11.1
+pkgver=1.11.2
 pkgrel=1
 pkgdesc="The Kerberos network authentication system"
 arch=('i686' 'x86_64' 'mips64el')
@@ -21,7 +21,7 @@ source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.11/${pkgname}-${pkgver}-si
         krb5-kpropd.service
         krb5-kpropd@.service
         krb5-kpropd.socket)
-sha1sums=('e2e759c35e775d8f03b75c26ffcaa4f2514147f5'
+sha1sums=('3863f7bdb2d8fc3e50484fb566124373c4b0a250'
           '09e478cddfb9d46d2981dd25ef96b8c3fd91e1aa'
           '2aa229369079ed1bbb201a1ef72c47bf143f4dbe'
           'a2a01e7077d9e89cda3457ea0e216debb3dc353c'
diff --git a/core/krb5/krb5-kadmind b/core/krb5/krb5-kadmind
new file mode 100644
index 000000000..04df0dcff
--- /dev/null
+++ b/core/krb5/krb5-kadmind
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# general config
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/kadmind`
+case "$1" in
+    start)
+        stat_busy "Starting Kerberos Admin Daemon"
+        if [ -z "$PID" ]; then
+           /usr/sbin/kadmind
+        fi
+        if [ ! -z "$PID" -o $? -gt 0 ]; then
+            stat_fail
+        else
+            add_daemon krb5-kadmind
+            stat_done
+        fi
+        ;;
+    stop)
+        stat_busy "Stopping Kerberos Admin Daemon"
+	    [ ! -z "$PID" ] && kill $PID &> /dev/null
+        if [ $? -gt 0 ]; then
+            stat_fail
+        else
+            rm_daemon krb5-kadmind
+            stat_done
+        fi
+        ;;
+    restart)
+        $0 stop
+	sleep 1
+        $0 start
+        ;;
+    *)
+        echo "usage: $0 {start|stop|restart}"
+	;;
+esac
+exit 0
diff --git a/core/krb5/krb5-kadmind.service b/core/krb5/krb5-kadmind.service
new file mode 100644
index 000000000..f3836c898
--- /dev/null
+++ b/core/krb5/krb5-kadmind.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Kerberos 5 administration server
+
+[Service]
+ExecStart=/usr/sbin/kadmind -nofork
+
+[Install]
+WantedBy=multi-user.target
diff --git a/core/krb5/krb5-kdc b/core/krb5/krb5-kdc
new file mode 100644
index 000000000..05a03411e
--- /dev/null
+++ b/core/krb5/krb5-kdc
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# general config
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/krb5kdc`
+case "$1" in
+    start)
+        stat_busy "Starting Kerberos Authentication"
+        if [ -z "$PID" ]; then
+           /usr/sbin/krb5kdc
+        fi
+        if [ ! -z "$PID" -o $? -gt 0 ]; then
+            stat_fail
+        else
+            add_daemon krb5-kdc
+            stat_done
+        fi
+        ;;
+    stop)
+        stat_busy "Stopping Kerberos Authentication"
+	    [ ! -z "$PID" ] && kill $PID &> /dev/null
+        if [ $? -gt 0 ]; then
+            stat_fail
+        else
+            rm_daemon krb5-kdc
+            stat_done
+        fi
+        ;;
+    restart)
+        $0 stop
+	sleep 1
+        $0 start
+        ;;
+    *)
+        echo "usage: $0 {start|stop|restart}"
+	;;
+esac
+exit 0
diff --git a/core/krb5/krb5-kdc.service b/core/krb5/krb5-kdc.service
new file mode 100644
index 000000000..6ec93bb72
--- /dev/null
+++ b/core/krb5/krb5-kdc.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Kerberos 5 KDC
+
+[Service]
+ExecStart=/usr/sbin/krb5kdc -n
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/core/krb5/krb5-kpropd b/core/krb5/krb5-kpropd
new file mode 100644
index 000000000..a0077d68e
--- /dev/null
+++ b/core/krb5/krb5-kpropd
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# general config
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/kpropd`
+case "$1" in
+    start)
+        stat_busy "Starting Kerberos Database Propagation Daemon"
+        if [ -z "$PID" ]; then
+           /usr/sbin/kpropd -S
+        fi
+        if [ ! -z "$PID" -o $? -gt 0 ]; then
+            stat_fail
+        else
+            add_daemon kpropd
+            stat_done
+        fi
+        ;;
+    stop)
+        stat_busy "Stopping Kerberos Database Propagation Daemon"
+	    [ ! -z "$PID" ] && kill $PID &> /dev/null
+        if [ $? -gt 0 ]; then
+            stat_fail
+        else
+            rm_daemon kpropd
+            stat_done
+        fi
+        ;;
+    restart)
+        $0 stop
+	sleep 1
+        $0 start
+        ;;
+    *)
+        echo "usage: $0 {start|stop|restart}"
+	;;
+esac
+exit 0
diff --git a/core/krb5/krb5-kpropd.service b/core/krb5/krb5-kpropd.service
new file mode 100644
index 000000000..a7c5b579d
--- /dev/null
+++ b/core/krb5/krb5-kpropd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Kerberos 5 propagation server
+
+[Service]
+ExecStart=/usr/sbin/kpropd -S
+
+[Install]
+WantedBy=multi-user.target
diff --git a/core/krb5/krb5-kpropd.socket b/core/krb5/krb5-kpropd.socket
new file mode 100644
index 000000000..4389290c0
--- /dev/null
+++ b/core/krb5/krb5-kpropd.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=Kerberos 5 propagation server
+
+[Socket]
+ListenStream=754
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
diff --git a/core/krb5/krb5-kpropd@.service b/core/krb5/krb5-kpropd@.service
new file mode 100644
index 000000000..46f7e3639
--- /dev/null
+++ b/core/krb5/krb5-kpropd@.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Kerberos 5 propagation server
+Conflicts=krb5-kpropd.service
+
+[Service]
+ExecStart=/usr/sbin/kpropd
+StandardInput=socket
+StandardError=syslog
diff --git a/core/m4/PKGBUILD b/core/m4/PKGBUILD
index 860958c53..d4a9da421 100644
--- a/core/m4/PKGBUILD
+++ b/core/m4/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142068 2011-11-04 23:36:00Z allan $
+# $Id: PKGBUILD 183048 2013-04-17 02:02:03Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=m4
 pkgver=1.4.16
-pkgrel=2.2
+pkgrel=3
 pkgdesc="The GNU macro processor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/m4"
@@ -16,14 +16,21 @@ source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz{,.sig}
         m4-1.4.16-readlink-einval.patch
 	gnulib-no-gets.patch)
 md5sums=('7548ec061a1ba993790159764f522d0e'
-         'eebe5c94e74e7551e2e30c5844f1b653'
-         'cea138fa9b568d06e46269611cec8dd0'
-         '9593407bef0afdca88c76a2959d6596f')
+         'SKIP'
+         'cea138fa9b568d06e46269611cec8dd0')
 
-build() {
+prepare() {
   cd ${srcdir}/$pkgname-$pkgver
+  
+  # glibc-2.16 compatibility
+  sed -i -e '/gets is a/d' lib/stdio.in.h
+  
+  # patch testsuite failure with newer kernels
   patch -Np1 -i $srcdir/m4-1.4.16-readlink-einval.patch
-  patch -p1 -i "$srcdir/gnulib-no-gets.patch"
+}
+
+build() {
+  cd ${srcdir}/$pkgname-$pkgver  
   ./configure --prefix=/usr
   make
 }
diff --git a/core/m4/m4.install b/core/m4/m4.install
index be4138170..523d39bd6 100644
--- a/core/m4/m4.install
+++ b/core/m4/m4.install
@@ -1,5 +1,5 @@
 infodir=usr/share/info
-filelist=(m4.info m4.info-1 m4.info-2)
+filelist=('m4.info' 'm4.info-1' 'm4.info-2')
 
 post_install() {
   [ -x usr/bin/install-info ] || return 0
diff --git a/core/perl/CVE-2012-6329.patch b/core/perl/CVE-2012-6329.patch
new file mode 100644
index 000000000..5f59e03c1
--- /dev/null
+++ b/core/perl/CVE-2012-6329.patch
@@ -0,0 +1,79 @@
+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 6c5229c31..ed8bdce52 100644
--- a/core/perl/PKGBUILD
+++ b/core/perl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180140 2013-03-18 08:31:17Z bluewind $
+# $Id: PKGBUILD 182787 2013-04-15 10:15:37Z bluewind $
 # Maintainer: Florian Pritz <bluewind@xinu.at>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: kevin <kevin.archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=perl
 pkgver=5.16.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A highly capable, feature-rich programming language"
 arch=(i686 x86_64 'mips64el')
 license=('GPL' 'PerlArtistic')
@@ -18,6 +18,7 @@ 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')
@@ -25,6 +26,7 @@ md5sums=('025102de0e4a597cf541e57da80c6aa3'
          '0486659c9eefe682364a3e364d814296'
          '5ed2542fdb9a60682f215bd33701e61a'
          '1f0cbbee783e8a6d32f01be5118e0d5e'
+         '5dc374e095d896fb30618e414aeb9017'
          '999c3eea6464860704abbb055a0f0896')
 # workaround to let the integrity check find the correct provides array
 if [[ ${0##*/} = "parse_pkgbuilds.sh" ]]; then
@@ -35,6 +37,7 @@ build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   patch -i "$srcdir/cgi-cr-escaping.diff" -p1
+  patch -i "$srcdir/CVE-2012-6329.patch" -p1
 
   if [ "${CARCH}" != "i686" ]; then
     arch_opts="-Dcccdlflags='-fPIC'"
diff --git a/core/systemd/0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch b/core/systemd/0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch
new file mode 100644
index 000000000..c245ce1e2
--- /dev/null
+++ b/core/systemd/0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch
@@ -0,0 +1,167 @@
+From d3b6d0c21ea5a0d15ec6dbd8b8d179138b7463bc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Sat, 13 Apr 2013 20:22:53 -0400
+Subject: [PATCH] fileio: in envfiles, do not skip lines following empty lines
+
+https://bugs.freedesktop.org/show_bug.cgi?id=63477
+---
+ src/binfmt/binfmt.c             |  2 +-
+ src/journal/catalog.c           |  2 +-
+ src/modules-load/modules-load.c |  2 +-
+ src/shared/conf-parser.c        |  2 +-
+ src/shared/install.c            |  2 +-
+ src/shared/util.h               |  2 +-
+ src/sysctl/sysctl.c             |  2 +-
+ src/test/test-unit-file.c       | 31 +++++++++++++++++++++++++++++++
+ 8 files changed, 38 insertions(+), 7 deletions(-)
+
+diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
+index 9ca1e60..5a42b3d 100644
+--- a/src/binfmt/binfmt.c
++++ b/src/binfmt/binfmt.c
+@@ -110,7 +110,7 @@ static int apply_file(const char *path, bool ignore_enoent) {
+                 p = strstrip(l);
+                 if (!*p)
+                         continue;
+-                if (strchr(COMMENTS, *p))
++                if (strchr(COMMENTS "\n", *p))
+                         continue;
+ 
+                 k = apply_rule(p);
+diff --git a/src/journal/catalog.c b/src/journal/catalog.c
+index ebf0622..7681af6 100644
+--- a/src/journal/catalog.c
++++ b/src/journal/catalog.c
+@@ -180,7 +180,7 @@ int catalog_import_file(Hashmap *h, struct strbuf *sb, const char *path) {
+                         continue;
+                 }
+ 
+-                if (strchr(COMMENTS, line[0]))
++                if (strchr(COMMENTS "\n", line[0]))
+                         continue;
+ 
+                 if (empty_line &&
+diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
+index 9ee2603..b3f7af0 100644
+--- a/src/modules-load/modules-load.c
++++ b/src/modules-load/modules-load.c
+@@ -206,7 +206,7 @@ static int apply_file(struct kmod_ctx *ctx, const char *path, bool ignore_enoent
+                 l = strstrip(line);
+                 if (!*l)
+                         continue;
+-                if (strchr(COMMENTS, *l))
++                if (strchr(COMMENTS "\n", *l))
+                         continue;
+ 
+                 k = load_module(ctx, l);
+diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
+index fbacf98..fea2e56 100644
+--- a/src/shared/conf-parser.c
++++ b/src/shared/conf-parser.c
+@@ -174,7 +174,7 @@ static int parse_line(
+         if (!*l)
+                 return 0;
+ 
+-        if (strchr(COMMENTS, *l))
++        if (strchr(COMMENTS "\n", *l))
+                 return 0;
+ 
+         if (startswith(l, ".include ")) {
+diff --git a/src/shared/install.c b/src/shared/install.c
+index f9d223e..71e0433 100644
+--- a/src/shared/install.c
++++ b/src/shared/install.c
+@@ -1699,7 +1699,7 @@ int unit_file_query_preset(UnitFileScope scope, const char *name) {
+                         if (!*l)
+                                 continue;
+ 
+-                        if (strchr(COMMENTS, *l))
++                        if (strchr(COMMENTS "\n", *l))
+                                 continue;
+ 
+                         if (first_word(l, "enable")) {
+diff --git a/src/shared/util.h b/src/shared/util.h
+index 99ec0a3..ad97536 100644
+--- a/src/shared/util.h
++++ b/src/shared/util.h
+@@ -52,7 +52,7 @@ union dirent_storage {
+ #define WHITESPACE " \t\n\r"
+ #define NEWLINE "\n\r"
+ #define QUOTES "\"\'"
+-#define COMMENTS "#;\n"
++#define COMMENTS "#;"
+ 
+ #define FORMAT_BYTES_MAX 8
+ 
+diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
+index e0ba78a..db18dd9 100644
+--- a/src/sysctl/sysctl.c
++++ b/src/sysctl/sysctl.c
+@@ -149,7 +149,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno
+                 if (!*p)
+                         continue;
+ 
+-                if (strchr(COMMENTS, *p))
++                if (strchr(COMMENTS "\n", *p))
+                         continue;
+ 
+                 value = strchr(p, '=');
+diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
+index 3cf8463..1bf11e6 100644
+--- a/src/test/test-unit-file.c
++++ b/src/test/test-unit-file.c
+@@ -199,6 +199,17 @@ static void test_config_parse_exec(void) {
+         "#--nouser-config                                     \\\n" \
+         "normal=line"
+ 
++#define env_file_4 \
++       "# Generated\n" \
++       "\n" \
++       "HWMON_MODULES=\"coretemp f71882fg\"\n" \
++       "\n" \
++       "# For compatibility reasons\n" \
++       "\n" \
++       "MODULE_0=coretemp\n" \
++       "MODULE_1=f71882fg"
++
++
+ static void test_load_env_file_1(void) {
+         char _cleanup_strv_free_ **data = NULL;
+         int r;
+@@ -251,6 +262,25 @@ static void test_load_env_file_3(void) {
+         unlink(name);
+ }
+ 
++static void test_load_env_file_4(void) {
++        char _cleanup_strv_free_ **data = NULL;
++        int r;
++
++        char name[] = "/tmp/test-load-env-file.XXXXXX";
++        int _cleanup_close_ fd = mkstemp(name);
++        assert(fd >= 0);
++        assert_se(write(fd, env_file_4, sizeof(env_file_4)) == sizeof(env_file_4));
++
++        r = load_env_file(name, NULL, &data);
++        assert(r == 0);
++        assert(streq(data[0], "HWMON_MODULES=coretemp f71882fg"));
++        assert(streq(data[1], "MODULE_0=coretemp"));
++        assert(streq(data[2], "MODULE_1=f71882fg"));
++        assert(data[3] == NULL);
++        unlink(name);
++}
++
++
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wnonnull"
+ 
+@@ -327,6 +357,7 @@ int main(int argc, char *argv[]) {
+         test_load_env_file_1();
+         test_load_env_file_2();
+         test_load_env_file_3();
++        test_load_env_file_4();
+         test_install_printf();
+ 
+         return 0;
+-- 
+1.8.2.1
+
diff --git a/core/systemd/0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch b/core/systemd/0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch
new file mode 100644
index 000000000..19edce5f4
--- /dev/null
+++ b/core/systemd/0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch
@@ -0,0 +1,35 @@
+From d378991747d67fff1d4dc39e7fb2bc8f49f1b561 Mon Sep 17 00:00:00 2001
+From: Mirco Tischler <mt-ml@gmx.de>
+Date: Sat, 13 Apr 2013 01:03:49 +0200
+Subject: [PATCH] journal: fix broken tags _SOURCE_REALTIME_TIMESTAMP and
+ _MACHINE_ID
+
+---
+ src/journal/journald-server.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
+index 53e3830..be84323 100644
+--- a/src/journal/journald-server.c
++++ b/src/journal/journald-server.c
+@@ -538,7 +538,7 @@ static void dispatch_message_real(
+         char pid[sizeof("_PID=") + DECIMAL_STR_MAX(ucred->pid)],
+                 uid[sizeof("_UID=") + DECIMAL_STR_MAX(ucred->uid)],
+                 gid[sizeof("_GID=") + DECIMAL_STR_MAX(ucred->gid)],
+-                source_time[sizeof("_SOURCE_REALTIME_TIMESTAMP=" + DECIMAL_STR_MAX(usec_t))],
++                source_time[sizeof("_SOURCE_REALTIME_TIMESTAMP=") + DECIMAL_STR_MAX(usec_t)],
+                 boot_id[sizeof("_BOOT_ID=") + 32] = "_BOOT_ID=",
+                 machine_id[sizeof("_MACHINE_ID=") + 32] = "_MACHINE_ID=";
+ 
+@@ -699,7 +699,7 @@ static void dispatch_message_real(
+ 
+         r = sd_id128_get_machine(&id);
+         if (r >= 0) {
+-                sd_id128_to_string(id, machine_id + sizeof("_MACHINE_ID") - 1);
++                sd_id128_to_string(id, machine_id + sizeof("_MACHINE_ID=") - 1);
+                 IOVEC_SET_STRING(iovec[n++], machine_id);
+         }
+ 
+-- 
+1.8.2.1
+
diff --git a/core/systemd/0001-logind-avoid-creating-stale-session-state-files.patch b/core/systemd/0001-logind-avoid-creating-stale-session-state-files.patch
new file mode 100644
index 000000000..9cac29b77
--- /dev/null
+++ b/core/systemd/0001-logind-avoid-creating-stale-session-state-files.patch
@@ -0,0 +1,48 @@
+From 50fb97935d689a520251b2d543599be14bdfd0ed Mon Sep 17 00:00:00 2001
+From: Fedora systemd team <systemd-maint@redhat.com>
+Date: Wed, 10 Apr 2013 09:49:24 +0200
+Subject: [PATCH] logind: avoid creating stale session state files
+
+There were old session state files accumulating in /run/systemd/session.
+They confused e.g. "reboot", which thought there were still users logged
+in. The files got created like this:
+
+session_stop(Session *s) ->
+        ...
+        unlink(s->state_file);
+        ...
+        seat_set_active(s->seat, NULL) ->
+                session_save(...);  /* re-creates the state file we just
+                                       unlinked */
+
+Fix it simply by clearing the s->started flag earlier to prevent
+any further writes of the state file (session_save() checks the flag).
+---
+ src/login/logind-session.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/login/logind-session.c b/src/login/logind-session.c
+index 508336d..e2f41d3 100644
+--- a/src/login/logind-session.c
++++ b/src/login/logind-session.c
+@@ -710,6 +710,8 @@ int session_stop(Session *s) {
+         if (s->started)
+                 session_send_signal(s, false);
+ 
++        s->started = false;
++
+         if (s->seat) {
+                 if (s->seat->active == s)
+                         seat_set_active(s->seat, NULL);
+@@ -721,8 +723,6 @@ int session_stop(Session *s) {
+         user_send_changed(s->user, "Sessions\0");
+         user_save(s->user);
+ 
+-        s->started = false;
+-
+         return r;
+ }
+ 
+-- 
+1.8.2.1
+
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index de4f4f2b2..9c2989261 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
 pkgver=201
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2' 'LGPL2.1' 'MIT')
@@ -16,11 +16,17 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-hook-udev'
         'initcpio-install-udev'
         'initcpio-install-timestamp'
+        '0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch'
+        '0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch'
+        '0001-logind-avoid-creating-stale-session-state-files.patch'
         'use-split-usr-path.patch')
 md5sums=('3e758392ff0e9206b3f7ee252b4a654b'
          'e99e9189aa2f6084ac28b8ddf605aeb8'
          'fb37e34ea006c79be1c54cbb0f803414'
          'df69615503ad293c9ddf9d8b7755282d'
+         'd575a29ca735944aa45126ab9d3087a5'
+         '8170482f10bb0420770a64dce23975bc'
+         'b1355aae98071e83fca27549a0ac3def'
          '76bf83fe34c5b40533abc5dc940576a6')
 
 prepare() {
@@ -28,6 +34,10 @@ prepare() {
 
   # hang onto this until we do the /{,s}bin merge
   patch -Np1 <"$srcdir/use-split-usr-path.patch"
+
+  patch -Np1 <"$srcdir/0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch"
+  patch -Np1 <"$srcdir/0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch"
+  patch -Np1 <"$srcdir/0001-logind-avoid-creating-stale-session-state-files.patch"
 }
 
 build() {
@@ -86,6 +96,10 @@ package_systemd() {
   install -dm755 "$pkgdir/bin"
   ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
 
+  # fix .so links in manpage stubs
+  find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \
+      -exec sed -ri '1s|^\.so (.*)\.([0-9]+)|.so man\2/\1.\2|' {} +
+
   # don't write units to /etc by default -- we'll enable this on post_install
   # as a sane default
   rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service"
diff --git a/core/tar/PKGBUILD b/core/tar/PKGBUILD
index 17ae0414c..240c5e292 100644
--- a/core/tar/PKGBUILD
+++ b/core/tar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142080 2011-11-04 23:36:17Z allan $
+# $Id: PKGBUILD 183049 2013-04-17 02:02:04Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=tar
 pkgver=1.26
-pkgrel=2.1
+pkgrel=3
 pkgdesc="Utility used to store, backup, and transport files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/tar/tar.html"
@@ -21,11 +21,16 @@ md5sums=('0ced6f20b9fa1bea588005b5ad4b52c1'
          'e97e7343f4e23724b4c48bca2f033e38'
          '4408365a66887d65f4c8d1f416fb9d9f')
 
-build() {
+prepare() {
   cd ${srcdir}/$pkgname-$pkgver
 
-  patch -p1 -i "$srcdir/gnulib-no-gets.patch"
-  ./configure --prefix=/usr --libexecdir=/usr/lib/tar --bindir=/bin
+  # fix build failure with glibc-2.16
+  sed -i -e '/gets is a/d' gnu/stdio.in.h
+}
+
+build() {
+  cd ${srcdir}/$pkgname-$pkgver
+  ./configure --prefix=/usr --libexecdir=/usr/lib/tar
   make
 }
 
@@ -37,5 +42,10 @@ check() {
 package() {
   cd ${srcdir}/$pkgname-$pkgver
   make DESTDIR=${pkgdir} install
+  
+  # probably needed for compatibility
+  install -dm755 ${pkgdir}/bin
+  ln -s ../usr/bin/tar ${pkgdir}/bin/tar
+  
   install -Dm644 ${srcdir}/tar.1 ${pkgdir}/usr/share/man/man1/tar.1
 }