Fri May 31 06:21:01 PDT 2013

39 files changed, 152 insertions, 553 deletions

diff --git a/community/aircrack-ng/PKGBUILD b/community/aircrack-ng/PKGBUILD
index c4c1e57b1..6e2021027 100644
--- a/community/aircrack-ng/PKGBUILD
+++ b/community/aircrack-ng/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 64237 2012-02-11 00:32:23Z arodseth $
+# $Id: PKGBUILD 92023 2013-05-30 23:34:33Z seblu $
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 # Contributor:  Daenyth <Daenyth+Arch [at] gmail [dot] com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
@@ -7,30 +7,30 @@
 pkgbase=aircrack-ng
 pkgname=(aircrack-ng aircrack-ng-scripts)
 pkgver=1.1
-pkgrel=8
+pkgrel=9
 arch=('i686' 'x86_64')
 url="http://www.aircrack-ng.org"
 license=('GPL2')
 source=("http://download.aircrack-ng.org/${pkgname}-${pkgver}.tar.gz")
 md5sums=('f7a24ed8fad122c4187d06bfd6f998b4')
-depends=('openssl' 'sqlite3' 'iw' 'net-tools')
+depends=('openssl' 'sqlite' 'iw' 'net-tools')
 
 build() {
-  	cd ${srcdir}/${pkgbase}-${pkgver}
-  	make SQLITE=true unstable=true
+	cd ${srcdir}/${pkgbase}-${pkgver}
+	make SQLITE=true unstable=true
 }
 
 package_aircrack-ng() {
 	pkgdesc="A key cracker for the 802.11 WEP and WPA-PSK protocols"
 
-  	cd ${srcdir}/${pkgname}-${pkgver}
+	cd ${srcdir}/${pkgname}-${pkgver}
 	make DESTDIR=${pkgdir} SQLITE=true unstable=true bindir=/usr/bin  \
-		mandir=/usr/share/man/man1 sbindir=/usr/sbin install
+		mandir=/usr/share/man/man1 sbindir=/usr/bin install
 
 	### Remove installed scripts/corresponding man pages (installed in aircrack-ng-scripts) ###
 	# Scripts
-	rm ${pkgdir}/usr/sbin/airdriver-ng
-	rm ${pkgdir}/usr/sbin/airodump-ng-oui-update
+	rm ${pkgdir}/usr/bin/airdriver-ng
+	rm ${pkgdir}/usr/bin/airodump-ng-oui-update
 	# Man pages
 	mkdir -p ${srcdir}/tmp/
 	mv ${pkgdir}/usr/share/man/man1/airdriver-ng.1 ${srcdir}/tmp/
@@ -38,15 +38,15 @@ package_aircrack-ng() {
 
 package_aircrack-ng-scripts() {
 	pkgdesc="Included scripts for a key cracker for the 802.11 WEP and WPA-PSK protocols"
-        depends=('python2' 'graphviz' 'python2-pylorcon')	
+    depends=('python2' 'graphviz' 'python2-pylorcon')
 
 	cd ${srcdir}/aircrack-ng-${pkgver}/scripts
 	mkdir -p ${pkgdir}/usr/share/man/man1/ \
-		${pkgdir}/usr/sbin
+		${pkgdir}/usr/bin
 
 	### AIRDRIVER-NG ###
 	# Script
-	install -Dm644 airdriver-ng ${pkgdir}/usr/sbin/
+	install -Dm644 airdriver-ng ${pkgdir}/usr/bin/
 	# Libs
 	mkdir -p ${pkgdir}/usr/lib/airdrop-ng/
 	install -Dm644 airdrop-ng/lib/{colorize.py,libDumpParse.py,libOuiParse.py} \
@@ -54,14 +54,14 @@ package_aircrack-ng-scripts() {
 	# Man page
 	mv ${srcdir}/tmp/airdriver-ng.1 ${pkgdir}/usr/share/man/man1/
 
-	### AIRDROP-NG ### 
+	### AIRDROP-NG ###
 	# Man page
 	install -Dm644 airdrop-ng/docs/airdrop-ng.1 ${pkgdir}/usr/share/man/man1/ 
 	# Script
 	sed s/python/python2/ -i airdrop-ng/airdrop-ng.py
-	install -Dm644 airdrop-ng/airdrop-ng.py ${pkgdir}/usr/sbin/airdrop-ng
-	chmod +x ${pkgdir}/usr/sbin/airdrop-ng
-	
+	install -Dm644 airdrop-ng/airdrop-ng.py ${pkgdir}/usr/bin/airdrop-ng
+	chmod +x ${pkgdir}/usr/bin/airdrop-ng
+
 	### AIRGRAPH-NG ###
 	# Libs
 	mkdir -p ${pkgdir}/usr/lib/airgraph-ng/
@@ -72,20 +72,20 @@ package_aircrack-ng-scripts() {
 	# Script
 	sed s/python/python2/ -i airgraph-ng/airgraph-ng.py
 	sed s_/usr/local/bin/lib_/usr/lib_ -i airgraph-ng/airgraph-ng.py
-	install -Dm644 airgraph-ng/airgraph-ng.py ${pkgdir}/usr/sbin/airgraph-ng
-	chmod +x ${pkgdir}/usr/sbin/airgraph-ng
+	install -Dm644 airgraph-ng/airgraph-ng.py ${pkgdir}/usr/bin/airgraph-ng
+	chmod +x ${pkgdir}/usr/bin/airgraph-ng
 
 	### DUMP-JOIN.PY ###
 	# Man page
 	install -Dm644 airgraph-ng/man/dump-join.1 ${pkgdir}/usr/share/man/man1/
 	# Script
 	sed s/python/python2/ -i airgraph-ng/dump-join.py
-	install -Dm644 airgraph-ng/dump-join.py ${pkgdir}/usr/sbin/dump-join.py
-	chmod +x ${pkgdir}/usr/sbin/dump-join.py
-	
+	install -Dm644 airgraph-ng/dump-join.py ${pkgdir}/usr/bin/dump-join.py
+	chmod +x ${pkgdir}/usr/bin/dump-join.py
+
 	### AIRODUMP-NG-OUI-UPDATE ###
 	# Script
-	install -Dm644 airodump-ng-oui-update ${pkgdir}/usr/sbin/
-	chmod +x ${pkgdir}/usr/sbin/airodump-ng-oui-update
+	install -Dm644 airodump-ng-oui-update ${pkgdir}/usr/bin/
+	chmod +x ${pkgdir}/usr/bin/airodump-ng-oui-update
 
 }
diff --git a/community/fcgiwrap/PKGBUILD b/community/fcgiwrap/PKGBUILD
index 80f5babe0..b42bf575d 100644
--- a/community/fcgiwrap/PKGBUILD
+++ b/community/fcgiwrap/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 84283 2013-02-15 14:33:33Z lfleischer $
+# $Id: PKGBUILD 92039 2013-05-31 00:13:34Z seblu $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Aaron Bull Schaefer <aaron@elasticdog.com>
 # Contributor: Ron Huang <ronhuang+aur at gmail dot com>
 
 pkgname=fcgiwrap
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A simple server for running CGI applications over FastCGI.'
 arch=('i686' 'x86_64')
 url='http://nginx.localdomain.pl/wiki/FcgiWrap'
@@ -20,7 +20,7 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   autoreconf --install
-  ./configure --prefix=/usr --mandir=/share/man
+  ./configure --prefix=/usr --mandir=/share/man --sbindir=/usr/bin
   make
 }
 
diff --git a/community/fortune-mod/PKGBUILD b/community/fortune-mod/PKGBUILD
index 427bdb8de..3fbbe9f80 100644
--- a/community/fortune-mod/PKGBUILD
+++ b/community/fortune-mod/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 75721 2012-08-29 11:10:03Z bisson $
+# $Id: PKGBUILD 92041 2013-05-31 00:16:32Z seblu $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: Dale Blount <archlinux@dale.us>
 
 pkgname=fortune-mod
 pkgver=1.99.1
-pkgrel=5
+pkgrel=6
 pkgdesc="The Fortune Cookie Program from BSD games"
 arch=('i686' 'x86_64')
 url="http://www.redellipse.net/code/fortune"
@@ -27,7 +27,7 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
   make FORTDIR="$pkgdir"/usr/bin \
        COOKIEDIR="$pkgdir"/usr/share/fortune \
-       BINDIR="$pkgdir"/usr/sbin \
+       BINDIR="$pkgdir"/usr/bin \
        BINMANDIR="$pkgdir"/usr/share/man/man1 \
        FORTMANDIR="$pkgdir"/usr/share/man/man6 install
   rm "$pkgdir"/usr/share/fortune/*.u8
diff --git a/community/hdapsd/PKGBUILD b/community/hdapsd/PKGBUILD
index 61c0d5d0d..7381649b5 100644
--- a/community/hdapsd/PKGBUILD
+++ b/community/hdapsd/PKGBUILD
@@ -4,26 +4,21 @@
 
 pkgname=hdapsd
 pkgver=20090401
-pkgrel=6
+pkgrel=7
 pkgdesc='HDAPS userspace hard drive protection daemon'
 arch=('i686' 'x86_64')
 url='http://sourceforge.net/projects/hdaps/'
 license=('GPL')
-depends=('glibc')
-backup=('etc/conf.d/hdapsd')
+depends=('glibc' 'bash')
 source=("http://downloads.sourceforge.net/hdaps/hdapsd-${pkgver}.tar.gz"
-        'hdapsd.conf.d'
-        'hdapsd.systemd'
-        'hdapsd.wrapper')
+        'hdapsd.systemd')
 md5sums=('897cee8b0192febd127470f3e9506aeb'
-         '07fc036c8717bf5a38bbc269ed38ad19'
-         '4b1378d43dc9431982f6605265c24f3b'
-         '11270661f3a543268786a68bbe74a6bb')
+         '61ac40d4d77e57863da68d9fd94c58e7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  ./configure --prefix=/usr --sysconfdir=/etc
+  ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
   make ${MAKEFLAGS}
 }
 
@@ -32,8 +27,5 @@ package() {
 
   make DESTDIR="${pkgdir}/" install
 
-  # install rc script and its configuration file
-  install -Dm0644 "${srcdir}/hdapsd.conf.d" "${pkgdir}/etc/conf.d/hdapsd"
   install -Dm0644 "${srcdir}/hdapsd.systemd" "${pkgdir}/usr/lib/systemd/system/hdapsd.service"
-  install -Dm0755 "${srcdir}/hdapsd.wrapper" "${pkgdir}/usr/sbin/hdapsd-wrapper"
 }
diff --git a/community/hdapsd/hdapsd.conf.d b/community/hdapsd/hdapsd.conf.d
deleted file mode 100644
index eb99fdc2c..000000000
--- a/community/hdapsd/hdapsd.conf.d
+++ /dev/null
@@ -1,22 +0,0 @@
-# DEVICE specifies the device to monitor, defaults to "sda".
-#DEVICE='sda'
-
-# If an ultrabay hard drive is inserted, the following can be used:
-#DEVICE=('sda' 'sdb')
-
-# SENSITIVITY is self explanatory, defaults to "15".
-#SENSITIVITY='15'
-
-# Set ADAPTIVE to "yes" to enable adaptive threshold (automatically increase
-# when the built-in keyboard/mouse is used).
-#ADAPTIVE='yes'
-
-# Set SYSLOG to "yes" to have the daemon report errors to syslog (instead of
-# stderr/stdout).
-SYSLOG='yes'
-
-# Set FORCE to "yes" to force the kernel to use the unload heads feature on
-# some old hard drives for which support cannot be autodetected (don't use this
-# unless you're absolutely sure your hard drive really supports unloading
-# heads).
-#FORCE='yes'
diff --git a/community/hdapsd/hdapsd.systemd b/community/hdapsd/hdapsd.systemd
index 328699bc7..d3927d61e 100644
--- a/community/hdapsd/hdapsd.systemd
+++ b/community/hdapsd/hdapsd.systemd
@@ -5,7 +5,7 @@ After=syslog.target
 [Service]
 Type=forking
 PIDFile=/var/run/hdapsd.pid
-ExecStart=/usr/sbin/hdapsd-wrapper
+ExecStart=/usr/bin/hdapsd-wrapper
 ExecReload=/bin/kill -HUP ${MAINPID}
 
 [Install]
diff --git a/community/hdapsd/hdapsd.wrapper b/community/hdapsd/hdapsd.wrapper
deleted file mode 100644
index d74fd272d..000000000
--- a/community/hdapsd/hdapsd.wrapper
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-[ -f /etc/conf.d/hdapsd ] && source /etc/conf.d/hdapsd
-
-OPTS="-bp"
-
-if [ -z "${DEVICE}" ]; then
-  OPTS="${OPTS} -d sda"
-else
-  for i in ${DEVICE[@]}; do
-    OPTS="${OPTS} -d ${i}"
-  done
-fi
-
-[ ! -z "${SENSITIVITY}" ] && OPTS="${OPTS} -s ${SENSITIVITY}"
-[ "${ADAPTIVE}" == "yes" ] && OPTS="${OPTS} -a"
-[ "${SYSLOG}" == "yes" ] && OPTS="${OPTS} -l"
-[ "${FORCE}" == "yes" ] && OPTS="${OPTS} -f"
-
-/usr/sbin/hdapsd ${OPTS}
diff --git a/community/hping/Makefile.patch b/community/hping/Makefile.patch
index dd53dd0a6..d1d4221f4 100644
--- a/community/hping/Makefile.patch
+++ b/community/hping/Makefile.patch
@@ -12,11 +12,11 @@ diff -Naur hping3-20051105/Makefile hping3-20051105-new/Makefile
 -	@if [ -d ${INSTALL_MANPATH}/man8 ]; then \
 -		cp ./docs/hping3.8 ${INSTALL_MANPATH}/man8; \
 -		chmod 644 ${INSTALL_MANPATH}/man8/hping3.8; \
-+	@[ ! -d ${DESTDIR}/usr/sbin ] && install -d ${DESTDIR}/usr/sbin
-+	cp -f hping3 ${DESTDIR}/usr/sbin/
-+	chmod 755 ${DESTDIR}/usr/sbin/hping3
-+	ln -s /usr/sbin/hping3 ${DESTDIR}/usr/sbin/hping
-+	ln -s /usr/sbin/hping3 ${DESTDIR}/usr/sbin/hping2
++	@[ ! -d ${DESTDIR}/usr/bin ] && install -d ${DESTDIR}/usr/bin
++	cp -f hping3 ${DESTDIR}/usr/bin/
++	chmod 755 ${DESTDIR}/usr/bin/hping3
++	ln -s hping3 ${DESTDIR}/usr/bin/hping
++	ln -s hping3 ${DESTDIR}/usr/bin/hping2
 +	@[ ! -d ${DESTDIR}${INSTALL_MANPATH}/man8 ] && install -d ${DESTDIR}${INSTALL_MANPATH}/man8
 +	@if [ -d ${DESTDIR}${INSTALL_MANPATH}/man8 ]; then \
 +		cp ./docs/hping3.8 ${DESTDIR}${INSTALL_MANPATH}/man8; \
diff --git a/community/hping/PKGBUILD b/community/hping/PKGBUILD
index ee6b4e835..41c30b6a4 100644
--- a/community/hping/PKGBUILD
+++ b/community/hping/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 57877 2011-11-04 07:45:07Z lfleischer $
+# $Id: PKGBUILD 92024 2013-05-30 23:36:53Z seblu $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 
 pkgname=hping
 pkgver=3.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc='A command-line oriented TCP/IP packet assembler/analyzer.'
 arch=('i686' 'x86_64')
 url='http://www.hping.org'
@@ -14,7 +14,7 @@ source=("http://www.hping.org/hping3-20051105.tar.gz"
         'Makefile.patch'
         'bytesex.h.patch')
 md5sums=('ca4ea4e34bcc2162aedf25df8b2d1747'
-         '3c6f920201fc980d377408917a28df93'
+         '339a38f86169d1b9344287a85201afbe'
          '8af8e336819df1447b0c1b879a704be9')
 
 build() {
diff --git a/community/i2c-tools/PKGBUILD b/community/i2c-tools/PKGBUILD
index 2e15b7557..448c7452c 100644
--- a/community/i2c-tools/PKGBUILD
+++ b/community/i2c-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91137 2013-05-20 09:47:55Z jelle $
+# $Id: PKGBUILD 92028 2013-05-30 23:36:57Z seblu $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: DonVla <donvla@users.sourceforge.net>
 
 pkgname=i2c-tools
 pkgver=3.1.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Heterogeneous set of I2C tools for Linux that used to be part of lm-sensors"
 arch=('i686' 'x86_64')
 url="http://www.lm-sensors.org/wiki/I2CTools"
@@ -15,7 +15,7 @@ source=(http://dl.lm-sensors.org/${pkgname}/releases/${pkgname}-${pkgver}.tar.bz
 md5sums=('f15019e559e378c6e9d5d6299a00df21')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}" 
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make
   make -C eepromer CFLAGS="$CFLAGS -I../include"
   cd py-smbus
@@ -24,7 +24,7 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make prefix="${pkgdir}/usr" install
+  make prefix="${pkgdir}/usr" sbindir="$pkgdir/usr/bin" install
   install -Dm755 eepromer/eeprog eepromer/eeprom eepromer/eepromer "${pkgdir}/usr/bin"
   cd py-smbus
   python2 setup.py install --prefix "${pkgdir}/usr"
diff --git a/community/iftop/PKGBUILD b/community/iftop/PKGBUILD
index 18c013068..c74667fab 100644
--- a/community/iftop/PKGBUILD
+++ b/community/iftop/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 67935 2012-03-16 10:23:32Z giovanni $
+# $Id: PKGBUILD 92025 2013-05-30 23:36:54Z seblu $
 # Maintainer: Daenyth <Daenyth+Arch at gmail dot com>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
 # Contributor: Alexander Mieland (dma147) <dma147@linux-stats.org>
@@ -6,21 +6,20 @@
 
 pkgname=iftop
 pkgver=0.17
-pkgrel=10
+pkgrel=11
 pkgdesc="iftop does for network usage what top(1) does for CPU usage"
 arch=('i686' 'x86_64')
 url="http://www.ex-parrot.com/~pdw/iftop/"
 license=('GPL')
 depends=('libpcap' 'ncurses')
 options=('!makeflags')
-source=(http://www.ex-parrot.com/~pdw/$pkgname/download/$pkgname-$pkgver.tar.gz)
+source=("http://www.ex-parrot.com/~pdw/$pkgname/download/$pkgname-$pkgver.tar.gz")
 md5sums=('062bc8fb3856580319857326e0b8752d')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr \
-              --mandir=/usr/share/man
+  ./configure --prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man
   make
 }
 
diff --git a/community/monit/PKGBUILD b/community/monit/PKGBUILD
index 44e524112..48ff45d64 100644
--- a/community/monit/PKGBUILD
+++ b/community/monit/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 79004 2012-10-28 18:41:19Z jlichtblau $
+# $Id: PKGBUILD 92063 2013-05-31 02:32:07Z seblu $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
 # Contributor: Marco Bartholomew <marco@marcobartholomew.com>
 
 pkgname=monit
 pkgver=5.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Utility for managing and monitoring, processes, files, directories and devices on a *NIX system"
 arch=('i686' 'x86_64')
 url="http://mmonit.com/monit/"
@@ -14,9 +14,8 @@ depends=('openssl')
 backup=('etc/monitrc')
 changelog=$pkgname.changelog
 source=(http://mmonit.com/$pkgname/dist/$pkgname-$pkgver.tar.gz \
-        monitd monit.service)
+        monit.service)
 sha256sums=('8276b060b3f0e6453c9748d421dec044ddae09d3e4c4666e13472aab294d7c53'
-            'b235b2fdeec49015d6b74f028d161b289663692f9ee2d2d78cf52d8db87ca496'
             'cf607209e9e5d39e708152dc181525570371fab750f828e890e2b6a00b81ebc4')
 
 build() {
@@ -32,8 +31,7 @@ package() {
 
   make DESTDIR=${pkgdir} install
 
-  install -D -m755 ${srcdir}/monitd  ${pkgdir}/etc/rc.d/monitd
   install -D -m700 monitrc ${pkgdir}/etc/monitrc
-  
+
   install -D -m644 ${srcdir}/$pkgname.service ${pkgdir}/usr/lib/systemd/system/$pkgname.service
 }
diff --git a/community/monit/monitd b/community/monit/monitd
deleted file mode 100644
index 61a359702..000000000
--- a/community/monit/monitd
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-start() {
-  stat_busy "Starting Monit"
-  /usr/bin/monit &> /dev/null
-  if [ $? -gt 0 ]; then
-    stat_fail
-  else
-    add_daemon monitd
-    stat_done
-  fi
-}
-
-stop() {
-  stat_busy "Stopping Monit"
-  /usr/bin/monit quit &> /dev/null
-  if [ $? -gt 0 ]; then
-    stat_fail
-  else
-    rm_daemon monitd
-    stat_done
-  fi
-}
-
-case "$1" in
-  start)
-    start
-    ;;
-  stop)
-    stop
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/ngircd/PKGBUILD b/community/ngircd/PKGBUILD
index e536d7f63..be8677c53 100644
--- a/community/ngircd/PKGBUILD
+++ b/community/ngircd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 84301 2013-02-15 22:17:20Z kkeen $
+# $Id: PKGBUILD 92045 2013-05-31 00:26:55Z seblu $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=ngircd
 pkgver=20.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Next Generation IRC Daemon"
 arch=('x86_64' 'i686')
 backup=(etc/ngircd.conf)
@@ -13,17 +13,16 @@ url="http://ngircd.barton.de/"
 license=('GPL')
 depends=('openssl' 'libident')
 source=("http://ngircd.barton.de/pub/ngircd/ngircd-$pkgver.tar.gz"
-        ngircd.sh
         ngircd.service)
 sha256sums=('306c0ef0d2ceac0836a84ecf871a6bc4dd16c25683aa87c0f172b6e68b93357d'
-            'f8c28546090af8ce67471b9b4d577f6926007615356dd11afd2bc16f61d698d5'
-            '13ffad9647ef42d1a9c8f01f6208bef9dfe9e0f86dce9a01f72711d813d720a0')
+            'f02e30f6864ba1130bcc85bedc44ad782687f572c06f10e0501b0ddcf532b404')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   ./configure --prefix=/usr \
   	--sysconfdir=/etc \
+  	--sbindir=/usr/bin \
   	--mandir=/usr/share/man \
   	--with-ident \
   	--with-openssl \
@@ -35,7 +34,6 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
-  install -Dm 755 ../ngircd.sh "$pkgdir/etc/rc.d/ngircd"
   install -Dm 755 ../ngircd.service "$pkgdir/usr/lib/systemd/system/ngircd.service"
 }
 
diff --git a/community/ngircd/ngircd.service b/community/ngircd/ngircd.service
index b5bab060b..b75382ea9 100644
--- a/community/ngircd/ngircd.service
+++ b/community/ngircd/ngircd.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 # don't daemonize to simplify stuff
-ExecStart=/usr/sbin/ngircd -n
+ExecStart=/usr/bin/ngircd -n
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/community/ngircd/ngircd.sh b/community/ngircd/ngircd.sh
deleted file mode 100644
index 3947f527e..000000000
--- a/community/ngircd/ngircd.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-	start)
-		stat_busy "Starting ngircd IRC daemon"
-		/usr/sbin/ngircd
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			stat_done
-			add_daemon ngircd
-		fi
-		;;
-	stop)
-		stat_busy "Stopping ngircd IRC daemon"
-		PID=`pidof -o %PPID /usr/sbin/ngircd`
-		kill $PID > /dev/null
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			rm_daemon ngircd
-			stat_done
-		fi
-		;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-	*)
-	echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/nss-pam-ldapd/PKGBUILD b/community/nss-pam-ldapd/PKGBUILD
index 5e6ebd566..bbdedb365 100644
--- a/community/nss-pam-ldapd/PKGBUILD
+++ b/community/nss-pam-ldapd/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=nss-pam-ldapd
 pkgver=0.8.13
-pkgrel=1
+pkgrel=2
 pkgdesc='LDAP module for NSS and PAM'
 arch=('i686' 'x86_64')
 url="http://arthurdejong.org/$pkgname/"
@@ -17,16 +17,17 @@ backup=('etc/nslcd.conf')
 source=("http://arthurdejong.org/$pkgname/$pkgname-$pkgver.tar.gz"
         "nslcd.service")
 sha1sums=('0567cfea104defabeacd88a3a3200b311b8071ec'
-          '40afa421f05c2128a5219504fea45b2e76830973')
-          
+          'b564fa5738963a67a9240bf4ce63b2fa494cafb7')
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   ./configure \
     --prefix=/usr \
+    --sbindir=/usr/bin \
     --sysconfdir=/etc \
     --localstatedir=/var \
     --with-pam-seclib-dir=/usr/lib/security;
- 
+
   make
 }
 
diff --git a/community/nss-pam-ldapd/nslcd.service b/community/nss-pam-ldapd/nslcd.service
index 41fcb8966..73a9b5272 100644
--- a/community/nss-pam-ldapd/nslcd.service
+++ b/community/nss-pam-ldapd/nslcd.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
 [Service]
 Type=forking
 PIDFile=/var/run/nslcd/nslcd.pid
-ExecStart=/usr/sbin/nslcd
+ExecStart=/usr/bin/nslcd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/nzbget/PKGBUILD b/community/nzbget/PKGBUILD
index 1643a3606..a2742fb2a 100644
--- a/community/nzbget/PKGBUILD
+++ b/community/nzbget/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 88583 2013-04-20 15:33:34Z jlichtblau $
+# $Id: PKGBUILD 92051 2013-05-31 00:48:23Z seblu $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=nzbget
 pkgver=10.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Download from Usenet using .nzb files"
 arch=('x86_64' 'i686')
 url="http://nzbget.sourceforge.net/"
@@ -18,7 +18,7 @@ sha256sums=('c9b878744c162e7721ffc8b048a2e4550a8ed8da6e706ee4cbd026ed2d612ec2')
 build() {
   cd ${srcdir}/$pkgname-$pkgver
 
-  ./configure --prefix=/usr --enable-parcheck
+  ./configure --prefix=/usr --sbindir=/usr/bin --enable-parcheck
   make CXXFLAGS="-lsigc-2.0"
 }
 
diff --git a/community/partimage/PKGBUILD b/community/partimage/PKGBUILD
index 2fe4fa830..f3cecc40a 100644
--- a/community/partimage/PKGBUILD
+++ b/community/partimage/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 77310 2012-10-08 15:54:38Z lfleischer $
+# $Id: PKGBUILD 92035 2013-05-31 00:06:34Z seblu $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Sven Kauber <celeon@gmail.com>
@@ -7,7 +7,7 @@
 
 pkgname=partimage
 pkgver=0.6.9
-pkgrel=3
+pkgrel=4
 pkgdesc='Partition Image saves partitions in many formats to an image file.'
 arch=('i686' 'x86_64')
 url='http://www.partimage.org/'
@@ -17,21 +17,19 @@ backup=('etc/partimaged/partimagedusers')
 install='partimage.install'
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'partimage-0.6.9-zlib-1.2.6.patch'
-        'partimaged'
         'partimaged-gencrt'
         'partimaged.service')
 md5sums=('1bc046fd915c5debbafc85729464e513'
          '202c4334766041d98c5f67c9d62c3063'
-         'f3b517a62de5540f3b1a8b7edf65b7ec'
          '2316b116227b07efb48266e660ca1ba1'
-         '4102983fdf6e7af7cac73fdf9d37a6f6')
+         '5f8dae511cdfbf097409a45e9642a372')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   patch -p1 -i ../partimage-0.6.9-zlib-1.2.6.patch
 
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-pam
+  ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --enable-pam
   make
   make pamfile
 }
@@ -42,7 +40,6 @@ package() {
   make DESTDIR="${pkgdir}" install
 
   install -Dm0644 partimaged.pam "${pkgdir}/etc/pam.d/partimaged"
-  install -Dm0755 "${srcdir}/partimaged" "${pkgdir}/etc/rc.d/partimaged"
   install -Dm0755 "${srcdir}/partimaged-gencrt" "${pkgdir}/usr/bin/partimaged-gencrt"
   chmod 644 "${pkgdir}/etc/partimaged/partimagedusers"
 
diff --git a/community/partimage/partimaged b/community/partimage/partimaged
deleted file mode 100644
index da810cbb1..000000000
--- a/community/partimage/partimaged
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-# This file belongs in /etc/rc.d
-#
-###############################################################################
-
-#inserting certain functions (like stat_busy)
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PARTIMAGE=/usr/sbin/
-
-# Check the file is there and is executable.
-[ -x $PARTIMAGE/partimaged ] || exit 0
-
-PID=`pidof -o %PPID /usr/sbin/partimaged`
-
-# See how we were called.
-case "$1" in
-  start)
-	stat_busy "Starting Partimage Daemon "
-	if [ -z "$PID" ]; then 
-	   /usr/sbin/partimaged -D &>/dev/null
-	   RETVAL=$? #storing the status of the last command to RETVAL
-	   if [ $? -gt 0 ]; then #if the status was other than 0, the command failed
-	      stat_fail
-	      exit 1
-           else			
-	      add_daemon partimaged
-	      stat_done
-	   fi
-	else
-	   stat_fail
-	   echo ":: Daemon already started as pid $PID"
-	   exit 1
-	fi			    
-	;;
-  stop)
-	stat_busy "Stopping Partimage Daemon "
-	if [ "$PID" != "" ]; then #if PID exists
-	   kill -KILL $PID &>/dev/null
-	   stat_done
-	   if [ $? -gt 0 ]; then
-	      stat_fail
-	      exit 1
-	   else		  
-	      RETVAL=$?
-	      rm_daemon partimaged
-      	   fi
-  	 else   
-	   stat_fail
-	   echo ":: Daemon already stopped"
-	   exit 1
-   	fi
-	;;
-  restart|reload)
-	$0 stop
-	$0 start
-	RETVAL=$?
-	;;
-  *)
-	echo "Usage: partimaged {start|stop|restart|reload}"
-	exit 1
-esac
-exit $RETVAL
diff --git a/community/partimage/partimaged.service b/community/partimage/partimaged.service
index 34eb87fd7..baa682981 100644
--- a/community/partimage/partimaged.service
+++ b/community/partimage/partimaged.service
@@ -4,7 +4,7 @@ After=syslog.target network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/partimaged --daemon
+ExecStart=/usr/bin/partimaged --daemon
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/privoxy/PKGBUILD b/community/privoxy/PKGBUILD
index 81e839275..a016a0e67 100644
--- a/community/privoxy/PKGBUILD
+++ b/community/privoxy/PKGBUILD
@@ -1,32 +1,27 @@
-# $Id: PKGBUILD 80122 2012-11-16 17:01:01Z lfleischer $
+# $Id: PKGBUILD 92055 2013-05-31 01:13:33Z seblu $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Juergen Hoetzel <juergen@hoetzel.info>
 # Contributor: basilburn (basilburn), Paul Bredbury (brebs) 
 
 pkgname=privoxy
-pkgver=3.0.19
-pkgrel=7
+pkgver=3.0.21
+pkgrel=1
 pkgdesc='A web proxy with advanced filtering capabilities.'
 arch=('i686' 'x86_64')
 url='http://www.privoxy.org'
 license=('GPL')
 depends=('pcre' 'zlib')
 makedepends=('autoconf')
-backup=('etc/conf.d/privoxy'
-        'etc/privoxy/'{config,trust,default.action,user.filter,default.filter}
+backup=('etc/privoxy/'{config,trust,default.action,user.filter,default.filter}
         'etc/privoxy/'{match-all,user}.action
         'etc/logrotate.d/privoxy')
 install='privoxy.install'
 source=("http://downloads.sourceforge.net/ijbswa/${pkgname}-${pkgver}-stable-src.tar.gz"
-        'privoxy'
         'privoxy.logrotate.d'
-        'privoxy.conf.d'
         'privoxy.service')
-md5sums=('57acc79059565cc42eda67982842785d'
-         '1b4ed8c4e7e5b04b10ef41b597dc3f3b'
+md5sums=('79558f2545cfcf9731f7de611646d837'
          'fc3046377137003726a151ee27b142a2'
-         '27830ef79418e277b90c1c1fa933f876'
-         '4c154a126ec17b02c623e3d451e062d9')
+         '358e614190247fc1671bbcadddf500db')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}-stable"
@@ -41,15 +36,14 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}-stable"
 
-  make prefix="${pkgdir}/usr" MAN_DEST="${pkgdir}/usr/share/man/man1" GROUP=42 \
+  make prefix="${pkgdir}/usr" SBIN_DEST="${pkgdir}/usr/bin" \
+    MAN_DEST="${pkgdir}/usr/share/man/man1" GROUP=42 \
     CONF_BASE="${pkgdir}/etc/privoxy" VAR_DEST="${pkgdir}/var" install
 
   # Don't overwrite existing log files!
   rm "${pkgdir}/var/log/privoxy/"*
 
-  install -Dm0755 "${srcdir}/privoxy" "${pkgdir}/etc/rc.d/privoxy"
   install -Dm0644 "${srcdir}/privoxy.logrotate.d" "${pkgdir}/etc/logrotate.d/privoxy"
-  install -Dm0644 "${srcdir}/privoxy.conf.d" "${pkgdir}/etc/conf.d/privoxy"
 
   # Fix config paths.
   sed -i -e 's#^confdir.*$#confdir /etc/privoxy#' -e 's#^logdir.*$#logdir /var/log/privoxy#' \
diff --git a/community/privoxy/privoxy b/community/privoxy/privoxy
deleted file mode 100644
index 754453de5..000000000
--- a/community/privoxy/privoxy
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/privoxy ] && . /etc/conf.d/privoxy
-
-# read logdir and logfile from privoxy config
-prld=`grep ^logdir "$PRIVOXY_CONF" 2>/dev/null | cut -d' ' -f2`
-[ -n "$prld" ] || prld=/var/log/privoxy
-prlf=`grep ^logfile "$PRIVOXY_CONF" 2>/dev/null | cut -d' ' -f2`
-[ -n "$prlf" ] || prlf=logfile
-
-PID=`pidof -o %PPID /usr/sbin/privoxy`
-
-case "$1" in
-  start)
-    stat_busy "Starting Privoxy"
-    # create missing logdir and logfile
-    [ -d "$prld" ] || mkdir -p "$prld"
-    if [ ! -f "$prlf" ]; then
-      touch "$prld/$prlf" && chgrp "${PRIVOXY_GROUP}" "$prld/$prlf" && \
-        chmod 0660 "$prld/$prlf"
-    fi
-    [ -z "$PID" ] && /usr/sbin/privoxy --user ${PRIVOXY_USER}.${PRIVOXY_GROUP} \
-                                       ${PRIVOXY_ARGS} ${PRIVOXY_CONF}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon privoxy
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Privoxy"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon privoxy
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/privoxy/privoxy.conf.d b/community/privoxy/privoxy.conf.d
deleted file mode 100644
index 9aa11cd67..000000000
--- a/community/privoxy/privoxy.conf.d
+++ /dev/null
@@ -1,10 +0,0 @@
-# Location of the config file.
-PRIVOXY_CONF='/etc/privoxy/config'
-
-# User and group that privoxy will be run as.
-PRIVOXY_USER='privoxy'
-PRIVOXY_GROUP='privoxy'
-
-# Additional arguments.
-PRIVOXY_ARGS="--pidfile /var/run/privoxy.pid"
-
diff --git a/community/privoxy/privoxy.service b/community/privoxy/privoxy.service
index 59a8884f9..e8b04447b 100644
--- a/community/privoxy/privoxy.service
+++ b/community/privoxy/privoxy.service
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 Type=forking
 PIDFile=/run/privoxy.pid
-ExecStart=/usr/sbin/privoxy --pidfile /run/privoxy.pid --user privoxy.privoxy /etc/privoxy/config
+ExecStart=/usr/bin/privoxy --pidfile /run/privoxy.pid --user privoxy.privoxy /etc/privoxy/config
 SuccessExitStatus=15
 
 [Install]
diff --git a/community/stunnel/PKGBUILD b/community/stunnel/PKGBUILD
index dfc28ebb7..2b6c55e35 100644
--- a/community/stunnel/PKGBUILD
+++ b/community/stunnel/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 87349 2013-03-30 09:40:31Z lfleischer $
+# $Id: PKGBUILD 92065 2013-05-31 02:33:12Z seblu $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 
 pkgname=stunnel
 pkgver=4.56
-pkgrel=1
+pkgrel=2
 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL"
 arch=('i686' 'x86_64')
 url="http://www.stunnel.org"
@@ -15,13 +15,11 @@ install=$pkgname.install
 options=('!libtool')
 source=("ftp://ftp.stunnel.org/stunnel/$pkgname-$pkgver.tar.gz"{,.asc}
         'Makefile.patch'
-        'stunnel.rc.d'
         'stunnel.tmpfiles.conf')
 
 md5sums=('ac4c4a30bd7a55b6687cbd62d864054c'
          'd68c7dd65d515c678cdde15bbf0ce344'
          'f15398497e10e080c2406d2fc541660c'
-         '4c7e3634a9d4dc040102f5d4160fb123'
          '2e065a39998e57727ee79887bbd1751e')
 
 build() {
@@ -48,7 +46,6 @@ package() {
   done
 
   install -Dm644 tools/stunnel.cnf "$pkgdir/etc/stunnel/stunnel.cnf"
-  install -Dm755 "$srcdir/stunnel.rc.d" "$pkgdir/etc/rc.d/stunnel"
   install -Dm644 "$srcdir/stunnel.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/stunnel.conf"
 
   # move systemd service into place
diff --git a/community/stunnel/stunnel.rc.d b/community/stunnel/stunnel.rc.d
deleted file mode 100644
index 76f7b796a..000000000
--- a/community/stunnel/stunnel.rc.d
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-pidfile=/var/run/stunnel/stunnel.pid
-if [[ -r $pidfile ]]; then
-  read -r PID < "$pidfile"
-  if [[ $PID && ! -d /proc/$PID ]]; then
-    # stale pidfile
-    unset PID
-    rm -f "$pidfile"
-  fi
-fi
-
-case "$1" in
-  start)
-    stat_busy "Starting stunnel"
-    if [[ -z $PID ]] && /usr/bin/stunnel; then
-      add_daemon stunnel
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping stunnel"
-    if [[ $PID ]] && kill $PID &>/dev/null; then
-      rm_daemon stunnel
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/community/tabbed/PKGBUILD b/community/tabbed/PKGBUILD
index c89f0ed1f..a66c44205 100644
--- a/community/tabbed/PKGBUILD
+++ b/community/tabbed/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 75438 2012-08-23 21:00:37Z lfleischer $
+# $Id: PKGBUILD 92069 2013-05-31 08:05:10Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: totoloco <totoloco at gmx>
 
 pkgname=tabbed
-pkgver=0.4.1
+pkgver=0.5
 pkgrel=1
 pkgdesc='Simple generic tabbed fronted to xembed aware applications.'
 arch=('i686' 'x86_64')
@@ -13,8 +13,8 @@ depends=('libx11')
 install='tabbed.install'
 source=("http://dl.suckless.org/tools/${pkgname}-${pkgver}.tar.gz"
         'config.h')
-md5sums=('6349b763f8a4d5e42d18245169fb136c'
-         '5aa6c1fdc7971b21363704391bea6e1b')
+md5sums=('cd9cfd696db745637486ec3b9bbe4b75'
+         'cea7b04d4f67d917c68673cd0e63ae32')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/tabbed/config.h b/community/tabbed/config.h
index 402cf25d1..ca4b8d6b4 100644
--- a/community/tabbed/config.h
+++ b/community/tabbed/config.h
@@ -1,21 +1,36 @@
-static const char *font        = "-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*";
-static const char *normbgcolor = "#cccccc";
-static const char *normfgcolor = "#000000";
-static const char *selbgcolor  = "#0066ff";
-static const char *selfgcolor  = "#ffffff";
-static const char *before      = "<";
-static const char *after       = ">";
-static const int tabwidth      = 200;
-static const Bool foreground   = False;
+/* See LICENSE file for copyright and license details. */
+
+/* appearance */
+static const char font[]        = "-*-*-medium-*-*-*-14-*-*-*-*-*-*-*";
+static const char normbgcolor[] = "#222222";
+static const char normfgcolor[] = "#cccccc";
+static const char selbgcolor[]  = "#555555";
+static const char selfgcolor[]  = "#ffffff";
+static const char before[]      = "<";
+static const char after[]       = ">";
+static const int  tabwidth      = 200;
+static const Bool foreground    = True;
+
+/*
+ * Where to place a new tab when it is opened. When npisrelative is True,
+ * then the current position is changed + newposition. If npisrelative
+ * is False, then newposition is an absolute position.
+ */
+static int  newposition   = 0;
+static Bool npisrelative  = False;
 
 #define MODKEY ControlMask
 static Key keys[] = { \
 	/* modifier                     key        function        argument */
 	{ MODKEY|ShiftMask,             XK_Return, focusonce,      { 0 } },
-	{ MODKEY|ShiftMask,             XK_Return, spawn,          { .v = (char*[]){ "surf", "-e", winid, NULL} } },
+	{ MODKEY|ShiftMask,             XK_Return, spawn,          { 0 } },
+
 	{ MODKEY|ShiftMask,             XK_l,      rotate,         { .i = +1 } },
 	{ MODKEY|ShiftMask,             XK_h,      rotate,         { .i = -1 } },
+	{ MODKEY|ShiftMask,             XK_j,      movetab,        { .i = -1 } },
+	{ MODKEY|ShiftMask,             XK_k,      movetab,        { .i = +1 } },
 	{ MODKEY,                       XK_Tab,    rotate,         { .i = 0 } },
+
 	{ MODKEY,                       XK_1,      move,           { .i = 0 } },
 	{ MODKEY,                       XK_2,      move,           { .i = 1 } },
 	{ MODKEY,                       XK_3,      move,           { .i = 2 } },
@@ -26,5 +41,9 @@ static Key keys[] = { \
 	{ MODKEY,                       XK_8,      move,           { .i = 7 } },
 	{ MODKEY,                       XK_9,      move,           { .i = 8 } },
 	{ MODKEY,                       XK_0,      move,           { .i = 9 } },
+
 	{ MODKEY,                       XK_q,      killclient,     { 0 } },
+
+	{ 0,                            XK_F11,    fullscreen,     { 0 } },
 };
+
diff --git a/community/tinc/PKGBUILD b/community/tinc/PKGBUILD
index d16e10cd1..d27feb7d8 100644
--- a/community/tinc/PKGBUILD
+++ b/community/tinc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88838 2013-04-23 16:26:01Z tredaelli $
+# $Id: PKGBUILD 92047 2013-05-31 00:34:01Z seblu $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: helios
 # Contributor: Lothar Gesslein
@@ -6,26 +6,23 @@
 
 pkgname=tinc
 pkgver=1.0.21
-pkgrel=1
+pkgrel=2
 pkgdesc="VPN (Virtual Private Network) daemon"
 arch=('i686' 'x86_64')
 url="http://www.tinc-vpn.org/"
 license=('GPL')
 depends=('lzo2' 'openssl')
-backup=(etc/conf.d/tincd.conf)
 install=tinc.install
 source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz{,.sig}
-        tincd.rc tincd.conf tincd@.service)
+        tincd@.service)
 md5sums=('d7bc9ca38672c9da08d74ff2a3e8e36d'
          'SKIP'
-         '64bb53748d9051255f243003f0d511f5'
-         '7c0276d4812cc5d3cc18142562a3aa82'
-         '035b0e549b08da55d19a8df5b8306e4d')
+         '112327da32fdb56ab779fe004712235f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin
   make
 }
 
@@ -38,7 +35,5 @@ package() {
   find "$pkgdir"/usr/share/tinc/examples -type f -exec chmod 644 {} +
   find "$pkgdir"/usr/share/tinc/examples -type d -exec chmod 755 {} +
 
-  install -Dm755 "$srcdir/tincd.rc" "$pkgdir/etc/rc.d/tincd"
-  install -Dm644 "$srcdir/tincd.conf" "$pkgdir/etc/conf.d/tincd.conf"
   install -Dm644 "$srcdir/tincd@.service" "$pkgdir/usr/lib/systemd/system/tincd@.service"
 }
diff --git a/community/tinc/tincd.conf b/community/tinc/tincd.conf
deleted file mode 100644
index 6e0902bbb..000000000
--- a/community/tinc/tincd.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Extra options to be passed to tincd.
-# TINCD_EXTRAOPTS="-d"
-
-# Arrays containing all names of the networks to be started from rc.d.
-NETNAMES=()
diff --git a/community/tinc/tincd.rc b/community/tinc/tincd.rc
deleted file mode 100644
index 48c132f25..000000000
--- a/community/tinc/tincd.rc
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-daemon_name=tincd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-case "$1" in
-  start)
-    for net in "${NETNAMES[@]}"; do
-      stat_busy "Starting ${daemon_name}"
-      /usr/sbin/tincd -n "${net}" $TINCD_EXTRAOPTS &>/dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        add_daemon ${daemon_name}
-        stat_done
-      fi
-    done
-    ;;
-  stop)
-    stat_busy "Stopping ${daemon_name}"
-    for net in "${NETNAMES[@]}"; do
-      /usr/sbin/tincd -k -n "${net}" &>/dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        rm_daemon ${daemon_name}
-        stat_done
-      fi
-    done
-    ;;
-  restart)
-    "$0" stop
-    sleep 5
-    "$0" start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/tinc/tincd@.service b/community/tinc/tincd@.service
index ef8f2da9f..069bf4570 100644
--- a/community/tinc/tincd@.service
+++ b/community/tinc/tincd@.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/tincd -n %i
+ExecStart=/usr/bin/tincd -n %i
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/tinyproxy/PKGBUILD b/community/tinyproxy/PKGBUILD
index 03b16dfbb..c2adfa0b2 100644
--- a/community/tinyproxy/PKGBUILD
+++ b/community/tinyproxy/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 80139 2012-11-16 17:14:04Z lfleischer $
+# $Id: PKGBUILD 92033 2013-05-30 23:55:47Z seblu $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Andrea Zucchelli <zukka77@gmail.com>
 
 pkgname=tinyproxy
 pkgver=1.8.3
