Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/electricsheep/PKGBUILD
	community-testing/gnash/PKGBUILD
	community-testing/performous/PKGBUILD
	community/drbd/PKGBUILD
	community/oss/PKGBUILD
	community/pinot/PKGBUILD
	core/glibc/PKGBUILD
	core/kmod/PKGBUILD
	core/pkg-config/PKGBUILD
	core/systemd/PKGBUILD
	extra/bitlbee/PKGBUILD
	extra/mesa/PKGBUILD
	extra/nettle/PKGBUILD
	extra/xfce4-netload-plugin/PKGBUILD
	kde-unstable/kdepim/PKGBUILD
	multilib/lib32-glibc/PKGBUILD
	multilib/lib32-mesa/PKGBUILD
	multilib/lib32-mpg123/PKGBUILD
	multilib/lib32-nettle/PKGBUILD
	multilib/lib32-nouveau-dri/PKGBUILD
	multilib/lib32-pcre/PKGBUILD
	multilib/lib32-readline/PKGBUILD
	multilib/zsnes/PKGBUILD
	multilib/zsnes/zsnes.patch
	testing/cryptsetup/PKGBUILD
	testing/ekiga/PKGBUILD
	testing/iputils/PKGBUILD
	testing/poppler/PKGBUILD
	testing/util-linux/PKGBUILD
	testing/util-linux/util-linux.install

63 files changed, 813 insertions, 243 deletions

