20 files changed, 176 insertions, 69 deletions
diff --git a/community/conntrack-tools/PKGBUILD b/community/conntrack-tools/PKGBUILD
index ef1d82740..d82489e0a 100644
--- a/community/conntrack-tools/PKGBUILD
+++ b/community/conntrack-tools/PKGBUILD
@@ -1,25 +1,29 @@
-# $Id: PKGBUILD 74777 2012-08-04 01:09:31Z seblu $
+# $Id: PKGBUILD 77959 2012-10-16 01:20:20Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Valere Monseur <valere_monseur@hotmail.com>
 # Contributor: Alessandro Sagratini <ale_sagra@hotmail.com>
 # Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
 
 pkgname=conntrack-tools
-pkgver=1.2.2
+pkgver=1.4.0
 pkgrel=1
 pkgdesc='Userspace tools to interact with the Netfilter connection tracking system'
 arch=('i686' 'x86_64')
 url='http://www.netfilter.org/projects/conntrack-tools'
 license=('GPL2')
-depends=('libnetfilter_conntrack' 'libnetfilter_cttimeout')
+depends=('libnetfilter_conntrack'
+         'libnetfilter_cttimeout'
+         'libnetfilter_cthelper'
+         'libnetfilter_queue')
 backup=('etc/conntrackd.conf' 'etc/conf.d/conntrackd')
-install=$pkgname.install
+options=('!libtool')
 source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2"
         'conntrackd.rc'
         'conntrackd.conf'
         'conntrackd.service'
         '01-config-file-path.patch')
