Fix segfault with signature checking as reported in bug 424882 by Alexander Tsoy, patch from upstream.

Package-Manager: portage-2.1.10.65/cvs/Linux i686

4 files changed, 179 insertions, 5 deletions

diff --git a/mail-client/claws-mail/ChangeLog b/mail-client/claws-mail/ChangeLog
index 092adcd9068b..8c67c809649b 100644
--- a/mail-client/claws-mail/ChangeLog
+++ b/mail-client/claws-mail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/claws-mail
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.205 2012/06/30 15:23:26 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.206 2012/07/17 19:51:57 fauli Exp $
+
+*claws-mail-3.8.1-r1 (17 Jul 2012)
+
+  17 Jul 2012; Christian Faulhammer <fauli@gentoo.org>
+  +claws-mail-3.8.1-r1.ebuild, +files/claws-mail-3.8.1_fix-signature.patch:
+  Fix segfault with signature checking as reported in bug 424882 by Alexander
+  Tsoy, patch from upstream.
 
 *claws-mail-3.8.1 (30 Jun 2012)
 
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 5ba9a186e293..046d5269bb63 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX claws-mail-3.8.1_fix-signature.patch 926 RMD160 f3334433830d19925795acb6c7ee071310bdb7f8 SHA1 1ce51ccce57772324ba324e050858f75b011f043 SHA256 3c106c1fe6a40c712c67586cf2cac8cb6d32539c6490f505a6ca260f599f0415
 DIST claws-mail-3.8.0.tar.bz2 7190415 RMD160 583e2966efda7a2fd6211eac43001b57c3d0efce SHA1 de6010392074633194e2aa5898e66d73c35bda5a SHA256 ec945e3b0f3df6f1f13fcf149ad3ee5306c0e6575bb375cf558e9028a0eb6231
 DIST claws-mail-3.8.1.tar.bz2 7335864 RMD160 e50ddd80589e7edb9f1c172a83e7f41dd8dec372 SHA1 c519d07121bfb3095c7a3d47e53b6726bf397ed8 SHA256 b421fd913694f9d04635212b0c47c9808a3f20a4f9a5dd15b6f4cd5022c6ee6f
 EBUILD claws-mail-3.8.0.ebuild 3767 RMD160 a7b8e83514613089c00d0aa82a1f807de8fbf3d1 SHA1 e847ea76306a984c452e60c8c975718335c3bcdb SHA256 0e17b317eb0832739d7177c45cd2f2cabc7322b34e99707d5376a50a4468479e
+EBUILD claws-mail-3.8.1-r1.ebuild 3870 RMD160 19ca8ea7bd7e94e4badaced93ef08da846934b70 SHA1 7d67af14182974f8169bfab44e8aed795587780f SHA256 aeb9f62d88c3b8db963416b3c9063c5c2f6e75a8198a3939f6335e5a1971f6b9
 EBUILD claws-mail-3.8.1.ebuild 3782 RMD160 bdcf9773248567cd8c5f0134ad1eb9c23b8a4963 SHA1 6c08efa7180e5a096718afeeef020bd0acf38560 SHA256 3e09e3cd4364612d5d0614a87df2fb17b48381b21f578a634313e3bd42cb41ad
-MISC ChangeLog 42802 RMD160 043ec71d7d691ed399ea8f769ce12b4e8293763f SHA1 894c5fdcf5bfbed5d271c46637456f3d948685f7 SHA256 0a58cc64f8dfba6960ce4ed120a96010391d46abad8ae46ee3eb013289e548cf
+MISC ChangeLog 43077 RMD160 a18b554d541b046a68913de13e79a93f8b515f7b SHA1 fbd54e8cb9901c11a3f21ab46047ea9ee931e65e SHA256 9073ba6f8889c84908275edd8631b9371d933754c02700dd657667bf64e95a9d
 MISC metadata.xml 778 RMD160 3bd95ae151e87a395e9ec7262824632dff8a0a43 SHA1 7d8c10b76fe54d6fec73b5cfff02786aa9c51ec2 SHA256 deae27a074e4678336af25da5b7a620236ba449406c595828eaaea5310e8d07b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/vGjsACgkQNQqtfCuFneNiYwCdHa1UfK6eflW/Rd8ROEqWQev9
-muIAnR3sGvGgAUZq7bg9t4c5MGGXALZN
-=gnyd
+iEYEARECAAYFAlAFwssACgkQNQqtfCuFnePllQCfbayAcy/stv1/Mf4DAVp7jVvK
+bB8AnAxjuAUdVL0mAe820QFIMDvJGgMR
+=D0Mc
 -----END PGP SIGNATURE-----
