Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre

27 files changed, 1060 insertions, 165 deletions

diff --git a/nonprism/amarok-nonprism/PKGBUILD b/nonprism/amarok-nonprism/PKGBUILD
index 82f0d1923..6bf592d5b 100644
--- a/nonprism/amarok-nonprism/PKGBUILD
+++ b/nonprism/amarok-nonprism/PKGBUILD
@@ -1,8 +1,8 @@
 # $Id: PKGBUILD 211520 2014-04-19 11:27:02Z andrea $
-# Maintainer: Ronald van Haren <ronald@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Ronald van Haren <ronald@archlinux.org>
+# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
+# Contributor (Arch): damir <damir@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgname=amarok
 pkgname=amarok-nonprism
@@ -12,9 +12,9 @@ pkgdesc="The powerful music player for KDE, without Amazon MP3 store support"
 arch=("i686" "x86_64")
 url="http://amarok.kde.org/"
 license=('GPL2' 'LGPL2.1' 'FDL')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
+replaces=($_pkgname)
+conflicts=($_pkgname)
+provides=($_pkgname=$pkgver)
 depends=('kdebase-runtime' 'mariadb' 'qtscriptgenerator' 'taglib-extras'
         'liblastfm' 'ffmpeg' 'libofa' 'qjson')
 makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
diff --git a/nonprism/banshee-nonprism/PKGBUILD b/nonprism/banshee-nonprism/PKGBUILD
index 5f3657615..c5b20fd7c 100644
--- a/nonprism/banshee-nonprism/PKGBUILD
+++ b/nonprism/banshee-nonprism/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 141668 2011-11-02 03:17:12Z eric $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: György Balló <ballogy@freestart.hu>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Daniel Isenmann <daniel@archlinux.org>
+# Contributor (Arch): György Balló <ballogy@freestart.hu>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgname=banshee
 pkgname=banshee-nonprism
@@ -17,9 +17,9 @@ optdepends=('gst-plugins-good: Extra media codecs'
             'gst-plugins-ugly: Extra media codecs'
             'gst-libav: Extra media codecs'
             'brasero: CD burning')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