-pkgrel=6
+pkgrel=7
 pkgdesc='A light-weight HTTP proxy daemon for POSIX operating systems.'
 arch=('i686' 'x86_64')
 url='https://banu.com/tinyproxy/'
@@ -13,18 +13,17 @@ makedepends=('asciidoc')
 install="${pkgname}.install"
 backup=('etc/tinyproxy/tinyproxy.conf')
 source=("https://banu.com/pub/${pkgname}/1.8/${pkgname}-${pkgver}.tar.bz2"
-        'tinyproxy'
         'tinyproxy.tmpfiles.conf'
         'tinyproxy.service')
 md5sums=('292ac51da8ad6ae883d4ebf56908400d'
-         '90eb2b3371e56d5a784fd826d4a6e5f8'
          '3c2764578f26581346fe312da0519a3e'
-         '299ca484c08d9873c74e1eb96f6a5cc0')
+         '41938243faca487a14beeee5114f244e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  ./configure --prefix=/usr --sysconfdir=/etc/tinyproxy --localstatedir=/var --enable-transparent
+  ./configure --prefix=/usr --sysconfdir=/etc/tinyproxy --sbindir=/usr/bin \
+     --localstatedir=/var --enable-transparent
   make
 }
 
@@ -32,7 +31,6 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   make DESTDIR="${pkgdir}" install
-  install -Dm0755 "${srcdir}/tinyproxy" "${pkgdir}/etc/rc.d/tinyproxy"
   install -Dm0644 "${srcdir}/tinyproxy.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/tinyproxy.conf"
 
   install -dm0755 -o nobody -g nobody "${pkgdir}/var/log/${pkgname}"