diff --git a/mail-client/claws-mail/claws-mail-3.8.1-r1.ebuild b/mail-client/claws-mail/claws-mail-3.8.1-r1.ebuild
new file mode 100644
index 000000000000..fa917e338a77
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.8.1-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.8.1-r1.ebuild,v 1.1 2012/07/17 19:51:57 fauli Exp $
+
+EAPI="4"
+
+inherit autotools-utils multilib gnome2-utils eutils
+
+DESCRIPTION="An email client (and news reader) based on GTK+"
+HOMEPAGE="http://www.claws-mail.org/"
+
+SRC_URI="mirror://sourceforge/sylpheed-claws/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="bogofilter crypt dbus dillo doc +imap ipv6 ldap nntp pda session smime spamassassin spell +ssl startup-notification xface"
+
+COMMONDEPEND=">=x11-libs/gtk+-2.20:2
+	pda? ( >=app-pda/jpilot-0.99 )
+	ssl? ( >=net-libs/gnutls-2.2.0 )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	crypt? ( >=app-crypt/gpgme-0.4.5 )
+	dbus? ( >=dev-libs/dbus-glib-0.60 )
+	dillo? ( www-client/dillo )
+	spell? ( >=app-text/enchant-1.0.0 )
+	imap? ( >=net-libs/libetpan-0.57 )
+	nntp? ( >=net-libs/libetpan-0.57 )
+	startup-notification? ( x11-libs/startup-notification )
+	bogofilter? ( mail-filter/bogofilter )
+	session? ( x11-libs/libSM
+			x11-libs/libICE )
+	smime? ( >=app-crypt/gpgme-0.4.5 )"
+
+DEPEND="${COMMONDEPEND}
+	xface? ( >=media-libs/compface-1.4 )
+	virtual/pkgconfig"
+
+RDEPEND="${COMMONDEPEND}
+	app-misc/mime-types
+	x11-misc/shared-mime-info"
+
+PLUGIN_NAMES="acpi-notifier address_keeper archive att-remover attachwarner clamd fancy fetchinfo geolocation gdata gtkhtml mailmbox newmail notification perl python rssyl spam_report tnef_parse vcalendar"
+
+src_prepare() {
+	epatch "${FILESDIR}"/claws-mail-${PV}_fix-signature.patch
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable ipv6)
+		$(use_enable ldap)
+		$(use_enable dbus)
+		$(use_enable pda jpilot)
+		$(use_enable spell enchant)
+		$(use_enable xface compface)
+		$(use_enable doc manual)
+		$(use_enable startup-notification)
+		$(use_enable session libsm)
+		$(use_enable crypt pgpmime-plugin)
+		$(use_enable crypt pgpinline-plugin)
+		$(use_enable crypt pgpcore-plugin)
+		$(use_enable dillo dillo-viewer-plugin)
+		$(use_enable spamassassin spamassassin-plugin)
+		$(use_enable bogofilter bogofilter-plugin)
+		$(use_enable smime smime-plugin)
+		--enable-trayicon-plugin
+		--disable-maemo
+	)
+
+	# libetpan is needed if user wants nntp or imap functionality
+	if use imap || use nntp; then
+		myeconfargs+=( --enable-libetpan )
+	else
+		myeconfargs+=( --disable-libetpan )
+	fi
+
+	if use ssl; then
+		myeconfargs+=( --enable-gnutls )
+	else
+		myeconfargs+=( --disable-gnutls )
+	fi
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
+	autotools-utils_src_install
+
+	# Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
+	# => also install it in /usr/share/pixmaps for other desktop envs
+	# => also install higher resolution icons in /usr/share/icons/hicolor/...
+	insinto /usr/share/pixmaps
+	doins ${PN}.png || die
+	local res resdir
+	for res in 64x64 128x128 ; do
+		resdir="/usr/share/icons/hicolor/${res}/apps"
+		insinto ${resdir}
+		newins ${PN}-${res}.png ${PN}.png || die
+	done
+
+	docinto tools
+	dodoc tools/README*
+
+	insinto /usr/share/applications
+	doins ${PN}.desktop
+
+	einfo "Installing extra tools"
+	cd "${S}"/tools
+	exeinto /usr/$(get_libdir)/${PN}/tools
+	doexe *.pl *.py *.conf *.sh || die
+	doexe tb2claws-mail update-po uudec uuooffice || die
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	UPDATE_PLUGINS=""
+	for x in ${PLUGIN_NAMES}; do
+		has_version mail-client/${PN}-$x && UPDATE_PLUGINS="${UPDATE_PLUGINS} $x"
+	done
+	if [ -n "${UPDATE_PLUGINS}" ]; then
+		elog
+		elog "You have to re-emerge or update the following plugins:"
+		elog
+		for x in ${UPDATE_PLUGINS}; do
+			elog "    mail-client/${PN}-$x"
+		done
+		elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/mail-client/claws-mail/files/claws-mail-3.8.1_fix-signature.patch b/mail-client/claws-mail/files/claws-mail-3.8.1_fix-signature.patch
new file mode 100644
index 000000000000..5e2eb9eada0c
--- /dev/null
+++ b/mail-client/claws-mail/files/claws-mail-3.8.1_fix-signature.patch
@@ -0,0 +1,25 @@
+Gentoo bug     : https://bugs.gentoo.org/show_bug.cgi?id=424882
+Upstream bug   : http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2689
+Upstream commit: http://www.claws-mail.org/tracker/getpatchset.php?ver=3.8.1cvs12
+
+Claws Mail segfaults showing GPG/S-MIME signature info.
+
+
+Index: src/plugins/pgpcore/sgpgme.c
+===================================================================
+RCS file: //claws/src/plugins/pgpcore/Attic/sgpgme.c,v
+retrieving revision 1.1.2.71
+retrieving revision 1.1.2.72
+diff -u -r1.1.2.71 -r1.1.2.72
+--- src/plugins/pgpcore/sgpgme.c	8 Jul 2012 12:48:47 -0000	1.1.2.71
++++ src/plugins/pgpcore/sgpgme.c	10 Jul 2012 14:10:11 -0000	1.1.2.72
+@@ -327,7 +327,7 @@
+ 				j++;
+ 				user = user->next;
+ 			}
+-			g_string_append_printf(siginfo,
++			g_string_append(siginfo,
+ 				_("Primary key fingerprint:"));
+ 			const char* primary_fpr = NULL;
+ 			if (key && key->subkeys && key->subkeys->fpr)
+