+replaces=($_pkgname)
+conflicts=($_pkgname)
+provides=($_pkgname=$pkgver)
 install=$_pkgname.install
 source=(http://download.gnome.org/sources/$_pkgname/2.6/$_pkgname-$pkgver.tar.xz
         Initial-port-to-GStreamer-1.0.patch
diff --git a/nonprism/bitlbee-libre-nonprism/PKGBUILD b/nonprism/bitlbee-libre-nonprism/PKGBUILD
index 9d29dce35..bb2ad0f09 100644
--- a/nonprism/bitlbee-libre-nonprism/PKGBUILD
+++ b/nonprism/bitlbee-libre-nonprism/PKGBUILD
@@ -1,12 +1,12 @@
 # $Id: PKGBUILD 202378 2013-12-21 14:01:44Z andyrtr $
 
-# Contributor: FUBAR <mrfubar@gmail.com>
-# Contributor: simo <simo@archlinux.org>
-# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Gaetan Bisson <bisson@archlinux.org>
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
+# Contributor (Arch): FUBAR <mrfubar@gmail.com>
+# Contributor (Arch): simo <simo@archlinux.org>
+# Contributor (Arch): Jeff 'codemac' Mickey <jeff@archlinux.org>
+# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor (Arch): Gaetan Bisson <bisson@archlinux.org>
+# Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
 
 _pkgname=bitlbee
 pkgname=bitlbee-libre-nonprism
@@ -20,8 +20,8 @@ depends=('gnutls' 'glib2')
 makedepends=('asciidoc' 'libotr3')
 optdepends=('libotr3: for OTR encryption support'
             'xinetd: to run bitlbee through xinetd')
-provides=$_pkgname=$pkgver
-conflicts=$_pkgname
+provides=($_pkgname=$pkgver)
+conflicts=($_pkgname)
 replaces=("$_pkgname" "$_pkgname-libre" "$_pkgname-coherence")
 source=("http://get.bitlbee.org/src/${_pkgname}-${pkgver}.tar.gz"
         'xinetd'
diff --git a/nonprism/bti-nonprism/PKGBUILD b/nonprism/bti-nonprism/PKGBUILD
index e09af287c..b7df4c6a2 100644
--- a/nonprism/bti-nonprism/PKGBUILD
+++ b/nonprism/bti-nonprism/PKGBUILD
@@ -1,8 +1,8 @@
 # $Id: PKGBUILD 105298 2014-02-04 18:30:40Z jlichtblau $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Kaiting Chen <kaitocracy@gmail.com>
-# Contributor: uvok <uvok at online dot de>
-# Contributor: Urist <9362773 at gmail.com>
+# Maintainer (Arch): Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor (Arch): Kaiting Chen <kaitocracy@gmail.com>
+# Contributor (Arch): uvok <uvok at online dot de>
+# Contributor (Arch): Urist <9362773 at gmail.com>
 
 _pkgname=bti
 pkgname=bti-nonprism
@@ -13,9 +13,9 @@ arch=('i686' 'x86_64' 'mips64el')
 url='http://gregkh.github.com/bti/'
 license=('GPL')
 depends=('pcre' 'libxml2' 'curl' 'liboauth' 'json-c')
-provides=$_pkgname=$pkgver
-conflicts=$_pkgname
-replaces=$_pkgname
+provides=($_pkgname=$pkgver)
+conflicts=($_pkgname)
+replaces=($_pkgname)
 source=(http://www.kernel.org/pub/software/web/$_pkgname/$_pkgname-$pkgver.tar.xz
         nonprism.patch)
 sha256sums=('8b4a1a11f529f83956468acadaea9d11db4f03e82afe07fecb84b2d00e9eae83'
diff --git a/nonprism/centerim-nonprism/PKGBUILD b/nonprism/centerim-nonprism/PKGBUILD
index 1863e006b..0c2b3163a 100644
--- a/nonprism/centerim-nonprism/PKGBUILD
+++ b/nonprism/centerim-nonprism/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-# Contributor: shild <sxp@bk.ru>
+# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor (Arch): Aaron Griffin <aaron@archlinux.org>
+# Contributor (Arch): shild <sxp@bk.ru>
 
 _pkgname=centerim
 pkgname=centerim-nonprism
@@ -13,8 +13,8 @@ url="http://www.centerim.org"
 license=('GPL')
 depends=('python2' 'libjpeg' 'gpgme')
 replaces=("$_pkgname" 'centericq')
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
+conflicts=($_pkgname)
+provides=($_pkgname=$pkgver)
 source=("http://www.centerim.org/download/releases/$_pkgname-$pkgver.tar.gz"
         'nonprism.patch')
 md5sums=('7565c3c8cac98a4e2d8524076a44676f'
diff --git a/nonprism/choqok-nonprism/PKGBUILD b/nonprism/choqok-nonprism/PKGBUILD
index 13f1392bd..62d23478c 100644
--- a/nonprism/choqok-nonprism/PKGBUILD
+++ b/nonprism/choqok-nonprism/PKGBUILD
@@ -1,9 +1,9 @@
 # $Id: PKGBUILD 96779 2013-09-04 22:09:55Z andrea $
-# Maintainer: Peter Richard Lewis <plewis@aur.archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Emanuele Rossi <newdna1510@yahoo.it>
-# Contributor: Bram Schoenmakers <me@bramschoenmakers.nl>
-# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
+# Maintainer (Arch): Peter Richard Lewis <plewis@aur.archlinux.org>
+# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
+# Contributor (Arch): Emanuele Rossi <newdna1510@yahoo.it>
+# Contributor (Arch): Bram Schoenmakers <me@bramschoenmakers.nl>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
 
 _pkgname=choqok
 pkgname=choqok-nonprism
@@ -14,7 +14,7 @@ url='http://choqok.gnufolks.org/'
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 provides=("$_pkgname=$pkgver")
-conflicts=$_pkgname
+conflicts=($_pkgname)
 depends=('kdebase-runtime' 'qjson' 'qoauth' 'qca-ossl')
 makedepends=('cmake' 'automoc4')
 optdepends=('kdebase-konqueror: proxy support')
diff --git a/nonprism/claws-mail-nonprism/PKGBUILD b/nonprism/claws-mail-nonprism/PKGBUILD
index 83710a1e8..f8af801a7 100644
--- a/nonprism/claws-mail-nonprism/PKGBUILD
+++ b/nonprism/claws-mail-nonprism/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 209689 2014-04-01 11:24:16Z jgc $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
+# $Id: PKGBUILD 211817 2014-04-27 16:25:16Z andyrtr $
+# Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
 
 _pkgname=claws-mail
 pkgname=$_pkgname-nonprism
 pkgver=3.9.3
-pkgrel=3
+pkgrel=4
 pkgdesc="A GTK+ based e-mail client, without libgdata support"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
@@ -35,9 +35,24 @@ replaces=("$_pkgname" "sylpheed-claws" "$_pkgname-extra-plugins" "$_pkgname-libr
 conflicts=("$_pkgname" "$_pkgname-extra-plugins")
 provides=("$_pkgname=$pkgver" 'claws')
 install=$_pkgname.install
-source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/$_pkgname-$pkgver.tar.bz2{,.asc})
+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')
+         '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
+}
 
 build() {
   cd $_pkgname-$pkgver
diff --git a/nonprism/claws-mail-nonprism/claws-ssl-1.patch b/nonprism/claws-mail-nonprism/claws-ssl-1.patch
new file mode 100644
index 000000000..941a66ac2
--- /dev/null
+++ b/nonprism/claws-mail-nonprism/claws-ssl-1.patch
@@ -0,0 +1,494 @@
+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/nonprism/claws-mail-nonprism/claws-ssl-2.patch b/nonprism/claws-mail-nonprism/claws-ssl-2.patch
new file mode 100644
index 000000000..77186d20b
--- /dev/null
+++ b/nonprism/claws-mail-nonprism/claws-ssl-2.patch
@@ -0,0 +1,139 @@
+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/nonprism/claws-mail-nonprism/claws-ssl-3.patch b/nonprism/claws-mail-nonprism/claws-ssl-3.patch
new file mode 100644
index 000000000..cf3306337
--- /dev/null
+++ b/nonprism/claws-mail-nonprism/claws-ssl-3.patch
@@ -0,0 +1,241 @@
+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/nonprism/darktable-nonprism/PKGBUILD b/nonprism/darktable-nonprism/PKGBUILD
index 2f4b6ecca..081ecfa1e 100644
--- a/nonprism/darktable-nonprism/PKGBUILD
+++ b/nonprism/darktable-nonprism/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 105572 2014-02-10 13:31:04Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer:  Christian Himpel <chressie at gmail dot com>
-# Contributor: Johannes Hanika <hanatos at gmail dot com>
+# $Id: PKGBUILD 110040 2014-04-23 14:50:57Z spupykin $
+# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer (Arch):  Christian Himpel <chressie at gmail dot com>
+# Contributor (Arch): Johannes Hanika <hanatos at gmail dot com>
 
 _pkgname=darktable
 pkgname=darktable-nonprism
-pkgver=1.4.1
+pkgver=1.4.2
 _pkgver=1.4
 pkgrel=1
 pkgdesc="Utility to organize and develop raw images, without flickcurl support"
 arch=('i686' 'x86_64' 'mips64el')
 url=http://darktable.sf.net/
 license=('GPL3')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
+replaces=($_pkgname)
+conflicts=($_pkgname)
+provides=($_pkgname=$pkgver)
 depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbus-glib'
 	 'curl' 'libgnome-keyring' 'libgphoto2' 'openexr' 'sqlite' 'libxslt'
 	 'libsoup' 'gtk-engines' 'json-glib')
@@ -22,7 +22,7 @@ makedepends=('intltool>=0.40' 'cmake' 'librsvg')
 optdepends=('librsvg')
 install=darktable.install
 source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.xz)
-md5sums=('78252618bb7b1df30109ef5484d46f3c')
+md5sums=('f86554329c2c809ffb009244a6f1d643')
 
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
diff --git a/nonprism/duplicity-nonprism/PKGBUILD b/nonprism/duplicity-nonprism/PKGBUILD
index 79163db90..1c7612999 100644
--- a/nonprism/duplicity-nonprism/PKGBUILD
+++ b/nonprism/duplicity-nonprism/PKGBUILD
@@ -1,18 +1,22 @@
-# $Id: PKGBUILD 105458 2014-02-08 15:39:04Z bgyorgy $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Kaiting Chen <kaitocracy@gmail.com>
-# Contributor: Aaron Schaefer <aaron@elasticdog.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# $Id: PKGBUILD 110919 2014-05-09 15:34:16Z lfleischer $
+# Maintainer (Arch): Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor (Arch): Kaiting Chen <kaitocracy@gmail.com>
+# Contributor (Arch): Aaron Schaefer <aaron@elasticdog.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgname=duplicity
 pkgname=duplicity-nonprism
-pkgver=0.6.23
-pkgrel=3
+pkgver=0.6.24
+pkgrel=1
 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm, without python2-gdata recommendation'
 arch=('i686' 'x86_64')
 url='http://www.nongnu.org/duplicity/'
 license=('GPL')
+replaces=($_pkgname)
+conflicts=($_pkgname)
+provides=($_pkgname=$pkgver)
 depends=('gnupg' 'librsync' 'ncftp' 'python2-paramiko' 'python2-lockfile')
+makedepends=('python2-setuptools')
 optdepends=('lftp: FTPS backend'
             'python2-boto: Amazon S3 backend'
             'python2-gobject: GIO backend'
@@ -20,21 +24,9 @@ optdepends=('lftp: FTPS backend'
             'python2-httplib2: Ubuntu One backend'
             'python2-oauthlib: Ubuntu One backend'
             'rsync: rsync backend')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-source=("http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.gz"{,.sig}
-        "gpg-encode.patch")
-md5sums=('ae0e84446bcf114735de1057ed53c977'
-         'SKIP'
-         '366555c73aeebf7f15f6f37ec65176ce')
-
-prepare() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  # Fix gpg encrypted backup (FS#38838, upstream revision 961, will be fixed in 0.6.24).
-  patch -Np0 -i ../gpg-encode.patch
-}
+source=("https://launchpad.net/$_pkgname/0.6-series/$pkgver/+download/$_pkgname-$pkgver.tar.gz"{,.sig})
+md5sums=('5d4e9329a6d793880909d18b0736ff06'
+         'SKIP')
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
diff --git a/nonprism/eog-plugins-nonprism/PKGBUILD b/nonprism/eog-plugins-nonprism/PKGBUILD
index aadbe85e9..8c69eb66a 100644
--- a/nonprism/eog-plugins-nonprism/PKGBUILD
+++ b/nonprism/eog-plugins-nonprism/PKGBUILD
@@ -1,6 +1,6 @@
 # $Id: PKGBUILD 210576 2014-04-15 08:00:45Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
+# Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
 
 _pkgname=eog-plugins
 pkgname=eog-plugins-nonprism
@@ -13,8 +13,8 @@ license=('GPL2')
 depends=('eog' 'libchamplain')
 makedepends=('intltool')
 provides=("$_pkgname=$pkgver")
-conflicts=$_pkgname
-replaces=$_pkgname
+conflicts=($_pkgname)
+replaces=($_pkgname)
 install=eog-plugins.install
 source=(http://download.gnome.org/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz)
 sha256sums=('5b9a6854d5411e75aadb9d44694bbe02a35f5a79a23da5c1bb4feb6bacf56f1c')
diff --git a/nonprism/evolution-data-server-nonprism/PKGBUILD b/nonprism/evolution-data-server-nonprism/PKGBUILD
index 209a3a287..63559b0e3 100644
--- a/nonprism/evolution-data-server-nonprism/PKGBUILD
+++ b/nonprism/evolution-data-server-nonprism/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 211290 2014-04-18 16:47:56Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 212323 2014-05-12 18:57:42Z jgc $
+# Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
 
 _pkgname=evolution-data-server
 pkgname=evolution-data-server-nonprism
-pkgver=3.12.1
-pkgrel=2
+pkgver=3.12.2
+pkgrel=1
 pkgdesc="Centralized access to appointments and contacts, without libgdata support"
 arch=(i686 x86_64)
 depends=(gnome-online-accounts nss krb5 libgweather libical db)
@@ -13,10 +13,10 @@ install=$_pkgname.install
 url="https://wiki.gnome.org/Apps/Evolution"
 license=(GPL)
 replaces=("$_pkgname" 'evolution-data-server-coherence')
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
+conflicts=($_pkgname)
+provides=($_pkgname=$pkgver)
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('8c794d7f3e5241cc8856ab1d9fccab29487c575d3a3b7d9b884064864b96caa3')
+sha256sums=('91c95e17a8c1cd1086dafcd99a40bdf8f5993770f251f8b0a10e5395e3f5a3b6')
 
 build() {
   cd "$_pkgname-$pkgver"
diff --git a/nonprism/gnome-online-accounts-nonprism/PKGBUILD b/nonprism/gnome-online-accounts-nonprism/PKGBUILD
index e47cd4c98..624d7eb46 100644
--- a/nonprism/gnome-online-accounts-nonprism/PKGBUILD
+++ b/nonprism/gnome-online-accounts-nonprism/PKGBUILD
@@ -1,6 +1,6 @@
 # $Id: PKGBUILD 211221 2014-04-18 11:14:01Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
+# Maintainer (Arch): Ionut Biru <ibiru@archlinux.org>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
 
 _pkgname=gnome-online-accounts
 pkgname=gnome-online-accounts-nonprism
@@ -11,7 +11,7 @@ arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org"
 license=('GPL')
 provides=("$_pkgname=$pkgver")
-conflicts=$_pkgname
+conflicts=($_pkgname)
 replaces=($_pkgname $pkgname-coherence)
 depends=('webkitgtk' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsecret'
          'telepathy-glib' 'krb5' 'gcr')
diff --git a/nonprism/grilo-plugins-nonprism/PKGBUILD b/nonprism/grilo-plugins-nonprism/PKGBUILD
index be38f4132..f2b675538 100644
--- a/nonprism/grilo-plugins-nonprism/PKGBUILD
+++ b/nonprism/grilo-plugins-nonprism/PKGBUILD
@@ -1,6 +1,6 @@
 # $Id: PKGBUILD 210323 2014-04-14 09:05:45Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgname=grilo-plugins
 pkgname=grilo-plugins-nonprism
@@ -10,9 +10,9 @@ pkgdesc="Plugins for Grilo, without libgdata support and gnome-online-accounts r
 url="http://www.gnome.org"
 arch=(i686 x86_64)
 license=(LGPL)
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
+replaces=($_pkgname)
+conflicts=($_pkgname)
+provides=($_pkgname=$pkgver)
 depends=(grilo sqlite libgcrypt)
 makedepends=(gupnp-av gmime libtracker-sparql libdmapsharing
              json-glib intltool avahi itstool libmediaart lua)
diff --git a/nonprism/gthumb-nonprism/PKGBUILD b/nonprism/gthumb-nonprism/PKGBUILD
index b82aa6448..759e14f2b 100644
--- a/nonprism/gthumb-nonprism/PKGBUILD
+++ b/nonprism/gthumb-nonprism/PKGBUILD
@@ -1,9 +1,9 @@
 # $Id: PKGBUILD 209693 2014-04-01 12:03:03Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
+# Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor (Arch): Jan de Groot <jgc@archlinux.org>
+# Contributor (Arch): Tobias Kieslich <tobias@justdreams.de>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Márcio Silva <coadde@parabola.nu>
 
 _pkgname=gthumb
 pkgname=gthumb-nonprism
@@ -13,9 +13,9 @@ pkgdesc="Image browser and viewer for the GNOME Desktop, without support for uns
 arch=(i686 x86_64)
 license=(GPL)
 url="http://live.gnome.org/gthumb"
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
+replaces=($_pkgname)
+conflicts=($_pkgname)
+provides=($_pkgname=$pkgver)
 depends=(desktop-file-utils hicolor-icon-theme dconf librsvg clutter-gtk
          gst-plugins-base-libs gsettings-desktop-schemas libwebp libsecret
          libsoup webkitgtk json-glib)
diff --git a/nonprism/icedove-libre-nonprism/PKGBUILD b/nonprism/icedove-libre-nonprism/PKGBUILD
index 3a2393476..8aca600e8 100644
--- a/nonprism/icedove-libre-nonprism/PKGBUILD
+++ b/nonprism/icedove-libre-nonprism/PKGBUILD
@@ -3,8 +3,8 @@
 
 # We're getting this from Debian Sid
 _debname=icedove
-_debver=24.4.0
-_debrel=deb1
+_debver=24.5.0
+_debrel=deb2
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -30,8 +30,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz"
         vendor.js
         ${_pkgname}.desktop)
 options=(!emptydirs)
-md5sums=('bfe7e2d0d7bf13070745849a98cf1ef0'
-         'bfb4b90eba2586b890c9735a91c3ab1f'
+md5sums=('f5fdb857b1da3e7419acbd5922b4966d'
+         '051ee07e7ca1f28b114e60524a7f72d2'
          'c46cf2a671c8fdefcabd4c87e38f3d40'
          '5a53179d14ae9631b7afe5e4d0fc0b25'
          'e785e0c267f4435ae1a9aa0b03bcacfb')
diff --git a/nonprism/jitsi-nonprism/PKGBUILD b/nonprism/jitsi-nonprism/PKGBUILD
index 914f780d6..d8eaa082d 100644
--- a/nonprism/jitsi-nonprism/PKGBUILD
+++ b/nonprism/jitsi-nonprism/PKGBUILD
@@ -1,7 +1,7 @@
-# Maintainer: Xavier Devlamynck <magicrhesus@ouranos.be>
+# Maintainer (Arch): Xavier Devlamynck <magicrhesus@ouranos.be>
 # Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Márcio Silva <coadde@parabola.nu>
 
 _pkgname=jitsi
 pkgname=jitsi-nonprism
@@ -11,9 +11,9 @@ pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (fo
 arch=('i686' 'x86_64' 'mips64el')
 url="http://jitsi.org"
 license=('LGPL')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
+replaces=($_pkgname)
+conflicts=($_pkgname)
+provides=($_pkgname=$pkgver)
 depends=('jre7-openjdk')
 makedepends=('apache-ant' 'jdk7-openjdk')
 options=(!strip !emptydirs zipman !libtool docs)
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
index d4d83035b..183a5e371 100644
--- a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
@@ -1,6 +1,6 @@
 # $Id: PKGBUILD 210205 2014-04-11 16:54:08Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgname=kdenetwork-kopete
 pkgname=kdenetwork-kopete-libre-nonprism
@@ -11,9 +11,9 @@ url='http://kde.org/applications/internet/kopete/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdenetwork')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
+replaces=($_pkgname)
+conflicts=($_pkgname)
+provides=($_pkgname=$pkgver)
 depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libidn'
          'qimageblitz' 'mediastreamer' 'jsoncpp')
 makedepends=('cmake' 'automoc4' 'boost')
diff --git a/nonprism/kdepim-runtime-nonprism/PKGBUILD b/nonprism/kdepim-runtime-nonprism/PKGBUILD
index cb0949d94..b3f8490bf 100644
--- a/nonprism/kdepim-runtime-nonprism/PKGBUILD
+++ b/nonprism/kdepim-runtime-nonprism/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 210205 2014-04-11 16:54:08Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
+# Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgname=kdepim-runtime
 pkgname=kdepim-runtime-nonprism
@@ -15,8 +15,8 @@ depends=('kdebase-runtime' 'libkolab')
 makedepends=('cmake' 'automoc4' 'boost')
 install="${_pkgname}.install"
 replaces=('kdepim-runtime' 'kdepim-runtime-coherence')
-conflicts=kdepim-runtime
-provides=kdepim-runtime=$pkgver
+conflicts=(kdepim-runtime)
+provides=(kdepim-runtime=$pkgver)
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz")
 sha1sums=('01e5d0d205128e45a1ecf839cc892b65479278dd')
 
diff --git a/nonprism/kipi-plugins-libre-nonprism/PKGBUILD b/nonprism/kipi-plugins-libre-nonprism/PKGBUILD
index eb1c06b9c..df63e45c7 100644
--- a/nonprism/kipi-plugins-libre-nonprism/PKGBUILD
+++ b/nonprism/kipi-plugins-libre-nonprism/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 211141 2014-04-17 06:54:31Z andrea $
-# Maintainer: Ronald van Haren <ronald@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
+# $Id: PKGBUILD 213016 2014-05-17 10:20:26Z ronald $
+# Maintainer (Arch): Ronald van Haren <ronald@archlinux.org>
+# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
+# Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Márcio Silva <coadde@parabola.nu>
 
 pkgbase=digikam
 _pkgname=kipi-plugins
 pkgname=kipi-plugins-libre-nonprism
-pkgver=3.5.0
-pkgrel=4
+pkgver=4.0.0
+pkgrel=1
 pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam, without nonfree jAlbum and SimpleViewer support and support for unsafe and dangerous for privacy protocols"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.digikam.org/"
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
+replaces=($_pkgname)
+conflicts=($_pkgname)
+provides=($_pkgname=$pkgver)
 makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
              'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'libgphoto2'
              'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick' 'eigen')
@@ -30,7 +30,7 @@ optdepends=('libkgeomap: Geolocalize tool'
 options=('staticlibs')
 install=kipi-plugins.install
 source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('9e44fcf219312cbcbbaee0cc9a7f460a01769224')
+sha1sums=('23fd1e31e1f0518265c3165e620beb15cef4d41e')
 
 prepare() {
   cd ${srcdir}/${pkgbase}-${pkgver}
@@ -76,4 +76,12 @@ build() {
 package() {
   cd build/extra/kipi-plugins
   make DESTDIR="${pkgdir}" install
+
+  cd ../../../build/po
+  make DESTDIR="${pkgdir}" install
+  # Put these in the relevant splitted packages
+  rm "${pkgdir}"/usr/share/locale/*/LC_MESSAGES/libkgeomap.mo
+  rm "${pkgdir}"/usr/share/locale/*/LC_MESSAGES/digikam.mo
+  # Fix conflicts with kde-l10n-* (FS#33762)
+  rm "${pkgdir}"/usr/share/locale/*/LC_MESSAGES/libkipi.mo  
 }
diff --git a/nonprism/openshot-libre-nonprism/PKGBUILD b/nonprism/openshot-libre-nonprism/PKGBUILD
index d648053eb..396e469e6 100644
--- a/nonprism/openshot-libre-nonprism/PKGBUILD
+++ b/nonprism/openshot-libre-nonprism/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 97284 2013-09-16 08:04:43Z bluewind $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Asa Marco <marcoasa90[at]gmail[.]com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor (Arch): Asa Marco <marcoasa90[at]gmail[.]com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgname=openshot
 pkgname=openshot-libre-nonprism
@@ -15,9 +15,9 @@ depends=('mlt-python-bindings' 'pygoocanvas' 'sdl' 'librsvg' 'mplayer'
 	 'pyxdg' 'pygtk' 'python2-httplib2' 'python2-pillow')
 optdepends=('dvgrab: for IEEE digital sources'
 	    'libquicktime' 'libavc1394' 'jack' 'jack-rack' 'ladspa')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
+replaces=($_pkgname)
+conflicts=($_pkgname)
+provides=($_pkgname=$pkgver)
 install=openshot.install
 source=(http://launchpad.net/openshot/${pkgver%.*}/$pkgver/+download/$_pkgname-$pkgver.tar.gz
         nonprism.patch)
diff --git a/nonprism/pidgin-nonprism/PKGBUILD b/nonprism/pidgin-nonprism/PKGBUILD
index 848606fd0..d7593d2a0 100644
--- a/nonprism/pidgin-nonprism/PKGBUILD
+++ b/nonprism/pidgin-nonprism/PKGBUILD
@@ -1,9 +1,9 @@
 # $Id: PKGBUILD 205034 2014-02-03 14:10:06Z foutrelis $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
+# Maintainer (Arch): Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor (Arch): Ionut Biru <ibiru@archlinux.org>
+# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
+# Contributor (Arch): Alexander Fehr <pizzapunk gmail com>
+# Contributor (Arch): Lucien Immink <l.immink@student.fnt.hvu.nl>
 
 _pkgname=pidgin
 pkgname=('pidgin-nonprism' 'libpurple-nonprism' 'finch-nonprism')
diff --git a/nonprism/shotwell-nonprism/PKGBUILD b/nonprism/shotwell-nonprism/PKGBUILD
index 640d1916b..6e6500940 100644
--- a/nonprism/shotwell-nonprism/PKGBUILD
+++ b/nonprism/shotwell-nonprism/PKGBUILD
@@ -1,21 +1,21 @@
 # $Id: PKGBUILD 107774 2014-03-19 12:02:19Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
+# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer (Arch): Ionut Biru <ibiru@archlinux.org>
+# Contributor (Arch): Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Márcio Silva <coadde@parabola.nu>
 
 _pkgname=shotwell
 pkgname=shotwell-nonprism
 pkgver=0.18.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A digital photo organizer designed for the GNOME desktop environment, without support for unsafe and dangerous for privacy protocols"
 arch=('i686' 'x86_64')
 url="http://yorba.org/shotwell/"
 license=('LGPL2.1')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
+replaces=($_pkgname)
+conflicts=($_pkgname)
+provides=($_pkgname=$pkgver)
 depends=('libgee' 'webkitgtk' 'libgexiv2' 'libraw' 'rest'
 	 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'json-glib'
 	 'gst-plugins-base' 'libgphoto2')
@@ -29,6 +29,12 @@ md5sums=('856b69fe67bc8bd42a6985e042041daf'
 prepare() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
   patch -Np1 -i ${srcdir}/nonprism.patch
+
+  cd po
+  for file in *.po; do
+    intltool-update ${file%.*}
+    msgattrib --no-obsolete -o $file $file
+  done
 }
 
 build() {
diff --git a/nonprism/sylpheed-nonprism/PKGBUILD b/nonprism/sylpheed-nonprism/PKGBUILD
index 745bc2782..98282e094 100644
--- a/nonprism/sylpheed-nonprism/PKGBUILD
+++ b/nonprism/sylpheed-nonprism/PKGBUILD
@@ -1,9 +1,9 @@
 # $Id: PKGBUILD 108818 2014-04-04 16:07:28Z speps $
-# Maintainer: speps <speps at aur dot archlinux dot org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Aditya Som <icarious@hacari.org>"
+# Maintainer (Arch): speps <speps at aur dot archlinux dot org>
+# Contributor (Arch): Alexander Fehr <pizzapunk gmail com>
+# Contributor (Arch): dorphell <dorphell@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Aditya Som <icarious@hacari.org>"
 
 _pkgname=sylpheed
 pkgname=sylpheed-nonprism
@@ -13,9 +13,9 @@ pkgdesc="Lightweight and user-friendly e-mail client, without Gmail support"
 arch=('i686' 'x86_64')
 url="http://sylpheed.sraoss.jp/en/"
 license=('GPL')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
+replaces=($_pkgname)
+conflicts=($_pkgname)
+provides=($_pkgname=$pkgver)
 depends=('compface' 'gpgme' 'gtkspell' 'desktop-file-utils')
 makedepends=('openssl')
 install="$_pkgname.install"
diff --git a/nonprism/your-privacy/PKGBUILD b/nonprism/your-privacy/PKGBUILD
index 3dbc1c733..393a9f3ef 100644
--- a/nonprism/your-privacy/PKGBUILD
+++ b/nonprism/your-privacy/PKGBUILD
@@ -7,7 +7,7 @@ arch=('any')
 url="https://parabolagnulinux.org"
 license=('GPL3')
 install=${pkgname}.install
-replaces=your-coherence
+replaces=(your-coherence)
 source=(${pkgname}-blacklist-${pkgver}.txt::https://projects.parabolagnulinux.org/blacklist.git/plain/${pkgname}-blacklist.txt)
 
 package() {