diff --git a/community/tinyproxy/tinyproxy b/community/tinyproxy/tinyproxy
deleted file mode 100644
index 5580ea804..000000000
--- a/community/tinyproxy/tinyproxy
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/sbin/tinyproxy)
-
-start() {
-  stat_busy "Starting Tinyproxy"
-
-  [ -z "$PID" ] && rm -f /var/run/tinyproxy/tinyproxy.pid && \
-    /usr/sbin/tinyproxy -c /etc/tinyproxy/tinyproxy.conf 2>/dev/null
-
-  if [ $? -gt 0 ]; then
-    stat_fail
-  else
-    add_daemon tinyproxy
-    stat_done
-  fi
-}
-
-stop() {
-  stat_busy "Stopping Tinyproxy"
-
-  [ ! -z "$PID" ]  && kill $PID &> /dev/null
-
-  if [ $? -gt 0 ]; then
-    stat_fail
-  else
-    rm_daemon tinyproxy
-    stat_done
-  fi
-}
-
-case "$1" in
-  start)
-    start
-    ;;
-  stop)
-    stop
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community/tinyproxy/tinyproxy.service b/community/tinyproxy/tinyproxy.service
index 8776a0ee1..f1ef18faa 100644
--- a/community/tinyproxy/tinyproxy.service
+++ b/community/tinyproxy/tinyproxy.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/tinyproxy -c /etc/tinyproxy/tinyproxy.conf
+ExecStart=/usr/bin/tinyproxy -c /etc/tinyproxy/tinyproxy.conf
 PIDFile=/run/tinyproxy/tinyproxy.pid
 
 [Install]