-md5sums=('a8afc813e16265655f83991fc0df35b6'
+install=$pkgname.install
+md5sums=('ee737c774e01349f75e935228a2d851b'
          '478fe76da0202fcb5249bf65968d1c26'
          'd3e73e81b54e3e8166d357d434680684'
          'bd135eaefb47923bb8e8d26f084d3e9d'
diff --git a/community/deja-dup/PKGBUILD b/community/deja-dup/PKGBUILD
index 76e4f4d65..1f9815897 100644
--- a/community/deja-dup/PKGBUILD
+++ b/community/deja-dup/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 69507 2012-04-17 14:32:37Z bgyorgy $
+# $Id: PKGBUILD 77901 2012-10-15 17:33:17Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=deja-dup
-pkgver=22.1
+pkgver=24.0
 pkgrel=1
 pkgdesc="Simple backup tool, that hides the complexity of backing up the Right Way and uses duplicity as the backend"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/deja-dup"
 license=('GPL')
-depends=('duplicity' 'gtk3' 'libgnome-keyring' 'libnotify' 'dconf' 'hicolor-icon-theme' 'xdg-utils')
+depends=('duplicity' 'libgnome-keyring' 'libpeas' 'libnotify' 'python2-gobject2' 'dconf' 'xdg-utils')
 makedepends=('vala' 'intltool' 'itstool' 'nautilus')
 optdepends=('nautilus: backup extension')
 options=('!libtool')
 install=$pkgname.install
 source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz)
-md5sums=('cbf7af6f0392ab9ef355a3aeb74c8a79')
+md5sums=('335131d1f3c85615339fa8b212db50ae')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/fox/PKGBUILD b/community/fox/PKGBUILD
index 5225f4927..cd8506fd0 100644
--- a/community/fox/PKGBUILD
+++ b/community/fox/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 77632 2012-10-13 11:42:15Z allan $
+# $Id: PKGBUILD 77870 2012-10-15 10:22:54Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=fox
 pkgver=1.6.46
-pkgrel=2
+pkgrel=3
 pkgdesc="Free Objects for X: GUI Toolkit for C++"
 arch=('i686' 'x86_64')
 url="http://www.fox-toolkit.org/"
 license=('LGPL' 'custom')
-depends=('bzip2' 'libxcursor' 'libxft' 'libxrandr' 'mesa' 'libxi' 'libpng' 'libtiff' 'glu')
+depends=('bzip2' 'libxcursor' 'libxft' 'libxrandr' 'libxi' 'libpng' 'libtiff' 'glu')
+makedepends=('mesa')
 optdepends=('perl')
 options=('!libtool')
 source=(http://ftp.fox-toolkit.org/pub/fox-$pkgver.tar.gz)
diff --git a/community/freedroidrpg/PKGBUILD b/community/freedroidrpg/PKGBUILD
index b3c2fb45d..38c9ce56d 100644
--- a/community/freedroidrpg/PKGBUILD
+++ b/community/freedroidrpg/PKGBUILD
@@ -1,15 +1,13 @@
-# $Id: PKGBUILD 75817 2012-09-01 20:39:32Z heftig $
+# $Id: PKGBUILD 77877 2012-10-15 10:55:20Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: nut543 <kfs1@online.no>
 
-#pkgbase=freedroidrpg
-#pkgname=('freedroidrpg' 'freedroidrpg-data')
 pkgname='freedroidrpg'
 pkgver=0.15.1
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
-# depends=('sdl_mixer' 'sdl_image' 'libogg' 'libvorbis' 'libgl' 'freedroidrpg-data')
-depends=('sdl_mixer' 'sdl_image' 'sdl_gfx' 'libogg' 'libvorbis' 'libgl' 'mesa')
+depends=('sdl_mixer' 'sdl_image' 'sdl_gfx' 'libogg' 'libvorbis' 'libgl' 'glu')
+makedepends=('mesa')
 optdepends=('python2' 'espeak')
 pkgdesc="a mature science fiction role playing game set in the future"
 url="http://freedroid.sourceforge.net"
diff --git a/community/freemat/PKGBUILD b/community/freemat/PKGBUILD
index 7fa884dca..02d57a273 100644
--- a/community/freemat/PKGBUILD
+++ b/community/freemat/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 77633 2012-10-13 11:42:24Z allan $
+# $Id: PKGBUILD 77872 2012-10-15 10:33:45Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=freemat
 pkgver=4.1
-pkgrel=5
+pkgrel=6
 pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing"
 arch=('i686' 'x86_64')
 url="http://freemat.sourceforge.net"
 license=('GPL')
-depends=('qt' 'ffcall' 'fftw' 'mesa' 'portaudio' 'libffi' 'mesa' 'glu')
-makedepends=('arpack' 'lapack' 'umfpack' 'blas' 'libmatio' 'cmake' 'python2')
+depends=('qt' 'ffcall' 'fftw' 'portaudio' 'libffi' 'glu')
+makedepends=('arpack' 'lapack' 'umfpack' 'blas' 'libmatio' 'cmake' 'python2' 'mesa')
 install=freemat.install
 source=(http://downloads.sourceforge.net/project/freemat/FreeMat4/FreeMat-$pkgver-Source.tar.gz
 	build-fix.patch)
diff --git a/community/inputattach/PKGBUILD b/community/inputattach/PKGBUILD
index 53879697c..ea6fca2b6 100644
--- a/community/inputattach/PKGBUILD
+++ b/community/inputattach/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65570 2012-02-21 09:01:06Z spupykin $
+# $Id: PKGBUILD 77899 2012-10-15 16:07:24Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Mark Smith <markzzzsmith@yahoo.com.au>
 
 pkgname=inputattach
 pkgver=1.24
-pkgrel=5
+pkgrel=6
 pkgdesc="Attach serial mice, keyboards and other input devices to the kernel input system"
 arch=('i686' 'x86_64')
 url="http://linuxconsole.sourceforge.net/"
@@ -19,26 +19,38 @@ source=('http://arch.p5n.pp.ru/~sergej/dl/2011/inputattach.c'
 	'http://arch.p5n.pp.ru/~sergej/dl/2011/serio-ids.h'
 	'inputattach.conf.d'
 	'inputattach.rc.d'
+	'inputattach.service'
+	'inputattachctl'
 	'0001-Add-w8001-flag.patch'
 	'0002-Allow-for-custom-baud-rates.patch')
 md5sums=('eb595a766ca363edb3b14c25404596ce'
          '93d34d96cd3ad19ea1aeca7f68a66b4a'
          '7ca903e54829764c8241233af5069216'
          'aa2e404fc113abdd2ab14e2a6352c331'
+         'c19b9ed38b243191cf5378b87a42a4cc'
+         '84c6463660c10bd34c0390102da087d5'
          'f1b3ddae308351357f557cbd5c6cda81'
          '8f76908449cae24a95adbf0bc0a17721')
 
 build() {
   cd "$srcdir"
+
+  mkdir src
+  cp inputattach.c serio-ids.h src/
+  cd src
+
   # Add support for serial wacom tablets
   patch -Np1 -i "$srcdir/0001-Add-w8001-flag.patch"
   patch -Np1 -i "$srcdir/0002-Allow-for-custom-baud-rates.patch"
+
   cc $CFLAGS inputattach.c -o inputattach
 }
 
 package() {
-  cd "$srcdir"
+  cd "$srcdir/src"
   install -Dm755 inputattach "$pkgdir/usr/sbin/inputattach"
   install -Dm644 $srcdir/inputattach.conf.d "$pkgdir/etc/conf.d/inputattach"
   install -Dm755 $srcdir/inputattach.rc.d "$pkgdir/etc/rc.d/inputattach"
+  install -Dm755 $srcdir/inputattachctl $pkgdir/usr/bin/inputattachctl
+  install -Dm644 $srcdir/inputattach.service $pkgdir/usr/lib/systemd/system/inputattach.service
 }
diff --git a/community/inputattach/inputattach.service b/community/inputattach/inputattach.service
new file mode 100644
index 000000000..2ec902c09
--- /dev/null
+++ b/community/inputattach/inputattach.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Attach serial input devices to kernel input subsystem
+After=syslog.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/inputattachctl start
+ExecStop=/usr/bin/inputattachctl stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/inputattach/inputattachctl b/community/inputattach/inputattachctl
new file mode 100755
index 000000000..291c531ae
--- /dev/null
+++ b/community/inputattach/inputattachctl
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+. /etc/conf.d/inputattach
+
+case "$1" in
+	start)
+		for i in "${IAPARAMS[@]}"; do
+			/usr/sbin/inputattach --daemon $i || exit 1
+		done
+		;;
+	stop)
+		killall inputattach || exit 1
+		;;
+esac
diff --git a/community/libnetfilter_cthelper/PKGBUILD b/community/libnetfilter_cthelper/PKGBUILD
new file mode 100644
index 000000000..0cca5f479
--- /dev/null
+++ b/community/libnetfilter_cthelper/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 77960 2012-10-16 01:20:23Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+
+pkgname=libnetfilter_cthelper
+pkgver=1.0.0
+pkgrel=1
+pkgdesc='Library for the connection tracking helper infrastructure'
+arch=('i686' 'x86_64')
+url='http://www.netfilter.org/projects/libnetfilter_cthelper/'
+license=('GPL2')
+depends=('libmnl')
+options=('!libtool')
+source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
+md5sums=('b2efab1a3a198a5add448960ba011acd')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/nestopia/PKGBUILD b/community/nestopia/PKGBUILD
index f9238d3f5..d03528a26 100644
--- a/community/nestopia/PKGBUILD
+++ b/community/nestopia/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 77652 2012-10-13 11:44:15Z allan $
+# $Id: PKGBUILD 77858 2012-10-15 10:08:57Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Tiago Pierezan Camargo <tcamargo@gmail.com>
 # Contributor: robb_force <robb_force@holybuffalo.net>
 
 pkgname=nestopia
 pkgver=1.42
