Added patch from debian to fix crash, hopefully fixes bug #292321, thank Phil Stracchino for good backtrace.

Package-Manager: portage-2.1.7.15/cvs/Linux x86_64

4 files changed, 64 insertions, 2 deletions

diff --git a/x11-plugins/pidgin-encryption/ChangeLog b/x11-plugins/pidgin-encryption/ChangeLog
index 671a8b8bb0e1..7c90a891bf0f 100644
--- a/x11-plugins/pidgin-encryption/ChangeLog
+++ b/x11-plugins/pidgin-encryption/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-plugins/pidgin-encryption
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-encryption/ChangeLog,v 1.7 2009/02/05 05:11:25 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-encryption/ChangeLog,v 1.8 2009/12/19 13:42:30 pva Exp $
+
+*pidgin-encryption-3.0-r1 (19 Dec 2009)
+
+  19 Dec 2009; Peter Volkov <pva@gentoo.org>
+  +pidgin-encryption-3.0-r1.ebuild,
+  +files/pidgin-encryption-3.0-crash.patch:
+  Added patch from debian to fix crash, hopefully fixes bug #292321, thank
+  Phil Stracchino for good backtrace.
 
   05 Feb 2009; Jeremy Olexa <darkside@gentoo.org>
   pidgin-encryption-3.0.ebuild:
diff --git a/x11-plugins/pidgin-encryption/Manifest b/x11-plugins/pidgin-encryption/Manifest
index 3d6a52599707..73b472121074 100644
--- a/x11-plugins/pidgin-encryption/Manifest
+++ b/x11-plugins/pidgin-encryption/Manifest
@@ -1,4 +1,6 @@
+AUX pidgin-encryption-3.0-crash.patch 670 RMD160 73df3bbfa0314d5dae25c596d95f42be6d401551 SHA1 b7c49065bd912a924d5fe348dd65da7282af6df6 SHA256 11ea6c33931d9c1e7a4923f974e4e465a8bf5e33bfe2dee08d517f8112dad5a5
 DIST pidgin-encryption-3.0.tar.gz 586394 RMD160 6eff777961785057c976e72b84e7cd83c7e189c9 SHA1 bccad1c4ac0bec12e6837324f543ea60530d0761 SHA256 ae754eb1a43d8d2341083187d6f9e2f396b5b521f87a62060369a55516896594
+EBUILD pidgin-encryption-3.0-r1.ebuild 904 RMD160 5933650e6d4a992f7857bf9b6c869c23140d79a2 SHA1 f55c31289e761f3d6c1d4c8efb345b785137a7f0 SHA256 c7ff996555d708f5b854afb91f74d3a8d175e2c5ddf943a5c678bf8c391abb04
 EBUILD pidgin-encryption-3.0.ebuild 897 RMD160 b546847c0a0b1bd134d72eb7825d18bda47b1879 SHA1 dc33b3d01000a3eb0528bbd2a3913012cab4fdd8 SHA256 9ae4d3585fbdfab00333fa26e10d55afd642a1ec9d95f3a94819e2e1be97a49e
-MISC ChangeLog 1144 RMD160 a47d1dc05931b2ab0a1cf6a145f85f7b14dd9b24 SHA1 89044ee67de3840d4564ab416f9775fb0e93fda2 SHA256 570eb881c65c0ee23660dd4e19270580e082b4e5fb13070a663deb78e76637b7
+MISC ChangeLog 1419 RMD160 5bd1c223bacfeecd9c9295105779dcc08ae20be5 SHA1 a008cfc71542937f08e9a90d91bb5207837547d4 SHA256 e4772c9e5d8980d1976b685591c50c0f91d9f01a5e2765962fcc74be0b49d4b5
 MISC metadata.xml 290 RMD160 0bfd24135e7a2517e8afa7ca0fa6a3cf690014d8 SHA1 d9a15f69c18eba328f14c5792d9f846e550f1d57 SHA256 45df283c73b0d7557d18dd23b21007113493fe9d98955865a33576b9bd6d4ebe
diff --git a/x11-plugins/pidgin-encryption/files/pidgin-encryption-3.0-crash.patch b/x11-plugins/pidgin-encryption/files/pidgin-encryption-3.0-crash.patch
new file mode 100644
index 000000000000..92c852736512
--- /dev/null
+++ b/x11-plugins/pidgin-encryption/files/pidgin-encryption-3.0-crash.patch
@@ -0,0 +1,14 @@
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=525501
+https://bugs.gentoo.org/show_bug.cgi?id=292321
+
+--- pidgin-encryption-3.0.orig/state_ui.c	2007-05-07 02:15:27.000000000 +0200
++++ pidgin-encryption-3.0.new/state_ui.c	2009-04-26 17:08:02.000000000 +0200
+@@ -268,6 +268,8 @@
+ static GtkIMHtmlSmiley * create_smiley_if_absent(GtkIMHtml *imhtml) {
+    GtkIMHtmlSmiley * smiley;
+    const char* category = gtk_imhtml_get_protocol_name(imhtml);
++   
++   if (!category) return NULL;
+ 
+    /* make sure that the category we're about to use to add (based on the protocol name) */
+    /* already exists.  If it doesn't, just use the default category so it isn't created. */
diff --git a/x11-plugins/pidgin-encryption/pidgin-encryption-3.0-r1.ebuild b/x11-plugins/pidgin-encryption/pidgin-encryption-3.0-r1.ebuild
new file mode 100644
index 000000000000..b3133cb68ed0
--- /dev/null
+++ b/x11-plugins/pidgin-encryption/pidgin-encryption-3.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-encryption/pidgin-encryption-3.0-r1.ebuild,v 1.1 2009/12/19 13:42:30 pva Exp $
+
+EAPI="2"
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Pidgin IM Encryption PlugIn"
+HOMEPAGE="http://pidgin-encrypt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gaim-encryption/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="nls"
+
+RDEPEND="net-im/pidgin
+	>=x11-libs/gtk+-2
+	>=dev-libs/nss-3.11"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-crash.patch"
+}
+
+src_configure() {
+	strip-flags
+	replace-flags -O? -O2
+	econf $(use_enable nls)
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die "Install failed"
+	dodoc CHANGELOG INSTALL NOTES README TODO VERSION WISHLIST
+}