Tue Feb 5 00:07:38 PST 2013

38 files changed, 452 insertions, 268 deletions

diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD
index 3d992c031..805882571 100644
--- a/community/aria2/PKGBUILD
+++ b/community/aria2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 81793 2012-12-30 11:33:11Z bpiotrowski $
+# $Id: PKGBUILD 83746 2013-02-04 21:45:01Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Angel Velasquez <angvp@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=aria2
-pkgver=1.16.1
+pkgver=1.16.3
 pkgrel=1
 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink'
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ license=('GPL')
 depends=('gnutls' 'libxml2' 'sqlite' 'c-ares' 'ca-certificates')
 checkdepends=('cppunit')
 source=(http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2)
-md5sums=('ad7e0575ce4a480eb54030e1d348e076')
+sha256sums=('989f8eb5599394681d75e18acf3d4261870cc2dce70b813ce84305dc3c9e50a2')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/chrony/PKGBUILD b/community/chrony/PKGBUILD
index 49ce93a61..3c923f6ea 100644
--- a/community/chrony/PKGBUILD
+++ b/community/chrony/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75385 2012-08-21 18:13:22Z bpiotrowski $
+# $Id: PKGBUILD 83627 2013-02-04 07:41:05Z bpiotrowski $
 # Maintainer:  Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net>
@@ -7,8 +7,8 @@
 # Contributor: Elisamuel Resto <ryuji@simplysam.us>
 
 pkgname=chrony
-pkgver=1.26
-pkgrel=7
+pkgver=1.27
+pkgrel=1
 pkgdesc='Lightweight NTP client and server'
 arch=('i686' 'x86_64')
 url="http://chrony.tuxfamily.org/"
@@ -17,11 +17,9 @@ license=('GPL')
 depends=('readline' 'libcap')
 backup=('etc/chrony.conf')
 source=(http://download.tuxfamily.org/chrony/${pkgname}-${pkgver}.tar.gz
-        rc.d
         service)
