Don't crash on unicode chars, #383463; thanks Suloev Dmitry for the patch; http://trac.gajim.org/ticket/6974

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

4 files changed, 143 insertions, 5 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 0a571892096c..741219e76916 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.121 2011/08/30 14:47:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.122 2011/09/24 13:20:53 jlec Exp $
+
+*gajim-0.14.4-r1 (24 Sep 2011)
+
+  24 Sep 2011; Justin Lecher <jlec@gentoo.org> +files/0.14.4-unicode.patch,
+  +gajim-0.14.4-r1.ebuild:
+  Don't crash on unicode chars, #383463; thanks Suloev Dmitry for the patch;
+  http://trac.gajim.org/ticket/6974
 
   30 Aug 2011; Justin Lecher <jlec@gentoo.org> -gajim-0.13.3.ebuild,
   gajim-0.14.1-r2.ebuild, metadata.xml:
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 4ae1f90d1fa4..55cf65badfd5 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -5,17 +5,19 @@ AUX 0.13.4-python-version.patch 372 RMD160 19ca9bca4a00eac318f5641de4bf93d1b6c09
 AUX 0.14-python-version.patch 316 RMD160 0866674b1e3499e8f215f0b042e15f28a54e2676 SHA1 bc360f052a46f97d1c36ec485e692080ab7a7581 SHA256 b4aba8ebc6241442f9eb1c335ba22c2eb5a3b3a24533cb2f944f3f812e06b687
 AUX 0.14.1-link.patch 721 RMD160 e112f2413542b03ae28f1a192d46581304e5347c SHA1 a189e6e189ba790de2b33efbc8ff581941c7008c SHA256 384b015b6d94fb4f183692d031fa54a26ab4260c75a94510fb9a6b3159f50b73
 AUX 0.14.1-testing.patch 237 RMD160 a0fec65b49dc987d259a1b1df7f56ccac1813d19 SHA1 a95e49f7e0efcf207dd04da420749283630f7826 SHA256 128da6d0a8ae48132df78f9027dc5ef5d8167e561fe12b1d774c628a5fc33638
+AUX 0.14.4-unicode.patch 671 RMD160 5a1f41e2694051efac82c155399cb19b8d92051c SHA1 96cbd80d6e6fcde39f7e5cb4549b2e37f136901e SHA256 d27b8f3ca5323200b3151ec9a580bab62722ce2e8be403b0c8395b64b603726b
 AUX gajim-0.13-autotools-enable-site-packages_option.patch 3306 RMD160 9490bde83855a72a9ad92824a082657613a60c50 SHA1 49b6c710fdd0124617ef5f5745584c47eca0313e SHA256 61d761c2eb3934c0257624dd0fe791ece5f980a312cecc4ff54e6bb7515c37ea
 DIST gajim-0.14.1.tar.bz2 4144916 RMD160 859cbd4a9f190adfc6b84c23ef03e3c3cab09d8d SHA1 d2fdf32ded4a5fb3c7a277a765f84a5453931f34 SHA256 5c8a10e7b06f362844ff70c6f49bd92a170b9d6e4c24e878f604032e31254d3b
 DIST gajim-0.14.4.tar.bz2 4173732 RMD160 e9c6d14328ca1c13cb1152fde79dd3b5e5204e64 SHA1 0343af3c4bae39aa49e547b641caac197a887bb4 SHA256 24a1c6ac8d8e489f9ea377f1b68707d1b3f55ccdf55131c16cb8e6128ca3e941
 EBUILD gajim-0.14.1-r2.ebuild 2473 RMD160 85cbc6c1c9a8f112148663feeda58a667a3165a3 SHA1 3868a0c9237009a7dd5c05c0a1e2485ad882a885 SHA256 d482cf849b105ac3f8d069bc48e1be4ff2de815006c90c4596d56801f6b3bd31
+EBUILD gajim-0.14.4-r1.ebuild 2591 RMD160 35c5c86bc049463b6444b4e8de31b6760306e97d SHA1 79a2c8ef29bd0a209bee1b536de705718d7e8f11 SHA256 7e3a9d72066ff5fd60fa88e93df8f8ef8334465e09f99bfa90b8b738bea0e4fc
 EBUILD gajim-0.14.4.ebuild 2477 RMD160 d45f9994859e30d90dafc9b73ad3df3004ebc512 SHA1 9c86467479d780203d677105c5e3e3ba29369b0d SHA256 3685553d56bf8ac1e36bf9ef7eee061877ae88a98db183c59fa3d75721c32a0e
