Thu Nov 10 23:14:50 UTC 2011

15 files changed, 145 insertions, 123 deletions

diff --git a/community/filezilla/PKGBUILD b/community/filezilla/PKGBUILD
index d81c7e6f8..d46042547 100644
--- a/community/filezilla/PKGBUILD
+++ b/community/filezilla/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 55926 2011-09-25 10:42:49Z bluewind $
+# $Id: PKGBUILD 58248 2011-11-09 10:50:52Z bluewind $
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=filezilla
-pkgver=3.5.1
-pkgrel=2
+pkgver=3.5.2
+pkgrel=1
 pkgdesc="Fast and reliable FTP, FTPS and SFTP client"
 arch=('i686' 'x86_64')
 url="http://filezilla-project.org/"
@@ -13,8 +13,8 @@ depends=('dbus-core' 'xdg-utils' 'wxgtk' 'libidn' 'hicolor-icon-theme' 'sqlite3'
 install=filezilla.install
 source=("http://downloads.sourceforge.net/project/filezilla/FileZilla_Client/${pkgver}/FileZilla_${pkgver}_src.tar.bz2"
 gnutls-3.patch)
-md5sums=('8afb7aee4ba72b6363dcfe469bc7fbef'
-'0646cf7d6f90766961724102cf2cebd6')
+md5sums=('ec4847be44932dc872a7e83b94ae2c9f'
+         '0646cf7d6f90766961724102cf2cebd6')
 
 build() {
   cd "${pkgname}-${pkgver}"
diff --git a/community/haskell-binary/PKGBUILD b/community/haskell-binary/PKGBUILD
index f682bb59a..ae5bcab42 100644
--- a/community/haskell-binary/PKGBUILD
+++ b/community/haskell-binary/PKGBUILD
@@ -1,39 +1,45 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.5
-_hkgname=binary
 pkgname=haskell-binary
 pkgver=0.5.0.2
-pkgrel=7.1
+pkgrel=8
 pkgdesc="Binary serialisation for Haskell values using lazy ByteStrings"
 url="http://hackage.haskell.org/package/binary"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('x86_64' 'i686')
 depends=(ghc=7.0.3-2 sh)
 options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
+source=("http://hackage.haskell.org/packages/archive/binary/$pkgver/binary-$pkgver.tar.gz")
+install=haskell-binary.install
 md5sums=('6bf8f3d1441602c9ab09a75e3bd6e926')
 
 build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+  cd "$srcdir/binary-$pkgver"
+
+  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+    --prefix=/usr --docdir="/usr/share/doc/$pkgname" \
+    --libsubdir=\$compiler/site-local/\$pkgid
+  runhaskell Setup build
+  runhaskell Setup haddock
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
 package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+  cd "$srcdir/binary-$pkgver"
+
+  install -Dm 744 register.sh \
+    "$pkgdir/usr/share/haskell/$pkgname/register.sh"
+  install -m 744 unregister.sh \
+    "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+  install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries"
+  ln -s "/usr/share/doc/$pkgname/html" \
+    "$pkgdir/usr/share/doc/ghc/html/libraries/binary"
+  runhaskell Setup copy --destdir="$pkgdir"
+  install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/haskell-ghc-paths/PKGBUILD b/community/haskell-ghc-paths/PKGBUILD
index a7a4be130..e90cf6dc0 100644
--- a/community/haskell-ghc-paths/PKGBUILD
+++ b/community/haskell-ghc-paths/PKGBUILD
@@ -1,35 +1,45 @@
-# Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=ghc-paths
+# $Id: PKGBUILD 58269 2011-11-09 16:24:41Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 pkgname=haskell-ghc-paths
 pkgver=0.1.0.8
-pkgrel=4.1
+pkgrel=5
 pkgdesc="Knowledge of GHC's installation directories"
-url="http://hackage.haskell.org/package/${_hkgname}"
+url="http://hackage.haskell.org/package/ghc-paths"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('x86_64' 'i686')
 makedepends=()
-depends=(ghc=7.0.3-2) # cannot have stricter dep here due to haddock
+depends=(ghc=7.0.3-2)
 options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
+source=("http://hackage.haskell.org/packages/archive/ghc-paths/$pkgver/ghc-paths-$pkgver.tar.gz")
+install=haskell-ghc-paths.install
 md5sums=('d2b23dc563888e380588501d2ce1d82b')
+
 build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-       --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+  cd "$srcdir/ghc-paths-$pkgver"
+
+  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+     --prefix=/usr --docdir="/usr/share/doc/$pkgname" \
+     --libsubdir=\$compiler/site-local/\$pkgid
+  runhaskell Setup build
+  runhaskell Setup haddock
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
+
 package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+  cd "$srcdir/ghc-paths-$pkgver"
+
+  install -Dm 744 register.sh \
+    "$pkgdir/usr/share/haskell/$pkgname/register.sh"
+  install -m 744 unregister.sh \
+    "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+  install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries"
+  ln -s "/usr/share/doc/$pkgname/html" \
+    "$pkgdir/usr/share/doc/ghc/html/libraries/ghc-paths"
+  runhaskell Setup copy --destdir="$pkgdir"
+  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
 }
+# vim:set ts=2 sw=2 et:
diff --git a/community/john/PKGBUILD b/community/john/PKGBUILD
index b90406aba..dbbb7450b 100644
--- a/community/john/PKGBUILD
+++ b/community/john/PKGBUILD
@@ -6,8 +6,8 @@
 
 pkgname=john
 pkgver=1.7.8
-pkgrel=5
-_jumbover=7
+pkgrel=6
+_jumbover=8
 pkgdesc="John The Ripper - A fast password cracker (jumbo-$_jumbover included)"
 arch=('i686' 'x86_64')
 url="http://www.openwall.com/$pkgname/"
@@ -19,7 +19,7 @@ source=(http://www.openwall.com/$pkgname/g/$pkgname-$pkgver.tar.bz2
 	ftp://ftp.kfki.hu/pub/packages/security/ssh/ossh/libdes-4.04b.tar.gz
 	params.h.patch)
 md5sums=('e6d7f261829610d6949c706ebac0517c'
-         '6513d201dfc2e87033a4068143de3ef0'
+         '96cb581fd8447f3f96614fd365896b07'
          'c8d5c69f86c2eedb485583b0305284a1'
          'f69ed632eba8fb9e45847a4b4a323787')
 
@@ -65,7 +65,7 @@ package() {
 	# install password list and charset files
 	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{{all,alnum,alpha,digits,lanman}.chr,password.lst} \
           ${pkgdir}/usr/share/john/
-	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{dumb16,dumb32,generic}.conf \
+	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{dumb16,dumb32}.conf \
           ${pkgdir}/usr/share/john/
 
 	# install binaries
diff --git a/community/lash/PKGBUILD b/community/lash/PKGBUILD
index 70985c530..16390c3ec 100644
--- a/community/lash/PKGBUILD
+++ b/community/lash/PKGBUILD
@@ -5,11 +5,12 @@
 pkgname=lash
 pkgver=0.6.0~rc2
 _relver=0.6.0.594
-pkgrel=5
+pkgrel=6
 pkgdesc="A session management system for JACK and ALSA"
 arch=('i686' 'x86_64')
 options=('!libtool')
-url="http://lash-audio.org"
+#url="http://lash-audio.org"
+url="http://lash.nongnu.org/"
 license=('GPL')
 depends=('dbus-core' 'gtk2' 'jack' 'libxml2' 'python2')
 install=$pkgname.install
diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD
index dfd30f1da..19d738644 100644
--- a/community/open-vm-tools-modules/PKGBUILD
+++ b/community/open-vm-tools-modules/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 58214 2011-11-08 22:41:11Z ibiru $
+# $Id: PKGBUILD 58261 2011-11-09 14:59:24Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Raczkowski <raczkow@gmail.com>
 
 pkgname=open-vm-tools-modules
-pkgver=2011.09.23
-_pkgsubver=491607
-pkgrel=2
+pkgver=2011.10.26
+_pkgsubver=514583
+pkgrel=1
 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools"
 arch=('i686' 'x86_64')
 url="http://open-vm-tools.sourceforge.net/"
@@ -14,7 +14,7 @@ makedepends=('libdnet' 'icu' 'uriparser' 'linux-headers')
 depends=("linux")
 install=$pkgname.install
 source=("http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz")
-md5sums=('599342eee8d531b35ca1cc948b61868f')
+md5sums=('06f299375a91fbcba9d16b5007490023')
 
 build() {
   _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -`
diff --git a/community/open-vm-tools/PKGBUILD b/community/open-vm-tools/PKGBUILD
index c38880bc2..8821eaa01 100644
--- a/community/open-vm-tools/PKGBUILD
+++ b/community/open-vm-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56482 2011-10-07 10:14:48Z spupykin $
+# $Id: PKGBUILD 58259 2011-11-09 14:58:37Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Raczkowski <raczkow@gmail.com>
 
 pkgname=open-vm-tools
-pkgver=2011.09.23
-_pkgsubver=491607
+pkgver=2011.10.26
+_pkgsubver=514583
 pkgrel=1
 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools."
 arch=('i686' 'x86_64')
@@ -24,9 +24,9 @@ source=(http://switch.dl.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver}
 	tools.conf
 	vmware-guestd
 	xautostart.conf)
-md5sums=('599342eee8d531b35ca1cc948b61868f'
+md5sums=('06f299375a91fbcba9d16b5007490023'
          '06f7448e274db2a911f582e276088fc9'
-         'b183ec265200d68431a5e4eb1b0c8cf5'
+         '199508b0d3fe6fa9b726d09170bf51f1'
          '8c333a979578bdc0c3134c1dd6bb7353'
          '79b0a14d86191fee70a4639da8bd7785'
          '67cb83a9e5a4dd016c1a1da2863ca36d'
@@ -37,7 +37,6 @@ md5sums=('599342eee8d531b35ca1cc948b61868f'
 build() {
   cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}"
   [ $NOEXTRACT -eq 1 ] || {
-#    sed -i 's#3.2.7#3.2.8#' configure configure.ac
     sed -i 's#CFLAGS="$CFLAGS -Werror"##' configure configure.ac
   }
   [ -f Makefile ] || ./configure --prefix=/usr --without-kernel-modules
@@ -52,8 +51,8 @@ package() {
   chmod 07755 $pkgdir/usr/bin/vmware-user-suid-wrapper
 
   cd $pkgdir
-  patch -Np1 -i $srcdir/scripts-network.patch etc/vmware-tools/scripts/vmware/network
-  patch -Np1 -i $srcdir/scripts-network-FS19541.patch etc/vmware-tools/scripts/vmware/network
+  patch -p1 -i $srcdir/scripts-network.patch etc/vmware-tools/scripts/vmware/network
+  patch -p1 -i $srcdir/scripts-network-FS19541.patch etc/vmware-tools/scripts/vmware/network
 
   install -D -m 755 $srcdir/open-vm-tools.rc.d $pkgdir/etc/rc.d/open-vm-tools
   install -D -m 644 $srcdir/open-vm-tools.conf.d $pkgdir/etc/conf.d/open-vm-tools
diff --git a/community/open-vm-tools/scripts-network-FS19541.patch b/community/open-vm-tools/scripts-network-FS19541.patch
index 1f65b9824..5fcb33ba8 100644
--- a/community/open-vm-tools/scripts-network-FS19541.patch
+++ b/community/open-vm-tools/scripts-network-FS19541.patch
@@ -1,5 +1,5 @@
---- network	2010-04-28 12:30:51.000000000 +0200
-+++ network.bak	2010-05-20 12:12:50.000000000 +0200
+--- network.orig	2011-11-09 18:42:28.000000000 +0400
++++ network	2011-11-09 18:46:22.000000000 +0400
 @@ -76,7 +76,7 @@
           else
              echo `date` "[rescue_nic] activating $nic ..."
@@ -9,32 +9,30 @@
              exitCode=`expr $exitCode \| $?`
           fi
        done < $activeList
-@@ -103,7 +103,7 @@
- TranquilizeNetworkManager() {
+@@ -105,7 +105,7 @@
     # `which' may be a bit noisy, so we'll shush it.
     dbusSend=`which dbus-send 2>/dev/null`
--   if [ $? -eq 0 ]; then
-+   if [ $? -eq 0 ] && [ `pidof dbus-daemon` ]; then
-       # NetworkManager 0.6
-       $dbusSend --system --dest=org.freedesktop.NetworkManager          \
-          /org/freedesktop/NetworkManager                                \
-@@ -133,7 +133,7 @@
- WakeNetworkManager() {
+    rc=$?
+-   if [ $rc = 0 ]; then
++   if [ $rc = 0 ] && [ `pidof dbus-daemon` ]; then
+       # NetworkManager 0.8.0
+       $dbusSend --system --print-reply          \
+          --dest=org.freedesktop.NetworkManager  \
+@@ -154,7 +154,7 @@
     # `which' may be a bit noisy, so we'll shush it.
     dbusSend=`which dbus-send 2>/dev/null`
--   if [ $? -eq 0 ]; then
-+   if [ $? -eq 0 ] && [ `pidof dbus-daemon` ]; then
-       # NetworkManager 0.6
-       $dbusSend --system --dest=org.freedesktop.NetworkManager          \
-          /org/freedesktop/NetworkManager                                \
-@@ -165,8 +165,8 @@
+    rc=$?
+-   if [ $rc = 0 ]; then
++   if [ $rc = 0 ] && [ `pidof dbus-daemon` ]; then
+       # NetworkManager 0.8.0
+       $dbusSend --system --print-reply          \
+          --dest=org.freedesktop.NetworkManager  \
+@@ -203,7 +203,7 @@
  
     # XXX Are these really necessary?  If so, we should have seen customer
     # complaints by now.
 -   which ifup >/dev/null 2>&1      || Panic "ifup not in search path."
--   which ifconfig >/dev/null 2>&1  || Panic "ifconfig not in search path."
 +#   which ifup >/dev/null 2>&1     || Panic "ifup not in search path."
-+   which ifconfig >/dev/null 2>&1 || Panic "ifconfig not in search path."
+    which ifconfig >/dev/null 2>&1  || Panic "ifconfig not in search path."
  
     case "$1" in
-       poweron-vm)
diff --git a/community/stunnel/PKGBUILD b/community/stunnel/PKGBUILD
index 15530d4dc..cd681ede7 100644
--- a/community/stunnel/PKGBUILD
+++ b/community/stunnel/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 57310 2011-10-25 14:35:46Z lfleischer $
+# $Id: PKGBUILD 58274 2011-11-09 16:42:13Z lfleischer $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 
 pkgname=stunnel
-pkgver=4.45
+pkgver=4.46
 pkgrel=1
 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL"
 arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ options=('!libtool')
 source=("ftp://ftp.stunnel.org/stunnel/$pkgname-$pkgver.tar.gz"{,.asc}
         'Makefile.patch'
         'stunnel.rc.d')
-md5sums=('dee104214a7c13593c1053cdff9a850f'
-         'be46793ceb4ce44f40edd70bbdd21c90'
+md5sums=('978030ff42f087ec26eb8a095ab69994'
+         'dcd8d51b8591d4d1df50373646a363b8'
          'f15398497e10e080c2406d2fc541660c'
          'cb647c71ff4cb1e035b6e515d5f13ebf')
 
diff --git a/community/tomoyo-tools/PKGBUILD b/community/tomoyo-tools/PKGBUILD
index d5a011512..caf0eb347 100644
--- a/community/tomoyo-tools/PKGBUILD
+++ b/community/tomoyo-tools/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 56076 2011-09-30 09:42:38Z spupykin $
+# $Id: PKGBUILD 58253 2011-11-09 13:16:03Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk>
 
 pkgname=tomoyo-tools
-_basever=2.3.0
-_timestamp=20110929
+_basever=2.4.0
+_timestamp=20111025
+_file=52848
 pkgver=${_basever}.${_timestamp}
 pkgrel=1
 pkgdesc='TOMOYO Linux 2.3.x userspace tools for Linux kernels 2.6.36 - 3.0'
@@ -15,8 +16,8 @@ license=('GPL')
 depends=('ncurses')
 conflicts=('ccs-tools')
 install=tomoyo-tools.install
-source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/48663/${pkgname}-${_basever}-${_timestamp}.tar.gz")
-md5sums=('4444feb74a84f2ae50a9a5d8065c3a8e')
+source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/${_file}/${pkgname}-${_basever}-${_timestamp}.tar.gz")
+md5sums=('eeee0afbccae2291e16dbbb64cf85370')
 
 build() {
   cd "${srcdir}/${pkgname}"
diff --git a/community/vhba-module/PKGBUILD b/community/vhba-module/PKGBUILD
index 4e2739fb2..448c9f7fb 100644
--- a/community/vhba-module/PKGBUILD
+++ b/community/vhba-module/PKGBUILD
@@ -1,17 +1,19 @@
-# $Id: PKGBUILD 57058 2011-10-20 04:40:39Z bpiotrowski $
+# $Id: PKGBUILD 58264 2011-11-09 15:50:55Z jelle $
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Charles Lindsay <charles@chaoslizard.org>
 
 pkgname=vhba-module
 pkgver=20110915
-_kernver='3.0-ARCH'
-pkgrel=1
+#_kernver='3.1.0-ARCH'
+_extramodules=extramodules-3.1-ARCH
+_kernver="$(cat /lib/modules/${_extramodules}/version)"
+pkgrel=2
 pkgdesc="Kernel module that emulates SCSI devices"
 arch=('i686' 'x86_64')
 url="http://cdemu.sourceforge.net/"
 license=('GPL2')
-depends=('linux>=3.0' 'linux<3.1')
-makedepends=('linux-headers>=3.0')
+depends=('linux>=3.1' 'linux<3.2')
+makedepends=('linux-headers>=3.1')
 install=vhba-module.install
 source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz)
 md5sums=('fb90cd8fc4cd74d08c92e8235f99f1f4')
@@ -23,6 +25,6 @@ build() {
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  install -D vhba.ko "$pkgdir/lib/modules/${_kernver}/extra/vhba.ko"
-  sed -i "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/vhba-module.install"
+  install -D vhba.ko "$pkgdir/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 75669d1a5..eca9bb285 100644
--- a/community/vhba-module/vhba-module.install
+++ b/community/vhba-module/vhba-module.install
@@ -1,8 +1,8 @@
 post_install() {
   echo ">> Place 'vhba' in MODULES= in /etc/rc.conf to enable vhba on system boot."
   echo ">> This module needs to be recompiled for every kernel version upgrade."
-  KERNEL_VERSION='3.0-ARCH'
-  depmod $KERNEL_VERSION > /dev/null 2>&1
+  EXTRAMODULES='extramodules-3.1-ARCH'
+  depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
@@ -10,7 +10,7 @@ post_upgrade() {
 }
 
 post_remove() {
-  KERNEL_VERSION='3.0-ARCH'
-  depmod $KERNEL_VERSION > /dev/null 2>&1
+  EXTRAMODULES='extramodules-3.1-ARCH'
+  depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 
diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD
index 543c856f4..1089651f1 100644
--- a/community/virtualbox/PKGBUILD
+++ b/community/virtualbox/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 58218 2011-11-08 22:41:47Z ibiru $
+# $Id: PKGBUILD 58251 2011-11-09 12:36:02Z ibiru $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgbase=virtualbox
 pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-sdk' 'virtualbox-source')
 pkgver=4.1.6
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
-makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt=4.7.4-3' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst'
+makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst'
 'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'linux-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' 'gsoap' 'vde2')
 #'xorg-server-devel' 'xf86driproto' 'libxcomposite')
 [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
@@ -17,7 +17,7 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}
         change_default_driver_dir.patch vbox-service.conf vbox-service.rc)
 
 _extramodules=extramodules-3.1-ARCH
-_kernver="$(cat /lib/modules/${_extramodules}/version || true)"
+_kernver="$(cat /lib/modules/${_extramodules}/version)"
 
 build() {
     cd "$srcdir/VirtualBox-${pkgver}_OSE"
@@ -183,7 +183,7 @@ md5sums=('89b979d1b817242c7cdcb489898f166a'
          '5f85710e0b8606de967716ded7b2d351'
          '6ab2455c391d8cc005e2f4461ae26a3b'
          '78ffa67ff131680f1d2b6f06d4325c5b'
-         'a82d698e7868315cdf876cfb02fd2268'
+         'bb9f83f91349437825edc7bc9a294aee'
          '97e193f050574dd272a38e5ee5ebe62b'
          '3c08ad30b89add47d3f45121200a5360'
          'e7416331d0bc331f3b5aae3e5d104642')
diff --git a/community/virtualbox/vboxbuild b/community/virtualbox/vboxbuild
index cfc3c0a66..fdfbe712f 100755
--- a/community/virtualbox/vboxbuild
+++ b/community/virtualbox/vboxbuild
@@ -59,13 +59,18 @@ for kernver; do
   fi
 
   stat_busy "Recompiling VirtualBox kernel modules ($kernver)"
-    for build in BUILDVBOX{DRV,NETFLT,NETADP,PCI}; do
+    if ! $BUILDVBOXDRV \
+      --save-module-symvers /tmp/vboxdrv-Module.symvers \
+      --no-print-directory install >> $LOG 2>&1; then
+      echo  "Look at $LOG to find out what went wrong"
+      stat_fail
+    fi
+    for build in BUILDVBOX{NETFLT,NETADP,PCI}; do
       if ! ${!build} \
-        --save-module-symvers /tmp/vboxdrv-Module.symvers \
+        --use-module-symvers /tmp/vboxdrv-Module.symvers \
         --no-print-directory install >> $LOG 2>&1; then
         echo  "Look at $LOG to find out what went wrong"
         stat_fail
-        continue
       fi
     done
   stat_done
diff --git a/community/zathura/PKGBUILD b/community/zathura/PKGBUILD
index 9aef3ce41..fcbdb7769 100644
--- a/community/zathura/PKGBUILD
+++ b/community/zathura/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 56955 2011-10-17 08:21:21Z ibiru $
+# $Id: PKGBUILD 58277 2011-11-09 16:52:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: ML <neldoreth>
 
 pkgname=zathura
-pkgver=0.0.8.4
+pkgver=0.0.8.5
 pkgrel=4
 pkgdesc="a PDF viewer"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ install=zathura.install
 DLAGENTS=('http::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u'
           'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u')
 source=(https://pwmt.org/download/zathura-$pkgver.tar.gz)
-md5sums=('e3a7f82401059e591ed549d615f53ddd')
+md5sums=('52e0c3b3917c7feaecba98cff8435b90')
 
 build() {
   cd $srcdir/zathura-$pkgver