-pkgrel=3
+pkgrel=4
 pkgdesc='An NES emulator featuring cycle exact emulation, a ridiculous number of mappers, and lots of custom sound chips.'
 url='http://0ldsk00l.ca/nestopia.html'
 license=('GPL')
 arch=('i686' 'x86_64')
-depends=('sdl' 'alsa-lib' 'gtk3' 'mesa' 'glu')
-makedepends=('unzip')
+depends=('sdl' 'alsa-lib' 'gtk3' 'glu')
+makedepends=('unzip' 'mesa')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/rdanbrook/nestopia/tarball/$pkgver"
 	"build-fix.patch")
 md5sums=('ce7ffba59f19c764f08546e015777172'
diff --git a/community/netcf/PKGBUILD b/community/netcf/PKGBUILD
index 9c26ba270..9e1d02240 100644
--- a/community/netcf/PKGBUILD
+++ b/community/netcf/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 70813 2012-05-16 21:38:44Z spupykin $
+# $Id: PKGBUILD 77847 2012-10-15 09:41:41Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Aurélien Wailly <aurelien.wailly@gmail.com>
 
 pkgname=netcf
-pkgver=0.1.9
-pkgrel=2
+pkgver=0.2.2
+pkgrel=1
 pkgdesc="A library for configuring network interfaces"
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -12,25 +12,23 @@ url="https://fedorahosted.org/netcf/"
 depends=('augeas>=0.7.4' 'netcfg' 'libxslt' 'libxml2' 'libnl')
 makedepends=('gcc')
 options=(!libtool)
-source=("https://fedorahosted.org/released/netcf/$pkgname-$pkgver.tar.gz"
-	"netcf-libnl3.patch::https://bugs.archlinux.org/task/29908?getfile=8775")
-md5sums=('4d62010a79d56c12438969da9035b63c'
-         'a509be4b819f669fac21e1eaa621e3e0')
+source=("https://fedorahosted.org/released/netcf/$pkgname-$pkgver.tar.gz")
+md5sums=('fbcd47101797b8fcd9519e22002cd200')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/netcf-libnl3.patch
   aclocal
   automake --add-missing || true
   autoreconf
-#  CFLAGS="`pkg-config --cflags libnl-3.0` -DRTNL_LINK_NOT_FOUND=-1"
-  CFLAGS="-DNETCF_TRANSACTION=\"true\"" ./configure --prefix=/usr \
+  ./configure --prefix=/usr \
 	--disable-static \
-	--with-init-script=none
+	--with-init-script=none \
+	--with-driver=redhat
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR=${pkgdir} install
+  rm -rf $pkgdir/etc/rc.d/init.d
 }
