Tue May 27 03:35:23 UTC 2014

30 files changed, 148 insertions, 1731 deletions

diff --git a/community/dietlibc/PKGBUILD b/community/dietlibc/PKGBUILD
index d52295e95..058e975c8 100644
--- a/community/dietlibc/PKGBUILD
+++ b/community/dietlibc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 100866 2013-11-12 15:53:53Z spupykin $
+# $Id: PKGBUILD 111875 2014-05-26 09:29:18Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Tino Reichardt <milky-archlinux@mcmilk.de>
 
 pkgname=dietlibc
 pkgver=0.33
-pkgrel=3
+pkgrel=4
 pkgdesc="a libc optimized for small size"
 arch=('i686' 'x86_64')
 url="http://www.fefe.de/dietlibc/"
@@ -22,4 +22,6 @@ build() {
 package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
+  mkdir -p $pkgdir/usr/bin
+  ln -s /opt/diet/bin/diet $pkgdir/usr/bin/diet
 }
diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD
deleted file mode 100644
index ba4a52ebc..000000000
--- a/community/gnome-settings-daemon-updates/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 109431 2014-04-14 20:16:52Z jgc $
-# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
-
-_pkgname=gnome-settings-daemon
-pkgname=$_pkgname-updates
-pkgver=3.12.0.1
-pkgrel=1
-pkgdesc="Updates plugin for the GNOME Settings daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gnome-packagekit' "$_pkgname")
-makedepends=('intltool' 'gtk-doc' 'gnome-desktop' 'gnome-common' 'xf86-input-wacom')
-options=('!emptydirs')
-install=$_pkgname.install
-url="http://www.gnome.org"
-source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz"
-	'packagekit-0.8.patch'
-	'arch.patch')
-sha256sums=('c21cfcee008da6935ed7f7e814a788a951ba67cc728e43f888b174701cd96847'
-            '2fd5ee457f5d57bfd9edef049719f55ab1cab5fe6d0fb422f91fe363c02e6efd'
-            '217004c112b18cf136c535ef3d6cc90f0cecc495573cfb8653ff089230d248bb')
-
-prepare() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  patch -RNp1 -i "$srcdir/packagekit-0.8.patch"
-  patch -Np1 -i "$srcdir/arch.patch"
-}
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  autoreconf -fi
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --localstatedir=/var \
-              --libexecdir=/usr/lib/gnome-settings-daemon \
-              --disable-static
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make -C 'gnome-settings-daemon'
-  make -C 'plugins/updates'
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  make -C 'plugins/updates' DESTDIR="${pkgdir}" install
-}
diff --git a/community/gnome-settings-daemon-updates/arch.patch b/community/gnome-settings-daemon-updates/arch.patch
deleted file mode 100644
index 297b98a48..000000000
--- a/community/gnome-settings-daemon-updates/arch.patch
+++ /dev/null
@@ -1,336 +0,0 @@
-diff --git a/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
-index 9af2718..bb45e48 100644
---- a/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
-+++ b/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
-@@ -16,7 +16,7 @@
-       <_description>Use mobile broadband connections such as GSM and CDMA to check for updates.</_description>
-     </key>
-     <key name="auto-download-updates" type="b">
--      <default>true</default>
-+      <default>false</default>
-       <_summary>Automatically download updates in the background without confirmation</_summary>
-       <_description>Automatically download updates in the background without confirmation. Updates will be auto-downloaded when using wired network connnections, and mobile broadband if 'connection-use-mobile' is enabled.</_description>
-     </key>
-@@ -36,7 +36,7 @@
-       <_description>The last time we notified the user about non-critical updates. Value is in seconds since the epoch, or zero for never.</_description>
-     </key>
-     <key name="frequency-get-upgrades" type="i">
--      <default>604800</default>
-+      <default>0</default>
-       <_summary>How often to check for distribution upgrades</_summary>
-       <_description>How often to check for distribution upgrades. Value is in seconds.</_description>
-     </key>
-diff --git a/plugins/updates/Makefile.am b/plugins/updates/Makefile.am
-index 81c7179..6fd3534 100644
---- a/plugins/updates/Makefile.am
-+++ b/plugins/updates/Makefile.am
-@@ -15,7 +15,9 @@ libupdates_la_SOURCES = \
- 	gsd-updates-firmware.h \
- 	gsd-updates-firmware.c \
- 	gsd-updates-manager.h \
--	gsd-updates-manager.c
-+	gsd-updates-manager.c \
-+	gsd-updates-watch.h \
-+	gsd-updates-watch.c
- 
- libupdates_la_CPPFLAGS = \
- 	-I$(top_srcdir)/gnome-settings-daemon \
-@@ -58,7 +60,9 @@ gsd_test_updates_SOURCES =		\
- 	gsd-updates-firmware.h		\
- 	gsd-updates-firmware.c		\
- 	gsd-updates-manager.h		\
--	gsd-updates-manager.c
-+	gsd-updates-manager.c		\
-+	gsd-updates-watch.h		\
-+	gsd-updates-watch.c
- 
- gsd_test_updates_CPPFLAGS =					\
- 	-I$(top_srcdir)/data/					\
-diff --git a/plugins/updates/gsd-updates-manager.c b/plugins/updates/gsd-updates-manager.c
-index 95ee1c4..7b26c06 100644
---- a/plugins/updates/gsd-updates-manager.c
-+++ b/plugins/updates/gsd-updates-manager.c
-@@ -33,6 +33,7 @@
- #include "gsd-updates-manager.h"
- #include "gsd-updates-firmware.h"
- #include "gsd-updates-refresh.h"
-+#include "gsd-updates-watch.h"
- #include "gsd-updates-common.h"
- #include "gnome-settings-profile.h"
- 
-@@ -47,6 +48,7 @@ struct GsdUpdatesManagerPrivate
-         GCancellable            *cancellable;
-         GsdUpdatesRefresh       *refresh;
-         GsdUpdatesFirmware      *firmware;
-+        GsdUpdatesWatch         *watch;
-         GSettings               *settings_proxy;
-         GSettings               *settings_ftp;
-         GSettings               *settings_gsd;
-@@ -1360,6 +1362,9 @@ gsd_updates_manager_start (GsdUpdatesManager *manager,
-         g_signal_connect (manager->priv->refresh, "get-updates",
-                           G_CALLBACK (due_get_updates_cb), manager);
- 
-+        /* watch transaction progress */
-+        manager->priv->watch = gsd_updates_watch_new ();
-+
-         /* get proxy settings */
-         manager->priv->settings_proxy = g_settings_new ("org.gnome.system.proxy");
-         g_signal_connect (manager->priv->settings_proxy, "changed",
-@@ -1455,6 +1460,7 @@ gsd_updates_manager_stop (GsdUpdatesManager *manager)
-         g_clear_object (&manager->priv->task);
-         g_clear_object (&manager->priv->refresh);
-         g_clear_object (&manager->priv->firmware);
-+        g_clear_object (&manager->priv->watch);
-         g_clear_object (&manager->priv->proxy_session);
-         g_clear_object (&manager->priv->volume_monitor);
-         g_clear_object (&manager->priv->cancellable);
-diff --git a/plugins/updates/gsd-updates-watch.c b/plugins/updates/gsd-updates-watch.c
-new file mode 100644
-index 0000000..d3a0202
---- /dev/null
-+++ b/plugins/updates/gsd-updates-watch.c
-@@ -0,0 +1,186 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2011-2012 Jonathan Conder <jonno.conder@gmail.com>
-+ *
-+ * Licensed under the GNU General Public License Version 2
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ */
-+
-+#include "config.h"
-+
-+#include <unistd.h>
-+#include <glib/gi18n.h>
-+#include <packagekit-glib2/packagekit.h>
-+#include <libnotify/notify.h>
-+
-+#include "gsd-updates-watch.h"
-+
-+#define GSD_UPDATES_WATCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_UPDATES_WATCH, GsdUpdatesWatchPrivate))
-+
-+struct GsdUpdatesWatchPrivate
-+{
-+        PkTransactionList *tlist;
-+        PkClient *client;
-+};
-+
-+G_DEFINE_TYPE (GsdUpdatesWatch, gsd_updates_watch, G_TYPE_OBJECT)
-+
-+static void
-+on_notification_closed (NotifyNotification *notification, gpointer data)
-+{
-+        g_object_unref (notification);
-+}
-+
-+static void
-+gsd_updates_watch_message_cb (PkMessage *item, GsdUpdatesWatch *watch)
-+{
-+        NotifyNotification *notification;
-+        gchar *details = NULL;
-+        const gchar *title, *message;
-+        GError *error = NULL;
-+
-+        g_return_if_fail (PK_IS_MESSAGE (item));
-+        g_return_if_fail (GSD_IS_UPDATES_WATCH (watch));
-+
-+        g_object_get (item, "details", &details, NULL);
-+        title = _("More information");
-+        message = details;
-+
-+        /* use a better title if available */
-+        if (g_str_has_prefix (details, "<b>")) {
-+                gchar *end = g_strstr_len (details, -1, "</b>\n");
-+                if (end != NULL && g_strstr_len (details, end - details, "\n") == NULL) {
-+                        title = details + 3;
-+                        *end = '\0';
-+                        message = end + 5;
-+                }
-+        }
-+
-+        /* display a notification */
-+        notification = notify_notification_new (title, message, NULL);
-+        notify_notification_set_app_name (notification, _("Software Updates"));
-+        notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
-+        notify_notification_set_urgency (notification, NOTIFY_URGENCY_NORMAL);
-+
-+        g_signal_connect (notification, "closed", G_CALLBACK (on_notification_closed), NULL);
-+        if (!notify_notification_show (notification, &error)) {
-+                g_warning ("error: %s", error->message);
-+                g_error_free (error);
-+        }
-+
-+        g_free (details);
-+}
-+
-+static void
-+gsd_updates_watch_adopt_cb (PkClient *client, GAsyncResult *res, GsdUpdatesWatch *watch)
-+{
-+        PkResults *results;
-+        PkProgress *progress = NULL;
-+        guint uid;
-+        GPtrArray *array;
-+        GError *error = NULL;
-+
-+        g_return_if_fail (PK_IS_CLIENT (client));
-+        g_return_if_fail (G_IS_ASYNC_RESULT (res));
-+        g_return_if_fail (GSD_IS_UPDATES_WATCH (watch));
-+
-+        results = pk_client_generic_finish (client, res, &error);
-+        if (results == NULL) {
-+                g_warning ("failed to adopt: %s", error->message);
-+                g_error_free (error);
-+                goto out;
-+        }
-+
-+        g_object_get (results, "progress", &progress, NULL);
-+        g_object_get (progress, "uid", &uid, NULL);
-+
-+        /* only display messages from the same user */
-+        if (uid != getuid ()) {
-+                g_printerr ("ignoring messages\n");
-+                goto out;
-+        }
-+
-+        array = pk_results_get_message_array (results);
-+        g_ptr_array_foreach (array, (GFunc) gsd_updates_watch_message_cb, watch);
-+        g_ptr_array_unref (array);
-+
-+out:
-+        if (progress != NULL) {
-+                g_object_unref (progress);
-+        }
-+        if (results != NULL) {
-+                g_object_unref (results);
-+        }
-+}
-+
-+static void
-+gsd_updates_watch_tlist_added_cb (PkTransactionList *tlist, const gchar *tid, GsdUpdatesWatch *watch)
-+{
-+        g_return_if_fail (PK_IS_TRANSACTION_LIST (tlist));
-+        g_return_if_fail (tid != NULL);
-+        g_return_if_fail (GSD_IS_UPDATES_WATCH (watch));
-+
-+        /* listen for messages */
-+        pk_client_adopt_async (watch->priv->client, tid, NULL, NULL, NULL,
-+                               (GAsyncReadyCallback) gsd_updates_watch_adopt_cb, watch);
-+}
-+
-+static void
-+gsd_updates_watch_init (GsdUpdatesWatch *watch)
-+{
-+        g_return_if_fail (GSD_IS_UPDATES_WATCH (watch));
-+
-+        watch->priv = GSD_UPDATES_WATCH_GET_PRIVATE (watch);
-+        watch->priv->tlist = pk_transaction_list_new ();
-+        watch->priv->client = pk_client_new ();
-+
-+        g_signal_connect (watch->priv->tlist, "added",
-+                          G_CALLBACK (gsd_updates_watch_tlist_added_cb), watch);
-+}
-+
-+static void
-+gsd_updates_watch_finalize (GObject *object)
-+{
-+        GsdUpdatesWatch *watch;
-+
-+        g_return_if_fail (GSD_IS_UPDATES_WATCH (object));
-+
-+        watch = GSD_UPDATES_WATCH (object);
-+        g_return_if_fail (watch->priv != NULL);
-+
-+        if (watch->priv->tlist != NULL) {
-+                g_object_unref (watch->priv->tlist);
-+        }
-+        if (watch->priv->client != NULL) {
-+                g_object_unref (watch->priv->client);
-+        }
-+
-+        G_OBJECT_CLASS (gsd_updates_watch_parent_class)->finalize (object);
-+}
-+
-+GsdUpdatesWatch *
-+gsd_updates_watch_new (void)
-+{
-+        return GSD_UPDATES_WATCH (g_object_new (GSD_TYPE_UPDATES_WATCH, NULL));
-+}
-+
-+static void
-+gsd_updates_watch_class_init (GsdUpdatesWatchClass *klass)
-+{
-+        GObjectClass *object_class = G_OBJECT_CLASS (klass);
-+        object_class->finalize = gsd_updates_watch_finalize;
-+        g_type_class_add_private (klass, sizeof (GsdUpdatesWatchPrivate));
-+}
-diff --git a/plugins/updates/gsd-updates-watch.h b/plugins/updates/gsd-updates-watch.h
-new file mode 100644
-index 0000000..439464f
---- /dev/null
-+++ b/plugins/updates/gsd-updates-watch.h
-@@ -0,0 +1,52 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2011-2012 Jonathan Conder <jonno.conder@gmail.com>
-+ *
-+ * Licensed under the GNU General Public License Version 2
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ */
-+
-+#ifndef __GSD_UPDATES_WATCH_H
-+#define __GSD_UPDATES_WATCH_H
-+
-+#include <glib-object.h>
-+
-+G_BEGIN_DECLS
-+
-+#define GSD_TYPE_UPDATES_WATCH          (gsd_updates_watch_get_type ())
-+#define GSD_UPDATES_WATCH(o)            (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_UPDATES_WATCH, GsdUpdatesWatch))
-+#define GSD_UPDATES_WATCH_CLASS(k)      (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_UPDATES_WATCH, GsdUpdatesWatchClass))
-+#define GSD_IS_UPDATES_WATCH(o)         (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_UPDATES_WATCH))
-+
-+typedef struct GsdUpdatesWatchPrivate GsdUpdatesWatchPrivate;
-+
-+typedef struct
-+{
-+         GObject                         parent;
-+         GsdUpdatesWatchPrivate         *priv;
-+} GsdUpdatesWatch;
-+
-+typedef struct
-+{
-+        GObjectClass    parent_class;
-+} GsdUpdatesWatchClass;
-+
-+GType                    gsd_updates_watch_get_type           (void);
-+GsdUpdatesWatch         *gsd_updates_watch_new                (void);
-+
-+G_END_DECLS
-+
-+#endif /* __GSD_UPDATES_WATCH_H */
diff --git a/community/gnome-settings-daemon-updates/gnome-settings-daemon.install b/community/gnome-settings-daemon-updates/gnome-settings-daemon.install
deleted file mode 100644
index f7e8c46ac..000000000
--- a/community/gnome-settings-daemon-updates/gnome-settings-daemon.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community/gnome-settings-daemon-updates/packagekit-0.8.patch b/community/gnome-settings-daemon-updates/packagekit-0.8.patch
deleted file mode 100644
index eae0105e0..000000000
--- a/community/gnome-settings-daemon-updates/packagekit-0.8.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 5f4f1ed45747343f26f280401bc4915d92b71d89 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Mon, 30 Sep 2013 12:06:22 +0000
-Subject: updates: Raise the dep on PackageKit to avoid complexity
-
----
-diff --git a/configure.ac b/configure.ac
-index 87eb473..199542c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -306,7 +306,7 @@ AC_ARG_ENABLE(packagekit,
-        [WANT_PACKAGEKIT=yes]) dnl Default value
- 
- if test x$WANT_PACKAGEKIT = xyes ; then
--       PK_REQUIRED_VERSION=0.7.4
-+       PK_REQUIRED_VERSION=0.8.1
-        PKG_CHECK_MODULES(PACKAGEKIT, glib-2.0 packagekit-glib2 >= $PK_REQUIRED_VERSION upower-glib >= $UPOWER_REQUIRED_VERSION gudev-1.0 libnotify >= $LIBNOTIFY_REQUIRED_VERSION,
-              [have_packagekit=true
-               AC_DEFINE(HAVE_PACKAGEKIT, 1, [Define if PackageKit should be used])],
-diff --git a/plugins/updates/gsd-updates-manager.c b/plugins/updates/gsd-updates-manager.c
-index 3aff29a..0f73a42 100644
---- a/plugins/updates/gsd-updates-manager.c
-+++ b/plugins/updates/gsd-updates-manager.c
-@@ -742,7 +742,6 @@ auto_download_updates (GsdUpdatesManager *manager)
-                 package_ids[i] = g_strdup (pk_package_get_id (pkg));
-         }
- 
--#if PK_CHECK_VERSION(0,8,1)
-         /* we've set only-download in PkTask */
-         pk_task_update_packages_async (manager->priv->task,
-                                        package_ids,
-@@ -750,16 +749,6 @@ auto_download_updates (GsdUpdatesManager *manager)
-                                        NULL, NULL,
-                                        (GAsyncReadyCallback) package_download_finished_cb,
-                                        manager);
--#else
--        /* download them all */
--        pk_client_download_packages_async (PK_CLIENT(manager->priv->task),
--                                           package_ids,
--                                           NULL, /* this means system cache */
--                                           manager->priv->cancellable,
--                                           NULL, NULL,
--                                           (GAsyncReadyCallback) package_download_finished_cb,
--                                           manager);
--#endif
-         g_strfreev (package_ids);
- }
- 
-@@ -1506,9 +1495,7 @@ gsd_updates_manager_start (GsdUpdatesManager *manager,
-         g_object_set (manager->priv->task,
-                       "background", TRUE,
-                       "interactive", FALSE,
--#if PK_CHECK_VERSION(0,8,1)
-                       "only-download", TRUE,
--#endif
-                       NULL);
- 
-         /* watch UDev for missing firmware */
---
-cgit v0.9.2
diff --git a/community/granite/PKGBUILD b/community/granite/PKGBUILD
index 231a9a71a..438a0194b 100644
--- a/community/granite/PKGBUILD
+++ b/community/granite/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 108074 2014-03-22 12:15:26Z alucryd $
+# $Id: PKGBUILD 111903 2014-05-26 13:58:55Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd at gmail dot com>
 # Contributor: Ner0 <darkelfdarkelf666 at yahoo dot co dot uk>
 
 pkgname=granite
-pkgver=0.2.3.1
+pkgver=0.3.0
 pkgrel=1
 pkgdesc='An extension of GTK+ libraries'
 arch=('i686' 'x86_64')
 url='https://launchpad.net/granite'
 license=('LGPL3')
-depends=('gtk3' 'libgee06')
+depends=('gtk3' 'libgee')
 makedepends=('cmake' 'gobject-introspection' 'vala')
 install="${pkgname}.install"
-source=("${url}/${pkgver%.?.?}/${pkgver}/+download/${pkgname}-${pkgver}.tgz")
-sha256sums=('56f05338bb7967f0b912d35bf780a3ddd68b517e1939371a14a5f79581a8f80d')
+source=("${url}/${pkgver%.?}/${pkgver%.?}/+download/${pkgname}-${pkgver}.tar.gz")
+sha256sums=('df950dd79749213971d50316c68edadf1fb3c2151cb7d63f6a6b9edf12084ad1')
 
 build() {
   cd ${pkgname}-${pkgver}
@@ -23,7 +23,7 @@ build() {
   fi
   mkdir build && cd build
 
-  cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release'
+  cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_INSTALL_LIBDIR='/usr/lib'
   make
 }
 
diff --git a/community/lua-posix/PKGBUILD b/community/lua-posix/PKGBUILD
new file mode 100644
index 000000000..d52cbac75
--- /dev/null
+++ b/community/lua-posix/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 111919 2014-05-26 15:44:44Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Sébastien Luttringer
+# Contributor: SpepS <dreamspepser at yahoo dot it>
+# Contributor: Laszlo Papp <djszapi at archlinux us>
+# Contributor: Donald Ephraim Curtis <dcurtis@gmail.com>
+
+pkgname=lua-posix
+pkgver=31
+pkgrel=2
+pkgdesc='POSIX library for Lua'
+arch=('x86_64' 'i686')
+url='https://github.com/luaposix/luaposix'
+license=('GPL' 'LGPL')
+depends=('lua')
+makedepends=('lua' 'git' 'help2man')
+options=('!makeflags')
+source=("$pkgname::git://github.com/luaposix/luaposix.git#tag=v$pkgver")
+md5sums=('SKIP')
+
+prepare() {
+  cd "$pkgname"
+
+  ./bootstrap
+}
+
+build() {
+  cd "$pkgname"
+
+  ./configure \
+      LUA=/usr/bin/lua \
+      --prefix=/usr \
+      --libdir=/usr/lib/lua/5.2 \
+      --datadir=/usr/share/lua/5.2 \
+      --docdir=/usr/share/doc/lua-posix
+  make
+}
+
+check() {
+  make -C "$pkgname" check || true
+}
+
+package() {
+  make -C "$pkgname" DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/luaposix/PKGBUILD b/community/luaposix/PKGBUILD
deleted file mode 100644
index 1e78e9372..000000000
--- a/community/luaposix/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 99901 2013-10-31 02:22:19Z allan $
-# Maintainer: Sébastien Luttringer
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-# Contributor: Laszlo Papp <djszapi at archlinux us>
-# Contributor: Donald Ephraim Curtis <dcurtis@gmail.com>
-
-pkgbase=luaposix
-pkgname=('lua-posix' 'lua51-posix')
-pkgver=31
-pkgrel=1
-pkgdesc='A POSIX library for Lua programming language'
-arch=('i686' 'x86_64')
-url='https://github.com/luaposix/luaposix'
-license=('GPL' 'LGPL')
-makedepends=('lua' 'lua51' 'lua51-bitop' 'git' 'help2man')
-options=('!makeflags')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/$pkgbase/$pkgbase/archive/v$pkgver.tar.gz"
-        'git+git://git.sv.gnu.org/gnulib'
-        'git+git://github.com/gvvaughan/slingshot')
-md5sums=('7b17b9a3f25d9658de967c6bfd50c138'
-         'SKIP'
-         'SKIP')
-
-prepare() {
-  # replace git submodules by source one.
-  # this allow us to cache and avoid clone each time
-  for _rep in gnulib slingshot; do
-    rmdir $pkgbase-$pkgver/$_rep
-    ln -s "$srcdir/$_rep" $pkgbase-$pkgver/$_rep
-  done
-  # bootstraping
-  (cd $pkgbase-$pkgver && ./bootstrap)
-  # copy source for lua 5.1 build
-  cp -r $pkgbase-$pkgver $pkgbase-$pkgver-51
-}
-
-build() {
-  msg2 'Build with lua 5.2'
-  cd $pkgbase-$pkgver
-  ./configure \
-      LUA=/usr/bin/lua \
-      --prefix=/usr \
-      --libdir=/usr/lib/lua/5.2 \
-      --datadir=/usr/share/lua/5.2 \
-      --docdir=/usr/share/doc/lua-posix
-  make
-  msg2 'Build with lua 5.1'
-  cd "$srcdir/$pkgbase-$pkgver-51"
-  ./configure \
-      LUA=/usr/bin/lua5.1 \
-      LUA_INCLUDE=-I/usr/include/lua5.1 \
-      --prefix=/usr \
-      --libdir=/usr/lib/lua/5.1 \
-      --datadir=/usr/share/lua/5.1 \
-      --docdir=/usr/share/doc/lua51-posix
-  make
-}
-
-package_lua-posix() {
-  depends=('lua')
-
-  cd $pkgbase-$pkgver
-  make DESTDIR="$pkgdir/" install
-}
-
-package_lua51-posix() {
-  depends=('lua51' 'lua51-bitop')
-  conflicts=('luaposix')
-  replaces=('luaposix')
-
-  cd $pkgbase-$pkgver-51
-  make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/noise/PKGBUILD b/community/noise/PKGBUILD
index 7557e4f97..d5b7cf128 100644
--- a/community/noise/PKGBUILD
+++ b/community/noise/PKGBUILD
@@ -1,23 +1,28 @@
-# $Id: PKGBUILD 109947 2014-04-22 08:25:27Z alucryd $
+# $Id: PKGBUILD 111905 2014-05-26 14:37:08Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd at gmail dot com>
 
 pkgname=noise
-pkgver=0.2.4
-pkgrel=4
+pkgver=0.3.0
+pkgrel=1
 pkgdesc='The Pantheon Music Player'
 arch=('i686' 'x86_64')
 url='https://launchpad.net/noise'
 license=('GPL3')
-depends=('desktop-file-utils' 'granite' 'gstreamer0.10-base' 'json-glib' 'libgpod' 'libnotify' 'libpeas' 'libsoup' 'sqlheavy' 'taglib')
+depends=('desktop-file-utils' 'granite' 'gst-plugins-base-libs' 'json-glib' 'libgpod' 'libnotify' 'libpeas' 'libsoup' 'sqlheavy' 'taglib')
 makedepends=('cmake' 'vala')
-optdepends=('elementary-icon-theme: Missing UI icons'
-            'gstreamer0.10-base-plugins: "Base" plugin libraries'
-            'gstreamer0.10-good-plugins: "Good" plugin libraries'
-            'gstreamer0.10-bad-plugins: "Bad" plugin libraries'
-            'gstreamer0.10-ugly-plugins: "Ugly" plugin libraries')
+optdepends=('gst-plugins-base: "Base" plugin libraries'
+            'gst-plugins-good: "Good" plugin libraries'
+            'gst-plugins-bad: "Bad" plugin libraries'
+            'gst-plugins-ugly: "Ugly" plugin libraries')
 install="${pkgname}.install"
-source=("https://launchpad.net/${pkgname}/${pkgver%.?}/${pkgver}/+download/${pkgname}-${pkgver}.tgz")
-sha256sums=('ffcd5f2cba112af13707a7ba7f0ceace7b812d4b6082671684ff78d76fc1d8a9')
+source=("https://launchpad.net/${pkgname}/${pkgver%.?}.x/${pkgver}/+download/${pkgname}-${pkgver}.tgz")
+sha256sums=('56d9dc11e376f0727748e5f60ad35555626314ecead6d62139a56ab487fdf7cf')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  sed 's|${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR_UNPREFIXED}|${PLUGIN_DIR_UNPREFIXED}|' -i CMakeLists.txt
+}
 
 build() {
   cd ${pkgname}-${pkgver}
@@ -27,8 +32,9 @@ build() {
   fi
   mkdir build && cd build
 
-  cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -DGSETTINGS_COMPILE='OFF'
-  make
+  cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_INSTALL_LIBDIR='/usr/lib' \
+           -DGSETTINGS_COMPILE='OFF'
+  make -j1
 }
 
 package() {
diff --git a/community/pantheon-terminal/PKGBUILD b/community/pantheon-terminal/PKGBUILD
index 06579d00f..d8a44feb7 100644
--- a/community/pantheon-terminal/PKGBUILD
+++ b/community/pantheon-terminal/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 102538 2013-12-13 11:19:00Z alucryd $
+# $Id: PKGBUILD 111909 2014-05-26 14:43:05Z alucryd $
 # Maintainer: alucryd <alucryd at gmail dot com>
 
 pkgname=pantheon-terminal
-pkgver=0.2.4.1
-pkgrel=3
+pkgver=0.3.0
+pkgrel=1
 pkgdesc='The Pantheon Terminal Emulator'
 arch=('i686' 'x86_64')
 url="https://launchpad.net/${pkgname}"
@@ -11,8 +11,8 @@ license=('GPL3')
 depends=('desktop-file-utils' 'granite' 'libnotify' 'vte3')
 makedepends=('cmake' 'vala')
 install="${pkgname}.install"
-source=("${url}/0.x/${pkgver}/+download/${pkgname}-${pkgver}.tgz")
-sha256sums=('0c03dc4023d3a78924d8b21658c62dd23ea0c93cd55af2f398686d28574dac04')
+source=("${url}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tgz")
+sha256sums=('b8bf8331ac5ebe0412b2023f19dfb3db78b0210002368466b3ba33cb01fece94')
 
 build() {
   cd ${pkgname}-${pkgver}
@@ -22,7 +22,7 @@ build() {
   fi
   mkdir build && cd build
 
-  cmake .. -DCMAKE_BUILD_TYPE='Release' -DCMAKE_INSTALL_PREFIX='/usr' -DGSETTINGS_COMPILE='OFF'
+  cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DGSETTINGS_COMPILE='OFF'
   make
 }
 
diff --git a/community/paxd/PKGBUILD b/community/paxd/PKGBUILD
index 35e1ed7de..eff430b4a 100644
--- a/community/paxd/PKGBUILD
+++ b/community/paxd/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Daniel Micay <danielmicay@gmail.com>
 pkgname=paxd
-pkgver=2
+pkgver=4
 pkgrel=1
 pkgdesc='PaX exception daemon'
 arch=(i686 x86_64)
diff --git a/community/plank-config/PKGBUILD b/community/plank-config/PKGBUILD
index ad8e621f4..7e87c045c 100755
--- a/community/plank-config/PKGBUILD
+++ b/community/plank-config/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 109586 2014-04-16 10:47:58Z flexiondotorg $
+# $Id: PKGBUILD 111897 2014-05-26 13:51:40Z flexiondotorg $
 # Maintainer : Martin Wimpress <code@flexion.org>
 # Contributor: Ernesto Ricart <ernest2193@gmail.com>
 
 _pkgname=Plank-Config
 # Convert to lowercase
 pkgname=${_pkgname,,}
-pkgver=1.2
-pkgrel=3
+pkgver=1.3
+pkgrel=1
 pkgdesc="A tool to configure Plank Dock"
 arch=('i686' 'x86_64')
 url="https://github.com/ernest21/Plank-Config/"
 license=('GPL')
-depends=('plank')
+depends=('desktop-file-utils' 'libnotify' 'plank')
 makedepends=('vala')
 source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/ernest21/${_pkgname}/archive/v${pkgver}.tar.gz")
-md5sums=('7b5ee3842c079166d70aadb9eb14fd77')
+sha1sums=('f125b8351e4204bcb38e8d5a5291423aff92ecf6')
 install=${pkgname}.install
 
 prepare() {
@@ -22,12 +22,14 @@ prepare() {
     chmod +x ./autogen.sh
     NOCONFIGURE=1 ./autogen.sh
 }
+
 build() {
     cd "${srcdir}/${_pkgname}-${pkgver}"
     ./configure \
         --prefix=/usr
     make
 }
+
 package() {
     cd "${srcdir}/${_pkgname}-${pkgver}"
     make DESTDIR="${pkgdir}" install
diff --git a/community/prelink/PKGBUILD b/community/prelink/PKGBUILD
index f50b40811..3df6d5eac 100644
--- a/community/prelink/PKGBUILD
+++ b/community/prelink/PKGBUILD
@@ -1,35 +1,34 @@
-# $Id: PKGBUILD 96818 2013-09-05 20:51:50Z eric $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# $Id: PKGBUILD 111908 2014-05-26 14:42:43Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Rouslan Solomakhin <rouslan@localnet.com>
 
 pkgname=prelink
 pkgver=20130503
-pkgrel=1
+pkgrel=2
 pkgdesc='ELF prelinking utility to speed up dynamic linking'
-arch=('i686' 'x86_64')
+arch=('x86_64' 'i686')
 url='http://people.redhat.com/jakub/prelink/'
 license=('GPL')
 depends=('elfutils')
-backup=('etc/prelink.conf')
-source=("http://people.redhat.com/jakub/prelink/${pkgname}-${pkgver}.tar.bz2"
-        'prelink.conf')
-sha1sums=('eff86cb26f0cc174486769527286cc388d5216b0'
-          'b83bd2d3505076151aa13d40de3d5c08a04440c7')
+makedepends=('elfutils' 'libtool')
+source=("http://people.redhat.com/jakub/$pkgname/$pkgname-$pkgver.tar.bz2")
+sha256sums=('6339c7605e9b6f414d1be32530c9c8011f38820d36431c8a62e8674ca37140f0')
 
 build() {
-  cd ${pkgname}
-  ./configure --prefix=/usr --mandir=/usr/share/man --sbin=/usr/bin
+  cd "$pkgname"
+
+  ./configure --prefix=/usr --mandir=/usr/share/man --sbin=/usr/bin --disable-static --with-gnu-ld
   make
 }
 
 check() {
-  cd ${pkgname}
-  make check
+  make -C "$pkgname" check
 }
 
 package() {
-  cd ${pkgname}
-  make DESTDIR="${pkgdir}" install
-  install -Dm0644 "${srcdir}/prelink.conf" "${pkgdir}/etc/prelink.conf"
+  make -C "$pkgname" DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/prelink/prelink.conf b/community/prelink/prelink.conf
deleted file mode 100644
index f48d7f9f8..000000000
--- a/community/prelink/prelink.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# System
-/usr/lib
-/usr/bin
-
-# KDE3
-/opt/kde/lib
-/opt/kde/bin
-/opt/kde/share
diff --git a/community/profanity/PKGBUILD b/community/profanity/PKGBUILD
index 05f979087..977e0ff5d 100644
--- a/community/profanity/PKGBUILD
+++ b/community/profanity/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: jason ryan <jasonwryan@gmail.com>
 
 pkgname=profanity
-pkgver=0.4.1
+pkgver=0.4.2
 pkgrel=1
 epoch=1
 pkgdesc='Console based XMPP client'
@@ -13,7 +13,7 @@ license=('GPL3')
 depends=('curl' 'expat' 'glib2' 'libotr' 'gnutls')
 makedepends=('doxygen' 'libstrophe')
 source=(http://www.profanity.im/profanity-$pkgver.tar.gz)
-md5sums=('d50c3a69165e3daa243c149f93cf32fc')
+md5sums=('bc950b272d2d4869aedf79dd90185969')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/simavr/PKGBUILD b/community/simavr/PKGBUILD
index 4f9a5a82a..95af46cb1 100644
--- a/community/simavr/PKGBUILD
+++ b/community/simavr/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: schuay <jakob.gruber@gmail.com>
 
 pkgname=simavr
-pkgver=1.1
+pkgver=1.2
 pkgrel=1
 pkgdesc='A lean, mean and hackable AVR simulator'
 arch=('i686' 'x86_64')
diff --git a/community/xmlrpc-c/PKGBUILD b/community/xmlrpc-c/PKGBUILD
index 453ba6c11..994de7f2e 100644
--- a/community/xmlrpc-c/PKGBUILD
+++ b/community/xmlrpc-c/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 100018 2013-10-31 03:01:57Z allan $
+# $Id: PKGBUILD 111892 2014-05-26 12:53:39Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Vitaliy Berdinskikh <skipper13@root.ua>
 
 pkgname=xmlrpc-c
-pkgver=1.36.00
+pkgver=1.38.02
 pkgrel=1
 epoch=1
 pkgdesc='XML-RPC for C and C++'
@@ -13,13 +13,17 @@ arch=('x86_64' 'i686')
 url='http://xmlrpc-c.sourceforge.net/'
 license=('custom')
 depends=('curl' 'libxml2')
-makedepends=('libtool' 'setconf')
+makedepends=('libtool' 'setconf' 'python')
 options=('!makeflags' '!emptydirs')
-source=('svn://svn.code.sf.net/p/xmlrpc-c/code/advanced#revision=2545')
+source=('svn://svn.code.sf.net/p/xmlrpc-c/code/advanced')
 sha1sums=('SKIP')
 
+pkgver() {
+  python -c 'print("%01d.%02d.%02d" % tuple(map(int, (x.rsplit(" ",1)[1] for x in open("advanced/version.mk").read().split("\n")[-4:-1]))))' 
+}
+
 build() {
-  cd "$srcdir/advanced"
+  cd advanced
 
   [ "$CARCH" != "i686" ] && export CFLAGS="$CFLAGS -fPIC"
   ./configure --prefix=/usr \
@@ -33,14 +37,14 @@ build() {
   mkdir include/curl
   touch include/curl/types.h
   make CFLAGS_PERSONAL="$CFLAGS"
-  make CFLAGS_PERSONAL="$CFLAGS" -C tools
+  make -C tools CFLAGS_PERSONAL="$CFLAGS"
 }
 
 package() {
-  cd "$srcdir/advanced"
+  cd advanced
 
   make DESTDIR="$pkgdir" install
-  make DESTDIR="$pkgdir" -C tools install
+  make -C tools DESTDIR="$pkgdir" install
   install -Dm644 doc/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   # Remove references to build directory
   setconf "$pkgdir/usr/bin/xmlrpc-c-config" BLDDIR ''
diff --git a/core/util-linux/0001-libmount-FS-id-and-parent-ID-could-be-zero.patch b/core/util-linux/0001-libmount-FS-id-and-parent-ID-could-be-zero.patch
deleted file mode 100644
index 01a8d441b..000000000
--- a/core/util-linux/0001-libmount-FS-id-and-parent-ID-could-be-zero.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 6c373810f5b1d32824371e9dff6ee5a006388f98 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 20 Feb 2014 16:59:11 +0100
-Subject: [PATCH] libmount: FS id and parent ID could be zero
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It seems that linux 3.14 is able to produce things like:
-
-  19 0 8:3 / / rw,relatime - ext4 /dev/sda3 rw,data=ordered
-     ^
-
-Reported-by: Mantas Mikulėnas <grawity@gmail.com>
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- libmount/src/tab.c   | 12 ++++--------
- misc-utils/findmnt.c |  5 +++--
- 2 files changed, 7 insertions(+), 10 deletions(-)
-
-diff --git a/libmount/src/tab.c b/libmount/src/tab.c
-index 4c2f8a4..332312b 100644
---- a/libmount/src/tab.c
-+++ b/libmount/src/tab.c
-@@ -505,7 +505,7 @@ int mnt_table_get_root_fs(struct libmnt_table *tb, struct libmnt_fs **root)
- 	assert(tb);
- 	assert(root);
- 
--	if (!tb || !root)
-+	if (!tb || !root || !is_mountinfo(tb))
- 		return -EINVAL;
- 
- 	DBG(TAB, mnt_debug_h(tb, "lookup root fs"));
-@@ -515,8 +515,6 @@ int mnt_table_get_root_fs(struct libmnt_table *tb, struct libmnt_fs **root)
- 	mnt_reset_iter(&itr, MNT_ITER_FORWARD);
- 	while(mnt_table_next_fs(tb, &itr, &fs) == 0) {
- 		int id = mnt_fs_get_parent_id(fs);
--		if (!id)
--			break;		/* @tab is not a mountinfo file? */
- 
- 		if (!*root || id < root_id) {
- 			*root = fs;
-@@ -524,7 +522,7 @@ int mnt_table_get_root_fs(struct libmnt_table *tb, struct libmnt_fs **root)
- 		}
- 	}
- 
--	return root_id ? 0 : -EINVAL;
-+	return *root ? 0 : -EINVAL;
- }
- 
- /**
-@@ -545,15 +543,13 @@ int mnt_table_next_child_fs(struct libmnt_table *tb, struct libmnt_iter *itr,
- 	struct libmnt_fs *fs;
- 	int parent_id, lastchld_id = 0, chld_id = 0;
- 
--	if (!tb || !itr || !parent)
-+	if (!tb || !itr || !parent || !is_mountinfo(tb))
- 		return -EINVAL;
- 
- 	DBG(TAB, mnt_debug_h(tb, "lookup next child of '%s'",
- 				mnt_fs_get_target(parent)));
- 
- 	parent_id = mnt_fs_get_id(parent);
--	if (!parent_id)
--		return -EINVAL;
- 
- 	/* get ID of the previously returned child */
- 	if (itr->head && itr->p != itr->head) {
-@@ -584,7 +580,7 @@ int mnt_table_next_child_fs(struct libmnt_table *tb, struct libmnt_iter *itr,
- 		}
- 	}
- 
--	if (!chld_id)
-+	if (!*chld)
- 		return 1;	/* end of iterator */
- 
- 	/* set the iterator to the @chld for the next call */
-diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
-index fb21174..988cd73 100644
---- a/misc-utils/findmnt.c
-+++ b/misc-utils/findmnt.c
-@@ -822,8 +822,9 @@ static int tab_is_tree(struct libmnt_table *tb)
- 	if (!itr)
- 		return 0;
- 
--	if (mnt_table_next_fs(tb, itr, &fs) == 0)
--		rc = mnt_fs_get_id(fs) > 0 && mnt_fs_get_parent_id(fs) > 0;
-+	rc = (mnt_table_next_fs(tb, itr, &fs) == 0 &&
-+	      mnt_fs_is_kernel(fs) &&
-+	      mnt_fs_get_root(fs));
- 
- 	mnt_free_iter(itr);
- 	return rc;
--- 
-1.9.1
-
diff --git a/core/util-linux/0001-switch_root-verify-initramfs-by-f_type-not-devno.patch b/core/util-linux/0001-switch_root-verify-initramfs-by-f_type-not-devno.patch
deleted file mode 100644
index 56191a30e..000000000
--- a/core/util-linux/0001-switch_root-verify-initramfs-by-f_type-not-devno.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 751c39383adaf5ff5a860516238d524b0e20f835 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Wed, 2 Apr 2014 10:41:30 -0400
-Subject: [PATCH] switch_root: verify initramfs by f_type, not devno
-
-As of linux 3.14, the initramfs device will have both major and
-minor 0, causing our paranoia check to fail. Make this version agnostic
-by checking the filesystem type, rather than a device number.
-
-[adopted from master for backport into 2.24.x branch]
-
-Signed-off-by: Dave Reisner <dreisner@archlinux.org>
----
- sys-utils/switch_root.c | 15 +++++++++------
- 1 file changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/sys-utils/switch_root.c b/sys-utils/switch_root.c
-index f26f7da..40e222d 100644
---- a/sys-utils/switch_root.c
-+++ b/sys-utils/switch_root.c
-@@ -23,6 +23,7 @@
- #include <sys/mount.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/statfs.h>
- #include <sys/param.h>
- #include <fcntl.h>
- #include <stdio.h>
-@@ -33,6 +34,8 @@
- #include <ctype.h>
- #include <dirent.h>
- 
-+#include <linux/magic.h>
-+
- #include "c.h"
- #include "nls.h"
- #include "closestream.h"
-@@ -174,12 +177,12 @@ static int switchroot(const char *newroot)
- 	if (cfd >= 0) {
- 		pid = fork();
- 		if (pid <= 0) {
--			if (fstat(cfd, &sb) == 0) {
--				if (sb.st_dev == makedev(0, 1))
--					recursiveRemove(cfd);
--				else
--					warn(_("old root filesystem is not an initramfs"));
--			}
-+			struct statfs stfs;
-+			if (fstatfs(cfd, &stfs) == 0 &&
-+			    (stfs.f_type == RAMFS_MAGIC || stfs.f_type == TMPFS_MAGIC))
-+				recursiveRemove(cfd);
-+			else
-+				warn(_("old root filesystem is not an initramfs"));
- 
- 			if (pid == 0)
- 				exit(EXIT_SUCCESS);
--- 
-1.9.1
-
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index 64d725582..3b641f13e 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 210105 2014-04-09 22:22:03Z thomas $
+# $Id: PKGBUILD 213600 2014-05-26 15:24:06Z dreisner $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgbase=util-linux
 pkgname=(util-linux libutil-linux)
-pkgver=2.24.1
-pkgrel=6
+pkgver=2.24.2
+pkgrel=1
 pkgdesc="Miscellaneous system utilities for Linux"
 url="http://www.kernel.org/pub/linux/utils/util-linux/"
 arch=('i686' 'x86_64')
@@ -19,26 +19,12 @@ source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.24/$pkgname-$pkgver.ta
         uuidd.tmpfiles
         pam-login
         pam-common
-        pam-su
-        move_is_mountinfo.patch
-        0001-switch_root-verify-initramfs-by-f_type-not-devno.patch
-        0001-libmount-FS-id-and-parent-ID-could-be-zero.patch)
-md5sums=('88d46ae23ca599ac5af9cf96b531590f'
+        pam-su)
+md5sums=('3f191727a0d28f7204b755cf1b6ea0aa'
          'a39554bfd65cccfd8254bb46922f4a67'
          '4368b3f98abd8a32662e094c54e7f9b1'
          'a31374fef2cba0ca34dfc7078e2969e4'
-         'fa85e5cce5d723275b14365ba71a8aad'
-         '4cdc5f9a6e51b032274761a82937d438'
-         'b7ca79a0d5318b7cd813bb2573a3f9a9'
-         '2f4bc305bd11d6bfaa81e6c1eb0c6f1b')
-
-prepare() {
-  cd "$pkgname-$pkgver"
-
-  patch -p1 -i "${srcdir}/move_is_mountinfo.patch"
-  patch -p1 -i "${srcdir}/0001-libmount-FS-id-and-parent-ID-could-be-zero.patch"
-  patch -p1 -i "${srcdir}/0001-switch_root-verify-initramfs-by-f_type-not-devno.patch"
-}
+         'fa85e5cce5d723275b14365ba71a8aad')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/core/util-linux/move_is_mountinfo.patch b/core/util-linux/move_is_mountinfo.patch
deleted file mode 100644
index ad9387efc..000000000
--- a/core/util-linux/move_is_mountinfo.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/libmount/src/tab.c b/libmount/src/tab.c
-index 3633b6a..8ae49c8 100644
---- a/libmount/src/tab.c
-+++ b/libmount/src/tab.c
-@@ -47,6 +47,20 @@
- #include "strutils.h"
- #include "loopdev.h"
- 
-+static int is_mountinfo(struct libmnt_table *tb)
-+{
-+	struct libmnt_fs *fs;
-+
-+	if (!tb)
-+		return 0;
-+
-+	fs = list_first_entry(&tb->ents, struct libmnt_fs, ents);
-+	if (fs && mnt_fs_is_kernel(fs) && mnt_fs_get_root(fs))
-+		return 1;
-+
-+	return 0;
-+}
-+
- /**
-  * mnt_new_table:
-  *
-@@ -1229,20 +1335,6 @@ err:
- 	return NULL;
- }
- 
--static int is_mountinfo(struct libmnt_table *tb)
--{
--	struct libmnt_fs *fs;
--
--	if (!tb)
--		return 0;
--
--	fs = list_first_entry(&tb->ents, struct libmnt_fs, ents);
--	if (fs && mnt_fs_is_kernel(fs) && mnt_fs_get_root(fs))
--		return 1;
--
--	return 0;
--}
--
- /**
-  * mnt_table_is_fs__mounted:
-  * @tb: /proc/self/mountinfo file
diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD
index 81e6d9b4f..8fd7b6b07 100644
--- a/extra/claws-mail/PKGBUILD
+++ b/extra/claws-mail/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 211907 2014-04-29 12:38:44Z andyrtr $
+# $Id: PKGBUILD 213599 2014-05-26 13:43:27Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=claws-mail
-pkgver=3.9.3
-pkgrel=4
+pkgver=3.10.0
+pkgrel=1
 pkgdesc="A GTK+ based e-mail client."
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -34,24 +34,9 @@ replaces=('sylpheed-claws' 'claws-mail-extra-plugins')
 conflicts=('claws-mail-extra-plugins')
 provides=('claws')
 install=claws-mail.install
-source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2{,.asc}
-        claws-ssl-1.patch
-        claws-ssl-2.patch
-        claws-ssl-3.patch)
-md5sums=('0158b5e6b6d6866f9a75fd288a4edf04'
-         'SKIP'
-         '02e5fc5dba976208dfabf23d7666681d'
-         'dd53ff284cf802ef639bf92fac996d12'
-         'e8c2ce77c8df7a2c514a4547337304d8')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  # fix ssl certificate verification with libetpan >= 1.4
-  patch -Np1 < ${srcdir}/claws-ssl-1.patch
-  patch -Np1 < ${srcdir}/claws-ssl-2.patch
-  patch -Np1 < ${srcdir}/claws-ssl-3.patch
-  autoreconf -vfi
-}
+source=(http://downloads.sourceforge.net/sourceforge/claws-mail/${pkgname}-${pkgver}.tar.xz{,.asc})
+sha1sums=('c5e8063ea922b1bd6825f5221347ec8ebfa0ae3b'
+          'SKIP')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/claws-mail/claws-ssl-1.patch b/extra/claws-mail/claws-ssl-1.patch
deleted file mode 100644
index 941a66ac2..000000000
--- a/extra/claws-mail/claws-ssl-1.patch
+++ /dev/null
@@ -1,494 +0,0 @@
-From 35da14ea91d4d32527fbe3293d2ffd26cd642710 Mon Sep 17 00:00:00 2001
-From: Nepu User <nepu@localhost.localdomain>
-Date: Sun, 27 Apr 2014 14:50:36 +0200
-Subject: [PATCH 1/3] upstream commit b0c17cd08e482dbda407dabdc952dfcf5d8fdb6e
-
----
- src/etpan/Makefile.am   |   6 ++-
- src/etpan/etpan-ssl.c   | 121 ++++++++++++++++++++++++++++++++++++++++++++++++
- src/etpan/etpan-ssl.h   |  40 ++++++++++++++++
- src/etpan/imap-thread.c |  96 +++-----------------------------------
- src/etpan/nntp-thread.c |  83 ++-------------------------------
- 5 files changed, 175 insertions(+), 171 deletions(-)
- create mode 100644 src/etpan/etpan-ssl.c
- create mode 100644 src/etpan/etpan-ssl.h
-
-diff --git a/src/etpan/Makefile.am b/src/etpan/Makefile.am
-index b4bfe62..eb343b2 100644
---- a/src/etpan/Makefile.am
-+++ b/src/etpan/Makefile.am
-@@ -5,7 +5,8 @@ noinst_LTLIBRARIES = libclawsetpan.la
- libclawsetpan_la_SOURCES = \
- 	etpan-thread-manager.c \
- 	imap-thread.c \
--	nntp-thread.c
-+	nntp-thread.c \
-+	etpan-ssl.c
- 
- clawsetpanincludedir = $(pkgincludedir)/etpan
- clawsetpaninclude_HEADERS = \
-@@ -13,7 +14,8 @@ clawsetpaninclude_HEADERS = \
- 	etpan-thread-manager.h \
- 	etpan-errors.h \
- 	imap-thread.h \
--	nntp-thread.h
-+	nntp-thread.h \
-+	etpan-ssl.h
- 
- INCLUDES = \
- 	-I$(top_srcdir)/src \
-diff --git a/src/etpan/etpan-ssl.c b/src/etpan/etpan-ssl.c
-new file mode 100644
-index 0000000..6642e40
---- /dev/null
-+++ b/src/etpan/etpan-ssl.c
-@@ -0,0 +1,121 @@
-+/*
-+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
-+ * Copyright (C) 1999-2012 Colin Leroy <colin@colino.net> 
-+ * and the Claws Mail team
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 3 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
-+ * 
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#  include "config.h"
-+#include "claws-features.h"
-+#endif
-+
-+#ifdef USE_GNUTLS
-+#ifdef HAVE_LIBETPAN
-+#include <libetpan/libetpan.h>
-+#include <gnutls/gnutls.h>
-+#include <gnutls/x509.h>
-+#include <stdlib.h>
-+#include <glib.h>
-+#include <glib/gi18n.h>
-+#include <errno.h>
-+
-+#include "ssl_certificate.h"
-+#include "utils.h"
-+#include "log.h"
-+#include "prefs_account.h"
-+
-+gboolean etpan_certificate_check(mailstream *stream, const char *host, gint port)
-+{
-+	unsigned char *cert_der = NULL;
-+	int len;
-+	gnutls_x509_crt_t cert = NULL;
-+	gnutls_datum_t tmp;
-+
-+	if (stream == NULL)
-+		return FALSE;
-+
-+	len = (int)mailstream_ssl_get_certificate(stream, &cert_der);
-+
-+	if (cert_der == NULL || len < 0) {
-+		g_warning("no cert presented.\n");
-+		return FALSE;
-+	}
-+
-+	tmp.data = malloc(len);
-+	memcpy(tmp.data, cert_der, len);
-+	tmp.size = len;
-+	gnutls_x509_crt_init(&cert);
-+
-+	free(cert_der);
-+
-+	if (gnutls_x509_crt_import(cert, &tmp, GNUTLS_X509_FMT_DER) < 0) {
-+		free(tmp.data);
-+		g_warning("IMAP: can't get cert\n");
-+		return FALSE;
-+	} else if (ssl_certificate_check(cert, (guint)-1, host, port) == TRUE) {
-+		free(tmp.data);
-+		gnutls_x509_crt_deinit(cert);
-+		return TRUE;
-+	} else {
-+		free(tmp.data);
-+		gnutls_x509_crt_deinit(cert);
-+		return FALSE;
-+	}
-+}
-+
-+void etpan_connect_ssl_context_cb(struct mailstream_ssl_context * ssl_context, void * data)
-+{
-+	PrefsAccount *account = (PrefsAccount *)data;
-+	const gchar *cert_path = NULL;
-+	const gchar *password = NULL;
-+	gnutls_x509_crt_t x509 = NULL;
-+	gnutls_x509_privkey_t pkey = NULL;
-+
-+	if (account->in_ssl_client_cert_file && *account->in_ssl_client_cert_file)
-+		cert_path = account->in_ssl_client_cert_file;
-+	if (account->in_ssl_client_cert_pass && *account->in_ssl_client_cert_pass)
-+		password = account->in_ssl_client_cert_pass;
-+
-+	if (mailstream_ssl_set_client_certificate_data(ssl_context, NULL, 0) < 0 ||
-+	    mailstream_ssl_set_client_private_key_data(ssl_context, NULL, 0) < 0)
-+		debug_print("Impossible to set the client certificate.\n");
-+	x509 = ssl_certificate_get_x509_from_pem_file(cert_path);
-+	pkey = ssl_certificate_get_pkey_from_pem_file(cert_path);
-+	if (!(x509 && pkey)) {
-+		/* try pkcs12 format */
-+		ssl_certificate_get_x509_and_pkey_from_p12_file(cert_path, password, &x509, &pkey);
-+	}
-+	if (x509 && pkey) {
-+		unsigned char *x509_der = NULL, *pkey_der = NULL;
-+		size_t x509_len, pkey_len;
-+
-+		x509_len = (size_t)gnutls_i2d_X509(x509, &x509_der);
-+		pkey_len = (size_t)gnutls_i2d_PrivateKey(pkey, &pkey_der);
-+		if (x509_len > 0 && pkey_len > 0) {
-+			if (mailstream_ssl_set_client_certificate_data(ssl_context, x509_der, x509_len) < 0 ||
-+			    mailstream_ssl_set_client_private_key_data(ssl_context, pkey_der, pkey_len) < 0) 
-+				log_error(LOG_PROTOCOL, _("Impossible to set the client certificate.\n"));
-+			g_free(x509_der);
-+			g_free(pkey_der);
-+		}
-+		gnutls_x509_crt_deinit(x509);
-+		gnutls_x509_privkey_deinit(pkey);
-+	}
-+}
-+
-+#endif /* USE_GNUTLS */
-+#endif /* HAVE_LIBETPAN */
-diff --git a/src/etpan/etpan-ssl.h b/src/etpan/etpan-ssl.h
-new file mode 100644
-index 0000000..5607d1a
---- /dev/null
-+++ b/src/etpan/etpan-ssl.h
-@@ -0,0 +1,40 @@
-+/*
-+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
-+ * Copyright (C) 1999-2012 Colin Leroy <colin@colino.net> 
-+ * and the Claws Mail team
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 3 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
-+ * 
-+ */
-+
-+#ifndef __ETPAN_SSL_H__
-+#define __ETPAN_SSL_H__
-+
-+#ifdef HAVE_CONFIG_H
-+#  include "config.h"
-+#include "claws-features.h"
-+#endif
-+
-+#ifdef USE_GNUTLS
-+#ifdef HAVE_LIBETPAN
-+
-+#include <libetpan/libetpan.h>
-+
-+gboolean etpan_certificate_check(mailstream *imap_stream, const char *host, gint port);
-+void etpan_connect_ssl_context_cb(struct mailstream_ssl_context * ssl_context, void * data);
-+
-+#endif /* USE_GNUTLS */
-+#endif /* HAVE_LIBETPAN */
-+
-+#endif /* __ETPAN_SSL_H__ */
-diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
-index b71e4d7..4332f59 100644
---- a/src/etpan/imap-thread.c
-+++ b/src/etpan/imap-thread.c
-@@ -41,6 +41,7 @@
- #include <gtk/gtk.h>
- #include <log.h>
- #include "etpan-thread-manager.h"
-+#include "etpan-ssl.h"
- #include "utils.h"
- #include "mainwindow.h"
- #include "ssl.h"
-@@ -519,79 +520,6 @@ int imap_threaded_connect(Folder * folder, const char * server, int port)
- 	return result.error;
- }
- 
--static int etpan_certificate_check(const unsigned char *certificate, int len, void *data)
--{
--#ifdef USE_GNUTLS
--	struct connect_param *param = (struct connect_param *)data;
--	gnutls_x509_crt_t cert = NULL;
--	gnutls_datum_t tmp;
--	
--	if (certificate == NULL || len < 0) {
--		g_warning("no cert presented.\n");
--		return 0;
--	}
--	
--	tmp.data = malloc(len);
--	memcpy(tmp.data, certificate, len);
--	tmp.size = len;
--	gnutls_x509_crt_init(&cert);
--	if (gnutls_x509_crt_import(cert, &tmp, GNUTLS_X509_FMT_DER) < 0) {
--		g_warning("IMAP: can't get cert\n");
--		return 0;
--	} else if (ssl_certificate_check(cert, (guint)-1, (gchar *)param->server,
--			(gushort)param->port) == TRUE) {
--		gnutls_x509_crt_deinit(cert);
--		return 0;
--	} else {
--		gnutls_x509_crt_deinit(cert);
--		return -1;
--	}
--#endif
--	return 0;
--}
--
--static void connect_ssl_context_cb(struct mailstream_ssl_context * ssl_context, void * data)
--{
--#ifdef USE_GNUTLS
--	PrefsAccount *account = (PrefsAccount *)data;
--	const gchar *cert_path = NULL;
--	const gchar *password = NULL;
--	gnutls_x509_crt_t x509 = NULL;
--	gnutls_x509_privkey_t pkey = NULL;
--
--	if (account->in_ssl_client_cert_file && *account->in_ssl_client_cert_file)
--		cert_path = account->in_ssl_client_cert_file;
--	if (account->in_ssl_client_cert_pass && *account->in_ssl_client_cert_pass)
--		password = account->in_ssl_client_cert_pass;
--	
--	if (mailstream_ssl_set_client_certificate_data(ssl_context, NULL, 0) < 0 ||
--	    mailstream_ssl_set_client_private_key_data(ssl_context, NULL, 0) < 0)
--		debug_print("Impossible to set the client certificate.\n");
--	x509 = ssl_certificate_get_x509_from_pem_file(cert_path);
--	pkey = ssl_certificate_get_pkey_from_pem_file(cert_path);
--	if (!(x509 && pkey)) {
--		/* try pkcs12 format */
--		ssl_certificate_get_x509_and_pkey_from_p12_file(cert_path, password, &x509, &pkey);
--	}
--	if (x509 && pkey) {
--		unsigned char *x509_der = NULL, *pkey_der = NULL;
--		size_t x509_len, pkey_len;
--		
--		x509_len = (size_t)gnutls_i2d_X509(x509, &x509_der);
--		pkey_len = (size_t)gnutls_i2d_PrivateKey(pkey, &pkey_der);
--		if (x509_len > 0 && pkey_len > 0) {
--			if (mailstream_ssl_set_client_certificate_data(ssl_context, x509_der, x509_len) < 0 ||
--			    mailstream_ssl_set_client_private_key_data(ssl_context, pkey_der, pkey_len) < 0) 
--				log_error(LOG_PROTOCOL, _("Impossible to set the client certificate.\n"));
--			g_free(x509_der);
--			g_free(pkey_der);
--		}
--		gnutls_x509_crt_deinit(x509);
--		gnutls_x509_privkey_deinit(pkey);
--	}
--#endif
--}
--
- static void connect_ssl_run(struct etpan_thread_op * op)
- {
- 	int r;
-@@ -605,7 +533,7 @@ static void connect_ssl_run(struct etpan_thread_op * op)
- 
- 	r = mailimap_ssl_connect_with_callback(param->imap,
- 				 		param->server, param->port,
--						connect_ssl_context_cb, param->account);
-+						etpan_connect_ssl_context_cb, param->account);
- 	result->error = r;
- }
- 
-@@ -616,8 +544,6 @@ int imap_threaded_connect_ssl(Folder * folder, const char * server, int port)
- 	chashdatum key;
- 	chashdatum value;
- 	mailimap * imap, * oldimap;
--	unsigned char *certificate = NULL;
--	int cert_len;
- 	
- 	oldimap = get_imap(folder);
- 
-@@ -644,11 +570,8 @@ int imap_threaded_connect_ssl(Folder * folder, const char * server, int port)
- 
- 	if ((result.error == MAILIMAP_NO_ERROR_AUTHENTICATED ||
- 	     result.error == MAILIMAP_NO_ERROR_NON_AUTHENTICATED) && !etpan_skip_ssl_cert_check) {
--		cert_len = (int)mailstream_ssl_get_certificate(imap->imap_stream, &certificate);
--		if (etpan_certificate_check(certificate, cert_len, &param) < 0)
--			return -1;
--		if (certificate) 
--			free(certificate); 
-+		if (etpan_certificate_check(imap->imap_stream, server, port) < 0)
-+			result.error = MAILIMAP_ERROR_SSL;
- 	}
- 	debug_print("connect %d with imap %p\n", result.error, imap);
- 	
-@@ -1156,7 +1079,7 @@ static void starttls_run(struct etpan_thread_op * op)
- 			return;
- 		}
- 
--		tls_low = mailstream_low_tls_open_with_callback(fd, connect_ssl_context_cb, param->account);
-+		tls_low = mailstream_low_tls_open_with_callback(fd, etpan_connect_ssl_context_cb, param->account);
- 		if (tls_low == NULL) {
- 			debug_print("imap starttls run - can't tls_open\n");
- 			result->error = MAILIMAP_ERROR_STREAM;
-@@ -1171,8 +1094,6 @@ int imap_threaded_starttls(Folder * folder, const gchar *host, int port)
- {
- 	struct connect_param param;
- 	struct starttls_result result;
--	int cert_len;
--	unsigned char *certificate = NULL;
- 	
- 	debug_print("imap starttls - begin\n");
- 	
-@@ -1186,11 +1107,8 @@ int imap_threaded_starttls(Folder * folder, const gchar *host, int port)
- 	debug_print("imap starttls - end\n");
- 
- 	if (result.error == 0 && param.imap && !etpan_skip_ssl_cert_check) {
--		cert_len = (int)mailstream_ssl_get_certificate(param.imap->imap_stream, &certificate);
--		if (etpan_certificate_check(certificate, cert_len, &param) < 0)
--			result.error = MAILIMAP_ERROR_STREAM;
--		if (certificate) 
--			free(certificate); 
-+		if (etpan_certificate_check(param.imap->imap_stream, host, port) < 0)
-+			return MAILIMAP_ERROR_SSL;
- 	}	
- 	return result.error;
- }
-diff --git a/src/etpan/nntp-thread.c b/src/etpan/nntp-thread.c
-index 6d76e7a..84a2f83 100644
---- a/src/etpan/nntp-thread.c
-+++ b/src/etpan/nntp-thread.c
-@@ -41,6 +41,7 @@
- #include <gtk/gtk.h>
- #include <log.h>
- #include "etpan-thread-manager.h"
-+#include "etpan-ssl.h"
- #include "utils.h"
- #include "mainwindow.h"
- #include "ssl_certificate.h"
-@@ -373,79 +374,6 @@ int nntp_threaded_connect(Folder * folder, const char * server, int port)
- 	return result.error;
- }
- 
--static int etpan_certificate_check(const unsigned char *certificate, int len, void *data)
--{
--#ifdef USE_GNUTLS
--	struct connect_param *param = (struct connect_param *)data;
--	gnutls_x509_crt_t cert = NULL;
--	gnutls_datum_t tmp;
--	
--	if (certificate == NULL || len < 0) {
--		g_warning("no cert presented.\n");
--		return 0;
--	}
--	
--	tmp.data = malloc(len);
--	memcpy(tmp.data, certificate, len);
--	tmp.size = len;
--	gnutls_x509_crt_init(&cert);
--	if (gnutls_x509_crt_import(cert, &tmp, GNUTLS_X509_FMT_DER) < 0) {
--		g_warning("nntp: can't get cert\n");
--		return 0;
--	} else if (ssl_certificate_check(cert, (guint)-1,
--		(gchar *)param->server, (gushort)param->port) == TRUE) {
--		gnutls_x509_crt_deinit(cert);
--		return 0;
--	} else {
--		gnutls_x509_crt_deinit(cert);
--		return -1;
--	}
--#endif
--	return 0;
--}
--
--static void connect_ssl_context_cb(struct mailstream_ssl_context * ssl_context, void * data)
--{
--#ifdef USE_GNUTLS
--	PrefsAccount *account = (PrefsAccount *)data;
--	const gchar *cert_path = NULL;
--	const gchar *password = NULL;
--	gnutls_x509_crt_t x509 = NULL;
--	gnutls_x509_privkey_t pkey = NULL;
--
--	if (account->in_ssl_client_cert_file && *account->in_ssl_client_cert_file)
--		cert_path = account->in_ssl_client_cert_file;
--	if (account->in_ssl_client_cert_pass && *account->in_ssl_client_cert_pass)
--		password = account->in_ssl_client_cert_pass;
--	
--	if (mailstream_ssl_set_client_certificate_data(ssl_context, NULL, 0) < 0 ||
--	    mailstream_ssl_set_client_private_key_data(ssl_context, NULL, 0) < 0)
--		debug_print("Impossible to set the client certificate.\n");
--	x509 = ssl_certificate_get_x509_from_pem_file(cert_path);
--	pkey = ssl_certificate_get_pkey_from_pem_file(cert_path);
--	if (!(x509 && pkey)) {
--		/* try pkcs12 format */
--		ssl_certificate_get_x509_and_pkey_from_p12_file(cert_path, password, &x509, &pkey);
--	}
--	if (x509 && pkey) {
--		unsigned char *x509_der = NULL, *pkey_der = NULL;
--		size_t x509_len, pkey_len;
--		
--		x509_len = (size_t)gnutls_i2d_X509(x509, &x509_der);
--		pkey_len = (size_t)gnutls_i2d_PrivateKey(pkey, &pkey_der);
--		if (x509_len > 0 && pkey_len > 0) {
--			if (mailstream_ssl_set_client_certificate_data(ssl_context, x509_der, x509_len) < 0 ||
--			    mailstream_ssl_set_client_private_key_data(ssl_context, pkey_der, pkey_len) < 0) 
--				log_error(LOG_PROTOCOL, _("Impossible to set the client certificate.\n"));
--			g_free(x509_der);
--			g_free(pkey_der);
--		}
--		gnutls_x509_crt_deinit(x509);
--		gnutls_x509_privkey_deinit(pkey);
--	}
--#endif
--}
--
- static void connect_ssl_run(struct etpan_thread_op * op)
- {
- 	int r;
-@@ -459,7 +387,7 @@ static void connect_ssl_run(struct etpan_thread_op * op)
- 
- 	r = newsnntp_ssl_connect_with_callback(param->nntp,
- 				 param->server, param->port,
--				 connect_ssl_context_cb, param->account);
-+				 etpan_connect_ssl_context_cb, param->account);
- 	result->error = r;
- }
- 
-@@ -470,8 +398,6 @@ int nntp_threaded_connect_ssl(Folder * folder, const char * server, int port)
- 	chashdatum key;
- 	chashdatum value;
- 	newsnntp * nntp, * oldnntp;
--	unsigned char *certificate = NULL;
--	int cert_len;
- 	
- 	oldnntp = get_nntp(folder);
- 
-@@ -497,11 +423,8 @@ int nntp_threaded_connect_ssl(Folder * folder, const char * server, int port)
- 	threaded_run(folder, &param, &result, connect_ssl_run);
- 
- 	if (result.error == NEWSNNTP_NO_ERROR && !etpan_skip_ssl_cert_check) {
--		cert_len = (int)mailstream_ssl_get_certificate(nntp->nntp_stream, &certificate);
--		if (etpan_certificate_check(certificate, cert_len, &param) < 0)
-+		if (etpan_certificate_check(nntp->nntp_stream, server, port) < 0)
- 			return -1;
--		if (certificate) 
--			free(certificate); 
- 	}
- 	debug_print("connect %d with nntp %p\n", result.error, nntp);
- 	
--- 
-1.9.2
-
diff --git a/extra/claws-mail/claws-ssl-2.patch b/extra/claws-mail/claws-ssl-2.patch
deleted file mode 100644
index 77186d20b..000000000
--- a/extra/claws-mail/claws-ssl-2.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From fe50206b4385404c38ad0421bdfb707bb6994d80 Mon Sep 17 00:00:00 2001
-From: Nepu User <nepu@localhost.localdomain>
-Date: Sun, 27 Apr 2014 14:55:18 +0200
-Subject: [PATCH 2/3] upstream commit dda3675203030f329d527c697e14342c9c13a75c
-
----
- src/common/ssl_certificate.c | 17 ++++++++++++++
- src/common/ssl_certificate.h |  1 +
- src/etpan/etpan-ssl.c        | 53 ++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 71 insertions(+)
-
-diff --git a/src/common/ssl_certificate.c b/src/common/ssl_certificate.c
-index 84e017e..72f73ac 100644
---- a/src/common/ssl_certificate.c
-+++ b/src/common/ssl_certificate.c
-@@ -647,6 +647,23 @@ gboolean ssl_certificate_check (gnutls_x509_crt_t x509_cert, guint status, const
- 	return TRUE;
- }
- 
-+gboolean ssl_certificate_check_chain(gnutls_x509_crt_t *certs, gint chain_len, const gchar *host, gushort port)
-+{
-+	gboolean result = FALSE;
-+	gint status;
-+
-+	gnutls_x509_crt_list_verify (certs,
-+                             chain_len,
-+                             NULL, 0,
-+                             NULL, 0,
-+                             GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT,
-+                             &status);
-+
-+	result = ssl_certificate_check(certs[0], status, host, port);
-+
-+	return result;
-+}
-+
- gnutls_x509_crt_t ssl_certificate_get_x509_from_pem_file(const gchar *file)
- {
- 	gnutls_x509_crt_t x509 = NULL;
-diff --git a/src/common/ssl_certificate.h b/src/common/ssl_certificate.h
-index 8bbe2ac..fd8822a 100644
---- a/src/common/ssl_certificate.h
-+++ b/src/common/ssl_certificate.h
-@@ -58,6 +58,7 @@ struct _SSLCertHookData
- 
- SSLCertificate *ssl_certificate_find (const gchar *host, gushort port, const gchar *fingerprint);
- gboolean ssl_certificate_check (gnutls_x509_crt_t x509_cert, guint status, const gchar *host, gushort port);
-+gboolean ssl_certificate_check_chain(gnutls_x509_crt_t *certs, gint chain_len, const gchar *host, gushort port);
- void ssl_certificate_destroy(SSLCertificate *cert);
- void ssl_certificate_delete_from_disk(SSLCertificate *cert);
- char * readable_fingerprint(unsigned char *src, int len);
-diff --git a/src/etpan/etpan-ssl.c b/src/etpan/etpan-ssl.c
-index 6642e40..c9dc9d8 100644
---- a/src/etpan/etpan-ssl.c
-+++ b/src/etpan/etpan-ssl.c
-@@ -26,6 +26,7 @@
- #ifdef USE_GNUTLS
- #ifdef HAVE_LIBETPAN
- #include <libetpan/libetpan.h>
-+#include <libetpan/libetpan_version.h>
- #include <gnutls/gnutls.h>
- #include <gnutls/x509.h>
- #include <stdlib.h>
-@@ -33,6 +34,7 @@
- #include <glib/gi18n.h>
- #include <errno.h>
- 
-+#include "etpan-ssl.h"
- #include "ssl_certificate.h"
- #include "utils.h"
- #include "log.h"
-@@ -40,6 +42,7 @@
- 
- gboolean etpan_certificate_check(mailstream *stream, const char *host, gint port)
- {
-+#if (!defined LIBETPAN_API_CURRENT || LIBETPAN_API_CURRENT < 18)
- 	unsigned char *cert_der = NULL;
- 	int len;
- 	gnutls_x509_crt_t cert = NULL;
-@@ -75,6 +78,56 @@ gboolean etpan_certificate_check(mailstream *stream, const char *host, gint port
- 		gnutls_x509_crt_deinit(cert);
- 		return FALSE;
- 	}
-+#else
-+	carray *certs_der = NULL;
-+	gint chain_len = 0, i;
-+	gnutls_x509_crt_t *certs = NULL;
-+	gboolean result;
-+
-+	if (stream == NULL)
-+		return FALSE;
-+
-+	certs_der = mailstream_get_certificate_chain(stream);
-+	if (!certs_der) {
-+		g_warning("could not get certs");
-+		return FALSE;
-+	}
-+	chain_len = carray_count(certs_der);
-+
-+	certs = malloc(sizeof(gnutls_x509_crt_t) * chain_len);
-+	if  (certs == NULL) {
-+		g_warning("could not allocate certs");
-+		return FALSE;
-+	}
-+
-+	result = TRUE;
-+	for (i = 0; i < chain_len; i++) {
-+		MMAPString *cert_str = carray_get(certs_der, i);
-+		gnutls_datum_t tmp;
-+
-+		tmp.data = malloc(cert_str->len);
-+		memcpy(tmp.data, cert_str->str, cert_str->len);
-+		tmp.size = cert_str->len;
-+
-+		mmap_string_free(cert_str);
-+
-+		gnutls_x509_crt_init(&certs[i]);
-+		if (gnutls_x509_crt_import(certs[i], &tmp, GNUTLS_X509_FMT_DER) < 0)
-+			result = FALSE;
-+
-+		free(tmp.data);
-+	}
-+
-+	carray_free(certs_der);
-+
-+	if (result == TRUE)
-+		result = ssl_certificate_check_chain(certs, chain_len, host, port);
-+
-+	for (i = 0; i < chain_len; i++)
-+		gnutls_x509_crt_deinit(certs[i]);
-+
-+	return result;
-+#endif
- }
- 
- void etpan_connect_ssl_context_cb(struct mailstream_ssl_context * ssl_context, void * data)
--- 
-1.9.2
-
diff --git a/extra/claws-mail/claws-ssl-3.patch b/extra/claws-mail/claws-ssl-3.patch
deleted file mode 100644
index cf3306337..000000000
--- a/extra/claws-mail/claws-ssl-3.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-From a74e15a5c7185b941a24b0b61bc134397c8d5737 Mon Sep 17 00:00:00 2001
-From: Nepu User <nepu@localhost.localdomain>
-Date: Sun, 27 Apr 2014 14:56:01 +0200
-Subject: [PATCH 3/3] upstream commit 4d0f2b9b14819b26fbaa72ad129ec0c03e41400f
-
----
- src/common/ssl_certificate.c | 114 +++++++++++++++++++++++++++++--------------
- src/etpan/etpan-ssl.c        |   1 +
- src/etpan/imap-thread.c      |   4 +-
- src/etpan/nntp-thread.c      |   2 +-
- 4 files changed, 82 insertions(+), 39 deletions(-)
-
-diff --git a/src/common/ssl_certificate.c b/src/common/ssl_certificate.c
-index 72f73ac..48e55c9 100644
---- a/src/common/ssl_certificate.c
-+++ b/src/common/ssl_certificate.c
-@@ -207,33 +207,73 @@ size_t gnutls_i2d_PrivateKey(gnutls_x509_privkey_t pkey, unsigned char **output)
- 	return key_size;
- }
- 
--static gnutls_x509_crt_t gnutls_d2i_X509_fp(FILE *fp, int format)
-+static int gnutls_d2i_X509_list_fp(FILE *fp, int format, gnutls_x509_crt_t **cert_list, gint *num_certs)
- {
--	gnutls_x509_crt_t cert = NULL;
-+	gnutls_x509_crt_t *crt_list;
-+	unsigned int max = 512;
-+	unsigned int flags = 0;
- 	gnutls_datum_t tmp;
- 	struct stat s;
- 	int r;
-+
-+	*cert_list = NULL;
-+	*num_certs = 0;
-+
-+	if (fp == NULL)
-+		return -ENOENT;
-+
- 	if (fstat(fileno(fp), &s) < 0) {
- 		perror("fstat");
--		return NULL;
-+		return -errno;
- 	}
-+
-+	crt_list=(gnutls_x509_crt_t*)malloc(max*sizeof(gnutls_x509_crt_t));
- 	tmp.data = malloc(s.st_size);
- 	memset(tmp.data, 0, s.st_size);
- 	tmp.size = s.st_size;
- 	if (fread (tmp.data, 1, s.st_size, fp) < s.st_size) {
- 		perror("fread");
- 		free(tmp.data);
--		return NULL;
-+		free(crt_list);
-+		return -EIO;
- 	}
- 
--	gnutls_x509_crt_init(&cert);
--	if ((r = gnutls_x509_crt_import(cert, &tmp, (format == 0)?GNUTLS_X509_FMT_DER:GNUTLS_X509_FMT_PEM)) < 0) {
-+	if ((r = gnutls_x509_crt_list_import(crt_list, &max, 
-+			&tmp, format, flags)) < 0) {
- 		debug_print("cert import failed: %s\n", gnutls_strerror(r));
--		gnutls_x509_crt_deinit(cert);
--		cert = NULL;
-+		free(tmp.data);
-+		free(crt_list);
-+		return r;
- 	}
- 	free(tmp.data);
--	debug_print("got cert! %p\n", cert);
-+	debug_print("got %d certs in crt_list! %p\n", max, &crt_list);
-+
-+	*cert_list = crt_list;
-+	*num_certs = max;
-+
-+	return r;
-+}
-+
-+/* return one certificate, read from file */
-+static gnutls_x509_crt_t gnutls_d2i_X509_fp(FILE *fp, int format)
-+{
-+	gnutls_x509_crt_t *certs = NULL;
-+	gnutls_x509_crt_t cert = NULL;
-+	int i, ncerts, r;
-+
-+	if ((r = gnutls_d2i_X509_list_fp(fp, format, &certs, &ncerts)) < 0) {
-+		return NULL;
-+	}
-+
-+	if (ncerts == 0)
-+		return NULL;
-+
-+	for (i = 1; i < ncerts; i++)
-+		gnutls_x509_crt_deinit(certs[i]);
-+
-+	cert = certs[0];
-+	free(certs);
-+
- 	return cert;
- }
- 
-@@ -474,8 +514,6 @@ static guint check_cert(gnutls_x509_crt_t cert)
- 	gnutls_x509_crt_t *ca_list;
- 	unsigned int max = 512;
- 	unsigned int flags = 0;
--	gnutls_datum_t tmp;
--	struct stat s;
- 	int r, i;
- 	unsigned int status;
- 	FILE *fp;
-@@ -485,34 +523,12 @@ static guint check_cert(gnutls_x509_crt_t cert)
- 	else
- 		return (guint)-1;
- 
--	if (fstat(fileno(fp), &s) < 0) {
--		perror("fstat");
--		fclose(fp);
--		return (guint)-1;
--	}
--
--	ca_list=(gnutls_x509_crt_t*)malloc(max*sizeof(gnutls_x509_crt_t));
--	tmp.data = malloc(s.st_size);
--	memset(tmp.data, 0, s.st_size);
--	tmp.size = s.st_size;
--	if (fread (tmp.data, 1, s.st_size, fp) < s.st_size) {
--		perror("fread");
--		free(tmp.data);
--		free(ca_list);
--		fclose(fp);
--		return (guint)-1;
--	}
--
--	if ((r = gnutls_x509_crt_list_import(ca_list, &max, 
--			&tmp, GNUTLS_X509_FMT_PEM, flags)) < 0) {
-+	if ((r = gnutls_d2i_X509_list_fp(fp, GNUTLS_X509_FMT_PEM, &ca_list, &max)) < 0) {
- 		debug_print("cert import failed: %s\n", gnutls_strerror(r));
--		free(tmp.data);
--		free(ca_list);
- 		fclose(fp);
- 		return (guint)-1;
- 	}
--	free(tmp.data);
--	debug_print("got %d certs in ca_list! %p\n", max, &ca_list);
-+
- 	r = gnutls_x509_crt_verify(cert, ca_list, max, flags, &status);
- 	fclose(fp);
- 
-@@ -649,18 +665,44 @@ gboolean ssl_certificate_check (gnutls_x509_crt_t x509_cert, guint status, const
- 
- gboolean ssl_certificate_check_chain(gnutls_x509_crt_t *certs, gint chain_len, const gchar *host, gushort port)
- {
-+	int ncas = 0, ncrls = 0;
-+	gnutls_x509_crt_t *cas = NULL;
-+	gnutls_x509_crl_t *crls = NULL;
- 	gboolean result = FALSE;
-+	int i;
- 	gint status;
- 
-+	if (claws_ssl_get_cert_file()) {
-+		FILE *fp = g_fopen(claws_ssl_get_cert_file(), "rb");
-+		int r = -errno;
-+
-+		if (fp) {
-+			r = gnutls_d2i_X509_list_fp(fp, GNUTLS_X509_FMT_PEM, &cas, &ncas);
-+			fclose(fp);
-+		}
-+
-+		if (r < 0)
-+			g_warning("Can't read SSL_CERT_FILE %s: %s\n",
-+				claws_ssl_get_cert_file(), 
-+				gnutls_strerror(r));
-+	} else {
-+		debug_print("Can't find SSL ca-certificates file\n");
-+	}
-+
-+
- 	gnutls_x509_crt_list_verify (certs,
-                              chain_len,
--                             NULL, 0,
-+                             cas, ncas,
-                              NULL, 0,
-                              GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT,
-                              &status);
- 
- 	result = ssl_certificate_check(certs[0], status, host, port);
- 
-+	for (i = 0; i < ncas; i++)
-+		gnutls_x509_crt_deinit(cas[i]);
-+	free(cas);
-+
- 	return result;
- }
- 
-diff --git a/src/etpan/etpan-ssl.c b/src/etpan/etpan-ssl.c
-index c9dc9d8..f99955b 100644
---- a/src/etpan/etpan-ssl.c
-+++ b/src/etpan/etpan-ssl.c
-@@ -125,6 +125,7 @@ gboolean etpan_certificate_check(mailstream *stream, const char *host, gint port
- 
- 	for (i = 0; i < chain_len; i++)
- 		gnutls_x509_crt_deinit(certs[i]);
-+	free(certs);
- 
- 	return result;
- #endif
-diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
-index 4332f59..f0b504e 100644
---- a/src/etpan/imap-thread.c
-+++ b/src/etpan/imap-thread.c
-@@ -570,7 +570,7 @@ int imap_threaded_connect_ssl(Folder * folder, const char * server, int port)
- 
- 	if ((result.error == MAILIMAP_NO_ERROR_AUTHENTICATED ||
- 	     result.error == MAILIMAP_NO_ERROR_NON_AUTHENTICATED) && !etpan_skip_ssl_cert_check) {
--		if (etpan_certificate_check(imap->imap_stream, server, port) < 0)
-+		if (etpan_certificate_check(imap->imap_stream, server, port) != TRUE)
- 			result.error = MAILIMAP_ERROR_SSL;
- 	}
- 	debug_print("connect %d with imap %p\n", result.error, imap);
-@@ -1107,7 +1107,7 @@ int imap_threaded_starttls(Folder * folder, const gchar *host, int port)
- 	debug_print("imap starttls - end\n");
- 
- 	if (result.error == 0 && param.imap && !etpan_skip_ssl_cert_check) {
--		if (etpan_certificate_check(param.imap->imap_stream, host, port) < 0)
-+		if (etpan_certificate_check(param.imap->imap_stream, host, port) != TRUE)
- 			return MAILIMAP_ERROR_SSL;
- 	}	
- 	return result.error;
-diff --git a/src/etpan/nntp-thread.c b/src/etpan/nntp-thread.c
-index 84a2f83..7708d31 100644
---- a/src/etpan/nntp-thread.c
-+++ b/src/etpan/nntp-thread.c
-@@ -423,7 +423,7 @@ int nntp_threaded_connect_ssl(Folder * folder, const char * server, int port)
- 	threaded_run(folder, &param, &result, connect_ssl_run);
- 
- 	if (result.error == NEWSNNTP_NO_ERROR && !etpan_skip_ssl_cert_check) {
--		if (etpan_certificate_check(nntp->nntp_stream, server, port) < 0)
-+		if (etpan_certificate_check(nntp->nntp_stream, server, port) != TRUE)
- 			return -1;
- 	}
- 	debug_print("connect %d with nntp %p\n", result.error, nntp);
--- 
-1.9.2
-
diff --git a/extra/efl/PKGBUILD b/extra/efl/PKGBUILD
index 028b92550..40e57269b 100644
--- a/extra/efl/PKGBUILD
+++ b/extra/efl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 213022 2014-05-17 12:44:11Z ronald $
+# $Id: PKGBUILD 213609 2014-05-26 19:22:35Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Enlightenment Developers <enlightenment-devel@enlightenment.org>
 
 pkgbase=efl
 pkgname=('efl' 'efl-docs')
-pkgver=1.9.4
+pkgver=1.10.0
 pkgrel=1
 pkgdesc="Enlightenment Foundation Libraries"
 arch=('i686' 'x86_64')
@@ -21,7 +21,8 @@ replaces=('ecore' 'edje' 'eet' 'eeze' 'efreet' 'eina' 'eio' 'embryo'
 options=('!emptydirs')
 source=(http://download.enlightenment.org/rel/libs/${pkgname}/$pkgname-$pkgver.tar.gz)
 install=efl.install
-sha1sums=('0f82e456f18f69617ff190ef4eb2138c8af393a3')
+sha1sums=('c9e57f55f050e2a7e97e870857170163a550beaa')
+
 
 prepare() {
   sed -i 's/env python$/&2/' "${srcdir}/${pkgname}-${pkgver}/src/scripts/eina/eina-bench-cmp"
diff --git a/extra/elementary/PKGBUILD b/extra/elementary/PKGBUILD
index da45e8729..921672dd0 100644
--- a/extra/elementary/PKGBUILD
+++ b/extra/elementary/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 213024 2014-05-17 12:49:09Z ronald $
+# $Id: PKGBUILD 213610 2014-05-26 19:26:32Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgbase=elementary
 pkgname=('elementary' 'elementary-docs')
-pkgver=1.9.4
+pkgver=1.10.0
 pkgrel=1
 pkgdesc="Enlightenment's widget set"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('efl' 'evas_generic_loaders')
 makedepends=('doxygen' 'imagemagick')
 options=('!emptydirs')
 source=(http://download.enlightenment.org/rel/libs/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('481930143499dcd23b417636f5115cc4a2d0f899')
+sha1sums=('48c62ab994d69f32c1cad3f3e499f7300e7ffda3')                                         
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/emotion_generic_players/PKGBUILD b/extra/emotion_generic_players/PKGBUILD
index e56f381ad..66561cdfc 100644
--- a/extra/emotion_generic_players/PKGBUILD
+++ b/extra/emotion_generic_players/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 207616 2014-03-12 20:49:03Z ronald $
+# $Id: PKGBUILD 213611 2014-05-26 19:28:08Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Enlightenment Developers <enlightenment-devel@enlightenment.org>
 
 pkgname=emotion_generic_players
-pkgver=1.9.0
+pkgver=1.10.0
 pkgrel=1
 pkgdesc="Enlightenment Foundation Libraries"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('efl' 'vlc')
 options=('!emptydirs')
 source=(http://download.enlightenment.org/rel/libs/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('c5adf821ca8084b9fd40fb786f206882dab3f41f')
+sha1sums=('813b099a8e8cde3062ebc2ecbd369555c79009d5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD
index a0845ecf3..da4042676 100644
--- a/extra/evas_generic_loaders/PKGBUILD
+++ b/extra/evas_generic_loaders/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 212155 2014-05-09 14:50:57Z andyrtr $
+# $Id: PKGBUILD 213612 2014-05-26 19:28:18Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=evas_generic_loaders
-pkgver=1.9.0
-pkgrel=2
+pkgver=1.10.0
+pkgrel=1
 pkgdesc="Additional generic loaders for Evas"
 arch=('i686' 'x86_64')
 url="http://www.enlightenment.org"
@@ -12,7 +12,7 @@ license=('GPL2')
 depends=('librsvg' 'poppler' 'libraw' 'libspectre' 'efl' 'gstreamer0.10-base')
 options=('!emptydirs')
 source=(http://download.enlightenment.org/rel/libs/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('9741e7aed8adb86f21563bccde40a0e39c64c250')
+sha1sums=('3ac1faf875cadaedfa86776e127874432e0273ea')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/terminology/PKGBUILD b/extra/terminology/PKGBUILD
index 234610495..acd8cf5ff 100644
--- a/extra/terminology/PKGBUILD
+++ b/extra/terminology/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Paul Ezvan <paul@ezvan.fr>
 
 pkgname=terminology
-pkgver=0.5.0
+pkgver=0.5.1
 pkgrel=1
 pkgdesc="EFL based terminal emulator"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('elementary')
 source=("http://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 install=terminology.install
-sha1sums=('9d072dc38a8884ec15b3cb2827f0b2a9bd574ad4')
+sha1sums=('5246904f5e7889cbf18c59a68d832fe36b43fafc')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"