Tue May 6 03:39:24 UTC 2014

42 files changed, 690 insertions, 226 deletions

diff --git a/community/amsynth/PKGBUILD b/community/amsynth/PKGBUILD
index 038fecfa2..1941e1876 100644
--- a/community/amsynth/PKGBUILD
+++ b/community/amsynth/PKGBUILD
@@ -3,17 +3,18 @@
 # Contributor: Alessio Biancalana <dottorblaster@gmail.com>
 
 pkgname=amsynth
-pkgver=1.4.1
+pkgver=1.4.2
 pkgrel=1
 pkgdesc="Analogue Modeling SYNTHesizer"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/$pkgname/"
 license=('GPL')
+groups=('dssi-plugins' 'lv2-plugins')
 depends=('gtkmm' 'jack' 'liblo' 'desktop-file-utils')
 makedepends=('dssi' 'ladspa')
 install="$pkgname.install"
 source=("http://downloads.sourceforge.net/project/amsynthe/amsynth-$pkgver.tar.gz")
-md5sums=('ea3815142cf2000572f40c64b21fd982')
+md5sums=('92aeadad41792e4dfedff5ab16a5cc5e')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/connman/PKGBUILD b/community/connman/PKGBUILD
index 33453e9b7..ece52e3b8 100644
--- a/community/connman/PKGBUILD
+++ b/community/connman/PKGBUILD
@@ -1,16 +1,15 @@
-#$Id: PKGBUILD 109454 2014-04-14 22:41:47Z dwallace $
+#$Id: PKGBUILD 110674 2014-05-04 22:17:22Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Lucas De Marchi <lucas.de.marchi@gmail.com>
 
 pkgname=connman
 pkgver=1.23
-pkgrel=1
+pkgrel=2
 pkgdesc="Wireless LAN network manager"
 url="http://connman.net/"
 arch=('i686' 'x86_64')
 license=('GPL2')
 depends=('dbus-core' 'iptables' 'gnutls' 'glib2')
-conflicts=('openresolv')
 optdepends=('bluez: Support for Bluetooth devices'
             'wpa_supplicant: For WiFi devices'
             'pptpclient: for ppp support')
