Wed May 22 00:46:35 PDT 2013

65 files changed, 463 insertions, 569 deletions

diff --git a/community/emerald/PKGBUILD b/community/emerald/PKGBUILD
deleted file mode 100644
index c7b2bf8f4..000000000
--- a/community/emerald/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 63540 2012-02-05 11:54:48Z ibiru $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com>
-# Contributor: nesl247 <nesl247@gmail.com>
-
-pkgname=emerald
-pkgver=0.8.8
-pkgrel=2
-pkgdesc="Emerald window decorator"
-arch=('i686' 'x86_64')
-url="http://www.compiz.org"
-license=('GPL')
-depends=('compiz-core' 'libwnck' 'gtk2' 'libxres' 'shared-mime-info' 'xdg-utils' \
-         'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'pkg-config' 'gettext')
-groups=('compiz-fusion' 'compiz-fusion-kde' 'compiz-fusion-gtk')
-options=(!libtool)
-conflicts=('emerald-git')
-install=emerald.install
-source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('a5deb2ae135d1c4dac7b57b2a0415f320ae7c0aa')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  LIBS+="-lm -ldl" ./configure --prefix=/usr
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community/emerald/deprecated_symbols.patch b/community/emerald/deprecated_symbols.patch
deleted file mode 100644
index b32ce154a..000000000
--- a/community/emerald/deprecated_symbols.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 30e3d45437b4285818ec016905151390c9604441 Mon Sep 17 00:00:00 2001
-From: ShadowKyogre <shadowkyogre@aim.com>
-Date: Fri, 05 Nov 2010 01:53:24 +0000
-Subject: Fix deprecated symbols and incorrect decoration property setting
-
----
-diff --git a/src/main.c b/src/main.c
-index 5f0ec35..150da99 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -27,8 +27,8 @@
- #include <emerald.h>
- #include <engine.h>
- 
--#define BASE_PROP_SIZE 12
--#define QUAD_PROP_SIZE 9
-+//#define BASE_PROP_SIZE 12
-+//#define QUAD_PROP_SIZE 9
- 
- #ifndef DECOR_INTERFACE_VERSION
- #define DECOR_INTERFACE_VERSION 0
-@@ -2457,7 +2457,7 @@ static gboolean get_window_prop(Window xwindow, Atom atom, Window * val)
-     gdk_error_trap_push();
- 
-     type = None;
--    result = XGetWindowProperty(gdk_display,
-+    result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
- 				xwindow,
- 				atom,
- 				0, G_MAXLONG,
-@@ -4246,10 +4246,10 @@ static void force_quit_dialog_realize(GtkWidget * dialog, void *data)
-     WnckWindow *win = data;
- 
-     gdk_error_trap_push();
--    XSetTransientForHint(gdk_display,
-+    XSetTransientForHint(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
- 			 GDK_WINDOW_XID(dialog->window),
- 			 wnck_window_get_xid(win));
--    XSync(gdk_display, FALSE);
-+    XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
-     gdk_error_trap_pop();
- }
- 
-@@ -4262,11 +4262,11 @@ static char *get_client_machine(Window xwindow)
-     int format, result;
-     char *retval;
- 
--    atom = XInternAtom(gdk_display, "WM_CLIENT_MACHINE", FALSE);
-+    atom = XInternAtom(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "WM_CLIENT_MACHINE", FALSE);
- 
-     gdk_error_trap_push();
- 
--    result = XGetWindowProperty(gdk_display,
-+    result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
- 				xwindow, atom,
- 				0, G_MAXLONG,
- 				FALSE, XA_STRING, &type, &format, &nitems,
-@@ -4318,8 +4318,8 @@ static void kill_window(WnckWindow * win)
-     }
- 
-     gdk_error_trap_push();
--    XKillClient(gdk_display, wnck_window_get_xid(win));
--    XSync(gdk_display, FALSE);
-+    XKillClient(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), wnck_window_get_xid(win));
-+    XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
-     gdk_error_trap_pop();
- }
- 
-@@ -4739,7 +4739,7 @@ static XFixed *create_gaussian_kernel(double radius,
- 
- static int update_shadow(frame_settings * fs)
- {
--    Display *xdisplay = gdk_display;
-+    Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-     XRenderPictFormat *format;
-     GdkPixmap *pixmap;
-     Picture src, dst, tmp;
---
-cgit v0.8.3.1-30-gff3a
-
---- a/src/main.c.old	2010-12-07 19:56:08.633333370 +0100
-+++ a/src/main.c	2010-12-07 19:56:39.273333379 +0100
-@@ -3757,7 +3757,7 @@
- 
- static void hide_tooltip(void)
- {
--    if (GTK_WIDGET_VISIBLE(tip_window))
-+    if (gtk_widget_get_visible (tip_window))
- 	g_get_current_time(&tooltip_last_popdown);
- 
-     gtk_widget_hide(tip_window);
-
---- emerald-0.8.4/libengine/themer.c	2009-10-13 20:56:23.000000000 -0400
-+++ emerald-0.8.4.new/libengine/themer.c	2010-03-10 
-01:20:03.046827674 -0500
-@@ -461,7 +461,7 @@
- }
- gdouble get_float(SettingItem * item)
- {
--    if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
-+    if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
-          return gtk_spin_button_get_value((GtkSpinButton *)item->widget);
-     }
-     else {
-@@ -647,7 +647,7 @@
- }
- void set_float(SettingItem * item, gdouble f)
- {
--    if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
-+    if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
-          gtk_spin_button_set_value((GtkSpinButton *)item->widget, f);
-     } 
-     else {
-
diff --git a/community/emerald/emerald.install b/community/emerald/emerald.install
deleted file mode 100644
index c2fa624ae..000000000
--- a/community/emerald/emerald.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate
-  update-mime-database usr/share/mime &> /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community/fcron/PKGBUILD b/community/fcron/PKGBUILD
index 37c0626e3..09ac4e51c 100644
--- a/community/fcron/PKGBUILD
+++ b/community/fcron/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90861 2013-05-15 00:13:25Z seblu $
+# $Id: PKGBUILD 91396 2013-05-21 19:34:28Z seblu $
 # Contributor: Giorgio Lando <lando at imap dot cc>
 # Contributor: Sergej Pupykin
 # Contributor: Thomas Bächler
@@ -7,14 +7,14 @@
 
 pkgname=fcron
 pkgver=3.1.2
-pkgrel=5
+pkgrel=6
 pkgdesc='Feature-rich cron implementation'
 arch=(i686 x86_64)
 url='http://fcron.free.fr'
 license=('GPL')
-depends=('pam')
-makedepends=('smtp-server' 'vi')
-optdepends=('smtp-server: to receive mails from cron jobs'
+depends=('pam' 'run-parts')
+makedepends=('smtp-forwarder' 'vi')
+optdepends=('smtp-forwarder: to send mails from cron jobs'
             'vi: default editor for fcrontab')
 provides=('cron')
 conflicts=('dcron')
@@ -26,12 +26,10 @@ backup=('etc/fcron/fcron.conf'
 options=('emptydirs' '!makeflags')
 source=("http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz"
         'systab'
-        'systab.orig'
-        'run-cron')
+        'systab.orig')
 md5sums=('36bf213e15f3a480f2274f8e46cced0a'
-         '55be3e80fb2545608feae6f2e0eebece'
-         '5384c607d842ca3d5cbb612ac1dceb15'
-         '524eba827447a6b7ef7515eedf305698')
+         '5f321747d86686f351ada7dce5774803'
+         'afecbfd98caa49e8e4aa239fa1b19255')
 
 build() {
   cd $pkgname-$pkgver
@@ -73,9 +71,6 @@ package() {
   install -d -m755 "$pkgdir/etc/cron.monthly"
   install -d -m755 "$pkgdir/etc/cron.weekly"
 
-  # Install run-cron script to make fcron run without dcron
-  install -D -m755 "$srcdir/run-cron" "$pkgdir/usr/bin/run-cron"
-
   # avoid conflict with filesystem>=2012.06
   rmdir "$pkgdir"/{var/,}run
 
diff --git a/community/fcron/run-cron b/community/fcron/run-cron
deleted file mode 100644
index 8e65e2fd0..000000000
--- a/community/fcron/run-cron
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-
-if [[ -z "$1" ]]; then
-   echo "Usage: $0 crondir"
-   exit 1
-fi
-
-for cron in "$1"/* ; do
-  if [[ -x "$cron" ]]; then
-     "$cron"
-  fi
-done
-unset cron
diff --git a/community/fcron/systab b/community/fcron/systab
index 7947f3598..392b2cb2c 100644
--- a/community/fcron/systab
+++ b/community/fcron/systab
diff --git a/community/fcron/systab.orig b/community/fcron/systab.orig
index b57ba8ef2..00af327bc 100644
--- a/community/fcron/systab.orig
+++ b/community/fcron/systab.orig
@@ -1,4 +1,4 @@
-&bootrun 01 * * * *  /usr/bin/run-cron /etc/cron.hourly
-&bootrun 02 00 * * * /usr/bin/run-cron /etc/cron.daily
-&bootrun 22 00 * * 0 /usr/bin/run-cron /etc/cron.weekly
-&bootrun 42 00 1 * * /usr/bin/run-cron /etc/cron.monthly
+&bootrun 01 * * * *  /usr/bin/run-parts /etc/cron.hourly
+&bootrun 02 00 * * * /usr/bin/run-parts /etc/cron.daily
+&bootrun 22 00 * * 0 /usr/bin/run-parts /etc/cron.weekly
+&bootrun 42 00 1 * * /usr/bin/run-parts /etc/cron.monthly
diff --git a/community/processing/PKGBUILD b/community/processing/PKGBUILD
index e4a8509ca..63ef3cdaa 100644
--- a/community/processing/PKGBUILD
+++ b/community/processing/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 85228 2013-02-27 19:59:51Z andrea $
+# $Id: PKGBUILD 91372 2013-05-21 10:01:44Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=processing
-pkgver=2.0b8
+pkgver=2.0b9
 pkgrel=1
 arch=('x86_64' 'i686')
 pkgdesc='Programming language and environment for creating images, animations and interactions'
@@ -15,19 +15,19 @@ options=(!strip)
 if [ "$CARCH" == "x86_64" ]; then
   source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver-linux64.tgz"
           "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png")
-  sha256sums=('5eab47cd67f3160a71ff694b45e74f8a17f0b0ca31cd3ae545104fb70babb58e'
+  sha256sums=('df6ab1042a09e72dec6eee8ae3bf21ed2fb47fc1eb63668960bea31a6cd62108'
             '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a')
 else
   source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver-linux32.tgz"
           "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png")
-  sha256sums=('ba113199c5ca3c0d9a274088a62eacd6c3872dea9151e34ed1f312d78bad6f17'
+  sha256sums=('9a1cc4b41c3eee3835347bc198252a2b30fea1c811abda18a42e295b5544048b'
             '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a')
 fi
 
-build() {
+prepare() {
   cd "$srcdir"
 
-  gendesk
+  gendesk --pkgname="$pkgname" --pkgdesc="$pkgdesc"
 }
 
 package() {
diff --git a/community/siege/PKGBUILD b/community/siege/PKGBUILD
index 7c6856755..77369aeeb 100644
--- a/community/siege/PKGBUILD
+++ b/community/siege/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90182 2013-05-08 09:32:40Z bluewind $
+# $Id: PKGBUILD 91394 2013-05-21 16:28:38Z bluewind $
 # Maintainer: Florian Pritz <flo@xinu.at>
 # Contributor: Sven Kauber <celeon@gmail.com>
 
 pkgname=siege
-pkgver=3.0.0
+pkgver=3.0.1
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -29,4 +29,4 @@ package() {
   sed -i 's/^# file =$/file = \/etc\/urls.txt/' "$pkgdir/etc/siegerc"
 }
 
-md5sums=('e0ace61f7e01c6b545ac767fc499f817')
+md5sums=('3401d9c8a02f227b63a0d10e2718ab37')
diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD
index 03471e84f..43b5a4a5e 100644
--- a/community/squid/PKGBUILD
+++ b/community/squid/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 90888 2013-05-15 08:03:45Z bpiotrowski $
+# $Id: PKGBUILD 91385 2013-05-21 13:59:14Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Mark Coolen <mark.coolen@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 
 pkgname=squid
-pkgver=3.3.4
-pkgrel=3
+pkgver=3.3.5
+pkgrel=1
 pkgdesc='Full-featured Web proxy cache server'
 arch=('x86_64' 'i686')
 url='http://www.squid-cache.org'
@@ -21,7 +21,7 @@ source=("http://www.squid-cache.org/Versions/v3/3.3/$pkgname-$pkgver.tar.bz2"
         'squid.pam'
         'squid.cron'
         'squid.service')
-md5sums=('0ef8e63a980389c62130fa639079fb54'
+md5sums=('c7991aa8528034af0e21a69edf26e41b'
          '270977cdd9b47ef44c0c427ab9034777'
          'b499c2b725aefd7bd60bec2f1a9de392'
          '20e00e1aa1198786795f3da32db3c1d8')
diff --git a/community/supertux/PKGBUILD b/community/supertux/PKGBUILD
index 3a9c88b88..e3608b109 100644
--- a/community/supertux/PKGBUILD
+++ b/community/supertux/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 78943 2012-10-27 23:45:45Z ebelanger $
+# $Id: PKGBUILD 91300 2013-05-20 22:16:28Z foutrelis $
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 # Contributor: Eric Bélanger <eric@archlinux.org>
 # Contributor: vande198
@@ -6,24 +6,32 @@
 
 pkgname=supertux
 pkgver=0.3.3
-pkgrel=7
+pkgrel=8
 pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games"
 arch=('i686' 'x86_64')
 url="http://super-tux.sourceforge.net/"
 license=('GPL')
 depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'glew')
-makedepends=('cmake' 'boost' 'mesa')
-source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2 
+makedepends=('cmake' 'boost' 'mesa' 'optipng')
+source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2
         supertux2-0.3.3-squirrel-gcc47.patch)
 md5sums=('f3f803e629ee51a9de0b366a036e393d'
          'eb06315514be4f200428f14b927beb66')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   patch -p1 -i "${srcdir}/supertux2-0.3.3-squirrel-gcc47.patch"
   sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp
   sed -i '/types\.h/d' src/addon/addon_manager.cpp
+
+  # Fix invalid PNG image to work with libpng 1.6
+  optipng -quiet -force -fix data/images/creatures/flame_fish/left-0.png
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
   cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin .
   make
 }
diff --git a/community/torsocks/PKGBUILD b/community/torsocks/PKGBUILD
index 6e6d3484f..352a1dce2 100644
--- a/community/torsocks/PKGBUILD
+++ b/community/torsocks/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=torsocks
 pkgver=1.3
-pkgrel=3
+pkgrel=4
 pkgdesc='Wrapper to safely torify applications'
 arch=('i686' 'x86_64')
 url='http://code.google.com/p/torsocks'
@@ -13,36 +13,18 @@ depends=('tor')
 makedepends=('git')
 options=(!libtool)
 backup=("etc/${pkgname}.conf")
-
-__gitroot=https://git.torproject.org/torsocks
-__gitname=torsocks
+source=("git://git.torproject.org/torsocks.git#tag=1.3")
+md5sums=(SKIP)
 
 build() {
-  cd "$srcdir"
-  msg "Connecting to GIT server...."
-
-  if [[ -d "$__gitname" ]]; then
-    cd "$__gitname" && git pull origin
-    msg "The local files are updated."
-  else
-    git clone "$__gitroot" "$__gitname"
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting build..."
-
-  rm -rf "$srcdir/$__gitname-build"
-  git clone "$srcdir/$__gitname" "$srcdir/$__gitname-build"
-  cd "$srcdir/$__gitname-build"
-
-  git checkout $pkgver
-
+  cd $pkgname
   ./autogen.sh
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
 
 package() {
-  cd "$srcdir/$__gitname-build"
+  cd $pkgname
   make DESTDIR="$pkgdir/" install
+  find "$pkgdir/usr/share" -maxdepth 1 -type f -delete
 }
diff --git a/core/cronie/PKGBUILD b/core/cronie/PKGBUILD
index ab03530b2..e45d47fa8 100644
--- a/core/cronie/PKGBUILD
+++ b/core/cronie/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname='cronie'
 pkgver=1.4.9
-pkgrel=2
+pkgrel=4
 pkgdesc='Daemon that runs specified programs at scheduled times and related tools'
 url='https://fedorahosted.org/cronie/'
 license=('custom:BSD')
@@ -16,13 +16,11 @@ optdepends=('pm-utils: defer anacron on battery power'
 source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'cron.deny'
 	'service'
-        'pam.d'
-        'rc.d')
+        'pam.d')
 sha1sums=('40405cb30b62bd60323e4daf5198f26f0e65c4c4'
           '0f279b8fb820340267d578dc85511c980715f91e'
-          'fa91ebee59df127ff3983b8d6fb9e1cc5fca53d0'
-          '5eff7fb31f6bc0a924243ff046704726cf20c221'
-          'c08c040ed5cb12bc4fd15639a5242d31ec247ef5')
+          'de455f11a310e64d6930390e57726ed70f3295d0'
+          '5eff7fb31f6bc0a924243ff046704726cf20c221')
 
 backup=('etc/anacrontab'
         'etc/conf.d/crond'
@@ -33,6 +31,11 @@ conflicts=('cron')
 provides=('cron')
 groups=('base')
 
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	sed 's:usr/sbin:usr/bin:g' -i contrib/0anacron
+}
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
@@ -40,6 +43,7 @@ build() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
+		--sbindir=/usr/bin \
 		--enable-anacron \
 		--with-inotify \
 		--with-pam \
@@ -56,7 +60,6 @@ package() {
 	install -d "${pkgdir}"/var/spool/{ana,}cron
 	install -d "${pkgdir}"/etc/cron.{d,hourly,daily,weekly,monthly}
 
-	install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/crond
 	install -Dm644 ../pam.d "${pkgdir}"/etc/pam.d/crond
 	install -Dm644 ../cron.deny "${pkgdir}"/etc/cron.deny
 	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/cronie.service
diff --git a/core/cronie/rc.d b/core/cronie/rc.d
deleted file mode 100755
index d0659685c..000000000
--- a/core/cronie/rc.d
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-name=crond
-. /etc/conf.d/crond
-PID=$(pidof -o %PPID /usr/sbin/crond)
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	[[ -z "$PID" ]] && /usr/sbin/crond $CRONDARGS &>/dev/null \
-	&& { add_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	[[ -n "$PID" ]] && kill $PID &>/dev/null \
-	&& { rm_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-reload)
-	stat_busy "Reloading $name daemon"
-	[[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \
-	&& { stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-*)
-	echo "usage: $0 {start|stop|restart|reload}"
-	;;
-esac
-exit 0
diff --git a/core/cronie/service b/core/cronie/service
index 4fa4d4593..cc671f7b6 100644
--- a/core/cronie/service
+++ b/core/cronie/service
@@ -2,7 +2,7 @@
 Description=Periodic Command Scheduler
 
 [Service]
-ExecStart=/usr/sbin/crond -n
+ExecStart=/usr/bin/crond -n
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 Restart=always
diff --git a/core/fakeroot/PKGBUILD b/core/fakeroot/PKGBUILD
index 292e30dcf..0ed7113df 100644
--- a/core/fakeroot/PKGBUILD
+++ b/core/fakeroot/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 160939 2012-06-07 07:26:49Z allan $
+# $Id: PKGBUILD 186069 2013-05-20 23:10:56Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Jochem Kossen <j.kossen@home.nl>
 
 pkgname=fakeroot
-pkgver=1.18.4
+pkgver=1.19
 pkgrel=1
 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ install=fakeroot.install
 depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh')
 options=('!libtool')
 source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2)
-md5sums=('706171d8d520b1ca1576ac73f2ceb4f3')
+md5sums=('3a00a1264cb31a815552050ef0c2468b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/hdparm/PKGBUILD b/core/hdparm/PKGBUILD
index 394af6391..095ba8c8c 100644
--- a/core/hdparm/PKGBUILD
+++ b/core/hdparm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 172450 2012-12-02 17:54:26Z tpowa $
+# $Id: PKGBUILD 186146 2013-05-21 09:12:32Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgname=hdparm
 pkgver=9.43
-pkgrel=1
+pkgrel=2
 pkgdesc="A shell utility for manipulating Linux IDE drive/driver parameters"
 arch=(i686 x86_64)
 depends=('glibc')
@@ -17,25 +17,27 @@ options=('emptydirs')
 md5sums=('f73233be118d86c779a8463d8b6a3cdb'
          '74e368f384166a7710b447573cda120a')
 
-build() {
+prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
   # Fix Range input/output error when wiping Intel G2 and OCZ drives
   patch -Np1 -i $srcdir/wiper.sh.2_6.max-ranges.patch
-  
-  # build
+}
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make
 }
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   # install
-  mkdir -p ${pkgdir}/{usr,sbin}
-  make DESTDIR=${pkgdir} install
-  install -m755 contrib/idectl ${pkgdir}/sbin
-  install -m755 contrib/ultrabayd ${pkgdir}/sbin
+  mkdir -p ${pkgdir}/usr/bin
+  make DESTDIR=${pkgdir} sbindir=/usr/bin install
+  install -m755 contrib/idectl ${pkgdir}/usr/bin
+  install -m755 contrib/ultrabayd ${pkgdir}/usr/bin
 
   install -D -m 0644 $srcdir/$pkgname-$pkgver/wiper/README.txt $pkgdir/usr/share/doc/wiper/README.txt
-  install -D -m 0755 $srcdir/$pkgname-$pkgver/wiper/wiper.sh $pkgdir/usr/sbin/wiper.sh
+  install -D -m 0755 $srcdir/$pkgname-$pkgver/wiper/wiper.sh $pkgdir/usr/bin/wiper.sh
 
   #install license file
   install -D -m 644 LICENSE.TXT $pkgdir/usr/share/licenses/hdparm/LICENSE.TXT
diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD
index 08405c999..6d3cd4c24 100644
--- a/core/mdadm/PKGBUILD
+++ b/core/mdadm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 177952 2013-02-12 12:13:48Z thomas $
+# $Id: PKGBUILD 186140 2013-05-21 09:11:15Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 pkgname=mdadm
 pkgver=3.2.6
-pkgrel=3
+pkgrel=4
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
@@ -13,7 +13,6 @@ conflicts=('mkinitcpio<0.7')
 depends=('glibc')
 backup=('etc/mdadm.conf')
 source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
-        mdadm 
         mdadm.conf 
         mdadm_install
         mdadm_hook
@@ -22,12 +21,24 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
         disable-werror.patch
         mdadm-fix-udev-rules.patch)
 replaces=('raidtools')
+md5sums=('3e255dc71e5144bbcb872788ca647267'
+         '5a37c112aa07dccdde62f9fa5b888607'
+         'af2f73f0094ebee66f503ca4710c7142'
+         'fbfb7d07efcbaf5dc61af424c5f6e352'
+         'b6b0bfd6487c99264578630616dfe5eb'
+         'eb1786b18fa4d13cfd7b71d6b05cfb4f'
+         '4ad87b74a4bc9a34621280abe0e0c3e4'
+         '6c76f2f261c1c3397c7290633f0a9acc')
 
-build() {
+prepare() {
   cd $srcdir/$pkgname-$pkgver
   patch -Np0 -i ../disable-werror.patch
   patch -p1 -i ../mdadm-fix-udev-rules.patch
-  make CXFLAGS="$CFLAGS"
+}
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  make CXFLAGS="$CFLAGS" BINDIR=/usr/bin
   # build static mdassemble for Arch's initramfs
   make MDASSEMBLE_AUTO=1 mdassemble
   
@@ -35,22 +46,12 @@ build() {
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  make INSTALL=/usr/bin/install DESTDIR=$pkgdir install
-  install -D -m755 mdassemble $pkgdir/sbin/mdassemble
+  make INSTALL=/usr/bin/install BINDIR=/usr/bin DESTDIR=$pkgdir install
+  install -D -m755 mdassemble $pkgdir/usr/bin/mdassemble
   install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf
-  install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm
   install -D -m644 ../mdadm_install $pkgdir/usr/lib/initcpio/install/mdadm
   install -D -m644 ../mdadm_hook $pkgdir/usr/lib/initcpio/hooks/mdadm
   install -D -m644 ../mdadm_udev_install $pkgdir/usr/lib/initcpio/install/mdadm_udev
   # systemd service file
   install -D -m644 $srcdir/mdadm.service $pkgdir/usr/lib/systemd/system/mdadm.service
 }
-md5sums=('3e255dc71e5144bbcb872788ca647267'
-         '8333d405f550317c2bacd5510bf1cb60'
-         '00cbed931db4f15b6ce49e3e7d433966'
-         '815245a3af16a73ec1c5e5989fb892e9'
-         'fbb5542d9bdf87441a11dd7e7a0a17f8'
-         '0e35422d0cc007c3654a5e2591a9f9b5'
-         'aafb5f9ac8437a284cbf948b9b13b179'
-         '4ad87b74a4bc9a34621280abe0e0c3e4'
-         '0bf45d6dcb3ea14facddbb10b3303806')
diff --git a/core/mdadm/mdadm b/core/mdadm/mdadm
deleted file mode 100755
index 9bf468e98..000000000
--- a/core/mdadm/mdadm
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-pidfile=/run/mdadm.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 mdadm RAID Monitor"
-    if [[ -z $PID ]] && mdadm --monitor --scan -i "$pidfile" -f; then
-      add_daemon mdadm
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping mdadm RAID Monitor"
-    if [[ $PID ]] && kill "$PID" &>/dev/null; then
-      rm_daemon mdadm
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/core/mdadm/mdadm-fix-udev-rules.patch b/core/mdadm/mdadm-fix-udev-rules.patch
index 60f5ae131..941cadf3a 100644
--- a/core/mdadm/mdadm-fix-udev-rules.patch
+++ b/core/mdadm/mdadm-fix-udev-rules.patch
@@ -39,7 +39,7 @@ index 0000000..883ee4d
 +ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0", GOTO="md_end"
 +LABEL="md_ignore_state"
 +
-+IMPORT{program}="/sbin/mdadm --detail --export $devnode"
++IMPORT{program}="/usr/bin/mdadm --detail --export $devnode"
 +ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace"
 +ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}"
 +ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}"
@@ -75,9 +75,9 @@ index 0000000..b89775e
 +
 +# remember you can limit what gets auto/incrementally assembled by
 +# mdadm.conf(5)'s 'AUTO' and selectively whitelist using 'ARRAY'
-+ACTION=="add", RUN+="/sbin/mdadm --incremental $devnode --offroot"
-+ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/sbin/mdadm -If $name --path $env{ID_PATH}"
-+ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/sbin/mdadm -If $name"
++ACTION=="add", RUN+="/usr/bin/mdadm --incremental $devnode --offroot"
++ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/usr/bin/mdadm -If $name --path $env{ID_PATH}"
++ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/usr/bin/mdadm -If $name"
 +
 +LABEL="md_inc_end"
 diff --git a/udev-md-raid.rules b/udev-md-raid.rules
diff --git a/core/mdadm/mdadm.conf b/core/mdadm/mdadm.conf
index 57bd4c683..36eaa0cc0 100644
--- a/core/mdadm/mdadm.conf
+++ b/core/mdadm/mdadm.conf
@@ -59,8 +59,8 @@ DEVICE partitions
 
 
 # When used in --follow (aka --monitor) mode, mdadm needs a
-# mail address and/or a program.  To start mdadm's monitor mode, add
-# "mdadm" to your DAEMONS array in /etc/rc.conf
+# mail address and/or a program.  To start mdadm's monitor mode, enable
+# mdadm.service in systemd.
 #
 # If the lines are not found, mdadm will exit quietly
 #MAILADDR root@mydomain.tld
diff --git a/core/mdadm/mdadm.service b/core/mdadm/mdadm.service
index 8389715e8..b3ca5f7a7 100644
--- a/core/mdadm/mdadm.service
+++ b/core/mdadm/mdadm.service
@@ -2,7 +2,7 @@
 Description=MDADM Event Monitor
 
 [Service]
-ExecStart=/sbin/mdadm --monitor --scan
+ExecStart=/usr/bin/mdadm --monitor --scan
 
 [Install]
 WantedBy=multi-user.target
diff --git a/core/mdadm/mdadm_hook b/core/mdadm/mdadm_hook
index 787be5d0c..5371baaca 100755
--- a/core/mdadm/mdadm_hook
+++ b/core/mdadm/mdadm_hook
@@ -43,7 +43,7 @@ run_hook() {
     fi
 
     # assemble everything
-    [ -s "$mdconfig" ] && /sbin/mdassemble
+    [ -s "$mdconfig" ] && /usr/bin/mdassemble
 }
 
 # vim: set ft=sh ts=4 sw=4 et:
diff --git a/core/mdadm/mdadm_install b/core/mdadm/mdadm_install
index 36b37fd0b..7390509fa 100644
--- a/core/mdadm/mdadm_install
+++ b/core/mdadm/mdadm_install
@@ -8,7 +8,7 @@ build() {
         echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays."
         add_file "/etc/mdadm.conf"
     fi
-    add_binary "/sbin/mdassemble"
+    add_binary "/usr/bin/mdassemble"
     add_file "/usr/lib/udev/rules.d/63-md-raid-arrays.rules"
 
     add_runscript
diff --git a/core/mdadm/mdadm_udev_install b/core/mdadm/mdadm_udev_install
index 5635b8f63..c01cbaf24 100644
--- a/core/mdadm/mdadm_udev_install
+++ b/core/mdadm/mdadm_udev_install
@@ -9,7 +9,7 @@ build() {
         add_file "/etc/mdadm.conf"
     fi
 
-    add_binary "mdadm"
+    add_binary "/usr/bin/mdadm"
     add_file "/usr/lib/udev/rules.d/63-md-raid-arrays.rules"
     add_file "/usr/lib/udev/rules.d/64-md-raid-assembly.rules"
 }
@@ -17,7 +17,7 @@ build() {
 help() {
   cat <<HELPEOF
 This hook loads the necessary modules for a RAID array and uses incremental
-assembly via udev at runtime to create the devices. This hook with NOT work
+assembly via udev at runtime to create the devices. This hook will NOT work
 without the udev hook included on the image.
 HELPEOF
 }
diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD
index 9093fa594..756f55a6e 100644
--- a/core/pam/PKGBUILD
+++ b/core/pam/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185040 2013-05-10 16:21:45Z tomegun $
+# $Id: PKGBUILD 186139 2013-05-21 09:11:14Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=pam
 pkgver=1.1.6
-pkgrel=3
+pkgrel=4
 pkgdesc="PAM (Pluggable Authentication Modules) library"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -25,13 +25,13 @@ md5sums=('7b73e58b7ce79ffa321d408de06db2c4'
 
 build() {
   cd $srcdir/Linux-PAM-$pkgver
-  ./configure --libdir=/usr/lib
+  ./configure --libdir=/usr/lib --sbindir=/usr/bin
   patch -Np0 -i ../pam_namespace-build-1.1.6.patch
   make
 
   cd $srcdir/pam_unix2-2.9.1
   patch -Np1 -i ../pam_unix2-glibc216.patch
-  ./configure --libdir=/usr/lib
+  ./configure --libdir=/usr/lib --sbindir=/usr/bin
   make
 }
 
@@ -62,5 +62,5 @@ _EOT
   ln -s pam_unix.so pam_unix_session.so
 
   # set unix_chkpwd uid
-  chmod +s $pkgdir/sbin/unix_chkpwd
+  chmod +s $pkgdir/usr/bin/unix_chkpwd
 }
diff --git a/core/pciutils/PKGBUILD b/core/pciutils/PKGBUILD
index 3ff913b2e..f31d69699 100644
--- a/core/pciutils/PKGBUILD
+++ b/core/pciutils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 184187 2013-05-03 10:22:45Z tpowa $
+# $Id: PKGBUILD 186143 2013-05-21 09:11:35Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=pciutils
 pkgver=3.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="PCI bus configuration space access library and tools"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -15,15 +15,15 @@ md5sums=('3fccb0b28879adb57d8156115f8003c8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man lib/libpci.a 
+  make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man SBINDIR=/usr/bin lib/libpci.a 
   cp lib/libpci.a "${srcdir}/"
   make clean
-  make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
+  make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib
+  make SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib
   install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/"
   # this is now supplied by the hwids package
   rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8,hwdata}}
diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD
index 73cb62ff0..18a040887 100644
--- a/extra/anjuta/PKGBUILD
+++ b/extra/anjuta/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185456 2013-05-14 10:24:22Z heftig $
+# $Id: PKGBUILD 186137 2013-05-21 08:51:28Z heftig $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Harley Laue <losinggeneration@yahoo.com>
 
 pkgbase=anjuta
 pkgname=('libanjuta' 'anjuta')
-pkgver=3.8.2
+pkgver=3.8.3
 pkgrel=1
 pkgdesc="GNOME Integrated Development Environment (IDE)"
 arch=(i686 x86_64)
@@ -14,19 +14,12 @@ makedepends=(gdl vte3 autogen devhelp glade libgda subversion gnome-icon-theme v
              python)
 url="http://www.anjuta.org/"
 options=('!libtool' '!emptydirs')
-source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
-        fix-compile-error.patch)
-sha256sums=('096203a294e0a7d8d7048fa74810495d590d32f96b7a7f014f34e532faa1c76e'
-            'd072af4c1c52ce65f84026b83baa642a9bcfa06b10913b356b5cd99d98931b1d')
+source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
+sha256sums=('06afea1de911067419b774eda2548a729668f93c5463726b353f5db686493f95')
 
 build() {
   cd "$pkgbase-$pkgver"
 
-  patch -Np1 -i ../fix-compile-error.patch
-
-  # Bump vala version
-  sed -i '/vala/s/-0\.18/-0.20/' configure.ac
-
   ./autogen.sh --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --enable-glade-catalog --enable-compile-warnings=minimum
   make
diff --git a/extra/anjuta/fix-compile-error.patch b/extra/anjuta/fix-compile-error.patch
deleted file mode 100644
index bc8fa7c41..000000000
--- a/extra/anjuta/fix-compile-error.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u -r anjuta-3.8.0/libanjuta/anjuta-token.c anjuta-3.8.0-fix/libanjuta/anjuta-token.c
---- anjuta-3.8.0/libanjuta/anjuta-token.c	2013-01-14 22:45:09.000000000 +0100
-+++ anjuta-3.8.0-fix/libanjuta/anjuta-token.c	2013-03-31 13:56:11.722332230 +0200
-@@ -329,7 +329,7 @@
- 	if (string == NULL)
- 	{
- 		/* Value doesn't contain a newline */
--		fprintf (stderr, "(%lu)", length);
-+		fprintf (stderr, "(%lu)", (long unsigned)length);
- 	}
- 	else
- 	{
-diff -u -r anjuta-3.8.0/plugins/dir-project/dir-project.c anjuta-3.8.0-fix/plugins/dir-project/dir-project.c
---- anjuta-3.8.0/plugins/dir-project/dir-project.c	2012-11-19 00:34:57.000000000 +0100
-+++ anjuta-3.8.0-fix/plugins/dir-project/dir-project.c	2013-03-31 13:55:35.922610895 +0200
-@@ -268,7 +268,7 @@
- 			{
- 				ptr++;
- 			} while  (*ptr == '?');
--			g_string_append_printf (regex, "(.{%d})", ptr - next);
-+			g_string_append_printf (regex, "(.{%ld})", (long)(ptr - next));
- 		}
- 		else if (*ptr == '\\')
- 		{
diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD
index 1caedc0b9..7210764cd 100644
--- a/extra/hylafax/PKGBUILD
+++ b/extra/hylafax/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 185691 2013-05-17 10:55:17Z tpowa $
+# $Id: PKGBUILD 186073 2013-05-21 07:34:09Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 pkgname=hylafax
 pkgver=6.0.6
-pkgrel=3
+pkgrel=4
 pkgdesc="Fax Server"
 arch=('i686' 'x86_64')
 install='hylafax.install'
@@ -45,8 +45,8 @@ package () {
   install -D -m644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT
 }
 md5sums=('d063d45049c8fcbabefe09d662313067'
-         '52beffe7dc296b4f9ce9fd0387f7804e'
+         'b0b8d19a10c2145476d9fbb18c0478fe'
          '5f3a89fbfb10c47755d3ca19183b8a59'
-         '832c8e8098e2dfa56040c975b554590c'
+         'a10aa2ef613551a88d750f6602b5f2f7'
          '38a00db6d9d765d130b2d8d3a98e5c24'
          'fe10ea597e786fe8c09e4104fbdf16de')
diff --git a/extra/hylafax/faxq.service b/extra/hylafax/faxq.service
index 0760a5b85..7ab8de318 100644
--- a/extra/hylafax/faxq.service
+++ b/extra/hylafax/faxq.service
@@ -3,7 +3,7 @@ Description=Hyla FAX queue manager
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/faxq
+ExecStart=/usr/bin/faxq
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/extra/hylafax/hylafax.cron.daily b/extra/hylafax/hylafax.cron.daily
index 2d1a77e5c..567dd8ed3 100644
--- a/extra/hylafax/hylafax.cron.daily
+++ b/extra/hylafax/hylafax.cron.daily
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-/usr/sbin/faxqclean
-/usr/sbin/faxcron -rcv 30
+/usr/bin/faxqclean
+/usr/bin/faxcron -rcv 30
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index 29534340d..733c62366 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -15,7 +15,7 @@ pkgver=4.0.5
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
 _realver=4.0.5
-pkgrel=3
+pkgrel=4
 arch=(i686 x86_64)
 url="http://www.samba.org"
 license=('GPL3')
@@ -67,6 +67,7 @@ _samba4_auth_modules=auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,a
  cd ${srcdir}/samba-${_realver}
   ./configure --enable-fhs \
               --prefix=/usr \
+              --sbindir=/usr/bin \
               --libdir=/usr/lib \
               --localstatedir=/var \
               --with-configdir=/etc/samba \
@@ -196,12 +197,12 @@ install=samba.install
 
     find ${pkgdir}/usr/lib/python${_pyver}/site-packages/ -name '*.py' | \
          xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|"
-    find ${pkgdir}/usr/bin ${pkgdir}/usr/sbin -type f -executable | \
+    find ${pkgdir}/usr/bin ${pkgdir}/usr/bin -type f -executable | \
          xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|"
 
     # Make admin scripts look in the right place for the samba python module
-    for script in sbin/samba_dnsupdate sbin/samba_kcc sbin/samba_spnupdate \
-                  sbin/samba_upgradedns bin/samba-tool
+    for script in bin/samba_dnsupdate bin/samba_kcc bin/samba_spnupdate \
+                  bin/samba_upgradedns bin/samba-tool
     do
         sed -i "/^sys\.path\.insert/ a\
 sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \
@@ -244,18 +245,17 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \
   # copy ldap example
   install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
 }
-
 md5sums=('58ec2fec08872b72f8fd526f2da20a9e'
          '5697da77590ec092cc8a883bae06093c'
-         'a4bbfa39fee95bba2e7ad6b535fae7e6'
+         'ee8507839745cf17d2fb5401be7da6a8'
          '96f82c38f3f540b53f3e5144900acf17'
-         '5602ba59bc60502c99e6d5a5ae16aecf'
+         'ee4763a656cf00d92bfda31b6bb2c5cb'
          '6c447748a064d631435dbef0a3dcf32f'
-         'd0b18dd7f5fafc8d25cb3a7c37c6d920'
+         'c0c561c47de24d33dd48aae79823810b'
          'a78b9aa93eb14b0ac445897395693225'
-         '90845b89f2321cb19c0b13f385f1782a'
-         '70186fa43510bf99e3afd5951e814fbf'
+         'e8ebc966b5684a557284dd435daaab7f'
+         '70afd2db60a2e8eff7615dbdecd887ac'
          '6db11f3dd2112a4b7a73007b189bef3f'
-         'b0de262f9c62acd162e873658f33d063'
-         '64a52bc798033aeabfae3410bd559aa4'
+         'fd6be0cf1e5b3f0c3599fdb95455d19f'
+         '081c20b9d994d69ce5c37dcf96f10572'
          '49abd7b719e3713a3f75a8a50958e381')
diff --git a/extra/samba/nmbd.service b/extra/samba/nmbd.service
index 4f86c4db9..34c66d5d6 100644
--- a/extra/samba/nmbd.service
+++ b/extra/samba/nmbd.service
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 Type=forking
 PIDFile=/var/run/nmbd.pid
-ExecStart=/usr/sbin/nmbd -D 
+ExecStart=/usr/bin/nmbd -D 
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/extra/samba/samba b/extra/samba/samba
deleted file mode 100755
index 6098ee0cb..000000000
--- a/extra/samba/samba
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[ -f /etc/conf.d/samba ] && . /etc/conf.d/samba
-
-[ -z "$SAMBA_DAEMONS" ] && SAMBA_DAEMONS=(smbd nmbd)
-
-case "$1" in
-	start)
-		rc=0
-		stat_busy "Starting Samba Server"
-                if [ ! -x /var/log/samba ] ; then
-                        install -m755 -d /var/log/samba
-                fi
-		for d in ${SAMBA_DAEMONS[@]}; do
-			PID=`pidof -o %PPID /usr/sbin/$d`
-			[ -z "$PID" ] && /usr/sbin/$d -D
-			rc=$(($rc+$?))
-		done
-		if [ $rc -gt 0 ]; then
-			stat_fail
-		else
-			add_daemon samba
-			stat_done
-		fi
-	;;
-	stop)
-		rc=0
-		stat_busy "Stopping Samba Server"
-		for d in ${SAMBA_DAEMONS[@]}; do
-			PID=`pidof -o %PPID /usr/sbin/$d`
-			[ -z "$PID" ] || kill $PID &> /dev/null
-			rc=$(($rc+$?))
-		done
-		if [ $rc -gt 0 ]; then
-			stat_fail
-		else
-			rm /run/samba/smbd.pid &>/dev/null
-			rm /run/samba/nmbd.pid &>/dev/null
-			rm /run/samba/winbindd.pid &>/dev/null
-			rm_daemon samba
-			stat_done
-		fi
-	;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-	;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/samba/samba.service b/extra/samba/samba.service
index e423a7d2d..562d42562 100644
--- a/extra/samba/samba.service
+++ b/extra/samba/samba.service
@@ -7,7 +7,7 @@ Type=forking
 PIDFile=/var/run/samba.pid
 LimitNOFILE=16384
 EnvironmentFile=-/etc/conf.d/samba
-ExecStart=/usr/sbin/samba $SAMBAOPTIONS
+ExecStart=/usr/bin/samba $SAMBAOPTIONS
 ExecReload=/usr/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/extra/samba/smbd.service b/extra/samba/smbd.service
index 12c08474a..de34c2a5f 100644
--- a/extra/samba/smbd.service
+++ b/extra/samba/smbd.service
@@ -5,7 +5,7 @@ After=network.target nmbd.service winbindd.service
 [Service]
 Type=forking
 PIDFile=/var/run/smbd.pid
-ExecStart=/usr/sbin/smbd -D 
+ExecStart=/usr/bin/smbd -D 
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/extra/samba/smbd@.service b/extra/samba/smbd@.service
index e1f71be3f..071eb5788 100644
--- a/extra/samba/smbd@.service
+++ b/extra/samba/smbd@.service
@@ -2,6 +2,6 @@
 Description=Samba SMB/CIFS server instance
 
 [Service]
-ExecStart=/usr/sbin/smbd -F
+ExecStart=/usr/bin/smbd -F
 ExecReload=/bin/kill -HUP $MAINPID
 StandardInput=socket
diff --git a/extra/samba/swat.xinetd b/extra/samba/swat.xinetd
index 2e62a82b2..b083ad860 100644
--- a/extra/samba/swat.xinetd
+++ b/extra/samba/swat.xinetd
@@ -3,7 +3,7 @@ service swat
         socket_type             = stream
         wait                    = no
         user                    = root
-        server                  = /usr/sbin/swat
+        server                  = /usr/bin/swat
         log_on_success  += HOST DURATION
         log_on_failure  += HOST
         disable                 = yes
diff --git a/extra/samba/swat@.service b/extra/samba/swat@.service
index a036b2c03..ebbc31c47 100644
--- a/extra/samba/swat@.service
+++ b/extra/samba/swat@.service
@@ -3,5 +3,5 @@ Description=SWAT Samba Web Admin Tool
 After=local-fs.target
 
 [Service]
-ExecStart=/usr/sbin/swat
+ExecStart=/usr/bin/swat
 StandardInput=socket
diff --git a/extra/samba/winbindd.service b/extra/samba/winbindd.service
index 02e3014b1..20bac9a83 100644
--- a/extra/samba/winbindd.service
+++ b/extra/samba/winbindd.service
@@ -5,7 +5,7 @@ After=network.target nmbd.service
 [Service]
 Type=forking
 PIDFile=/var/run/winbindd.pid
-ExecStart=/usr/sbin/winbindd -D 
+ExecStart=/usr/bin/winbindd -D 
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD
index 6ec245c68..df0b53381 100644
--- a/extra/telepathy-kde-accounts-kcm/PKGBUILD
+++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 183062 2013-04-17 06:09:00Z andrea $
+# $Id: PKGBUILD 186175 2013-05-21 22:00:58Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-accounts-kcm
 _pkgname=ktp-accounts-kcm
-pkgver=0.6.1
+pkgver=0.6.2
 pkgrel=1
 pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ groups=('kde-telepathy')
 conflicts=('telepathy-kde-accounts-kcm-plugins')
 replaces=('telepathy-kde-accounts-kcm-plugins')
 source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('a6ba149da9a52423a41fe99704e57344d384b1cc')
+sha1sums=('fc71170f6f7f417b9cd0f4da3cb54ff70e66406e')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD
index 294b9af44..2d219ed16 100644
--- a/extra/telepathy-kde-approver/PKGBUILD
+++ b/extra/telepathy-kde-approver/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 183131 2013-04-17 17:57:15Z eric $
+# $Id: PKGBUILD 186177 2013-05-21 22:01:10Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-approver
 _pkgname=ktp-approver
-pkgver=0.6.1
+pkgver=0.6.2
 pkgrel=1
 pkgdesc="KDE Channel Approver for Telepathy"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('1ccb773a14fa480e7e4c14611bc6d8a95e970e8e')
+sha1sums=('996fabdc858bb48be7b5c277f0a88c0fb357ee8c')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD
index b4bbdfc43..8ffa77001 100644
--- a/extra/telepathy-kde-auth-handler/PKGBUILD
+++ b/extra/telepathy-kde-auth-handler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183133 2013-04-17 18:23:20Z eric $
+# $Id: PKGBUILD 186179 2013-05-21 22:01:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-auth-handler
 _pkgname=ktp-auth-handler
-pkgver=0.6.1
+pkgver=0.6.2
 pkgrel=1
 pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals' 'qjson')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('c3cc980dced0a7d63b287c382cec05fb9ef0348a')
+sha1sums=('a27fb07682fb2ce7dde15a40688c12b3d8f2299d')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-common-internals/PKGBUILD b/extra/telepathy-kde-common-internals/PKGBUILD
index 381f9c610..6f11d8c1a 100644
--- a/extra/telepathy-kde-common-internals/PKGBUILD
+++ b/extra/telepathy-kde-common-internals/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183068 2013-04-17 06:14:39Z andrea $
+# $Id: PKGBUILD 186195 2013-05-21 22:02:56Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-common-internals
 _pkgname=ktp-common-internals
-pkgver=0.6.1
+pkgver=0.6.2
 pkgrel=1
 pkgdesc="Common components for KDE-Telepathy"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('kdelibs' 'telepathy-logger-qt' 'telepathy-mission-control')
 makedepends=('cmake' 'automoc4' 'boost' 'doxygen')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('47f99b56e2faa6ef7c760f2112a7b10445f9c709')
+sha1sums=('06fb5a5353f973e254c894be33de79b28089cbc5')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD
index d698242bd..4ac21e494 100644
--- a/extra/telepathy-kde-contact-list/PKGBUILD
+++ b/extra/telepathy-kde-contact-list/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 183065 2013-04-17 06:12:27Z andrea $
+# $Id: PKGBUILD 186182 2013-05-21 22:01:31Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-contact-list
 _pkgname=ktp-contact-list
-pkgver=0.6.1
+pkgver=0.6.2
 pkgrel=1
 pkgdesc="Telepathy contact list application"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4' 'boost')
 groups=('kde-telepathy')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('0fb7888effd4e9a8f584dfbdcce31e088fbe71de')
+sha1sums=('fe971a74ab966faea0680b6231c545754b9e00cf')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-contact-runner/PKGBUILD b/extra/telepathy-kde-contact-runner/PKGBUILD
index 2adaa1652..26f91b71f 100644
--- a/extra/telepathy-kde-contact-runner/PKGBUILD
+++ b/extra/telepathy-kde-contact-runner/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183135 2013-04-17 18:25:34Z eric $
+# $Id: PKGBUILD 186184 2013-05-21 22:01:43Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-contact-runner
 _pkgname=ktp-contact-runner
-pkgver=0.6.1
+pkgver=0.6.2
 pkgrel=1
 pkgdesc="KRunner plugin for KDE Telepathy"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('1acb3f1371008040abf3a75d39a61fbe9f580821')
+sha1sums=('98c21256a81b18955628b3c645e36391c1ffca4a')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-desktop-applets/PKGBUILD b/extra/telepathy-kde-desktop-applets/PKGBUILD
index cd38cc095..d41e628bb 100644
--- a/extra/telepathy-kde-desktop-applets/PKGBUILD
+++ b/extra/telepathy-kde-desktop-applets/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183137 2013-04-17 18:33:27Z eric $
+# $Id: PKGBUILD 186186 2013-05-21 22:01:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-desktop-applets
 _pkgname=ktp-desktop-applets
-pkgver=0.6.1
+pkgver=0.6.2
 pkgrel=1
 pkgdesc="The KDE-Telepathy Plasma desktop applets"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ groups=('kde-telepathy')
 conflicts=('telepathy-kde-contact-applet' 'telepathy-kde-presence-applet')
 replaces=('telepathy-kde-contact-applet' 'telepathy-kde-presence-applet')
 source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('78cf1e37fbaf2af2b3c14df81dde7417a5bd7c07')
+sha1sums=('b0273d52657a31ba56168a4e4db2f56f6c81e2fd')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
index 62eb1109f..7e80d9e95 100644
--- a/extra/telepathy-kde-filetransfer-handler/PKGBUILD
+++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183140 2013-04-17 18:34:04Z eric $
+# $Id: PKGBUILD 186188 2013-05-21 22:02:08Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-filetransfer-handler
 _pkgname=ktp-filetransfer-handler
-pkgver=0.6.1
+pkgver=0.6.2
 pkgrel=1
 pkgdesc="Telepathy file transfer handler"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('66e365cf5ec60233d04869570cc89ad70eacb214')
+sha1sums=('79bb46d90a3a981cadb2cc2f84832ef91e11deeb')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-integration-module/PKGBUILD b/extra/telepathy-kde-integration-module/PKGBUILD
index 397e4b620..a39601fe7 100644
--- a/extra/telepathy-kde-integration-module/PKGBUILD
+++ b/extra/telepathy-kde-integration-module/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183141 2013-04-17 18:34:18Z eric $
+# $Id: PKGBUILD 186190 2013-05-21 22:02:18Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-integration-module
 _pkgname=ktp-kded-integration-module
-pkgver=0.6.1
+pkgver=0.6.2
 pkgrel=1
 pkgdesc="Sits in KDED and takes care of various bits of system integration like setting user to auto-away or handling connection errors"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('c5121ed5ba4f7ea0e7885b0aa7a42008c3ec6930')
+sha1sums=('1aa1b8597acff39f0549ed9f716d733de4d77b63')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD
index 99a821e8d..220cd0417 100644
--- a/extra/telepathy-kde-send-file/PKGBUILD
+++ b/extra/telepathy-kde-send-file/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183143 2013-04-17 18:35:12Z eric $
+# $Id: PKGBUILD 186192 2013-05-21 22:02:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-send-file
 _pkgname=ktp-send-file
-pkgver=0.6.1
+pkgver=0.6.2
 pkgrel=1
 pkgdesc="A File manager plugin to launch a file transfer job with a specified contact"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('48ece90d7f2614aa133b8304d4891e0151d26f00')
+sha1sums=('51734ea448b6a3338a28fc9e9fc7d371453ed9a6')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD
index 74cddc43f..65b5ecf6f 100644
--- a/extra/telepathy-kde-text-ui/PKGBUILD
+++ b/extra/telepathy-kde-text-ui/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 183145 2013-04-17 18:35:36Z eric $
+# $Id: PKGBUILD 186194 2013-05-21 22:02:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-text-ui
 _pkgname=ktp-text-ui
-pkgver=0.6.1
+pkgver=0.6.2.1
 pkgrel=1
 pkgdesc="Telepathy handler for Text Chats"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('telepathy-kde-contact-list' 'telepathy-logger-qt')
 makedepends=('cmake' 'automoc4' 'boost')
 groups=('kde-telepathy')
 source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('6dd32df14da326bcaeed8b68a25634b2731f0b6b')
+sha1sums=('71951b929ad3caa6a0f46e338bd669c7e542ac15')
 
 build() {
   mkdir build
diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD
index d058ce54a..35ca53f0c 100644
--- a/extra/udisks/PKGBUILD
+++ b/extra/udisks/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185610 2013-05-15 22:57:00Z tomegun $
+# $Id: PKGBUILD 186141 2013-05-21 09:11:20Z tpowa $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 
 pkgname=udisks
 pkgver=1.0.4
-pkgrel=7
+pkgrel=8
 pkgdesc="Disk Management Service"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/udisks"
@@ -21,6 +21,9 @@ build() {
   patch -p1 < ../drop-pci-db.patch
 
   make
+  # fix mdadm location
+  sed -i -e 's#/sbin/mdadm#/usr/bin/mdadm#g' \
+            "${srcdir}/${pkgname}-${pkgver}"/data/80-udisks.rules
 }
 
 package() {
diff --git a/extra/udisks2/PKGBUILD b/extra/udisks2/PKGBUILD
index 93c024e79..9ae7f37fd 100644
--- a/extra/udisks2/PKGBUILD
+++ b/extra/udisks2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183464 2013-04-21 22:12:17Z heftig $
+# $Id: PKGBUILD 186142 2013-05-21 09:11:21Z tpowa $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=udisks2
 pkgver=2.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Disk Management Service, version 2"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/udisks"
@@ -22,6 +22,9 @@ build() {
       --with-systemdsystemunitdir=/usr/lib/systemd/system \
       --localstatedir=/var --disable-static
   make
+  # fix mdadm location
+  sed -i -e 's#/sbin/mdadm#/usr/bin/mdadm#g' \
+            "${srcdir}/udisks-${pkgver}"/data/80-udisks2.rules
 }
 
 package() {
diff --git a/extra/vde2/PKGBUILD b/extra/vde2/PKGBUILD
index c6f12a215..2b17d70c5 100644
--- a/extra/vde2/PKGBUILD
+++ b/extra/vde2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185995 2013-05-20 07:12:08Z tpowa $
+# $Id: PKGBUILD 186164 2013-05-21 13:35:09Z tpowa $
 # Contributor: Sergej Pupykin
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=vde2
 pkgver=2.3.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Virtual Distributed Ethernet for emulators like qemu"
 url="http://sourceforge.net/projects/vde/"
 license=("GPL" "LGPL" "CUSTOM")
@@ -41,3 +41,8 @@ md5sums=('46fbc5f97f03dc517aa3b2c9d9ea6628'
          'a920123fc620bcedbccb703a8d1bdc55'
          'cb8ace28e8efd4dad128be4be71b3b07'
          '63033c33565e2030541c5e05e9d9b063')
+md5sums=('46fbc5f97f03dc517aa3b2c9d9ea6628'
+         '7d9bc56d2e561d849e915000d1c0f269'
+         'a920123fc620bcedbccb703a8d1bdc55'
+         'f47d3372382dc9d67c1174d2796729fe'
+         '63033c33565e2030541c5e05e9d9b063')
diff --git a/extra/vde2/vde-config.sample b/extra/vde2/vde-config.sample
index c5a5b7d88..f7e0660a4 100644
--- a/extra/vde2/vde-config.sample
+++ b/extra/vde2/vde-config.sample
@@ -6,7 +6,7 @@ VDE_NUMPORTS="32"  # Number of ports (default 32)
 VDE_HUB="no"       # [yes|no] Make the switch act as a hub
 VDE_FSTP="no"      # [yes|no] Activate the fast spanning tree protocol
 VDE_MAC=""         # Set the Switch MAC address
-VDE_PRIOTIRY=""    # Set the priority for FST (MAC extension)
+VDE_PRIORITY=""    # Set the priority for FST (MAC extension)
 VDE_HASHSIZE=""    # Hash table size
 
 # Options from datasock module
@@ -32,4 +32,4 @@ SLIRP="no"         # [yes|no] enable/disable SLIRP daemon support
 SLIRP_DHCP="no"    # [yes|no] turn on the DHCP server for the network autoconfiguration of all the units connected to the VDE
 SLIRP_NETWORK="" # specify the network address (default 10.0.2.0)
 # other options to parse to slirpvde
-SLIRP_OPTIONS=""
\ No newline at end of file
+SLIRP_OPTIONS=""
diff --git a/extra/xfce4-dict/PKGBUILD b/extra/xfce4-dict/PKGBUILD
index 89cdd0d67..02518029a 100644
--- a/extra/xfce4-dict/PKGBUILD
+++ b/extra/xfce4-dict/PKGBUILD
@@ -1,41 +1,41 @@
-# $Id: PKGBUILD 157851 2012-04-30 04:20:17Z foutrelis $
+# $Id: PKGBUILD 186157 2013-05-21 10:21:01Z foutrelis $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-dict
-pkgver=0.6.0
-pkgrel=3
+pkgver=0.7.0
+pkgrel=1
 pkgdesc="A dictionary plugin for the Xfce panel"
 arch=('i686' 'x86_64')
-license=('GPL2')
 url="http://goodies.xfce.org/projects/applications/xfce4-dict"
+license=('GPL2')
 groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxfcegui4' 'hicolor-icon-theme' 'librsvg')
+depends=('xfce4-panel' 'librsvg' 'hicolor-icon-theme')
 makedepends=('intltool')
 provides=('xfce4-dict-plugin')
 conflicts=('xfce4-dict-plugin')
 replaces=('xfce4-dict-plugin')
 options=('!libtool')
-install=${pkgname}.install
-source=(http://archive.xfce.org/src/apps/xfce4-dict/0.6/xfce4-dict-${pkgver}.tar.bz2)
-md5sums=('c371c5c0bbe45a2bfac336cfe01dfe01')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/apps/$pkgname/0.7/$pkgname-$pkgver.tar.bz2)
+sha256sums=('407fc0f02adf6ea85dec6993db1e222b548afcdd63a9e35ed2d70a42c9738e58')
 
 build() {
-  cd ${srcdir}/xfce4-dict-${pkgver}
+  cd "$srcdir/$pkgname-$pkgver"
 
-  # Work around DSO linking issue
-  LDFLAGS+=' -Wl,--copy-dt-needed-entries'
-
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--disable-debug
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
   make
 }
 
 package() {
-  cd ${srcdir}/xfce4-dict-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfce4-dict/xfce4-dict.install b/extra/xfce4-dict/xfce4-dict.install
index 21b79d2d4..e4f8fd06c 100644
--- a/extra/xfce4-dict/xfce4-dict.install
+++ b/extra/xfce4-dict/xfce4-dict.install
@@ -3,9 +3,11 @@ post_install() {
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/corosync/PKGBUILD b/pcr/corosync/PKGBUILD
new file mode 100644
index 000000000..e7c019a66
--- /dev/null
+++ b/pcr/corosync/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer: Eric Renfro <erenfro@gmail.com>
+
+pkgname=corosync
+pkgver=2.1.0
+pkgrel=4
+pkgdesc="Cluster engine for nodal communication systems with additional features for implementing high availability within applications."
+arch=('i686' 'x86_64')
+url="http://www.corosync.org/"
+license=('BSD')
+makedepends=('nss' 'libstatgrab' 'net-snmp' 'libqb')
+depends=('nss' 'libstatgrab' 'net-snmp' 'libqb')
+provides=('corosync=2.1.0')
+conflicts=('corosync1')
+#source=(ftp://ftp:downloads@ftp.corosync.org/downloads/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz)
+source=("https://github.com/downloads/corosync/corosync/corosync-${pkgver}.tar.gz"
+	"corosync.init"
+	"corosync.service")
+md5sums=('dc5152e6dfdb4638ab544e587884483a'
+         'fdc3b648f020e165eaa7c3283ce5b9ac'
+         'abc267226faafc7dc8246634277705ea')
+ 
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr        \
+              --sysconfdir=/etc    \
+              --localstatedir=/var \
+              --enable-systemd     \
+              --enable-monitoring  \
+              --enable-snmp        \
+              --enable-dbus        \
+              --with-systemddir=/usr/lib/systemd/system
+  make || return 1
+  make DESTDIR="${pkgdir}" install || return 1
+  ## Updated and fixed up systemd service unit and associated start/stop script:
+  cp ${srcdir}/corosync.service ${pkgdir}/usr/lib/systemd/system/corosync.service || return 1
+  cp ${srcdir}/corosync.init ${pkgdir}/usr/share/corosync/corosync || return 1
+}
+
diff --git a/pcr/corosync/corosync.init b/pcr/corosync/corosync.init
new file mode 100755
index 000000000..b97186dee
--- /dev/null
+++ b/pcr/corosync/corosync.init
@@ -0,0 +1,126 @@
+#!/bin/bash
+
+# Authors:
+#  Eric Renfro <erenfro@gmail.com>
+
+desc="Corosync Cluster Engine"
+prog="corosync"
+
+# set secure PATH
+PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/sbin"
+
+status()
+{
+	pid=$(pidof $prog 2>/dev/null)
+	return $?
+}
+
+if [ -d /etc/default ]; then
+	[ -f /etc/default/$prog ] && . /etc/default/$prog
+	[ -z "$LOCK_FILE" ] && LOCK_FILE="/var/lock/$prog"
+fi
+
+cluster_disabled_at_boot()
+{
+       if grep -q nocluster /proc/cmdline && \
+          [ "$(tty)" = "/dev/console" ]; then
+               return 1
+       fi
+       return 0
+}
+
+wait_for_ipc()
+{
+	local try=0
+	while [ "$try" -le "20" ]; do
+		if corosync-cfgtool -s > /dev/null 2>&1; then
+			return 0
+		fi
+		sleep 0.5
+		let try++
+	done
+
+	return 1
+}
+
+start()
+{
+	echo -n "Starting $desc ($prog): "
+
+	! cluster_disabled_at_boot && return
+
+	# most recent distributions use tmpfs for /var/run
+	# to avoid to clean it up on every boot.
+	# they also assume that init scripts will create
+	# required subdirectories for proper operations
+	mkdir -p /var/run
+
+	if status $prog > /dev/null 2>&1; then
+		rtrn=0
+	else
+		$prog > /dev/null 2>&1
+
+		if ! wait_for_ipc; then
+			echo "FAILED"
+			rtrn=1
+		fi
+		touch $LOCK_FILE
+		rtrn=0
+	fi
+	echo "OK"
+}
+
+stop()
+{
+	! status $prog > /dev/null 2>&1 && return
+
+	echo -n "Signaling $desc ($prog) to terminate: "
+	kill -TERM $(pidof $prog) > /dev/null 2>&1
+	echo "OK"
+
+	echo -n "Waiting for $prog services to unload:"
+	while status $prog > /dev/null 2>&1; do
+		sleep 1
+		echo -n "."
+	done
+
+	rm -f $LOCK_FILE
+	echo " OK"
+	rtrn=0
+}
+
+restart()
+{
+	stop
+	start
+}
+
+rtrn=0
+
+case "$1" in
+start)
+	start
+	;;
+restart|reload|force-reload)
+	restart
+	;;
+condrestart|try-restart)
+	if status $prog > /dev/null 2>&1; then
+		restart
+	fi
+	;;
+status)
+	status $prog
+	rtrn=$?
+	;;
+stop)
+	stop
+	;;
+*)
+	echo "usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|status}"
+	rtrn=2
+	;;
+esac
+
+exit $rtrn
+
diff --git a/pcr/corosync/corosync.service b/pcr/corosync/corosync.service
new file mode 100644
index 000000000..e601181ee
--- /dev/null
+++ b/pcr/corosync/corosync.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Corosync Cluster Engine
+ConditionKernelCommandLine=!nocluster
+Requires=network.target
+After=network.target
+
+[Service]
+ExecStart=/usr/share/corosync/corosync start
+ExecStop=/usr/share/corosync/corosync stop
+Type=forking
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/ha-heartbeat/PKGBUILD b/pcr/ha-heartbeat/PKGBUILD
index 10ef5def3..f913344a0 100644
--- a/pcr/ha-heartbeat/PKGBUILD
+++ b/pcr/ha-heartbeat/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=ha-heartbeat
 _pkgname=${pkgname:3}
 pkgver=3.0.5
 _pkgver=${pkgver::1}_${pkgver:2:1}