diff --git a/community/avr-gdb/PKGBUILD b/community/avr-gdb/PKGBUILD
new file mode 100644
index 000000000..ba22c2407
--- /dev/null
+++ b/community/avr-gdb/PKGBUILD
@@ -0,0 +1,50 @@
+# Maintainer: schuay <jakob.gruber@gmail.com>
+# Contributor: Ivan Sichmann Freitas <ivansichfreitas at gmail dot com>
+# Contributor: Laszlo Papp <djszapi2 at gmail dot com>
+# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
+# Contributor: Vladimir Cerny <blackvladimir@gmail.com>
+# Contributor: 4javier <4javieregATgmailDOTcom>
+
+pkgname=avr-gdb
+_pkgname=gdb
+pkgver=7.4
+pkgrel=1
+pkgdesc="The GNU Debugger for AVR"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/gdb/"
+license=('GPL3')
+depends=('python')
+options=('!libtool')
+source=(http://ftp.gnu.org/gnu/gdb/${_pkgname}-${pkgver}.tar.bz2)
+md5sums=('95a9a8305fed4d30a30a6dc28ff9d060')
+
+build() {
+  cd ${srcdir}/${_pkgname}-${pkgver}
+
+  unset LDFLAGS
+  export CFLAGS="-O2 -pipe"
+  export CXXFLAGS="$CFLAGS"
+    
+  ./configure --prefix=/usr \
+    --target=avr \
+    --disable-nls \
+    --enable-languages=c,c++ \
+    --infodir=/usr/share/info \
+    --libdir=/usr/lib \
+    --program-prefix=avr- \
+    --libexecdir=/usr/lib \
+    --mandir=/usr/share/man \
+    --with-system-readline
+  make
+}
+
+package() {
+  cd ${srcdir}/${_pkgname}-${pkgver}
+
+  make DESTDIR=${pkgdir} install
+
+  rm -f ${pkgdir}/usr/lib/libiberty.a
+  rm -rf ${pkgdir}/usr/share/info
+  rm -rf ${pkgdir}/usr/share/gdb
+  rm -rf ${pkgdir}/usr/include/gdb
+}
diff --git a/community/awesome/PKGBUILD b/community/awesome/PKGBUILD
index 95010badd..6ed44edd8 100644
--- a/community/awesome/PKGBUILD
+++ b/community/awesome/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 72334 2012-06-12 00:36:49Z seblu $
+# $Id: PKGBUILD 73742 2012-07-15 11:16:56Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: xduugu
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Vesa Kaihlavirta
 
 pkgname=awesome
-pkgver=3.4.12
+pkgver=3.4.13
 pkgrel=1
 pkgdesc='Highly configurable framework window manager'
 arch=('i686' 'x86_64' 'mips64el')
@@ -42,12 +42,12 @@ optdepends=(
 provides=('notification-daemon')
 source=("$url/download/$pkgname-$pkgver.tar.xz"
         "$pkgname.desktop")
-md5sums=('2c3490b820a19c044290027e6f2eb6c8'
+md5sums=('8449fde51c08ca69fe4c5bb831b3c618'
          '0fdbeec43d211c6750041d7e37611a6a')
 
 build() {
   cd $pkgname-$pkgver
-  make CMAKE_ARGS=' -DPREFIX=/usr -DSYSCONFDIR=/etc -DCMAKE_BUILD_TYPE=RELEASE'
+  make CMAKE_ARGS=' -DCMAKE_INSTALL_PREFIX=/usr -DSYSCONFDIR=/etc -DCMAKE_BUILD_TYPE=RELEASE'
 }
 
 package() {
diff --git a/community/bsd-games/PKGBUILD b/community/bsd-games/PKGBUILD
index 47f8ea801..910754aec 100644
--- a/community/bsd-games/PKGBUILD
+++ b/community/bsd-games/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 72260 2012-06-11 12:32:05Z cbrannon $
+# $Id: PKGBUILD 73816 2012-07-15 23:02:25Z cbrannon $
 # Maintainer: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
 # Contributor: SmackleFunky <smacklefunky@optusnet.com.au>
 
 pkgname=bsd-games
 pkgver=2.17
-pkgrel=12
+pkgrel=13
 pkgdesc="A linux port for a collection of BSD command line games."
 url="ftp://ftp.ibiblio.org/pub/Linux/games/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,9 +13,10 @@ install=$pkgname.install
 license=('BSD')
 depends=(gcc-libs words sh)
 makedepends=('flex' 'bison' 'm4')
-source=(ftp://ftp.ibiblio.org/pub/Linux/games/$pkgname-$pkgver.tar.gz \
-	      config.params stdio.h.diff gamescreen.h.diff getline.diff
-		  number.c.diff bsd-games-2.17-64bit.patch)
+source=(ftp://ftp.ibiblio.org/pub/Linux/games/$pkgname-$pkgver.tar.gz
+        config.params stdio.h.diff gamescreen.h.diff getline.diff
+        number.c.diff bsd-games-2.17-64bit.patch
+        bad-ntohl-cast.diff null-check.diff)
 
 build() {
   cd "${srcdir}/$pkgname-$pkgver"
@@ -36,6 +37,10 @@ build() {
 
 # Incorporated some fixes from Debian
   patch -p1 -i "${srcdir}/number.c.diff"
+# ntohl returns uint32_t, not unsigned long:
+  patch -p1 -i "${srcdir}/bad-ntohl-cast.diff"
+# And add a NULL pointer check to the "hunt" program, fixing a segfault.
+  patch -p1 -i "${srcdir}/null-check.diff"
 
   sed -i "s/FISH/GO-FISH/g; s/\.Nm fish/\.Nm go-fish/g" fish/fish.6
   sed -i "s/tenths/tenth/g" tests/number.-0.1
@@ -92,4 +97,6 @@ md5sums=('238a38a3a017ca9b216fc42bde405639'
          '9c0fa6e2345bd0a7945c9a41d5ba68aa'
          '5356bd6999ae53dd27cb2a0f837a3e70'
          '47249a90f38ccb4dd07625b245bbc728'
-         '257813b76a41c8b2c02701571c804227')
+         '257813b76a41c8b2c02701571c804227'
+         '3d21a9dad2e603ddf3842972e4ff85a1'
+         'a43ca0b4b9ebc4eec26372c52014ac0a')
diff --git a/community/bsd-games/bad-ntohl-cast.diff b/community/bsd-games/bad-ntohl-cast.diff
new file mode 100644
index 000000000..f783813e9
--- /dev/null
+++ b/community/bsd-games/bad-ntohl-cast.diff
@@ -0,0 +1,22 @@
+diff --git a/hunt/hunt/playit.c b/hunt/hunt/playit.c
+index 9acf86e..881a4e7 100644
+--- a/hunt/hunt/playit.c
++++ b/hunt/hunt/playit.c
+@@ -114,7 +114,7 @@ playit()
+ 		bad_con();
+ 		/* NOTREACHED */
+ 	}
+-	if (ntohl(version) != (unsigned long)HUNT_VERSION) {
++	if (ntohl(version) != (uint32_t)HUNT_VERSION) {
+ 		bad_ver();
+ 		/* NOTREACHED */
+ 	}
+@@ -649,7 +649,7 @@ do_message()
+ 		bad_con();
+ 		/* NOTREACHED */
+ 	}
+-	if (ntohl(version) != (unsigned long)HUNT_VERSION) {
++	if (ntohl(version) != (uint32_t)HUNT_VERSION) {
+ 		bad_ver();
+ 		/* NOTREACHED */
+ 	}
diff --git a/community/bsd-games/null-check.diff b/community/bsd-games/null-check.diff
new file mode 100644
index 000000000..048ed93f4
--- /dev/null
+++ b/community/bsd-games/null-check.diff
@@ -0,0 +1,24 @@
+diff --git a/hunt/hunt/hunt.c b/hunt/hunt/hunt.c
+index 11f4c44..28321bc 100644
+--- a/hunt/hunt/hunt.c
++++ b/hunt/hunt/hunt.c
+@@ -394,7 +394,8 @@ broadcast_vec(s, vector)
+ 
+ 	vec_cnt = 0;
+ 	for (ip = ifp; ip; ip = ip->ifa_next)
+-		if ((ip->ifa_addr->sa_family == AF_INET) &&
++		if (ip->ifa_addr &&
++		    (ip->ifa_addr->sa_family == AF_INET) &&
+ 		    (ip->ifa_flags & IFF_BROADCAST))
+ 			vec_cnt++;
+ 
+@@ -405,7 +406,8 @@ broadcast_vec(s, vector)
+ 
+ 	vec_cnt = 0;
+ 	for (ip = ifp; ip; ip = ip->ifa_next)
+-		if ((ip->ifa_addr->sa_family == AF_INET) &&
++		if (ip->ifa_addr &&
++		    (ip->ifa_addr->sa_family == AF_INET) &&
+ 		    (ip->ifa_flags & IFF_BROADCAST))
+ 			memcpy(&(*vector)[vec_cnt++], ip->ifa_broadaddr,
+ 			       sizeof(struct sockaddr_in));
diff --git a/community/c++-gtk-utils/PKGBUILD b/community/c++-gtk-utils/PKGBUILD
index 51ed71635..c466f8b8f 100644
--- a/community/c++-gtk-utils/PKGBUILD
+++ b/community/c++-gtk-utils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 71906 2012-06-03 07:35:53Z giovanni $
+# $Id: PKGBUILD 73736 2012-07-15 04:46:33Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=c++-gtk-utils
-pkgver=2.0.9
+pkgver=2.0.10
 pkgrel=1
 pkgdesc="Classes and functions for programming in GTK+"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL2.1')
 depends=('gtk3')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/project/cxx-gtk-utils/cxx-gtk-utils/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('62d596cda98a7d82b3ea21cb1ce7b546')
+md5sums=('6a2ba8c42356fa82e60d75410ebe6c54')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/calf/PKGBUILD b/community/calf/PKGBUILD
new file mode 100644
index 000000000..078681e5a
--- /dev/null
+++ b/community/calf/PKGBUILD
@@ -0,0 +1,35 @@
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+
+pkgname=calf
+pkgver=0.0.18.6
+pkgrel=1
+pkgdesc="LV2/DSSI/LADSPA plug-ins suite and standalone JACK host"
+arch=('i686' 'x86_64')
+url="http://calf.sf.net/"
+license=('LGPL')
+depends=('libglade' 'lash')
+makedepends=('lv2core' 'ladspa' 'dssi')
+source=("http://downloads.sf.net/$pkgname/$pkgname-$pkgver.tar.gz"
+        'include_fix.patch')
+md5sums=('780854561dad1cb873041d7a0b98cbcd'
+         '5aab4d057fb3646c43e6dfcad4c7128f')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  patch -Np1 -i "$srcdir/include_fix.patch"
+
+  ./configure	--prefix=/usr \
+              --enable-experimental
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+
+  rm "$pkgdir/usr/share/icons/hicolor/icon-theme.cache"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/calf/include_fix.patch b/community/calf/include_fix.patch
new file mode 100644
index 000000000..243bd86ab
--- /dev/null
+++ b/community/calf/include_fix.patch
@@ -0,0 +1,33 @@
+diff -aur calf-0.0.18.6.orig/src/benchmark.cpp calf-0.0.18.6/src/benchmark.cpp
+--- calf-0.0.18.6.orig/src/benchmark.cpp	2012-07-08 21:57:55.246042862 +0800
++++ calf-0.0.18.6/src/benchmark.cpp	2012-07-08 21:58:20.015908672 +0800
+@@ -26,6 +26,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <config.h>
++#include <unistd.h>
+ #include <calf/audio_fx.h>
+ 
+ #ifdef BENCHMARK_PLUGINS
+diff -aur calf-0.0.18.6.orig/src/osctlnet.cpp calf-0.0.18.6/src/osctlnet.cpp
+--- calf-0.0.18.6.orig/src/osctlnet.cpp	2012-07-08 21:57:55.246042862 +0800
++++ calf-0.0.18.6/src/osctlnet.cpp	2012-07-08 21:58:19.002580827 +0800
+@@ -26,6 +26,7 @@
+ #include <stdlib.h>
+ #include <sstream>
+ #include <stdio.h>
++#include <unistd.h>
+ using namespace osctl;
+ using namespace std;
+ 
+diff -aur calf-0.0.18.6.orig/src/preset.cpp calf-0.0.18.6/src/preset.cpp
+--- calf-0.0.18.6.orig/src/preset.cpp	2012-07-08 21:57:55.246042862 +0800
++++ calf-0.0.18.6/src/preset.cpp	2012-07-08 21:58:18.989247567 +0800
+@@ -20,6 +20,7 @@
+  */
+ 
+ #include <config.h>
++#include <unistd.h>
+ #include <fcntl.h>
+ #include <stdlib.h>
+ #include <errno.h>
diff --git a/community/cdfs/PKGBUILD b/community/cdfs/PKGBUILD
index 56ed891b3..71b7c99f3 100644
--- a/community/cdfs/PKGBUILD
+++ b/community/cdfs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 72481 2012-06-15 13:19:51Z spupykin $
+# $Id: PKGBUILD 73696 2012-07-14 13:06:31Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar>
 
 pkgname=cdfs
 pkgver=2.6.27
-pkgrel=22
+pkgrel=23
 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files."
 arch=(i686 x86_64 'mips64el')
 url="http://www.elis.UGent.be/~ronsse/cdfs/"
@@ -23,13 +23,13 @@ md5sums=('ac64c014a90e3c488394832ea29605b3'
 build() {
   _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -`
   depends=("linux>=3.${_kernver}" "linux<3.`expr ${_kernver} + 1`")
-  _kernverfull=`cat /lib/modules/extramodules-3.${_kernver}-ARCH/version`
+  _kernverfull=`cat /usr/lib/modules/extramodules-3.${_kernver}-ARCH/version`
 
   cd $srcdir/$pkgname-$pkgver
   patch -p1 <$srcdir/cdfs-3.0.patch
   patch -p1 <$srcdir/cdfs-3.2.patch
   patch -p1 <$srcdir/cdfs-3.4.patch
-  make KDIR=/lib/modules/${_kernverfull}/build
-  install -Dm0644 cdfs.ko $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/cdfs.ko
+  make KDIR=/usr/lib/modules/${_kernverfull}/build
+  install -Dm0644 cdfs.ko $pkgdir/usr/lib/modules/extramodules-3.${_kernver}-ARCH/cdfs.ko
   sed -i "s|extramodules-.*-ARCH|extramodules-3.${_kernver}-ARCH|" $startdir/cdfs.install
 }
diff --git a/community/cdfs/cdfs.install b/community/cdfs/cdfs.install
index d24929157..6be46f6d5 100644
--- a/community/cdfs/cdfs.install
+++ b/community/cdfs/cdfs.install
@@ -1,14 +1,14 @@
 post_install() {
-  EXTRAMODULES='extramodules-3.2-ARCH'
-  depmod $(cat /lib/modules/$EXTRAMODULES/version)
+  EXTRAMODULES='extramodules-3.4-ARCH'
+  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-  EXTRAMODULES='extramodules-3.2-ARCH'
-  depmod $(cat /lib/modules/$EXTRAMODULES/version)
+  EXTRAMODULES='extramodules-3.4-ARCH'
+  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-  EXTRAMODULES='extramodules-3.2-ARCH'
-  depmod $(cat /lib/modules/$EXTRAMODULES/version)
+  EXTRAMODULES='extramodules-3.4-ARCH'
+  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
diff --git a/community/drbd/PKGBUILD b/community/drbd/PKGBUILD
index bff899504..5babd0437 100644
--- a/community/drbd/PKGBUILD
+++ b/community/drbd/PKGBUILD
@@ -1,25 +1,27 @@
-# $Id: PKGBUILD 69076 2012-04-08 23:26:43Z seblu $
+# $Id: PKGBUILD 73826 2012-07-16 02:13:49Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgname=drbd
 pkgver=8.3.11
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Userland tools for drbd block devices'
 url='http://www.drbd.org'
 license=('GPL2')
 source=("http://oss.linbit.com/drbd/8.3/$pkgname-$pkgver.tar.gz"
         "$pkgname.rc"
+        "$pkgname.service"
         '01-remove-old-sanity-check.diff')
 backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf')
 md5sums=('e47a35a80143b72e9708844efbe2e608'
-         '6a91609fcd69b435a2a96599f07ad856'
+         '8902a2f7aca6245c27e9566a1509312c'
+         'afbb345094db49b0a474c0b4e51c0acd'
          '24144d23b31f9ce66929fe989247c779')
 
 build() {
   cd $pkgname-$pkgver
   # patch bad sanity check in makefile
-  patch -p1 -i ../01-remove-old-sanity-check.diff
+  patch -p1 -i "$srcdir/01-remove-old-sanity-check.diff"
   ./configure \
     --prefix=/usr \
     --localstatedir=/var \
@@ -41,21 +43,28 @@ build() {
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-  # move forced /sbin binaries and fix harcoded path
-  mv "$pkgdir/sbin"/* "$pkgdir/usr/sbin"
-  rmdir "$pkgdir/sbin"
-  sed -i 's,/sbin/drbdadm,/usr/sbin/drbdadm,' \
-    "$pkgdir/etc/udev/rules.d/65-drbd.rules"
+  # move forced /sbin binaries
+  cd "$pkgdir"
+  mv sbin/* usr/sbin
+  rmdir sbin
+  # fix hardcoded path in udev rules
+  sed -i 's,/sbin/drbdadm,/usr/sbin/drbdadm,' etc/udev/rules.d/65-drbd.rules
   # move udev files
-  mv "$pkgdir/etc/udev" "$pkgdir/usr/lib"
+  mv etc/udev usr/lib
   # move bash completion
-  install -d -m 755 "$pkgdir/usr/share/bash-completion"
-  mv "$pkgdir/etc/bash_completion.d" \
-    "$pkgdir/usr/share/bash-completion/completions"
+  install -dm 755 usr/share/bash-completion
+  mv etc/bash_completion.d usr/share/bash-completion/completions
   # remove /var/lock
-  rmdir "$pkgdir/var/lock"
+  rmdir var/lock
+  # autoload module
+  install -Dm 644 /dev/null usr/lib/modules-load.d/$pkgname.conf
+  echo 'drbd' > usr/lib/modules-load.d/$pkgname.conf
   # setup initscript (replace)
-  install -D -m 755 ../$pkgname.rc "$pkgdir/etc/rc.d/$pkgname"
+  cd "$srcdir"
+  install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname"
+  # install systemd stuff
+  install -Dm 644 $pkgname.service \
+    "$pkgdir/usr/lib/systemd/system/$pkgname.service"
 }
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/drbd/drbd.rc b/community/drbd/drbd.rc
index 893ce3e20..b8b196e4b 100644
--- a/community/drbd/drbd.rc
+++ b/community/drbd/drbd.rc
@@ -29,9 +29,9 @@ case "$1" in
     check_config
     # load config
     $DRBDADM adjust all 2>/dev/null || { stat_fail; exit 1; }
-    # User interruptible version of wait-connect all
+    # user interruptible version of wait-connect all
     $DRBDADM wait-con-int 2>/dev/null || { stat_fail; exit 1; }
-    # Become primary if configured
+    # become primary if configured
     $DRBDADM sh-b-pri all 2>/dev/nul l|| { stat_fail; exit 1; }
     add_daemon drbd
     stat_done
diff --git a/community/drbd/drbd.service b/community/drbd/drbd.service
new file mode 100644
index 000000000..ddd6c62b7
--- /dev/null
+++ b/community/drbd/drbd.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=Distributed Replicated Block Device
+After=systemd-modules-load.service network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+
+# load config
+ExecStart=/usr/sbin/drbdadm adjust all
+# user interruptible version of wait-connect all
+ExecStart=/usr/sbin/drbdadm wait-con-int
+# become primary if configured
+ExecStart=/usr/sbin/drbdadm sh-b-pri all
+# disconnect and detach all resources
+ExecStop=/usr/sbin/drbdadm down all
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index 4d82d08e0..205266d43 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73513 2012-07-08 23:03:50Z lcarlier $
+# $Id: PKGBUILD 73734 2012-07-14 22:35:52Z lcarlier $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor : sebikul <sebikul@gmail.com>
 
@@ -15,7 +15,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba
          'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc'
          'gambas3-gb-xml-xslt' 'gambas3-gb-web') 
 pkgver=3.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gambas.sourceforge.net/"
@@ -1161,7 +1161,7 @@ package_gambas3-gb-xml-html() {
 }
 
 package_gambas3-gb-xml-rpc() {
-  depends=('gambas3-gb-xml' 'gambas3-gb-net' 'gambas3-gb-net-curl')
+  depends=('gambas3-gb-xml' 'gambas3-gb-net-curl')
   pkgdesc="XML-RPC component"
 
   ## workaround for splitting
@@ -1173,8 +1173,11 @@ package_gambas3-gb-xml-rpc() {
   make XDG_UTILS='' DESTDIR="${pkgdir}" install
   ##
 
+  
+  # BUG: rpc component need the xml gambas3 component to be built/installed before!
   cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
   make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
 
   ## cleanup the workaround
   cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
@@ -1183,8 +1186,12 @@ package_gambas3-gb-xml-rpc() {
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
   cd ${srcdir}/${pkgbase}-${pkgver}/main
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.xml.{[c-l]*,xslt*,so*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.xml.{[i-l]*,x*}
+  # BUG: rpc component need the xml gambas3 component to be built/installed before!
+  rm ${pkgdir}/usr/lib/gambas3/gb.xml.[c-l]*
+  rm ${pkgdir}/usr/lib/gambas3/gb.xml.[s-x]*
+  rm ${pkgdir}/usr/share/gambas3/info/gb.xml.[h-l]*
+  rm ${pkgdir}/usr/share/gambas3/info/gb.xml.xslt.*
+  # BUG
   ##
 }
 
diff --git a/community/gammu/PKGBUILD b/community/gammu/PKGBUILD
index 047c2dd8b..cf50f6cf2 100644
--- a/community/gammu/PKGBUILD
+++ b/community/gammu/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 69642 2012-04-20 22:20:38Z tdziedzic $
+# $Id: PKGBUILD 73714 2012-07-14 13:31:58Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=gammu
-pkgver=1.31.0
-pkgrel=2
+pkgver=1.32.0
+pkgrel=1
 pkgdesc="GNU All Mobile Management Utilities"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://wammu.eu/"
@@ -14,9 +14,8 @@ depends=('bluez' 'curl' 'libmysqlclient'
          'postgresql-libs' 'python2' 'libusb')
 makedepends=('cmake' 'doxygen' 'mysql')
 optdepends=('dialog: support for the gammu-config script')
-#options=('!makeflags')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('9b1ff5d84730f025802b961ab9f26717')
+md5sums=('8ea16c6b3cc48097a8e62311fe0e25b9')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/geany-plugins/PKGBUILD b/community/geany-plugins/PKGBUILD
index 23874b8d0..39966c035 100644
--- a/community/geany-plugins/PKGBUILD
+++ b/community/geany-plugins/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 72667 2012-06-18 20:30:29Z arodseth $
+# $Id: PKGBUILD 73662 2012-07-12 20:54:20Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>  
 # Contributor: djgera
 # Contributor: Patrick Melo <patrick@patrickmelo.eti.br>
 
 pkgname=geany-plugins
-pkgver=0.21.1
-pkgrel=2
+pkgver=1.22
+pkgrel=1
 pkgdesc="Combined plugins release for Geany"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://plugins.geany.org/"
@@ -16,7 +16,7 @@ makedepends=('intltool')
 optdepends=('hspell: hebrew spell checker')
 install=geany-plugins.install
 source=("http://plugins.geany.org/geany-plugins/$pkgname-$pkgver.tar.bz2")
-sha256sums=('3a4bd29e690067ca5b97c11a74ea95ad0c960e5d45b205756c1f9e1f0f2847a6')
+sha256sums=('a0dcf0cb00ac260670ef8fae682aade60c7c3075c88121fd21f3aecdff84e1ce')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -29,11 +29,6 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
-  rmdir \
-    "$pkgdir/usr/share/geany-plugins/devhelp" \
-    "$pkgdir/usr/share/doc/geany-plugins/devhelp" \
-    "$pkgdir/usr/share/geany-plugins/debugger" \
-    "$pkgdir/usr/share/doc/geany-plugins/debugger"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/i2c-tools/PKGBUILD b/community/i2c-tools/PKGBUILD
new file mode 100644
index 000000000..679dad5ca
--- /dev/null
+++ b/community/i2c-tools/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 73640 2012-07-12 13:05:49Z tredaelli $
+# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
+# Contributor: DonVla <donvla@users.sourceforge.net>
+
+pkgname=i2c-tools
+pkgver=3.1.0
+pkgrel=3
+pkgdesc="Heterogeneous set of I2C tools for Linux that used to be part of lm-sensors"
+arch=('i686' 'x86_64')
+url="http://www.lm-sensors.org/wiki/I2CTools"
+license=('GPL')
+depends=('python2')
+optdepends=('read-edid: for decode-edid script')
+source=(http://dl.lm-sensors.org/${pkgname}/releases/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('f15019e559e378c6e9d5d6299a00df21')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}" 
+  make
+  make -C eepromer CFLAGS="$CFLAGS -I../include"
+  cd py-smbus
+  CPPFLAGS="$CPPFLAGS -I../include" python2 setup.py build
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make prefix="${pkgdir}/usr" install
+  install -Dm755 eepromer/eeprog eepromer/eeprom eepromer/eepromer "${pkgdir}/usr/sbin"
+  cd py-smbus
+  python2 setup.py install --prefix "${pkgdir}/usr"
+  rm -rf "${pkgdir}/usr/include"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD
index 6b8b97719..2c92df1e7 100644
--- a/community/kdenlive/PKGBUILD
+++ b/community/kdenlive/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 71628 2012-05-31 14:14:16Z spupykin $
+# $Id: PKGBUILD 73620 2012-07-12 08:51:08Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Zuf <kontakt.zuf@gmail.com>
 # Contributor: Darwin Bautista <djclue917@gmail.com>
 
 pkgname=kdenlive
 pkgver=0.9.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A non-linear video editor for Linux"
 arch=('i686' 'x86_64' 'mips64el')
 # http://download.kde.org/stable/kdenlive/
diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD
index 821958cae..dfa6b51df 100644
--- a/community/keepalived/PKGBUILD
+++ b/community/keepalived/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 69505 2012-04-17 12:51:53Z seblu $
+# $Id: PKGBUILD 73694 2012-07-14 12:56:44Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Andrea Zucchelli <zukka77@gmail.com>
 
 pkgname=keepalived
-pkgver=1.2.2
-pkgrel=4
+pkgver=1.2.3
+pkgrel=1
 pkgdesc='Failover and monitoring daemon for LVS clusters'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.keepalived.org/'
@@ -14,17 +14,14 @@ depends=('openssl' 'popt' 'libnl1')
 source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz"
         'keepalived.rc'
         'keepalived.service'
-        'keepalived.conf'
-        'ip_vs_moved.patch')
-md5sums=('f68327ca142616a8463d2d105db122cd'
-         'baeb62a682c2b59d732cea84bf52cc87'
+        'keepalived.conf')
+md5sums=('1516a2fa0793184ff5c7ad77bac79460'
+         '0d7ea6296bce403a5d24be305a0a9d73'
          '7a327df915700dcd45a049d099c9c42b'
-         '9c8142da8730ad27a345587dea83ced7'
-         '87ee19c85adaedd3eb11bea8a5865d47')
+         '9c8142da8730ad27a345587dea83ced7')
 
 build() {
   cd $pkgname-$pkgver
-  patch -p1 -i ../ip_vs_moved.patch
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
diff --git a/community/keepalived/keepalived.rc b/community/keepalived/keepalived.rc
index 88bb90724..0ecfc7ded 100644
--- a/community/keepalived/keepalived.rc
+++ b/community/keepalived/keepalived.rc
@@ -4,36 +4,35 @@
 . /etc/rc.d/functions
 . /etc/conf.d/${0##*/}
 
-NAME=keepalived
 DAEMON=/usr/sbin/keepalived
 PID=$(pidof -o %PPID $DAEMON)
 
 case "$1" in
-	start)
-		stat_busy "Starting $NAME daemon"
-		[[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon $NAME && stat_done && exit 0
-		stat_fail
-	;;
+  start)
+    stat_busy "Starting ${0##*/} daemon"
+    [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon ${0##*/} && stat_done && exit 0
+    stat_fail
+  ;;
   stop)
-		stat_busy "Stopping $NAME daemon"
-		[[ $PID ]] && kill $PID &> /dev/null && rm_daemon $NAME && stat_done && exit 0
-		stat_fail
-	;;
+    stat_busy "Stopping ${0##*/} daemon"
+    [[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0
+    stat_fail
+  ;;
   restart)
-		$0 stop
-		$0 start
-		exit 0
-	;;
+    $0 stop
+    $0 start
+    exit 0
+  ;;
   reload)
-		stat_busy "Reloading $NAME daemon"
-		[[ $PID ]] && kill -HUP $PID &> /dev/null && stat_done && exit 0
-		stat_fail
-	;;
-  *) 
-		echo "usage: ${0##*/} {start|stop|restart|reload}" >&2
-	;;
+    stat_busy "Reloading ${0##*/} daemon"
+    [[ $PID ]] && kill -HUP $PID &> /dev/null && stat_done && exit 0
+    stat_fail
+  ;;
+  *)
+    echo "usage: ${0##*/} {start|stop|restart|reload}" >&2
+  ;;
 esac
 
 exit 1
 
-# vim:set ts=2 sw=2 ft=sh noet:
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/leptonica/PKGBUILD b/community/leptonica/PKGBUILD
index aa5e4f7bd..62ee0d991 100644
--- a/community/leptonica/PKGBUILD
+++ b/community/leptonica/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 73532 2012-07-09 08:57:53Z spupykin $
+# $Id: PKGBUILD 73623 2012-07-12 09:07:57Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Christoph Drexler <chrdr at gmx dot at>
 
 pkgname=leptonica
 pkgver=1.69
-pkgrel=1
+pkgrel=2
 pkgdesc="Software that is broadly useful for image processing and image analysis applications"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.leptonica.com/"
 license=('custom')
-depends=('giflib' 'gnuplot' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'libwebp')
+options=(!libtool)
+depends=('giflib' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'libwebp')
 source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz)
 md5sums=('d4085c302cbcab7f9af9d3d6f004ab22')
 
diff --git a/community/libdlna/PKGBUILD b/community/libdlna/PKGBUILD
index f3fd73aa4..2e66d5198 100644
--- a/community/libdlna/PKGBUILD
+++ b/community/libdlna/PKGBUILD
@@ -1,31 +1,27 @@
-# $Id: PKGBUILD 58580 2011-11-15 20:11:36Z spupykin $
+# $Id: PKGBUILD 73658 2012-07-12 19:03:11Z spupykin $
 # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> 
 # Contributor: kastor <kastor@fobos.org.ar>
 
 pkgname=libdlna
-pkgver=0.2.3
-pkgrel=10
+pkgver=0.2.4
+pkgrel=11
 pkgdesc="An open-source implementation of DLNA (Digital Living Network Alliance) standards "
 url="http://libdlna.geexbox.org"
 license=("LGPL")
 arch=('i686' 'x86_64' 'mips64el')
 options=('!libtool' '!makeflags')  # not parallel safe, error find -ldlna  
-makedepends=('ctags')
+#makedepends=('ctags')
 depends=('glibc' 'ffmpeg')
-source=("http://libdlna.geexbox.org/releases/${pkgname}-${pkgver}.tar.bz2" "libdlna-0.2.3-libavcodec-libavformat-include-paths.patch" "ffmpeg-0.8.patch")
-md5sums=('2c974f95b711e5fd07f78fc4ebfcca66'
-         '937f1aebf930571127856056bd1d3959'
-         'a5c9f58233fc7fc79b5fe550b297273b')
+source=("http://libdlna.geexbox.org/releases/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('64d7de57aff5a729f2434fc5e69b4ffc')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i $srcdir/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch
-  patch -Np1 -i $srcdir/ffmpeg-0.8.patch
-  ./configure --prefix=/usr --includedir=/usr/include/libavformat 
-  make -j1 # not parallel safe, error find -ldlna
+  ./configure --prefix=/usr
+  make
 }
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  make INSTALL=/bin/install DESTDIR=${pkgdir} install
+  make DESTDIR=${pkgdir} install
 }
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index 3bd7e93c1..be0fd6f5c 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 73136 2012-07-02 10:22:36Z spupykin $
+# $Id: PKGBUILD 73804 2012-07-15 20:16:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
 pkgver=0.9.13
-pkgrel=1
+pkgrel=2
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libvirt.org/"
@@ -36,7 +36,8 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
 	libvirtd-guests.conf.d
 	libvirt.tmpfiles.d
 	openbsd-netcat-default.patch
-	libvirt-libnl3.patch)
+	libvirt-libnl3.patch
+	xdg.patch)
 md5sums=('86cbe53ee662e3b9e8bb0c63c737ba27'
          'c43244c40a0437038c82089618e7beaa'
          '3ed0e24f5b5e25bf553f5427d64915e6'
@@ -44,7 +45,8 @@ md5sums=('86cbe53ee662e3b9e8bb0c63c737ba27'
          'bc2971dacdbac967fc3474e50affc345'
          '8d98e62915785686b0b6c8c070628392'
          'b0be50eb9dfe4d133decf23b60880f7d'
-         'ba27fbcd989de8d84cfff98326f10c54')
+         'ba27fbcd989de8d84cfff98326f10c54'
+         '9b9fcdbd64d37d84ae73d9da0a7efed7')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -59,6 +61,7 @@ build() {
   [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch
 
   patch -Np1 -i ${srcdir}/libvirt-libnl3.patch
+  patch -Np1 -i ${srcdir}/xdg.patch
   aclocal
   automake --add-missing || true
   autoreconf
diff --git a/community/libvirt/xdg.patch b/community/libvirt/xdg.patch
new file mode 100644
index 000000000..0a12c83b5
--- /dev/null
+++ b/community/libvirt/xdg.patch
@@ -0,0 +1,14 @@
+diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
+index 0b32ffe..08dfbb0 100644
+--- a/src/rpc/virnetsocket.c
++++ b/src/rpc/virnetsocket.c
+@@ -97,6 +97,9 @@ static int virNetSocketForkDaemon(const char *binary)
+                                              NULL);
+ 
+     virCommandAddEnvPassCommon(cmd);
++    virCommandAddEnvPass(cmd, "XDG_CACHE_HOME");
++    virCommandAddEnvPass(cmd, "XDG_CONFIG_HOME");
++    virCommandAddEnvPass(cmd, "XDG_RUNTIME_DIR");
+     virCommandClearCaps(cmd);
+     virCommandDaemonize(cmd);
+     ret = virCommandRun(cmd, NULL);
diff --git a/community/lrzip/PKGBUILD b/community/lrzip/PKGBUILD
index 116232b2c..0b017ecb6 100644
--- a/community/lrzip/PKGBUILD
+++ b/community/lrzip/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 73561 2012-07-09 21:11:49Z arodseth $
+# $Id: PKGBUILD 73744 2012-07-15 12:25:29Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: graysky <graysky AT archlinux DOT us>
 # Contributor: kastor@fobos.org.ar
 
 pkgname=lrzip
-pkgver=0.613
+pkgver=0.614
 pkgrel=1
 pkgdesc="Multi-threaded compression using the rzip/lzma, lzo, and zpaq algorithms"
 url="http://lrzip.kolivas.org/"
@@ -18,7 +18,7 @@ then
 fi
 options=('!libtool')
 source=("http://ck.kolivas.org/apps/$pkgname/$pkgname-$pkgver.tar.bz2")
-sha256sums=('70dc55fbc4fe3d029c8edfc20f47f02d78c9c4c473201e6ec616febe9ce6b7eb')
+sha256sums=('65024d69d1773f3ccf84508a481d7de128c03d1cf9750b5803aead4a24522763')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/luabitop/PKGBUILD b/community/luabitop/PKGBUILD
new file mode 100644
index 000000000..9e8a83683
--- /dev/null
+++ b/community/luabitop/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 73728 2012-07-14 17:39:06Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# Contributor: Lucas Hermann Negri <kkndrox@gmail.com>
+
+pkgname=luabitop
+pkgver=1.0.2
+pkgrel=1
+pkgdesc='C extension adding bitwise operations on numbers'
+arch=(i686 x86_64)
+url='http://bitop.luajit.org/index.html'
+depends=('lua')
+source=("http://bitop.luajit.org/download/LuaBitOp-$pkgver.tar.gz")
+md5sums=('d0c1080fe0c844e8477279668e2d0d06')
+license=('MIT')
+
+build() {
+  cd LuaBitOp-$pkgver
+  make
+}
+
+package() {
+  cd LuaBitOp-$pkgver
+  install -Dm 644 bit.so "$pkgdir/usr/lib/lua/5.1/bit.so"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/luaposix/PKGBUILD b/community/luaposix/PKGBUILD
index 26a2c9407..77241e0fd 100644
--- a/community/luaposix/PKGBUILD
+++ b/community/luaposix/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73453 2012-07-07 23:53:09Z seblu $
+# $Id: PKGBUILD 73729 2012-07-14 18:16:59Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 # Contributor: Laszlo Papp <djszapi at archlinux us>
@@ -6,12 +6,12 @@
 
 pkgname=luaposix
 pkgver=5.1.20
-pkgrel=1
+pkgrel=2
 pkgdesc='A POSIX library for Lua programming language'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://luaforge.net/projects/luaposix/'
 license=('GPL' 'LGPL')
-depends=('lua')
+depends=('lua' 'luabitop')
 #checkdepends=('lunit')
 options=('!libtool')
 source=("https://github.com/downloads/rrthomas/$pkgname/$pkgname-$pkgver.tar.gz")
diff --git a/community/luarocks/PKGBUILD b/community/luarocks/PKGBUILD
index f288a5461..2c710e072 100644
--- a/community/luarocks/PKGBUILD
+++ b/community/luarocks/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 72118 2012-06-08 21:45:36Z cbrannon $
+# $Id: PKGBUILD 73676 2012-07-13 11:41:36Z cbrannon $
 # Maintainer: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 
 pkgname=luarocks
-pkgver=2.0.9
+pkgver=2.0.10
 pkgrel=1
 pkgdesc='Deployment and management system for Lua modules'
 arch=('i686' 'x86_64' 'mips64el')
@@ -33,4 +33,4 @@ package() {
   install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
-md5sums=('78dceb5c513fd241665688ecd229ff51')
+md5sums=('85cccdbd995b489ae1a9aab33c14b7fc')
diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD
index a067e098f..e18712450 100644
--- a/community/minidlna/PKGBUILD
+++ b/community/minidlna/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73571 2012-07-10 08:51:06Z stativ $
+# $Id: PKGBUILD 73806 2012-07-15 20:17:53Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:Biginoz < biginoz AT free point fr>
 # Contributor: Ignacio Galmarino <igalmarino@gmail.com>
@@ -6,8 +6,8 @@
 # Contributor: Kamil Kaminski <kyle@kkaminsk.com>
 
 pkgname=minidlna
-pkgver=1.0.24
-pkgrel=6
+pkgver=1.0.25
+pkgrel=1
 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/minidlna/"
@@ -20,17 +20,14 @@ changelog=changelog
 source=(http://downloads.sourceforge.net/minidlna/minidlna_${pkgver}_src.tar.gz
 	minidlna.rc
 	minidlna.conf
-	minidlna.service
-    ffmpeg_0.11.diff)
-md5sums=('be9b4c91e3fcde592dc3f9828098ca0f'
+	minidlna.service)
+md5sums=('d966256baf2f9b068b9de871ab5dade5'
          'c9863d5703e0a8469cc200f2739567e7'
          'af1b8c0fef9902f797b0324c255da5a1'
-         '1903ed9ceee43b8bb86146b9ad8eb50c'
-         '1346e1d3d7d71db70ac46dcad96391b1')
+         '1903ed9ceee43b8bb86146b9ad8eb50c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 <$srcdir/ffmpeg_0.11.diff || true
   sed -i 's|DB_PATH=.*|DB_PATH=/var/cache/minidlna|' genconfig.sh
   make
 }
diff --git a/community/mtpaint/PKGBUILD b/community/mtpaint/PKGBUILD
index 92accf109..c0ea3d86c 100644
--- a/community/mtpaint/PKGBUILD
+++ b/community/mtpaint/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 63668 2012-02-05 12:04:57Z ibiru $
+# $Id: PKGBUILD 73778 2012-07-15 13:21:04Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: yosh64 <yosh64.at.gmail.dot.com>
+
 pkgname=mtpaint
 pkgver=3.40
-pkgrel=2
+pkgrel=4
 pkgdesc="Simple GTK2 paint program for creating icons and pixel based artwork"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mtpaint.sourceforge.net/"
@@ -19,8 +20,8 @@ sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890'
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	patch -Np1 -i "$srcdir/libpng15.patch"
-	./configure --prefix=/usr --mandir=/usr/share/man/man1 man intl gif jpeg tiff
+	patch -Np1 -i ../libpng15.patch
+	./configure --prefix=/usr --mandir=/usr/share/man man intl gif jpeg tiff
   sed -i 's:-lpng:-lpng -lgif:' _conf.txt
 	make
 }
diff --git a/community/mtpaint/mtpaint.install b/community/mtpaint/mtpaint.install
index 99a538dea..ad97d7bab 100644
--- a/community/mtpaint/mtpaint.install
+++ b/community/mtpaint/mtpaint.install
@@ -1,13 +1,13 @@
 post_upgrade() {
-	update-desktop-database -q
+  update-desktop-database -q
 }
 
 post_install() {
-	post_upgrade
+  post_upgrade
 }
 
 post_remove() {
-	post_upgrade
+  post_upgrade
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index 36f40c85d..19522811b 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73072 2012-06-30 08:03:14Z bpiotrowski $
+# $Id: PKGBUILD 73801 2012-07-15 18:02:53Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: James Campos <james.r.campos@gmail.com>
@@ -8,8 +8,8 @@
 # Contributor: TIanyi Cui <tianyicui@gmail.com>
 
 pkgname=nodejs
-pkgver=0.8.1
-pkgrel=1
+pkgver=0.8.2
+pkgrel=3
 pkgdesc='Evented I/O for V8 javascript'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://nodejs.org/'
@@ -19,7 +19,7 @@ checkdepends=('curl') # curl used for check()
 optdepends=('openssl: TLS support')
 options=('!emptydirs')
 source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz")
-md5sums=('32a6f7b7cf196cb89bd973741ae58dd1')
+md5sums=('2d1a74aa9e5ecfdb4c64d200b642eb1e')
 
 build() {
   cd node-v${pkgver}
@@ -35,7 +35,8 @@ build() {
   export PYTHON=python2
 
   ./configure \
-    --prefix=/usr
+    --prefix=/usr \
+    --shared-openssl
 
   make
 }
@@ -58,6 +59,9 @@ package() {
   cp -r doc/api/*.html \
     ${pkgdir}/usr/share/doc/nodejs
 
+  # compress man pages
+  find $pkgdir/usr/lib/node_modules/npm/man -type f | xargs gzip -9
+
   install -D -m644 LICENSE \
     ${pkgdir}/usr/share/licenses/nodejs/LICENSE
 }
diff --git a/community/opendkim/PKGBUILD b/community/opendkim/PKGBUILD
index 99255fa97..34eb54b98 100644
--- a/community/opendkim/PKGBUILD
+++ b/community/opendkim/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 72633 2012-06-18 09:23:25Z spupykin $
+# $Id: PKGBUILD 73808 2012-07-15 20:18:52Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Thomas Jost <schnouki@schnouki.net>
 
 pkgname=opendkim
-pkgver=2.6.0
+pkgver=2.6.5
 pkgrel=1
 pkgdesc="An open source implementation of the DKIM sender authentication system. Based on a fork of dkim-milter."
 arch=(i686 x86_64)
@@ -17,7 +17,7 @@ install=opendkim.install
 source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz
         opendkim.conf
         opendkim.rc)
-md5sums=('ad4eb5131642cadd778dc26ed7daacf0'
+md5sums=('fde50b442af3fa2ecaee53f4eb9c9c15'
          '3e2bb1058ac0662f01e675aa6ac7ee8f'
          '093f5c098a45cc68753f97e45a5b374c')
 
diff --git a/community/oss/PKGBUILD b/community/oss/PKGBUILD
index 3ac93b2ab..23e8d00a6 100644
--- a/community/oss/PKGBUILD
+++ b/community/oss/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72792 2012-06-22 12:51:25Z dreisner $
+# $Id: PKGBUILD 73700 2012-07-14 13:07:06Z allan $
 # Maintainer: Florian Pritz <bluewind@xinu.at>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,7 +6,7 @@
 pkgbase=oss
 pkgname=(oss libflashsupport-oss)
 pkgver=4.2_2006
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64' 'mips64el')
 url="http://developer.opensound.com/"
 license=('GPL2')
@@ -50,6 +50,10 @@ build() {
 	mkdir build && cd build
 	"${srcdir}/${_dir}/configure" --enable-libsalsa=NO --regparm
 
+	# ossvermagic hardcodes /lib/modules *grumble*
+	sed -i 's|/lib/modules|/usr&|' \
+			os_cmd/Linux/ossvermagic/ossvermagic.c
+
 	msg "Building OSS."
 	make build
 
@@ -62,9 +66,19 @@ build() {
 	patch -p0 -i "${srcdir}/remove-hal.patch"
 	rm -rf usr/lib/oss/scripts/oss_usb-create-devices usr/lib/oss/scripts/90-oss_usb-create-device.fdi
 
-	sed -i 's#/lib/modules/$KERNEL_VERSION/kernel/#/lib/modules/$KERNEL_VERSION/extramodules/kernel/#g' usr/sbin/soundon
-	sed -i 's#/lib/modules/$UNAME/kernel/#/lib/modules/$UNAME/extramodules/kernel/#g' usr/lib/oss/build/install.sh
-	sed -i 's#mkdir /lib/modules#mkdir -p /lib/modules#' usr/lib/oss/build/install.sh
+	# fix kernel module directories
+	sed -i 's#/lib/modules/$KERNEL_VERSION/kernel/#/usr/lib/modules/$KERNEL_VERSION/extramodules/kernel/#g' usr/sbin/soundon
+	sed -i 's#/lib/modules/$UNAME/kernel/#/usr/lib/modules/$UNAME/extramodules/kernel/#g' usr/lib/oss/build/install.sh
+	sed -i 's#mkdir /lib/modules#mkdir -p /usr/lib/modules#' usr/lib/oss/build/install.sh
+	sed -i 's#mkdir \(/usr/lib/modules/$UNAME/extramodules/kernel/oss\)#mkdir -p \1#' usr/lib/oss/build/install.sh
+	sed -i 's#\([= ]\)/lib/modules#\1/usr/lib/modules#g' \
+		usr/lib/oss/build/install.sh \
+		usr/lib/oss/scripts/restore_drv.sh \
+		usr/lib/oss/scripts/setup-alsa.sh \
+		usr/lib/oss/scripts/remove_drv.sh \
+		usr/lib/oss/build/Makefile.tmpl \
+		usr/lib/oss/build/Makefile.osscore \
+		usr/lib/oss/cuckoo/Makefile
 }
 
 package_oss() {
diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD
index 9c48b53e6..5bf9e12dc 100644
--- a/community/percona-server/PKGBUILD
+++ b/community/percona-server/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 71873 2012-06-02 15:23:50Z mtorromeo $
+# $Id: PKGBUILD 73668 2012-07-13 06:40:20Z spupykin $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=percona-server
 pkgver=5.5.24_rel26.0
-pkgrel=1
+pkgrel=3
 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation, and manageability of the server"
 arch=('i686' 'x86_64' 'mips64el')
 
@@ -20,7 +20,10 @@ backup=('etc/mysql/my.cnf')
 install=percona.install
 source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_rel/-}/source/Percona-Server-${pkgver/_/-}.tar.gz"
         'mysqld'
-        'my.cnf')
+        'my.cnf'
+        'mysqld-post'
+        'mysqld.service'
+        'tmpfiles.conf')
 
 build() {
 	cd "${srcdir}/Percona-Server-${pkgver/_/-}"
@@ -97,8 +100,15 @@ package() {
 	rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1
 
 	install -dm700 "${pkgdir}"/var/lib/mysql
+
+	install -Dm644 "$srcdir/tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/mysqld.conf"
+	install -Dm644 "$srcdir/mysqld.service" "$pkgdir/usr/lib/systemd/system/mysqld.service"
+	install -Dm755 "$srcdir/mysqld-post" "$pkgdir/usr/bin/mysqld-post"
 }
 
 md5sums=('76f835e98ad3c71fcaa33794ee187630'
          '243864805611764a7e5883c1dba7afd8'
-         '1c949c0dbea5206af0db14942d9927b6')
+         '1c949c0dbea5206af0db14942d9927b6'
+         '5143dadeaac15f1ff88ea16716588554'
+         'e2e21a54c1aa1d6ab83a3dd0629aac52'
+         '7af72b49f943bd52defce8bc4e804e64')
diff --git a/community/percona-server/mysqld-post b/community/percona-server/mysqld-post
new file mode 100644
index 000000000..8c404f4c4
--- /dev/null
+++ b/community/percona-server/mysqld-post
@@ -0,0 +1,6 @@
+#!/bin/sh
+while true; do
+	response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break
+	echo "$response" | grep -q "mysqld is alive" && break
+	sleep 1
+done
diff --git a/community/percona-server/mysqld.service b/community/percona-server/mysqld.service
new file mode 100644
index 000000000..15802b226
--- /dev/null
+++ b/community/percona-server/mysqld.service
@@ -0,0 +1,21 @@
+[Unit]
+Description=MySQL database server
+After=syslog.target network.target
+
+[Service]
+User=mysql
+Group=mysql
+
+ExecStart=/usr/bin/mysqld --pid-file=/var/run/mysqld/mysqld.pid
+ExecStop=/bin/kill -15 $MAINPID
+PIDFile=/var/run/mysqld/mysqld.pid
+WorkingDirectory=/usr
+
+# We rely on systemd, not mysqld_safe, to restart mysqld if it dies
+Restart=always
+
+# Place temp files in a secure directory, not /tmp
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/percona-server/tmpfiles.conf b/community/percona-server/tmpfiles.conf
new file mode 100644
index 000000000..d621cd9df
--- /dev/null
+++ b/community/percona-server/tmpfiles.conf
@@ -0,0 +1 @@
+d /var/run/mysqld 0755 mysql mysql -
\ No newline at end of file
diff --git a/community/pinot/PKGBUILD b/community/pinot/PKGBUILD
index 9b123e6fb..7234e8ad9 100644
--- a/community/pinot/PKGBUILD
+++ b/community/pinot/PKGBUILD
@@ -1,19 +1,17 @@
-# $Id: PKGBUILD 62141 2012-01-16 19:53:05Z dreisner $
+# $Id: PKGBUILD 73687 2012-07-14 05:57:24Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: William Rea <sillywilly@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=pinot
-pkgver=0.98
-pkgrel=2
+pkgver=1.0
+pkgrel=1
 pkgdesc='Personal search and metasearch tool'
 arch=('i686' 'x86_64' 'mips64el')
-url='http://pinot.berlios.de/'
+url='http://code.google.com/p/pinot-search/'
 license=('GPL')
-depends=('gtkmm' 'xapian-core' 'libtextcat' 'sqlite3' 'libxml++' 'curl'
-         'gmime' 'dbus-glib' 'shared-mime-info' 'libexif' 'taglib' 
-         'hicolor-icon-theme' 'cairo' 'exiv2')
+depends=('gtkmm3' 'xapian-core' 'libtextcat' 'sqlite' 'libxml++' 'curl' 'gmime' 'dbus-glib' 'shared-mime-info' 'libexif' 'taglib' 'hicolor-icon-theme' 'cairo' 'exiv2')
 makedepends=('boost' 'desktop-file-utils')
 optdepends=('unzip: ZIP files extraction'
             'poppler: PDF to text conversion'
@@ -21,22 +19,25 @@ optdepends=('unzip: ZIP files extraction'
             'djvulibre: DjVu text extraction'
             'unrtf: RTF to HTML conversion'
             'antiword: MS Word to text conversion'
-            'catdoc: XLS and PPT to text conversion'
-            'deskbar-applet: Pinot Deskbar-Applet module')
+            'catdoc: XLS and PPT to text conversion')
 options=('!emptydirs')
 install=$pkgname.install
 changelog=$pkgname.changelog
-source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('8a89a73a48344074aa8f4534ce68fd18e3d84553645cef864c137ab21d8d341c')
+source=(http://pinot-search.googlecode.com/files/$pkgname-$pkgver.tar.gz)
+sha256sums=('d1f5ac17022014c5a29ba1e6d95fc39bcf254338a4e0bfe84bf16558d219e2e2')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
   sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat_conf.txt
+  sed -i 's|/LM/russian.lm|/LM/russian-windows1251.lm|' textcat_conf.txt
+  sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat3_conf.txt
+  sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat31_conf.txt
+  sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat32_conf.txt
   sed -i -e "s|.*russian$|/usr/share/libtextcat/LM/russian-iso8859_5.lm   russian-iso8859_5\n\
 /usr/share/libtextcat/LM/russian-koi8_r.lm      russian-koi8_r\n\
-/usr/share/libtextcat/LM/russian-windows1251.lm russian-windows1251|" textcat_conf.txt
+/usr/share/libtextcat/LM/russian-windows1251.lm russian-windows1251|" textcat3_conf.txt
 
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib
+  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib --enable-gtkmm3=yes
   make
 }
 
@@ -44,7 +45,4 @@ package() {
   cd ${srcdir}/$pkgname-$pkgver
 
   make DESTDIR=${pkgdir} install
-
-  # Remove Deskbar-Applet handler
-  rm -rf ${pkgdir}/usr/lib/deskbar-applet/handlers
 }
diff --git a/community/pinot/pinot.changelog b/community/pinot/pinot.changelog
index 7d899cdb0..406c94f58 100644
--- a/community/pinot/pinot.changelog
+++ b/community/pinot/pinot.changelog
@@ -1,2 +1,5 @@
+2012-07-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* pinot 1.0-1
+
 2011-12-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* pinot 0.98-1
diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD
index 71c6261a9..fa8b45e8b 100644
--- a/community/plan9port/PKGBUILD
+++ b/community/plan9port/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 68148 2012-03-18 18:26:06Z cbrannon $
+# $Id: PKGBUILD 73814 2012-07-15 22:19:23Z cbrannon $
 # Contributor: phrakture <aaronmgriffin--gmail--com>
 # Contributor: Fazlul Shahriar
 # Contributor: Chris Brannon <cmbrannon79@gmail.com>
 pkgname=plan9port
-pkgver=20120307
+pkgver=20120715
 pkgrel=1
 pkgdesc="A port of many programs from Plan 9 to Unix-like operating systems"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,6 +11,7 @@ url="http://swtch.com/plan9port/"
 license=('custom')
 depends=(xorg-server libxt libxext sh fuse)
 optdepends=('python2: for the codereview script')
+provides=('plan9')
 install=plan9.install
 source=(http://swtch.com/$pkgname/$pkgname-$pkgver.tgz plan9.sh)
 
@@ -48,5 +49,5 @@ build()
     rm -f $i
   done
 }
-md5sums=('c806d048788b6beb65efd9f5179f1192'
+md5sums=('1e0698aa5f652a1a47227be2b25fa8fd'
          '9695eb15a247e23140e8a35ff52a5c20')
diff --git a/community/pv/PKGBUILD b/community/pv/PKGBUILD
index be7580221..308e11988 100644
--- a/community/pv/PKGBUILD
+++ b/community/pv/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 73006 2012-06-27 20:22:20Z lfleischer $
+# $Id: PKGBUILD 73617 2012-07-12 05:30:42Z lfleischer $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Aaron Schaefer <aaron@elasticdog.com>
 
 pkgname=pv
-pkgver=1.3.1
+pkgver=1.3.4
 pkgrel=1
 pkgdesc='A terminal-based tool for monitoring the progress of data through a pipeline.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ url='http://www.ivarch.com/programs/pv.shtml'
 license=('custom:Artistic 2.0')
 depends=('glibc')
 source=("http://www.ivarch.com/programs/sources/$pkgname-$pkgver.tar.bz2")
-md5sums=('4ca3b00c92e4c79045ca2d056fb77f40')
+md5sums=('8041eac8a2942ef11ce6c7559cc4fb0a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/quagga/0002-CVE-2012-1820.patch b/community/quagga/0002-CVE-2012-1820.patch
new file mode 100644
index 000000000..aae2d7b18
--- /dev/null
+++ b/community/quagga/0002-CVE-2012-1820.patch
@@ -0,0 +1,74 @@
+@@ -, +, @@ 
+    bgpd: CVE-2012-1820, DoS in bgp_capability_orf()
+    
+    An ORF (code 3) capability TLV is defined to contain exactly one
+    AFI/SAFI block. Function bgp_capability_orf(), which parses ORF
+    capability TLV, uses do-while cycle to call its helper function
+    bgp_capability_orf_entry(), which actually processes the AFI/SAFI data
+    block. The call is made at least once and repeated as long as the input
+    buffer has enough data for the next call.
+    
+    The helper function, bgp_capability_orf_entry(), uses "Number of ORFs"
+    field of the provided AFI/SAFI block to verify, if it fits the input
+    buffer. However, the check is made based on the total length of the ORF
+    TLV regardless of the data already consumed by the previous helper
+    function call(s). This way, the check condition is only valid for the
+    first AFI/SAFI block inside an ORF capability TLV.
+    
+    For the subsequent calls of the helper function, if any are made, the
+    check condition may erroneously tell, that the current "Number of ORFs"
+    field fits the buffer boundary, where in fact it does not. This makes it
+    possible to trigger an assertion by feeding an OPEN message with a
+    specially-crafted malformed ORF capability TLV.
+    
+    This commit fixes the vulnerability by making the implementation follow
+    the spec.
+--- a/bgpd/bgp_open.c	
++++ a/bgpd/bgp_open.c	
+@@ -231,7 +231,7 @@ bgp_capability_orf_entry (struct peer *peer, struct capability_header *hdr)
+     }
+   
+   /* validate number field */
+-  if (sizeof (struct capability_orf_entry) + (entry.num * 2) > hdr->length)
++  if (sizeof (struct capability_orf_entry) + (entry.num * 2) != hdr->length)
+     {
+       zlog_info ("%s ORF Capability entry length error,"
+                  " Cap length %u, num %u",
+@@ -335,28 +335,6 @@ bgp_capability_orf_entry (struct peer *peer, struct capability_header *hdr)
+ }
+ 
+ static int
+-bgp_capability_orf (struct peer *peer, struct capability_header *hdr)
+-{
+-  struct stream *s = BGP_INPUT (peer);
+-  size_t end = stream_get_getp (s) + hdr->length;
+-  
+-  assert (stream_get_getp(s) + sizeof(struct capability_orf_entry) <= end);
+-  
+-  /* We must have at least one ORF entry, as the caller has already done
+-   * minimum length validation for the capability code - for ORF there must
+-   * at least one ORF entry (header and unknown number of pairs of bytes).
+-   */
+-  do
+-    {
+-      if (bgp_capability_orf_entry (peer, hdr) == -1)
+-        return -1;
+-    } 
+-  while (stream_get_getp(s) + sizeof(struct capability_orf_entry) < end);
+-  
+-  return 0;
+-}
+-
+-static int
+ bgp_capability_restart (struct peer *peer, struct capability_header *caphdr)
+ {
+   struct stream *s = BGP_INPUT (peer);
+@@ -573,7 +551,7 @@ bgp_capability_parse (struct peer *peer, size_t length, int *mp_capability,
+             break;
+           case CAPABILITY_CODE_ORF:
+           case CAPABILITY_CODE_ORF_OLD:
+-            if (bgp_capability_orf (peer, &caphdr))
++            if (bgp_capability_orf_entry (peer, &caphdr))
+               return -1;
+             break;
+           case CAPABILITY_CODE_RESTART:
diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD
index d3d4ea974..5c4edc8d6 100644
--- a/community/quagga/PKGBUILD
+++ b/community/quagga/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 72737 2012-06-21 19:55:00Z seblu $
+# $Id: PKGBUILD 73818 2012-07-15 23:51:42Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgname=quagga
 pkgver=0.99.21
-pkgrel=1
+pkgrel=2
 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.quagga.net'
@@ -15,16 +15,41 @@ install=quagga.install
 source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
         'quagga.rc'
         'quagga.conf'
-        '0001-isisd-fix-typo-in-topology-generator-BZ-731.patch')
+        'babeld.service'
+        'bgpd.service'
+        'isisd.service'
+        'ospf6d.service'
+        'ospfd.service'
+        'ripd.service'
+        'ripngd.service'
+        'zebra.service'
+        '0001-isisd-fix-typo-in-topology-generator-BZ-731.patch'
+        '0002-CVE-2012-1820.patch')
 md5sums=('99840adbe57047c90dfba6b6ed9aec7f'
          '71d474228a1e02d698cd24e9fd55ca38'
          '0c4f2dd13c7dac1b73de923d1d5e4e17'
-         'c80174f7bdd32cd84550d52451e8f495')
+         '45d8bf56a426b0e7ebe429547be8a27a'
+         'ab31ed8dafd7a92137f4f00ad0937b4f'
+         '4c05d0105cd0db23a2583bd75a1bde4d'
+         'd087dce5eeba78ac64541157c7e04dfd'
+         'c5f8a729685cebf8fc5b1a1552d37b6d'
+         'e721b334bb0b31983642b307033c63d0'
+         'effeb26ff78ffcafe7808596ddc5d3fc'
+         'a4bf0a090747bd7dc4094a1e6e96e6ad'
+         'c80174f7bdd32cd84550d52451e8f495'
+         '44f39016d81f3b13b2744f7dcd93289d')
 
 build() {
   cd $pkgname-$pkgver
-  patch -p 1 -i "$srcdir/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch"
-  ./configure --prefix=/usr --sysconfdir=/etc/quagga --localstatedir=/run/quagga \
+  shopt -s nullglob
+  for _p in "$srcdir"/*.patch; do
+    msg2 "Applying ${_p##*/}"
+    patch -p 1 -i "$_p"
+  done
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc/quagga \
+    --localstatedir=/run/quagga \
     --enable-exampledir=/usr/share/doc/quagga/examples \
     --enable-vtysh \
     --enable-isisd \
@@ -35,28 +60,37 @@ build() {
     --enable-irdp \
     --enable-pcreposix \
     --enable-multipath=64 \
-    --enable-user=nobody \
-    --enable-group=nobody \
+    --enable-user=quagga \
+    --enable-group=quagga \
     --enable-configfile-mask=0640 \
     --enable-logfile-mask=0640
   make
 }
 
 package() {
+  # upstream install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # logrotate stuff
+  install -D -m 644 redhat/$pkgname.logrotate "$pkgdir/etc/logrotate.d/$pkgname"
+  sed -ri 's,/var/run/quagga,/run/quagga,g' "$pkgdir/etc/logrotate.d/$pkgname"
+
   # initscripts files
-  for d in zebra ripd ripngd bgpd ospfd ospf6d isisd; do
+  cd "$srcdir"
+  for d in zebra ripd ripngd bgpd ospfd ospf6d isisd babeld; do
     install -D -m 755 $pkgname.rc "$pkgdir/etc/rc.d/$d"
     install -D -m 644 $pkgname.conf "$pkgdir/etc/conf.d/$d"
     backup+=("etc/conf.d/$d")
   done
 
-  # create /run/quagga directory at startup
+  # systemd stuff
+  for d in zebra ripd ripngd bgpd ospfd ospf6d isisd babeld; do
+    install -D -m 644 $d.service "$pkgdir/usr/lib/systemd/system/$d.service"
+  done
   install -D -m 644 /dev/null "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
   echo "d /run/$pkgname 0750 $pkgname $pkgname" > "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
 
-  # soft
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/quagga/babeld.service b/community/quagga/babeld.service
new file mode 100644
index 000000000..5b2848042
--- /dev/null
+++ b/community/quagga/babeld.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Babel routing daemon
+BindTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/babeld.conf
+
+[Service]
+ExecStart=/usr/sbin/babeld
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/quagga/bgpd.service b/community/quagga/bgpd.service
new file mode 100644
index 000000000..21ac18c8a
--- /dev/null
+++ b/community/quagga/bgpd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=BGP routing daemon
+BindTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/bgpd.conf
+
+[Service]
+ExecStart=/usr/sbin/bgpd
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/quagga/isisd.service b/community/quagga/isisd.service
new file mode 100644
index 000000000..298946998
--- /dev/null
+++ b/community/quagga/isisd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=IS-IS routing daemon
+BindTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/isisd.conf
+
+[Service]
+ExecStart=/usr/sbin/isisd
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/quagga/ospf6d.service b/community/quagga/ospf6d.service
new file mode 100644
index 000000000..31194fc6e
--- /dev/null
+++ b/community/quagga/ospf6d.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=OSPF routing daemon for IPv6
+BindTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/ospf6d.conf
+
+[Service]
+ExecStart=/usr/sbin/ospf6d
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/quagga/ospfd.service b/community/quagga/ospfd.service
new file mode 100644
index 000000000..f864aa258
--- /dev/null
+++ b/community/quagga/ospfd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=OSPF routing daemon
+BindTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/ospfd.conf
+
+[Service]
+ExecStart=/usr/sbin/ospfd
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/quagga/ripd.service b/community/quagga/ripd.service
new file mode 100644
index 000000000..22716e2c9
--- /dev/null
+++ b/community/quagga/ripd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=RIP routing daemon
+BindTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/ripd.conf
+
+[Service]
+ExecStart=/usr/sbin/ripd
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/quagga/ripngd.service b/community/quagga/ripngd.service
new file mode 100644
index 000000000..9ac51bd1c
--- /dev/null
+++ b/community/quagga/ripngd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=RIP routing daemon for IPv6
+BindTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/ripngd.conf
+
+[Service]
+ExecStart=/usr/sbin/ripngd
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/quagga/zebra.service b/community/quagga/zebra.service
new file mode 100644
index 000000000..e0f87f9bc
--- /dev/null
+++ b/community/quagga/zebra.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=GNU Zebra routing manager
+After=network.target
+ConditionPathExists=/etc/quagga/zebra.conf
+
+[Service]
+ExecStartPre=/sbin/ip route flush proto zebra
+ExecStart=/usr/sbin/zebra
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/r8168-lts/PKGBUILD b/community/r8168-lts/PKGBUILD
index 867bc44b1..df0540070 100644
--- a/community/r8168-lts/PKGBUILD
+++ b/community/r8168-lts/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71856 2012-06-02 12:20:04Z mtorromeo $
+# $Id: PKGBUILD 73702 2012-07-14 13:07:16Z allan $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=r8168-lts
 _pkgname=r8168
 pkgver=8.031.00
-pkgrel=1
+pkgrel=2
 pkgdesc="A kernel module for Realtek 8168 network cards for linux-lts"
 url="http://www.realtek.com.tw"
 license=("GPL")
@@ -13,20 +13,22 @@ depends=('glibc' "linux-lts>=3.0" "linux-lts<3.1")
 makedepends=("linux-lts-headers>=3.0" "linux-lts-headers<3.1")
 source=(http://r8168.googlecode.com/files/$_pkgname-$pkgver.tar.bz2)
 install=$pkgname.install
+md5sums=('ec1654f02e2dad930bbeb0210ddab7e5')
+sha256sums=('5c617b3c08aca18d1eb24d33f77df40020eb64fb32c8e4008265e08b7ffe5779')
 
 _extramodules=extramodules-3.0-lts
-_kernver="$(cat /lib/modules/$_extramodules/version || true)"
+_kernver="$(cat /usr/lib/modules/$_extramodules/version || true)"
 
 build() {
-	cd "$srcdir/$_pkgname-$pkgver"
-	make -C /lib/modules/$_kernver/build SUBDIRS="$srcdir/$_pkgname-$pkgver/src" EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" modules
+	cd "$_pkgname-$pkgver"
+	make -C /usr/lib/modules/$_kernver/build \
+			SUBDIRS="$srcdir/$_pkgname-$pkgver/src" \
+			EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \
+			modules
 }
 
 package() {
-	cd "$srcdir/$_pkgname-$pkgver/src"
-	install -D -m644 $_pkgname.ko "$pkgdir/lib/modules/$_extramodules/$_pkgname.ko"
-	find "$pkgdir" -name '*.ko' -exec gzip -9 {} \;
+	cd "$_pkgname-$pkgver"
+	install -Dm644 src/$_pkgname.ko "$pkgdir/usr/lib/modules/$_extramodules/$_pkgname.ko"
+	find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
 }
-
-md5sums=('ec1654f02e2dad930bbeb0210ddab7e5')
-sha256sums=('5c617b3c08aca18d1eb24d33f77df40020eb64fb32c8e4008265e08b7ffe5779')
diff --git a/community/rawstudio/PKGBUILD b/community/rawstudio/PKGBUILD
index d6afcc08d..2086a5f3f 100644
--- a/community/rawstudio/PKGBUILD
+++ b/community/rawstudio/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 63726 2012-02-05 12:09:34Z ibiru $
+# $Id: PKGBUILD 73812 2012-07-15 20:23:46Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=rawstudio
 pkgver=2.0
-pkgrel=5
+pkgrel=6
 pkgdesc="An open source raw-image converter written in GTK+"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -23,6 +23,7 @@ md5sums=('b2f86b8ca6b83ad954e3104c4cb89e9b'
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p1 <$srcdir/libpng15.patch
+  export LDFLAGS="$LDFLAGS `pkg-config --libs gthread-2.0`"
   ./configure --prefix=/usr
   make
 }
diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD
index 2c2177295..91ee3c39e 100644
--- a/community/rsyslog/PKGBUILD
+++ b/community/rsyslog/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 72439 2012-06-14 15:09:58Z spupykin $
+# $Id: PKGBUILD 73703 2012-07-14 13:07:25Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=rsyslog
 pkgver=6.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
 url="http://www.rsyslog.com/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -51,6 +51,8 @@ package() {
   install -D -m644 $srcdir/${pkgname}.logrotate ${pkgdir}/etc/logrotate.d/${pkgname}
   install -D -m644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
 
-  # fix location of systemctl
-  sed -i 's@/bin/systemctl@/usr&@' "$pkgdir/usr/lib/systemd/system/rsyslog.service"
+  # fix location of systemctl and remove start precondition
+  sed -i "$pkgdir/usr/lib/systemd/system/rsyslog.service" \
+    -e 's@/bin/systemctl@/usr&@' \
+    -e '/^ExecStartPre/d'
 }
diff --git a/community/spacefm/PKGBUILD b/community/spacefm/PKGBUILD
index 9de16b687..e89183510 100644
--- a/community/spacefm/PKGBUILD
+++ b/community/spacefm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 72589 2012-06-17 07:23:49Z bpiotrowski $
+# $Id: PKGBUILD 73680 2012-07-13 19:18:42Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/
 # Contributor: ridikulus_rat <the.ridikulus.rat@gmail.com>
 
 pkgname=spacefm
-pkgver=0.7.8
+pkgver=0.7.9
 pkgrel=1
 pkgdesc="A multi-panel tabbed file manager"
 arch=('i686' 'x86_64')
@@ -18,29 +18,20 @@ optdepends=('lsof: device processes'
             'wget: plugin download'
             'gksu: perform as root functionality'
             'pmount: mount as non-root user'
+            'udevil: mount as non-root user and mount networks'
             'udisks: mount as non-root user'
             'udisks2: mount as non-root user')
-           #'ktsuss: perform as root functionality' (AUR)
-           #'udevil-git: mount as non-root user and mount networks' (AUR)
 source=(https://raw.github.com/IgnorantGuru/spacefm/master/packages/${pkgver}/spacefm-${pkgver}.tar.xz)
-md5sums=('746b8f55735217a0e6d48e4e666a7534')
+md5sums=('428739bc310d7010eca3f64caf2e7c1e')
 
 build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    
-    # NOTE: To enable hal support add --enable-hal to
-    # configure line below. See README for details.
-    # NOTE: To disable inotify and use fam or gamin instead, add:
-    # --disable-inotify to configure line below.
-    # NOTE: To add a custom su program (mysu in this example), add:
-    # --with-preferable-sudo="mysu"  to configure line below.
-    
+    cd $srcdir/$pkgname-$pkgver
     ./configure --prefix=/usr
     make
 }
 
 package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}/" install
+    cd $srcdir/$pkgname-$pkgver
+    make DESTDIR=$pkgdir install
 }
 
diff --git a/community/tellico/PKGBUILD b/community/tellico/PKGBUILD
index d4725a53a..df8205287 100644
--- a/community/tellico/PKGBUILD
+++ b/community/tellico/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 71282 2012-05-26 07:55:16Z pschmitz $
+# $Id: PKGBUILD 73797 2012-07-15 16:49:25Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Maintainer: Ray Rashif <schiv@archlinux.org
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
 pkgname=tellico
-pkgver=2.3.5
-pkgrel=2
+pkgver=2.3.6
+pkgrel=1
 pkgdesc="A collection manager for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://tellico-project.org/"
@@ -15,7 +15,7 @@ depends=('kdebase-workspace' 'yaz' 'exempi' 'libksane' 'taglib' 'kdemultimedia-k
 makedepends=('automoc4' 'cmake')
 install=$pkgname.install
 source=(http://tellico-project.org/files/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('b31db35589cae7f9af56a17e6589f8c5de68e36d9fc5fbaea4154e8238bf041c')
+sha256sums=('62bafaea733ce3b108322623e866b8659ab2644cc80ee06f0fc7fe974ec5d1c3')
 
 build() {
   cd ${srcdir}
diff --git a/community/udevil/PKGBUILD b/community/udevil/PKGBUILD
new file mode 100644
index 000000000..7a7df6839
--- /dev/null
+++ b/community/udevil/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 73683 2012-07-13 19:36:15Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/
+
+pkgname=udevil
+pkgver=0.3.0
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc='Mount and unmount without password'
+url='http://ignorantguru.github.com/udevil/'
+license=('GPL3')
+makedepends=('intltool' 'gettext')
+depends=('udev' 'glib2')
+optdepends=('nfs-utils:  mount nfs shares'
+            'sshfs:      mount sftp shares'
+            'curlftpfs:  mount ftp shares'
+            'cifs-utils: mount samba shares'
+            'eject:      eject via devmon'
+            'zenity:     devmon popups'
+            'pmount:     devmon mount without suid udevil'
+            'udisks:     devmon mount without suid udevil'
+            'udisks2:    devmon mount without suid udevil')
+provides=('devmon')
+backup=('etc/udevil/udevil.conf')
+install=$pkgname.install
+source=(https://raw.github.com/IgnorantGuru/$pkgname/master/packages/$pkgver/$pkgname-$pkgver.tar.xz)
+md5sums=('a2695eb0e9d1d2b5208f781710b1a286')
+
+build() {
+    cd $srcdir/$pkgname-$pkgver
+    ./configure --prefix=/usr
+    make
+}
+
+package() {
+    cd $srcdir/$pkgname-$pkgver
+    make DESTDIR=$pkgdir install
+}
+
diff --git a/community/udevil/udevil.install b/community/udevil/udevil.install
new file mode 100644
index 000000000..d839de662
--- /dev/null
+++ b/community/udevil/udevil.install
@@ -0,0 +1,4 @@
+post_install() {
+    echo '>>> REMEMBER to enable kernel polling when using devmon without udisks:'
+    echo '         http://ignorantguru.github.com/udevil/#polling'
+}
diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD
index 865775ffe..c229e8fcd 100644
--- a/community/usb_modeswitch/PKGBUILD
+++ b/community/usb_modeswitch/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 69169 2012-04-09 22:13:15Z spupykin $
+# $Id: PKGBUILD 73810 2012-07-15 20:19:38Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=usb_modeswitch
 pkgver=1.2.3
-pkgrel=1
-_pkgdata=20120120
+pkgrel=2
+_pkgdata=20120531
 pkgdesc="Activating switchable USB devices on Linux."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.draisberghof.de/usb_modeswitch/"
@@ -16,8 +16,8 @@ source=("http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${pkgver}.tar.
 	"http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${_pkgdata}.tar.bz2"
 	"usb-modeswitch-${pkgver}-device_reference.txt::http://www.draisberghof.de/usb_modeswitch/device_reference.txt")
 md5sums=('9b29e8b0d93d7604a9e5efc4696d37a3'
-         'c899cc9c71bb35f3ec600b7cd1455c65'
-         'c12e19e3992b5beac9b6c48555cff660')
+         '4a948331d5b9fccba4a89d3e62040cc3'
+         'dffc247648ed7359820c9caae413704a')
 
 build() {
   cd $srcdir/usb-modeswitch-$pkgver/
diff --git a/community/vhba-module/PKGBUILD b/community/vhba-module/PKGBUILD
index b867586d7..89bab4a08 100644
--- a/community/vhba-module/PKGBUILD
+++ b/community/vhba-module/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73199 2012-07-03 19:16:32Z dreisner $
+# $Id: PKGBUILD 73706 2012-07-14 13:07:56Z allan $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Charles Lindsay <charles@chaoslizard.org>
@@ -6,13 +6,14 @@
 pkgname=vhba-module
 pkgver=20120422
 _extramodules=extramodules-3.4-ARCH
-pkgrel=2
+pkgrel=3
 pkgdesc="Kernel module that emulates SCSI devices"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cdemu.sourceforge.net/"
 license=('GPL')
 depends=('linux>=3.4' 'linux<3.5')
 makedepends=('linux-headers>=3.4')
+options=(!makeflags)
 install=$pkgname.install
 source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2"
         '60-vhba.rules')
@@ -22,15 +23,15 @@ md5sums=('d97372da1d270d1605742b2995fb6678'
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  _kernver="$(cat /lib/modules/$_extramodules/version)"
+  _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
 
-  make -j1 KDIR=/usr/src/linux-$_kernver
+  make KDIR=/usr/lib/modules/$_kernver/build
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  install -D vhba.ko "$pkgdir/lib/modules/$_extramodules/vhba.ko"
+  install -D vhba.ko "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko"
 
   sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" \
     "$startdir/vhba-module.install"
diff --git a/community/vhba-module/vhba-module.install b/community/vhba-module/vhba-module.install
index d9264d853..8458b2ae7 100644
--- a/community/vhba-module/vhba-module.install
+++ b/community/vhba-module/vhba-module.install
@@ -2,7 +2,7 @@ post_upgrade() {
   ! grep -q 'cdemu' /etc/group && groupadd cdemu
   echo "  > Updating module dependencies..."
   EXTRAMODULES='extramodules-3.4-ARCH'
-  depmod $(cat /lib/modules/$EXTRAMODULES/version)
+  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 
diff --git a/community/virtviewer/PKGBUILD b/community/virtviewer/PKGBUILD
index 2fb6b0fc3..547d604d7 100644
--- a/community/virtviewer/PKGBUILD
+++ b/community/virtviewer/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 64445 2012-02-13 15:08:55Z spupykin $
+# $Id: PKGBUILD 73649 2012-07-12 13:51:32Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=virtviewer
-pkgver=0.4.2
+pkgver=0.5.3
 pkgrel=1
 pkgdesc="A lightweight interface for interacting with the graphical display of virtualized guest OS."
 depends=('gtk-vnc' 'libglade>=2.6.0' 'libvirt')
@@ -12,11 +12,11 @@ url="http://virt-manager.et.redhat.com"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 source=("http://virt-manager.et.redhat.com/download/sources/virt-viewer/virt-viewer-$pkgver.tar.gz")
-md5sums=('4fc003cb655aa45b77c9f2ee45ba6d4f')
+md5sums=('69a7c6d5cbd23d478396da4883567261')
 
 build() {
   cd $srcdir/virt-viewer-$pkgver
-  export LDFLAGS=-lX11
+#  export LDFLAGS=-lX11
   ./configure --prefix=/usr
   make
   make DESTDIR=$pkgdir install