diff --git a/community/fish/CVE-2014-2905.patch b/community/fish/CVE-2014-2905.patch
new file mode 100644
index 000000000..539a0c3bb
--- /dev/null
+++ b/community/fish/CVE-2014-2905.patch
@@ -0,0 +1,263 @@
+From 8412c867a501e3a68e55fef6215e86d3ac9f617b Mon Sep 17 00:00:00 2001
+From: David Adam <zanchey@ucc.gu.uwa.edu.au>
+Date: Sun, 20 Apr 2014 17:51:27 +0800
+Subject: [PATCH] Check effective credentials of socket peers
+
+Fix for CVE-2014-2905.
+
+Code for getpeereid() on non-BSD systems imported from the PostgreSQL
+project under a BSD-style license.
+---
+ configure.ac        |  4 +--
+ doc_src/license.hdr | 30 +++++++++++++++++++-
+ env_universal.cpp   |  9 ++++++
+ fallback.cpp        | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ fallback.h          |  4 +++
+ fishd.cpp           |  9 +++++-
+ osx/config.h        |  6 ++++
+ 7 files changed, 137 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ea7c592..bdfa5f0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -557,7 +557,7 @@ LIBS=$LIBS_COMMON
+ # Check presense of various header files
+ #
+ 
+-AC_CHECK_HEADERS([getopt.h termios.h sys/resource.h term.h ncurses/term.h ncurses.h curses.h stropts.h siginfo.h sys/select.h sys/ioctl.h execinfo.h spawn.h sys/sysctl.h])
++AC_CHECK_HEADERS([getopt.h termios.h sys/resource.h term.h ncurses/term.h ncurses.h curses.h stropts.h siginfo.h sys/select.h sys/ioctl.h execinfo.h spawn.h sys/sysctl.h sys/un.h sys/ucred.h ucred.h ])
+ 
+ if test x$local_gettext != xno; then
+   AC_CHECK_HEADERS([libintl.h])
+@@ -698,7 +698,7 @@ fi
+ AC_CHECK_FUNCS( wcsdup wcsndup wcslen wcscasecmp wcsncasecmp fwprintf )
+ AC_CHECK_FUNCS( futimes wcwidth wcswidth wcstok fputwc fgetwc )
+ AC_CHECK_FUNCS( wcstol wcslcat wcslcpy lrand48_r killpg )
+-AC_CHECK_FUNCS( backtrace backtrace_symbols sysconf getifaddrs )
++AC_CHECK_FUNCS( backtrace backtrace_symbols sysconf getifaddrs getpeerucred getpeereid )
+ 
+ if test x$local_gettext != xno; then
+   AC_CHECK_FUNCS( gettext dcgettext )
+diff --git a/doc_src/license.hdr b/doc_src/license.hdr
+index 64bab10..f292722 100644
+--- a/doc_src/license.hdr
++++ b/doc_src/license.hdr
+@@ -1400,6 +1400,34 @@ POSSIBILITY OF SUCH DAMAGES.
+ 
+ <P>
+ 
+-*/
++<hr>
++
++<h2>License for getpeereid</h2>
++
++\c fish contains code imported from the PostgreSQL project under
++license, namely the getpeereid fallback function. This code is copyrighted
++by:
++
++Portions Copyright (c) 1996-2014, PostgreSQL Global Development Group
++
++Portions Copyright (c) 1994, The Regents of the University of California
++
++Permission to use, copy, modify, and distribute this software and its
++documentation for any purpose, without fee, and without a written agreement
++is hereby granted, provided that the above copyright notice and this
++paragraph and the following two paragraphs appear in all copies.
++
++IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
++DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
++LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
++DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE
++POSSIBILITY OF SUCH DAMAGE.
++
++THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
++INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
++AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
++ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO
++PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ 
+ \htmlonly </div> \endhtmlonly
++*/
+diff --git a/env_universal.cpp b/env_universal.cpp
+index c7d060a..987f88b 100644
+--- a/env_universal.cpp
++++ b/env_universal.cpp
+@@ -88,6 +88,8 @@ static int try_get_socket_once(void)
+ 
+     wdir = path;
+     wuname = user;
++    uid_t seuid;
++    gid_t segid;
+ 
+     if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
+     {
+@@ -135,6 +137,13 @@ static int try_get_socket_once(void)
+         return -1;
+     }
+ 
++    if ((getpeereid(s, &seuid, &segid) != 0) || seuid != geteuid())
++    {
++        debug(1, L"Wrong credentials for socket %s at fd %d", name.c_str(), s);
++        close(s);
++        return -1;
++    }
++
+     if ((make_fd_nonblocking(s) != 0) || (fcntl(s, F_SETFD, FD_CLOEXEC) != 0))
+     {
+         wperror(L"fcntl");
+diff --git a/fallback.cpp b/fallback.cpp
+index 5e4b3e1..34db397 100644
+--- a/fallback.cpp
++++ b/fallback.cpp
+@@ -15,8 +15,9 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <sys/socket.h>
+ #include <sys/stat.h>
+-#include <unistd.h>
++#include <sys/param.h>
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <wchar.h>
+@@ -1521,3 +1522,80 @@ static int mk_wcswidth(const wchar_t *pwcs, size_t n)
+ }
+ 
+ #endif // HAVE_BROKEN_WCWIDTH
++
++#ifndef HAVE_GETPEEREID
++
++/*-------------------------------------------------------------------------
++ *
++ * getpeereid.c
++ *		get peer userid for UNIX-domain socket connection
++ *
++ * Portions Copyright (c) 1996-2014, PostgreSQL Global Development Group
++ *
++ *
++ * IDENTIFICATION
++ *	  src/port/getpeereid.c
++ *
++ *-------------------------------------------------------------------------
++ */
++
++#ifdef HAVE_SYS_UN_H
++#include <sys/un.h>
++#endif
++#ifdef HAVE_UCRED_H
++#include <ucred.h>
++#endif
++#ifdef HAVE_SYS_UCRED_H
++#include <sys/ucred.h>
++#endif
++
++/*
++ * BSD-style getpeereid() for platforms that lack it.
++ */
++int getpeereid(int sock, uid_t *uid, gid_t *gid)
++{
++#if defined(SO_PEERCRED)
++	/* Linux: use getsockopt(SO_PEERCRED) */
++	struct ucred peercred;
++	socklen_t so_len = sizeof(peercred);
++
++	if (getsockopt(sock, SOL_SOCKET, SO_PEERCRED, &peercred, &so_len) != 0 ||
++		so_len != sizeof(peercred))
++		return -1;
++	*uid = peercred.uid;
++	*gid = peercred.gid;
++	return 0;
++#elif defined(LOCAL_PEERCRED)
++	/* Debian with FreeBSD kernel: use getsockopt(LOCAL_PEERCRED) */
++	struct xucred peercred;
++	socklen_t * so_len = sizeof(peercred);
++
++	if (getsockopt(sock, 0, LOCAL_PEERCRED, &peercred, &so_len) != 0 ||
++		so_len != sizeof(peercred) ||
++		peercred.cr_version != XUCRED_VERSION)
++		return -1;
++	*uid = peercred.cr_uid;
++	*gid = peercred.cr_gid;
++	return 0;
++#elif defined(HAVE_GETPEERUCRED)
++	/* Solaris: use getpeerucred() */
++	ucred_t    *ucred;
++
++	ucred = NULL;				/* must be initialized to NULL */
++	if (getpeerucred(sock, &ucred) == -1)
++		return -1;
++
++	*uid = ucred_geteuid(ucred);
++	*gid = ucred_getegid(ucred);
++	ucred_free(ucred);
++
++	if (*uid == (uid_t) (-1) || *gid == (gid_t) (-1))
++		return -1;
++	return 0;
++#else
++	/* No implementation available on this platform */
++	errno = ENOSYS;
++	return -1;
++#endif
++}
++#endif // HAVE_GETPEEREID
+diff --git a/fallback.h b/fallback.h
+index eba91be..6898ea5 100644
+--- a/fallback.h
++++ b/fallback.h
+@@ -482,3 +482,7 @@ double nan(char *tagp);
+ 
+ 
+ #endif
++
++#ifndef HAVE_GETPEEREID
++int getpeereid(int sock, uid_t *uid, gid_t *gid);
++#endif
+diff --git a/fishd.cpp b/fishd.cpp
+index edb79c2..1e09524 100644
+--- a/fishd.cpp
++++ b/fishd.cpp
+@@ -880,6 +880,8 @@ int main(int argc, char ** argv)
+     int child_socket;
+     struct sockaddr_un remote;
+     socklen_t t;
++    uid_t sock_euid;
++    gid_t sock_egid;
+     int max_fd;
+     int update_count=0;
+ 
+@@ -1000,7 +1002,12 @@ int main(int argc, char ** argv)
+             {
+                 debug(4, L"Connected with new child on fd %d", child_socket);
+ 
+-                if (make_fd_nonblocking(child_socket) != 0)
++                if (((getpeereid(child_socket, &sock_euid, &sock_egid) != 0) || sock_euid != geteuid()))
++                {
++                    debug(1, L"Wrong credentials for child on fd %d", child_socket);
++                    close(child_socket);
++                }
++                else if (make_fd_nonblocking(child_socket) != 0)
+                 {
+                     wperror(L"fcntl");
+                     close(child_socket);
+diff --git a/osx/config.h b/osx/config.h
+index 4968a78..bc058ae 100644
+--- a/osx/config.h
++++ b/osx/config.h
+@@ -40,6 +40,12 @@
+ /* Define to 1 if you have the <getopt.h> header file. */
+ #define HAVE_GETOPT_H 1
+ 
++/* Define to 1 if you have the `getpeereid' function. */
++#define HAVE_GETPEEREID 1
++
++/* Define to 1 if you have the `getpeerucred' function. */
++/* #undef HAVE_GETPEERUCRED */
++
+ /* Define to 1 if you have the `gettext' function. */
+ /* #undef HAVE_GETTEXT */
+ 
+-- 
+1.9.1
+
diff --git a/community/fish/CVE-2014-2906.patch b/community/fish/CVE-2014-2906.patch
new file mode 100644
index 000000000..739eb71db
--- /dev/null
+++ b/community/fish/CVE-2014-2906.patch
@@ -0,0 +1,67 @@
+From c0989dce2d882c94eb3183e7b94402ba53534abb Mon Sep 17 00:00:00 2001
+From: David Adam <zanchey@ucc.gu.uwa.edu.au>
+Date: Sun, 20 Apr 2014 23:51:20 +0800
+Subject: [PATCH] use mktemp(1) to generate temporary file names
+
+Fix for CVE-2014-2906.
+
+Closes a race condition in funced which would allow execution of
+arbitrary code; closes a race condition in psub which would allow
+alternation of the data stream.
+
+Note that `psub -f` does not work (#1040); a fix should be committed
+separately for ease of maintenance.
+---
+ share/functions/funced.fish |  6 +-----
+ share/functions/psub.fish   | 11 +++--------
+ 2 files changed, 4 insertions(+), 13 deletions(-)
+
+diff --git a/share/functions/funced.fish b/share/functions/funced.fish
+index 3c2de06..ca2e277 100644
+--- a/share/functions/funced.fish
++++ b/share/functions/funced.fish
+@@ -81,11 +81,7 @@ function funced --description 'Edit function definition'
+         return 0
+     end
+ 
+-    set -q TMPDIR; or set -l TMPDIR /tmp
+-    set -l tmpname (printf "$TMPDIR/fish_funced_%d_%d.fish" %self (random))
+-    while test -f $tmpname
+-        set tmpname (printf "$TMPDIR/fish_funced_%d_%d.fish" %self (random))
+-    end
++    set tmpname (mktemp -t fish_funced.XXXXXXXXXX)
+ 
+     if functions -q -- $funcname
+         functions -- $funcname > $tmpname
+diff --git a/share/functions/psub.fish b/share/functions/psub.fish
+index 42e34c7..7877aa4 100644
+--- a/share/functions/psub.fish
++++ b/share/functions/psub.fish
+@@ -45,21 +45,16 @@ function psub --description "Read from stdin into a file and output the filename
+ 		return
+ 	end
+ 
+-	# Find unique file name for writing output to
+-	while true
+-		set filename /tmp/.psub.(echo %self).(random);
+-		if not test -e $filename
+-			break;
+-		end
+-	end
+-
+ 	if test use_fifo = 1
+ 		# Write output to pipe. This needs to be done in the background so
+ 		# that the command substitution exits without needing to wait for
+ 		# all the commands to exit
++                set dir (mktemp -d /tmp/.psub.XXXXXXXXXX); or return
++                set filename $dir/psub.fifo
+ 		mkfifo $filename
+ 		cat >$filename &
+ 	else
++                set filename (mktemp /tmp/.psub.XXXXXXXXXX)
+ 		cat >$filename
+ 	end
+ 
+-- 
+1.9.1
+
diff --git a/community/fish/PKGBUILD b/community/fish/PKGBUILD
index a538a3ca0..ff829d644 100644
--- a/community/fish/PKGBUILD
+++ b/community/fish/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 106894 2014-03-09 17:38:13Z bpiotrowski $
+# $Id: PKGBUILD 110716 2014-05-05 14:15:56Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
@@ -7,7 +7,7 @@
 
 pkgname=fish
 pkgver=2.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Smart and user friendly shell intended mostly for interactive use'
 arch=('i686' 'x86_64')
 url='http://fishshell.com/'
@@ -15,14 +15,24 @@ license=('GPL2')
 depends=('bc' 'gcc-libs' 'inetutils' 'ncurses')
 optdepends=('python: for manual page completion parser and web configuration tool')
 install=fish.install
-source=(http://fishshell.com/files/$pkgver/fish-$pkgver.tar.gz)
-md5sums=('3a29aebde522b8f52d9975d7423db99e')
+source=(http://fishshell.com/files/$pkgver/fish-$pkgver.tar.gz
+        CVE-2014-2905.patch
+        CVE-2014-2906.patch)
+md5sums=('3a29aebde522b8f52d9975d7423db99e'
+         '1e194b61bb7ec49e2e005383724037b7'
+         'cf0c216f528c9d9adac2aa5f8e9b716b')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../CVE-2014-2905.patch
+  patch -p1 -i ../CVE-2014-2906.patch
+  autoconf -f
+}
 
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --without-xsel
+    --sysconfdir=/etc
   make
 }
 
diff --git a/community/g2reverb/PKGBUILD b/community/g2reverb/PKGBUILD
new file mode 100644
index 000000000..c78895ef0
--- /dev/null
+++ b/community/g2reverb/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer : speps <speps at aur dot archlinux dot org>
+
+pkgname=g2reverb
+pkgver=0.7.1
+pkgrel=1
+pkgdesc="LADSPA stereo reverb plugin based on greverb"
+arch=('i686' 'x86_64')
+url="http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/"
+license=('GPL')
+groups=('ladspa-plugins')
+depends=('ladspa')
+source=("${url}../downloads/$pkgname-$pkgver.tar.bz2")
+md5sums=('072c2af1f0ed526be432ede7e7a529ae')
+
+build() {
+  cd $pkgname-$pkgver
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+
+  # plugin
+  install -Dm755 $pkgname.so \
+    "$pkgdir/usr/lib/ladspa/$pkgname.so"
+}
diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD
index 5c81fe1d0..28000d7eb 100644
--- a/community/lazarus/PKGBUILD
+++ b/community/lazarus/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 107590 2014-03-18 08:37:39Z spupykin $
+# $Id: PKGBUILD 110700 2014-05-05 09:48:16Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jens Adam (byte/jra) <j_adam@web.de>
 # Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 
 pkgbase=lazarus
 pkgname=('lazarus' 'lazarus-gtk2' 'lazarus-qt')
-pkgver=1.2
+pkgver=1.2.2
 _pkgsubver=0
-pkgrel=2
+pkgrel=1
 url='http://www.lazarus.freepascal.org/'
 license=('GPL2' 'MPL' 'custom:modifiedLGPL')
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ makedepends=('fpc' 'fpc-src' 'gtk2' 'qt4pas' 'rsync')
 options=('!emptydirs' '!makeflags')
 source=("http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-${_pkgsubver}.tar.gz"
 	'lazcontrols2.diff')
-md5sums=('f36e7182cf5a5d75a7157104d1370e0b'
+md5sums=('f6dccb86952906e60484ee46d2888838'
          '288bca6ad5ade79deec34c3602daaaa9')
 
 build() {
diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD
index 10e012434..817bed807 100644
--- a/community/libmicrohttpd/PKGBUILD
+++ b/community/libmicrohttpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 109027 2014-04-09 11:57:32Z spupykin $
+# $Id: PKGBUILD 110680 2014-05-05 09:14:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Norberto Lopes <shelika@mail.telepac.pt>
 # Contributor: Kao Dome <kaodome@gmail.com>
@@ -6,7 +6,7 @@
 # Contributor: Mathias Rohnstock <linksoft@gmx.de>
 
 pkgname=libmicrohttpd
-pkgver=0.9.34
+pkgver=0.9.35
 pkgrel=1
 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application."
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ depends=('gnutls' 'libgcrypt')
 optdepends=('file' 'curl')
 install=libmicrohttpd.install
 source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz)
-md5sums=('2947eee13c2c8affb95023a0cb6fda0c')
+md5sums=('a9d747b6666879569036bb791653a1c7')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index cba7eb63c..f457ffa6b 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 109400 2014-04-14 14:53:23Z spupykin $
+# $Id: PKGBUILD 110702 2014-05-05 09:50:23Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
-pkgver=1.2.3
-pkgrel=4
+pkgver=1.2.4
+pkgrel=1
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64')
 url="http://libvirt.org/"
@@ -62,7 +62,7 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
 	libvirtd.conf.d
 	libvirtd-guests.conf.d
 	libvirt.tmpfiles.d)
-md5sums=('ad1602a2fcc3609c83b885a28f3eecbd'
+md5sums=('da7a9ca519df45a460659189fe0024e6'
          '3ed0e24f5b5e25bf553f5427d64915e6'
          '0a96ed876ffb1fcb9dff5a9b3a609c1e'
          '020971887442ebbf1b6949e031c8dd3f')
diff --git a/community/openvswitch/PKGBUILD b/community/openvswitch/PKGBUILD
index 9cba87bd4..d7f88b1d0 100644
--- a/community/openvswitch/PKGBUILD
+++ b/community/openvswitch/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 110448 2014-04-30 09:59:12Z spupykin $
+# $Id: PKGBUILD 110682 2014-05-05 09:14:44Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Pedro Martinez-Julia (pedromj@um.es)
 # Contributor: Matt Monaco <net 0x01b dgbaley27>
 
 pkgname=openvswitch
-pkgver=2.1.1
+pkgver=2.1.2
 pkgrel=1
 pkgdesc="Production Quality, Multilayer Open Virtual Switch"
 url="http://openvswitch.org"
@@ -34,6 +34,11 @@ sha256sums=('43f228ac145f682a7c6681bae7b9bee004fcdd9d4a4503d87ca65c0e9fe1a04b'
             'e8dc21e50fc886bfd6aa55991bdb3cb66907e11b071045452bb12de01a3ecbd9'
             '5900728bca0292ec66e6da234eaa6f32f28ead6bda163d89a480eac08558c657'
             'c2cb5e2685240ea50b1aba4e77784f4dd66d157e7cd05a17853868aa8d8a2a45')
+sha256sums=('875429b052c4001815b6cb38616c7a6cb212df4bba74602164ee0a99b172079b'
+            '9d30ed859214f4cdeb6b6450d5c5defaf31f2c593c05201109df66fa9373ef0c'
+            'e8dc21e50fc886bfd6aa55991bdb3cb66907e11b071045452bb12de01a3ecbd9'
+            '5900728bca0292ec66e6da234eaa6f32f28ead6bda163d89a480eac08558c657'
+            'c2cb5e2685240ea50b1aba4e77784f4dd66d157e7cd05a17853868aa8d8a2a45')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/perl-curses/PKGBUILD b/community/perl-curses/PKGBUILD
index c501dc462..536f7cc29 100644
--- a/community/perl-curses/PKGBUILD
+++ b/community/perl-curses/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 109110 2014-04-10 13:24:43Z fyan $
+# $Id: PKGBUILD 110686 2014-05-05 09:15:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Charles Mauch <cmauch@gmail.com>
 # Contributor: Francois Charette <firmicus@gmx.net>
 
 pkgname=perl-curses
-pkgver=1.29
+pkgver=1.31
 pkgrel=1
 pkgdesc="Character screen handling and windowing"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('GPL' 'PerlArtistic')
 depends=('perl' 'ncurses')
 options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/G/GI/GIRAFFED/Curses-$pkgver.tgz)
-md5sums=('236de0209223e40b458c55e5250da2b3')
+md5sums=('119aff0faaa9347ed32dad127c4a6707')
 
 build() {
   cd  $srcdir/Curses-$pkgver
diff --git a/community/perl-datetime/PKGBUILD b/community/perl-datetime/PKGBUILD
index 1319045c0..e6b3320e4 100644
--- a/community/perl-datetime/PKGBUILD
+++ b/community/perl-datetime/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 107078 2014-03-12 10:56:22Z spupykin $
+# $Id: PKGBUILD 110688 2014-05-05 09:15:39Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: François Charette <firmicus ατ gmx δοτ net>
 
 pkgname=perl-datetime
-pkgver=1.08
+pkgver=1.09
 pkgrel=1
 pkgdesc="A complete, easy to use date and time object"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ LC_NUMERIC=C
 provides=("perl-datetime=`printf %.4f $pkgver`")
 options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-$pkgver.tar.gz)
-md5sums=('e928c3cdf31b7e39b2f7865f4037ce8b')
+md5sums=('5bd3b4145ea08df1af71f2e8979ca178')
 
 build() {
   cd  $srcdir/DateTime-$pkgver
diff --git a/community/python-msgpack/PKGBUILD b/community/python-msgpack/PKGBUILD
index ae85028e1..8b888b33c 100644
--- a/community/python-msgpack/PKGBUILD
+++ b/community/python-msgpack/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 108457 2014-03-27 14:47:55Z fyan $
+# $Id: PKGBUILD 110722 2014-05-05 21:10:57Z seblu $
 # Maintainer: Sébastien "Seblu" Luttringer
 
 pkgbase=python-msgpack
 pkgname=('python-msgpack' 'python2-msgpack')
-pkgver=0.4.1
-pkgrel=2
+pkgver=0.4.2
+pkgrel=1
 arch=('i686' 'x86_64')
 url='https://github.com/msgpack/msgpack-python'
 license=('Apache')
 makedepends=('cython' 'cython2' 'python-setuptools' 'python2-setuptools')
 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=('3ff478e75e783f4e69c1a8d5ca63dea4')
+md5sums=('e3a0fdfd864c72c958bb501d39b39caf')
 
 build() {
   cd msgpack-python-$pkgver
@@ -21,13 +21,13 @@ build() {
     sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \;
 }
 
-check() {
-  cd msgpack-python-$pkgver
-  msg2 'python'
-  PYTHONPATH=$PWD/build/python py.test test
-  msg2 'python2'
-  PYTHONPATH=$PWD/build/python2 py.test2 test
-}
+#check() {
+#  cd msgpack-python-$pkgver
+#  msg2 'python'
+#  PYTHONPATH=$PWD/build/python py.test test
+#  msg2 'python2'
+#  PYTHONPATH=$PWD/build/python2 py.test2 test
+#}
 
 package_python-msgpack() {
   pkgdesc='MessagePack serializer implementation for Python'
diff --git a/community/python-psutil/PKGBUILD b/community/python-psutil/PKGBUILD
index 43032b93f..e59b536d6 100644
--- a/community/python-psutil/PKGBUILD
+++ b/community/python-psutil/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 109232 2014-04-11 23:45:33Z seblu $
+# $Id: PKGBUILD 110728 2014-05-05 22:06:27Z seblu $
 # Maintainer: Sébastien Luttringer
 
 pkgbase=python-psutil
 pkgname=('python-psutil' 'python2-psutil')
-pkgver=2.1.0
+pkgver=2.1.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://code.google.com/p/psutil/'
@@ -11,7 +11,7 @@ license=('custom: BSD')
 makedepends=('python' 'python-setuptools' 'python2' 'python2-setuptools')
 checkdepends=('net-tools' 'procps-ng')
 source=("https://pypi.python.org/packages/source/p/psutil/psutil-$pkgver.tar.gz")
-md5sums=('ba1f51f4c8e2c74cba48cef70b8a5bec')
+md5sums=('72a6b15d589fab11f6ca245b775bc3c6')
 
 build() {
   cd psutil-$pkgver
@@ -25,19 +25,19 @@ build() {
     sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \;
 }
 
-#check() {
-#  cd psutil-$pkgver
-#
-#  msg2 python
-#  export PYTHONPATH="$PWD/build/python"
-#  #python test/test_psutil.py
-#  python test/test_memory_leaks.py
-#
-#  msg2 python2
-#  export PYTHONPATH="$PWD/build/python2"
-#  #python2 test/test_psutil.py
-#  python2 test/test_memory_leaks.py
-#}
+check() {
+  cd psutil-$pkgver
+
+  msg2 python
+  export PYTHONPATH="$PWD/build/python"
+  #python test/test_psutil.py
+  python test/test_memory_leaks.py
+
+  msg2 python2
+  export PYTHONPATH="$PWD/build/python2"
+  #python2 test/test_psutil.py
+  python2 test/test_memory_leaks.py
+}
 
 package_python-psutil() {
   pkgdesc='A cross-platform process and system utilities module for Python'
diff --git a/community/rev-plugins/PKGBUILD b/community/rev-plugins/PKGBUILD
index 83d6ee649..db44f1558 100644
--- a/community/rev-plugins/PKGBUILD
+++ b/community/rev-plugins/PKGBUILD
@@ -1,27 +1,27 @@
-# $Id: PKGBUILD 95493 2013-08-13 03:23:10Z speps $
+# $Id: PKGBUILD 110720 2014-05-05 19:45:33Z speps $
 # Maintainer : speps <speps at aur dot archlinux dot org>
 
 pkgname=rev-plugins
-pkgver=0.3.1
+pkgver=0.7.1
 pkgrel=1
-pkgdesc="LADSPA stereo reverb plugin based on greverb"
+pkgdesc="LADSPA stereo and ambisonic reverb plugin based on zita-rev1"
 arch=('i686' 'x86_64')
 url="http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/"
 license=('GPL')
 groups=('ladspa-plugins')
 depends=('ladspa')
 source=("${url}../downloads/REV-plugins-$pkgver.tar.bz2")
-md5sums=('bca920c2cbf5e33989e7cafab6fbaee4')
+md5sums=('9f0be0d26592f67ba5fe16102c6bc332')
 
 build() {
-  cd "$srcdir/REV-plugins-$pkgver"
+  cd REV-plugins-$pkgver
   make
 }
 
 package() {
-  cd "$srcdir/REV-plugins-$pkgver"
+  cd REV-plugins-$pkgver
 
   # plugin
-  install -Dm 755 g2reverb.so \
-    "$pkgdir/usr/lib/ladspa/g2reverb.so"
+  install -Dm755 zita-reverbs.so \
+    "$pkgdir/usr/lib/ladspa/zita-reverbs.so"
 }
diff --git a/community/rxvt-unicode/PKGBUILD b/community/rxvt-unicode/PKGBUILD
index 227014973..b1424c23a 100644
--- a/community/rxvt-unicode/PKGBUILD
+++ b/community/rxvt-unicode/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99594 2013-10-30 11:27:15Z seblu $
+# $Id: PKGBUILD 110724 2014-05-05 21:25:11Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgbase=rxvt-unicode
 pkgname=('rxvt-unicode' 'rxvt-unicode-terminfo')
-pkgver=9.19
+pkgver=9.20
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://software.schmorp.de/pkg/rxvt-unicode.html'
@@ -18,7 +18,7 @@ source=(
   'urxvtc.desktop'
   'urxvt-tabbed.desktop'
 )
-md5sums=('45ad197eb9b5a840c0f65e3a8131921c'
+md5sums=('4a5b823f08d21036f94a6c51e94d025b'
          'fec94dc986fa37ec380079d81de3e0b2'
          'fac55f0a8404c86dad3e702146762332'
          '8a5599197568c63720e282b9722a7990')
diff --git a/community/sniffit/PKGBUILD b/community/sniffit/PKGBUILD
index a117f5848..47effdc3d 100644
--- a/community/sniffit/PKGBUILD
+++ b/community/sniffit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 95658 2013-08-15 09:57:11Z spupykin $
+# $Id: PKGBUILD 110704 2014-05-05 09:50:50Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com>
 
 pkgname=sniffit
 pkgver=0.3.7.beta
-pkgrel=14
+pkgrel=15
 pkgdesc="Very good packet sniffer for unix with ncurses interactive mode"
 arch=('i686' 'x86_64')
 url="http://packages.ubuntu.com/source/sniffit"
@@ -33,7 +33,18 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}.${pkgver}"
-  install -d -m0755 -g root -o root ${pkgdir}/usr/{bin,share/licenses/${pkgname}}
-  install -D -m0744 -g root -o root sniffit ${pkgdir}/usr/bin/sniffit
-  install -D -m0644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}
+  install -dm0755 -g root -o root ${pkgdir}/usr/{bin,share/licenses/${pkgname}}
+  install -Dm0744 -g root -o root sniffit ${pkgdir}/usr/bin/sniffit
+  install -Dm0644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}
+
+  # docs
+  install -Dm0644 sniffit.5 $pkgdir/usr/share/man/man5/sniffit.5
+  install -Dm0644 sniffit.8 $pkgdir/usr/share/man/man8/sniffit.8
+
+  for i in BETA-TESTING PLUGIN-HOWTO README.FIRST sniffit-FAQ; do
+    install -Dm0644 $i $pkgdir/usr/share/doc/sniffit/$i
+  done
+  for i in dns_plugin.plug dummy_plugin.plug sample_config_file; do
+    install -Dm0644 $i $pkgdir/usr/share/doc/sniffit/examples/$i
+  done
 }
diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD
index 5ceb3f71a..a4835349a 100644
--- a/community/squid/PKGBUILD
+++ b/community/squid/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 110475 2014-04-30 16:04:37Z spupykin $
+# $Id: PKGBUILD 110696 2014-05-05 09:16:38Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Mark Coolen <mark.coolen@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 
 pkgname=squid
-pkgver=3.4.4.2
-pkgrel=2
+pkgver=3.4.5
+pkgrel=1
 pkgdesc='Full-featured Web proxy cache server'
 arch=('x86_64' 'i686')
 url='http://www.squid-cache.org'
@@ -21,18 +21,16 @@ source=("http://www.squid-cache.org/Versions/v3/3.4/$pkgname-$pkgver.tar.bz2"
         'squid.pam'
         'squid.cron'
         'squid.service'
-        'squid.tmpfiles'
-        "ssl.patch::http://bugs.squid-cache.org/attachment.cgi?id=3036")
-md5sums=('d9d4a3d414db60e687d99080fbc68d1e'
+        'squid.tmpfiles')
+md5sums=('b6bee84755c9bd08a119a386c26c9189'
          '270977cdd9b47ef44c0c427ab9034777'
          'a71425c4951f2e5b640d19e6a5048531'
          'ceeb57c69ebb165676219222f109a24e'
-         'd243da117c1aee03c0cc6052f023a380'
-         '4a21c881444707586095c4acc238eae6')
+         'd243da117c1aee03c0cc6052f023a380')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
-  patch -p0 <$srcdir/ssl.patch
+#  patch -p0 <$srcdir/ssl.patch
 }
 
 build() {
diff --git a/community/tinyserial/PKGBUILD b/community/tinyserial/PKGBUILD
new file mode 100644
index 000000000..e458ed875
--- /dev/null
+++ b/community/tinyserial/PKGBUILD
@@ -0,0 +1,24 @@
+# Maintainer: Anatol Pomozov
+# Contributor: Jens Adam (byte/jra) <jra@byte.cx>
+
+pkgname=tinyserial
+pkgver=20090305
+pkgrel=2
+pkgdesc="Small minicom replacement for accessing serial ports on Linux inspired by FreeBSD 'tip'"
+url="http://brokestream.com/tinyserial.html"
+license=(BSD)
+arch=(i686 x86_64)
+depends=(glibc)
+source=(http://brokestream.com/com.c)
+sha1sums=('720a3ec74eddd6799c0ca55ef50479a160a55b73')
+
+build() {
+  gcc $CFLAGS $LDFLAGS -o com com.c
+}
+
+package() {
+  install -D com "$pkgdir"/usr/bin/com
+
+  sed -n '16,36p' com.c > license.txt
+  install -Dm644 license.txt "$pkgdir"/usr/share/licenses/tinyserial/license.txt
+}
diff --git a/core/btrfs-progs/PKGBUILD b/core/btrfs-progs/PKGBUILD
index 3890c5c46..16443376e 100644
--- a/core/btrfs-progs/PKGBUILD
+++ b/core/btrfs-progs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 210214 2014-04-11 23:33:01Z seblu $
+# $Id: PKGBUILD 212061 2014-05-05 21:10:41Z seblu $
 # Maintainer: Sébastien "Seblu" Luttringer
 # Contributor: Tom Gundersen <teg@jklm.no>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=btrfs-progs
-pkgver=3.14
+pkgver=3.14.1
 pkgrel=1
 pkgdesc='Btrfs filesystem utilities'
 arch=('i686' 'x86_64')
diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD
index 0fcd10d11..a4a7c5afe 100644
--- a/core/lvm2/PKGBUILD
+++ b/core/lvm2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 210240 2014-04-12 17:56:22Z thomas $
+# $Id: PKGBUILD 212046 2014-05-05 07:44:24Z thomas $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
 pkgver=2.02.106
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://sourceware.org/lvm2/"
 license=('GPL2' 'LGPL2.1')
@@ -16,42 +16,47 @@ source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
         lvm2_hook
         sd-lvm2
         11-dm-initramfs.rules
-        lvm2.conf
-        dmeventd.service
-        dmeventd.socket
-        lvm-monitoring.service
-        lvmetad.service
-        lvmetad.socket)
+        lvm2-fix-pvscan-service.patch
+        lvm2-make-sockets-static.patch)
 sha1sums=('0943d1c401675dfdc2118b9ad4fd4d7fb50eaaff'
           'SKIP'
-          '76e83966d1bc84f9a1e30bcaff84b8b8fefbca0f'
+          'be3b7db02e76d31d4742dc853b2fa3f898368ff8'
           'ff0fdf0a3005a41acd4b36865056109effc3474b'
-          'ab1719813fd7e5f5b525b7f38e969d1f855d6083'
+          '86c18852409dc03f38bdd734ac3e7b54bed9c4ce'
           'f6a554eea9557c3c236df2943bb6e7e723945c41'
-          'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4'
-          '01782ce8e10718c1513e3906b126f30f682f5cab'
-          '1d56f47a81350ae37ffbf61ee036fe31f4c5d504'
-          'aad90fce0e12eda41d38571d8eb27c5d5a8c59ec'
-          'f857a4a63fcc604a981e56875edda91767d4f1bf'
-          'fcfc265e3b10294cc4b10949a342e9db4310b186')
+          'ec22d30fed5fb5ec836932b070ee65b34bbe875b'
+          'f9e96af741ef6d0b4bb3c302faa5f6b29f9ef04a')
 
 prepare() {
   cd LVM2.${pkgver}
   # enable lvmetad
   sed -i 's|use_lvmetad = 0|use_lvmetad = 1|' conf/example.conf.in
+  # fix pvscan@.service for initramfs
+  patch -p1 -i "${srcdir}/lvm2-fix-pvscan-service.patch"
+  # make systemd sockets static
+  patch -p1 -i "${srcdir}/lvm2-make-sockets-static.patch"
 }
 
 build() {
+  CONFIGUREOPTS="--prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin \
+      --with-udev-prefix=/usr --with-systemdsystemunitdir=/usr/lib/systemd/system \
+      --with-default-pid-dir=/run --with-default-dm-run-dir=/run --with-default-run-dir=/run/lvm \
+      --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \
+      --enable-udev_sync --enable-udev_rules --with-default-locking-dir=/run/lock/lvm \
+      --enable-lvmetad --with-thin=internal"
+
+  cp -a LVM2.${pkgver} LVM2-initramfs
+
   cd LVM2.${pkgver}
-  unset LDFLAGS
 
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin \
-    --with-udev-prefix=/usr --with-systemdsystemunitdir=/usr/lib/systemd/system \
-    --with-default-pid-dir=/run --with-default-dm-run-dir=/run --with-default-run-dir=/run/lvm \
-    --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \
-    --enable-udev_sync --enable-udev_rules --with-default-locking-dir=/run/lock/lvm \
-    --enable-lvmetad --with-thin=internal
+  ./configure $CONFIGUREOPTS --enable-udev-systemd-background-jobs
   make
+
+  # Build legacy udev rule for initramfs
+  cd ../LVM2-initramfs
+  ./configure $CONFIGUREOPTS --enable-udev-systemd-background-jobs=no
+  cd udev
+  make 69-dm-lvm-metad.rules  
 }
 
 package_device-mapper() {
@@ -64,10 +69,10 @@ package_device-mapper() {
   # extra udev rule for device-mapper in initramfs
   install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/usr/lib/initcpio/udev/11-dm-initramfs.rules"
   # Install dmeventd socket and service
-  install -D -m644 "${srcdir}/dmeventd.service" "${pkgdir}/usr/lib/systemd/system/dmeventd.service"
-  install -D -m644 "${srcdir}/dmeventd.socket" "${pkgdir}/usr/lib/systemd/system/dmeventd.socket"
+  make DESTDIR="${pkgdir}" install_systemd_units
+  rm -f "${pkgdir}/usr/lib/systemd/system/"{blk-availability.service,lvm2-*}
   install -d -m755 "${pkgdir}/usr/lib/systemd/system/sockets.target.wants"
-  ln -sf /usr/lib/systemd/system/dmeventd.socket "${pkgdir}/usr/lib/systemd/system/sockets.target.wants/dmeventd.socket"
+  ln -sf ../dm-event.socket "${pkgdir}/usr/lib/systemd/system/sockets.target.wants/dm-event.socket"
 }
 
 package_lvm2() {
@@ -89,11 +94,12 @@ package_lvm2() {
   install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/lvm2"
   install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2"
   install -D -m644 "${srcdir}/sd-lvm2" "${pkgdir}/usr/lib/initcpio/install/sd-lvm2"
+  # extra udev rule for lvmetad in non-systemd initramfs
+  install -D -m644 "${srcdir}/LVM2-initramfs/udev/69-dm-lvm-metad.rules" "${pkgdir}/usr/lib/initcpio/udev/69-dm-lvm-metad.rules"
   # systemd support
-  install -D -m644 "${srcdir}/lvm2.conf" "${pkgdir}/usr/lib/tmpfiles.d/lvm2.conf"
-  install -D -m644 "${srcdir}/lvm-monitoring.service" "${pkgdir}/usr/lib/systemd/system/lvm-monitoring.service"
-  install -D -m644 "${srcdir}/lvmetad.service" "${pkgdir}/usr/lib/systemd/system/lvmetad.service"
-  install -D -m644 "${srcdir}/lvmetad.socket" "${pkgdir}/usr/lib/systemd/system/lvmetad.socket"
+  make DESTDIR="${pkgdir}" install_systemd_units
+  rm -f "${pkgdir}/usr/lib/systemd/system/"dm-*
   install -d -m755 "${pkgdir}/usr/lib/systemd/system/sysinit.target.wants"
-  ln -sf /usr/lib/systemd/system/lvmetad.socket "${pkgdir}/usr/lib/systemd/system/sysinit.target.wants/lvmetad.socket"
+  ln -sf ../lvm2-lvmetad.socket "${pkgdir}/usr/lib/systemd/system/sysinit.target.wants/lvm2-lvmetad.socket"
+  make DESTDIR="${pkgdir}" install_systemd_generators
 }
diff --git a/core/lvm2/dmeventd.service b/core/lvm2/dmeventd.service
deleted file mode 100644
index e0b1b33d0..000000000
--- a/core/lvm2/dmeventd.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Device-mapper event daemon
-Documentation=man:dmeventd(8)
-Requires=dmeventd.socket
-After=dmeventd.socket
-DefaultDependencies=no
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/dmeventd
-ExecReload=/usr/bin/dmeventd -R
-Environment=SD_ACTIVATION=1
-PIDFile=/run/dmeventd.pid
-OOMScoreAdjust=-1000
diff --git a/core/lvm2/dmeventd.socket b/core/lvm2/dmeventd.socket
deleted file mode 100644
index 726d11236..000000000
--- a/core/lvm2/dmeventd.socket
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Device-mapper event daemon FIFOs
-Documentation=man:dmeventd(8)
-Before=sockets.target
-DefaultDependencies=no
-Conflicts=shutdown.target
-
-[Socket]
-ListenFIFO=/run/dmeventd-server
-ListenFIFO=/run/dmeventd-client
-SocketMode=0600
diff --git a/core/lvm2/lvm-monitoring.service b/core/lvm2/lvm-monitoring.service
deleted file mode 100644
index 14b2d1dee..000000000
--- a/core/lvm2/lvm-monitoring.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or progress polling
-Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8) man:vgchange(8)
-Requires=dmeventd.socket
-After=dmeventd.socket lvmetad.socket
-DefaultDependencies=no
-Conflicts=shutdown.target
-
-[Service]
-Type=oneshot
-Environment=LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES=1
-ExecStart=/usr/bin/lvm vgchange --monitor y
-ExecStop=/usr/bin/lvm vgchange --monitor n
-RemainAfterExit=yes
-
-[Install]
-WantedBy=sysinit.target
diff --git a/core/lvm2/lvm2-fix-pvscan-service.patch b/core/lvm2/lvm2-fix-pvscan-service.patch
new file mode 100644
index 000000000..e19e09084
--- /dev/null
+++ b/core/lvm2/lvm2-fix-pvscan-service.patch
@@ -0,0 +1,11 @@
+diff -Nur LVM2.2.02.106.orig/scripts/lvm2_pvscan_systemd_red_hat@.service.in LVM2.2.02.106/scripts/lvm2_pvscan_systemd_red_hat@.service.in
+--- LVM2.2.02.106.orig/scripts/lvm2_pvscan_systemd_red_hat@.service.in	2014-04-10 17:38:46.000000000 +0200
++++ LVM2.2.02.106/scripts/lvm2_pvscan_systemd_red_hat@.service.in	2014-04-26 14:14:27.472679661 +0200
+@@ -11,5 +11,5 @@
+ [Service]
+ Type=oneshot
+ RemainAfterExit=yes
+-ExecStart=@sbindir@/pvscan --cache --activate ay %i
+-ExecStop=@sbindir@/pvscan --cache %i
++ExecStart=@sbindir@/lvm pvscan --cache --activate ay %i
++ExecStop=@sbindir@/lvm pvscan --cache %i
diff --git a/core/lvm2/lvm2-make-sockets-static.patch b/core/lvm2/lvm2-make-sockets-static.patch
new file mode 100644
index 000000000..7291100a9
--- /dev/null
+++ b/core/lvm2/lvm2-make-sockets-static.patch
@@ -0,0 +1,20 @@
+diff -Nur LVM2.2.02.106.orig/scripts/dm_event_systemd_red_hat.socket.in LVM2.2.02.106/scripts/dm_event_systemd_red_hat.socket.in
+--- LVM2.2.02.106.orig/scripts/dm_event_systemd_red_hat.socket.in	2014-04-10 17:38:46.000000000 +0200
++++ LVM2.2.02.106/scripts/dm_event_systemd_red_hat.socket.in	2014-04-26 14:21:10.097269315 +0200
+@@ -7,6 +7,3 @@
+ ListenFIFO=@DEFAULT_DM_RUN_DIR@/dmeventd-server
+ ListenFIFO=@DEFAULT_DM_RUN_DIR@/dmeventd-client
+ SocketMode=0600
+-
+-[Install]
+-WantedBy=sockets.target
+diff -Nur LVM2.2.02.106.orig/scripts/lvm2_lvmetad_systemd_red_hat.socket.in LVM2.2.02.106/scripts/lvm2_lvmetad_systemd_red_hat.socket.in
+--- LVM2.2.02.106.orig/scripts/lvm2_lvmetad_systemd_red_hat.socket.in	2014-04-10 17:38:46.000000000 +0200
++++ LVM2.2.02.106/scripts/lvm2_lvmetad_systemd_red_hat.socket.in	2014-04-26 14:21:15.287156152 +0200
+@@ -6,6 +6,3 @@
+ [Socket]
+ ListenStream=@DEFAULT_RUN_DIR@/lvmetad.socket
+ SocketMode=0600
+-
+-[Install]
+-WantedBy=sockets.target
diff --git a/core/lvm2/lvm2.conf b/core/lvm2/lvm2.conf
deleted file mode 100644
index 129824552..000000000
--- a/core/lvm2/lvm2.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-d /run/lock/lvm 0755 root root -
-d /run/lvm 0755 root root -
diff --git a/core/lvm2/lvm2.install b/core/lvm2/lvm2.install
index 7faf708d4..e11834d44 100644
--- a/core/lvm2/lvm2.install
+++ b/core/lvm2/lvm2.install
@@ -11,6 +11,15 @@ post_upgrade() {
         echo "         into /etc/lvm/lvm.conf or LVM will fail to work."
     fi
   fi
+
+  if [ $(vercmp $2 2.02.106-2) -lt 0 ]; then
+    if [ -L /etc/systemd/system/sysinit.target.wants/lvm-monitoring.service ]; then
+      echo "rm /etc/systemd/system/sysinit.target.wants/lvm-monitoring.service"
+      rm /etc/systemd/system/sysinit.target.wants/lvm-monitoring.service
+      echo "ln -s /usr/lib/systemd/system/lvm2-monitor.service /etc/systemd/system/sysinit.target.wants/lvm2-monitor.service"
+      ln -s /usr/lib/systemd/system/lvm2-monitor.service /etc/systemd/system/sysinit.target.wants/lvm2-monitor.service
+    fi
+  fi
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/core/lvm2/lvm2_install b/core/lvm2/lvm2_install
index 6f3c1cb41..fd0a51075 100644
--- a/core/lvm2/lvm2_install
+++ b/core/lvm2/lvm2_install
@@ -13,7 +13,7 @@ build() {
     add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
     add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
     add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules"
-    add_file "/usr/lib/udev/rules.d/69-dm-lvm-metad.rules"
+    add_file "/usr/lib/initcpio/udev/69-dm-lvm-metad.rules" "/usr/lib/udev/rules.d/69-dm-lvm-metad.rules"
     add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
     add_file "/etc/lvm/lvm.conf"
 
diff --git a/core/lvm2/lvmetad.service b/core/lvm2/lvmetad.service
deleted file mode 100644
index 4be520a3b..000000000
--- a/core/lvm2/lvmetad.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=LVM2 metadata daemon
-Documentation=man:lvmetad(8)
-Requires=lvmetad.socket
-After=lvmetad.socket
-DefaultDependencies=no
-Conflicts=shutdown.target
-
-[Service]
-Type=forking
-NonBlocking=true
-ExecStart=/usr/bin/lvmetad
-ExecReload=/usr/bin/lvmetad -R
-Environment=SD_ACTIVATION=1
-Restart=on-abort
-PIDFile=/run/lvmetad.pid
diff --git a/core/lvm2/lvmetad.socket b/core/lvm2/lvmetad.socket
deleted file mode 100644
index 9c0ffa5b4..000000000
--- a/core/lvm2/lvmetad.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=LVM2 metadata daemon socket
-Documentation=man:lvmetad(8)
-Before=sockets.target systemd-udev-trigger.service
-DefaultDependencies=no
-Conflicts=shutdown.target
-
-[Socket]
-ListenStream=/run/lvm/lvmetad.socket
-SocketMode=0600
diff --git a/core/lvm2/sd-lvm2 b/core/lvm2/sd-lvm2
index 214b38c8e..e35e40cb6 100644
--- a/core/lvm2/sd-lvm2
+++ b/core/lvm2/sd-lvm2
@@ -17,9 +17,10 @@ build() {
     add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
     add_file "/etc/lvm/lvm.conf"
 
-    add_file "/usr/lib/systemd/system/lvmetad.service"
-    add_file "/usr/lib/systemd/system/lvmetad.socket"
-    add_symlink "/usr/lib/systemd/system/sysinit.target.wants/lvmetad.socket"
+    add_file "/usr/lib/systemd/system/lvm2-lvmetad.service"
+    add_file "/usr/lib/systemd/system/lvm2-lvmetad.socket"
+    add_file "/usr/lib/systemd/system/lvm2-pvscan@.service"
+    add_symlink "/usr/lib/systemd/system/sysinit.target.wants/lvm2-lvmetad.socket"
 }
 
 help() {
diff --git a/extra/baloo/PKGBUILD b/extra/baloo/PKGBUILD
index 8561c2ada..45b3b9f10 100644
--- a/extra/baloo/PKGBUILD
+++ b/extra/baloo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 211334 2014-04-18 18:01:21Z andrea $
+# $Id: PKGBUILD 212054 2014-05-05 17:50:18Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=baloo
 pkgver=4.13.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A framework for searching and managing metadata"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs/baloo'
@@ -11,18 +11,23 @@ license=('LGPL')
 depends=('kdepimlibs' 'xapian-core' 'kfilemetadata')
 makedepends=('cmake' 'automoc4' 'boost')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('ace3a80d3c0e3bb444ebe7f30392db791eab7c61')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
+        'krunner-crash.patch')
+sha1sums=('ace3a80d3c0e3bb444ebe7f30392db791eab7c61'
+          'fdb37257dca64531559fdc2ddf4730582b9a009c')
 
 prepare() {
   mkdir build
+
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/krunner-crash.patch
 }
 
 build() {
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr
+    -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
 
diff --git a/extra/baloo/krunner-crash.patch b/extra/baloo/krunner-crash.patch
new file mode 100644
index 000000000..733556d80
--- /dev/null
+++ b/extra/baloo/krunner-crash.patch
@@ -0,0 +1,35 @@
+commit 5bdb32928dc3eabf482676bb039104d1137cf1fb
+Author: Vishesh Handa <me@vhanda.in>
+Date:   Mon May 5 16:28:17 2014 +0200
+
+    XapianSearchStore: Split the string based on + * / - =
+    
+    When we receive a search string, we typically split it up by spaces and
+    dots. Then each sub string is checked, if it is <= 3 characters, we use
+    our own expansion scheme (imperfect) otherwise xapians.
+    
+    We need to use our own completion scheme because xapian's consumes too
+    much memory in the case of very few characters. It basically expands the
+    string to every possible completion result it has in its db, this
+    results in loads and loads of memory being consumed.
+    
+    We now split based on some extra characters so that when searching for
+    '2*2=' will not consume all your RAM in the case when your DB has many
+    words starting with 2.
+    
+    BUG: 332253
+    FIXED-IN: 4.13.1
+
+diff --git a/src/xapian/xapiansearchstore.cpp b/src/xapian/xapiansearchstore.cpp
+index a0529ce..1a59e3e 100644
+--- a/src/xapian/xapiansearchstore.cpp
++++ b/src/xapian/xapiansearchstore.cpp
+@@ -174,7 +174,7 @@ namespace {
+ Xapian::Query XapianSearchStore::constructSearchQuery(const QString& str)
+ {
+     QVector<Xapian::Query> queries;
+-    QRegExp splitRegex("[\\s.]");
++    QRegExp splitRegex("[\\s.+*/\\-=]");
+     QStringList list = str.split(splitRegex, QString::SkipEmptyParts);
+ 
+     QMutableListIterator<QString> iter(list);
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index 5edf28227..6bcb3e7b8 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 210158 2014-04-10 14:28:28Z bpiotrowski $
+# $Id: PKGBUILD 212060 2014-05-05 19:27:06Z 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.2.1
+pkgver=2.2.2
 pkgrel=1
 epoch=1
 pkgdesc='Complete and free Internet live audio and video broadcasting solution'
@@ -19,16 +19,9 @@ depends=(
       'v4l-utils' 'x264' 'xvidcore' 'zlib' 'x265'
       )
 makedepends=('libvdpau' 'yasm')
-source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2{,.asc}
-        0001-libx265-Support-API-version-9.patch)
-md5sums=('b8a1ee4964c2638f46fcc803ed453818'
-         'SKIP'
-         '4cbf9b13dc013e96be36445b4a2bfdac')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -p1 -i ../0001-libx265-Support-API-version-9.patch
-}
+source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2{,.asc})
+md5sums=('581affe5d820d89ce21fe3f0316ef2c3'
+         'SKIP')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD
index 455d46c10..349158527 100644
--- a/extra/gnome-settings-daemon/PKGBUILD
+++ b/extra/gnome-settings-daemon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 211870 2014-04-28 15:12:01Z jgc $
+# $Id: PKGBUILD 212051 2014-05-05 16:34:04Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-settings-daemon
-pkgver=3.12.1
-pkgrel=2
+pkgver=3.12.2
+pkgrel=1
 pkgdesc="The GNOME Settings daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -16,7 +16,7 @@ install=gnome-settings-daemon.install
 url="http://www.gnome.org"
 groups=('gnome')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('639df1fb978c765009d574d0fb892abbf35f1e875ba71e801cb0dd555a15f23c')
+sha256sums=('e887bd63c733febccb7f2c1453c075016342e223214fa9cfc60d90f1e16e080f')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libetpan/PKGBUILD b/extra/libetpan/PKGBUILD
index 68837699c..f94bf3632 100644
--- a/extra/libetpan/PKGBUILD
+++ b/extra/libetpan/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 211908 2014-04-29 12:38:45Z andyrtr $
+# $Id: PKGBUILD 212058 2014-05-05 19:13:40Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=libetpan
-pkgver=1.4.1
+pkgver=1.5
 pkgrel=1
 pkgdesc="A portable middleware for email access"
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ url="http://www.etpan.org/libetpan.html"
 license=("custom:etpan")
 depends=('libsasl' 'curl' 'expat')
 source=(https://github.com/dinhviethoa/${pkgname}/archive/${pkgver}.tar.gz)
-md5sums=('430a530a38d3bc6028b973a75d219891')
+md5sums=('f5a0ae8071937b31d0facc1f2d874ead')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/libkscreen/PKGBUILD b/extra/libkscreen/PKGBUILD
index a60163757..198df650d 100644
--- a/extra/libkscreen/PKGBUILD
+++ b/extra/libkscreen/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 199946 2013-11-20 08:45:12Z andrea $
+# $Id: PKGBUILD 212048 2014-05-05 12:13:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: birdflesh <antkoul at gmail dot com>
 
 pkgname=libkscreen
-pkgver=1.0.2
+pkgver=1.0.3
 pkgrel=1
 pkgdesc="KDE's screen management library"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('kdelibs' 'qjson')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-md5sums=('39f5316ef4f9203dd7a42180edbab122')
+md5sums=('7048db071d669193f8dafc9a1319998b')
 
 prepare() {
   mkdir build
diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD
index d27620468..2a31a43f2 100644
--- a/extra/sqlite/PKGBUILD
+++ b/extra/sqlite/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 209788 2014-04-04 08:57:39Z andyrtr $
+# $Id: PKGBUILD 212049 2014-05-05 12:26:57Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
@@ -8,7 +8,7 @@ _amalgamationver=3080403
 _docver=${_amalgamationver}
 #_docver=3080001
 pkgver=3.8.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A C library that implements an SQL database engine"
 arch=('i686' 'x86_64')
 license=('custom:Public Domain')
@@ -17,11 +17,19 @@ makedepends=('tcl' 'readline')
 source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA)
 	http://www.sqlite.org/2014/sqlite-autoconf-$_amalgamationver.tar.gz
 	http://www.sqlite.org/2014/sqlite-doc-${_docver}.zip
-	license.txt)
+	license.txt
+	sqlite-nautilus.patch)
 options=('!emptydirs')
 sha1sums=('70f3b100fa22e5bfebfe1b0a2102612e3c6c53fb'
           'ce8615799a9da7fc9d2cbcd2774d77da4ba72417'
-          'f34f6daa4ab3073d74e774aad21d66878cf26853')
+          'f34f6daa4ab3073d74e774aad21d66878cf26853'
+          '4e9a4f80c91bbaf80f0f45b9b97fb1cbe3464bc7')
+
+prepare() {
+  cd "$srcdir"/sqlite-autoconf-$_amalgamationver
+  # https://bugs.archlinux.org/task/39861
+  patch -Np1 -i ${srcdir}/sqlite-nautilus.patch
+}
 
 build() {
   export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE"
diff --git a/extra/sqlite/sqlite-nautilus.patch b/extra/sqlite/sqlite-nautilus.patch
new file mode 100644
index 000000000..046b1acfa
--- /dev/null
+++ b/extra/sqlite/sqlite-nautilus.patch
@@ -0,0 +1,41 @@
+Upstream fix for the issue that caused nautilus to crash.
+RHBZ: #1075889
+
+--- src/sqlite3.c
++++ src/sqlite3.c
+@@ -4855,18 +4855,10 @@
+   ** rowid appears in the ORDER BY clause, the corresponding WhereLoop is
+   ** automatically order-distinct.
+   */
+ 
+   assert( pOrderBy!=0 );
+-
+-  /* Sortability of virtual tables is determined by the xBestIndex method
+-  ** of the virtual table itself */
+-  if( pLast->wsFlags & WHERE_VIRTUALTABLE ){
+-    testcase( nLoop>0 );  /* True when outer loops are one-row and match 
+-                          ** no ORDER BY terms */
+-    return pLast->u.vtab.isOrdered;
+-  }
+   if( nLoop && OptimizationDisabled(db, SQLITE_OrderByIdxJoin) ) return 0;
+ 
+   nOrderBy = pOrderBy->nExpr;
+   testcase( nOrderBy==BMS-1 );
+   if( nOrderBy>BMS-1 ) return 0;  /* Cannot optimize overly large ORDER BYs */
+@@ -4875,11 +4867,14 @@
+   orderDistinctMask = 0;
+   ready = 0;
+   for(iLoop=0; isOrderDistinct && obSat<obDone && iLoop<=nLoop; iLoop++){
+     if( iLoop>0 ) ready |= pLoop->maskSelf;
+     pLoop = iLoop<nLoop ? pPath->aLoop[iLoop] : pLast;
+-    assert( (pLoop->wsFlags & WHERE_VIRTUALTABLE)==0 );
++    if( pLoop->wsFlags & WHERE_VIRTUALTABLE ){
++      if( pLoop->u.vtab.isOrdered ) obSat = obDone;
++      break;
++    }
+     iCur = pWInfo->pTabList->a[pLoop->iTab].iCursor;
+ 
+     /* Mark off any ORDER BY term X that is a column in the table of
+     ** the current loop for which there is term in the WHERE
+     ** clause of the form X IS NULL or X=? that reference only outer
+
diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD
index 64c79168c..85ad11050 100644
--- a/extra/totem/PKGBUILD
+++ b/extra/totem/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 210536 2014-04-14 20:07:33Z jgc $
+# $Id: PKGBUILD 212056 2014-05-05 18:59:54Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=totem
-pkgver=3.12.0
+pkgver=3.12.1
 pkgrel=1
 pkgdesc="GNOME3 movie player based on GStreamer"
 url="http://www.gnome.org"
@@ -28,7 +28,7 @@ conflicts=(totem-plugin)
 replaces=(totem-plugin)
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         browser-plugins.ini bugreport.patch)
-sha256sums=('96762a1c2026f7bbc6ef8a431cf7626647e54ac2d195eb573a71d62dc3a2c430'
+sha256sums=('dd168cdd4051d01131d47c24fa45bfd08b6ccf45900ac4b64bae47f6f47a35e3'
             'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e'
             '30481dab7e21b66257e3238f5a8b708e1a5c4797d7da904f7ebaba4c2c2ef167')
 
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index 2436be818..82c8de005 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -6,8 +6,8 @@
 pkgbase=vim
 pkgname=('vim' 'gvim' 'vim-runtime')
 _topver=7.4
-_patchlevel=214
-__hgrev=d2ef98a43b5d
+_patchlevel=274
+__hgrev=075eea398fff
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
 pkgrel=1
@@ -20,7 +20,7 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz"
         'vimrc'
         'archlinux.vim'
         'gvim.desktop')
-md5sums=('5ec7d7f84955dacfef88e52ebc79b267'
+md5sums=('98bf9f8d57b95715d08fcc42beae8761'
          'SKIP'
          'b9d4dcb9d3ee2e151dc4be1e94934f6a'
          '10353a61aadc3f276692d0e17db1478e'