diff --git a/community/unhide/PKGBUILD b/community/unhide/PKGBUILD
index a8b35e112..04f43703e 100644
--- a/community/unhide/PKGBUILD
+++ b/community/unhide/PKGBUILD
@@ -1,31 +1,31 @@
-# $Id: PKGBUILD 66390 2012-02-24 12:30:25Z lfleischer $
+# $Id: PKGBUILD 92031 2013-05-30 23:43:09Z seblu $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 
 pkgname=unhide
-pkgver=20110113
-pkgrel=3
+pkgver=20130526
+pkgrel=1
 pkgdesc='A forensic tool to find processes hidden by rootkits, LKMs or by other techniques.'
 arch=('i686' 'x86_64')
-url='http://www.unhide-forensics.info/'
+url='http://sourceforge.net/projects/unhide/'
 license=('GPL3')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tgz")
-md5sums=('0dff8ee5029615f1f81db96dcf6758f7')
+depends=('iproute2' 'lsof' 'psmisc' 'net-tools' 'procps-ng')
+source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgname-$pkgver.tgz")
+md5sums=('f3d68ed8eb239614abb0ff5ace22cf85')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  cc -Os -static unhide.c -o unhide-posix
-  cc -Os -static -pthread unhide-linux26.c -o unhide-linux26
-  cc -Os -static unhide-tcp.c -o unhide-tcp
+  cd $pkgname-$pkgver
+  cc -Wall -O2 --static -pthread unhide-linux*.c unhide-output.c -o unhide-linux
+  cc -Wall -O2 --static unhide_rb.c -o unhide_rb
+  cc -Wall -O2 --static unhide-posix.c -o unhide-posix
+  cc -Wall -O2 --static unhide-tcp.c unhide-tcp-fast.c unhide-output.c -o unhide-tcp
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  install -Dm0755 unhide-posix "${pkgdir}/usr/sbin/unhide-posix"
-  install -Dm0755 unhide-linux26 "${pkgdir}/usr/sbin/unhide-linux26"
-  install -Dm0755 unhide-tcp "${pkgdir}/usr/sbin/unhide-tcp"
-  ln -fs ./unhide-linux26 "${pkgdir}/usr/sbin/unhide"
-  install -Dm0644 man/unhide.8 "${pkgdir}/usr/share/man/man8/unhide.8"
+  cd $pkgname-$pkgver
+  for _p in unhide-linux unhide-posix unhide_rb unhide-tcp; do
+    install -Dm0755 "$_p" "$pkgdir/usr/bin/$_p"
+  done
+  ln -s unhide-linux "$pkgdir/usr/bin/unhide"
+  install -Dm0644 man/unhide.8 "$pkgdir/usr/share/man/man8/unhide.8"
 }
 
diff --git a/community/vbetool/PKGBUILD b/community/vbetool/PKGBUILD
index 1eb2b244c..de312a4f7 100644
--- a/community/vbetool/PKGBUILD
+++ b/community/vbetool/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 55527 2011-09-14 07:33:04Z andrea $
+# $Id: PKGBUILD 92026 2013-05-30 23:36:55Z seblu $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Christian Storm <Christian.Storm@gmx.DE>
 # Contributor: James Rayner <james@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=vbetool
 pkgver=1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Uses lrmi in order to run code from the video BIOS"
 url="http://www.srcf.ucam.org/~mjg59/vbetool/"
 license=('GPL2')
@@ -19,9 +19,9 @@ md5sums=('ffb03b118867a02296d7449019ad8846')
 build() {
   cd "${srcdir}"/$pkgname-$pkgver
   if [ "${CARCH}" = "x86_64" ]; then
-    ./configure --prefix=/usr --without-x86emu
+    ./configure --prefix=/usr --sbindir=/usr/bin --without-x86emu
   else
-    ./configure --prefix=/usr
+    ./configure --prefix=/usr --sbindir=/usr/bin
   fi
   make LIBS=-lpci
 }