-md5sums=('ad6dd619ff1986e4ff780363c64e2246'
-         'd8b653c8bcc76cef00aa10fbd3eeb4f7'
-         '778d85a6b42ccfab6460ec257b39ca4d')
+sha256sums=('d44835ee2180a9a0f4f320fc498c39d59dec33d35c2aa05b446fe65a2a83ae9d'
+            'b4f68b335820b6a8429591750da294e5a9fafc1e8f6af8d865f6604516ecb306')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -34,7 +32,6 @@ package() {
   make DESTDIR=$pkgdir install
 
   install -Dm0644 $srcdir/$pkgname-$pkgver/examples/chrony.conf.example $pkgdir/etc/chrony.conf
-  install -Dm0755 $srcdir/rc.d $pkgdir/etc/rc.d/chrony
   install -Dm644  $srcdir/service $pkgdir/usr/lib/systemd/system/chrony.service
 
   install -dm755 "$pkgdir/usr/lib/systemd/ntp-units.d"
diff --git a/community/connman/PKGBUILD b/community/connman/PKGBUILD
index faf051560..c9091f03d 100644
--- a/community/connman/PKGBUILD
+++ b/community/connman/PKGBUILD
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD 82130 2013-01-09 02:21:52Z dwallace $
+#$Id: PKGBUILD 83726 2013-02-04 18:08:38Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Lucas De Marchi <lucas.de.marchi@gmail.com>
 
 pkgname=connman
-pkgver=1.10
+pkgver=1.11
 pkgrel=1
 pkgdesc="Wireless LAN network manager"
 url="http://connman.net/"
@@ -19,7 +19,7 @@ source=('connmand-daemon'
         "http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'allow_group_network.diff')
 md5sums=('88ece7cbf1d0d289545ce4f8553fdab8'
-         '95a87fdccab7b63390c1c38ebba2883b'
+         '73f1f93ce503ee80dcc8c9bdda2c3426'
          'a8d22ee089fb0ed725130d16ad393047')
 
 build() {
@@ -31,6 +31,7 @@ build() {
       --with-systemdunitdir=/usr/lib/systemd/system \
       --enable-threads \
       --enable-openconnect \
+      --enable-vpnc \
       --enable-openvpn \
       --enable-polkit \
       --enable-client
diff --git a/community/drbd/PKGBUILD b/community/drbd/PKGBUILD
index d7e4c7c59..d34757355 100644
--- a/community/drbd/PKGBUILD
+++ b/community/drbd/PKGBUILD
@@ -1,20 +1,18 @@
-# $Id: PKGBUILD 75667 2012-08-28 14:04:52Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# $Id: PKGBUILD 83703 2013-02-04 14:42:03Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
 
 pkgname=drbd
 pkgver=8.3.13
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 pkgdesc='Userland tools for Distributed Replicated Block Device'
 url='http://www.drbd.org'
 license=('GPL2')
 depends=('perl' 'bash')
 source=("http://oss.linbit.com/drbd/8.3/$pkgname-$pkgver.tar.gz"
-        "$pkgname.rc"
         "$pkgname.service")
 backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf')
 md5sums=('760a25459ef6b7262a2a3572c1561c5b'
-         '8902a2f7aca6245c27e9566a1509312c'
          'afbb345094db49b0a474c0b4e51c0acd')
 
 build() {
@@ -56,12 +54,9 @@ package() {
   # 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)
-  cd "$srcdir"
-  install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname"
-  # install systemd stuff
-  install -Dm 644 $pkgname.service \
+  # systemd
+  install -Dm 644 "$srcdir/$pkgname.service" \
     "$pkgdir/usr/lib/systemd/system/$pkgname.service"
 }
 
-# vim:set ts=2 sw=2 ft=sh et:
+# vim:set ts=2 sw=2 et:
diff --git a/community/dumb/PKGBUILD b/community/dumb/PKGBUILD
index 2ddfc6153..c30d667a1 100644
--- a/community/dumb/PKGBUILD
+++ b/community/dumb/PKGBUILD
@@ -1,31 +1,35 @@
+# $Id: PKGBUILD 83614 2013-02-03 23:11:33Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: JJDaNiMoTh <jjdanimoth@gmail.com>
 # Contributor: Bjørn Lindeijer <bjorn lindeijer nl>
 
 pkgname=dumb
 pkgver=0.9.3
-pkgrel=6
-pkgdesc="An IT, XM, S3M and MOD player library"
-arch=('i686' 'x86_64')
+pkgrel=7
+pkgdesc='IT, XM, S3M and MOD player library'
+arch=('x86_64' 'i686')
 license=('custom:dumb' 'GPL')
-url="http://dumb.sourceforge.net/"
+url='http://dumb.sourceforge.net/'
+makedepends=('setconf')
 depends=('glibc' 'allegro4')
-source=(http://downloads.sourceforge.net/sourceforge/dumb/$pkgname-$pkgver.tar.gz
-        as-needed.patch
-        CVE-2006-3668.patch)
-md5sums=('f48da5b990aa8aa822d3b6a951baf5c2'
-         '580676387b07d3b5998bbd525df2df52'
-         'e1378e2eb30346073ee188608ac2c9e7')
+source=("http://downloads.sourceforge.net/sourceforge/dumb/$pkgname-$pkgver.tar.gz"
+        'as-needed.patch'
+        'CVE-2006-3668.patch')
+sha256sums=('8d44fbc9e57f3bac9f761c3b12ce102d47d717f0dd846657fb988e0bb5d1ea33'
+            'f7a41576d5dcecad2f9a01cbb0228457b434423046cb67c9a0a720ec87f43fb9'
+            '9f6785435757db725bc73b1c4874b91e80b9277c6fdd2b56e47dae1cfbc968e6')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC"
 
-  # Fix CVE-2006-3668 (Patch found in Gentoo and other distros).
+  # Add -fPIC for anything but i686
+  [ "$CARCH" = 'i686' ] || export CFLAGS="${CFLAGS} -fPIC"
+
+  # Patch from Gentoo for CVE-2006-3668
   patch -p1 < "$srcdir/CVE-2006-3668.patch"
 
-  # Apply a patch from Gentoo, so that we can build against binutils
-  # 2.22 and above.
+  # Patch from Gentoo for binutils >= 2.22
   patch -p1 < "$srcdir/as-needed.patch"
   sed -i '/LDFLAGS :=/d' Makefile
   cp Makefile Makefile.rdy
@@ -39,23 +43,21 @@ build() {
 include make/unix.inc
 ALL_TARGETS := core core-examples core-headers
 ALL_TARGETS += allegro allegro-examples allegro-headers
-PREFIX := "$pkgdir/usr"
+PREFIX := /usr
 EOF
 
-  # Upstream's makefile ignores our CFLAGS.  They put -I directives in
-  # their own CFLAGS, so we can't just say
-  # make CFLAGS=...
-  # Gentoo's ebuild overrides another of their makefile variables, named
-  # OFLAGS.
-  make OFLAGS="${CFLAGS}"
+  # Use OFLAGS to be able to set CFLAGS without replacing the -I directives
+  make -j1 OFLAGS="${CFLAGS}"
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  # Create directories
+
   install -d "$pkgdir"/usr/{lib,bin,include}
-  install -D -m644 licence.txt \
+  install -Dm644 licence.txt \
     "$pkgdir/usr/share/licenses/$pkgname/licence.txt"
-
-  make install
+  setconf make/config.txt PREFIX "$pkgdir/usr"
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/ebtables/PKGBUILD b/community/ebtables/PKGBUILD
index ffc3b451b..1430af343 100644
--- a/community/ebtables/PKGBUILD
+++ b/community/ebtables/PKGBUILD
@@ -1,27 +1,24 @@
-# $Id: PKGBUILD 71322 2012-05-26 15:04:32Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# $Id: PKGBUILD 83705 2013-02-04 14:45:58Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
 # Contributor: Michal Soltys <soltys@ziu.info>
 
 pkgname=ebtables
 pkgver=2.0.10_4
-pkgrel=2
+pkgrel=3
 pkgdesc='Ethernet bridge filtering utilities'
 arch=('i686' 'x86_64')
 url='http://ebtables.sourceforge.net/'
+depends=('perl' 'bash')
 license=('GPL2')
-backup=("etc/$pkgname.conf" "etc/conf.d/$pkgname")
+backup=("etc/$pkgname.conf")
 # ebtables segfault with --as-needed
 options=('!buildflags')
 install=$pkgname.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-v${pkgver/_/-}.tar.gz"
-        "$pkgname.conf"
-        "$pkgname.rc"
         "$pkgname.systemd"
         "$pkgname.service")
 md5sums=('506742a3d44b9925955425a659c1a8d0'
-         'c6f0838de4429af68d21b4d61f00db59'
-         'd0e340f2cefe91b1569c0e87c2a1288f'
-         '5a49ea09af202cb438c8a1b15abf9147'
+         'b4c329060809e5b290ae49fbd0ad61f2'
          'baf923443c3b16277e50d60d2e68f534')
 
 build() {
@@ -41,10 +38,7 @@ package() {
   popd
   # rm package ebtables rc.d scripts
   rm "$pkgdir/etc/ebtables-config"
-  # install initscripts
-  install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname"
-  install -Dm 644 $pkgname.conf "$pkgdir/etc/conf.d/$pkgname"
-  # install systemd service
+  # systemd
   install -Dm 755 $pkgname.systemd \
     "$pkgdir/usr/lib/systemd/scripts/$pkgname"
   install -Dm 644 $pkgname.service \
@@ -53,4 +47,4 @@ package() {
   install -Dm 644 /dev/null "$pkgdir/etc/$pkgname.conf"
 }
 
-# vim:set ts=2 sw=2 ft=sh et:
+# vim:set ts=2 sw=2 et:
diff --git a/community/ebtables/ebtables.systemd b/community/ebtables/ebtables.systemd
index 4c51e9b6f..7c21ff967 100644
--- a/community/ebtables/ebtables.systemd
+++ b/community/ebtables/ebtables.systemd
@@ -1,13 +1,12 @@
 #!/bin/bash
 
-. /etc/conf.d/ebtables
+CONFIG_FILE='/etc/ebtables.conf'
 
 case $1 in
   start)
     ebtables-restore < "$CONFIG_FILE"
   ;;
   stop)
-    [[ $SAVE_ON_STOP =~ [yY][eE][sS] ]] && $0 save
     ebtables -F
   ;;
   save)
diff --git a/community/echat/PKGBUILD b/community/echat/PKGBUILD
index f78e322b4..38544e955 100644
--- a/community/echat/PKGBUILD
+++ b/community/echat/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65144 2012-02-20 05:23:08Z spupykin $
+# $Id: PKGBUILD 83672 2013-02-04 11:04:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
@@ -21,9 +21,9 @@ md5sums=('dda3891d08f04dd266858380d404af15')
 #
 
 build() {
-  cd ${startdir}/src/$pkgname-${pkgver}
+  cd $srcdir/$pkgname-${pkgver}
   make
-  install -D -m 0755 echat $startdir/pkg/usr/bin/echat
-  install -D -m 0644 doc/echat.1 $startdir/pkg/usr/share/man/man1/echat.1
-  install -D -m 0644 doc/.echatrc.sample $startdir/pkg/usr/share/echat/dot.echatrc.sample
+  install -D -m 0755 echat $pkgdir/usr/bin/echat
+  install -D -m 0644 doc/echat.1 $pkgdir/usr/share/man/man1/echat.1
+  install -D -m 0644 doc/.echatrc.sample $pkgdir/usr/share/echat/dot.echatrc.sample
 }
diff --git a/community/fbgrab/PKGBUILD b/community/fbgrab/PKGBUILD
index 14c947599..66e75dacd 100644
--- a/community/fbgrab/PKGBUILD
+++ b/community/fbgrab/PKGBUILD
@@ -1,4 +1,5 @@
-# $Id: PKGBUILD 63546 2012-02-05 11:55:12Z ibiru $
+# $Id: PKGBUILD 83675 2013-02-04 11:04:55Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 
 pkgname=fbgrab
@@ -14,10 +15,10 @@ source=(http://hem.bredband.net/gmogmo/fbgrab/fbgrab-1.0.tar.gz)
 md5sums=('7af4d8774684182ed690d5da82d6d234')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   sed -i '1,1i#include <zlib.h>' fbgrab.c
   gcc -g -Wall fbgrab.c -lpng -lz -o fbgrab
   strip fbgrab
-  install -D -m755 $startdir/src/$pkgname-$pkgver/fbgrab $startdir/pkg/usr/bin/fbgrab
-  install -D -m644 $startdir/src/$pkgname-$pkgver/fbgrab.1.man $startdir/pkg/usr/share/man/man1/fbgrab.1
+  install -D -m755 $srcdir/$pkgname-$pkgver/fbgrab $pkgdir/usr/bin/fbgrab
+  install -D -m644 $srcdir/$pkgname-$pkgver/fbgrab.1.man $pkgdir/usr/share/man/man1/fbgrab.1
 }
diff --git a/community/fceux/PKGBUILD b/community/fceux/PKGBUILD
index 69db955b8..3d963df97 100644
--- a/community/fceux/PKGBUILD
+++ b/community/fceux/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 82066 2013-01-07 08:30:37Z arodseth $
+# $Id: PKGBUILD 83618 2013-02-03 23:24:07Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contriutor: Eric Belanger <eric@archlinux.org>
 # Contributor: Jo Christian Bergskås <jcberg@gmail.com>
 
 pkgname=fceux
 pkgver=2.2.0
-pkgrel=1
+pkgrel=2
 url='http://www.fceux.com/'
 pkgdesc='Fast and ultra-compatible NES/Famicom emulator'
 arch=('x86_64' 'i686')
@@ -21,7 +21,7 @@ build() {
   cd "$srcdir/$pkgname"
 
   msg2 'Compiling...'
-  scons --prefix="$pkgdir/usr"
+  scons
 }
 
 package() {
diff --git a/community/fldiff/PKGBUILD b/community/fldiff/PKGBUILD
index 0b973410a..e528e4221 100644
--- a/community/fldiff/PKGBUILD
+++ b/community/fldiff/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65186 2012-02-20 10:08:06Z spupykin $
+# $Id: PKGBUILD 83678 2013-02-04 11:05:24Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: kevin <kevin@archlinux.org>
 # Contributor: iztok pizorn <pizorn@gmail.com>
@@ -27,5 +27,5 @@ build() {
 package() {
   cd $srcdir/$pkgname-$pkgver
   make BUILDROOT=$pkgdir install install-desktop
-  mv `find $pkgdir/ -name Development -type d` $startdir/pkg/usr/share/applications
+  mv `find $pkgdir/ -name Development -type d` $pkgdir/usr/share/applications
 }
diff --git a/community/floyd/PKGBUILD b/community/floyd/PKGBUILD
index ae919142d..bf88c40de 100644
--- a/community/floyd/PKGBUILD
+++ b/community/floyd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 58684 2011-11-17 15:37:37Z spupykin $
+# $Id: PKGBUILD 83680 2013-02-04 11:05:45Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
@@ -16,13 +16,13 @@ md5sums=('c1b80bc76ac4e25e821a193428fa42a4'
          '0cde2017ead790f9d556ef34c6a4008f')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   patch -p1 <$srcdir/build-fix.patch
   make pthread
 }
 
 package() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   mkdir -p $pkgdir/usr/share/man/man1 $pkgdir/usr/bin
   make install MANDIR=$pkgdir/usr/share/man/man1 BINDIR=$pkgdir/usr/bin
 }
diff --git a/community/glob2/PKGBUILD b/community/glob2/PKGBUILD
index 6512def53..37bf01a70 100644
--- a/community/glob2/PKGBUILD
+++ b/community/glob2/PKGBUILD
@@ -1,4 +1,5 @@
-# $Id: PKGBUILD 83251 2013-01-28 16:49:37Z stephane $
+# $Id: PKGBUILD 83748 2013-02-04 22:09:20Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
 
@@ -23,15 +24,15 @@ build() {
 
   patch -Np0 -i "$srcdir/glob2-0.9.4.1-gcc44.patch"
   scons \
-    BINDIR="$pkgdir/usr/bin" \
-    INSTALLDIR="$pkgdir/usr/share" \
     LINKFLAGS="-lboost_system"
 }
 
 package () {
   cd "$srcdir/$pkgname-$pkgver"
 
-  scons install
+  scons install \
+    BINDIR="$pkgdir/usr/bin" \
+    INSTALLDIR="$pkgdir/usr/share"
   find "$pkgdir/usr/share" -type f -exec chmod 644 '{}' \;
   install -Dm644 data/icons/glob2-icon-48x48.png \
     "$pkgdir/usr/share/pixmaps/glob2-icon-48x48.png"
diff --git a/community/haskell-regex-base/PKGBUILD b/community/haskell-regex-base/PKGBUILD
index d4e951cc6..a7c840762 100644
--- a/community/haskell-regex-base/PKGBUILD
+++ b/community/haskell-regex-base/PKGBUILD
@@ -1,37 +1,43 @@
+# $Id: PKGBUILD 83658 2013-02-04 10:08:27Z arodseth $
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 _hkgname=regex-base
 pkgname=haskell-regex-base
 pkgver=0.93.2
-pkgrel=7
-pkgdesc="Interface API for regex-posix,pcre,parsec,tdfa,dfa"
-url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base"
+pkgrel=8
+pkgdesc='Interface API for regex-posix,pcre,parsec,tdfa,dfa'
+url='http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base'
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' sh 'haskell-mtl=2.1.2-1')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('e7b93b0b17eff8d3068ecb2f5d5f6ea3')
+arch=('x86_64' 'i686')
+depends=('ghc=7.6.2-1' 'sh' 'haskell-mtl=2.1.2')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz")
+install=$pkgname.install
+sha256sums=('20dc5713a16f3d5e2e6d056b4beb9cfdc4368cd09fd56f47414c847705243278')
 
 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/$_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
 }
 
 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/$_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
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/ht/PKGBUILD b/community/ht/PKGBUILD
index 958362ca6..4b8a33501 100644
--- a/community/ht/PKGBUILD
+++ b/community/ht/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 67315 2012-03-08 16:30:08Z spupykin $
+# $Id: PKGBUILD 83652 2013-02-04 10:01:08Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: tardo <tardo@nagi-fanboi.net>
 # Contributor: Simon Morgan <"mra84964@mra.pb.hx".decode('rot-13')>
 
 pkgname=ht
-pkgver=2.0.20
+pkgver=2.0.21
 pkgrel=1
 pkgdesc="A file editor/viewer/analyzer for executables"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ url="http://hte.sourceforge.net/"
 license=('GPL')
 depends=('gcc-libs' 'ncurses' 'lzo2')
 source=(http://downloads.sourceforge.net/sourceforge/hte/$pkgname-$pkgver.tar.gz)
-md5sums=('22d5a30470032ec8b858d4a3a24f8d02')
+md5sums=('419a25004421b9455430f523636bdcca')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD
index ab1e13a7f..e350de11c 100644
--- a/community/keepalived/PKGBUILD
+++ b/community/keepalived/PKGBUILD
@@ -1,24 +1,20 @@
-# $Id: PKGBUILD 75723 2012-08-29 14:02:05Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# $Id: PKGBUILD 83710 2013-02-04 14:57:08Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
 # Contributor: Andrea Zucchelli <zukka77@gmail.com>
 
 pkgname=keepalived
 pkgver=1.2.7
-pkgrel=1
+pkgrel=2
 pkgdesc='Failover and monitoring daemon for LVS clusters'
 arch=('i686' 'x86_64')
 url='http://www.keepalived.org/'
 license=('GPL2')
-backup=('etc/keepalived/keepalived.conf' 'etc/conf.d/keepalived')
+backup=('etc/keepalived/keepalived.conf')
 depends=('openssl' 'popt' 'libnl1')
 source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz"
-        'keepalived.rc'
-        'keepalived.service'
-        'keepalived.conf')
+        'keepalived.service')
 md5sums=('8551a34ee048895dbe5350a031ff29c1'
-         '0d7ea6296bce403a5d24be305a0a9d73'
-         'dd0a003a24057eba1e4dc09f372aaa52'
-         '9c8142da8730ad27a345587dea83ced7')
+         'edbeda8c8777cf36110c1623e49bc5c9')
 
 build() {
   cd $pkgname-$pkgver
@@ -30,18 +26,15 @@ package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
   # clean pacakge init scripts
-  rm -r "$pkgdir/etc/rc.d/init.d" "$pkgdir/etc/sysconfig"
+  rm -r "$pkgdir/etc/rc.d" "$pkgdir/etc/sysconfig"
   # move examples to /usr/share
   install -d -m 755 "$pkgdir/usr/share/$pkgname"
   mv "$pkgdir/etc/keepalived/samples" "$pkgdir/usr/share/$pkgname/samples"
-
-  # add initscripts
-  cd ..
-  install -D -m 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname"
-  install -D -m 644 $pkgname.conf "$pkgdir/etc/conf.d/$pkgname"
+  # systemd
+  cd "$srcdir"
   install -D -m 644 $pkgname.service \
     "$pkgdir/usr/lib/systemd/system/$pkgname.service"
 
 }
 
-# vim:set ts=2 sw=2 ft=sh et:
+# vim:set ts=2 sw=2 et:
diff --git a/community/keepalived/keepalived.service b/community/keepalived/keepalived.service
index e29deeebd..b96a8f474 100644
--- a/community/keepalived/keepalived.service
+++ b/community/keepalived/keepalived.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=Keepalive Daemon
+After=network.target
 
 [Service]
 ExecStart=/usr/sbin/keepalived --dont-fork
diff --git a/community/libpaper/PKGBUILD b/community/libpaper/PKGBUILD
index 113fe83f1..0e222d90c 100644
--- a/community/libpaper/PKGBUILD
+++ b/community/libpaper/PKGBUILD
@@ -1,29 +1,29 @@
-# $Id: PKGBUILD 79303 2012-11-02 14:41:55Z arodseth $
+# $Id: PKGBUILD 83644 2013-02-04 09:47:51Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: royrocks <royrocks13@gmail.com>
 
 pkgname=libpaper
 pkgver=1.1.24
-pkgrel=3
+pkgrel=4
 pkgdesc='Library for handling paper characteristics'
 arch=('x86_64' 'i686')
 url='http://packages.debian.org/unstable/source/libpaper'
 license=('GPL')
+depends=('sh')
+options=('!libtool')
 source=("http://ftp.de.debian.org/debian/pool/main/libp/$pkgname/${pkgname}_$pkgver+nmu2.tar.gz")
 sha256sums=('c5bdd6d9dff179699160675dbb61651d9b3158f6da27558fdaba00e7c427ba96')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver+nmu2
-  ./configure --prefix=/usr \
-  	--mandir=$pkgdir/usr/share/man \
-	--sysconfdir=/etc
+  cd "$srcdir/$pkgname-$pkgver+nmu2"
+  ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver+nmu2
-  make prefix=$pkgdir/usr install
+  cd "$srcdir/$pkgname-$pkgver+nmu2"
+  make prefix="$pkgdir/usr" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/libpqxx/PKGBUILD b/community/libpqxx/PKGBUILD
index fbefdafa7..00a6dba5d 100644
--- a/community/libpqxx/PKGBUILD
+++ b/community/libpqxx/PKGBUILD
@@ -1,23 +1,22 @@
-# $Id: PKGBUILD 59094 2009-11-20 06:50:18Z giovanni $
+# $Id: PKGBUILD 83662 2013-02-04 10:17:35Z spupykin $
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=libpqxx
-pkgver=4.0
+pkgver=4.0.1
 pkgrel=1
 pkgdesc="C++ client API for PostgreSQL"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://pqxx.org/development/libpqxx/"
 depends=('postgresql-libs>=8.4.1')
+makedepends=('python2')
 options=('!libtool')
-source=("http://pqxx.org/download/software/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-	build-fix.patch)
-md5sums=('bd7541f858400a96cbe2a48cb342ad0e'
-         'e59f5f63e1800406bf494e19cea479a4')
+source=("http://pqxx.org/download/software/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('6ea888b9ba85dd7cef1b182dc5f223a2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-#  patch -p1 <$srcdir/build-fix.patch
+  sed -i 's|python|python2|' tools/splitconfig
   ./configure --prefix=/usr --enable-shared
   make
   make prefix="${pkgdir}/usr" install
diff --git a/community/librcc/PKGBUILD b/community/librcc/PKGBUILD
index c5e3ffb0a..fa2df29fc 100644
--- a/community/librcc/PKGBUILD
+++ b/community/librcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 61953 2012-01-11 15:22:10Z stephane $
+# $Id: PKGBUILD 83682 2013-02-04 11:06:09Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=librcc
@@ -18,32 +18,32 @@ md5sums=('9bbf248c7312c73c0b6ca19b9c5a2af1'
          '040313d1d8f166ccf2b128cea4c05f21')
 
 build() {
-  cd ${startdir}/src/$pkgname-${pkgver}
+  cd $srcdir/$pkgname-${pkgver}
   ./configure --prefix=/usr
   patch -p1 <$srcdir/librcc-strnlen.patch
   make
 }
 
 package() {
-  cd ${startdir}/src/$pkgname-${pkgver}
-  mkdir -p $startdir/pkg/etc/rcc
-  mkdir -p $startdir/pkg/usr/lib/rcc/engines
-  mkdir -p $startdir/pkg/usr/bin
+  cd $srcdir/$pkgname-${pkgver}
+  mkdir -p $pkgdir/etc/rcc
+  mkdir -p $pkgdir/usr/lib/rcc/engines
+  mkdir -p $pkgdir/usr/bin
 
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR=$pkgdir install
 
   make -C examples
-  make -C examples install DESTDIR=$startdir/pkg
-  rm -f $startdir/pkg/usr/bin/example*
+  make -C examples install DESTDIR=$pkgdir
+  rm -f $pkgdir/usr/bin/example*
 
-  install -m 644 examples/rcc.xml $startdir/pkg/etc
+  install -m 644 examples/rcc.xml $pkgdir/etc
 
-  if [ -f $startdir/pkg/usr/bin/rcc-gtk2-config ]; then
-      ln -s rcc-gtk2-config $startdir/pkg/usr/bin/rcc-config
-  elif [ -f $startdir/pkg/usr/bin/rcc-gtk-config ]; then
-      ln -s rcc-gtk-config $startdir/pkg/usr/bin/rcc-config
+  if [ -f $pkgdir/usr/bin/rcc-gtk2-config ]; then
+      ln -s rcc-gtk2-config $pkgdir/usr/bin/rcc-config
+  elif [ -f $pkgdir/usr/bin/rcc-gtk-config ]; then
+      ln -s rcc-gtk-config $pkgdir/usr/bin/rcc-config
   else
-      echo "#!/bin/bash" > $startdir/pkg/usr/bin/rcc-config
-      echo "echo \"Configuration UI is not available!\"" >> $startdir/pkg/usr/bin/rcc-config
+      echo "#!/bin/bash" > $pkgdir/usr/bin/rcc-config
+      echo "echo \"Configuration UI is not available!\"" >> $pkgdir/usr/bin/rcc-config
   fi
 }
diff --git a/community/mailman/PKGBUILD b/community/mailman/PKGBUILD
index 74db47b4b..91ef3a656 100644
--- a/community/mailman/PKGBUILD
+++ b/community/mailman/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 74799 2012-08-05 16:06:17Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# $Id: PKGBUILD 83707 2013-02-04 14:51:45Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=mailman
 pkgver=2.1.15
-pkgrel=2
+pkgrel=3
 pkgdesc='The GNU Mailing List Manager'
 arch=(i686 x86_64)
 license=('GPL')
@@ -19,13 +19,11 @@ source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tgz"
         'mailman-2.1-build.patch'
         "$pkgname.profile.sh"
         "$pkgname.profile.csh"
-        "$pkgname.rc"
         "$pkgname.service")
 md5sums=('7d207489e8e9de0727cb334d46029833'
          'ed04d062379eb21e39ce1e70e6b1ade2'
          'a9c71ec940c56173415fbd49087d10b0'
          '85a8c30ffc444e677b286f54df530482'
-         '3a4014c15e9923451f5f282860896057'
          'f3ea6ef02ab135274406ce52ea8bbb7b')
 
 build() {
@@ -73,12 +71,10 @@ package() {
   chmod 2755 "$pkgdir"/usr/lib/mailman/cgi-bin/*
   chmod 2755 "$pkgdir"/usr/lib/mailman/mail/mailman
   cd "$srcdir"
-  # install initscripts
-  install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname"
-  # install systemd service
+  # systemd
   install -Dm 644 $pkgname.service \
     "$pkgdir/usr/lib/systemd/system/$pkgname.service"
-  # install profiles
+  # profiles
   install -Dm 755 $pkgname.profile.sh "$pkgdir/etc/profile.d/$pkgname.sh"
   install -Dm 755 $pkgname.profile.csh "$pkgdir/etc/profile.d/$pkgname.csh"
 }
diff --git a/community/mailman/mailman.install b/community/mailman/mailman.install
index 62a364e1a..98864b3d3 100644
--- a/community/mailman/mailman.install
+++ b/community/mailman/mailman.install
@@ -17,13 +17,14 @@ post_install() {
 ## arg 1:  the new package version
 ## arg 2:  the old package version
 post_upgrade() {
-  post_install "$1"
+  # check file permissions
+  cd /usr/lib/mailman && bin/check_perms > /dev/null
 }
 
 ## arg 1:  the old package version
-pre_remove() {
-  userdel mailman >/dev/null || true
-  groupdel mailman >/dev/null || true
+post_remove() {
+  userdel -f mailman >/dev/null 2>&1 || true
+  groupdel mailman >/dev/null 2>&1 || true
 }
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD
index 650c6f9ba..4ea5062fa 100644
--- a/community/mongodb/PKGBUILD
+++ b/community/mongodb/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83260 2013-01-28 16:49:47Z stephane $
+# $Id: PKGBUILD 83665 2013-02-04 10:18:57Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -6,8 +6,8 @@
 # Contributor: Alec Thomas
 
 pkgname=mongodb
-pkgver=2.2.2
-pkgrel=2
+pkgver=2.2.3
+pkgrel=1
 pkgdesc='A high-performance, open source, schema-free document-oriented database'
 arch=('i686' 'x86_64')
 url='http://www.mongodb.org'
@@ -66,7 +66,7 @@ package() {
   rm -r ${pkgdir}/usr/lib64 || true
 
 }
-md5sums=('697c448271358545a8a40a973f88edf4'
+md5sums=('4308c72b1342236dc585e0df0201db48'
          '9c67e00f4626ad761a8f7d4e037a54d7'
          '4839fe1d638187ca3226e8267b947318'
          '96ab4517b48974ce0e566d9746a75a4f'
diff --git a/community/nicotine/PKGBUILD b/community/nicotine/PKGBUILD
index 4b849aa83..bd3c6e999 100644
--- a/community/nicotine/PKGBUILD
+++ b/community/nicotine/PKGBUILD
@@ -1,34 +1,44 @@
-# $Id: PKGBUILD 83168 2013-01-27 16:22:44Z pierre $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
+# $Id: PKGBUILD 83656 2013-02-04 10:04:46Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 # Contributor: Andrew Wright <andreww@photism.org>
 
 pkgname=nicotine
 pkgver=1.2.16
-pkgrel=4
-pkgdesc="Soulseek music-sharing client, written in python"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/nicotine-plus/"
+pkgrel=5
+pkgdesc='Soulseek music-sharing client, written in python'
+arch=('x86_64' 'i686')
+url='http://sourceforge.net/projects/nicotine-plus/'
 license=('GPL')
-depends=('pygtk' 'mutagen')
+depends=('pygtk' 'mutagen') #'python-sexy') TODO: Move python-sexy from AUR
+makedepends=('setconf')
 optdepends=('python2-geoip: to enable Geographical blocker')
-source=(http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2)
-md5sums=('ac7433c21ef619a37e079a7ae68da94a')
+source=("http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2")
+sha256sums=('71e5b33e273daaf072dbf63839536c14d7ead9d149323d50eee09f7429e34c1d')
 
 build() {
-  cd "${srcdir}/${pkgname}+-${pkgver}"
-  sed -i -e "s/Icon=nicotine-plus/Icon=nicotine-plus-32px/" files/nicotine.desktop # Fixing FS#22476
+  cd "$srcdir/${pkgname}+-$pkgver"
+
+  # Fix for FS#22476
+  setconf files/nicotine.desktop Icon nicotine-plus-32px
+
+  # Python fix
   sed -i -e 's|/usr/bin/env python|/usr/bin/env python2|' \
     -e 's|/usr/bin/python|/usr/bin/python2|' pynicotine/{,gtkgui/}*.py
 
-  python2 setup.py install --root="${pkgdir}"
   cd trayicon
   python2 autogen.py
   make 
 }
 
 package() {
-  cd "${srcdir}/${pkgname}+-${pkgver}/trayicon"
-  make DESTDIR="${pkgdir}" install 
-  ln -s nicotine.py "${pkgdir}/usr/bin/nicotine"
+  cd "$srcdir/${pkgname}+-$pkgver"
+
+  python2 setup.py install --root="$pkgdir"
+  cd trayicon
+  make DESTDIR="$pkgdir" install 
+  ln -s nicotine.py "$pkgdir/usr/bin/nicotine"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/nsd/PKGBUILD b/community/nsd/PKGBUILD
index 566d28dc8..7a7d8dc62 100644
--- a/community/nsd/PKGBUILD
+++ b/community/nsd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 79243 2012-11-01 17:25:44Z bisson $
+# $Id: PKGBUILD 83750 2013-02-04 22:23:27Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 
 pkgname=nsd
-pkgver=3.2.14
+pkgver=3.2.15
 pkgrel=1
 pkgdesc='Authoritative only, high performance and simple DNS server'
 url='http://www.nlnetlabs.nl/nsd/'
@@ -14,7 +14,7 @@ makedepends=('flex')
 arch=('i686' 'x86_64')
 source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'service')
-sha1sums=('78390145ec392b520d88c19fc99c544dd1426959'
+sha1sums=('e31a81ab7877422b34e1f163f9509cd93f395664'
           '1cfa2d7254139be50f11753d4e07281ed2af36eb')
 
 install=install
@@ -27,6 +27,7 @@ build() {
 		--exec-prefix=/usr \
 		--datarootdir=/usr/share \
 		--with-pidfile=/run/nsd.pid \
+		--enable-ratelimit \
 
 	make
 }
diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD
index 8d16a5344..c54515013 100644
--- a/community/passenger/PKGBUILD
+++ b/community/passenger/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 81317 2012-12-17 13:56:57Z spupykin $
+# $Id: PKGBUILD 83664 2013-02-04 10:17:56Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=passenger
-pkgver=3.0.17
-pkgrel=2
-_pkgdlnr=76398
+pkgver=3.0.19
+pkgrel=1
+_pkgdlnr=76675
 pkgdesc="mod_rails passenger"
 arch=('i686' 'x86_64')
 url="http://www.modrails.com"
@@ -15,7 +15,8 @@ makedepends=('apache')
 install=passenger.install
 options=('!emptydirs')
 source=(http://rubyforge.org/frs/download.php/${_pkgdlnr}/passenger-$pkgver.tar.gz)
-md5sums=('4ce8cac20e3c857bad621a6113d7268f')
+#https://github.com/FooBarWidget/passenger/archive/release-3.0.19.tar.gz
+md5sums=('5df27d7908d55f164853fc2043ee069f')
 
 build(){
   cd $srcdir/passenger-$pkgver
diff --git a/community/python2-pysqlite-legacy/PKGBUILD b/community/python2-pysqlite-legacy/PKGBUILD
index 6fdb5bb66..9c5ed703d 100644
--- a/community/python2-pysqlite-legacy/PKGBUILD
+++ b/community/python2-pysqlite-legacy/PKGBUILD
@@ -1,25 +1,24 @@
-# $Id: PKGBUILD 77909 2012-10-15 19:54:27Z rvanharen $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor : Aaron Griffin <aaron.archlinux.org>
+# $Id: PKGBUILD 83742 2013-02-04 21:03:18Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: 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"
+pkgrel=2
+pkgdesc='Python DB-API 2.0 interface for the legacy SQLite 2'
+arch=('x86_64' 'i686')
+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')
+source=("http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/pysqlite-$pkgver.tar.gz")
+sha256sums=('9ceed0af9e94b2f8701d4f36d7e86715d8ca64283e0b311e1816c031c3658f08')
 
-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
+package() {
+  cd "$srcdir/pysqlite"
+  python2 setup.py install --root="$pkgdir" -O1
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/python2-pyxmpp/PKGBUILD b/community/python2-pyxmpp/PKGBUILD
index 49096a86f..e1aa144d0 100644
--- a/community/python2-pyxmpp/PKGBUILD
+++ b/community/python2-pyxmpp/PKGBUILD
@@ -4,17 +4,23 @@
 
 pkgname=python2-pyxmpp
 pkgver=1.1.2
-pkgrel=2
-pkgdesc="A Python XMPP and Jabber implementation based on libxml2"
-arch=('i686' 'x86_64')
-url="http://pyxmpp.jajcus.net/"
+pkgrel=3
+pkgdesc='Python XMPP and Jabber implementation based on libxml2'
+arch=('x86_64' 'i686')
+url='http://pyxmpp.jajcus.net/'
 license=('LGPL')
 depends=('python2-dnspython' 'libxml2' 'python2-m2crypto')
-source=(http://pyxmpp.jajcus.net/downloads/pyxmpp-$pkgver.tar.gz)
-md5sums=('a38abf032aca0408b6055cd94296eb75')
+source=("http://pyxmpp.jajcus.net/downloads/pyxmpp-$pkgver.tar.gz")
+sha256sums=('f45365bae922a9e44226622cf086e3ffd3c681012f6c6b609d3306e4d0dfb33c')
 
 build() {
-  cd $srcdir/pyxmpp-$pkgver
+  cd "$srcdir/pyxmpp-$pkgver"
   python2 setup.py build
+}
+
+package() {
+  cd "$srcdir/pyxmpp-$pkgver"
   python2 setup.py install --root=$pkgdir
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD
index d24c91df3..0b3dd2afe 100644
--- a/community/quagga/PKGBUILD
+++ b/community/quagga/PKGBUILD
@@ -1,20 +1,17 @@
-# $Id: PKGBUILD 73818 2012-07-15 23:51:42Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# $Id: PKGBUILD 83621 2013-02-04 00:43:11Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
 
 pkgname=quagga
 pkgver=0.99.21
-pkgrel=2
+pkgrel=3
 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite'
 arch=('i686' 'x86_64')
 url='http://www.quagga.net'
 license=('GPL2')
 depends=('libcap' 'net-snmp' 'readline' 'ncurses')
 options=('!libtool' '!buildflags')
-backup=()
 install=quagga.install
 source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
-        'quagga.rc'
-        'quagga.conf'
         'babeld.service'
         'bgpd.service'
         'isisd.service'
@@ -26,8 +23,6 @@ source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar
         '0001-isisd-fix-typo-in-topology-generator-BZ-731.patch'
         '0002-CVE-2012-1820.patch')
 md5sums=('99840adbe57047c90dfba6b6ed9aec7f'
-         '71d474228a1e02d698cd24e9fd55ca38'
-         '0c4f2dd13c7dac1b73de923d1d5e4e17'
          '45d8bf56a426b0e7ebe429547be8a27a'
          'ab31ed8dafd7a92137f4f00ad0937b4f'
          '4c05d0105cd0db23a2583bd75a1bde4d'
@@ -35,7 +30,7 @@ md5sums=('99840adbe57047c90dfba6b6ed9aec7f'
          'c5f8a729685cebf8fc5b1a1552d37b6d'
          'e721b334bb0b31983642b307033c63d0'
          'effeb26ff78ffcafe7808596ddc5d3fc'
-         'a4bf0a090747bd7dc4094a1e6e96e6ad'
+         'f0c0b99346b2c373a74158e45f04cf91'
          'c80174f7bdd32cd84550d52451e8f495'
          '44f39016d81f3b13b2744f7dcd93289d')
 
@@ -76,21 +71,14 @@ package() {
   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
+  # systemd
   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
-
-  # 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"
+  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"
 
 }
 
-# vim:set ts=2 sw=2 ft=sh et:
+# vim:set ts=2 sw=2 et:
diff --git a/community/quagga/zebra.service b/community/quagga/zebra.service
index e0f87f9bc..0bba03972 100644
--- a/community/quagga/zebra.service
+++ b/community/quagga/zebra.service
@@ -4,7 +4,7 @@ After=network.target
 ConditionPathExists=/etc/quagga/zebra.conf
 
 [Service]
-ExecStartPre=/sbin/ip route flush proto zebra
+ExecStartPre=/usr/sbin/ip route flush proto zebra
 ExecStart=/usr/sbin/zebra
 Restart=on-abort
 
diff --git a/community/sslh/PKGBUILD b/community/sslh/PKGBUILD
index 023a11422..ed60e5e8a 100644
--- a/community/sslh/PKGBUILD
+++ b/community/sslh/PKGBUILD
@@ -1,36 +1,31 @@
-# $Id: PKGBUILD 81431 2012-12-20 23:33:39Z seblu $
+# $Id: PKGBUILD 83699 2013-02-04 14:24:41Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@archlinux.org>
 # Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com>
 # Contributor: Jason Rodriguez <jason-aur@catloaf.net>
 
 pkgname=sslh
 pkgver=1.14
-pkgrel=1
+pkgrel=2
 pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer'
 arch=('i686' 'x86_64')
 url='http://www.rutschle.net/tech/sslh.shtml'
 license=('GPL2')
 depends=('libconfig')
-backup=('etc/conf.d/sslh' 'etc/sslh.conf')
+backup=('etc/sslh.conf')
+install=$pkgname.install
 source=("http://www.rutschle.net/tech/$pkgname-$pkgver.tar.gz"
-        'sslh.rc'
-        'sslh.conf')
+       'sslh-select.service'
+       'sslh-fork.service')
 md5sums=('36e64bd6c7d0a299d5acd1109988099b'
-         'c2a0c7c58d091acf5b4672f58066ee8f'
-         'c51c63d2b28080bae4c1c7a0c469bab7')
+         '67e8c9511508673254afa3e1ca61ff89'
+         'a4402244a4d819beb3c6dc7ff031084e')
 
 build() {
   cd $pkgname-$pkgver
-  # fix archlinux path in manpage
-  sed -i 's/init.d/rc.d/' sslh.pod
-  sed -i 's+/etc/default+/etc/conf.d+' sslh.pod
   make VERSION=\"v$pkgver\"
 }
 
 package() {
-  # install initscripts
-  install -Dm 755 sslh.rc "$pkgdir/etc/rc.d/sslh"
-  install -Dm 644 sslh.conf "$pkgdir/etc/conf.d/sslh"
   # manually install to have both ssl-fork and ssl-select
   cd $pkgname-$pkgver
   install -Dm 0755 sslh-fork "$pkgdir/usr/bin/sslh-fork"
@@ -40,9 +35,11 @@ package() {
   install -Dm 0644 sslh.8.gz "$pkgdir/usr/share/man/man8/sslh.8.gz"
   # install example file
   install -Dm 0644 example.cfg "$pkgdir/etc/sslh.conf"
-  # install systemd service
-  install -Dm 644 scripts/systemd.sslh.service \
-    "$pkgdir/usr/lib/systemd/system/sslh.service"
+  # systemd
+  install -Dm 644 $srcdir/sslh-fork.service \
+    "$pkgdir/usr/lib/systemd/system/sslh-fork.service"
+  install -Dm 644 $srcdir/sslh-select.service \
+    "$pkgdir/usr/lib/systemd/system/sslh-select.service"
 }
 
-# vim:set ts=2 sw=2 ft=sh et:
+# vim:set ts=2 sw=2 et:
diff --git a/community/sslh/sslh-fork.service b/community/sslh/sslh-fork.service
new file mode 100644
index 000000000..cbfc41686
--- /dev/null
+++ b/community/sslh/sslh-fork.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=SSL/SSH multiplexer
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/sslh-fork -f -F /etc/sslh.conf
+KillMode=process
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/sslh/sslh-select.service b/community/sslh/sslh-select.service
new file mode 100644
index 000000000..43f4f2787
--- /dev/null
+++ b/community/sslh/sslh-select.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=SSL/SSH multiplexer
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/sslh-select -f -F /etc/sslh.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/sslh/sslh.install b/community/sslh/sslh.install
new file mode 100644
index 000000000..46ce7beae
--- /dev/null
+++ b/community/sslh/sslh.install
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  if [ "$(vercmp $2 1.14-1)" -le 0 ]; then
+    cat << EOF
+===> sslh systemd service has been splitted in sslh-fork.service and sslh-select.service
+EOF
+    fi
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/unifdef/PKGBUILD b/community/unifdef/PKGBUILD
index 6306f4c92..d9e468341 100644
--- a/community/unifdef/PKGBUILD
+++ b/community/unifdef/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65345 2012-02-21 02:14:45Z spupykin $
+# $Id: PKGBUILD 83684 2013-02-04 11:06:31Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=unifdef
@@ -16,7 +16,7 @@ build() {
   cd "$srcdir/$pkgname-$pkgver"
   make clean
   make
-  mkdir -p $pkgdir/usr/bin $startdir/pkg/usr/share/man/man1
+  mkdir -p $pkgdir/usr/bin $pkgdir/usr/share/man/man1
   install -m 0755 unifdef $pkgdir/usr/bin/
   install -m 0644 unifdef.1 $pkgdir/usr/share/man/man1/
 }
diff --git a/community/wine/PKGBUILD b/community/wine/PKGBUILD
new file mode 100644
index 000000000..08b583614
--- /dev/null
+++ b/community/wine/PKGBUILD
@@ -0,0 +1,152 @@
+# $Id: PKGBUILD 83667 2013-02-04 10:53:01Z svenstaro $
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: Eduardo Romero <eduardo@archlinux.org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+
+pkgname=wine
+pkgver=1.5.23
+pkgrel=1
+
+_pkgbasever=${pkgver/rc/-rc}
+
+source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$_pkgbasever.tar.bz2{,.sign})
+md5sums=('70228ea29efe9700a66202b495b068bc'
+         '8b8620cf523bb6c7e61d01480c167859')
+
+pkgdesc="A compatibility layer for running Windows programs"
+url="http://www.winehq.com"
+arch=(i686 x86_64)
+license=(LGPL)
+install=wine.install
+
+depends=(
+  fontconfig      lib32-fontconfig
+  libxcursor      lib32-libxcursor
+  libxrandr       lib32-libxrandr
+  libxdamage      lib32-libxdamage
+  libxi           lib32-libxi
+  gettext         lib32-gettext
+  glu             lib32-glu
+  libsm           lib32-libsm
+  gcc-libs        lib32-gcc-libs
+  desktop-file-utils
+)
+
+makedepends=(autoconf ncurses bison perl fontforge flex prelink
+  'gcc>=4.5.0-2'  'gcc-multilib>=4.5.0-2'
+  giflib          lib32-giflib
+  libpng          lib32-libpng
+  gnutls          lib32-gnutls
+  libxinerama     lib32-libxinerama
+  libxcomposite   lib32-libxcomposite
+  libxmu          lib32-libxmu
+  libxxf86vm      lib32-libxxf86vm
+  libxml2         lib32-libxml2
+  libldap         lib32-libldap
+  lcms            lib32-lcms
+  mpg123          lib32-mpg123
+  openal          lib32-openal
+  v4l-utils       lib32-v4l-utils
+  alsa-lib        lib32-alsa-lib
+  libxcomposite   lib32-libxcomposite
+  mesa            lib32-mesa
+  oss
+  samba
+)
+  
+optdepends=(
+  giflib          lib32-giflib
+  libpng          lib32-libpng
+  libldap         lib32-libldap
+  gnutls          lib32-gnutls
+  lcms            lib32-lcms
+  libxml2         lib32-libxml2
+  mpg123          lib32-mpg123
+  openal          lib32-openal
+  v4l-utils       lib32-v4l-utils
+  libpulse        lib32-libpulse
+  alsa-plugins    lib32-alsa-plugins
+  alsa-lib        lib32-alsa-lib
+  libjpeg-turbo   lib32-libjpeg-turbo
+  libxcomposite   lib32-libxcomposite
+  libxinerama     lib32-libxinerama
+  oss             cups
+  samba
+)
+
+if [[ $CARCH == i686 ]]; then
+  # Strip lib32 etc. on i686
+  depends=(${depends[@]/*32-*/})
+  makedepends=(${makedepends[@]/*32-*/})
+  makedepends=(${makedepends[@]/*-multilib*/})
+  optdepends=(${optdepends[@]/*32-*/})
+else
+  provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver")
+  conflicts=('bin32-wine' 'wine-wow64')
+  replaces=('bin32-wine')
+fi
+
+build() {
+  cd "$srcdir"
+
+  # Allow ccache to work
+  mv $pkgname-$_pkgbasever $pkgname
+
+  # Get rid of old build dirs
+  rm -rf $pkgname-{32,64}-build
+  mkdir $pkgname-32-build
+
+  if [[ $CARCH == x86_64 ]]; then
+    msg2 "Building Wine-64..."
+
+    mkdir $pkgname-64-build
+    cd "$srcdir/$pkgname-64-build"
+    ../$pkgname/configure \
+      --prefix=/usr \
+      --libdir=/usr/lib \
+      --with-x \
+      --enable-win64
+
+    make
+
+    _wine32opts=(
+      --libdir=/usr/lib32
+      --with-wine64="$srcdir/$pkgname-64-build"
+    )
+
+    export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+  fi
+
+  msg2 "Building Wine-32..."
+  cd "$srcdir/$pkgname-32-build"
+  ../$pkgname/configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --with-x \
+    "${_wine32opts[@]}"
+
+  # These additional flags solve FS#23277
+  #make CFLAGS+="-mincoming-stack-boundary=2" CXXFLAGS+="-mincoming-stack-boundary=2"
+}
+
+package() {
+  msg2 "Packaging Wine-32..."
+  cd "$srcdir/$pkgname-32-build"
+
+  if [[ $CARCH == i686 ]]; then
+    make prefix="$pkgdir/usr" install
+  else
+    make prefix="$pkgdir/usr" \
+      libdir="$pkgdir/usr/lib32" \
+      dlldir="$pkgdir/usr/lib32/wine" install
+
+    msg2 "Packaging Wine-64..."
+    cd "$srcdir/$pkgname-64-build"
+    make prefix="$pkgdir/usr" \
+      libdir="$pkgdir/usr/lib" \
+      dlldir="$pkgdir/usr/lib/wine" install
+  fi
+}
+
+# vim:set ts=8 sts=2 sw=2 et:
diff --git a/community/wine/wine.install b/community/wine/wine.install
new file mode 100644
index 000000000..0548b7ffd
--- /dev/null
+++ b/community/wine/wine.install
@@ -0,0 +1,12 @@
+post_install() {
+	update-desktop-database -q
+	#echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64."
+	#echo "If you are on x86_64, the default WINEARCH will be win64."
+	#echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine."
+	#echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64."
+	#echo "See the Arch wiki on wine for more information."
+}
+
+post_remove() {
+	update-desktop-database -q
+}
diff --git a/community/xmms-imms/PKGBUILD b/community/xmms-imms/PKGBUILD
index e6dc930f7..fd6a5cb94 100644
--- a/community/xmms-imms/PKGBUILD
+++ b/community/xmms-imms/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 82400 2013-01-16 15:53:22Z spupykin $
+# $Id: PKGBUILD 83686 2013-02-04 11:06:53Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Kritoke <kritoke@nospam.gmail.com>
 # Contributor: Kritoke <kritoke@nospam.gmail.com>
@@ -27,6 +27,6 @@ build() {
 
   make
   mkdir -p $pkgdir/usr/bin
-  make prefix=$pkgdir/usr DESTDIR=$startdir/pkg/usr/lib/xmms/General \
+  make prefix=$pkgdir/usr DESTDIR=$pkgdir/usr/lib/xmms/General \
 	 BMPDESTDIR=$pkgdir/usr/lib/bmp/General install
 }