Tue Feb 25 03:19:16 UTC 2014

41 files changed, 280 insertions, 944 deletions

diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD
index 7731c49a5..8e93c9119 100644
--- a/community/collectd/PKGBUILD
+++ b/community/collectd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 103909 2014-01-13 17:16:40Z andyrtr $
+# $Id: PKGBUILD 106139 2014-02-24 06:59:03Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Gerhard Brauer <gerhard.brauer@web.de>
 
 pkgname=collectd
-pkgver=5.4.0
-pkgrel=2
+pkgver=5.4.1
+pkgrel=1
 pkgdesc='Daemon which collects system performance statistics periodically'
 url='http://collectd.org/'
 arch=('i686' 'x86_64')
@@ -41,17 +41,17 @@ depends=('libltdl' 'iptables')
 source=("${url}files/${pkgname}-${pkgver}.tar.bz2"
         'libperl.patch'
         'service')
-sha1sums=('c2bc3ca3c62cfba4499c4eb14066a4c78301cc2c'
-          '5364ea1330bc56c3b7cfb6d7f19a627c0053279e'
+sha1sums=('cea47e3936ed081bd71efacf7ba825fc837dc347'
+          'efa6450c20ce314e9000a69b17520211f6a471e1'
           '04f676d0b76c34df0bbf94629813e035b1febe04')
 
 backup=('etc/collectd.conf')
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	sed 's/-Werror//g' -i *.in */*.in */*/*.in
+	sed 's/-Werror//g' -i *.ac */*.{am,in} */*/*.{am,in}
 	patch -p1 -i ../libperl.patch
-	autoconf
+	autoreconf
 }
 
 build() {
diff --git a/community/collectd/libperl.patch b/community/collectd/libperl.patch
index 31b269a41..bebc87428 100644
--- a/community/collectd/libperl.patch
+++ b/community/collectd/libperl.patch
@@ -1,6 +1,6 @@
-diff -Naur old/configure.in new/configure.in
---- old/configure.in	2013-08-18 22:24:25.049973054 +1200
-+++ new/configure.in	2013-08-23 15:58:24.552240546 +1200
+diff -Naur old/configure.ac new/configure.ac
+--- old/configure.ac	2013-08-18 22:24:25.049973054 +1200
++++ new/configure.ac	2013-08-23 15:58:24.552240546 +1200
 @@ -3101,11 +3101,13 @@
  then
    SAVE_CFLAGS="$CFLAGS"
diff --git a/community/dmd/PKGBUILD b/community/dmd/PKGBUILD
index f1d7b0640..134e8cb69 100644
--- a/community/dmd/PKGBUILD
+++ b/community/dmd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 100583 2013-11-06 11:18:29Z dicebot $
+# $Id: PKGBUILD 106170 2014-02-24 17:34:53Z dicebot $
 # Maintainer: Mihails Strasunse <public@dicebot.lv>
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Chris Brannon <cmbrannon79@gmail.com>
@@ -9,7 +9,7 @@
 pkgname=('dmd' 'libphobos-devel' 'libphobos' 'dtools')
 groups=('dlang' 'dlang-dmd')
 pkgbase=dmd
-pkgver=2.064.2
+pkgver=2.065.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.dlang.org"
@@ -38,7 +38,7 @@ build() {
 
     cd $srcdir/tools
 
-    # rdmd is used to buil others
+    # rdmd is used to build others
     $srcdir/dmd/src/dmd -I../druntime/import -I../phobos -L-L../phobos/generated/linux/release/$_archbits/ -od. -ofdtools-rdmd rdmd.d
 
     for tool in DustMite/dustmite ddemangle catdoc detab tolf dget; do
@@ -60,8 +60,10 @@ package_dmd() {
     mkdir -p $pkgdir/etc
     echo -e "[Environment]\nDFLAGS=-I/usr/include/dlang/dmd -L-L/usr/lib -L-L/usr/lib32 -L--no-warn-search-mismatch -L--export-dynamic" > $pkgdir/etc/dmd.conf
 
-    install -Dm644 $srcdir/dmd/docs/man/man1/dmd.1 $pkgdir/usr/share/man/man1/dmd.1
-    install -Dm644 $srcdir/dmd/docs/man/man1/dmd.conf.5 $pkgdir/usr/share/man/man5/dmd.conf.5
+    mkdir -p $pkgdir/usr/share/man/man1
+    mkdir -p $pkgdir/usr/share/man/man5
+    cp -r $srcdir/dmd/docs/man/man1/* $pkgdir/usr/share/man/man1/
+    cp -r $srcdir/dmd/docs/man/man5/* $pkgdir/usr/share/man/man5/
 
     install -Dm644 $srcdir/dmd/src/backendlicense.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-backend
     install -Dm644 $srcdir/dmd/src/gpl.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-frontend.1
diff --git a/community/exim/PKGBUILD b/community/exim/PKGBUILD
index 403671761..d4ce05234 100644
--- a/community/exim/PKGBUILD
+++ b/community/exim/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 99560 2013-10-29 18:01:02Z bpiotrowski $
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# $Id: PKGBUILD 106168 2014-02-24 17:05:04Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=exim
 pkgver=4.82
-pkgrel=1
-pkgdesc="Message Transfer Agent"
+pkgrel=2
+pkgdesc='Message Transfer Agent'
 arch=('x86_64' 'i686')
 url='http://www.exim.org/'
 license=('GPL')
 backup=(etc/mail/aliases etc/mail/exim.conf etc/logrotate.d/exim)
 install=exim.install
-depends=('db' 'pcre' 'pam' 'openssl' 'libldap')
+depends=('gdbm' 'pcre' 'pam' 'openssl' 'libldap')
 provides=('smtp-server' 'smtp-forwarder')
 conflicts=('smtp-server' 'smtp-forwarder')
 options=('!makeflags')
-source=("http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/exim-$pkgver.tar.bz2"
+source=(http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/exim-$pkgver.tar.bz2
         aliases
         exim.logrotate
         exim.Makefile
@@ -26,47 +26,49 @@ source=("http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/exim-$pkgver.tar.bz2
         exim@.service
         exim.socket
         exim-submission.socket)
-sha256sums=('46dedfb6ced2aa4a1eddc5d8ce46a790a961508bd389faa2e215302ae80d91cf'
-            '932c9149b6809c70e94c1256e28325d197bbf80d27322793e217d4b692d49c5a'
-            '7f1408f9c5d905968e665941f5c5efcf9da53e7a0bbef6c66220343bc2ae994b'
-            'd33b8595e92ec812c9f6961f98e50b6a3986d5bd966ed4efec2c52c1fce47636'
-            '55719e8b823702b0054584326ca28349b7487e5be9e567ddc7a6e6259767e05b'
-            '652250d99479b58b7127ff60c29f28ca09ebac09cab7e54771d62ce38407012d'
-            'faad96dadbb2750faa5652d830f10d5a14be487a42e8db1cec797164acf14b73'
-            '3e3d8b6be2741d2587a496196c08b3f2ffa05b5803b2bf9fb49359cef3a98d26'
-            'd3bb58f0fbeaaa33c812a823708664bbcd828da7d24e2a098f84a15aee443fee')
+md5sums=('feb933baa4db773c2ef76b794c60b647'
+         '4874006f0585253ddab027d441009757'
+         'e18a535218718c5eb394ed5c9296fe06'
+         '2675c17fa9e5bb63c0862fe6fa633377'
+         '88cf76405367a6ed371d05db1d3c9565'
+         'be8fdcf7b2d6b6368a21705e69743265'
+         '6f5a5c2b0835b33f59d2513cce18c65b'
+         '101a726e4d3f4d0074710273f9808022'
+         '11b319ba0bd84911fa70e9bef2190715')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
-  cp "$srcdir/$pkgname.Makefile" Local/Makefile
+  cp ../$pkgname.Makefile Local/Makefile
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
-  install -Dm0644 $srcdir/exim.logrotate "${pkgdir}/etc/logrotate.d/exim"
-  install -Dm0644 doc/exim.8 "${pkgdir}/usr/share/man/man8/exim.8"
+  install -Dm0644 ../exim.logrotate "$pkgdir"/etc/logrotate.d/exim
+  install -Dm0644 doc/exim.8 "$pkgdir"/usr/share/man/man8/exim.8
 
-  mkdir -p "${pkgdir}/var/spool/exim/db" "${pkgdir}/etc/mail" \
-    "${pkgdir}/var/log/exim" "${pkgdir}/usr"/{lib,bin}
+  mkdir -p "$pkgdir"/var/spool/exim/db "$pkgdir"/etc/mail \
+    "$pkgdir"/var/log/exim "$pkgdir"/usr/{lib,bin}
 
-  chmod 770 "${pkgdir}/var/spool/exim" "${pkgdir}/var/spool/exim/db" "${pkgdir}/var/log/exim"
+  chmod 770 "$pkgdir"/var/spool/exim{,/db} "$pkgdir"/var/log/exim
 
   cd build-Linux-*
-  for i in exicyclog exim_checkaccess exim_dumpdb exim_lock exim_tidydb exipick exiqsumm exigrep \
-    exim_dbmbuild exim exim_fixdb eximstats exinext exiqgrep exiwhat; do
-    install -m0755 "$i" "$pkgdir/usr/bin"
+  for i in exicyclog exim_checkaccess exim_dumpdb exim_lock exim_tidydb \
+    exipick exiqsumm exigrep exim_dbmbuild exim exim_fixdb eximstats exinext \
+    exiqgrep exiwhat; do
+    install -m0755 "$i" "$pkgdir"/usr/bin
   done
 
-  cd "$srcdir/exim-$pkgver/src"
-  sed -e "s|/etc/aliases|/etc/mail/aliases|g" -e "s|SYSTEM_ALIASES_FILE|/etc/mail/aliases|g" \
-    configure.default > "$pkgdir/etc/mail/exim.conf"
+  cd ../src
+  sed -e "s|/etc/aliases|/etc/mail/aliases|g" \
+    -e "s|SYSTEM_ALIASES_FILE|/etc/mail/aliases|g" \
+    configure.default > "$pkgdir"/etc/mail/exim.conf
 
-  cp "$srcdir/aliases" "$pkgdir/etc/mail"
+  cp "$srcdir"/aliases "$pkgdir"/etc/mail
 
-  cd "$pkgdir/usr/bin"
+  cd "$pkgdir"/usr/bin
   for i in mailq newaliases rmail rsmtp runq sendmail; do
     ln -s exim "$i"
   done
@@ -74,11 +76,14 @@ package() {
   # fhs compliancy
   ln -s ../bin/exim ../lib/sendmail
 
-  install -Dm0644 "$srcdir/exim-submission@.service" \
-    "${pkgdir}/usr/lib/systemd/system/exim-submission@.service"
-  install -Dm0644 "$srcdir/exim.service" "${pkgdir}/usr/lib/systemd/system/exim.service"
-  install -Dm0644 "$srcdir/exim@.service" "${pkgdir}/usr/lib/systemd/system/exim@.service"
-  install -Dm0644 "$srcdir/exim.socket" "${pkgdir}/usr/lib/systemd/system/exim.socket"
-  install -Dm0644 "$srcdir/exim-submission.socket" \
-    "${pkgdir}/usr/lib/systemd/system/exim-submission.socket"
+  install -Dm0644 "$srcdir"/exim-submission@.service \
+    "$pkgdir"/usr/lib/systemd/system/exim-submission@.service
+  install -Dm0644 "$srcdir"/exim.service \
+    "$pkgdir"/usr/lib/systemd/system/exim.service
+  install -Dm0644 "$srcdir"/exim@.service \
+    "$pkgdir"/usr/lib/systemd/system/exim@.service
+  install -Dm0644 "$srcdir"/exim.socket \
+    "$pkgdir"/usr/lib/systemd/system/exim.socket
+  install -Dm0644 "$srcdir"/exim-submission.socket \
+    "$pkgdir"/usr/lib/systemd/system/exim-submission.socket
 }
diff --git a/community/exim/exim.Makefile b/community/exim/exim.Makefile
index 2bf77f434..efba5e379 100644
--- a/community/exim/exim.Makefile
+++ b/community/exim/exim.Makefile
@@ -1224,4 +1224,7 @@ PID_FILE_PATH=/var/run/exim.pid
 HAVE_IPV6=YES
 LOOKUP_LIBS=-lldap -llber
 EXTRALIBS_EXIM=-lpam
+
+USE_GDBM=yes
+DBMLIB=-lgdbm
 # End of EDITME for Exim 4.
diff --git a/community/exim/exim.install b/community/exim/exim.install
index d666be17f..4aea548e8 100644
--- a/community/exim/exim.install
+++ b/community/exim/exim.install
@@ -1,4 +1,3 @@
-# arg 1:  the new package version
 post_install() {
   getent group exim >/dev/null 2>&1 || groupadd -g 79 exim 
   if getent passwd exim > /dev/null 2>&1; then
@@ -12,14 +11,10 @@ post_install() {
   chmod u+s /usr/bin/exim
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
-# arg 1:  the old package version
 pre_remove() {
   getent passwd exim >/dev/null 2>&1 && userdel exim
 }
-
diff --git a/community/instead/PKGBUILD b/community/instead/PKGBUILD
index 04b247bda..c8c059782 100644
--- a/community/instead/PKGBUILD
+++ b/community/instead/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 105061 2014-01-30 20:23:17Z spupykin $
+# $Id: PKGBUILD 106141 2014-02-24 08:38:56Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Peter Kosyh <p.kosyhgmail.com>
 
 pkgname=instead
-pkgver=2.0.2
+pkgver=2.0.3
 pkgrel=1
 pkgdesc="a quest interpreter"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('sdl_image' 'sdl_mixer' 'sdl_ttf' 'lua')
 optdepends=('instead-launcher: install and update INSTEAD games from net')
 source=(http://downloads.sourceforge.net/project/instead/instead/${pkgver}/instead_${pkgver}.tar.gz)
-md5sums=('040d8378df4695aed771d6699e1cd7d8')
+md5sums=('ea56d214fab7dbbaeb225f61eeba213c')
 
 build() {
   cd "${srcdir}/instead-${pkgver}"
diff --git a/community/kadu/PKGBUILD b/community/kadu/PKGBUILD
index c34fcdf61..8baf90b56 100644
--- a/community/kadu/PKGBUILD
+++ b/community/kadu/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 89897 2013-05-05 09:24:04Z bpiotrowski $
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# $Id: PKGBUILD 106173 2014-02-24 18:01:27Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Mateusz Herych
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 
 pkgname=kadu
 pkgver=0.12.3
-pkgrel=3
+pkgrel=4
 pkgdesc='Qt-based Jabber/XMPP and Gadu-Gadu client'
 arch=('i686' 'x86_64')
 url='http://www.kadu.net/'
 license=('GPL')
-depends=('libgadu' 'libxss' 'enchant' 'phonon' 'qca-ossl'
-         'libidn' 'libmpdclient' 'qtwebkit' 'xdg-utils')
+depends=('libgadu' 'libxss' 'enchant' 'phonon' 'qca-ossl' 'libidn'
+         'libmpdclient' 'qtwebkit' 'xdg-utils')
 makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl' 'optipng')
 install=kadu.install
-source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2)
-sha256sums=('d607bbd0d00b01bfb70dd15f15c8be4076896a935041651e67a3887ad12ab8a8')
+source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2
+        kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch)
+md5sums=('c5d6f0bd384cd96090819ea018eb8ad8'
+         '76e53a1f77699ba81c076f9254bb28c5')
 
 prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch
   find -name '*.png' -exec optipng -quiet -force -fix {} +
 }
 
@@ -27,14 +31,15 @@ build() {
 
   cmake ../$pkgname-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=/usr/lib
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+    -DQT_QMAKE_EXECUTABLE=qmake-qt4
   make
 }
 
 package() {
   cd build
-  make DESTDIR=$pkgdir LIBDIR=/usr/lib install
+  make DESTDIR="$pkgdir" LIBDIR=/usr/lib install
 
-  mv $pkgdir/usr/sdk $pkgdir/usr/share/kadu/sdk
-  rm -rf $pkgdir/usr/{lib,include}/{libgadu*,pkgconfig}
+  mv "$pkgdir"/usr/sdk "$pkgdir"/usr/share/kadu/sdk
+  rm -rf "$pkgdir"/usr/{lib,include}/{libgadu*,pkgconfig}
 }
diff --git a/community/kadu/kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch b/community/kadu/kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch
new file mode 100644
index 000000000..c818be5c2
--- /dev/null
+++ b/community/kadu/kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch
@@ -0,0 +1,12 @@
+diff -rupN a/plugins/jabber_protocol/3rdparty/CMakeLists.txt b/plugins/jabber_protocol/3rdparty/CMakeLists.txt
+--- a/plugins/jabber_protocol/3rdparty/CMakeLists.txt	2012-09-14 21:54:35.000000000 +0000
++++ b/plugins/jabber_protocol/3rdparty/CMakeLists.txt	2014-02-24 17:43:59.696495517 +0000
+@@ -26,7 +26,7 @@ macro (kadu_jabber_automoc)
+ 					get_filename_component (_basename ${_current_MOC} NAME_WE)
+ 					set (_header ${_abs_FILE})
+ 					set (_moc ${_abs_PATH}/${_current_MOC})
+-					QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "")
++					QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "" "${moc_target}")
+ 					MACRO_ADD_FILE_DEPENDENCIES (${_abs_FILE} ${_moc})
+ 				endforeach (_current_MOC_INC)
+ 			endif (_match)
diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD
index 87705015f..24fc01741 100644
--- a/community/kdenlive/PKGBUILD
+++ b/community/kdenlive/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 92336 2013-06-04 05:10:18Z svenstaro $
+# $Id: PKGBUILD 106147 2014-02-24 08:56:12Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Zuf <kontakt.zuf@gmail.com>
 # Contributor: Darwin Bautista <djclue917@gmail.com>
 
 pkgname=kdenlive
 pkgver=0.9.6
-pkgrel=2
+pkgrel=3
 pkgdesc="A non-linear video editor for Linux"
 arch=('i686' 'x86_64')
 # http://download.kde.org/stable/kdenlive/
@@ -20,8 +20,15 @@ optdepends=('recordmydesktop: screen capture'
 	    'cdrkit: dvd iso image creation')
 install=kdenlive.install
 options=('docs')
-source=(http://download.kde.org/stable/kdenlive/$pkgver/src/kdenlive-$pkgver.tar.bz2)
-md5sums=('3bd3a511b860490acc367e7c9d7ffa43')
+source=(http://download.kde.org/stable/kdenlive/$pkgver/src/kdenlive-$pkgver.tar.bz2
+	"FS37617.patch::http://quickgit.kde.org/?p=kdenlive.git&a=commitdiff&h=d049b327afc02b499266b5c895b13e438490b7c0&o=plain")
+md5sums=('3bd3a511b860490acc367e7c9d7ffa43'
+         '672edd6399a4d5e80937f61547490038')
+
+prepare() {
+  cd ${srcdir}/kdenlive-${pkgver}
+  patch -p1 <$srcdir/FS37617.patch
+}
 
 build() {
   export LDFLAGS="$LDFLAGS -lX11"
diff --git a/community/lcdproc/PKGBUILD b/community/lcdproc/PKGBUILD
index 3106af2ad..0a07f615d 100644
--- a/community/lcdproc/PKGBUILD
+++ b/community/lcdproc/PKGBUILD
@@ -1,22 +1,30 @@
-# $Id: PKGBUILD 102962 2013-12-25 04:58:31Z bgyorgy $
+# $Id: PKGBUILD 106179 2014-02-24 19:17:26Z idevolder $
 # Maintainer: BlackEagle <ike DOT devolder AT gmail DOT com>
 # Contributor: Bernhard Walle <bernhard.walle@gmx.de>
 
 pkgname=lcdproc
 pkgver=0.5.6
-pkgrel=4
+pkgrel=5
 pkgdesc="Utility to drive one or more LCD (and LCD-like) devices"
 arch=('i686' 'x86_64')
 url="http://lcdproc.omnipotent.net/"
 license=('GPL')
 depends=('libftdi-compat')
-optdepends=('perl: needed for some lcdproc tools')
-backup=('etc/LCDd.conf'
+makedepends=('g15daemon')
+optdepends=(
+	'perl: needed for some lcdproc tools'
+	'g15daemon: needed if you want g15 support'
+)
+backup=(
+	'etc/LCDd.conf'
 	'etc/lcdexec.conf'
 	'etc/lcdproc.conf'
-	'etc/lcdvc.conf')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
-	'lcdd.service')
+	'etc/lcdvc.conf'
+)
+source=(
+	"http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+	'lcdd.service'
+)
 sha256sums=('bd2f43c30ff43b30f43110abe6b4a5bc8e0267cb9f57fa97cc5e5ef9488b984a'
             '0acdc0fb9668e6d5e023349874301153a16935e1ad757d550c426a9a7ac64638')
 
diff --git a/community/libnewt/PKGBUILD b/community/libnewt/PKGBUILD
index 8a0805b7e..be2cbd5f8 100644
--- a/community/libnewt/PKGBUILD
+++ b/community/libnewt/PKGBUILD
@@ -1,30 +1,30 @@
-# $Id: PKGBUILD 99611 2013-10-30 13:59:02Z arodseth $
+# $Id: PKGBUILD 106158 2014-02-24 12:27:03Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Tom Killian <tomk@runbox.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=libnewt
-pkgver=0.52.16
-pkgrel=2
+pkgver=0.52.17
+pkgrel=1
 _tclver=8.6
 pkgdesc="Not Erik's Windowing Toolkit - text mode windowing with slang"
 arch=('x86_64' 'i686')
 url='https://fedorahosted.org/newt/'
 license=('GPL')
 depends=('slang' 'popt' 'gpm')
-makedepends=("tcl>=$_tclver" 'python2')
+makedepends=("tcl>=$_tclver" 'python' 'python2')
 optdepends=('tcl: whiptcl support' \
-            'python2: libnewt api through _snack module')
+            'python: libnewt support with the _snack module'
+            'python2: libnewt support with the _snack module')
 options=('!makeflags')
 source=("https://fedorahosted.org/releases/n/e/newt/newt-$pkgver.tar.gz")
-sha256sums=('1b9574bc9c8fb7b25cd26e5c3f2840e8c17fde5dd09c759604925919b3589cd3')
+sha256sums=('69837973ef2ee2fa644426f1c3e48d2b18785ebcd382ef7fd01eb2e67d2d632b')
 
 prepare() {
   cd "newt-$pkgver"
-  
+
   sed -i "s:tcl8.4:tcl$_tclver:" Makefile.in
-  sed -i 's:bin/python:bin/python2:' *.py
   echo '#define USE_INTERP_RESULT 1' >> config.h
 }
 
@@ -37,7 +37,7 @@ build() {
 
 package() {
   cd "newt-$pkgver"
-  
+
   make prefix="$pkgdir/usr" install
 }
 
diff --git a/community/libuv/PKGBUILD b/community/libuv/PKGBUILD
new file mode 100644
index 000000000..55195d7af
--- /dev/null
+++ b/community/libuv/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 106163 2014-02-24 13:13:50Z mtorromeo $
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+
+pkgname=libuv
+pkgver=0.11.19
+pkgrel=1
+pkgdesc="A new platform layer for Node.JS"
+arch=('i686' 'x86_64')
+url="https://github.com/joyent/libuv"
+license=('custom')
+depends=('glibc')
+source=("https://github.com/joyent/libuv/archive/v$pkgver.tar.gz")
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	./autogen.sh
+	./configure --prefix=/usr
+	make
+}
+
+check() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make check
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	make DESTDIR="$pkgdir" install
+
+	install -Dm644 LICENSE \
+		"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+	install -Dm644 AUTHORS \
+		"$pkgdir/usr/share/doc/$pkgname/AUTHORS"
+	install -Dm644 README.md \
+		"$pkgdir/usr/share/doc/$pkgname/README.md"
+	install -Dm644 ChangeLog \
+		"$pkgdir/usr/share/doc/$pkgname/ChangeLog"
+}
+
+sha256sums=('2d2d17be846d0fe459ad1b56f10eab1e6cdf9693f7d9dbd89bb2b0de3e24ef58')
diff --git a/community/lxc/PKGBUILD b/community/lxc/PKGBUILD
index e53241c57..28790bbd0 100644
--- a/community/lxc/PKGBUILD
+++ b/community/lxc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 106015 2014-02-21 08:11:19Z spupykin $
+# $Id: PKGBUILD 106149 2014-02-24 08:56:42Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andrea Zucchelli <zukka77@gmail.com>
 # Contributor: Daniel Micay <danielmicay@gmail.com>
@@ -8,15 +8,16 @@
 pkgname=lxc
 pkgver=1.0.0
 epoch=1
-pkgrel=1
+pkgrel=2
 pkgdesc="Linux Containers"
 arch=('i686' 'x86_64')
 url="http://linuxcontainers.org"
-depends=('bash' 'perl' 'libseccomp' 'libcap')
+depends=('bash' 'perl' 'libseccomp' 'libcap' 'python')
 makedepends=('docbook2x')
 optdepends=('arch-install-scripts: for archlinux template')
 license=('LGPL')
 install=lxc.install
+options=('emptydirs')
 source=("http://linuxcontainers.org/downloads/$pkgname-${pkgver}.tar.gz"
 	"lxc.tmpfiles.d"
 	"lxc@.service")
@@ -49,6 +50,7 @@ package() {
 
   make DESTDIR="$pkgdir" install
   install -d -m755 "$pkgdir/var/lib/lxc"
+  install -d -m755 "$pkgdir/usr/lib/lxc/rootfs/dev"
   install -D -m644 ${srcdir}/lxc@.service ${pkgdir}/usr/lib/systemd/system/lxc@.service
   install -D -m644 ${srcdir}/lxc.tmpfiles.d ${pkgdir}/usr/lib/tmpfiles.d/lxc.conf
 
diff --git a/community/python-msgpack/PKGBUILD b/community/python-msgpack/PKGBUILD
index 486ea8c28..814a35d07 100644
--- a/community/python-msgpack/PKGBUILD
+++ b/community/python-msgpack/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 105444 2014-02-08 02:18:28Z seblu $
+# $Id: PKGBUILD 106135 2014-02-24 00:51:07Z seblu $
 # Maintainer: Sébastien "Seblu" Luttringer
 
 pkgbase=python-msgpack
 pkgname=('python-msgpack' 'python2-msgpack')
-pkgver=0.4.0
-pkgrel=2
+pkgver=0.4.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url='https://github.com/msgpack/msgpack-python'
 license=('Apache')
 makedepends=('cython' 'cython2' 'python-distribute' 'python2-distribute')
 checkdepends=('python-pytest' 'python2-pytest' 'python-six' 'python2-six')
 source=("http://pypi.python.org/packages/source/m/msgpack-python/msgpack-python-$pkgver.tar.gz")
-md5sums=('8b9ce43619fd1428bf7baddf57e38d1a')
+md5sums=('3ff478e75e783f4e69c1a8d5ca63dea4')
 
 build() {
   cd msgpack-python-$pkgver
diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD
index 710934ed7..00dad4da2 100644
--- a/community/squid/PKGBUILD
+++ b/community/squid/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 105249 2014-02-03 11:29:24Z spupykin $
+# $Id: PKGBUILD 106151 2014-02-24 09:06:12Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Mark Coolen <mark.coolen@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -6,7 +6,7 @@
 
 pkgname=squid
 pkgver=3.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Full-featured Web proxy cache server'
 arch=('x86_64' 'i686')
 url='http://www.squid-cache.org'
@@ -20,11 +20,13 @@ install=$pkgname.install
 source=("http://www.squid-cache.org/Versions/v3/3.4/$pkgname-$pkgver.tar.bz2"
         'squid.pam'
         'squid.cron'
-        'squid.service')
+        'squid.service'
+        'squid.tmpfiles')
 md5sums=('4c4c53d2260afd6e7e2dd7c445c92920'
          '270977cdd9b47ef44c0c427ab9034777'
          'a71425c4951f2e5b640d19e6a5048531'
-         'ceeb57c69ebb165676219222f109a24e')
+         'ceeb57c69ebb165676219222f109a24e'
+         'd243da117c1aee03c0cc6052f023a380')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -76,6 +78,7 @@ package() {
   make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
   install -Dm755 "$srcdir/squid.cron" "$pkgdir/etc/cron.weekly/squid"
   install -Dm644 "$srcdir/squid.pam" "$pkgdir/etc/pam.d/squid"
+  install -Dm644 "$srcdir/squid.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/squid.conf"
   install -Dm644 "$srcdir/squid.service" \
     "$pkgdir/usr/lib/systemd/system/squid.service"
   rm -rf "$pkgdir/run" "$pkgdir/var/run"
diff --git a/community/squid/squid.install b/community/squid/squid.install
index a7c76d87a..5c8b77600 100644
--- a/community/squid/squid.install
+++ b/community/squid/squid.install
@@ -1,16 +1,8 @@
 post_install() {
-  if [ -z "$(grep ^proxy: /etc/group)" ]; then
-    groupadd -g 15 proxy &>/dev/null
-  fi
-
-  id proxy &>/dev/null || \
-    useradd -u 15 -g proxy -d /var/empty proxy
-
+  [ -z "$(grep ^proxy: /etc/group)" ] && groupadd -g 15 proxy &>/dev/null
+  id proxy &>/dev/null || useradd -u 15 -g proxy -d /var/empty proxy
   chown proxy.proxy var/{cache,log}/squid
-
-#  cat << EOF
-#Release notes:  http://www.squid-cache.org/Versions/v3/3.1/RELEASENOTES.html
-#EOF
+  systemd-tmpfiles --create squid.conf
 }
 
 post_upgrade() {
@@ -19,8 +11,5 @@ post_upgrade() {
 
 pre_remove() {
   userdel proxy &> /dev/null
-  if [ ! -z "$(grep ^proxy: /etc/group)" ]; then
-    groupdel proxy &>/dev/null
-  fi
+  [ ! -z "$(grep ^proxy: /etc/group)" ] && groupdel proxy &>/dev/null
 }
-
diff --git a/community/squid/squid.tmpfiles b/community/squid/squid.tmpfiles
new file mode 100644
index 000000000..a45d96ccf
--- /dev/null
+++ b/community/squid/squid.tmpfiles
@@ -0,0 +1 @@
+d /run/squid 0755 proxy proxy -
diff --git a/community/sxiv/PKGBUILD b/community/sxiv/PKGBUILD
index 0d3439b71..e7ab28b45 100644
--- a/community/sxiv/PKGBUILD
+++ b/community/sxiv/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 97145 2013-09-14 07:15:14Z bpiotrowski $
-# Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
+# $Id: PKGBUILD 106175 2014-02-24 18:03:28Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Bert Muennich <muennich at informatik.hu-berlin.de>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 
 pkgname=sxiv
 pkgver=1.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Simple X Image Viewer'
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -15,19 +15,20 @@ url='https://github.com/muennich/sxiv'
 depends=('libx11' 'xproto' 'imlib2' 'giflib' 'desktop-file-utils')
 source=(https://github.com/muennich/sxiv/archive/v$pkgver.tar.gz
         config.h)
-sha256sums=('30569b7cb1568a7f60d102f6eb21f25c93de42243a1c8ac3c1a521d58b08281f'
-            '61515a87692849c942bfc3cce8b4c0f19139b4a1e9b6375a994cc541c64aab5c')
+md5sums=('786f647326bdb24b672519924928dfca'
+         '53729e7dfba3c12b26fc8359d56523a2')
+
+prepare() {
+  cp config.h sxiv-$pkgver
+}
 
 build() {
   cd sxiv-$pkgver
-  cp "$srcdir"/config.h .
   make
 }
 
 package() {
   cd sxiv-$pkgver
-
   make PREFIX="$pkgdir"/usr install
-  install -D -m644 sxiv.desktop \
-    "$pkgdir"/usr/share/applications/sxiv.desktop
+  install -Dm644 sxiv.desktop "$pkgdir"/usr/share/applications/sxiv.desktop
 }
diff --git a/community/tmux/PKGBUILD b/community/tmux/PKGBUILD
index d0bca3de1..7e075be62 100644
--- a/community/tmux/PKGBUILD
+++ b/community/tmux/PKGBUILD
@@ -1,29 +1,29 @@
-# $Id: PKGBUILD 106013 2014-02-21 07:54:51Z spupykin $
+# $Id: PKGBUILD 106145 2014-02-24 08:39:29Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  TDY <tdy@gmx.com>
 # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com>
 
 pkgname=tmux
-pkgver=1.9
+pkgver=1.9_a
 pkgrel=1
 pkgdesc='A terminal multiplexer'
 url='http://tmux.sourceforge.net/'
 arch=('i686' 'x86_64')
 license=('BSD')
 depends=('ncurses' 'libevent')
-source=(http://downloads.sourceforge.net/tmux/tmux-$pkgver.tar.gz
+source=(http://downloads.sourceforge.net/tmux/tmux-${pkgver/_/}.tar.gz
 		LICENSE)
-md5sums=('5f5ed0f03a666279264da45b60075600'
+md5sums=('b07601711f96f1d260b390513b509a2d'
          '71601bc37fa44e4395580b321963018e')
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$srcdir/$pkgname-${pkgver/_/}"
 	./configure --prefix=/usr
 	make
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$srcdir/$pkgname-${pkgver/_/}"
 	make install DESTDIR=$pkgdir
 	install -Dm644 ../LICENSE "$pkgdir/usr/share/licenses/tmux/LICENSE"
 
diff --git a/core/s-nail/PKGBUILD b/core/s-nail/PKGBUILD
index 2e8e82cca..9ebf3b848 100644
--- a/core/s-nail/PKGBUILD
+++ b/core/s-nail/PKGBUILD
@@ -1,26 +1,20 @@
-# $Id: PKGBUILD 205863 2014-02-12 06:21:09Z bisson $
+# $Id: PKGBUILD 206340 2014-02-24 06:14:05Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s@arch@gmail.com>
 # Contributor: Andreas Wagner <Andreas.Wagner@em.uni-frankfurt.de>
 
 pkgname=s-nail
-pkgver=14.5.2
-pkgrel=4
+pkgver=14.6
+pkgrel=1
 pkgdesc='Mail processing system with a command syntax reminiscent of ed'
 url='http://sdaoden.users.sourceforge.net/code.html#s-nail'
 license=('custom:BSD')
 arch=('i686' 'x86_64')
 depends=('openssl')
 optdepends=('smtp-forwarder: for sending mail')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver//./_}.tar.xz"
-        'mimeheader.patch'
-        'maildir.patch'
-        'sort.patch')
-sha1sums=('26ad43f5f41b429d5f13a3ce73a3dff75325950c'
-          'e72ed84f584ebc50eb9d04779b8b754afa446bf4'
-          '9ba91a0c697c121d9de4ff67766ec90f4ee354b5'
-          '909da731e590d1d2877ed38bed667440a02d1259')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver//./_}.tar.xz")
+sha1sums=('57603cdc3dea79fda699cc172c33ccae75b1d794')
 
 groups=('base')
 backup=('etc/mail.rc')
@@ -28,13 +22,6 @@ replaces=('mailx' 'mailx-heirloom' 'heirloom-mailx')
 provides=('mailx' 'mailx-heirloom' 'heirloom-mailx')
 conflicts=('mailx' 'mailx-heirloom' 'heirloom-mailx')
 
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../mimeheader.patch
-	patch -p1 -i ../maildir.patch
-	patch -p1 -i ../sort.patch
-}
-
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make \
diff --git a/core/s-nail/maildir.patch b/core/s-nail/maildir.patch
deleted file mode 100644
index d9b16c348..000000000
--- a/core/s-nail/maildir.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-s-nail-14_5_2-maildir.patch, 2014-02-10:
-
-Apply:
-  $ cd s-nail-14.5.2
-  $ patch -bu < s-nail-14_5_2-maildir.patch
-
-Description:
-  To overcome a general design problem of the Berkeley Mail codebase
-  i once added realpath(3) calls to be able to resolve the path of
-  a mailbox file: like that changing a directory wouldn't cause the
-  program to "hang" because the (relatively) opened mailbox became
-  inaccessible.  (Again: the real solution will take many years.)
-
-  My first KISS solution to one aspect of the general problem was
-  [3adf33ee] (schdir(): realpath() local files before leaving CWD..,
-  2013-01-08), and it should possibly have worked with maildir boxes,
-  because we'd only did anything once the user actively used the `chdir'
-  command (and who does), but Christos Zoulas from NetBSD actually forced
-  me to do more (after i've reported the general Berkeley bug), and that
-  led to the current code, which always calls realpath(3).
-  Anyway, i wasn't in the position to reflect the impact of doing so at
-  that time.  And the entire codebase needs to be reworked anyway. (:(
-
-  Anyway -- this patch is an adjusted combination of the [1c2563b]
-  (lex.c:_update_mailname(): continue if realname() fails.., 2014-02-10)
-  and [13f325f] (Avoid "cannot canonicalize" maildir warning.., 2014-02-10)
-  changesets that have been pushed to [master], and make maildir mailboxes
-  usable again.
-
-Notes:
-  The patch is so large because it was cherry-picked from [crawl] onto
-  [master] and (thus) includes the very large [nyd] topic branch style-and-
-  much-more changes.  Sorry for that.
-
- lex.c     |  11 +++--
- maildir.c | 152 +++++++++++++++++++++++++++++++++-----------------------------
- 2 files changed, 87 insertions(+), 76 deletions(-)
-
-diff --git a/lex.c b/lex.c
-index 922faf8..3b3b3cc 100644
---- a/lex.c
-+++ b/lex.c
-@@ -164,7 +164,7 @@ _update_mailname(char const *name)
- {
-    char tbuf[MAXPATHLEN], *mailp, *dispp;
-    size_t i, j;
--   bool_t rv;
-+   bool_t rv = TRU1;
- 
-    /* Don't realpath(3) if it's only an update request */
-    if (name != NULL) {
-@@ -174,9 +174,10 @@ _update_mailname(char const *name)
-          if (realpath(name, mailname) == NULL) {
-             fprintf(stderr, tr(151, "Can't canonicalize `%s'\n"), name);
-             rv = FAL0;
--            goto jleave;
-+            goto jdocopy;
-          }
-       } else
-+jdocopy:
- #endif
-          n_strlcpy(mailname, name, sizeof(mailname));
-    }
-@@ -197,9 +198,10 @@ _update_mailname(char const *name)
- 
-    /* We want to see the name of the folder .. on the screen */
-    i = strlen(mailp);
--   if ((rv = (i < sizeof(displayname) - 1)))
-+   if (i < sizeof(displayname) - 1)
-       memcpy(dispp, mailp, i + 1);
-    else {
-+      rv = FAL0;
-       /* Avoid disrupting multibyte sequences (if possible) */
- #ifndef HAVE_C90AMEND1
-       j = sizeof(displayname) / 3 - 1;
-@@ -212,9 +214,6 @@ _update_mailname(char const *name)
-       snprintf(dispp, sizeof(displayname), "%.*s...%s",
-          (int)j, mailp, mailp + i);
-    }
--#ifdef HAVE_REALPATH
--jleave:
--#endif
-    return rv;
- }
- 
-diff --git a/maildir.c b/maildir.c
-index 32180bd..3d45f77 100644
---- a/maildir.c
-+++ b/maildir.c
-@@ -1,5 +1,5 @@
- /*@ S-nail - a mail user agent derived from Berkeley Mail.
-- *@ Maildir folder support.
-+ *@ Maildir folder support. FIXME rewrite - why do we chdir(2)??
-  *
-  * Copyright (c) 2000-2004 Gunnar Ritter, Freiburg i. Br., Germany.
-  * Copyright (c) 2012 - 2014 Steffen "Daode" Nurpmeso <sdaoden@users.sf.net>.
-@@ -101,75 +101,87 @@ jleave:	;
- FL int
- maildir_setfile(char const * volatile name, int nmail, int isedit)
- {
--	sighandler_type	volatile saveint;
--	struct cw	cw;
--	int	i = -1, omsgCount;
--
--	(void)&saveint;
--	(void)&i;
--	omsgCount = msgCount;
--	if (cwget(&cw) == STOP) {
--		fprintf(stderr, "Fatal: Cannot open current directory\n");
--		return -1;
--	}
--	if (!nmail)
--		quit();
--	saveint = safe_signal(SIGINT, SIG_IGN);
--	if (chdir(name) < 0) {
--		fprintf(stderr, "Cannot change directory to \"%s\".\n", name);
--		cwrelse(&cw);
--		return -1;
--	}
--	if (!nmail) {
--		edit = (isedit != 0);
--		if (mb.mb_itf) {
--			fclose(mb.mb_itf);
--			mb.mb_itf = NULL;
--		}
--		if (mb.mb_otf) {
--			fclose(mb.mb_otf);
--			mb.mb_otf = NULL;
--		}
--		initbox(name);
--		mb.mb_type = MB_MAILDIR;
--	}
--	_maildir_table = NULL;
--	if (sigsetjmp(_maildir_jmp, 1) == 0) {
--		if (nmail)
--			mktable();
--		if (saveint != SIG_IGN)
--			safe_signal(SIGINT, maildircatch);
--		i = maildir_setfile1(name, nmail, omsgCount);
--	}
--	if (nmail && _maildir_table != NULL)
--		free(_maildir_table);
--	safe_signal(SIGINT, saveint);
--	if (i < 0) {
--		mb.mb_type = MB_VOID;
--		*mailname = '\0';
--		msgCount = 0;
--	}
--	if (cwret(&cw) == STOP) {
--		fputs("Fatal: Cannot change back to current directory.\n",
--				stderr);
--		abort();
--	}
--	cwrelse(&cw);
--	setmsize(msgCount);
--	if (nmail && mb.mb_sorted && msgCount > omsgCount) {
--		mb.mb_threaded = 0;
--		sort((void *)-1);
--	}
--	if (!nmail)
--		sawcom = FAL0;
--	if (!nmail && !edit && msgCount == 0) {
--		if (mb.mb_type == MB_MAILDIR && !ok_blook(emptystart))
--			fprintf(stderr, "No mail at %s\n", name);
--		return 1;
--	}
--	if (nmail && msgCount > omsgCount)
--		newmailinfo(omsgCount);
--	return 0;
-+   sighandler_type volatile saveint;
-+   struct cw cw;
-+   int i = -1, omsgCount;
-+
-+   /* TODO ince we have a VOID box... */
-+   omsgCount = msgCount;
-+   if (cwget(&cw) == STOP) {
-+      fprintf(stderr, "Cannot open current directory");
-+      goto jleave;
-+   }
-+
-+   if (!nmail)
-+      quit();
-+
-+   saveint = safe_signal(SIGINT, SIG_IGN);
-+
-+   if (!nmail) {
-+      edit = (isedit != 0);
-+      if (mb.mb_itf) {
-+         fclose(mb.mb_itf);
-+         mb.mb_itf = NULL;
-+      }
-+      if (mb.mb_otf) {
-+         fclose(mb.mb_otf);
-+         mb.mb_otf = NULL;
-+      }
-+      initbox(name);
-+      mb.mb_type = MB_MAILDIR;
-+   }
-+
-+   if (chdir(name) < 0) {
-+      fprintf(stderr, "Cannot change directory to \"%s\".\n", name);/*TODO tr*/
-+      mb.mb_type = MB_VOID;
-+      *mailname = '\0';
-+      msgCount = 0;
-+      cwrelse(&cw);
-+      safe_signal(SIGINT, saveint);
-+      goto jleave;
-+   }
-+
-+   _maildir_table = NULL;
-+   if (sigsetjmp(_maildir_jmp, 1) == 0) {
-+      if (nmail)
-+         mktable();
-+      if (saveint != SIG_IGN)
-+         safe_signal(SIGINT, &maildircatch);
-+      i = maildir_setfile1(name, nmail, omsgCount);
-+   }
-+   if (nmail && _maildir_table != NULL)
-+      free(_maildir_table);
-+
-+   safe_signal(SIGINT, saveint);
-+
-+   if (i < 0) {
-+      mb.mb_type = MB_VOID;
-+      *mailname = '\0';
-+      msgCount = 0;
-+   }
-+
-+   if (cwret(&cw) == STOP)
-+      panic("Cannot change back to current directory.");/* TODO tr */
-+   cwrelse(&cw);
-+
-+   setmsize(msgCount);
-+   if (nmail && mb.mb_sorted && msgCount > omsgCount) {
-+      mb.mb_threaded = 0;
-+      sort((void*)-1);
-+   }
-+   if (!nmail)
-+      sawcom = FAL0;
-+   if (!nmail && !edit && msgCount == 0) {
-+      if (mb.mb_type == MB_MAILDIR /* XXX ?? */ && !ok_blook(emptystart))
-+         fprintf(stderr, tr(258, "No mail at %s\n"), name);
-+      i = 1;
-+      goto jleave;
-+   }
-+   if (nmail && msgCount > omsgCount)
-+      newmailinfo(omsgCount);
-+   i = 0;
-+jleave:
-+   return i;
- }
- 
- static int
diff --git a/core/s-nail/mimeheader.patch b/core/s-nail/mimeheader.patch
deleted file mode 100644
index 2f7163b36..000000000
--- a/core/s-nail/mimeheader.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-s-nail-14_5_2-mimeheader.patch, 2014-02-05:
-
-Apply:
-  $ cd s-nail-14.5.2
-  $ patch -bu < s-nail-14_5_2-mimeheader.patch
-
-Description:
-    mime_fromhdr(): fix my rewrite again..
-    
-    My hasty rewrite [0f9ad93] (mime_fromhdr(): partial rewrite using
-    n_iconv_str(), 2013-03-12), just about ninety (90) minutes before
-    the release of S-nail v14.1 already caused the bugfix [b608c6b]
-    (mime_fromhdr(): never return NULL output.., 2013-03-14), which
-    was the sole reason for the release of S-nail v14.2.
-    
-    Well, about a year later, after tens of thousands of mails,
-    including multibyte ones, i wrote myself a message that has shown
-    that the rewrite was still buggy -- the header
-    
-      Subject: ehm, .getElementById("blink") needs <span
-       =?US-ASCII?Q?id=3D"blink">,?= not =?US-ASCII?Q?class=3D"id"?=
-    
-    cannot be viewed correctly, the ", not" will be lost.
-    The reason is now understood and this changeset should fix
-    mime_fromhdr() so that it'll do what it is assumed to do in the
-    current codebase, unless i'm terribly mistaken.
-    
-    Because i bickered some time in private, i WANT to add that the
-    real problem is that the codebase is weird INSOFAR as that i still
-    don't really understand the WAY it works, because THAT IS SICK.
-    I.e., in my brain i assume this function effectively is
-    rfc_2047_decode(), meant to decode encoded words as specified in
-    RFC 2047, but that's simply not true, and FOR QUITE SOME TIME,
-    because of the embedded newlines that may be in the data and need
-    to passed through for at least the case that we send data to the
-    display.  I slowly get around that schizophrenic codebase while
-    also converting it to a straight one, but that will take years.
-    Until then we need to strip whitespace in between multiple
-    adjacent encoded words, while passing through newlines and
-    whitespace that follows newlines, regardless of whatever.
-    I hope this will do it until we are sane.
----
- mime.c | 63 +++++++++++++++++++++++++++++++++++++++------------------------
- 1 file changed, 39 insertions(+), 24 deletions(-)
-
-diff --git a/mime.c b/mime.c
-index ccb0061..6ee55cc 100644
---- a/mime.c
-+++ b/mime.c
-@@ -863,20 +863,26 @@ jclear:
- 	goto jleave;
- }
- 
--/*
-- * Convert header fields from RFC 1522 format
-- * TODO mime_fromhdr(): NO error handling, fat; REWRITE **ASAP**
-- */
- FL void
- mime_fromhdr(struct str const *in, struct str *out, enum tdflags flags)
- {
--	/* TODO mime_fromhdr(): is called with strings that contain newlines;
--	 * TODO this is the usual newline problem all around the codebase;
--	 * TODO i.e., if we strip it, then the display misses it ;} */
-+   /* TODO mime_fromhdr(): is called with strings that contain newlines;
-+    * TODO this is the usual newline problem all around the codebase;
-+    * TODO i.e., if we strip it, then the display misses it ;>
-+    * TODO this is why it is so messy and why S-nail v14.2 plus additional
-+    * TODO patch for v14.5.2 (and maybe even v14.5.3 subminor) occurred, and
-+    * TODO why our display reflects what is contained in the message: the 1:1
-+    * TODO relationship of message content and display!
-+    * TODO instead a header line should be decoded to what it is (a single
-+    * TODO line that is) and it should be objective to the backend wether
-+    * TODO it'll be folded to fit onto the display or not, e.g., for search
-+    * TODO purposes etc.  then the only condition we have to honour in here
-+    * TODO is that whitespace in between multiple adjacent MIME encoded words
-+    * TODO á la RFC 2047 is discarded; i.e.: this function should deal with
-+    * TODO RFC 2047 and be renamed: mime_fromhdr() -> mime_rfc2047_decode() */
- 	struct str cin, cout;
- 	char *p, *op, *upper, *cs, *cbeg;
--	int convert;
--	size_t lastoutl = (size_t)-1;
-+   ui32_t convert, lastenc, lastoutl;
- #ifdef HAVE_ICONV
- 	char const *tcs;
- 	iconv_t fhicd = (iconv_t)-1;
-@@ -894,6 +900,7 @@ mime_fromhdr(struct str const *in, struct str *out, enum tdflags flags)
- #endif
- 	p = in->s;
- 	upper = p + in->l;
-+   lastenc = lastoutl = 0;
- 
- 	while (p < upper) {
- 		op = p;
-@@ -949,8 +956,7 @@ mime_fromhdr(struct str const *in, struct str *out, enum tdflags flags)
- 					--cout.l;
- 			} else
- 				(void)qp_decode(&cout, &cin, NULL);
--			if (lastoutl != (size_t)-1)
--				out->l = lastoutl;
-+			out->l = lastenc;
- #ifdef HAVE_ICONV
- 			if ((flags & TD_ICONV) && fhicd != (iconv_t)-1) {
- 				cin.s = NULL, cin.l = 0; /* XXX string pool ! */
-@@ -966,21 +972,30 @@ mime_fromhdr(struct str const *in, struct str *out, enum tdflags flags)
- #ifdef HAVE_ICONV
- 			}
- #endif
--			lastoutl = out->l;
-+			lastenc = lastoutl = out->l;
- 			free(cout.s);
--		} else {
--jnotmime:
--			p = op;
--			convert = 1;
--			while ((op = p + convert) < upper &&
--					(op[0] != '=' || op[1] != '?'))
--				++convert;
--			out = n_str_add_buf(out, p, convert);
--			p += convert;
--			if (! blankchar(p[-1]))
--				lastoutl = (size_t)-1;
--		}
-+		} else
-+jnotmime: {
-+         bool_t onlyws;
-+
-+         p = op;
-+         onlyws = (lastenc > 0);
-+         for (;;) {
-+            if (++op == upper)
-+               break;
-+            if (op[0] == '=' && (PTRCMP(op + 1, ==, upper) || op[1] == '?'))
-+               break;
-+            if (onlyws && !blankchar(*op))
-+               onlyws = FAL0;
-+         }
-+
-+         out = n_str_add_buf(out, p, PTR2SIZE(op - p));
-+         p = op;
-+         if (!onlyws || lastoutl != lastenc)
-+            lastenc = out->l;
-+         lastoutl = out->l;
- 	}
-+  }
- 	out->s[out->l] = '\0';
- 
- 	if (flags & TD_ISPR) {
diff --git a/core/s-nail/sort.patch b/core/s-nail/sort.patch
deleted file mode 100644
index fdb8d526d..000000000
--- a/core/s-nail/sort.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-s-nail-14_5_2-sort.patch, 2014-01-30:
-
-Apply:
-  $ cd s-nail-14.5.2
-  $ patch -bu < s-nail-14_5_2-sort.patch
-
-Description:
-Reverses (sort(),thread(): use srelax()!, 2014-01-18, [a9b67e9]), which
-was a hasty commit of an untested diff that i've added few minutes
-beforehand.
-It was of course wrong.
-The problem (no memory relaxation during entire sort operation) requires
-a different approach (either only relax when we don't need to hold
-dope storage (as for SORT_TO/SORT_FROM/SORT_SUBJECT/+) or use heap
-memory for those allocations, then).
-
-s-nail-14_5_2-sort-alt.patch is an alternative working thesis that uses
-heap allocations, thus continues to relax the dope storage.
-This version has been pushed to [master].
-
-diff --git a/thread.c b/thread.c
-index 3ac5966..9ec1ac9 100644
---- a/thread.c
-+++ b/thread.c
-@@ -361,8 +361,6 @@ makethreads(struct message *m, long cnt, int nmail)
- 		return;
- 	mprime = nextprime(cnt);
- 	mt = scalloc(mprime, sizeof *mt);
--
--	srelax_hold();
- 	for (i = 0; i < cnt; i++) {
- 		if ((m[i].m_flag&MHIDDEN) == 0) {
- 			mlook(NULL, mt, &m[i], mprime);
-@@ -376,7 +374,6 @@ makethreads(struct message *m, long cnt, int nmail)
- 		m[i].m_level = 0;
- 		if (!nmail && !(inhook&2))
- 			m[i].m_collapsed = 0;
--		srelax();
- 	}
- 	/*
- 	 * Most folders contain the eldest messages first. Traversing
-@@ -387,12 +384,8 @@ makethreads(struct message *m, long cnt, int nmail)
- 	 * are replies to the one message, and are sorted such that
- 	 * youngest messages occur first.
- 	 */
--	for (i = cnt-1; i >= 0; i--) {
-+	for (i = cnt-1; i >= 0; i--)
- 		lookup(&m[i], mt, mprime);
--		srelax();
--	}
--	srelax_rele();
--
- 	threadroot = interlink(m, cnt, nmail);
- 	finalize(threadroot);
- 	free(mt);
-@@ -572,8 +565,6 @@ sort(void *vp)
- 	default:
- 		break;
- 	}
--
--	srelax_hold();
- 	for (n = 0, i = 0; i < msgCount; i++) {
- 		mp = &message[i];
- 		if ((mp->m_flag&MHIDDEN) == 0) {
-@@ -637,10 +628,7 @@ sort(void *vp)
- 		mp->m_child = mp->m_younger = mp->m_elder = mp->m_parent = NULL;
- 		mp->m_level = 0;
- 		mp->m_collapsed = 0;
--		srelax();
- 	}
--	srelax_rele();
--
- 	if (n > 0) {
- 		qsort(ms, n, sizeof *ms, func);
- 		threadroot = &message[ms[0].ms_n];
diff --git a/extra/dcraw/PKGBUILD b/extra/dcraw/PKGBUILD
index 0414cffd3..e36475d74 100644
--- a/extra/dcraw/PKGBUILD
+++ b/extra/dcraw/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 188700 2013-06-18 09:44:02Z bisson $
+# $Id: PKGBUILD 206344 2014-02-24 06:30:08Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=dcraw
-pkgver=9.19
+pkgver=9.20
 pkgrel=1
 pkgdesc='Decodes any raw image from any digital camera'
 url='http://www.cybercom.net/~dcoffin/dcraw/'
 arch=('i686' 'x86_64')
 license=('custom')
-depends=('lcms' 'jasper')
+depends=('lcms2' 'jasper')
 source=("http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('83a85200b0f105a40d23e885f5108bc3b53bdbe4')
+sha1sums=('9b8ca82eaaf6582ffa0f2602e8ca705c722ea87e')
 
 build() {
 	cd "${srcdir}/${pkgname}"
 	gcc ${CFLAGS} ${LDFLAGS} \
 		-o dcraw dcraw.c \
-		-lm -ljasper -ljpeg -llcms \
+		-lm -ljasper -ljpeg -llcms2 \
 		-DLOCALEDIR=\"/usr/share/locale/\"
 }
 
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index 34f78179e..59fe84bd5 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 204259 2014-01-15 20:56:02Z bpiotrowski $
+# $Id: PKGBUILD 206354 2014-02-24 10:37:56Z bpiotrowski $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=ffmpeg
-pkgver=2.1.3
+pkgver=2.1.4
 pkgrel=1
 epoch=1
 pkgdesc='Complete and free Internet live audio and video broadcasting solution'
@@ -20,7 +20,7 @@ depends=(
       )
 makedepends=('libvdpau' 'yasm')
 source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2)
-md5sums=('711b795bbc7b527c0f4a1828f324fd5a')
+md5sums=('dedc28003a77c69432c42ab16e5f6982')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD
index ba8dee5fb..2c3f63798 100644
--- a/extra/networkmanager/PKGBUILD
+++ b/extra/networkmanager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 206327 2014-02-23 23:02:02Z thomas $
+# $Id: PKGBUILD 206339 2014-02-24 03:07:41Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinxu.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -9,7 +9,7 @@
 pkgname=networkmanager
 _pkgname=NetworkManager
 pkgver=0.9.8.8
-pkgrel=2
+pkgrel=3
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index fb105df68..2a0158d85 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -10,11 +10,11 @@
 
 pkgbase=samba
 pkgname=('libwbclient' 'smbclient' 'samba')
-pkgver=4.1.4
+pkgver=4.1.5
 # We use the 'A' to fake out pacman's version comparators.  Samba chooses
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
-_realver=4.1.4
+_realver=4.1.5
 pkgrel=1
 arch=(i686 x86_64)
 url="http://www.samba.org"
@@ -240,7 +240,7 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \
   # copy ldap example
   install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
 }
-md5sums=('c7871012ac40b8c74afff42bbd873bd7'
+md5sums=('71658f34cfdcffe3f48c0df5f4b08d79'
          '5697da77590ec092cc8a883bae06093c'
          '96f82c38f3f540b53f3e5144900acf17'
          'ee4763a656cf00d92bfda31b6bb2c5cb'
diff --git a/kernels/linux-libre-grsec/0001-SUNRPC-Ensure-that-gss_auth-isn-t-freed-before-its-u.patch b/kernels/linux-libre-grsec/0001-SUNRPC-Ensure-that-gss_auth-isn-t-freed-before-its-u.patch
deleted file mode 100644
index 93803d2e6..000000000
--- a/kernels/linux-libre-grsec/0001-SUNRPC-Ensure-that-gss_auth-isn-t-freed-before-its-u.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 2bd7c7b5f011b3d57e4f5625b561a6f3f2f34a81 Mon Sep 17 00:00:00 2001
-From: Trond Myklebust <trond.myklebust@primarydata.com>
-Date: Sun, 16 Feb 2014 12:14:13 -0500
-Subject: [PATCH] SUNRPC: Ensure that gss_auth isn't freed before its upcall
- messages
-
-Fix a race in which the RPC client is shutting down while the
-gss daemon is processing a downcall. If the RPC client manages to
-shut down before the gss daemon is done, then the struct gss_auth
-used in gss_release_msg() may have already been freed.
-
-Link: http://lkml.kernel.org/r/1392494917.71728.YahooMailNeo@web140002.mail.bf1.yahoo.com
-Reported-by: John <da_audiophile@yahoo.com>
-Reported-by: Borislav Petkov <bp@alien8.de>
-Cc: stable@vger.kernel.org # 3.12+
-Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
----
- net/sunrpc/auth_gss/auth_gss.c | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
-index 42fdfc6..a642fd616 100644
---- a/net/sunrpc/auth_gss/auth_gss.c
-+++ b/net/sunrpc/auth_gss/auth_gss.c
-@@ -108,6 +108,7 @@ struct gss_auth {
- static DEFINE_SPINLOCK(pipe_version_lock);
- static struct rpc_wait_queue pipe_version_rpc_waitqueue;
- static DECLARE_WAIT_QUEUE_HEAD(pipe_version_waitqueue);
-+static void gss_put_auth(struct gss_auth *gss_auth);
- 
- static void gss_free_ctx(struct gss_cl_ctx *);
- static const struct rpc_pipe_ops gss_upcall_ops_v0;
-@@ -320,6 +321,7 @@ gss_release_msg(struct gss_upcall_msg *gss_msg)
- 	if (gss_msg->ctx != NULL)
- 		gss_put_ctx(gss_msg->ctx);
- 	rpc_destroy_wait_queue(&gss_msg->rpc_waitqueue);
-+	gss_put_auth(gss_msg->auth);
- 	kfree(gss_msg);
- }
- 
-@@ -500,6 +502,7 @@ gss_alloc_msg(struct gss_auth *gss_auth,
- 		if (err)
- 			goto err_free_msg;
- 	};
-+	kref_get(&gss_auth->kref);
- 	return gss_msg;
- err_free_msg:
- 	kfree(gss_msg);
-@@ -1071,6 +1074,12 @@ gss_free_callback(struct kref *kref)
- }
- 
- static void
-+gss_put_auth(struct gss_auth *gss_auth)
-+{
-+	kref_put(&gss_auth->kref, gss_free_callback);
-+}
-+
-+static void
- gss_destroy(struct rpc_auth *auth)
- {
- 	struct gss_auth *gss_auth = container_of(auth,
-@@ -1091,7 +1100,7 @@ gss_destroy(struct rpc_auth *auth)
- 	gss_auth->gss_pipe[1] = NULL;
- 	rpcauth_destroy_credcache(auth);
- 
--	kref_put(&gss_auth->kref, gss_free_callback);
-+	gss_put_auth(gss_auth);
- }
- 
- /*
-@@ -1262,7 +1271,7 @@ gss_destroy_nullcred(struct rpc_cred *cred)
- 	call_rcu(&cred->cr_rcu, gss_free_cred_callback);
- 	if (ctx)
- 		gss_put_ctx(ctx);
--	kref_put(&gss_auth->kref, gss_free_callback);
-+	gss_put_auth(gss_auth);
- }
- 
- static void
--- 
-1.9.0
-
diff --git a/kernels/linux-libre-grsec/0001-quirk-asm_volatile_goto.patch b/kernels/linux-libre-grsec/0001-quirk-asm_volatile_goto.patch
deleted file mode 100644
index c9ee40400..000000000
--- a/kernels/linux-libre-grsec/0001-quirk-asm_volatile_goto.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From a9f180345f5378ac87d80ed0bea55ba421d83859 Mon Sep 17 00:00:00 2001
-From: Steven Noonan <steven@uplinklabs.net>
-Date: Thu, 13 Feb 2014 07:01:07 +0000
-Subject: compiler/gcc4: Make quirk for asm_volatile_goto() unconditional
-
-I started noticing problems with KVM guest destruction on Linux
-3.12+, where guest memory wasn't being cleaned up. I bisected it
-down to the commit introducing the new 'asm goto'-based atomics,
-and found this quirk was later applied to those.
-
-Unfortunately, even with GCC 4.8.2 (which ostensibly fixed the
-known 'asm goto' bug) I am still getting some kind of
-miscompilation. If I enable the asm_volatile_goto quirk for my
-compiler, KVM guests are destroyed correctly and the memory is
-cleaned up.
-
-So make the quirk unconditional for now, until bug is found
-and fixed.
-
-Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Steven Noonan <steven@uplinklabs.net>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Steven Rostedt <rostedt@goodmis.org>
-Cc: Jakub Jelinek <jakub@redhat.com>
-Cc: Richard Henderson <rth@twiddle.net>
-Cc: Andrew Morton <akpm@linux-foundation.org>
-Cc: Oleg Nesterov <oleg@redhat.com>
-Cc: <stable@vger.kernel.org>
-Link: http://lkml.kernel.org/r/1392274867-15236-1-git-send-email-steven@uplinklabs.net
-Link: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
----
-diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
-index ded4299..2507fd2 100644
---- a/include/linux/compiler-gcc4.h
-+++ b/include/linux/compiler-gcc4.h
-@@ -75,11 +75,7 @@
-  *
-  * (asm goto is automatically volatile - the naming reflects this.)
-  */
--#if GCC_VERSION <= 40801
--# define asm_volatile_goto(x...)	do { asm goto(x); asm (""); } while (0)
--#else
--# define asm_volatile_goto(x...)	do { asm goto(x); } while (0)
--#endif
-+#define asm_volatile_goto(x...)	do { asm goto(x); asm (""); } while (0)
- 
- #ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
- #if GCC_VERSION >= 40400
---
-cgit v0.9.2
diff --git a/kernels/linux-libre-grsec/PKGBUILD b/kernels/linux-libre-grsec/PKGBUILD
index 28c6c1e8f..1bc252caf 100644
--- a/kernels/linux-libre-grsec/PKGBUILD
+++ b/kernels/linux-libre-grsec/PKGBUILD
@@ -39,16 +39,14 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         '0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch'
         '0005-sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch'
         '0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch'
-        '0001-SUNRPC-Ensure-that-gss_auth-isn-t-freed-before-its-u.patch'
         '0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch'
-        '0001-quirk-asm_volatile_goto.patch'
         'i8042-fix-aliases.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz")
 md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1'
          '3659d30b1d06dd5b7874ae04c946863b'
          '0022d89a923e5e871ba53db1f969e46e'
-         'a2718a1b47c6c3b0774ce786488d22c3'
-         'cbe58a543b96ae282c674875b1940e59'
+         'c7dae5d3fbb294ea14e67915ac86a37a'
+         'd4b95575b9cc32b7ba4ad8624972ddf9'
          '5f66bed97a5c37e48eb2f71b2d354b9a'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
@@ -61,9 +59,7 @@ md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1'
          '10dbaf863e22b2437e68f9190d65c861'
          'd5907a721b97299f0685c583499f7820'
          'a724515b350b29c53f20e631c6cf9a14'
-         '1ae4ec847f41fa1b6d488f956e94c893'
          'e6fa278c092ad83780e2dd0568e24ca6'
-         '6baa312bc166681f48e972824f3f6649'
          '93dbf73af819b77f03453a9c6de2bb47'
          'ac92b702b8497d2be14f96e077a7f48f')
 if [ "$CARCH" != "mips64el" ]; then
@@ -116,18 +112,11 @@ prepare() {
   # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=23e66ba97127ff3b064d4c6c5138aa34eafc492f
   patch -p1 -i "${srcdir}/0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch"
 
-  # Fix FS#38921
-  # http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=9eb2ddb48ce3a7bd745c14a933112994647fa3cd
-  patch -p1 -i "${srcdir}/0001-SUNRPC-Ensure-that-gss_auth-isn-t-freed-before-its-u.patch"
-
   # Fix symbols: Revert http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=83460ec8dcac14142e7860a01fa59c267ac4657c
   patch -Rp1 -i "${srcdir}/0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch"
 
   # Fix i8042 aliases
   patch -p1 -i "${srcdir}/i8042-fix-aliases.patch"
-  # Fix compile issues
-  # http://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/patch/?id=a9f180345f5378ac87d80ed0bea55ba421d83859
-  patch -Np1 -i "${srcdir}/0001-quirk-asm_volatile_goto.patch"
 
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-grsec|" Makefile
diff --git a/kernels/linux-libre-grsec/config.i686 b/kernels/linux-libre-grsec/config.i686
index 3d48a9b03..5bbdedd4a 100644
--- a/kernels/linux-libre-grsec/config.i686
+++ b/kernels/linux-libre-grsec/config.i686
@@ -5874,7 +5874,9 @@ CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_JFFS2_FS_WRITEBUFFER=y
 # CONFIG_JFFS2_FS_WBUF_VERIFY is not set
 # CONFIG_JFFS2_SUMMARY is not set
-# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_ZLIB=y
 # CONFIG_JFFS2_LZO is not set
diff --git a/kernels/linux-libre-grsec/config.x86_64 b/kernels/linux-libre-grsec/config.x86_64
index 0269c67cc..f89860f78 100644
--- a/kernels/linux-libre-grsec/config.x86_64
+++ b/kernels/linux-libre-grsec/config.x86_64
@@ -5662,7 +5662,9 @@ CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_JFFS2_FS_WRITEBUFFER=y
 # CONFIG_JFFS2_FS_WBUF_VERIFY is not set
 # CONFIG_JFFS2_SUMMARY is not set
-# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_ZLIB=y
 # CONFIG_JFFS2_LZO is not set
diff --git a/kernels/linux-libre-knock/0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch b/kernels/linux-libre-knock/0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch
deleted file mode 100644
index 3f1bccc80..000000000
--- a/kernels/linux-libre-knock/0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 2def2ef2ae5f3990aabdbe8a755911902707d268 Mon Sep 17 00:00:00 2001
-From: PaX Team <pageexec@freemail.hu>
-Date: Thu, 30 Jan 2014 16:59:25 -0800
-Subject: [PATCH] x86, x32: Correct invalid use of user timespec in the kernel
-
-The x32 case for the recvmsg() timout handling is broken:
-
-  asmlinkage long compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg,
-                                      unsigned int vlen, unsigned int flags,
-                                      struct compat_timespec __user *timeout)
-  {
-          int datagrams;
-          struct timespec ktspec;
-
-          if (flags & MSG_CMSG_COMPAT)
-                  return -EINVAL;
-
-          if (COMPAT_USE_64BIT_TIME)
-                  return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
-                                        flags | MSG_CMSG_COMPAT,
-                                        (struct timespec *) timeout);
-          ...
-
-The timeout pointer parameter is provided by userland (hence the __user
-annotation) but for x32 syscalls it's simply cast to a kernel pointer
-and is passed to __sys_recvmmsg which will eventually directly
-dereference it for both reading and writing.  Other callers to
-__sys_recvmmsg properly copy from userland to the kernel first.
-
-The bug was introduced by commit ee4fa23c4bfc ("compat: Use
-COMPAT_USE_64BIT_TIME in net/compat.c") and should affect all kernels
-since 3.4 (and perhaps vendor kernels if they backported x32 support
-along with this code).
-
-Note that CONFIG_X86_X32_ABI gets enabled at build time and only if
-CONFIG_X86_X32 is enabled and ld can build x32 executables.
-
-Other uses of COMPAT_USE_64BIT_TIME seem fine.
-
-This addresses CVE-2014-0038.
-
-Signed-off-by: PaX Team <pageexec@freemail.hu>
-Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-Cc: <stable@vger.kernel.org> # v3.4+
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
- net/compat.c | 9 ++-------
- 1 file changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/net/compat.c b/net/compat.c
-index dd32e34..f50161f 100644
---- a/net/compat.c
-+++ b/net/compat.c
-@@ -780,21 +780,16 @@ asmlinkage long compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg,
- 	if (flags & MSG_CMSG_COMPAT)
- 		return -EINVAL;
- 
--	if (COMPAT_USE_64BIT_TIME)
--		return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
--				      flags | MSG_CMSG_COMPAT,
--				      (struct timespec *) timeout);
--
- 	if (timeout == NULL)
- 		return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
- 				      flags | MSG_CMSG_COMPAT, NULL);
- 
--	if (get_compat_timespec(&ktspec, timeout))
-+	if (compat_get_timespec(&ktspec, timeout))
- 		return -EFAULT;
- 
- 	datagrams = __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
- 				   flags | MSG_CMSG_COMPAT, &ktspec);
--	if (datagrams > 0 && put_compat_timespec(&ktspec, timeout))
-+	if (datagrams > 0 && compat_put_timespec(&ktspec, timeout))
- 		datagrams = -EFAULT;
- 
- 	return datagrams;
--- 
-1.8.5.3
-
diff --git a/kernels/linux-libre-knock/PKGBUILD b/kernels/linux-libre-knock/PKGBUILD
index 0ca9167b8..0184dc0f1 100644
--- a/kernels/linux-libre-knock/PKGBUILD
+++ b/kernels/linux-libre-knock/PKGBUILD
@@ -10,11 +10,11 @@
 pkgbase=linux-libre-knock   # Build stock -LIBRE-KNOCK kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.12
-_sublevel=9
+_sublevel=13
 _knockpatchver=${_basekernel}.4
 pkgver=${_basekernel}.${_sublevel}
-pkgrel=2
-_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver
+pkgrel=1
+_lxopkgver=${_basekernel}.12 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -38,10 +38,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch'
         'sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch'
         'rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch'
-        '0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz")
 md5sums=('254f59707b6676b59ce5ca5c3c698319'
-         '348975e36e4dd27f5d8fc50e92de8922'
+         'e2ec796847356b785cb06d0563f3f7d5'
          '387673a6510de1e1bce8188fc7a72bd1'
          '6eac169d20fd27b55815b0b2db4a473b'
          'f341bc4685a40dc409b144b0f44bb137'
@@ -57,8 +56,7 @@ md5sums=('254f59707b6676b59ce5ca5c3c698319'
          'cec0bb8981936eab2943b2009b7a6fff'
          '88d9cddf9e0050a76ec4674f264fb2a1'
          'cb9016630212ef07b168892fbcfd4e5d'
-         '336d2c4afd7ee5f2bdf0dcb1a54df4b2'
-         '9cdff00e5aa53962869857d64a1ccf01')
+         'a9a0ee57377ed6e55957f9671eead03a')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -107,9 +105,6 @@ prepare() {
 
   patch -Np1 -i "${srcdir}/rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch"
 
-  # Fix CVE-2014-0038
-  patch -p1 -i "${srcdir}/0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch"
-
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-knock|" Makefile
     sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index e74b26c45..4468b7832 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 103980 2014-01-14 12:52:23Z jgc $
+# $Id: PKGBUILD 106122 2014-02-23 15:32:14Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: BlackEagle <ike.devolder@gmail.com>
@@ -9,8 +9,8 @@
 
 _pkgname=clementine
 pkgname=clementine-libre
-pkgver=1.2.1
-pkgrel=2.1
+pkgver=1.2.2
+pkgrel=1
 pkgdesc="A music player and library organizer, without nonfree artwork and spotify support"
 url="http://www.clementine-player.org/"
 license=('GPL')
@@ -26,17 +26,19 @@ replaces=('clementine')
 conflicts=('clementine')
 provides=("clementine=$pkgver")
 install=clementine.install
-mksource=("http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz"
+mksource=("${_pkgname}-${pkgver}.tar.gz::https://github.com/clementine-player/Clementine/archive/${pkgver}.tar.gz"
           'remove-nonfree-artwork-and-spotify.patch'
           'moognu.png')
-source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-mksha256sums=('db556e8bf230e2535636f5736a62ffe24ce154481fb05123e8395ab4aa64654e'
-              '13c12cb47a9bb4585014512ebf2c9e81f8ab35afee255f35360acb0f388e21db'
+source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        "${_pkgname}-unistd.patch")
+mksha256sums=('1f674c42f05c476baf74f1dd37b1aa357ff9199e4493173052c856a53e5f0a96'
+              '48bfbf42c84ac1891021638627c10780194fcc59eda1c69e157be3aebe8ee10b'
               'c6918617769152f3617c61f721819e69d03f671b85760b11cfe45abd53955bc4')
-sha256sums=('c376dd2cc346ad1f9828d3731e2bfb03cd0b4d06ea2b23d4b2caaf9351812ec2')
+sha256sums=('02d799056435f244a319eea110672c404c8804a2418677253d5cdd4ea01a340f'
+            'bb02f82c3bcdad542396fc0788010321d618fc0545d34d00fee63bed987a0bbf')
 
 mksource() {
-  cd ${_pkgname}-${pkgver}
+  cd Clementine-${pkgver}
 
   # remove nonfree nonfree artwork and spotify references on files
   patch -Np1 -i ../remove-nonfree-artwork-and-spotify.patch
@@ -61,8 +63,14 @@ mksource() {
   touch data/schema/schema-30.sql  
 }
 
+prepare() {
+  cd Clementine-${pkgver}
+
+  patch -Np1 -i ../${_pkgname}-unistd.patch
+}
+
 build() {
-  cd ${_pkgname}-${pkgver}
+  cd Clementine-${pkgver}
 
   if [[ -d build ]]; then
     rm -rf build
@@ -74,7 +82,7 @@ build() {
 }
 
 package() {
-  cd ${_pkgname}-${pkgver}/build
+  cd Clementine-${pkgver}/build
 
   make DESTDIR="${pkgdir}" install
 }
diff --git a/libre/clementine-libre/clementine-unistd.patch b/libre/clementine-libre/clementine-unistd.patch
new file mode 100644
index 000000000..9bd053b60
--- /dev/null
+++ b/libre/clementine-libre/clementine-unistd.patch
@@ -0,0 +1,11 @@
+diff -rupN Clementine-1.2.2.orig/src/core/utilities.cpp Clementine-1.2.2/src/core/utilities.cpp
+--- Clementine-1.2.2.orig/src/core/utilities.cpp	2014-02-23 16:14:06.919406700 +0100
++++ Clementine-1.2.2/src/core/utilities.cpp	2014-02-23 16:16:12.107064900 +0100
+@@ -50,6 +50,7 @@
+ #endif
+ 
+ #ifdef Q_OS_LINUX
++#  include <unistd.h>
+ #  include <sys/syscall.h>
+ #endif
+ #ifdef Q_OS_DARWIN
diff --git a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
index 38bac21bf..8c1b9aafd 100644
--- a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
+++ b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
@@ -157,52 +157,6 @@ index e054619..3568a6f 100755
  
    for plugin in QT_PLUGINS:
      FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))
-diff --git a/dist/windows/clementine.nsi b/dist/windows/clementine.nsi
-index 038a60b..1d29a9e 100644
---- a/dist/windows/clementine.nsi
-+++ b/dist/windows/clementine.nsi
-@@ -97,9 +97,6 @@ Section "Delete old files" oldfiles
-   Delete "$INSTDIR\gstreamer-plugins\libgstqueue2.dll"
-   Delete "$INSTDIR\gstreamer-plugins\libgstsoup.dll"
- 
--  ; 1.0 prerelease
--  Delete "$INSTDIR\spotify.dll"
--
-   ; 1.0
-   Delete "$INSTDIR\libofa.dll"
-   Delete "$INSTDIR\gstreamer-plugins\libgstofa.dll"
-@@ -128,7 +125,6 @@ Section "Clementine" Clementine
-   File "avutil-51.dll"
-   File "clementine.exe"
-   File "clementine-tagreader.exe"
--  File "clementine-spotifyblob.exe"
-   File "clementine.ico"
-   File "glew32.dll"
-   File "intl.dll"
-@@ -181,7 +177,6 @@ Section "Clementine" Clementine
-   File "libqjson.dll"
-   File "libsoup-2.4-1.dll"
-   File "libspeex-1.dll"
--  File "libspotify.dll"
-   File "libstdc++-6.dll"
-   File "libtag.dll"
-   File "libtasn1-3.dll"
-@@ -939,7 +934,6 @@ Section "Uninstall"
-   Delete "$INSTDIR\clementine.ico"
-   Delete "$INSTDIR\clementine.exe"
-   Delete "$INSTDIR\clementine-tagreader.exe"
--  Delete "$INSTDIR\clementine-spotifyblob.exe"
-   Delete "$INSTDIR\glew32.dll"
-   Delete "$INSTDIR\intl.dll"
-   Delete "$INSTDIR\libcdio-14.dll"
-@@ -992,7 +986,6 @@ Section "Uninstall"
-   Delete "$INSTDIR\libqjson.dll"
-   Delete "$INSTDIR\libsoup-2.4-1.dll"
-   Delete "$INSTDIR\libspeex-1.dll"
--  Delete "$INSTDIR\libspotify.dll"
-   Delete "$INSTDIR\libstdc++-6.dll"
-   Delete "$INSTDIR\libtag.dll"
-   Delete "$INSTDIR\libtasn1-3.dll"
 diff --git a/dist/windows/clementine.nsi.in b/dist/windows/clementine.nsi.in
 index 750b332..6bf47ff 100644
 --- a/dist/windows/clementine.nsi.in
diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD
index a565c8421..6d883edd9 100644
--- a/libre/xbmc-libre/PKGBUILD
+++ b/libre/xbmc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 104515 2014-01-22 06:55:21Z spupykin $
+# $Id: PKGBUILD 106153 2014-02-24 09:49:46Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
@@ -11,8 +11,8 @@ _pkgname=xbmc
 pkgname=xbmc-libre
 pkgver=12.3
 _codename=Frodo
-pkgrel=8.1
-pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation"
+pkgrel=9
+pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation and without nonfree components"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
 license=('GPL' 'custom')
@@ -39,7 +39,7 @@ source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
 	"polkit.rules"
 	"libass.patch::https://bugs.archlinux.org/index.php?getfile=11285")
 md5sums=('7ae385ebf8e5cfcb917393235e6efbdb'
-         '8312d6d4ac5d7c3d9eed40ab08a17d3b'
+         '4d3cc17703a9a477a32db486c257a305'
          '02f7951824ee13103344f36009c0ef2a'
          '7fd6399d2ffbdf06b724f0cc2efa0784')
 
@@ -93,7 +93,8 @@ build() {
     --enable-libusb \
     --enable-libcec \
     --enable-external-libraries \
-    --enable-external-ffmpeg
+    --enable-external-ffmpeg \
+    --disable-non-free
   # Now (finally) build
   make
 }
@@ -121,7 +122,7 @@ package() {
   done
 
   install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service
-  install -Dm0644 $srcdir/polkit.rules $pkgdir/usr/share/polkit-1/rules.d/10-xbmc.rules
-  chmod 0700 $pkgdir/usr/share/polkit-1/rules.d/
+#  install -Dm0644 $srcdir/polkit.rules $pkgdir/usr/share/polkit-1/rules.d/10-xbmc.rules
+#  chmod 0700 $pkgdir/usr/share/polkit-1/rules.d/
 }
 # vim:set ts=2 sw=2 et:
diff --git a/libre/xbmc-libre/xbmc.install b/libre/xbmc-libre/xbmc.install
index 32626f28f..8076fe2d3 100644
--- a/libre/xbmc-libre/xbmc.install
+++ b/libre/xbmc-libre/xbmc.install
@@ -3,7 +3,8 @@ post_install() {
   [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
   getent group xbmc > /dev/null || groupadd -r xbmc
   getent passwd xbmc > /dev/null || useradd -r -m -d /var/lib/xbmc -g xbmc xbmc
-  usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc
+  usermod -a -G xbmc,audio,video,network,optical xbmc
+  mkdir -p var/lib/xbmc
   chown -R xbmc:xbmc var/lib/xbmc
 }
 
diff --git a/libre/xbmc-libre/xbmc.service b/libre/xbmc-libre/xbmc.service
index b6430e255..9987dfeb9 100644
--- a/libre/xbmc-libre/xbmc.service
+++ b/libre/xbmc-libre/xbmc.service
@@ -6,7 +6,7 @@ After = remote-fs.target
 User = xbmc
 Group = xbmc
 Type = simple
-ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp
+ExecStart = /usr/bin/xinit /usr/bin/dbus-launch /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp
 Restart = on-abort
 
 [Install]