diff --git a/community/pptpd/PKGBUILD b/community/pptpd/PKGBUILD
index c3e97bec9..d7e98e032 100644
--- a/community/pptpd/PKGBUILD
+++ b/community/pptpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 74350 2012-07-25 10:18:29Z spupykin $
+# $Id: PKGBUILD 77852 2012-10-15 09:47:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=pptpd
 pkgver=1.3.4
-pkgrel=10
+pkgrel=11
 pkgdesc="Poptop server"
 arch=(i686 x86_64)
 url="http://poptop.sourceforge.net/"
@@ -12,9 +12,11 @@ depends=(ppp glibc)
 backup=(etc/pptpd.conf)
 source=(http://downloads.sourceforge.net/sourceforge/poptop/pptpd-$pkgver.tar.gz
 	pptpd
+	pptpd.service
 	unrecognized-opt.patch)
 md5sums=('b38df9c431041922c997c1148bedf591'
          'e09f81beb5d59a0fdfba94e3a60d992b'
+         '144c17c7d5c1b95cfb3450eb73aa2e50'
          'cfa02c86d0413eb94fac15599986f54c')
 
 build() {
@@ -38,6 +40,7 @@ package() {
   mkdir -p $pkgdir/etc/
   echo -e "# Read man pptpd.conf, see samples in /usr/share/doc/pptpd\n# and write your pptpd configuration here" >$pkgdir/etc/pptpd.conf
   install -Dm0755 ../pptpd $pkgdir/etc/rc.d/pptpd
+  install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
   mkdir -p $pkgdir/usr/share/doc/pptpd
   cp -a samples $pkgdir/usr/share/doc/pptpd/
 }
diff --git a/community/pptpd/pptpd.service b/community/pptpd/pptpd.service
new file mode 100644
index 000000000..739508b60
--- /dev/null
+++ b/community/pptpd/pptpd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=PPTP Server
+After=network.target
+
+[Service]
+ExecStart=/usr/sbin/pptpd -c /etc/pptpd.conf -p /var/run/pptpd.pid -f
+StandardOutput=null
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/python2-pysqlite-legacy/PKGBUILD b/community/python2-pysqlite-legacy/PKGBUILD
new file mode 100644
index 000000000..6fdb5bb66
--- /dev/null
+++ b/community/python2-pysqlite-legacy/PKGBUILD
@@ -0,0 +1,25 @@
+# $Id: PKGBUILD 77909 2012-10-15 19:54:27Z rvanharen $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor : Aaron Griffin <aaron.archlinux.org>
+
+pkgname=python2-pysqlite-legacy
+pkgver=1.0.1
+pkgrel=1
+pkgdesc="A Python DB-API 2.0 interface for the legacy SQLite 2"
+arch=('i686' 'x86_64')
+url="http://initd.org/tracker/pysqlite"
+replaces=('python-pysqlite-legacy')
+license=('custom')
+depends=('python2' 'sqlite2')
+source=(http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/pysqlite-$pkgver.tar.gz)
+md5sums=('4797b5ea7a3d96b87333e6b5af7b9979')
+
+build()
+{
+  cd ${srcdir}/pysqlite
+  python2 setup.py install --root=${pkgdir} -O1
+
+ # install custom license
+ install -Dm644 ${srcdir}/pysqlite/LICENSE \
+	${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/community/rss-glx/PKGBUILD b/community/rss-glx/PKGBUILD
index 8822cdff5..3886c1660 100644
--- a/community/rss-glx/PKGBUILD
+++ b/community/rss-glx/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 77659 2012-10-13 11:44:58Z allan $
+# $Id: PKGBUILD 77864 2012-10-15 10:12:56Z spupykin $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it>
 # Contributor: Tate "Tatey" Johnson <tatey86@tpg.com.au>
 
 pkgname=rss-glx
 pkgver=0.9.1
-pkgrel=10
+pkgrel=11
 pkgdesc="The Really Slick Screensavers port to GLX"
 arch=('i686' 'x86_64')
 url="http://rss-glx.sourceforge.net/"
 license=('GPL')
-depends=('desktop-file-utils' 'freealut' 'glew' 'imagemagick' 'glu' 'mesa')
+depends=('desktop-file-utils' 'freealut' 'glew' 'imagemagick' 'glu')
+makedepends=('mesa')
 optdepends=('xscreensaver: xscreensaver integration')
 install=rss-glx.install
 options=('!libtool')
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index eff2034da..28b75bd71 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 77194 2012-10-06 11:13:30Z tpowa $
+# $Id: PKGBUILD 77842 2012-10-15 05:19:18Z tpowa $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
 pkgver=4.2.0
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -16,7 +16,8 @@ makedepends=('linux-headers'
 
 build() {
   # current kernel version
-  _kernver=$(expac -Q '%v' linux-headers)-ARCH
+  #_kernver=$(expac -Q '%v' linux-headers)-ARCH
+  _kernver=3.6.0-1-ARCH
   # dkms need modification to be run as user
   cp -r /var/lib/dkms .
   echo "dkms_tree='$srcdir/dkms'" > dkms.conf
@@ -30,12 +31,13 @@ build() {
 
 package_virtualbox-host-modules(){
   pkgdesc='Host kernel modules for VirtualBox'
-  depends=('linux>=3.5' 'linux<3.6')
+  depends=('linux>=3.6' 'linux<3.7')
   replaces=('virtualbox-modules')
   conflicts=('virtualbox-modules')
   install=virtualbox-host-modules.install
 
-  _kernver=$(expac -Q '%v' linux-headers)-ARCH
+  #_kernver=$(expac -Q '%v' linux-headers)-ARCH
+   _kernver=3.6.0-1-ARCH
   _extraver=extramodules-${_kernver%.*}-ARCH
 
   install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
@@ -48,19 +50,20 @@ package_virtualbox-host-modules(){
 package_virtualbox-guest-modules(){
   pkgdesc='Guest kernel modules for VirtualBox'
   license=('GPL')
-  depends=('linux>=3.5' 'linux<3.6')
+  depends=('linux>=3.6' 'linux<3.7')
   replaces=('virtualbox-archlinux-modules')
   conflicts=('virtualbox-archlinux-modules')
   install=virtualbox-guest-modules.install
 
-  _kernver=$(expac -Q '%v' linux-headers)-ARCH
+  #_kernver=$(expac -Q '%v' linux-headers)-ARCH
+  _kernver=3.6.0-1-ARCH
   _extraver=extramodules-${_kernver%.*}-ARCH
 
   install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
   install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-host-modules.install"
+  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-guest-modules.install"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/virtualbox-modules/build.sh b/community/virtualbox-modules/build.sh
index 9b0e6fca8..828448cab 100755
--- a/community/virtualbox-modules/build.sh
+++ b/community/virtualbox-modules/build.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-if (( $# != 2 )); then
-  echo "usage: $0 extra multilib"
-  echo "       $0 testing multilib-testing"
+if (( $# != 1 )); then
+  echo "usage: $0 extra"
+  echo "       $0 testing"
   exit 1
 fi
 
@@ -11,10 +11,10 @@ linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-i686.pk
 linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-i686.pkg.tar.xz  -r /var/lib/archbuild/$1-i686
 linux32 makechrootpkg -r /var/lib/archbuild/$1-i686
 
-$2-build
-makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$2-x86_64
-makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-x86_64.pkg.tar.xz  -r /var/lib/archbuild/$2-x86_64
-makechrootpkg -r /var/lib/archbuild/$2-x86_64
+$1-x86_64-build
+makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
+makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-x86_64.pkg.tar.xz  -r /var/lib/archbuild/$1-x86_64
+makechrootpkg -r /var/lib/archbuild/$1-x86_64
 
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/virtualbox-modules/virtualbox-guest-modules.install b/community/virtualbox-modules/virtualbox-guest-modules.install
index 15d536b7f..e5d1038af 100644
--- a/community/virtualbox-modules/virtualbox-guest-modules.install
+++ b/community/virtualbox-modules/virtualbox-guest-modules.install
@@ -2,16 +2,16 @@ post_install() {
 cat << EOF
 ===> You may want to load vboxguest, vboxsf and vboxvideo
 EOF
-    EXTRAMODULES='extramodules-3.5-ARCH'
+    EXTRAMODULES='extramodules-3.6-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.5-ARCH'
+    EXTRAMODULES='extramodules-3.6-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.5-ARCH'
+    EXTRAMODULES='extramodules-3.6-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
diff --git a/community/virtualbox-modules/virtualbox-host-modules.install b/community/virtualbox-modules/virtualbox-host-modules.install
index 9b7b8c444..3f2ed4a10 100644
--- a/community/virtualbox-modules/virtualbox-host-modules.install
+++ b/community/virtualbox-modules/virtualbox-host-modules.install
@@ -3,17 +3,17 @@ cat << EOF
 ===> You must load vboxdrv module before starting VirtualBox:
 ===> # modprobe vboxdrv
 EOF
-    EXTRAMODULES='extramodules-3.5-ARCH'
+    EXTRAMODULES='extramodules-3.6-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.5-ARCH'
+    EXTRAMODULES='extramodules-3.6-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
     echo 'In order to use the new version, reload all virtualbox modules manually.'
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.5-ARCH'
+    EXTRAMODULES='extramodules-3.6-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
diff --git a/community/xlockmore/PKGBUILD b/community/xlockmore/PKGBUILD
index afcbb9752..a0e8e4380 100644
--- a/community/xlockmore/PKGBUILD
+++ b/community/xlockmore/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 77669 2012-10-13 11:46:09Z allan $
+# $Id: PKGBUILD 77869 2012-10-15 10:22:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: dorphell <dorphell@archlinux.org>
 
 pkgname=xlockmore
 pkgver=5.40
-pkgrel=2
+pkgrel=3
 pkgdesc="screen saver / locker for the X Window System"
 arch=(i686 x86_64)
 license=('BSD')
-depends=(freetype2 gtk2 libxpm lesstif pam mesa libxmu glu)
+depends=(freetype2 gtk2 libxpm lesstif pam libxmu glu)
+makedepends=(mesa)
 url="http://www.tux.org/~bagleyd/xlockmore.html"
 options=('!makeflags')
 source=(http://www.tux.org/~bagleyd/xlock/xlockmore-$pkgver/xlockmore-$pkgver.tar.bz2