-pkgrel=2
+pkgrel=6
 pkgdesc='Daemon that provides cluster infrastructure services to its clients'
 arch=(
   i686
@@ -12,17 +12,33 @@ arch=(
   mips64el
 )
 url=http://linux-ha.org/wiki/${_pkgname^}
-license=GPL
-makedepends=docbook-xsl
+license=(
+  GPL2
+  lGPL2.1
+)
 depends=(
   gnutls
   ha-glue
 )
-options=(
-  '!emptydirs'
-  '!libtool'
-  strip
+optdepends=(
+  lynx
+  net-tools
+  openssh
+  swig
+  valgrind
+  w3m
+)
+makedepends=(
+  docbook-xsl
+  libxslt
+  lynx
+  net-tools
+  openssh
+  swig
+  valgrind
+  w3m
 )
+options=!libtool
 source=(
   http://hg.linux-ha.org/$_pkgname-STABLE_$_pkgver/archive/STABLE-$pkgver.tar.bz2
   $pkgname.service
@@ -34,17 +50,25 @@ sha512sums=(
 
 prepare() {
   cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver
-  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|' configure.in
   mv configure.{in,ac}
+  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|;
+          s|AM_INIT_AUTOMAKE(heartbeat, $HAPKGVERSION)|AM_INIT_AUTOMAKE|;
+         ' configure.ac
+  sed -i "s|AC_INIT(GNUmakefile)|AC_INIT(heartbeat, $pkgver)|;
+         " configure.ac
+  sed -i 's|INCLUDES|AM_CPPFLAGS|;
+         ' {contrib/{drbd-outdate-peer,ipfail,mlock},cts,heartbeat,lib/{apphb,hbclient,plugins/{HB{auth,comm,compress},quorum{,d},tiebreaker}},membership/{ccm,quorumd},replace,telecom/apphbd,tools}/Makefile.am
 }
 
 build() {
   cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver
   setarch $CARCH ./bootstrap
   setarch $CARCH ./configure --prefix=/usr\
-    --enable-fatal-warnings=no\
+    --disable-fatal-warnings\
     --enable-static=no\
+    --enable-valgrind\
     --libdir=/usr/lib\
+    --localstatedir=/var\
     --sysconfdir=/etc
   setarch $CARCH make
 }
@@ -53,14 +77,8 @@ package() {
   cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver
   setarch $CARCH make DESTDIR=$pkgdir install
 
-  for py in `grep -r -l "\#\!\/usr\/bin\/python" $pkgdir`;do
-    sed -i.bk 's:/usr/bin/python$:/usr/bin/python2:g' $py
-  done
-  for py in `grep -r -l "\#\!\/usr\/bin\/env python" $pkgdir`;do
-    sed -i.bk 's:/usr/bin/env python$:/usr/bin/env python2:g' $py
-  done
-  #end python path correction
-
   install -d $pkgdir/usr/lib/systemd/system
   install -Dm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/libqb/PKGBUILD b/pcr/libqb/PKGBUILD
index eacdb6ea2..6b9d7d9d7 100644
--- a/pcr/libqb/PKGBUILD
+++ b/pcr/libqb/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=libqb
 pkgver=0.14.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Library with the primary purpose of providing high performance client server reusable features'
 arch=(
   i686
@@ -14,6 +14,7 @@ makedepends=(
   splint
 )
 license=LGPL2.1
+options=!libtool
 url=https://github.com/asalkeld/$pkgname/wiki
 source=https://github.com/asalkeld/$pkgname/archive/v$pkgver.tar.gz
 sha512sums=1377e38d5547eb516b255c0aa0972e858048053202692d7d5ef1c746d79dee2c78eddc29e797215376990f2c776b34261f765858606b59d77f9218fb0dac5977
@@ -22,6 +23,8 @@ build() {
   cd $srcdir/$pkgname-$pkgver
   setarch $CARCH ./autogen.sh
   setarch $CARCH ./configure --prefix=/usr\
+    --disable-fatal-warnings\
+    --disable-static\
     --libdir=/usr/lib
   setarch $CARCH make
 }
diff --git a/pcr/xsynth-dssi/PKGBUILD b/pcr/xsynth-dssi/PKGBUILD
new file mode 100644
index 000000000..f353b9bfa
--- /dev/null
+++ b/pcr/xsynth-dssi/PKGBUILD
@@ -0,0 +1,28 @@
+# Maintainer: Guest One <theguestone at gmail dot com>
+
+pkgname=xsynth-dssi
+pkgver=0.9.4
+pkgrel=1
+pkgdesc="An analog-style (VCOs-VCF-VCA) synth plugin for DSSI"
+arch=('i686')
+url="http://dssi.sourceforge.net/download.html#Xsynth-DSSI"
+license=('GPL')
+depends=('gtk2' 'liblo')
+makedepends=('dssi' 'ladspa')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/project/dssi/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz
+        xsynth-dssi)
+md5sums=('3432ecdac06407a992f80eb1c1ecf7cd'
+         'c346e6a944f202fccb2278b77a5e184b')
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make || return 1
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR=${pkgdir} install || return 1
+  install -D -m755 ${srcdir}/xsynth-dssi ${pkgdir}/usr/bin/xsynth-dssi
+}
+
diff --git a/pcr/xsynth-dssi/xsynth-dssi b/pcr/xsynth-dssi/xsynth-dssi
new file mode 100644
index 000000000..5503b12ba
--- /dev/null
+++ b/pcr/xsynth-dssi/xsynth-dssi
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+export DSSI_PATH=/usr/lib/dssi
+exec jack-dssi-host xsynth-dssi.so