Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/ruby-gtk2/PKGBUILD
	core/lvm2/PKGBUILD

38 files changed, 1134 insertions, 112 deletions

diff --git a/community/courier-authlib/PKGBUILD b/community/courier-authlib/PKGBUILD
index 94456028b..aec16d2ac 100644
--- a/community/courier-authlib/PKGBUILD
+++ b/community/courier-authlib/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 65015 2012-02-20 01:42:55Z spupykin $
+# $Id: PKGBUILD 70428 2012-05-06 03:21:33Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=courier-authlib
-pkgver=0.63.0
-pkgrel=8
+pkgver=0.64.0
+pkgrel=1
 pkgdesc="Authentification library for the courier mailserver(s)"
 arch=(i686 x86_64 'mips64el')
 license=('GPL2')
@@ -21,7 +21,7 @@ options=(!libtool)
 install=${pkgname}.install
 source=(http://downloads.sourceforge.net/project/courier/authlib/${pkgver}/${pkgname}-${pkgver}.tar.bz2
         authdaemond.rc.d)
-md5sums=('411a927d178f783a1e8fab9964ce0dd2'
+md5sums=('d946a76e81e45a139543305d310399f6'
          '7de75a9a74796f4fd2e81fd3ca16ed8d')
 
 build() {
diff --git a/community/courier-mta/PKGBUILD b/community/courier-mta/PKGBUILD
index 8d0a03833..94a3767b1 100644
--- a/community/courier-mta/PKGBUILD
+++ b/community/courier-mta/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75460 2010-04-01 16:56:22Z giovanni $
+# $Id: PKGBUILD 70426 2012-05-06 03:20:26Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
@@ -7,8 +7,8 @@
 # Go read http://www.courier-mta.org/install.html b4 running or building courier
 
 pkgname=courier-mta
-pkgver=0.67.0
-pkgrel=2
+pkgver=0.68.0
+pkgrel=1
 pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig"
 arch=(i686 x86_64 'mips64el')
 license=('GPL2')
@@ -40,7 +40,7 @@ source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/couri
         pop3d.rc.d
         pop3d-ssl.rc.d
         webmaild.rc.d)
-md5sums=('c2e26499f9f48577aa7a0735f5e96997'
+md5sums=('5bd56150ed7c75cc8378c443742c632e'
          '9055ba622efd37603186ce1f37277224'
          '5cbeb5c323706058e545f74ad7752ebe'
          'f3ff70b40c7a1f7a017e8c4cc4d92f4f'
diff --git a/community/geos/PKGBUILD b/community/geos/PKGBUILD
index e56735717..5cda9ef58 100644
--- a/community/geos/PKGBUILD
+++ b/community/geos/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 64216 2012-02-10 11:57:59Z arodseth $
+# $Id: PKGBUILD 70399 2012-05-05 14:32:15Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Contributor: William Rea <sillywilly@gmail.com>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 pkgname=geos
-pkgver=3.3.2
+pkgver=3.3.3
 pkgrel=1
 pkgdesc="C++ port of the Java Topology Suite"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('LGPL')
 depends=('gcc-libs' 'bash')
 options=('!libtool' '!emptydirs')
 source=("http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.bz2")
-sha256sums=('ec64d3a92540a1618aa3b91dc1235caae1c370ec23afd59a2734062bf182ed5b')
+sha256sums=('dfcf4bd70ab212a5b7bad21d01b84748f101a545092b56dafdc3882ef3bddec9')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index ff3cd3f8f..4be7ea328 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69644 2012-04-20 22:36:38Z tdziedzic $
+# $Id: PKGBUILD 70381 2012-05-05 13:14:13Z arodseth $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Andres Perera <andres87p gmail>
@@ -8,43 +8,28 @@
 # Contributor: Daniel YC Lin <dlin.tw@gmail.com>
 
 pkgname=go
-pkgver=1
-pkgrel=6
+pkgver=1.0.1
+pkgrel=1
 epoch=2
 pkgdesc='Google Go compiler and tools (release version)'
 arch=('x86_64' 'i686')
 url="http://golang.org/"
 license=('custom')
-depends=('perl' 'ed' 'gawk' 'mercurial')
+depends=('perl' 'ed' 'gawk')
 makedepends=('inetutils')
 options=('!strip' '!emptydirs')
 install=go.install
-source=("$pkgname"
+source=("http://go.googlecode.com/files/${pkgname}$pkgver.src.tar.gz"
+        "$pkgname.run"
         "$pkgname.sh")
-sha1sums=('655754d95688294b0cf2334a1155432884f92859'
+sha1sums=('fc8a6d6725f7f2bf7c94685c5fd0880c9b7f67f6'
+          '655754d95688294b0cf2334a1155432884f92859'
           'a760c32cbad5a013f384a086efb3b8b8fd88794f')
 
 build() {
-  _hgroot="https://go.googlecode.com/hg/"
-  _hgrepo="release"
-
-  cd "$srcdir"
-
-  msg "Connecting to Mercurial server...."
-  if [[ -d $_hgrepo ]] ; then
-    cd $_hgrepo
-    hg pull -u
-    msg "The local files are updated."
-  else
-    hg clone $_hgroot $_hgrepo
-  fi
-  msg "Mercurial checkout done or server timeout"
-
-  rm -rf "$srcdir/$_hgrepo-build"
-  cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build"
-  cd "$srcdir/$_hgrepo-build"
-
-  export GOROOT="$srcdir/$_hgrepo-build"
+  cd "$srcdir/$pkgname"
+
+  export GOROOT="$srcdir/$pkgname"
   export GOOS_FINAL="/usr/lib/go"
   export GOOS=linux
   export GOBIN="$GOROOT/bin"
@@ -52,12 +37,12 @@ build() {
 
   mkdir -p "$GOROOT/bin"
   cd "$GOROOT/src"
-  hg update release-branch.go$pkgver
+
   . ./make.bash 
 }
 
 package() {
-  cd "$srcdir/release-build"
+  cd "$srcdir/$pkgname"
 
   install -Dm644 LICENSE \
     "$pkgdir/usr/share/licenses/go/LICENSE"
@@ -103,7 +88,7 @@ package() {
   install $srcdir/go.sh $pkgdir/etc/profile.d/
 
   mv "$pkgdir/usr/bin/go" "$pkgdir/usr/bin/go.elf"
-  install -Dm755 "$srcdir/go" "$pkgdir/usr/bin/go"
+  install -Dm755 "$srcdir/go.run" "$pkgdir/usr/bin/go"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/go/go.run b/community/go/go.run
new file mode 100644
index 000000000..2f68ce8ff
--- /dev/null
+++ b/community/go/go.run
@@ -0,0 +1,8 @@
+#!/bin/sh
+if [[ -z $GOROOT ]]; then
+    export GOROOT=/usr/lib/go
+fi
+if [[ -z $GOROOT_FINAL ]]; then
+    export GOROOT_FINAL=$GOROOT
+fi
+/usr/bin/go.elf "$@"
diff --git a/community/gwget/PKGBUILD b/community/gwget/PKGBUILD
new file mode 100644
index 000000000..ff888ec34
--- /dev/null
+++ b/community/gwget/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 70413 2012-05-05 16:24:44Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Allan McRae <allan@archlinux.org>
+# Contributor: Aaron, phrakture, Griffin <aaron@archlinux.org>
+# Contributor: erkaN kaplaN <erkan@linux-sevenler.org>
+# Contributor: Alexsandr Pavlov <kidoz at mail dot ru>
+
+pkgname=gwget
+pkgver=1.0.4
+pkgrel=5
+pkgdesc="Download manager for GNOME"
+arch=('i686' 'x86_64')
+url="http://projects.gnome.org/gwget/"
+license=('GPL')
+depends=('gtk2' 'gconf' 'libnotify')
+makedepends=('intltool')
+install=$pkgname.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
+        gwget-1.0.4-notify-0.7.patch
+        gwget-1.0.4-glib-2.32.patch
+        drop-libgnomeui.patch)
+sha256sums=('a65b2b2b3befb6cf34a697a13111b35498a6d63f9a9b048a22b8654f35ef643f'
+            '84efbbea9c2a91c60288edb67264bbdb4ec2c579cf95b3baa8282040a1b65c76'
+            '319c4795d0034c4adacf302db697d966ca228fc1bbe9778af9dadcfb0c2531c8'
+            '72506677886deb5fc2436c667e2f79ed868ce9384cad77b9a97ec68e41ae45c3')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=634170
+  patch -Np1 -i "$srcdir/gwget-1.0.4-notify-0.7.patch"
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=665286
+  patch -Np1 -i "$srcdir/gwget-1.0.4-glib-2.32.patch"
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=671759
+  patch -Np1 -i "$srcdir/drop-libgnomeui.patch"
+
+  autoreconf -fi
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-static --disable-schemas-install \
+              --with-gconf-schema-file-dir=/usr/share/gconf/schemas
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/community/gwget/drop-libgnomeui.patch b/community/gwget/drop-libgnomeui.patch
new file mode 100644
index 000000000..30a121f25
--- /dev/null
+++ b/community/gwget/drop-libgnomeui.patch
@@ -0,0 +1,257 @@
+diff -Naur gwget-1.0.4.orig/configure.ac gwget-1.0.4/configure.ac
+--- gwget-1.0.4.orig/configure.ac	2009-10-17 22:26:09.000000000 +0200
++++ gwget-1.0.4/configure.ac	2012-03-10 01:09:09.246869284 +0100
+@@ -14,15 +14,13 @@
+ 
+ AM_GCONF_SOURCE_2
+ 
+-LIBGNOMEUI_REQUIRED=2.0.0
+-LIBGNOME_REQUIRED=2.0.0
+ GTK_REQUIRED=2.6.0
+ GCONF_REQUIRED=1.1.11
+ DBUS_GLIB_REQUIRED=0.33
+ GIO_REQUIRED=2.16.0
+ 
+-PKG_CHECK_MODULES(GNOME, libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
+-		 	  gtk+-2.0 	>= $GTK_REQUIRED 
++PKG_CHECK_MODULES(GNOME, gtk+-2.0 	>= $GTK_REQUIRED 
++ 			  gconf-2.0
+ 			  gmodule-2.0
+ 			  gio-unix-2.0 >= $GIO_REQUIRED)
+ 			
+diff -Naur gwget-1.0.4.orig/src/custom-cell-renderer-progressbar.c gwget-1.0.4/src/custom-cell-renderer-progressbar.c
+--- gwget-1.0.4.orig/src/custom-cell-renderer-progressbar.c	2009-06-16 19:58:06.000000000 +0200
++++ gwget-1.0.4/src/custom-cell-renderer-progressbar.c	2012-03-10 01:09:09.260201828 +0100
+@@ -21,8 +21,8 @@
+ 
+ #include <config.h>
+ #include <stdlib.h>
+-#include <gnome.h>
+-/* #include <glib/gi18n.h> */
++#include <glib/gi18n.h>
++#include <gtk/gtk.h>
+ 
+ #include "custom-cell-renderer-progressbar.h"
+ 
+diff -Naur gwget-1.0.4.orig/src/gwget-application.c gwget-1.0.4/src/gwget-application.c
+--- gwget-1.0.4.orig/src/gwget-application.c	2009-06-20 10:12:37.000000000 +0200
++++ gwget-1.0.4/src/gwget-application.c	2012-03-10 01:09:09.263534966 +0100
+@@ -21,8 +21,6 @@
+ #include "gwget-application.h"
+ 
+ 
+-#include <libgnomeui/gnome-client.h>
+-
+ #ifdef ENABLE_DBUS
+ #include "gwget-application-service.h"
+ #include <dbus/dbus-glib-bindings.h>
+@@ -86,39 +84,6 @@
+ #endif /* ENABLE_DBUS */
+ 
+ 
+-static gint
+-save_session (GnomeClient *client, gint phase, GnomeSaveStyle save_style, gint shutdown,
+-	      GnomeInteractStyle interact_style, gint fast, GwgetApplication *application)
+-{
+-	char **restart_argv;
+-	int argc = 0;
+-
+-	restart_argv = g_new (char *, 1);
+-	restart_argv[0] = g_strdup ("gwget");
+-	gnome_client_set_restart_command (client, argc, restart_argv);
+-
+-	return TRUE;
+-}
+-
+-static void
+-removed_from_session (GnomeClient *client, GwgetApplication *application)
+-{
+-	gwget_application_shutdown (application);
+-}
+-
+-static void
+-init_session (GwgetApplication *application)
+-{
+-	GnomeClient *client;
+-
+-	client = gnome_master_client ();
+-
+-	g_signal_connect (client, "save_yourself",
+-			  G_CALLBACK (save_session), application);	
+-	g_signal_connect (client, "die",
+-			  G_CALLBACK (removed_from_session), application);
+-}
+-
+ gboolean
+ gwget_application_open_window (GwgetApplication  *application,
+                            guint32         timestamp,
+@@ -199,7 +164,6 @@
+ static void
+ gwget_application_init (GwgetApplication *gwget_application)
+ {
+-	init_session (gwget_application);
+ 
+ }
+ 
+diff -Naur gwget-1.0.4.orig/src/main.c gwget-1.0.4/src/main.c
+--- gwget-1.0.4.orig/src/main.c	2009-06-20 10:12:37.000000000 +0200
++++ gwget-1.0.4/src/main.c	2012-03-10 01:09:09.273534378 +0100
+@@ -17,11 +17,13 @@
+ 
+ #include <config.h>
+ 
+-#include <gnome.h>
++#include <stdlib.h>
++#include <errno.h>
++#include <glib/gi18n.h>
++#include <gtk/gtk.h>
+ #include <string.h>
+ #include <gconf/gconf-client.h>
+ #include <locale.h>
+-#include <libgnomeui/libgnomeui.h>
+ #include <gio/gio.h>
+ 
+ #include "main_window_cb.h"
+@@ -201,7 +203,6 @@
+ 
+ int main(int argc,char *argv[])
+ {
+-	GnomeProgram *program;
+ 	GOptionContext *context;
+ 	
+ 	context = g_option_context_new (_("Gwget Download Manager"));
+@@ -220,12 +221,7 @@
+ 	
+ 
+ 	gwget_init_pref(&gwget_pref);
+-	program = gnome_program_init(PACKAGE, VERSION, 
+-				LIBGNOMEUI_MODULE, argc, argv,
+-			        GNOME_PARAM_GOPTION_CONTEXT, context, 
+-				GNOME_PARAM_HUMAN_READABLE_NAME, _("Gwget"),
+-				GNOME_PARAM_APP_DATADIR, GNOME_GWGET_LOCALEDIR,
+-                              	NULL);
++	gtk_init (&argc, &argv);
+ 	
+ #ifdef ENABLE_DBUS
+ 	if (!gwget_application_register_service (GWGET_APP)) {
+@@ -243,9 +239,5 @@
+ 	
+ 	gtk_main();
+ 	
+-	gnome_accelerators_sync ();
+-	
+-	g_object_unref (program);
+-	
+ 	return (0);
+ }
+diff -Naur gwget-1.0.4.orig/src/main_window.c gwget-1.0.4/src/main_window.c
+--- gwget-1.0.4.orig/src/main_window.c	2009-08-14 19:19:51.000000000 +0200
++++ gwget-1.0.4/src/main_window.c	2012-03-10 01:09:09.276867514 +0100
+@@ -15,7 +15,9 @@
+  */
+  
+ #include <config.h>
+-#include <gnome.h>
++#include <stdlib.h>
++#include <glib/gi18n.h>
++#include <gtk/gtk.h>
+ #include <gconf/gconf-client.h>
+ #include <glib/gstdio.h>
+ #include <string.h>
+diff -Naur gwget-1.0.4.orig/src/main_window_cb.c gwget-1.0.4/src/main_window_cb.c
+--- gwget-1.0.4.orig/src/main_window_cb.c	2009-08-14 19:19:51.000000000 +0200
++++ gwget-1.0.4/src/main_window_cb.c	2012-03-10 01:07:57.131122811 +0100
+@@ -15,7 +15,9 @@
+  */
+  
+ #include <config.h>
+-#include <gnome.h>
++#include <stdlib.h>
++#include <glib/gi18n.h>
++#include <gtk/gtk.h>
+ #include <gconf/gconf-client.h>
+ #include <signal.h>
+ 
+@@ -217,7 +220,10 @@
+ 	gchar *size;
+ 	int width = 16, height = 16;
+ 	gdouble perc;
+-	
++	GThemedIcon *icon;
++       const gchar *const *icon_names;
++	gint i;
++
+ 	gtk_list_store_append (GTK_LIST_STORE(model), &iter); 
+ 	size = g_strdup_printf ("%d kB", (guint32)(gwgetdata->cur_size + 512) / 1024);
+ 	gtk_list_store_set (GTK_LIST_STORE(model), &iter,URL_COLUMN,gwgetdata->url,
+@@ -243,10 +249,15 @@
+ 	theme = gtk_icon_theme_get_default ();
+ 	if (!gwgetdata->recursive) {
+ 		content_type = g_content_type_guess (gwgetdata->local_filename, NULL, 0, NULL);
+-		gwgetdata->icon_name = gnome_icon_lookup (theme, NULL, NULL, NULL, NULL,
+-	 							content_type, GNOME_ICON_LOOKUP_FLAGS_NONE, NULL);
+-	} else {
+ 		gwgetdata->icon_name = g_strdup("gtk-refresh");
++		icon = (GThemedIcon*) g_content_type_get_icon (content_type);
++		icon_names = g_themed_icon_get_names (icon);
++		for (i=0; i<sizeof(icon_names)-1; i++) {
++			if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default (), icon_names[i])) {
++	 			gwgetdata->icon_name = icon_names[i];
++				break;
++			}
++		}
+ 	}
+ 	gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &width, &height);
+ 	width *= 2;
+diff -Naur gwget-1.0.4.orig/src/new_window.c gwget-1.0.4/src/new_window.c
+--- gwget-1.0.4.orig/src/new_window.c	2009-08-14 19:19:51.000000000 +0200
++++ gwget-1.0.4/src/new_window.c	2012-03-10 01:09:09.283533785 +0100
+@@ -24,7 +24,8 @@
+ */
+ 
+ 
+-#include <gnome.h>
++#include <glib/gi18n.h>
++#include <gtk/gtk.h>
+ #include <config.h>
+ #include "new_window.h"
+ #include "main_window.h"
+diff -Naur gwget-1.0.4.orig/src/systray.c gwget-1.0.4/src/systray.c
+--- gwget-1.0.4.orig/src/systray.c	2009-08-14 19:19:51.000000000 +0200
++++ gwget-1.0.4/src/systray.c	2012-03-10 01:09:09.290200060 +0100
+@@ -1,6 +1,7 @@
+ 
+ #include <config.h>
+-#include <gnome.h>
++#include <glib/gi18n.h>
++#include <gtk/gtk.h>
+ #include "main_window.h"
+ #include "gwget_data.h"
+ #include "systray.h"
+diff -Naur gwget-1.0.4.orig/src/utils.c gwget-1.0.4/src/utils.c
+--- gwget-1.0.4.orig/src/utils.c	2009-08-14 19:19:51.000000000 +0200
++++ gwget-1.0.4/src/utils.c	2012-03-10 01:09:09.296866335 +0100
+@@ -14,7 +14,8 @@
+  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  */
+ 
+-#include <gnome.h>
++#include <string.h>
++#include <gtk/gtk.h>
+ #include "main_window.h"
+ #include "utils.h"
+ #include "gwget_data.h"
+diff -Naur gwget-1.0.4.orig/src/wget-log.c gwget-1.0.4/src/wget-log.c
+--- gwget-1.0.4.orig/src/wget-log.c	2009-10-04 20:29:35.000000000 +0200
++++ gwget-1.0.4/src/wget-log.c	2012-03-10 01:09:09.306865743 +0100
+@@ -25,7 +25,9 @@
+ #define _FILE_OFFSET_BITS 64
+ 
+ #include <config.h>
+-#include <gnome.h>
++#include <stdlib.h>
++#include <glib/gi18n.h>
++#include <gtk/gtk.h>
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
diff --git a/community/gwget/gwget-1.0.4-glib-2.32.patch b/community/gwget/gwget-1.0.4-glib-2.32.patch
new file mode 100644
index 000000000..ac914070e
--- /dev/null
+++ b/community/gwget/gwget-1.0.4-glib-2.32.patch
@@ -0,0 +1,12 @@
+diff -Naur gwget-1.0.4.orig/src/gwget-application.h gwget-1.0.4/src/gwget-application.h
+--- gwget-1.0.4.orig/src/gwget-application.h	2012-05-05 12:53:49.679322992 +0000
++++ gwget-1.0.4/src/gwget-application.h	2012-05-05 12:56:21.481488856 +0000
+@@ -18,7 +18,7 @@
+ #ifndef GWGET_APPLICATION_H
+ #define GWGET_APPLICATION_H
+ 
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include <glib-object.h>
+ 
+ G_BEGIN_DECLS
diff --git a/community/gwget/gwget-1.0.4-notify-0.7.patch b/community/gwget/gwget-1.0.4-notify-0.7.patch
new file mode 100644
index 000000000..2edbfa473
--- /dev/null
+++ b/community/gwget/gwget-1.0.4-notify-0.7.patch
@@ -0,0 +1,24 @@
+diff -Naur gwget-1.0.4.orig/configure.ac gwget-1.0.4/configure.ac
+--- gwget-1.0.4.orig/configure.ac	2009-10-17 22:26:09.000000000 +0200
++++ gwget-1.0.4/configure.ac	2011-03-18 00:24:51.993660191 +0100
+@@ -270,7 +270,7 @@
+ #
+ # Check for libnotify
+ #
+-LIBNOTIFY_REQUIRED=0.2.2
++LIBNOTIFY_REQUIRED=0.7.0
+ AC_ARG_ENABLE(libnotify,
+             AC_HELP_STRING([--disable-libnotify],
+                            [Disable libnotify support]),,
+diff -Naur gwget-1.0.4.orig/src/systray.c gwget-1.0.4/src/systray.c
+--- gwget-1.0.4.orig/src/systray.c	2009-08-14 19:19:51.000000000 +0200
++++ gwget-1.0.4/src/systray.c	2011-03-18 00:24:27.612098913 +0100
+@@ -224,7 +224,7 @@
+        		if (!notify_is_initted ())
+ 			if (!notify_init ("gwget"))
+ 		               return;
+-       NotifyNotification *notification = notify_notification_new(primary,secondary,icon_name,NULL);
++       NotifyNotification *notification = notify_notification_new(primary,secondary,icon_name);
+        notify_notification_show(notification,NULL);
+ #endif
+ 
diff --git a/community/gwget/gwget.install b/community/gwget/gwget.install
new file mode 100644
index 000000000..9cdb0dcf9
--- /dev/null
+++ b/community/gwget/gwget.install
@@ -0,0 +1,17 @@
+pkgname=gwget
+
+post_install() {
+  gconfpkg --install $pkgname
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  gconfpkg --uninstall $pkgname
+}
diff --git a/community/motion/PKGBUILD b/community/motion/PKGBUILD
index df25eb4d9..a165015eb 100644
--- a/community/motion/PKGBUILD
+++ b/community/motion/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 67264 2012-03-06 01:23:37Z spupykin $
+# $Id: PKGBUILD 70406 2012-05-05 14:52:58Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=motion
 pkgver=3.2.12
-pkgrel=3
+pkgrel=4
 pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -16,11 +16,11 @@ source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
 	ffmpeg-0.8.patch
 	linux-headers.patch)
 md5sums=('1ba0065ed50509aaffb171594c689f46'
-         '77be944e4466ab66836d50ea216af3b6'
+         '2e8c53c4980edddd420f08fdd572c9be'
          'd36687710837d69fbce4608b1345fa34'
          'd8c3c4fdded5cfbd729710475559a21d')
 sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd'
-          'e092b0d880d0169feb56ed1e8a3c95729a7896f7'
+          '47536a115d4df7497f6e6c616b76ea98e3372e29'
           '6912448db0711f85322505ee6f8052f8f98ae634'
           '6f33dab895ae398cc5e7017cbf5dc5d728f3ca9e')
 
diff --git a/community/motion/rc.motion b/community/motion/rc.motion
index b6057744a..5b4c65500 100755
--- a/community/motion/rc.motion
+++ b/community/motion/rc.motion
@@ -8,7 +8,7 @@ case "$1" in
   start)
     stat_busy "Starting Motion"
     mkdir -p /var/run/motion
-    [ -z "$PID" ] && /usr/bin/motion
+    [ -z "$PID" ] && /usr/bin/motion 1>/dev/null 2>&1
     if [ $? -gt 0 ]; then
       stat_fail
     else
diff --git a/community/nzbget/PKGBUILD b/community/nzbget/PKGBUILD
index 60ca3c6d0..c850f379d 100644
--- a/community/nzbget/PKGBUILD
+++ b/community/nzbget/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 68199 2012-03-18 23:15:46Z arodseth $
+# $Id: PKGBUILD 70376 2012-05-05 12:41:24Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=nzbget
-pkgver=0.7.0
-pkgrel=4
+pkgver=0.8.0
+pkgrel=1
 pkgdesc="Download from Usenet using .nzb files"
 arch=('x86_64' 'i686' 'mips64el')
 url="http://nzbget.sourceforge.net/"
 license=('GPL')
 depends=('gnutls' 'libpar2' 'libxml2' 'libsigc++' 'libgcrypt')
 makedepends=('autoconf' 'automake')
+changelog=$pkgname.changelog
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-sha256sums=('b798bbcc9f6816b4e19a95f74df067440f7ad49e1c16a3f33f99bddf7916771e')
+sha256sums=('646939596097fafdeb0b4064b433463419e7d0d9af7fe32f6689d6b95ad77d95')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -30,5 +31,3 @@ package() {
     AUTHORS postprocess-example.sh postprocess-example.conf \
     ChangeLog nzbget.conf.example README
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/nzbget/nzbget.changelog b/community/nzbget/nzbget.changelog
new file mode 100644
index 000000000..80220e1a4
--- /dev/null
+++ b/community/nzbget/nzbget.changelog
@@ -0,0 +1,24 @@
+2012-05-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* nzbget 0.8.0-1
+
+2012-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* nzbget 0.7.0-4 package signed
+
+2010-05-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Fixed FS#19399 - missing postprocess-example.conf file
+
+2010-05-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to major release 0.7.0
+
+2009-10-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Dependency added (gnutls) in v0.6.0-2 
+
+2008-03-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to major release 0.6.0
+
+2008-09-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to major release 0.5.1
+
+2008-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Package moved to [community]
+	* Update to major release 0.5.0
diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD
index 7cc14ed88..a5c72c304 100644
--- a/community/open-vm-tools-modules/PKGBUILD
+++ b/community/open-vm-tools-modules/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 70211 2012-05-02 12:45:26Z spupykin $
+# $Id: PKGBUILD 70408 2012-05-05 14:54:37Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Raczkowski <raczkow@gmail.com>
 
@@ -24,6 +24,7 @@ build() {
   KERNEL_RELEASE=`cat /lib/modules/extramodules-3.${_kernver}-ARCH/version`
 
   cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}"
+  sed -i 's|proc-3.2.8|procps|g' configure
   [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr \
 	--without-x --with-kernel-release=$KERNEL_RELEASE
 
diff --git a/community/open-vm-tools-modules/open-vm-tools-modules.install b/community/open-vm-tools-modules/open-vm-tools-modules.install
index d2a8f1d62..b8f6dd618 100644
--- a/community/open-vm-tools-modules/open-vm-tools-modules.install
+++ b/community/open-vm-tools-modules/open-vm-tools-modules.install
@@ -1,5 +1,5 @@
 post_install() {
-  EXTRAMODULES='extramodules-3.2-ARCH'
+  EXTRAMODULES='extramodules-3.3-ARCH'
   depmod $(cat /lib/modules/$EXTRAMODULES/version)
   echo ">>> Enabling vmxnet driver in /etc/modprobe.d/open-vm-tools-modules.conf"
   echo ">>> (this will disable pcnet32 driver)"
@@ -10,12 +10,12 @@ post_install() {
 }
 
 post_upgrade() {
-  EXTRAMODULES='extramodules-3.2-ARCH'
+  EXTRAMODULES='extramodules-3.3-ARCH'
   depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-  EXTRAMODULES='extramodules-3.2-ARCH'
+  EXTRAMODULES='extramodules-3.3-ARCH'
   depmod $(cat /lib/modules/$EXTRAMODULES/version)
   echo ">>>"
   echo ">>> Remember to un-blacklist pcnet32 driver"
diff --git a/community/proj/PKGBUILD b/community/proj/PKGBUILD
index 978edf21a..a64fb6298 100644
--- a/community/proj/PKGBUILD
+++ b/community/proj/PKGBUILD
@@ -1,32 +1,39 @@
-# $Id: PKGBUILD 68205 2012-03-19 01:22:23Z lfleischer $
-# Maintainer:  Mateusz Herych <heniekk@gmail.com>
+# $Id: PKGBUILD 70420 2012-05-05 19:41:43Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=proj
-pkgver=4.7.0
-pkgrel=2
+pkgver=4.8.0
+pkgrel=1
 pkgdesc='Cartographic Projections library.'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://trac.osgeo.org/proj/"
 license=('MIT')
 options=('!libtool')
+changelog=$pkgname.changelog
 source=("http://download.osgeo.org/proj/$pkgname-$pkgver.tar.gz"
         "http://download.osgeo.org/proj/$pkgname-datumgrid-1.5.zip"
         "chenyx06a.zip::http://www.swisstopo.admin.ch/internet/swisstopo/en/home/topics/survey/lv03-lv95/chenyx06/distortion_grids.parsys.65772.downloadList.94632.DownloadFile.tmp/chenyx06antv2.zip")
-md5sums=('927d34623b52e0209ba2bfcca18fe8cd'
-         'f5bf28a2a9c6afe9a3f670f0c0adb783'
-         'fbbfe2b6bcbc41168fe3bdc4a6c1082a')
+sha256sums=('2db2dbf0fece8d9880679154e0d6d1ce7c694dd8e08b4d091028093d87a9d1b5'
+            '723c4017d95d7a8abdf3bda4e18d3c15d79b00f9326d453da5fdf13f96c287db'
+            'f61290a32815622bfe182af475c76b0b4c282de66121fdddce2f6201e8bca2e0')
 
 build() {
   bsdtar -xzvf "${srcdir}/${pkgname}-datumgrid-1.5.zip" -C "${srcdir}/proj-${pkgver}/nad"
   bsdtar -xzvf "${srcdir}/chenyx06a.zip" -C "${srcdir}/proj-${pkgver}/nad" CHENYX06a.gsb
 
-  cd "${srcdir}/proj-${pkgver}"
+  cd ${srcdir}/$pkgname-$pkgver
 
   ./configure --prefix=/usr
   make
-  make DESTDIR="${pkgdir}" install
+}
+
+package() {
+  cd ${srcdir}/$pkgname-$pkgver
+
+  make DESTDIR=${pkgdir} install
 
-  install -D COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -D COPYING ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/community/proj/proj.changelog b/community/proj/proj.changelog
new file mode 100644
index 000000000..7d3e4bd22
--- /dev/null
+++ b/community/proj/proj.changelog
@@ -0,0 +1,8 @@
+2012-05-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* proj 4.8.0-1
+
+2012-03-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* proj 4.7.0-2 adopted, package signed, FS#27119 fixed
+
+2007-06-27 tardo <tardo@nagi-fanboi.net>
+	* Fixed license dir | license -> licenses
diff --git a/community/quassel/PKGBUILD b/community/quassel/PKGBUILD
index d405bb53b..7f7588299 100644
--- a/community/quassel/PKGBUILD
+++ b/community/quassel/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 68048 2012-03-17 13:06:01Z giovanni $
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
+# $Id: PKGBUILD 70378 2012-05-05 12:50:26Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Vesa Kaihlavirta <vegai@iki.fi>
 
 pkgname=quassel
-pkgver=0.7.3
-pkgrel=2
+pkgver=0.8.0
+pkgrel=1
 pkgdesc="QT4 irc client with a separated core"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://quassel-irc.org/"
@@ -15,7 +16,7 @@ backup=(etc/conf.d/quassel)
 source=("http://quassel-irc.org/pub/$pkgname-$pkgver.tar.bz2"
         'rc.quassel'
         'quassel.conf')
-sha256sums=('9e78dbc28bfeda2ed66fa3082392951cbd002f851ef1a7f1228988bb18c7c98d'
+sha256sums=('a3515bd18e2b100eb9a72480e76b1faefaa5e84cdb236b6af1f05b477a1e9071'
             '845e621448a51ec181554e9327bfcc3a3de1501ae8f70410f0b9b8991ac171b0'
             'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8')
 
diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD
index 954508481..bcd90a3e3 100644
--- a/community/ruby-gtk2/PKGBUILD
+++ b/community/ruby-gtk2/PKGBUILD
@@ -1,13 +1,14 @@
-# $Id: PKGBUILD 70197 2012-05-01 20:53:57Z arodseth $
+# $Id: PKGBUILD 70396 2012-05-05 14:23:49Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Eric Bélanger
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl>
 # Contributor: kritoke <kritoke@nospam.gmail.com>
+
 pkgbase=ruby-gtk2
 pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' 'ruby-pango')
 pkgver=1.1.3
-pkgrel=1
+pkgrel=2
 arch=('x86_64' 'i686' 'mips64el')
 url="http://ruby-gnome2.sourceforge.jp/"
 license=('LGPL')
diff --git a/community/skrooge/PKGBUILD b/community/skrooge/PKGBUILD
index 77eca6e20..61e5c8343 100644
--- a/community/skrooge/PKGBUILD
+++ b/community/skrooge/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 66443 2012-02-24 23:28:14Z jlichtblau $
+# $Id: PKGBUILD 70372 2012-05-05 12:26:17Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Ray Rashif <schiv@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: neuromante <lorenzo.nizzi.grifi@gmail.com>
 
 pkgname=skrooge
-pkgver=1.2.0
+pkgver=1.3.0
 pkgrel=1
 pkgdesc="A personal finances manager for KDE"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ makedepends=('cmake' 'automoc4' 'docbook-xsl')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://skrooge.org/files/$pkgname-$pkgver.tar.bz2)
-sha256sums=('059d2e1dd6feb8e7fcf86b61c0932359b182c207f9dda21642a50253b7857f2a')
+sha256sums=('7f8ec247084a005b743bb080ded5724f6c1ee3644c135e12002c80df93fddfe9')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/skrooge/skrooge.changelog b/community/skrooge/skrooge.changelog
index bbad6e6bc..946388d77 100644
--- a/community/skrooge/skrooge.changelog
+++ b/community/skrooge/skrooge.changelog
@@ -1,3 +1,6 @@
+2012-05-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* skrooge 1.3.0-1
+
 2012-02-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* skrooge 1.2.0-1
 
diff --git a/community/spacefm/PKGBUILD b/community/spacefm/PKGBUILD
new file mode 100644
index 000000000..303105ede
--- /dev/null
+++ b/community/spacefm/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 70364 2012-05-05 07:51:43Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/
+# Contributor: ridikulus_rat <the.ridikulus.rat@gmail.com>
+
+pkgname=spacefm
+pkgver=0.7.6
+pkgrel=2
+pkgdesc="A multi-panel tabbed file manager"
+arch=('i686' 'x86_64')
+url="http://ignorantguru.github.com/spacefm/"
+license=('GPL2')
+install=$pkgname.install
+depends=('gtk2' 'shared-mime-info' 'desktop-file-utils' 'startup-notification' 'udev')
+makedepends=('intltool' 'gettext')
+optdepends=('lsof: device processes'
+            'eject: eject media'
+            'wget: plugin download'
+            'gksu: perform as root functionality'
+            'pmount: mount as non-root user'
+            'udisks: mount as non-root user'
+            'udisks2: mount as non-root user')
+source=(https://raw.github.com/IgnorantGuru/spacefm/master/packages/${pkgver}/spacefm-${pkgver}.tar.xz)
+md5sums=('572b256ab46073d8bb065999bd531423')
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    
+    # NOTE: To enable hal support add --enable-hal to
+    # configure line below. See README for details.
+    # NOTE: To disable inotify and use fam or gamin instead, add:
+    # --disable-inotify to configure line below.
+    # NOTE: To add a custom su program (mysu in this example), add:
+    # --with-preferable-sudo="mysu"  to configure line below.
+    
+    ./configure --prefix=/usr
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}/" install
+}
+
diff --git a/community/spacefm/spacefm.install b/community/spacefm/spacefm.install
new file mode 100644
index 000000000..1182e768f
--- /dev/null
+++ b/community/spacefm/spacefm.install
@@ -0,0 +1,12 @@
+post_install() {
+  update-mime-database usr/share/mime > /dev/null
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community/viking/PKGBUILD b/community/viking/PKGBUILD
index 3fad1772e..e09285b19 100644
--- a/community/viking/PKGBUILD
+++ b/community/viking/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 59505 2011-11-27 13:11:14Z jlichtblau $
+# $Id: PKGBUILD 70383 2012-05-05 13:23:37Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Nick Østergaard <oe.nick@gmail.com>
 # Contributor: Jonny Gerold <jonny@fsk141.com>
 
 pkgname=viking
-pkgver=1.2.2
+pkgver=1.3
 pkgrel=1
 pkgdesc="GTK+2 application to manage GPS data"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://viking.sourceforge.net/"
 license=('GPL2')
-depends=('curl' 'gpsd' 'gtk2' 'hicolor-icon-theme')
+depends=('curl' 'gpsd' 'gtk2' 'hicolor-icon-theme' 'libexif')
 makedepends=('intltool' 'gnome-doc-utils')
 optdepends=('gpsbabel: for GPS management')
 options=('!emptydirs')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('9f96f9bdfc9cae8c65d391f9e972a987ec7f3d9d662a0e4df8bd14282879b10c')
+sha256sums=('54dc43b0136722118b8402d51ac8d78180ad59cc37e37ddf3fb6a7ee6bf04fdf')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/viking/viking.changelog b/community/viking/viking.changelog
index b195927d1..d9333735f 100644
--- a/community/viking/viking.changelog
+++ b/community/viking/viking.changelog
@@ -1,3 +1,6 @@
+2012-05-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* viking 1.3.0-1
+
 2011-11-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* viking 1.2.2-1
 
diff --git a/community/viking/viking.install b/community/viking/viking.install
index 1a05f573e..bce670aff 100644
--- a/community/viking/viking.install
+++ b/community/viking/viking.install
@@ -1,5 +1,6 @@
 post_install() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/community/vym/PKGBUILD b/community/vym/PKGBUILD
index 4af6ea712..ac2b0efc7 100644
--- a/community/vym/PKGBUILD
+++ b/community/vym/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 61822 2012-01-08 17:53:27Z jlichtblau $
+# $Id: PKGBUILD 70394 2012-05-05 13:56:05Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> 
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: S�ren Holm <sgh@sgh.dk> 
 
 pkgname=vym
-pkgver=2.0.3
+pkgver=2.0.12
 pkgrel=1
 pkgdesc="A mindmapping tool"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ changelog=$pkgname.changelog
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 \
         $pkgname.desktop)
-sha256sums=('b04b57647adef84920c140fb5900ca884235a00bfd88ef6352ecf700a96717c4'
+sha256sums=('6557ce134506f6654767c63e4a7aedbd9acc4c6f02e38cdb6041fa4ca51ca06c'
             'e299c69c213e7aac3f5b5d0ab088132b4ec7cb63a391f272e75ed64f049d541b')
 
 build() {
diff --git a/community/vym/vym.changelog b/community/vym/vym.changelog
index f3146af3a..6035624df 100644
--- a/community/vym/vym.changelog
+++ b/community/vym/vym.changelog
@@ -1,3 +1,6 @@
+2012-05-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* vym 2.0.12-1
+
 2012-01-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* vym 2.0.3-1
 
diff --git a/community/xplanet/PKGBUILD b/community/xplanet/PKGBUILD
index 16fccd280..b9221c93e 100644
--- a/community/xplanet/PKGBUILD
+++ b/community/xplanet/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 63792 2012-02-05 12:15:38Z ibiru $
+# $Id: PKGBUILD 70418 2012-05-05 19:10:15Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: dorphell <dorphell@archlinux.org>
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=xplanet
-pkgver=1.2.2
-pkgrel=2
+pkgver=1.3.0
+pkgrel=1
 pkgdesc="An Xearth wannabe"
 arch=(i686 x86_64 'mips64el')
 url="http://xplanet.sourceforge.net/"
 license=('GPL')
 depends=('pango' 'libungif' 'libtiff' 'libxss')
 source=(http://downloads.sourceforge.net/project/xplanet/xplanet/$pkgver/xplanet-$pkgver.tar.gz)
-md5sums=('b38c3b4cfdd772643f876a9bb15f288b')
+md5sums=('41f7db2ccd1d8b4b989cacaf9adfe692')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD
index f892eeabc..ff3ce0a7a 100644
--- a/core/lvm2/PKGBUILD
+++ b/core/lvm2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 157318 2012-04-26 22:51:18Z eric $
+# $Id: PKGBUILD 158638 2012-05-05 04:07:30Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
 pkgver=2.02.95
-pkgrel=2
+pkgrel=4
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceware.org/lvm2/"
 license=('GPL2' 'LGPL2.1')
@@ -23,7 +23,8 @@ sha1sums=('f61dfbd8e9219291d11de3d70f0b3d20a29fae85'
 build() {
   cd "${srcdir}/LVM2.${pkgver}"
   unset LDFLAGS
-  ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --localstatedir=/var \
+  ./configure --prefix=/ --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \
+    --includedir=/usr/include --with-usrlibdir=/usr/lib  --libdir=/usr/lib --with-udev-prefix=/usr \
     --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \
     --enable-udev_sync --enable-udev_rules
   make
diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD
index c301880e2..1a0ebffaa 100644
--- a/extra/miro/PKGBUILD
+++ b/extra/miro/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 148432 2012-01-31 20:05:46Z ronald $
+# $Id: PKGBUILD 158653 2012-05-05 12:58:13Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=miro
-pkgver=4.0.6
+pkgver=5.0
 pkgrel=1
 pkgdesc="The free and open source internet TV platform"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,12 +13,12 @@ depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
          'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme'
          'gstreamer0.10-python' 'python-notify' 'libtorrent-rasterbar'
          'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl' 
-         'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen')
-makedepends=('pkg-config')
+         'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen' 'xdg-utils')
+makedepends=('pkg-config' 'boost')
 install=miro.install
 options=('!makeflags')
 source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('5c3d632d8cf30516b321f79b22d4468b61ff9e6c')
+sha1sums=('64350e658ac427378b84ff1356adce668ddbd521')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -29,4 +29,18 @@ build() {
   # fix miro startup script so --debug works with python2
   sed -i "s|which python|which python2|" "${pkgdir}/usr/bin/miro"
   sed -i "s|./miro.real|/usr/bin/miro.real|" "${pkgdir}/usr/bin/miro"
+
+  # fix python scripts for python2
+  sed -i "s|/usr/bin/env python|/usr/bin/env python2|" ${pkgdir}/usr/share/miro/resources/searchengines/update-icons.py
+  for i in usr/share/miro/resources/testdata/echonest-replies/generate.py usr/share/miro/resources/searchengines/update-icons.py \
+    usr/share/miro/resources/testdata/7digital-replies/generate.py; do
+    sed -i "s|/usr/bin/python|/usr/bin/python2|" ${pkgdir}/${i} 
+  done
+
+  # Fakeroot segfaults on these; remove
+  if [ ${arch} == "i686" ]; then
+    rm -f ${pkgdir}/usr/bin/codegen.Linux-x86_64 || true
+  else
+    rm -f ${pkgdir}/usr/bin/codegen.Linux-i686 || true
+  fi
 }
diff --git a/extra/sysklogd/PKGBUILD b/extra/sysklogd/PKGBUILD
index ebd117193..d07395b8d 100644
--- a/extra/sysklogd/PKGBUILD
+++ b/extra/sysklogd/PKGBUILD
@@ -1,44 +1,52 @@
-# $Id: PKGBUILD 122666 2011-05-05 23:43:52Z eric $
+# $Id: PKGBUILD 158662 2012-05-05 22:14:49Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=sysklogd
 pkgver=1.5
-pkgrel=3
+pkgrel=4
 pkgdesc="System and kernel log daemons"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.infodrom.org/projects/sysklogd/"
 license=('GPL' 'BSD')
-depends=('glibc' 'logrotate')
+depends=('glibc' 'bash')
 provides=('logger')
 backup=('etc/syslog.conf' 'etc/logrotate.d/syslog')
-source=(http://www.infodrom.org/projects/sysklogd/download/${pkgname}-${pkgver}.tar.gz \
-        sysklogd-debian.patch syslog.conf syslog.logrotate syslogd klogd LICENSE)
-md5sums=('e053094e8103165f98ddafe828f6ae4b'
-         '1759e667ecf07ba23297f2c05b8dbe3f'
-         'b8bc568494359fa932b7a5e17c4ba4de'
-         'fb3fdb03959ff62ede00487c853bb950'
-         '92531ee64cdc0ca978bbe9a81c269211'
-         'c2fe75c82c35371972b6ceda72d6a861'
-         '7930f7ff5038e1318511624e348581cc')
+source=(http://www.infodrom.org/projects/sysklogd/download/${pkgname}-${pkgver}.tar.gz{,.asc} \
+        syslog.conf syslog.logrotate syslogd klogd LICENSE \
+        sysklogd-1.4.1-caen-owl-syslogd-bind.diff \
+        sysklogd-1.4.1-caen-owl-syslogd-drop-root.diff \
+        sysklogd-1.4.1-caen-owl-klogd-drop-root.diff \
+        sysklogd-1.5-syslog-func-collision.patch)
 sha1sums=('070cce745b023f2ce7ca7d9888af434d6d61c236'
-          '7a7320b8e4e21d85cfc9a5aa478a8b013b8afe96'
+          '9599322fc176004d95b5111b05f665b5191dfe67'
           '35b4cb76109a6ffe9269021a6bfb4f8da614a4eb'
           'e67c0f78f13c94507d3f686b4e5b8340db4624fd'
           '848beb23b9ca4de19c6022df03878dbe57e04c0a'
           'f46088f761c033562a59bc13d4888b7343bc02fc'
-          'c416bcefd3d3d618139cc7912310caddf34c0c0b')
+          'c416bcefd3d3d618139cc7912310caddf34c0c0b'
+          '849b2dcaf11060d583ccb3c48356a6971df45cf0'
+          '9701989490748b0c5a1727e0fc459179d0e350a8'
+          '76da0ecd9bca969e292a6ec58d7cd96e4c97e525'
+          '826e76a59834868658eb9f8d8f3aabd8bf748759')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i ../sysklogd-debian.patch
-  sed -i "s/-O3/${CFLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE/" Makefile
+# CAEN/OWL security patches
+  patch -p1 -i ../sysklogd-1.4.1-caen-owl-syslogd-bind.diff
+  patch -p1 -i ../sysklogd-1.4.1-caen-owl-syslogd-drop-root.diff 
+  patch -p1 -i ../sysklogd-1.4.1-caen-owl-klogd-drop-root.diff
+
+  patch -p1 -i ../sysklogd-1.5-syslog-func-collision.patch
+  sed -i -e "s/-O3/${CFLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE/" \
+         -e "s/LDFLAGS= -s/LDFLAGS= ${LDFLAGS}/" Makefile
+  sed -i 's/500 -s/755/' Makefile
   make
 }
 
 package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   install -d "${pkgdir}/usr/sbin" "${pkgdir}"/usr/share/man/{man5,man8}
-  make INSTALL=/bin/install prefix="${pkgdir}" install
+  make prefix="${pkgdir}" install
   install -D -m644 ../syslog.conf "${pkgdir}/etc/syslog.conf"
   install -D -m644 ../syslog.logrotate "${pkgdir}/etc/logrotate.d/syslog"
   install -D -m755 ../syslogd "${pkgdir}/etc/rc.d/syslogd"
diff --git a/extra/sysklogd/sysklogd-1.4.1-caen-owl-klogd-drop-root.diff b/extra/sysklogd/sysklogd-1.4.1-caen-owl-klogd-drop-root.diff
new file mode 100644
index 000000000..e2597fe1a
--- /dev/null
+++ b/extra/sysklogd/sysklogd-1.4.1-caen-owl-klogd-drop-root.diff
@@ -0,0 +1,161 @@
+diff -Naur sysklogd-1.4.1-orig/klogd.8 sysklogd-1.4.1/klogd.8
+--- sysklogd-1.4.1-orig/klogd.8	2005-03-11 11:12:09.000000000 -0500
++++ sysklogd-1.4.1/klogd.8	2005-10-17 23:47:41.615009160 -0400
+@@ -18,6 +19,12 @@
+ .RB [ " \-f "
+ .I fname
+ ]
++.RB [ " \-u "
++.I username
++]
++.RB [ " \-j "
++.I chroot_dir
++]
+ .RB [ " \-iI " ]
+ .RB [ " \-n " ]
+ .RB [ " \-o " ]
+@@ -53,6 +60,20 @@
+ .BI "\-f " file
+ Log messages to the specified filename rather than to the syslog facility.
+ .TP
++.BI "\-u " username
++Tells klogd to become the specified user and drop root privileges before
++starting logging.
++.TP
++.BI "\-j " chroot_dir
++Tells klogd to
++.BR chroot (2)
++into this directory after initializing.
++This option is only valid if the \-u option is also used to run klogd
++without root privileges.
++Note that the use of this option will prevent \-i and \-I from working
++unless you set up the chroot directory in such a way that klogd can still
++read the kernel module symbols.
++.TP
+ .BI "\-i \-I"
+ Signal the currently executing klogd daemon.  Both of these switches control
+ the loading/reloading of symbol information.  The \-i switch signals the
+diff -Naur sysklogd-1.4.1-orig/klogd.c sysklogd-1.4.1/klogd.c
+--- sysklogd-1.4.1-orig/klogd.c	2004-04-29 09:29:03.000000000 -0400
++++ sysklogd-1.4.1/klogd.c	2005-10-17 23:46:05.200556847 -0400
+@@ -261,6 +261,8 @@
+ #include <stdarg.h>
+ #include <paths.h>
+ #include <stdlib.h>
++#include <pwd.h>
++#include <grp.h>
+ #include "klogd.h"
+ #include "ksyms.h"
+ #ifndef TESTING
+@@ -311,6 +313,9 @@
+ int debugging = 0;
+ int symbols_twice = 0;
+ 
++char *server_user = NULL;
++char *chroot_dir = NULL;
++int log_flags = 0;
+ 
+ /* Function prototypes. */
+ extern int ksyslog(int type, char *buf, int len);
+@@ -531,8 +536,9 @@
+ 	 * First do a stat to determine whether or not the proc based
+ 	 * file system is available to get kernel messages from.
+ 	 */
+-	if ( use_syscall ||
+-	    ((stat(_PATH_KLOG, &sb) < 0) && (errno == ENOENT)) )
++	if (!server_user &&
++	    (use_syscall ||
++	    ((stat(_PATH_KLOG, &sb) < 0) && (errno == ENOENT))))
+ 	{
+ 	  	/* Initialize kernel logging. */
+ 	  	ksyslog(1, NULL, 0);
+@@ -980,6 +986,27 @@
+ }
+ 
+ 
++static int drop_root(void)
++{
++	struct passwd *pw;
++
++	if (!(pw = getpwnam(server_user))) return -1;
++
++	if (!pw->pw_uid) return -1;
++
++	if (chroot_dir) {
++		if (chroot(chroot_dir)) return -1;
++		if (chdir("/")) return -1;
++	}
++
++	if (setgroups(0, NULL)) return -1;
++	if (setgid(pw->pw_gid)) return -1;
++	if (setuid(pw->pw_uid)) return -1;
++
++	return 0;
++}
++
++
+ int main(argc, argv)
+ 
+ 	int argc;
+@@ -997,7 +1024,7 @@
+ 	chdir ("/");
+ #endif
+ 	/* Parse the command-line. */
+-	while ((ch = getopt(argc, argv, "c:df:iIk:nopsvx2")) != EOF)
++	while ((ch = getopt(argc, argv, "c:df:u:j:iIk:nopsvx2")) != EOF)
+ 		switch((char)ch)
+ 		{
+ 		    case '2':		/* Print lines with symbols twice. */
+@@ -1019,6 +1046,10 @@
+ 		    case 'I':
+ 			SignalDaemon(SIGUSR2);
+ 			return(0);
++		    case 'j':		/* chroot 'j'ail */
++			chroot_dir = optarg;
++			log_flags |= LOG_NDELAY;
++			break;
+ 		    case 'k':		/* Kernel symbol file. */
+ 			symfile = optarg;
+ 			break;
+@@ -1034,6 +1065,9 @@
+ 		    case 's':		/* Use syscall interface. */
+ 			use_syscall = 1;
+ 			break;
++		    case 'u':		/* Run as this user */
++			server_user = optarg;
++			break;
+ 		    case 'v':
+ 			printf("klogd %s.%s\n", VERSION, PATCHLEVEL);
+ 			exit (1);
+@@ -1042,6 +1076,10 @@
+ 			break;
+ 		}
+ 
++	if (chroot_dir && !server_user) {
++		fputs("'-j' is only valid with '-u'", stderr);
++		exit(1);
++	}
+ 
+ 	/* Set console logging level. */
+ 	if ( log_level != (char *) 0 )
+@@ -1139,7 +1177,7 @@
+ 		}
+ 	}
+ 	else
+-		openlog("kernel", 0, LOG_KERN);
++		openlog("kernel", log_flags, LOG_KERN);
+ 
+ 
+ 	/* Handle one-shot logging. */
+@@ -1166,6 +1204,11 @@
+ 		InitMsyms();
+ 	}
+ 
++	if (server_user && drop_root()) {
++		syslog(LOG_ALERT, "klogd: failed to drop root");
++		Terminate();
++	}
++
+         /* The main loop. */
+ 	while (1)
+ 	{
diff --git a/extra/sysklogd/sysklogd-1.4.1-caen-owl-syslogd-bind.diff b/extra/sysklogd/sysklogd-1.4.1-caen-owl-syslogd-bind.diff
new file mode 100644
index 000000000..e79a67d0b
--- /dev/null
+++ b/extra/sysklogd/sysklogd-1.4.1-caen-owl-syslogd-bind.diff
@@ -0,0 +1,104 @@
+diff -ur sysklogd-1.4.1.orig/sysklogd.8 sysklogd-1.4.1/sysklogd.8
+--- sysklogd-1.4.1.orig/sysklogd.8	Sun Mar 11 22:35:51 2001
++++ sysklogd-1.4.1/sysklogd.8	Mon Oct  8 07:20:31 2001
+@@ -15,6 +15,9 @@
+ .I config file
+ ]
+ .RB [ " \-h " ] 
++.RB [ " \-i "
++.I IP address
++]
+ .RB [ " \-l "
+ .I hostlist
+ ]
+@@ -103,8 +106,15 @@
+ Specifying this switch on the command line will cause the log daemon to
+ forward any remote messages it receives to forwarding hosts which have been
+ defined.
+ This can cause syslog loops that fill up hard disks quite fast and
+ thus needs to be used with caution.
++.TP
++.BI "\-i " "IP address"
++If
++.B syslogd
++is configured to accept log input from a UDP port, specify an IP address
++to bind to, rather than the default of INADDR_ANY.  The address must be in
++dotted quad notation, DNS host names are not allowed.
+ .TP
+ .BI "\-l " "hostlist"
+ Specify a hostname that should be logged only with its simple hostname
+diff -ur sysklogd-1.4.1.orig/syslogd.c sysklogd-1.4.1/syslogd.c
+--- sysklogd-1.4.1.orig/syslogd.c	Sun Mar 11 22:40:10 2001
++++ sysklogd-1.4.1/syslogd.c	Mon Oct  8 07:24:41 2001
+@@ -736,6 +736,8 @@
+ int	NoHops = 1;		/* Can we bounce syslog messages through an
+ 				   intermediate host. */
+ 
++char	*bind_addr = NULL;	/* bind UDP port to this interface only */
++
+ extern	int errno;
+ 
+ /* Function prototypes. */
+@@ -829,7 +831,7 @@
+ 		funix[i]  = -1;
+ 	}
+ 
+-	while ((ch = getopt(argc, argv, "a:dhf:l:m:np:rs:v")) != EOF)
++	while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:v")) != EOF)
+ 		switch((char)ch) {
+ 		case 'a':
+ 			if (nfunix < MAXFUNIX)
+@@ -846,9 +848,17 @@
+ 		case 'h':
+ 			NoHops = 0;
+ 			break;
++		case 'i':
++			if (bind_addr) {
++				fprintf(stderr, "Only one -i argument allowed, "
++					"the first one is taken.\n");
++				break;
++			}
++			bind_addr = optarg;
++			break;
+ 		case 'l':
+ 			if (LocalHosts) {
+-				fprintf (stderr, "Only one -l argument allowed," \
++				fprintf(stderr, "Only one -l argument allowed, "
+ 					"the first one is taken.\n");
+ 				break;
+ 			}
+@@ -1175,7 +1185,7 @@
+ int usage()
+ {
+ 	fprintf(stderr, "usage: syslogd [-drvh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \
+-		" [-s domainlist] [-f conffile]\n");
++		" [-s domainlist] [-f conffile] [-i IP address]\n");
+ 	exit(1);
+ }
+ 
+@@ -1217,15 +1227,22 @@
+ 	int fd, on = 1;
+ 	struct sockaddr_in sin;
+ 
++	memset(&sin, 0, sizeof(sin));
++	sin.sin_family = AF_INET;
++	sin.sin_port = LogPort;
++	if (bind_addr) {
++		if (!inet_aton(bind_addr, &sin.sin_addr)) {
++			logerror("syslog: not a valid IP address to bind to.");
++			return -1;
++		}
++	}
++
+ 	fd = socket(AF_INET, SOCK_DGRAM, 0);
+ 	if (fd < 0) {
+ 		logerror("syslog: Unknown protocol, suspending inet service.");
+ 		return fd;
+ 	}
+ 
+-	memset(&sin, 0, sizeof(sin));
+-	sin.sin_family = AF_INET;
+-	sin.sin_port = LogPort;
+ 	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, \
+ 		       (char *) &on, sizeof(on)) < 0 ) {
+ 		logerror("setsockopt(REUSEADDR), suspending inet");
diff --git a/extra/sysklogd/sysklogd-1.4.1-caen-owl-syslogd-drop-root.diff b/extra/sysklogd/sysklogd-1.4.1-caen-owl-syslogd-drop-root.diff
new file mode 100644
index 000000000..b5813c1d2
--- /dev/null
+++ b/extra/sysklogd/sysklogd-1.4.1-caen-owl-syslogd-drop-root.diff
@@ -0,0 +1,117 @@
+diff -ur sysklogd-1.4.1-caen-owl-syslogd-bind/sysklogd.8 sysklogd-1.4.1/sysklogd.8
+--- sysklogd-1.4.1-caen-owl-syslogd-bind/sysklogd.8	Mon Oct  8 07:26:27 2001
++++ sysklogd-1.4.1/sysklogd.8	Mon Oct  8 07:30:31 2001
+@@ -32,6 +32,9 @@
+ .RB [ " \-s "
+ .I domainlist
+ ]
++.RB [ " \-u"
++.IB username
++]
+ .RB [ " \-v " ]
+ .LP
+ .SH DESCRIPTION
+@@ -159,6 +162,19 @@
+ is specified and the host logging resolves to satu.infodrom.north.de
+ no domain would be cut, you will have to specify two domains like:
+ .BR "\-s north.de:infodrom.north.de" .
++.TP
++.BI "\-u " "username"
++This causes the
++.B syslogd
++daemon to become the named user before starting up logging.
++
++Note that when this option is in use,
++.B syslogd
++will open all log files as root when the daemon is first started;
++however, after a
++.B SIGHUP
++the files will be reopened as the non-privileged user.  You should
++take this into account when deciding the ownership of the log files.
+ .TP
+ .B "\-v"
+ Print version and exit.
+diff -ur sysklogd-1.4.1-caen-owl-syslogd-bind/syslogd.c sysklogd-1.4.1/syslogd.c
+--- sysklogd-1.4.1-caen-owl-syslogd-bind/syslogd.c	Mon Oct  8 07:26:27 2001
++++ sysklogd-1.4.1/syslogd.c	Mon Oct  8 07:40:35 2001
+@@ -491,6 +491,10 @@
+ #include <arpa/nameser.h>
+ #include <arpa/inet.h>
+ #include <resolv.h>
++
++#include <pwd.h>
++#include <grp.h>
++
+ #ifndef TESTING
+ #include "pidfile.h"
+ #endif
+@@ -737,6 +741,7 @@
+ 				   intermediate host. */
+ 
+ char	*bind_addr = NULL;	/* bind UDP port to this interface only */
++char	*server_user = NULL;	/* user name to run server as */
+ 
+ extern	int errno;
+ 
+@@ -778,6 +783,21 @@
+ static int create_inet_socket();
+ #endif
+ 
++static int drop_root(void)
++{
++	struct passwd *pw;
++
++	if (!(pw = getpwnam(server_user))) return -1;
++
++	if (!pw->pw_uid) return -1;
++
++	if (initgroups(server_user, pw->pw_gid)) return -1;
++	if (setgid(pw->pw_gid)) return -1;
++	if (setuid(pw->pw_uid)) return -1;
++
++	return 0;
++}
++
+ int main(argc, argv)
+ 	int argc;
+ 	char **argv;
+@@ -831,7 +851,7 @@
+ 		funix[i]  = -1;
+ 	}
+ 
+-	while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:v")) != EOF)
++	while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:u:v")) != EOF)
+ 		switch((char)ch) {
+ 		case 'a':
+ 			if (nfunix < MAXFUNIX)
+@@ -884,6 +904,9 @@
+ 			}
+ 			StripDomains = crunch_list(optarg);
+ 			break;
++		case 'u':
++			server_user = optarg;
++			break;
+ 		case 'v':
+ 			printf("syslogd %s.%s\n", VERSION, PATCHLEVEL);
+ 			exit (0);
+@@ -1031,6 +1054,11 @@
+ 		kill (ppid, SIGTERM);
+ #endif
+ 
++	if (server_user && drop_root()) {
++		dprintf("syslogd: failed to drop root\n");
++		exit(1);
++	}
++
+ 	/* Main loop begins here. */
+ 	for (;;) {
+ 		int nfds;
+@@ -1185,7 +1213,7 @@
+ int usage()
+ {
+ 	fprintf(stderr, "usage: syslogd [-drvh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \
+-		" [-s domainlist] [-f conffile] [-i IP address]\n");
++		" [-s domainlist] [-f conffile] [-i IP address] [-u username]\n");
+ 	exit(1);
+ }
+ 
diff --git a/extra/sysklogd/sysklogd-1.5-syslog-func-collision.patch b/extra/sysklogd/sysklogd-1.5-syslog-func-collision.patch
new file mode 100644
index 000000000..76912a265
--- /dev/null
+++ b/extra/sysklogd/sysklogd-1.5-syslog-func-collision.patch
@@ -0,0 +1,103 @@
+http://bugs.gentoo.org/342601
+
+rename local "syslog" and "vsyslog" functions to avoid conflicts with glibc's
+
+patch by Dmitriy Matrosov
+
+--- sysklogd-1.5/klogd.c
++++ sysklogd-1.5/klogd.c
+@@ -258,7 +262,6 @@
+ #if !defined(__GLIBC__)
+ #include <linux/time.h>
+ #endif /* __GLIBC__ */
+-#include <stdarg.h>
+ #include <paths.h>
+ #include <stdlib.h>
+ #include <pwd.h>
+@@ -637,7 +640,7 @@
+ 			}
+ 			argl += 3;
+ 		}
+-		syslog(priority, fmt, argl);
++		syslog_own(priority, fmt, argl);
+ 		va_end(ap);
+ #ifdef TESTING
+ 		putchar('\n');
+@@ -646,7 +649,7 @@
+ 	}
+ 
+ 	va_start(ap, fmt);
+-	vsyslog(priority, fmt, ap);
++	vsyslog_own(priority, fmt, ap);
+ 	va_end(ap);
+ #ifdef TESTING
+ 	printf ("\n");
+@@ -1205,7 +1208,7 @@
+ 	}
+ 
+ 	if (server_user && drop_root()) {
+-		syslog(LOG_ALERT, "klogd: failed to drop root");
++		syslog_own(LOG_ALERT, "klogd: failed to drop root");
+ 		Terminate();
+ 	}
+ 
+--- sysklogd-1.5/klogd.h
++++ sysklogd-1.5/klogd.h
+@@ -24,6 +24,7 @@
+ #include <stdio.h>
+ #include <syslog.h>
+ #include <string.h>
++#include <stdarg.h>
+ 
+ 
+ /* Function prototypes. */
+@@ -38,3 +43,5 @@
+ extern char * ExpandKadds(char *, char *);
+ extern void SetParanoiaLevel(int);
+ extern void Syslog(int priority, char *fmt, ...);
++extern void syslog_own(int, const char *, ...);
++extern void vsyslog_own(int, const char *, va_list);
+--- sysklogd-1.5/ksym_mod.c
++++ sysklogd-1.5/ksym_mod.c
+@@ -95,7 +98,6 @@
+ #if !defined(__GLIBC__)
+ #include <linux/time.h>
+ #endif /* __GLIBC__ */
+-#include <stdarg.h>
+ #include <paths.h>
+ #include <linux/version.h>
+ 
+--- sysklogd-1.5/syslog.c
++++ sysklogd-1.5/syslog.c
+@@ -75,6 +79,10 @@
+ 
+ #define	_PATH_LOGNAME	"/dev/log"
+ 
++
++void syslog_own(int, const char *, ...);
++void vsyslog_own(int, const char *, va_list);
++
+ static int	LogFile = -1;		/* fd for log */
+ static int	connected;		/* have done connect */
+ static int	LogStat = 0;		/* status bits, set by openlog() */
+@@ -82,17 +90,17 @@
+ static int	LogFacility = LOG_USER;	/* default facility code */
+ 
+ void
+-syslog(int pri, const char *fmt, ...)
++syslog_own(int pri, const char *fmt, ...)
+ {
+ 	va_list ap;
+ 
+ 	va_start(ap, fmt);
+-	vsyslog(pri, fmt, ap);
++	vsyslog_own(pri, fmt, ap);
+ 	va_end(ap);
+ }
+ 
+ void
+-vsyslog(pri, fmt, ap)
++vsyslog_own(pri, fmt, ap)
+ 	int pri;
+ 	const char *fmt;
+ 	va_list ap;
diff --git a/testing/ntfs-3g_ntfsprogs/PKGBUILD b/testing/ntfs-3g_ntfsprogs/PKGBUILD
new file mode 100644
index 000000000..d1084ddee
--- /dev/null
+++ b/testing/ntfs-3g_ntfsprogs/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 158659 2012-05-05 16:20:23Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Thomas Bächler <thomas.archlinux.org>
+
+pkgbase=ntfs-3g_ntfsprogs
+pkgname=('ntfs-3g' 'ntfsprogs')
+pkgver=2012.1.15
+pkgrel=3
+url="http://www.tuxera.com"
+arch=('i686' 'x86_64')
+license=('GPL2')
+depends=('glibc' 'fuse')
+makedepends=('pkgconfig')
+options=('!libtool')
+source=(http://tuxera.com/opensource/$pkgbase-$pkgver.tgz)
+sha1sums=('8d55cf49afde172fefa369a0a85289e09c4d7bbb')
+
+build() {
+  cd "$srcdir/$pkgbase-$pkgver"
+  ac_cv_path_LDCONFIG=/bin/true ./configure --prefix=/usr \
+    --with-fuse=external --disable-static \
+    --enable-posix-acls --mandir=/usr/share/man
+  make
+}
+
+package_ntfs-3g() {
+  pkgdesc="Stable read and write NTFS driver"
+
+  for DIR in src libntfs-3g include; do
+    cd "$srcdir/$pkgbase-$pkgver/$DIR"
+    make DESTDIR="$pkgdir" install
+  done
+
+  mv "$pkgdir"/lib/* "$pkgdir"/usr/lib/
+  mv "$pkgdir"/bin/* "$pkgdir"/usr/bin/
+  rm -rf "$pkgdir"/{lib,{s,}bin}
+
+  cd "$pkgdir"/usr/bin
+  ln -s ntfs-3g mount.ntfs
+  ln -s ntfs-3g mount.ntfs-3g
+  ln -s lowntfs-3g mount.lowntfs-3g
+}
+
+package_ntfsprogs() {
+  pkgdesc="NTFS filesystem utilities"
+  depends=('util-linux' 'ntfs-3g')
+
+  cd "$srcdir/$pkgbase-$pkgver/ntfsprogs"
+  make DESTDIR="$pkgdir" install
+
+  mv "$pkgdir"/sbin/* "$pkgdir"/usr/bin/
+  rm -rf "$pkgdir"/sbin
+}