Wed Feb 15 20:35:25 UTC 2012

40 files changed, 1540 insertions, 95 deletions

diff --git a/community-staging/libvirt/PKGBUILD b/community-staging/libvirt/PKGBUILD
new file mode 100644
index 000000000..f5f73cd0e
--- /dev/null
+++ b/community-staging/libvirt/PKGBUILD
@@ -0,0 +1,88 @@
+# $Id: PKGBUILD 64468 2012-02-14 07:05:10Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Jonathan Wiersma <archaur at jonw dot org>
+
+pkgname=libvirt
+pkgver=0.9.10
+pkgrel=1
+pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
+arch=('i686' 'x86_64')
+url="http://libvirt.org/"
+license=('LGPL')
+depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2'
+	 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap'
+	 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs'
+	 'iproute2' 'netcf' 'libnl1')
+makedepends=('pkgconfig' 'lvm2')
+optdepends=('bridge-utils: for briged networking (default)'
+	    'dnsmasq: for NAT/DHCP for guests'
+	    'kvm'
+	    'openbsd-netcat: for remote management over ssh'
+	    'qemu'
+	    'radvd'
+	    'dmidecode')
+options=('emptydirs' '!libtool')
+backup=('etc/conf.d/libvirtd'
+	'etc/conf.d/libvirtd-guests'
+	'etc/libvirt/libvirtd.conf'
+	'etc/libvirt/libvirt.conf'
+	'etc/libvirt/qemu.conf'
+	'etc/sasl2/libvirt.conf')
+install="libvirt.install"
+source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
+	libvirtd.rc.d
+	libvirtd.conf.d
+	libvirtd-guests.rc.d
+	libvirtd-guests.conf.d
+	openbsd-netcat-default.patch
+	unixperms.patch
+	yajl-2.x.patch)
+md5sums=('a424bb793521e637349da47e93dd5fff'
+         'c43244c40a0437038c82089618e7beaa'
+         '3ed0e24f5b5e25bf553f5427d64915e6'
+         '737ec24aa56871fbabfa892789457db4'
+         'bc2971dacdbac967fc3474e50affc345'
+         'b0be50eb9dfe4d133decf23b60880f7d'
+         'db95aecdf2ccf3693fef5821cdcb7eba'
+         '5745bb8d0b254abb7a3528c66e03b0f9')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # python2 fix
+  export PYTHON=`which python2`
+  for file in $(find . -name '*.py' -print); do
+    sed -i 's_#!.*/usr/bin/python_#!/usr/bin/python2_' $file
+    sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
+  done
+
+#  for more information on authentication see http://libvirt.org/auth.html
+#  If you wish to have unix-permissions based access rather than only polkit
+#  access, create a group called libvirt and uncomment the line below:
+#  patch -Np1 -i "$srcdir"/unixperms.patch
+
+  [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch
+
+  # fixes for yajl 2.0 API changes
+#  [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir/yajl-2.x.patch"
+
+  export LDFLAGS=-lX11
+  [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \
+	--with-storage-lvm --without-xen --with-udev --without-hal --disable-static
+  find -name Makefile -exec sed -i 's#-L /usr#-L/usr#' {} \;
+  make -j1
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  install -D -m755 "$srcdir"/libvirtd.rc.d "$pkgdir"/etc/rc.d/libvirtd
+  install -D -m644 "$srcdir"/libvirtd.conf.d "$pkgdir"/etc/conf.d/libvirtd
+
+  install -D -m755 "$srcdir"/libvirtd-guests.rc.d "$pkgdir"/etc/rc.d/libvirtd-guests
+  install -D -m644 "$srcdir"/libvirtd-guests.conf.d "$pkgdir"/etc/conf.d/libvirtd-guests
+
+  rm -rf $pkgdir/var/run
+}
diff --git a/community-staging/libvirt/libvirt.install b/community-staging/libvirt/libvirt.install
new file mode 100644
index 000000000..3881386d2
--- /dev/null
+++ b/community-staging/libvirt/libvirt.install
@@ -0,0 +1,38 @@
+_libvirt_setup() {
+  rm -f /usr/lib/python?.?/site-packages/libvirt.pyc
+  echo ">>> To use libvirt as a non-root user:"
+  echo ">>>  Use polkit to grant access."
+  echo ">>>  ...or change the access model in /etc/libvirt/libvirtd.conf."
+  echo ">>>     (see unixperms.patch in PKGBUILD for help)"
+  echo ""
+}
+
+post_install() {
+  _libvirt_setup || return 1
+  echo ">>> Be sure to see optdepends as you may find some of them helpfull."
+  echo ">>>  Especially: bridge-utils, dnsmasq, and hal."
+  echo ""
+  echo ">>> To start libvirtd run: '/etc/rc.d/libvirtd start' as root."
+  echo ">>> Add 'libvirtd' to daemons in /etc/rc.conf if you want it to load upon"
+  echo ">>>  booting."
+  echo ""
+  /bin/true
+}
+
+post_upgrade() {
+  _libvirt_setup || return 1
+  echo ">>> To finish the upgrade, restart libvirtd by running the command:"
+  echo ">>>  '/etc/rc.d/libvirtd restart' as root or rebooting."
+  echo ">>> You may also need to run 'rm -rf ~/.libvirt'"
+  echo ""
+  /bin/true
+}
+
+post_remove() {
+   rm -f /usr/lib/python[0-9].[0-9]/site-packages/libvirt.pyc
+   echo ">>> You may wish to delete the group 'libvirt' if it still exists."
+   echo ">>>  It can be removed by running 'groupdel libvirt' as root."
+   echo ""
+   depmod -a
+   /bin/true
+}
diff --git a/community-staging/libvirt/libvirtd-guests.conf.d b/community-staging/libvirt/libvirtd-guests.conf.d
new file mode 100644
index 000000000..02a933715
--- /dev/null
+++ b/community-staging/libvirt/libvirtd-guests.conf.d
@@ -0,0 +1,11 @@
+LIBVIRTD_STOP_ACTION=suspend
+
+#LIBVIRTD_URI="-c qemu+ssh://user@host/system"
+LIBVIRTD_URI=""
+
+#LIBVIRTD_BYPASS_CACHE="--bypass-cache"
+LIBVIRTD_BYPASS_CACHE=""
+
+LIBVIRTD_START_DELAY=0
+
+LIBVIRTD_SHUTDOWN_TIMEOUT=3
diff --git a/community-staging/libvirt/libvirtd-guests.rc.d b/community-staging/libvirt/libvirtd-guests.rc.d
new file mode 100644
index 000000000..b4331964a
--- /dev/null
+++ b/community-staging/libvirt/libvirtd-guests.rc.d
@@ -0,0 +1,107 @@
+#!/bin/bash
+
+. /etc/conf.d/libvirtd-guests
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+LIBVIRTD_LISTFILE="/var/state/libvirtd/vm-list"
+
+# get guest state by name
+libvirt_get_guest_state()
+{
+	virsh $LIBVIRTD_URI dominfo "$1" | grep -E '^State:' | awk '{print $2}'
+}
+
+# list IDs of running guests
+libvirt_list()
+{
+	virsh $LIBVIRTD_URI list | awk 'NR > 2 {print $2}'
+}
+
+# suspend guest by name
+libvirt_suspend()
+{
+	virsh $LIBVIRTD_URI $LIBVIRTD_BYPASS_CACHE managedsave "$1" >/dev/null
+	timeout=$LIBVIRTD_SHUTDOWN_TIMEOUT
+	while [ "$timeout" -gt 0 ]; do
+		sleep 1
+		timeout=$((timeout - 1))
+		state=`libvirt_get_guest_state "$1"`
+		[ "x$state" == "xshut" ] && return 0
+	done
+	return 1
+}
+
+# shutdown guest by name
+libvirt_shutdown()
+{
+	virsh $LIBVIRTD_URI shutdown "$1" >/dev/null
+	timeout=$LIBVIRTD_SHUTDOWN_TIMEOUT
+	while [ "$timeout" -gt 0 ]; do
+		sleep 1
+		timeout=$((timeout - 1))
+		state=`libvirt_get_guest_state "$1"`
+		[ "x$state" != "xshut" ] && return 0
+	done
+	return 1
+}
+
+# start guest by name
+libvirt_start()
+{
+	virsh $LIBVIRTD_URI $LIBVIRTD_BYPASS_CACHE start "$1" >/dev/null
+}
+
+# stop all guests
+libvirt_stop_all()
+{
+	mkdir -p `dirname $LIBVIRTD_LISTFILE`
+	echo -n >$LIBVIRTD_LISTFILE
+	for i in `libvirt_list`; do
+		if [ "x$LIBVIRTD_STOP_ACTION" == "xsuspend" ]; then
+			stat_busy "Suspending libvirtd/$i guest"
+			libvirt_suspend "$i"
+		else
+			stat_busy "Shutting libvirtd/$i guest down"
+			libvirt_shutdown "$i"
+		fi
+		[ $? -eq 0 ] && stat_done || stat_fail
+		echo $i >>$LIBVIRTD_LISTFILE
+	done
+}
+
+# start all guests
+libvirt_start_all()
+{
+	if [ -f $LIBVIRTD_LISTFILE ]; then
+		for i in `cat $LIBVIRTD_LISTFILE`; do
+			stat_busy "Starting/resuming libvirtd/$i guest"
+			libvirt_start "$i"
+			[ $? -eq 0 ] && { sleep $LIBVIRTD_START_DELAY; stat_done; } || stat_fail
+		done
+	fi
+	rm -f $LIBVIRTD_LISTFILE
+}
+
+# main
+LC_ALL=C
+LANG=C
+case "$1" in
+    start)
+		libvirt_start_all
+		add_daemon libvirtd-guests
+	;;
+    stop)
+		libvirt_stop_all
+		rm_daemon libvirtd-guests
+	;;
+    restart)
+	$0 stop
+	sleep 1
+	$0 start
+	;;
+    *)
+        echo $"Usage: $0 {start|stop|restart}"
+        ;;
+esac
+exit 0
diff --git a/community-staging/libvirt/libvirtd.conf.d b/community-staging/libvirt/libvirtd.conf.d
new file mode 100644
index 000000000..d4d25b47a
--- /dev/null
+++ b/community-staging/libvirt/libvirtd.conf.d
@@ -0,0 +1,3 @@
+LIBVIRTD_CONFIG="/etc/libvirt/libvirtd.conf"
+LIBVIRTD_ARGS="-p /var/run/libvirtd.pid"
+KRB5_KTNAME="/etc/libvirt/krb5.tab"
diff --git a/community-staging/libvirt/libvirtd.rc.d b/community-staging/libvirt/libvirtd.rc.d
new file mode 100644
index 000000000..193bffa9c
--- /dev/null
+++ b/community-staging/libvirt/libvirtd.rc.d
@@ -0,0 +1,66 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/conf.d/libvirtd
+. /etc/rc.d/functions
+
+LIBVIRTD_CONFIG_ARGS=
+if [ -n "$LIBVIRTD_CONFIG" ]
+then
+	LIBVIRTD_CONFIG_ARGS="--config $LIBVIRTD_CONFIG"
+fi
+
+PID=`pidof -o %PPID /usr/sbin/libvirtd`
+case "$1" in
+    start)
+	stat_busy "Starting libvirtd"
+	export RADVD=/usr/sbin/radvd
+	for i in /var/run/libvirt/qemu /var/run/libvirt/lxc /var/run/libvirt/uml /var/run/libvirt/network; do
+		[ -d $i ] || mkdir -p $i
+	done
+	[ -z "$PID" ] && (
+		mkdir -p /var/{cache,run}/libvirt
+		rm -rf /var/cache/libvirt/*
+		KRB5_KTNAME=$KRB5_KTNAME \
+			/usr/sbin/libvirtd --daemon $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS
+	)
+	if [ $? -gt 0 ]; then
+		stat_fail
+	else
+		add_daemon libvirtd
+		stat_done
+	fi
+	;;
+    stop)
+	stat_busy "Stopping libvirtd"
+	[ ! -z "$PID" ]  && (
+		kill $PID &> /dev/null
+		rm -rf /var/cache/libvirt/*
+		rm -f /var/run/libvirtd.pid
+	)
+	if [ $? -gt 0 ]; then
+		stat_fail
+	else
+		rm_daemon libvirtd
+		stat_done
+	fi
+	;;
+    restart)
+	$0 stop
+	sleep 1
+	$0 start
+	;;
+    reload)
+	stat_busy "Reloading libvirtd configuration"
+	[ ! -z "$PID" ]  && kill -HUP $PID &> /dev/null
+	if [ $? -gt 0 ]; then
+		stat_fail
+	else
+		stat_done
+	fi
+	;;
+    *)
+        echo $"Usage: $0 {start|stop|restart|reload}"
+        ;;
+esac
+exit 0
diff --git a/community-staging/libvirt/openbsd-netcat-default.patch b/community-staging/libvirt/openbsd-netcat-default.patch
new file mode 100644
index 000000000..a01b4f14e
--- /dev/null
+++ b/community-staging/libvirt/openbsd-netcat-default.patch
@@ -0,0 +1,36 @@
+diff -wbBur libvirt-0.9.7/src/qemu/qemu_migration.c libvirt-0.9.7.my/src/qemu/qemu_migration.c
+--- libvirt-0.9.7/src/qemu/qemu_migration.c	2011-10-31 07:46:04.000000000 +0400
++++ libvirt-0.9.7.my/src/qemu/qemu_migration.c	2011-11-08 15:46:10.000000000 +0400
+@@ -1589,7 +1589,7 @@
+                                            spec->dest.unix_socket.file);
+         } else {
+             const char *args[] = {
+-                "nc", "-U", spec->dest.unix_socket.file, NULL
++                "nc.openbsd", "-U", spec->dest.unix_socket.file, NULL
+             };
+             ret = qemuMonitorMigrateToCommand(priv->mon, migrate_flags, args);
+         }
+diff -wbBur libvirt-0.9.7/src/remote/remote_driver.c libvirt-0.9.7.my/src/remote/remote_driver.c
+--- libvirt-0.9.7/src/remote/remote_driver.c	2011-11-08 07:53:30.000000000 +0400
++++ libvirt-0.9.7.my/src/remote/remote_driver.c	2011-11-08 15:46:10.000000000 +0400
+@@ -614,7 +614,7 @@
+                                                 username,
+                                                 !tty,
+                                                 !verify,
+-                                                netcat ? netcat : "nc",
++                                                netcat ? netcat : "nc.openbsd",
+                                                 keyfile,
+                                                 sockname)))
+             goto failed;
+diff -wbBur libvirt-0.9.7/src/rpc/virnetsocket.c libvirt-0.9.7.my/src/rpc/virnetsocket.c
+--- libvirt-0.9.7/src/rpc/virnetsocket.c	2011-11-08 07:53:30.000000000 +0400
++++ libvirt-0.9.7.my/src/rpc/virnetsocket.c	2011-11-08 15:46:31.000000000 +0400
+@@ -642,7 +642,7 @@
+         virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL);
+ 
+     if (!netcat)
+-        netcat = "nc";
++        netcat = "nc.openbsd";
+ 
+     virCommandAddArgList(cmd, nodename, "sh", "-c", NULL);
+ 
diff --git a/community-staging/libvirt/unixperms.patch b/community-staging/libvirt/unixperms.patch
new file mode 100644
index 000000000..b3fb86cf5
--- /dev/null
+++ b/community-staging/libvirt/unixperms.patch
@@ -0,0 +1,47 @@
+diff -ur libvirt-0.7.4-orig/daemon/libvirtd.conf libvirt-0.7.4-patched/daemon/libvirtd.conf
+--- libvirt-0.7.4-orig/daemon/libvirtd.conf	2009-11-23 03:10:33.398655655 -0800
++++ libvirt-0.7.4-patched/daemon/libvirtd.conf	2009-11-23 03:09:37.831189671 -0800
+@@ -78,14 +78,14 @@
+ # without becoming root.
+ #
+ # This is restricted to 'root' by default.
+-#unix_sock_group = "libvirt"
++unix_sock_group = "libvirt"
+ 
+ # Set the UNIX socket permissions for the R/O socket. This is used
+ # for monitoring VM status only
+ #
+ # Default allows any user. If setting group ownership may want to
+ # restrict this to:
+-#unix_sock_ro_perms = "0777"
++unix_sock_ro_perms = "0770"
+ 
+ # Set the UNIX socket permissions for the R/W socket. This is used
+ # for full management of VMs
+@@ -95,7 +95,7 @@
+ #
+ # If not using PolicyKit and setting group ownership for access
+ # control then you may want to relax this to:
+-#unix_sock_rw_perms = "0770"
++unix_sock_rw_perms = "0770"
+ 
+ # Set the name of the directory in which sockets will be found/created.
+ #unix_sock_dir = "/var/run/libvirt"
+@@ -126,7 +126,7 @@
+ #
+ # To restrict monitoring of domains you may wish to enable
+ # an authentication mechanism here
+-#auth_unix_ro = "none"
++auth_unix_ro = "none"
+ 
+ # Set an authentication scheme for UNIX read-write sockets
+ # By default socket permissions only allow root. If PolicyKit
+@@ -135,7 +135,7 @@
+ #
+ # If the unix_sock_rw_perms are changed you may wish to enable
+ # an authentication mechanism here
+-#auth_unix_rw = "none"
++auth_unix_rw = "none"
+ 
+ # Change the authentication scheme for TCP sockets.
+ #
diff --git a/community-staging/libvirt/yajl-2.x.patch b/community-staging/libvirt/yajl-2.x.patch
new file mode 100644
index 000000000..80d3edce0
--- /dev/null
+++ b/community-staging/libvirt/yajl-2.x.patch
@@ -0,0 +1,66 @@
+--- a/src/util/json.c	2011-03-24 03:10:26.000000000 -0400
++++ b/src/util/json.c	2011-04-25 20:01:29.354939116 -0400
+@@ -709,7 +709,7 @@
+ 
+ static int virJSONParserHandleNumber(void * ctx,
+                                      const char * s,
+-                                     unsigned int l)
++                                     size_t l)
+ {
+     virJSONParserPtr parser = ctx;
+     char *str = strndup(s, l);
+@@ -735,7 +735,7 @@
+ 
+ static int virJSONParserHandleString(void * ctx,
+                                      const unsigned char * stringVal,
+-                                     unsigned int stringLen)
++                                     size_t stringLen)
+ {
+     virJSONParserPtr parser = ctx;
+     virJSONValuePtr value = virJSONValueNewStringLen((const char *)stringVal,
+@@ -756,7 +756,7 @@
+ 
+ static int virJSONParserHandleMapKey(void * ctx,
+                                      const unsigned char * stringVal,
+-                                     unsigned int stringLen)
++                                     size_t stringLen)
+ {
+     virJSONParserPtr parser = ctx;
+     virJSONParserStatePtr state;
+@@ -894,14 +894,14 @@
+ /* XXX add an incremental streaming parser - yajl trivially supports it */
+ virJSONValuePtr virJSONValueFromString(const char *jsonstring)
+ {
+-    yajl_parser_config cfg = { 1, 1 };
+     yajl_handle hand;
+     virJSONParser parser = { NULL, NULL, 0 };
+     virJSONValuePtr ret = NULL;
+ 
+     VIR_DEBUG("string=%s", jsonstring);
+ 
+-    hand = yajl_alloc(&parserCallbacks, &cfg, NULL, &parser);
++    hand = yajl_alloc(&parserCallbacks, NULL, &parser);
++    yajl_config(hand, yajl_allow_comments, 1);
+ 
+     if (yajl_parse(hand,
+                    (const unsigned char *)jsonstring,
+@@ -1002,15 +1002,16 @@
+ 
+ char *virJSONValueToString(virJSONValuePtr object)
+ {
+-    yajl_gen_config conf = { 0, " " }; /* Turns off pretty printing since QEMU can't cope */
+     yajl_gen g;
+     const unsigned char *str;
+     char *ret = NULL;
+-    unsigned int len;
++    size_t len;
+ 
+     VIR_DEBUG("object=%p", object);
+ 
+-    g = yajl_gen_alloc(&conf, NULL);
++    g = yajl_gen_alloc(NULL);
++    yajl_gen_config(g, yajl_gen_beautify, 0);
++    yajl_gen_config(g, yajl_gen_indent_string, " ");
+ 
+     if (virJSONValueToStringOne(object, g) < 0) {
+         virReportOOMError();
diff --git a/community-staging/netcf/PKGBUILD b/community-staging/netcf/PKGBUILD
new file mode 100644
index 000000000..cf8d6f053
--- /dev/null
+++ b/community-staging/netcf/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 64466 2012-02-14 06:53:16Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Aurélien Wailly <aurelien.wailly@gmail.com>
+
+pkgname=netcf
+pkgver=0.1.7
+pkgrel=3
+pkgdesc="A library for configuring network interfaces"
+arch=('i686' 'x86_64')
+license=('LGPL')
+url="https://fedorahosted.org/netcf/"
+depends=('augeas>=0.7.4' 'netcfg' 'libxslt' 'libxml2' 'libnl1')
+makedepends=('gcc')
+options=(!libtool)
+source=("https://fedorahosted.org/released/netcf/$pkgname-$pkgver.tar.gz"
+        netcf-0.1.7.patch)
+md5sums=('8e313b623c907eb035cf3948b71fecc2'
+         '0e88ee6813219e9e75a943444fe439f5')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/netcf-0.1.7.patch
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR=${pkgdir} install
+}
diff --git a/community-staging/netcf/netcf-0.1.7.patch b/community-staging/netcf/netcf-0.1.7.patch
new file mode 100644
index 000000000..d4a4d31b7
--- /dev/null
+++ b/community-staging/netcf/netcf-0.1.7.patch
@@ -0,0 +1,426 @@
+diff -ur netcf-0.1.7.ori//data/xml/initscripts-get.xsl netcf-0.1.7/data/xml/initscripts-get.xsl
+--- netcf-0.1.7.ori//data/xml/initscripts-get.xsl	2009-10-04 08:18:41.000000000 +0200
++++ netcf-0.1.7/data/xml/initscripts-get.xsl	2010-12-08 14:54:28.891813397 +0100
+@@ -47,9 +47,12 @@
+   <xsl:template name="vlan-interface-common">
+     <xsl:variable name="iface" select="concat(vlan/interface/@name, '.', vlan/@tag)"/>
+ 
+-    <xsl:attribute name="path">/files/etc/sysconfig/network-scripts/ifcfg-<xsl:value-of select="$iface"/></xsl:attribute>
+-    <node label="DEVICE" value="{$iface}"/>
+-    <node label="VLAN" value="yes"/>
++    <xsl:attribute name="path">/files/etc/network.d/ifcfg-<xsl:value-of select="$iface"/></xsl:attribute>
++    <node label="INTERFACE" value="{$iface}"/>
++    <node label="PHYS_INTERFACE" value="{vlan/interface/@name}"/>
++    <node label="VLAN" value="{vlan/@tag}"/>
++    <node label="CONNECTION" value="ethernet-iproute-vlan"/>
++    <node label="FLAG" value="false"/>
+   </xsl:template>
+ 
+   <xsl:template name='bare-vlan-interface'>
+@@ -68,6 +71,7 @@
+       <xsl:call-template name="startmode"/>
+       <xsl:call-template name="mtu"/>
+       <node label="TYPE" value="Bridge"/>
++      <node label="CONNECTION" value="bridge"/>
+       <xsl:call-template name="interface-addressing"/>
+       <xsl:if test="bridge/@stp">
+         <node label="STP" value="{bridge/@stp}"/>
+@@ -75,7 +79,11 @@
+       <xsl:if test="bridge/@delay">
+         <node label="DELAY" value="{bridge/@delay}"/>
+       </xsl:if>
++      <node label="DHCP_TIMEOUT" value="0"/>
++    <!--
++    We don't have to define interfaces separately
+     </tree>
++    
+     <xsl:for-each select='bridge/interface'>
+       <tree>
+         <xsl:if test="@type = 'ethernet'">
+@@ -87,12 +95,29 @@
+         <xsl:if test="@type = 'bond'">
+           <xsl:call-template name="bare-bond-interface"/>
+         </xsl:if>
++
++        BRIDGE_INTERFACES= is defined with all interfaces
+         <node label="BRIDGE" value="{../../@name}"/>
++
++        <xsl:variable name="bridgeifaces" select="concat($bridgeifaces, '.', @name)"/>
+       </tree>
+       <xsl:if test="@type = 'bond'">
+         <xsl:call-template name="bond-slaves"/>
+       </xsl:if>
+     </xsl:for-each>
++    -->
++    <!-- <xsl:if test="count(ip) > 1"> -->
++    <node label="BRIDGE_INTERFACES">
++    <xsl:attribute name="value">
++      <xsl:text></xsl:text>
++      <xsl:for-each select="bridge/interface">
++        <xsl:value-of select="@name"/><xsl:value-of select="string(' ')"/>
++      </xsl:for-each>
++      <xsl:text></xsl:text>
++    </xsl:attribute>
++    </node>
++    <!-- </xsl:if> -->
++    </tree>
+   </xsl:template>
+ 
+   <!--
+@@ -138,8 +163,8 @@
+        Named templates, following the Relax NG syntax
+   -->
+   <xsl:template name="name-attr">
+-    <xsl:attribute name="path">/files/etc/sysconfig/network-scripts/ifcfg-<xsl:value-of select="@name"/></xsl:attribute>
+-    <node label="DEVICE" value="{@name}"/>
++    <xsl:attribute name="path">/files/etc/network.d/ifcfg-<xsl:value-of select="@name"/></xsl:attribute>
++    <node label="INTERFACE" value="{@name}"/>
+   </xsl:template>
+ 
+   <xsl:template name="mtu">
+@@ -153,6 +178,7 @@
+     <xsl:if test="mac">
+       <node label="HWADDR" value="{mac/@address}"/>
+     </xsl:if>
++    <node label="CONNECTION" value="{@type}"/>
+     <xsl:call-template name="startmode"/>
+     <xsl:call-template name="mtu"/>
+   </xsl:template>
+@@ -184,14 +210,14 @@
+   <xsl:template name="protocol-ipv4">
+     <xsl:choose>
+       <xsl:when test="dhcp">
+-        <node label="BOOTPROTO" value="dhcp"/>
++        <node label="IP" value="dhcp"/>
+         <xsl:if test="dhcp/@peerdns">
+           <node label="PEERDNS" value="{dhcp/@peerdns}"/>
+         </xsl:if>
+       </xsl:when>
+       <xsl:when test="ip">
+-        <node label="BOOTPROTO" value="none"/>
+-        <node label="IPADDR" value="{ip/@address}"/>
++        <node label="IP" value="static"/>
++        <node label="ADDR" value="{ip/@address}"/>
+         <xsl:if test="ip/@prefix">
+           <node label="NETMASK" value="{ipcalc:netmask(ip/@prefix)}"/>
+         </xsl:if>
+diff -ur netcf-0.1.7.ori//data/xml/initscripts-put.xsl netcf-0.1.7/data/xml/initscripts-put.xsl
+--- netcf-0.1.7.ori//data/xml/initscripts-put.xsl	2009-10-04 08:18:41.000000000 +0200
++++ netcf-0.1.7/data/xml/initscripts-put.xsl	2010-11-26 10:44:46.133757628 +0100
+@@ -47,7 +47,7 @@
+   </xsl:template>
+ 
+   <xsl:template name="bare-vlan-interface">
+-    <xsl:variable name="name" select="node[@label = 'DEVICE']/@value"/>
++    <xsl:variable name="name" select="node[@label = 'INTERFACE']/@value"/>
+     <interface type="vlan">
+       <xsl:call-template name="name-attr"/>
+       <xsl:call-template name="vlan-device"/>
+@@ -55,7 +55,7 @@
+   </xsl:template>
+ 
+   <xsl:template name="vlan-device">
+-    <xsl:variable name="name" select="node[@label = 'DEVICE']/@value"/>
++    <xsl:variable name="name" select="node[@label = 'INTERFACE']/@value"/>
+     <xsl:variable name="device" select="substring-before($name, '.')"/>
+     <xsl:variable name="tag" select="substring-after($name, '.')"/>
+     <vlan tag="{$tag}">
+@@ -70,7 +70,7 @@
+                 match="tree[node[@label = 'TYPE' and @value = 'Bridge']]">
+     <interface type="bridge">
+       <!-- the bridge node itself -->
+-      <xsl:variable name="iface" select="node[@label= 'DEVICE']/@value"/>
++      <xsl:variable name="iface" select="node[@label= 'INTERFACE']/@value"/>
+       <xsl:call-template name="name-attr"/>
+       <xsl:call-template name="startmode"/>
+       <xsl:call-template name="mtu"/>
+@@ -101,17 +101,17 @@
+       Bond
+   -->
+   <xsl:template name="bond-element">
+-    <xsl:variable name="iface" select="node[@label= 'DEVICE']/@value"/>
++    <xsl:variable name="iface" select="node[@label= 'INTERFACE']/@value"/>
+     <bond>
+       <xsl:variable name="opts" select="node[@label = 'BONDING_OPTS']/@value"/>
+       <xsl:call-template name="bonding-opts">
+         <xsl:with-param name="opts" select="$opts"/>
+       </xsl:call-template>
+       <xsl:variable name="primary" select="bond:option($opts, 'primary')"/>
+-      <xsl:for-each select="/descendant-or-self::*[node[@label = 'MASTER' and @value = $iface]][node[@label = 'DEVICE' and @value = $primary]]">
++      <xsl:for-each select="/descendant-or-self::*[node[@label = 'MASTER' and @value = $iface]][node[@label = 'INTERFACE' and @value = $primary]]">
+         <xsl:call-template name='bare-ethernet-interface'/>
+       </xsl:for-each>
+-      <xsl:for-each select="/descendant-or-self::*[node[@label = 'MASTER' and @value = $iface]][node[@label = 'DEVICE' and @value != $primary]]">
++      <xsl:for-each select="/descendant-or-self::*[node[@label = 'MASTER' and @value = $iface]][node[@label = 'INTERFACE' and @value != $primary]]">
+         <xsl:call-template name='bare-ethernet-interface'/>
+       </xsl:for-each>
+     </bond>
+@@ -125,7 +125,7 @@
+   </xsl:template>
+ 
+   <xsl:template name="bond-interface"
+-                match="tree[node[@label = 'DEVICE'][@value = //tree/node[@label = 'MASTER']/@value]][count(node[@label = 'BRIDGE']) = 0]">
++                match="tree[node[@label = 'INTERFACE'][@value = //tree/node[@label = 'MASTER']/@value]][count(node[@label = 'BRIDGE']) = 0]">
+     <interface type="bond">
+       <xsl:call-template name="name-attr"/>
+       <xsl:call-template name="startmode"/>
+@@ -154,7 +154,7 @@
+ 
+   <xsl:template name="name-attr">
+     <xsl:attribute name="name">
+-      <xsl:value-of select="node[@label= 'DEVICE']/@value"/>
++      <xsl:value-of select="node[@label= 'INTERFACE']/@value"/>
+     </xsl:attribute>
+   </xsl:template>
+ 
+@@ -173,7 +173,7 @@
+     <xsl:variable name="uses_dhcp"
+                   select="node[@label = 'BOOTPROTO']/@value = 'dhcp'"/>
+     <xsl:variable name="uses_static"
+-                  select="count(node[@label = 'IPADDR']) > 0"/>
++                  select="count(node[@label = 'ADDR']) > 0"/>
+     <xsl:variable name="uses_ipv4" select="$uses_dhcp or $uses_static"/>
+     <xsl:if test="$uses_ipv4">
+     <protocol family="ipv4">
+@@ -186,7 +186,7 @@
+           </dhcp>
+         </xsl:when>
+         <xsl:when test="$uses_static">
+-          <ip address="{node[@label = 'IPADDR']/@value}">
++          <ip address="{node[@label = 'ADDR']/@value}">
+             <xsl:choose>
+               <xsl:when test="node[@label = 'PREFIX']">
+                 <xsl:attribute name="prefix"><xsl:value-of select="node[@label = 'PREFIX']/@value"/></xsl:attribute>
+diff -ur netcf-0.1.7.ori//src/drv_initscripts.c netcf-0.1.7/src/drv_initscripts.c
+--- netcf-0.1.7.ori//src/drv_initscripts.c	2010-09-23 14:13:13.000000000 +0200
++++ netcf-0.1.7/src/drv_initscripts.c	2010-12-08 13:57:02.027361706 +0100
+@@ -49,17 +49,20 @@
+ #include <libexslt/exslt.h>
+ 
+ static const char *const network_scripts_path =
+-    "/files/etc/sysconfig/network-scripts";
++    //"/files/etc/sysconfig/network-scripts";
++    "/files/etc/network.d/*";
+ 
+ static const char *const ifcfg_path =
+-    "/files/etc/sysconfig/network-scripts/*";
++    //"/files/etc/sysconfig/network-scripts/*";
++    "/files/etc/network.d/*";
+ 
+ /* Augeas should only load the files we are interested in */
+ static const struct augeas_pv augeas_xfm_common_pv[] = {
+     /* Ifcfg files */
+     { "/augeas/load/Ifcfg/lens", "Sysconfig.lns" },
+     { "/augeas/load/Ifcfg/incl",
+-      "/etc/sysconfig/network-scripts/ifcfg-*" },
++      "/etc/network.d/ifcfg-*" },
++      //"/etc/sysconfig/network-scripts/ifcfg-*" },
+     { "/augeas/load/Ifcfg/excl[1]", "*~" },
+     { "/augeas/load/Ifcfg/excl[2]", "*.bak" },
+     { "/augeas/load/Ifcfg/excl[3]", "*.orig" },
+@@ -107,10 +110,10 @@
+     int nmatches;
+ 
+     nmatches = aug_fmt_match(ncf, NULL,
+-                             "%s[ DEVICE = '%s'"
++                             "%s[ INTERFACE = '%s'"
+                              "    or BRIDGE = '%s'"
+                              "    or MASTER = '%s'"
+-                             "    or MASTER = ../*[BRIDGE = '%s']/DEVICE ]/DEVICE",
++                             "    or MASTER = ../*[BRIDGE = '%s']/INTERFACE ]/INTERFACE",
+                              ifcfg_path, name, name, name, name);
+     return nmatches > 0;
+ }
+@@ -173,7 +176,7 @@
+     aug = get_augeas(ncf);
+     ERR_BAIL(ncf);
+ 
+-    ndevs = aug_fmt_match(ncf, &devs, "%s[DEVICE = '%s']",
++    ndevs = aug_fmt_match(ncf, &devs, "%s[INTERFACE = '%s']",
+                           ifcfg_path, name);
+     ERR_COND_BAIL(ndevs < 0, ncf, EOTHER);
+ 
+@@ -296,7 +299,8 @@
+     int result = 0, ndevs;
+     char **devs = NULL;
+ 
+-    ndevs = aug_fmt_match(ncf, &devs, "%s/DEVICE", ifcfg_path);
++    ndevs = aug_fmt_match(ncf, &devs, "%s/INTERFACE", ifcfg_path);
++    printf("%i\n", ndevs);
+     ERR_COND_BAIL(ndevs < 0, ncf, EOTHER);
+ 
+     result = uniq_ifcfg_paths(ncf, ndevs, devs, intf);
+@@ -453,11 +457,11 @@
+ 
+ int drv_list_interfaces(struct netcf *ncf, int maxnames, char **names,
+         unsigned int flags) {
+-    return list_interface_ids(ncf, maxnames, names, flags, "DEVICE");
++    return list_interface_ids(ncf, maxnames, names, flags, "INTERFACE");
+ }
+ 
+ int drv_num_of_interfaces(struct netcf *ncf, unsigned int flags) {
+-    return list_interface_ids(ncf, 0, NULL, flags, "DEVICE");
++    return list_interface_ids(ncf, 0, NULL, flags, "INTERFACE");
+ }
+ 
+ struct netcf_if *drv_lookup_by_name(struct netcf *ncf, const char *name) {
+@@ -599,8 +603,8 @@
+ 
+     ncf = nif->ncf;
+     ndevs = aug_fmt_match(ncf, &devs,
+-              "%s[ DEVICE = '%s' or BRIDGE = '%s' or MASTER = '%s'"
+-              "    or MASTER = ../*[BRIDGE = '%s']/DEVICE ]/DEVICE",
++              "%s[ INTERFACE = '%s' or BRIDGE = '%s' or MASTER = '%s'"
++              "    or MASTER = ../*[BRIDGE = '%s']/INTERFACE ]/INTERFACE",
+               ifcfg_path, nif->name, nif->name, nif->name, nif->name);
+     ERR_BAIL(ncf);
+ 
+@@ -745,7 +749,7 @@
+     int nmatches = 0;
+ 
+     nmatches = aug_fmt_match(ncf, NULL,
+-                             "%s[ DEVICE = '%s' and TYPE = 'Bridge']",
++                             "%s[ INTERFACE = '%s' and TYPE = 'Bridge']",
+                              ifcfg_path, name);
+     return nmatches > 0;
+ }
+@@ -758,7 +762,7 @@
+     ERR_BAIL(ncf);
+ 
+     nslaves = aug_fmt_match(ncf, slaves,
+-                            "%s[ BRIDGE = '%s' ]/DEVICE", ifcfg_path, name);
++                            "%s[ BRIDGE = '%s' ]/INTERFACE", ifcfg_path, name);
+     ERR_BAIL(ncf);
+     for (int i=0; i < nslaves; i++) {
+         char *p = (*slaves)[i];
+@@ -790,8 +794,8 @@
+     /* The last or clause catches slaves of a bond that are enslaved to
+      * a bridge NAME */
+     r = xasprintf(&path,
+-          "%s[ DEVICE = '%s' or BRIDGE = '%s' or MASTER = '%s' "
+-          "    or MASTER = ../*[BRIDGE = '%s']/DEVICE ]",
++          "%s[ INTERFACE = '%s' or BRIDGE = '%s' or MASTER = '%s' "
++          "    or MASTER = ../*[BRIDGE = '%s']/INTERFACE ]",
+                   ifcfg_path, name, name, name, name);
+     ERR_NOMEM(r < 0, ncf);
+ 
+@@ -967,7 +971,7 @@
+     for (int i = 0; i < nmatches; i++) {
+         if (!has_ifcfg_file(ncf, matches[i]))
+             continue;
+-        r = xasprintf(&ifcfg, "%s[DEVICE = '%s']", ifcfg_path, matches[i]);
++        r = xasprintf(&ifcfg, "%s[INTERFACE = '%s']", ifcfg_path, matches[i]);
+         ERR_NOMEM(r < 0, ncf);
+ 
+         if (! is_slave(ncf, ifcfg))
+@@ -1023,7 +1027,10 @@
+  */
+ 
+ int drv_if_up(struct netcf_if *nif) {
+-    static const char *const ifup = "ifup";
++    //static const char *const ifup = "ifup";
++    static const char *const ifup = "netcfg";
++    static const char *const ifprefix = "ifcfg-";
++    char ifname[strlen(nif->name) + sizeof(ifprefix)];
+     struct netcf *ncf = nif->ncf;
+     char **slaves = NULL;
+     int nslaves = 0;
+@@ -1035,11 +1042,24 @@
+         ERR_BAIL(ncf);
+ 
+         for (int i=0; i < nslaves; i++) {
+-            run1(ncf, ifup, slaves[i]);
++            //run1(ncf, ifup, slaves[i]);
++            const char *const argv[] = {
++                ifup, "-u", slaves[i], NULL
++            };
++
++            run_program(ncf, argv);
+             ERR_BAIL(ncf);
+         }
+     }
+-    run1(ncf, ifup, nif->name);
++    //run1(ncf, ifup, nif->name);
++    /* Interfaces name have to be equal to script under /etc/network.d */
++    strcpy(ifname, ifprefix);
++    strcat(ifname, nif->name);
++    const char *const argv[] = {
++                ifup, "-u", ifname, NULL
++            };
++
++    run_program(ncf, argv);
+     ERR_BAIL(ncf);
+     result = 0;
+  error:
+@@ -1048,13 +1068,23 @@
+ }
+ 
+ int drv_if_down(struct netcf_if *nif) {
+-    static const char *const ifdown = "ifdown";
++    //static const char *const ifdown = "ifdown";
++    static const char *const ifdown = "netcfg";
++    static const char *const ifprefix = "ifcfg-";
++    char ifname[strlen(nif->name) + sizeof(ifprefix)];
+     struct netcf *ncf = nif->ncf;
+     char **slaves = NULL;
+     int nslaves = 0;
+     int result = -1;
+ 
+-    run1(ncf, ifdown, nif->name);
++    //run1(ncf, ifdown, nif->name);
++    strcpy(ifname, ifprefix);
++    strcat(ifname, nif->name);
++    const char *const argv[] = {
++        ifdown, "-d", ifname, NULL
++    };
++
++    run_program(ncf, argv);
+     ERR_BAIL(ncf);
+     if (is_bridge(ncf, nif->name)) {
+         /* Bring up bridge slaves after the bridge */
+@@ -1062,7 +1092,12 @@
+         ERR_BAIL(ncf);
+ 
+         for (int i=0; i < nslaves; i++) {
+-            run1(ncf, ifdown, slaves[i]);
++            //run1(ncf, ifdown, slaves[i]);
++            const char *const argvs[] = {
++                ifdown, "-d", slaves[i], NULL
++            };
++
++            run_program(ncf, argvs);
+             ERR_BAIL(ncf);
+         }
+     }
+diff -ur netcf-0.1.7.ori//tests/interface/bridge.xml~ netcf-0.1.7/tests/interface/bridge.xml~
+--- netcf-0.1.7.ori//tests/interface/bridge.xml~	2009-10-13 19:14:53.000000000 +0200
++++ netcf-0.1.7/tests/interface/bridge.xml~	2009-10-14 05:09:05.000000000 +0200
+@@ -2,10 +2,12 @@
+   <start mode="onboot"/>
+   <mtu size="1500"/>
+   <protocol family="ipv4">
+-    <ip address="192.168.80.5" prefix="24"/>
++    <dhcp/>
+   </protocol>
+   <bridge stp="off" delay="0.01">
+     <interface type="ethernet" name="eth0">
++      <mac address="ab:bb:cc:dd:ee:ff"/>
+     </interface>
++    <interface type="ethernet" name="eth1"/>
+   </bridge>
+ </interface>
+diff -ur netcf-0.1.7.ori//tests/interface/vlan.xml~ netcf-0.1.7/tests/interface/vlan.xml~
+--- netcf-0.1.7.ori//tests/interface/vlan.xml~	2010-07-30 06:02:39.000000000 +0200
++++ netcf-0.1.7/tests/interface/vlan.xml~	2010-09-07 18:26:22.000000000 +0200
+@@ -1,9 +1,9 @@
+-<interface type="vlan" name="eth1.42">
++<interface type="vlan" name="eth0.42">
+   <start mode="onboot"/>
+   <protocol family="ipv4">
+     <dhcp peerdns="no"/>
+   </protocol>
+   <vlan tag="42">
+-    <interface name="eth1"/>
++    <interface name="eth0"/>
+   </vlan>
+ </interface>
diff --git a/community/ngspice/PKGBUILD b/community/ngspice/PKGBUILD
index 9bf37940b..80a989034 100644
--- a/community/ngspice/PKGBUILD
+++ b/community/ngspice/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 49542 2011-06-18 04:13:44Z kkeen $
+# $Id: PKGBUILD 64464 2012-02-14 05:45:33Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
 # Contributor: Jason Taylor <jftaylor21@gmail.com>
 
 pkgname=ngspice
-pkgver=23
+pkgver=24
 pkgrel=1
 pkgdesc='Mixed-level/Mixed-signal circuit simulator based on Spice3f5, Ciber1b1, and Xspice.'
 url='http://ngspice.sourceforge.net'
@@ -12,7 +12,7 @@ license=('BSD')
 arch=('i686' 'x86_64')
 depends=('libxaw' 'libedit')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgver/ngspice-$pkgver.tar.gz")
-sha1sums=('65fa23d1168cb3af7651b990344f763c77bf6132')
+sha1sums=('a6bb0e65c1c07d48f1d3e4df44fc17f6262952eb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/volumeicon/PKGBUILD b/community/volumeicon/PKGBUILD
new file mode 100644
index 000000000..daa61ed5d
--- /dev/null
+++ b/community/volumeicon/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 64486 2012-02-14 08:50:43Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Maato <maato softwarebakery com>
+
+pkgname=volumeicon
+pkgver=0.4.6
+pkgrel=3
+pkgdesc="Volume control for your system tray"
+arch=('x86_64' 'i686')
+url="http://softwarebakery.com/maato/volumeicon.html"
+license=('GPL3')
+depends=('gtk2>=2.16.0' 'alsa-lib')
+source=("http://softwarebakery.com/maato/files/volumeicon/$pkgname-$pkgver.tar.gz")
+sha256sums=('32f94adc5f346404ae564405dd483ae4bd04212df08e46f18d369b4ba2cb6590')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/conky/PKGBUILD b/extra/conky/PKGBUILD
index 543348b26..037f0a618 100644
--- a/extra/conky/PKGBUILD
+++ b/extra/conky/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 142242 2011-11-07 05:35:59Z bisson $
+# $Id: PKGBUILD 150215 2012-02-15 03:04:18Z bisson $
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: James Rayner <james@archlinux.org>
 # Contributor: Partha Chowdhury <kira.laucas@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=conky
 pkgver=1.8.2git20111107
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight system monitor for X'
 url='http://conky.sourceforge.net/'
 license=('BSD' 'GPL')
@@ -44,5 +44,7 @@ build() {
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
-	install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	install -Dm644 extras/vim/syntax/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/syntax/conkyrc.vim
+	install -Dm644 extras/vim/ftdetect/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/ftdetect/conkyrc.vim
 }
diff --git a/extra/conky/PKGBUILD.cmake b/extra/conky/PKGBUILD.cmake
index 7f980868f..a4d50d737 100644
--- a/extra/conky/PKGBUILD.cmake
+++ b/extra/conky/PKGBUILD.cmake
@@ -44,4 +44,6 @@ package() {
 	make DESTDIR="${pkgdir}" install
 	install -d "${pkgdir}/usr/share/licenses/${pkgname}"
 	install -m644 ../conky/{COPYING,LICENSE}* "${pkgdir}/usr/share/licenses/${pkgname}"
+	install -Dm644 extras/vim/syntax/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/syntax/conkyrc.vim
+	install -Dm644 extras/vim/ftdetect/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/ftdetect/conkyrc.vim
 }
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 48cdca748..18c09ed34 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 149948 2012-02-11 23:30:42Z allan $
+# $Id: PKGBUILD 150206 2012-02-14 20:14:21Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.7.9
-pkgrel=2
+pkgver=1.7.9.1
+pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64)
 url="http://git-scm.com/"
@@ -22,8 +22,6 @@ optdepends=('tk: gitk and git gui'
 replaces=('git-core')
 provides=('git-core')
 backup=('etc/conf.d/git-daemon.conf')
-#source=("http://kernel.org/pub/software/scm/git/${pkgname}-${pkgver}.tar.bz2"
-#        "http://kernel.org/pub/software/scm/git/git-manpages-$pkgver.tar.bz2"
 source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz"
         "http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz"
         git-daemon
@@ -80,7 +78,7 @@ package() {
   install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
 }
 
-sha1sums=('ed51ef5ef250daaa6e98515cf2641820cd268d4c'
-          '1ca1fc430b2814f9e9cf82ec3bf7f2eaf5209b7a'
+sha1sums=('bd85327627f96c4e98071a4d1d32c30f210aa54a'
+          '8c6ee031b39da5c5e53f927952838796e0959ce9'
           'f2b41828bd912b72e2cb3e14677739c4f370de66'
           '149e2da1ecb48872ddb31c0945afeaad1f9653d7')
diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD
index 1c9ae1425..bf665d310 100644
--- a/extra/gpsd/PKGBUILD
+++ b/extra/gpsd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 142040 2011-11-04 20:43:48Z andrea $
+# $Id: PKGBUILD 150180 2012-02-14 08:19:26Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Giacomo Rizzo <alt@free-os.it>
 
 pkgname=gpsd
-pkgver=3.3
+pkgver=3.4
 pkgrel=1
 pkgdesc="GPS daemon and library to support USB/serial GPS devices"
 arch=('i686' 'x86_64')
@@ -21,8 +21,8 @@ options=('!libtool')
 install="${pkgname}.install"
 source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
         'gpsd' 'gpsd.conf.d')
-md5sums=('4cfdcfd88e925f4d0d6c2272fc573ab5'
-         '90086315ed6f266748b9acb338b903a5'
+md5sums=('c01353459faa68834309109d4e868460'
+         '8aea27e1b0c23f254f94861f7d898106'
          '1f3402f8e33a7032b9ae6dfd077234f7'
          '3e963df3f9f7ef3572ecc648ae829315')
 
diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD
index cabf80cc7..baa314ddc 100644
--- a/extra/kdebindings-python/PKGBUILD
+++ b/extra/kdebindings-python/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 147780 2012-01-28 10:32:45Z andrea $
+# $Id: PKGBUILD 150178 2012-02-14 07:57:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-python
 pkgver=4.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE bindings for Python"
 url="http://kde.org/"
 arch=('i686' 'x86_64')
diff --git a/extra/metalog/PKGBUILD b/extra/metalog/PKGBUILD
index 4d5002f2b..f44fb93ba 100644
--- a/extra/metalog/PKGBUILD
+++ b/extra/metalog/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 149960 2012-02-11 23:31:08Z allan $
+# $Id: PKGBUILD 150210 2012-02-14 21:34:23Z juergen $
 # Maintainer: juergen <juergen@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=metalog
-pkgver=1.0
-pkgrel=3
+pkgver=2.0
+pkgrel=1
 pkgdesc="Metalog is a modern replacement for syslogd and klogd"
 url="http://metalog.sourceforge.net"
 license=('GPL')
@@ -12,21 +12,19 @@ arch=('i686' 'x86_64')
 depends=('pcre')
 provides=('logger')
 backup=('etc/metalog.conf' 'etc/conf.d/metalog')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-1.tar.lzma"
-        'metalog'
-        'metalog.confd')
-md5sums=('df4ec89f6a0df24a43f9592ee80ab6be'
+source=("http://sourceforge.net/projects/metalog/files/metalog-2.tar.xz/download" 'metalog' 'metalog.confd')
+md5sums=('e948d10d780205eae17645c89aee1361'
          'cdd1d34eedbfbc2d9e659bf0a0f58f56'
          '86bccd5a02996921e29eff8a0394d11f')
 
 build() {
-  cd $srcdir/$pkgname-1
+  cd $srcdir/$pkgname-2
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-1
+  cd $srcdir/$pkgname-2
   make DESTDIR=$pkgdir install
   install -D -m755 $srcdir/metalog $pkgdir/etc/rc.d/metalog
   install -D -m644 $srcdir/metalog.confd $pkgdir/etc/conf.d/metalog
diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD
index a0510e30d..d46ff3749 100644
--- a/extra/pyqt/PKGBUILD
+++ b/extra/pyqt/PKGBUILD
@@ -1,13 +1,12 @@
-# $Id: PKGBUILD 145605 2011-12-23 14:48:45Z andrea $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 150176 2012-02-14 07:57:37Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
 
 pkgbase=pyqt
 pkgname=('pyqt' 'python2-pyqt')
-pkgver=4.9
-pkgrel=2
+pkgver=4.9.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 license=('GPL')
@@ -15,14 +14,15 @@ makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon'
              'python-opengl' 'qt-assistant-compat' 'qtwebkit')
 source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz"
         'fix-qthelp-build.patch')
-md5sums=('61619500d09d87b6c2a25bd3ea994504'
-         '356a453331a33c507b1baba4a9771764')
+md5sums=('7f495dc49f71e3bfb64bf942e0d8bb3c'
+         '6acfe0a5a00779f946c29d5fac647ce1')
 
 build() {
-  cd "${srcdir}"
-
-  patch -p0 -i "${srcdir}"/fix-qthelp-build.patch
+  # Build QtHelp (FS#27665)
+  cd "${srcdir}"/PyQt-x11-gpl-${pkgver}
+  patch -p1 -i "${srcdir}"/fix-qthelp-build.patch
 
+  cd "${srcdir}"
   cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
 
   cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
diff --git a/extra/pyqt/fix-qthelp-build.patch b/extra/pyqt/fix-qthelp-build.patch
index cd565e646..6055f9f35 100644
--- a/extra/pyqt/fix-qthelp-build.patch
+++ b/extra/pyqt/fix-qthelp-build.patch
@@ -1,6 +1,6 @@
---- PyQt-x11-gpl-4.9/configure.py~	2011-12-23 14:53:07.981490550 +0100
-+++ PyQt-x11-gpl-4.9/configure.py	2011-12-23 14:52:38.384984221 +0100
-@@ -1264,7 +1264,7 @@
+--- PyQt-x11-gpl-4.9.1/configure.py~	2012-02-13 20:16:11.418786488 +0000
++++ PyQt-x11-gpl-4.9.1/configure.py	2012-02-13 20:16:50.561809527 +0000
+@@ -1261,7 +1261,7 @@
      opengl = (mname == "QtOpenGL")
  
      qt = [mname]
diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD
index fd047dc72..8a3f939a3 100644
--- a/extra/sip/PKGBUILD
+++ b/extra/sip/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 145600 2011-12-23 10:58:52Z andrea $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 150174 2012-02-14 07:57:34Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
 
 pkgbase=sip
 pkgname=('sip' 'python2-sip')
-pkgver=4.13.1
+pkgver=4.13.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.riverbankcomputing.com/software/sip/"
 license=('custom:"sip"')
 makedepends=('python' 'python2')
 source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz")
-md5sums=('3f61fd39d5b0c8fa9e43b59af04de924')
+md5sums=('5a12ea8e8a09b879ed2b3817e30fbc84')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/uim/PKGBUILD b/extra/uim/PKGBUILD
index 01142b16b..fd1e4dc15 100644
--- a/extra/uim/PKGBUILD
+++ b/extra/uim/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 146641 2012-01-15 08:38:24Z bisson $
+# $Id: PKGBUILD 150199 2012-02-14 13:39:03Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=uim
-pkgver=1.7.2
+pkgver=1.7.3
 pkgrel=1
 pkgdesc='Multilingual input method library'
-arch=('i686' 'x86_64')
 url='http://code.google.com/p/uim/'
 license=('custom:BSD')
+arch=('i686' 'x86_64')
 depends=('libxft' 'libedit' 'anthy' 'm17n-lib')
 makedepends=('intltool' 'gettext' 'qt' 'gtk2' 'gtk3' 'gnome-panel')
 optdepends=('qt: immodule and helper applications'
@@ -16,8 +16,8 @@ optdepends=('qt: immodule and helper applications'
             'gtk3: immodules and helper applications'
             'gnome-panel: gnome applet indicator')
 options=('!libtool')
-source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('4982178aca6ee1ae775fc2a9b4bbb7a66e97cbd4')
+source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('1c7bb8c6c475dcbc4768bcabac540c42ccfd8185')
 
 install=install
 
diff --git a/extra/windowmaker/PKGBUILD b/extra/windowmaker/PKGBUILD
index d09b67951..e9a98534e 100644
--- a/extra/windowmaker/PKGBUILD
+++ b/extra/windowmaker/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 149306 2012-02-06 18:35:19Z daniel $
+# $Id: PKGBUILD 150208 2012-02-14 20:50:29Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 pkgname=windowmaker
-pkgver=0.95.1
+pkgver=0.95.2
 pkgrel=1
 pkgdesc="An X11 window manager with a NEXTSTEP look and feel"
 arch=(i686 x86_64)
@@ -10,14 +10,13 @@ url="http://www.windowmaker.org/"
 license=('GPL' 'custom')
 depends=('libxinerama' 'libxrandr' 'libxmu' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib')
 options=('!libtool')
-source=(ftp://ftp.archlinux.org/other/windowmaker/windowmaker-$pkgver.tar.gz wmaker.desktop)  
-md5sums=('1b0d0aa2ac53a7a98ef80a35e507b082'
+source=(http://windowmaker.org/pub/source/release/WindowMaker-$pkgver.tar.gz wmaker.desktop)  
+md5sums=('ae62bad9c4dee504066e0f172b565ff0'
          '2fba97bebfd691836b92b8f0db79ff13')
 
 build() {
-  cd $srcdir/windowmaker-$pkgver
+  cd $srcdir/WindowMaker-$pkgver
   [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
-  ./autogen.sh
   ./configure --prefix=/usr --sysconfdir=/etc --enable-xinerama \
     --with-nlsdir=/usr/share/locale --with-gnustepdir=/usr/lib/GNUstep \
     --enable-usermenu --enable-modelock --enable-xrandr
@@ -25,7 +24,7 @@ build() {
 }
 
 package() {
-  cd $srcdir/windowmaker-$pkgver
+  cd $srcdir/WindowMaker-$pkgver
   
   make DESTDIR=$pkgdir install
   install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL
diff --git a/libre/kdenetwork-libre/PKGBUILD b/libre/kdenetwork-libre/PKGBUILD
index d8fa960e5..e744b22ef 100644
--- a/libre/kdenetwork-libre/PKGBUILD
+++ b/libre/kdenetwork-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147895 2012-01-28 10:36:24Z andrea $
+# $Id: PKGBUILD 150223 2012-02-15 09:34:48Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -11,7 +11,7 @@ pkgname=('kdenetwork-filesharing'
          'kdenetwork-krdc'
          'kdenetwork-krfb')
 pkgver=4.8.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -19,7 +19,7 @@ groups=('kde' 'kdenetwork')
 makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp'
 	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn'
     'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
-    'telepathy-qt4' 'libktorrent' 'libmms' 'mediastreamer')
+    'libktorrent' 'libmms' 'mediastreamer')
 source=("http://repo.parabolagnulinux.org/other/${pkgbase}-libre-${pkgver}.tar.xz")
 sha1sums=('2472128aef671e3474505cf65397dfc7ef9f79bb')
 
@@ -103,7 +103,7 @@ package_kdenetwork-kppp() {
 
 package_kdenetwork-krdc() {
 	pkgdesc='Remote Desktop Client'
-	depends=('kdebase-runtime' 'libvncserver' 'rdesktop' 'telepathy-qt4')
+	depends=('kdebase-runtime' 'libvncserver' 'rdesktop')
     optdepends=('kdebase-keditbookmarks: to edit bookmarks')
 	url="http://kde.org/applications/internet/krdc/"
 	cd $srcdir/build/krdc
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index 4964b0263..6fa7ec4c7 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=texlive-bin-libre
 pkgver=2011.3
 _luatex_ver=0.70.1
-pkgrel=4
+pkgrel=4.1
 pkgdesc="TeX Live binaries"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ optdepends=('ed: for texconfig')
 provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin')
 conflicts=('pdfjam' 'texlive-bin')
 replaces=('texlive-bin')
-options=('!libtool')
+options=('!libtool' '!strip')
 url='http://tug.org/texlive/'
 install="texlive.install"
 source=('texmf.cnf'
@@ -49,6 +49,11 @@ md5sums=('220a4f4cc0d915bf8fcbcb553dcee1ae'
          'e7f0197559ef865d8c01683dab3b8526')
 
 build() {
+   if [ "${CARCH}" != "i686" ]; then
+     export CFLAGS="${CFLAGS} -fPIC"
+     export CXXFLAGS="${CXXFLAGS} -fPIC"
+   fi
+
    cd "$srcdir"
    # Building LuaTeX
    # cd luatex-beta-${_luatex_ver}
@@ -60,7 +65,7 @@ build() {
    ../source/configure --prefix=/usr -C \
      --disable-native-texlive-build \
      --with-banner-add="/Parabola GNU/Linux-libre" \
-    --disable-cxx-runtime-hack \
+    --enable-cxx-runtime-hack \
     --disable-all-pkgs \
     --disable-dump-share \
     --disable-ptex \
@@ -215,12 +220,12 @@ package() {
    echo "--> Proceeding with make install ..."
    echo "-------------------------------------------------------"
    cd Work
-   make DESTDIR=${pkgdir} texmf="$pkgdir"/usr/share/texmf install
+   make DESTDIR="${pkgdir}" texmf="$pkgdir"/usr/share/texmf install
    rm -rf "${pkgdir}"/usr/{texmf,share/texmf-dist}
 
    # replace upstream texmf.cnf with ours
    rm -f "$pkgdir"/usr/share/texmf/web2c/texmf.cnf
-   install -m644 "$srcdir"/texmf.cnf $pkgdir/etc/texmf/web2c/texmf.cnf
+   install -m644 "$srcdir"/texmf.cnf "$pkgdir"/etc/texmf/web2c/texmf.cnf
    # since the location of texmf.cnf is hard-wired to be under /usr/share/texmf/web2c
    # we make a symlink from /etc/texmf/web2c/texmf.cnf to the latter
    ln -sf /etc/texmf/web2c/texmf.cnf "$pkgdir"/usr/share/texmf/web2c/texmf.cnf
@@ -230,15 +235,15 @@ package() {
    sed -i -e '/aleph/d' "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf
 
    ## install luatex binary
-   cd "$srcdir"/luatex/build/texk/web2c
-   ./libtool --mode=install install -m755 luatex "$pkgdir"/usr/bin/
+   #install -m755 "$srcdir"/luatex-beta-${_luatex_ver}/build/texk/web2c/luatex "$pkgdir"/usr/bin/
+   install -m755 "$srcdir"/luatex/build/texk/web2c/luatex "$pkgdir"/usr/bin/
    cd "$pkgdir"/usr/bin
    /bin/ln -s luatex texlua
    /bin/ln -s luatex texluac
 
    ## install Perl libraries
-   mkdir -p $pkgdir/usr/share/tlpkg/TeXLive
-   install -m644 ${srcdir}/source/utils/biber/TeXLive/*.pm $pkgdir/usr/share/tlpkg/TeXLive
+   mkdir -p "$pkgdir"/usr/share/tlpkg/TeXLive
+   install -m644 "${srcdir}"/source/utils/biber/TeXLive/*.pm "$pkgdir"/usr/share/tlpkg/TeXLive
 
    # create symlinks for formats 
    echo "--> Create symlinks for TeX formats ..."
diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD
index 84b6714ed..6b8124e27 100644
--- a/multilib-testing/lib32-glibc/PKGBUILD
+++ b/multilib-testing/lib32-glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 63464 2012-02-04 11:00:52Z heftig $
+# $Id: PKGBUILD 64480 2012-02-14 08:41:39Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
@@ -9,7 +9,7 @@
 _pkgbasename=glibc
 pkgname=lib32-$_pkgbasename
 pkgver=2.15
-pkgrel=5
+pkgrel=6
 _glibcdate=20111227
 pkgdesc="GNU C Library for multilib"
 arch=('x86_64')
@@ -33,8 +33,11 @@ source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcda
         glibc-2.15-scanf.patch
         glibc-2.15-ifunc.patch
         glibc-2.15-avx.patch
+        glibc-2.15-strcasecmp-disable-avx.patch
         glibc-2.15-gb18030.patch
         glibc-2.15-revert-netlink-cache.patch
+        glibc-2.15-arena.patch
+        glibc-2.15-negative-result-cache.patch
         lib32-glibc.conf)
 md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
          '4dadb9203b69a3210d53514bb46f41c3'
@@ -51,8 +54,11 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
          '39353f53168f4a7509ba5fe0d9f218b8'
          '136eb969f5d6bb6f5155f72a1a7cf23e'
          '41ae047ac88e8f6f547c70b0a0bc3b72'
+         'fccb89f6628f59752278e125c35941f8'
          'c4cd34f20ccd37817f6c1374bd4ee68e'
          '6771b0b2bb8aa3870a259fd2f46c424f'
+         'a9ffadcfd2d357f91fee0b861fd4a7c6'
+         '2c46b8e294de24c531f2253ff69aeef3'
          '6e052f1cb693d5d3203f50f9d4e8c33b')
 
 build() {
@@ -64,8 +70,9 @@ build() {
   # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781
   patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch
 
-  # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411
+  # Undefine __i686 for gcc <= 4.6
   # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
+  # fix in http://sourceware.org/git/?p=glibc.git;a=commit;h=d4a54ac6 requires additional backporting...
   patch -Np1 -i ${srcdir}/glibc-__i686.patch
 
   # http://www.exploit-db.com/exploits/15274/
@@ -99,6 +106,8 @@ build() {
 
   # revert commit c5a0802a - causes various hangs
   # https://bugzilla.redhat.com/show_bug.cgi?id=769421
+  # Note: fedora may have actual fix (not submitted upstream yet...)
+  # http://pkgs.fedoraproject.org/gitweb/?p=glibc.git;a=blob_plain;f=glibc-rh552960-2.patch
   patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch
 
   # fix realloc usage in vfscanf
@@ -113,6 +122,8 @@ build() {
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=afc5ed09
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=08cf777f
   patch -Np1 -i ${srcdir}/glibc-2.15-avx.patch
+  # and "fix" strcasecmp
+  patch -Np1 -i ${srcdir}/glibc-2.15-strcasecmp-disable-avx.patch
 
   # fix GB18030 charmap
   # http://sourceware.org/bugzilla/show_bug.cgi?id=11837
@@ -121,10 +132,18 @@ build() {
   patch -Np1 -i ${srcdir}/glibc-2.15-gb18030.patch
 
   # fix crash in __nscd_get_mapping if nscd not running
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13594
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=13594 (potential "fix" in comment)
   # reverts commit 3a2c0242 and other necessary following changes...
   patch -Np1 -i ${srcdir}/glibc-2.15-revert-netlink-cache.patch
 
+  # handle ARENA_TEST correctly
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=41b81892
+  patch -Np1 -i ${srcdir}/glibc-2.15-arena.patch
+
+  # Do not cache negative results in nscd if these are transient
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=3e1aa84e
+  patch -Np1 -i ${srcdir}/glibc-2.15-negative-result-cache.patch
+
 
   cd ${srcdir}
   mkdir glibc-build
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-arena.patch b/multilib-testing/lib32-glibc/glibc-2.15-arena.patch
new file mode 100644
index 000000000..46f52e98d
--- /dev/null
+++ b/multilib-testing/lib32-glibc/glibc-2.15-arena.patch
@@ -0,0 +1,29 @@
+diff --git a/malloc/arena.c b/malloc/arena.c
+index d3cf4b9..b1c9469 100644
+--- a/malloc/arena.c
++++ b/malloc/arena.c
+@@ -828,7 +828,7 @@ arena_get2(mstate a_tsd, size_t size)
+ 	{
+ 	  if (mp_.arena_max != 0)
+ 	    narenas_limit = mp_.arena_max;
+-	  else
++	  else if (narenas > mp_.arena_test)
+ 	    {
+ 	      int n  = __get_nprocs ();
+ 
+@@ -842,7 +842,14 @@ arena_get2(mstate a_tsd, size_t size)
+ 	}
+     repeat:;
+       size_t n = narenas;
+-      if (__builtin_expect (n <= mp_.arena_test || n < narenas_limit, 0))
++      /* NB: the following depends on the fact that (size_t)0 - 1 is a
++	 very large number and that the underflow is OK.  If arena_max
++	 is set the value of arena_test is irrelevant.  If arena_test
++	 is set but narenas is not yet larger or equal to arena_test
++	 narenas_limit is 0.  There is no possibility for narenas to
++	 be too big for the test to always fail since there is not
++	 enough address space to create that many arenas.  */
++      if (__builtin_expect (n <= narenas_limit - 1, 0))
+ 	{
+ 	  if (catomic_compare_and_exchange_bool_acq (&narenas, n + 1, n))
+ 	    goto repeat;
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-negative-result-cache.patch b/multilib-testing/lib32-glibc/glibc-2.15-negative-result-cache.patch
new file mode 100644
index 000000000..c09e79a17
--- /dev/null
+++ b/multilib-testing/lib32-glibc/glibc-2.15-negative-result-cache.patch
@@ -0,0 +1,138 @@
+diff --git a/nscd/aicache.c b/nscd/aicache.c
+index aaaf80d..e1f1244 100644
+--- a/nscd/aicache.c
++++ b/nscd/aicache.c
+@@ -1,5 +1,5 @@
+ /* Cache handling for host lookup.
+-   Copyright (C) 2004-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
++   Copyright (C) 2004-2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
+ 
+@@ -514,8 +514,9 @@ next_nip:
+       if (fd != -1)
+ 	TEMP_FAILURE_RETRY (send (fd, &notfound, total, MSG_NOSIGNAL));
+ 
+-      /* If we cannot permanently store the result, so be it.  */
+-      if (__builtin_expect (db->negtimeout == 0, 0))
++      /* If we have a transient error or cannot permanently store the
++	 result, so be it.  */
++      if (rc4 == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
+ 	{
+ 	  /* Mark the old entry as obsolete.  */
+ 	  if (dh != NULL)
+diff --git a/nscd/grpcache.c b/nscd/grpcache.c
+index e9607c6..a698f36 100644
+--- a/nscd/grpcache.c
++++ b/nscd/grpcache.c
+@@ -1,5 +1,5 @@
+ /* Cache handling for group lookup.
+-   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
++   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+ 
+@@ -120,8 +120,9 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req,
+ 	  else
+ 	    written = total;
+ 
+-	  /* If we cannot permanently store the result, so be it.  */
+-	  if (db->negtimeout == 0)
++	  /* If we have a transient error or cannot permanently store
++	     the result, so be it.  */
++	  if (errno == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
+ 	    {
+ 	      /* Mark the old entry as obsolete.  */
+ 	      if (dh != NULL)
+diff --git a/nscd/hstcache.c b/nscd/hstcache.c
+index 4d68ade..c72feaa 100644
+--- a/nscd/hstcache.c
++++ b/nscd/hstcache.c
+@@ -1,5 +1,5 @@
+ /* Cache handling for host lookup.
+-   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
++   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+ 
+@@ -141,8 +141,9 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req,
+ 					MSG_NOSIGNAL)) != total)
+ 	    all_written = false;
+ 
+-	  /* If we cannot permanently store the result, so be it.  */
+-	  if (__builtin_expect (db->negtimeout == 0, 0))
++	  /* If we have a transient error or cannot permanently store
++	     the result, so be it.  */
++	  if (errval == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
+ 	    {
+ 	      /* Mark the old entry as obsolete.  */
+ 	      if (dh != NULL)
+diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c
+index 4ac9942..2019991 100644
+--- a/nscd/initgrcache.c
++++ b/nscd/initgrcache.c
+@@ -1,5 +1,5 @@
+ /* Cache handling for host lookup.
+-   Copyright (C) 2004-2006, 2008, 2009, 2011 Free Software Foundation, Inc.
++   Copyright (C) 2004-2006, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
+ 
+@@ -202,8 +202,9 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
+ 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
+ 						MSG_NOSIGNAL));
+ 
+-	  /* If we cannot permanently store the result, so be it.  */
+-	  if (__builtin_expect (db->negtimeout == 0, 0))
++	  /* If we have a transient error or cannot permanently store
++	     the result, so be it.  */
++	  if (all_tryagain || __builtin_expect (db->negtimeout == 0, 0))
+ 	    {
+ 	      /* Mark the old entry as obsolete.  */
+ 	      if (dh != NULL)
+diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c
+index 49e130c..e2ba09d 100644
+--- a/nscd/pwdcache.c
++++ b/nscd/pwdcache.c
+@@ -1,5 +1,5 @@
+ /* Cache handling for passwd lookup.
+-   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
++   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+ 
+@@ -124,8 +124,9 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req,
+ 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
+ 						MSG_NOSIGNAL));
+ 
+-	  /* If we cannot permanently store the result, so be it.  */
+-	  if (__builtin_expect (db->negtimeout == 0, 0))
++	  /* If we have a transient error or cannot permanently store
++	     the result, so be it.  */
++	  if (errno == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
+ 	    {
+ 	      /* Mark the old entry as obsolete.  */
+ 	      if (dh != NULL)
+diff --git a/nscd/servicescache.c b/nscd/servicescache.c
+index d3d5dce..a6337e3 100644
+--- a/nscd/servicescache.c
++++ b/nscd/servicescache.c
+@@ -1,5 +1,5 @@
+ /* Cache handling for services lookup.
+-   Copyright (C) 2007, 2008, 2009, 2011 Free Software Foundation, Inc.
++   Copyright (C) 2007, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@drepper.com>, 2007.
+ 
+@@ -108,8 +108,9 @@ cache_addserv (struct database_dyn *db, int fd, request_header *req,
+ 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
+ 						MSG_NOSIGNAL));
+ 
+-	  /* If we cannot permanently store the result, so be it.  */
+-	  if (__builtin_expect (db->negtimeout == 0, 0))
++	  /* If we have a transient error or cannot permanently store
++	     the result, so be it.  */
++	  if (errval == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
+ 	    {
+ 	      /* Mark the old entry as obsolete.  */
+ 	      if (dh != NULL)
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-strcasecmp-disable-avx.patch b/multilib-testing/lib32-glibc/glibc-2.15-strcasecmp-disable-avx.patch
new file mode 100644
index 000000000..4c104fa55
--- /dev/null
+++ b/multilib-testing/lib32-glibc/glibc-2.15-strcasecmp-disable-avx.patch
@@ -0,0 +1,48 @@
+diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S
+index f93c83d..d8aa889 100644
+--- a/sysdeps/x86_64/multiarch/strcmp.S
++++ b/sysdeps/x86_64/multiarch/strcmp.S
+@@ -105,11 +105,6 @@ ENTRY(__strcasecmp)
+	jne	1f
+	call	__init_cpu_features
+ 1:
+-#  ifdef HAVE_AVX_SUPPORT
+-	leaq	__strcasecmp_avx(%rip), %rax
+-	testl	$bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
+-	jnz	2f
+-#  endif
+	leaq	__strcasecmp_sse42(%rip), %rax
+	testl	$bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
+	jnz	2f
+@@ -128,11 +123,6 @@ ENTRY(__strncasecmp)
+	jne	1f
+	call	__init_cpu_features
+ 1:
+-#  ifdef HAVE_AVX_SUPPORT
+-	leaq	__strncasecmp_avx(%rip), %rax
+-	testl	$bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
+-	jnz	2f
+-#  endif
+	leaq	__strncasecmp_sse42(%rip), %rax
+	testl	$bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
+	jnz	2f
+@@ -152,19 +142,6 @@ weak_alias (__strncasecmp, strncasecmp)
+ # include "strcmp-sse42.S"
+
+
+-# ifdef HAVE_AVX_SUPPORT
+-#  if defined USE_AS_STRCASECMP_L || defined USE_AS_STRNCASECMP_L
+-#   define LABEL(l) .L##l##_avx
+-#   define GLABEL(l) l##_avx
+-#   define USE_AVX 1
+-#   undef STRCMP_SSE42
+-#   define STRCMP_SSE42 STRCMP_AVX
+-#   define SECTION avx
+-#   include "strcmp-sse42.S"
+-#  endif
+-# endif
+-
+-
+ # undef ENTRY
+ # define ENTRY(name) \
+	.type STRCMP_SSE2, @function; \
diff --git a/multilib-testing/lib32-libxcb/PKGBUILD b/multilib-testing/lib32-libxcb/PKGBUILD
index 141b91b96..b51422646 100644
--- a/multilib-testing/lib32-libxcb/PKGBUILD
+++ b/multilib-testing/lib32-libxcb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 64458 2012-02-14 00:06:32Z bluewind $
+# $Id: PKGBUILD 64491 2012-02-14 11:43:17Z bluewind $
 # Maintainer: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 _pkgbasename=libxcb
 pkgname=lib32-$_pkgbasename
 pkgver=1.8
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 client-side library (32-bit)"
 arch=(x86_64)
 url="http://xcb.freedesktop.org/"
diff --git a/multilib/libtool-multilib/PKGBUILD b/multilib/libtool-multilib/PKGBUILD
index 22767d11a..1a4c37926 100644
--- a/multilib/libtool-multilib/PKGBUILD
+++ b/multilib/libtool-multilib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 62210 2012-01-18 10:47:35Z heftig $
+# $Id: PKGBUILD 64483 2012-02-14 08:46:18Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
@@ -8,7 +8,7 @@
 pkgbase=libtool-multilib
 pkgname=(libtool-multilib lib32-libltdl)
 pkgver=2.4.2
-pkgrel=2.1
+pkgrel=3
 pkgdesc="A generic library support script for multilib"
 arch=('x86_64')
 url="http://www.gnu.org/software/libtool"
@@ -56,6 +56,7 @@ package_libtool-multilib() {
   conflicts=(libtool)
 
   cd "$srcdir/libtool-64"
+  
   make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \
                          install-data-local
   rm -rf ${pkgdir}/usr/share/libtool/libltdl/
diff --git a/multilib/libtool-multilib/libtool.install b/multilib/libtool-multilib/libtool.install
index 424c8cb88..f4f700705 100644
--- a/multilib/libtool-multilib/libtool.install
+++ b/multilib/libtool-multilib/libtool.install
@@ -1,4 +1,4 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(libtool.info  libtool.info-1  libtool.info-2)
 
 post_install() {
diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD
index 150204fbf..a5159b34b 100644
--- a/testing/glibc/PKGBUILD
+++ b/testing/glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 148588 2012-02-04 06:45:28Z allan $
+# $Id: PKGBUILD 150168 2012-02-14 06:50:20Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.15
-pkgrel=5
+pkgrel=6
 _glibcdate=20111227
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
@@ -35,8 +35,11 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t
         glibc-2.15-scanf.patch
         glibc-2.15-ifunc.patch
         glibc-2.15-avx.patch
+        glibc-2.15-strcasecmp-disable-avx.patch
         glibc-2.15-gb18030.patch
         glibc-2.15-revert-netlink-cache.patch
+        glibc-2.15-arena.patch
+        glibc-2.15-negative-result-cache.patch
         nscd
         locale.gen.txt
         locale-gen)
@@ -55,8 +58,11 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
          '39353f53168f4a7509ba5fe0d9f218b8'
          '136eb969f5d6bb6f5155f72a1a7cf23e'
          '41ae047ac88e8f6f547c70b0a0bc3b72'
+         'fccb89f6628f59752278e125c35941f8'
          'c4cd34f20ccd37817f6c1374bd4ee68e'
          '6771b0b2bb8aa3870a259fd2f46c424f'
+         'a9ffadcfd2d357f91fee0b861fd4a7c6'
+         '2c46b8e294de24c531f2253ff69aeef3'
          'b587ee3a70c9b3713099295609afde49'
          '07ac979b6ab5eeb778d55f041529d623'
          '476e9113489f93b348b21e144b6a8fcf')
@@ -80,8 +86,9 @@ build() {
   # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781
   patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch
 
-  # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411
+  # Undefine __i686 for gcc <= 4.6
   # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
+  # fix in http://sourceware.org/git/?p=glibc.git;a=commit;h=d4a54ac6 requires additional backporting...
   patch -Np1 -i ${srcdir}/glibc-__i686.patch
 
   # http://www.exploit-db.com/exploits/15274/
@@ -115,6 +122,8 @@ build() {
 
   # revert commit c5a0802a - causes various hangs
   # https://bugzilla.redhat.com/show_bug.cgi?id=769421
+  # Note: fedora may have actual fix (not submitted upstream yet...)
+  # http://pkgs.fedoraproject.org/gitweb/?p=glibc.git;a=blob_plain;f=glibc-rh552960-2.patch
   patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch
 
   # fix realloc usage in vfscanf
@@ -129,6 +138,8 @@ build() {
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=afc5ed09
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=08cf777f
   patch -Np1 -i ${srcdir}/glibc-2.15-avx.patch
+  # and "fix" strcasecmp
+  patch -Np1 -i ${srcdir}/glibc-2.15-strcasecmp-disable-avx.patch
 
   # fix GB18030 charmap
   # http://sourceware.org/bugzilla/show_bug.cgi?id=11837
@@ -137,10 +148,18 @@ build() {
   patch -Np1 -i ${srcdir}/glibc-2.15-gb18030.patch
 
   # fix crash in __nscd_get_mapping if nscd not running
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13594
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=13594 (potential "fix" in comment)
   # reverts commit 3a2c0242 and other necessary following changes...
   patch -Np1 -i ${srcdir}/glibc-2.15-revert-netlink-cache.patch
 
+  # handle ARENA_TEST correctly
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=41b81892
+  patch -Np1 -i ${srcdir}/glibc-2.15-arena.patch
+
+  # Do not cache negative results in nscd if these are transient
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=3e1aa84e
+  patch -Np1 -i ${srcdir}/glibc-2.15-negative-result-cache.patch
+
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf
 
diff --git a/testing/glibc/glibc-2.15-arena.patch b/testing/glibc/glibc-2.15-arena.patch
new file mode 100644
index 000000000..46f52e98d
--- /dev/null
+++ b/testing/glibc/glibc-2.15-arena.patch
@@ -0,0 +1,29 @@
+diff --git a/malloc/arena.c b/malloc/arena.c
+index d3cf4b9..b1c9469 100644
+--- a/malloc/arena.c
++++ b/malloc/arena.c
+@@ -828,7 +828,7 @@ arena_get2(mstate a_tsd, size_t size)
+ 	{
+ 	  if (mp_.arena_max != 0)
+ 	    narenas_limit = mp_.arena_max;
+-	  else
++	  else if (narenas > mp_.arena_test)
+ 	    {
+ 	      int n  = __get_nprocs ();
+ 
+@@ -842,7 +842,14 @@ arena_get2(mstate a_tsd, size_t size)
+ 	}
+     repeat:;
+       size_t n = narenas;
+-      if (__builtin_expect (n <= mp_.arena_test || n < narenas_limit, 0))
++      /* NB: the following depends on the fact that (size_t)0 - 1 is a
++	 very large number and that the underflow is OK.  If arena_max
++	 is set the value of arena_test is irrelevant.  If arena_test
++	 is set but narenas is not yet larger or equal to arena_test
++	 narenas_limit is 0.  There is no possibility for narenas to
++	 be too big for the test to always fail since there is not
++	 enough address space to create that many arenas.  */
++      if (__builtin_expect (n <= narenas_limit - 1, 0))
+ 	{
+ 	  if (catomic_compare_and_exchange_bool_acq (&narenas, n + 1, n))
+ 	    goto repeat;
diff --git a/testing/glibc/glibc-2.15-negative-result-cache.patch b/testing/glibc/glibc-2.15-negative-result-cache.patch
new file mode 100644
index 000000000..c09e79a17
--- /dev/null
+++ b/testing/glibc/glibc-2.15-negative-result-cache.patch
@@ -0,0 +1,138 @@
+diff --git a/nscd/aicache.c b/nscd/aicache.c
+index aaaf80d..e1f1244 100644
+--- a/nscd/aicache.c
++++ b/nscd/aicache.c
+@@ -1,5 +1,5 @@
+ /* Cache handling for host lookup.
+-   Copyright (C) 2004-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
++   Copyright (C) 2004-2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
+ 
+@@ -514,8 +514,9 @@ next_nip:
+       if (fd != -1)
+ 	TEMP_FAILURE_RETRY (send (fd, &notfound, total, MSG_NOSIGNAL));
+ 
+-      /* If we cannot permanently store the result, so be it.  */
+-      if (__builtin_expect (db->negtimeout == 0, 0))
++      /* If we have a transient error or cannot permanently store the
++	 result, so be it.  */
++      if (rc4 == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
+ 	{
+ 	  /* Mark the old entry as obsolete.  */
+ 	  if (dh != NULL)
+diff --git a/nscd/grpcache.c b/nscd/grpcache.c
+index e9607c6..a698f36 100644
+--- a/nscd/grpcache.c
++++ b/nscd/grpcache.c
+@@ -1,5 +1,5 @@
+ /* Cache handling for group lookup.
+-   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
++   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+ 
+@@ -120,8 +120,9 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req,
+ 	  else
+ 	    written = total;
+ 
+-	  /* If we cannot permanently store the result, so be it.  */
+-	  if (db->negtimeout == 0)
++	  /* If we have a transient error or cannot permanently store
++	     the result, so be it.  */
++	  if (errno == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
+ 	    {
+ 	      /* Mark the old entry as obsolete.  */
+ 	      if (dh != NULL)
+diff --git a/nscd/hstcache.c b/nscd/hstcache.c
+index 4d68ade..c72feaa 100644
+--- a/nscd/hstcache.c
++++ b/nscd/hstcache.c
+@@ -1,5 +1,5 @@
+ /* Cache handling for host lookup.
+-   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
++   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+ 
+@@ -141,8 +141,9 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req,
+ 					MSG_NOSIGNAL)) != total)
+ 	    all_written = false;
+ 
+-	  /* If we cannot permanently store the result, so be it.  */
+-	  if (__builtin_expect (db->negtimeout == 0, 0))
++	  /* If we have a transient error or cannot permanently store
++	     the result, so be it.  */
++	  if (errval == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
+ 	    {
+ 	      /* Mark the old entry as obsolete.  */
+ 	      if (dh != NULL)
+diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c
+index 4ac9942..2019991 100644
+--- a/nscd/initgrcache.c
++++ b/nscd/initgrcache.c
+@@ -1,5 +1,5 @@
+ /* Cache handling for host lookup.
+-   Copyright (C) 2004-2006, 2008, 2009, 2011 Free Software Foundation, Inc.
++   Copyright (C) 2004-2006, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
+ 
+@@ -202,8 +202,9 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
+ 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
+ 						MSG_NOSIGNAL));
+ 
+-	  /* If we cannot permanently store the result, so be it.  */
+-	  if (__builtin_expect (db->negtimeout == 0, 0))
++	  /* If we have a transient error or cannot permanently store
++	     the result, so be it.  */
++	  if (all_tryagain || __builtin_expect (db->negtimeout == 0, 0))
+ 	    {
+ 	      /* Mark the old entry as obsolete.  */
+ 	      if (dh != NULL)
+diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c
+index 49e130c..e2ba09d 100644
+--- a/nscd/pwdcache.c
++++ b/nscd/pwdcache.c
+@@ -1,5 +1,5 @@
+ /* Cache handling for passwd lookup.
+-   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
++   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+ 
+@@ -124,8 +124,9 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req,
+ 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
+ 						MSG_NOSIGNAL));
+ 
+-	  /* If we cannot permanently store the result, so be it.  */
+-	  if (__builtin_expect (db->negtimeout == 0, 0))
++	  /* If we have a transient error or cannot permanently store
++	     the result, so be it.  */
++	  if (errno == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
+ 	    {
+ 	      /* Mark the old entry as obsolete.  */
+ 	      if (dh != NULL)
+diff --git a/nscd/servicescache.c b/nscd/servicescache.c
+index d3d5dce..a6337e3 100644
+--- a/nscd/servicescache.c
++++ b/nscd/servicescache.c
+@@ -1,5 +1,5 @@
+ /* Cache handling for services lookup.
+-   Copyright (C) 2007, 2008, 2009, 2011 Free Software Foundation, Inc.
++   Copyright (C) 2007, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@drepper.com>, 2007.
+ 
+@@ -108,8 +108,9 @@ cache_addserv (struct database_dyn *db, int fd, request_header *req,
+ 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
+ 						MSG_NOSIGNAL));
+ 
+-	  /* If we cannot permanently store the result, so be it.  */
+-	  if (__builtin_expect (db->negtimeout == 0, 0))
++	  /* If we have a transient error or cannot permanently store
++	     the result, so be it.  */
++	  if (errval == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
+ 	    {
+ 	      /* Mark the old entry as obsolete.  */
+ 	      if (dh != NULL)
diff --git a/testing/glibc/glibc-2.15-strcasecmp-disable-avx.patch b/testing/glibc/glibc-2.15-strcasecmp-disable-avx.patch
new file mode 100644
index 000000000..4c104fa55
--- /dev/null
+++ b/testing/glibc/glibc-2.15-strcasecmp-disable-avx.patch
@@ -0,0 +1,48 @@
+diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S
+index f93c83d..d8aa889 100644
+--- a/sysdeps/x86_64/multiarch/strcmp.S
++++ b/sysdeps/x86_64/multiarch/strcmp.S
+@@ -105,11 +105,6 @@ ENTRY(__strcasecmp)
+	jne	1f
+	call	__init_cpu_features
+ 1:
+-#  ifdef HAVE_AVX_SUPPORT
+-	leaq	__strcasecmp_avx(%rip), %rax
+-	testl	$bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
+-	jnz	2f
+-#  endif
+	leaq	__strcasecmp_sse42(%rip), %rax
+	testl	$bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
+	jnz	2f
+@@ -128,11 +123,6 @@ ENTRY(__strncasecmp)
+	jne	1f
+	call	__init_cpu_features
+ 1:
+-#  ifdef HAVE_AVX_SUPPORT
+-	leaq	__strncasecmp_avx(%rip), %rax
+-	testl	$bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
+-	jnz	2f
+-#  endif
+	leaq	__strncasecmp_sse42(%rip), %rax
+	testl	$bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
+	jnz	2f
+@@ -152,19 +142,6 @@ weak_alias (__strncasecmp, strncasecmp)
+ # include "strcmp-sse42.S"
+
+
+-# ifdef HAVE_AVX_SUPPORT
+-#  if defined USE_AS_STRCASECMP_L || defined USE_AS_STRNCASECMP_L
+-#   define LABEL(l) .L##l##_avx
+-#   define GLABEL(l) l##_avx
+-#   define USE_AVX 1
+-#   undef STRCMP_SSE42
+-#   define STRCMP_SSE42 STRCMP_AVX
+-#   define SECTION avx
+-#   include "strcmp-sse42.S"
+-#  endif
+-# endif
+-
+-
+ # undef ENTRY
+ # define ENTRY(name) \
+	.type STRCMP_SSE2, @function; \
diff --git a/testing/shadow/PKGBUILD b/testing/shadow/PKGBUILD
index 7409f0f9f..b47226ed4 100644
--- a/testing/shadow/PKGBUILD
+++ b/testing/shadow/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 150166 2012-02-14 01:55:53Z dreisner $
+# $Id: PKGBUILD 150202 2012-02-14 16:39:16Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=shadow
 pkgver=4.1.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Password and account management tool suite with support for shadow files and PAM"
 arch=('i686' 'x86_64')
 url='http://pkg-shadow.alioth.debian.org/'
@@ -30,6 +30,7 @@ source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2"{
         passwd
         shadow.cron.daily
         useradd.defaults
+        nscd-error-reporting.patch
         xstrdup.patch
         shadow-strncpy-usage.patch
         shadow-add-missing-include.patch)
@@ -46,6 +47,7 @@ sha1sums=('3ab1ae0e30af36d04445314fcb5a079bdf05de41'
           '611be25d91c3f8f307c7fe2485d5f781e5dee75f'
           '5d83ba7e11c765c951867cbe00b0ae7ff57148fa'
           '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19'
+          'ae6eebb842c433ac4022c493294a13ed68e06acc'
           '6010fffeed1fc6673ad9875492e1193b1a847b53'
           '21e12966a6befb25ec123b403cd9b5c492fe5b16'
           '0697a21f7519de30821da7772677035652df4ad2')
@@ -62,6 +64,7 @@ build() {
   patch -Np1 <"$srcdir/xstrdup.patch"
   patch -Np1 <"$srcdir/shadow-strncpy-usage.patch"
   patch -Np1 <"$srcdir/shadow-add-missing-include.patch"
+  patch -Np1 <"$srcdir/nscd-error-reporting.patch"
 
   # supress etc/pam.d/*, we provide our own
   sed -i '/^SUBDIRS/s/pam.d//' etc/Makefile.in
diff --git a/testing/shadow/nscd-error-reporting.patch b/testing/shadow/nscd-error-reporting.patch
new file mode 100644
index 000000000..a4075756e
--- /dev/null
+++ b/testing/shadow/nscd-error-reporting.patch
@@ -0,0 +1,17 @@
+diff --git a/upstream/trunk/lib/nscd.c b/upstream/trunk/lib/nscd.c
+index 227c205..7adb58f 100644
+--- a/lib/nscd.c
++++ b/lib/nscd.c
+@@ -39,8 +39,11 @@ int nscd_flush_cache (const char *service)
+ 		/* nscd is not installed, or it is installed but uses an
+ 		   interpreter that is missing.  Probably the former. */
+ 		return 0;
++	} else if (code == 1) {
++		/* nscd is installed, but it isn't active. */
++		return 0;
+ 	} else if (code != 0) {
+-		(void) fprintf (stderr, _("%s: nscd exited with status %d"),
++		(void) fprintf (stderr, _("%s: nscd exited with status %d\n"),
+ 		                Prog, code);
+ 		(void) fprintf (stderr, _(MSG_NSCD_FLUSH_CACHE_FAILED), Prog);
+ 		return -1;
diff --git a/testing/xf86-video-savage/PKGBUILD b/testing/xf86-video-savage/PKGBUILD
index b09d8495b..74cb1514d 100644
--- a/testing/xf86-video-savage/PKGBUILD
+++ b/testing/xf86-video-savage/PKGBUILD
@@ -1,29 +1,35 @@
-# $Id: PKGBUILD 150067 2012-02-12 09:45:36Z andyrtr $
+# $Id: PKGBUILD 150182 2012-02-14 09:08:45Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-savage
 pkgver=2.3.3
-pkgrel=2
+pkgrel=3
+_gitver=c4022796ec69bb3223d435d8442f9168aebe9c3d
 pkgdesc="X.org savage video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903' 'libdrm' 'xf86driproto' 'mesa>=8.0') # 'glproto')
-conflicts=('xorg-server<1.11.99.903')
+makedepends=('xorg-server-devel>=1.11.99.903') # 'libdrm' 'xf86driproto' 'mesa>=8.0') # 'glproto')
+conflicts=('xorg-server<1.11.99.903' 'savage-dri')
 options=(!libtool !makeflags)
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('d3854d375dbf7d83bf90e30d72837ce60d808119c6fa4bb98088e68e7cc7e7b2')
+source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        #http://cgit.freedesktop.org/xorg/driver/xf86-video-savage/snapshot/xf86-video-savage-${_gitver}.tar.gz
+        ftp://ftp..archlinux.org/other/xf86-video-savage/xf86-video-savage-${_gitver}.tar.gz)
+md5sums=('3a7921de0d365ab5dd1af15010807e36')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr #--enable-dri
+  #cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${srcdir}/${pkgname}*
+  autoreconf -fi
+  ./configure --prefix=/usr --disable-dri
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  #cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${srcdir}/${pkgname}*
   make DESTDIR="${pkgdir}" install
 
   install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"