-MISC ChangeLog 17350 RMD160 01660a8111a0e731774d416776b2c1353ab3551c SHA1 85fe2d4bf77fc1d7969fd19db7c1ab4d6e71549e SHA256 edf0c0c5edc822ab1b2bef27f6bd0e3e6171117612bec0b71768327fcce2ca5d
+MISC ChangeLog 17599 RMD160 ba2c9c7f9c480a064e05134554d5c969d0ff5930 SHA1 6859991fb418edf9c7419df8e21a240b6fdd8a43 SHA256 ed489e9aa36c264b4e746db4018346e90f885e7032bd907a52ca43fd3f8ef5fe
 MISC metadata.xml 573 RMD160 dc721373fb3fd62f6880046dae4636883f227fcb SHA1 85cba4d5f576b219ece32f59461a57575309fe99 SHA256 cdbbf751d0c4736aceae69a53fddb805be8f9daa2fb5ef1929be06814d79de69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk5c+AsACgkQgAnW8HDreRYgdgCgvPrQLYpCMf2VOeHF4pOdaMmH
-i74AoLFwarwDbuGIVy0zcNPxPbn3OEzB
-=rSG6
+iEYEAREKAAYFAk592UAACgkQgAnW8HDreRbicwCcCrM1fBNHpQh59g6iVMZhL+VN
+DVQAoLtMNNtFFKTsqzqFiLjH5xi+1fEs
+=vz/A
 -----END PGP SIGNATURE-----
diff --git a/net-im/gajim/files/0.14.4-unicode.patch b/net-im/gajim/files/0.14.4-unicode.patch
new file mode 100644
index 000000000000..5c0dd0d314aa
--- /dev/null
+++ b/net-im/gajim/files/0.14.4-unicode.patch
@@ -0,0 +1,19 @@
+diff --git a/src/remote_control.py b/src/remote_control.py
+--- a/src/remote_control.py
++++ b/src/remote_control.py
+@@ -211,6 +211,15 @@ class Remote:
+
+     def raise_signal(self, signal, arg):
+         if self.signal_object:
++            arg_copy = list(arg)
++            newarg = []
++            for a in arg_copy[1]:
++                try:
++                    newarg.append(a.decode('utf-8', 'replace'))
++                except:
++                    newarg.append(a)
++            arg_copy[1] = newarg
++            arg = tuple(arg_copy)
+             try:
+                 getattr(self.signal_object, signal)(get_dbus_struct(arg))
+             except UnicodeDecodeError:
diff --git a/net-im/gajim/gajim-0.14.4-r1.ebuild b/net-im/gajim/gajim-0.14.4-r1.ebuild
new file mode 100644
index 000000000000..6762e63e7e47
--- /dev/null
+++ b/net-im/gajim/gajim-0.14.4-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.14.4-r1.ebuild,v 1.1 2011/09/24 13:20:53 jlec Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="sqlite xml"
+
+inherit eutils python versionator
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="http://www.gajim.org/"
+SRC_URI="http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="avahi crypt dbus gmail gnome idle jingle libnotify networkmanager nls spell srv X xhtml"
+
+# needs EAPI=4
+#REQUIRED_USE="
+#	libnotify? ( dbus )
+#	avahi? ( dbus )"
+
+COMMON_DEPEND="
+	dev-python/pygtk:2
+	x11-libs/gtk+:2"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40.1
+	dev-util/pkgconfig
+	>=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/pyopenssl
+	crypt? (
+		app-crypt/gnupg
+		dev-python/pycrypto
+		)
+	dbus? (
+		dev-python/dbus-python
+		dev-libs/dbus-glib
+		libnotify? ( dev-python/notify-python )
+		avahi? ( net-dns/avahi[dbus,gtk,python] )
+		)
+	gmail? ( net-dns/bind-tools )
+	gnome? (
+		dev-python/libgnome-python
+		dev-python/gnome-keyring-python
+		dev-python/egg-python
+		)
+	idle? ( x11-libs/libXScrnSaver )
+	jingle? ( net-libs/farsight2[python] )
+	networkmanager? (
+			dev-python/dbus-python
+			|| ( >=net-misc/networkmanager-0.7.1 net-misc/networkmanager[gnome] )
+		)
+	srv? (
+		|| (
+			dev-python/libasyncns-python
+			net-dns/bind-tools )
+		)
+	spell? ( app-text/gtkspell )
+	xhtml? ( dev-python/docutils )"
+
+pkg_setup() {
+	if ! use dbus; then
+		if use libnotify; then
+			eerror "The dbus USE flag is required for libnotify support"
+			die "USE=\"dbus\" needed for libnotify support"
+		fi
+		if use avahi; then
+			eerror "The dbus USE flag is required for avahi support"
+			die "USE=\"dbus\" needed for avahi support"
+		fi
+	fi
+	python_pkg_setup
+	python_set_active_version 2
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/0.14-python-version.patch \
+		"${FILESDIR}"/0.14.1-testing.patch \
+		"${FILESDIR}"/${PV}-unicode.patch
+	echo '#!/bin/sh' > config/py-compile
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with X x) \
+		--docdir="/usr/share/doc/${PF}" \
+		--libdir="$(python_get_sitedir)" \
+		--enable-site-packages
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	rm "${D}/usr/share/doc/${PF}/"{README.html,COPYING} || die
+	dohtml README.html || die
+}
+
+pkg_postinst() {
+	python_mod_optimize ${PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup ${PN}
+}