5 files changed, 37 insertions, 108 deletions
diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 84e0ee1f8ccf..b37608e7056f 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.135 2012/04/23 19:50:08 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.136 2012/04/23 20:19:29 jlec Exp $
+
+  23 Apr 2012; Justin Lecher <jlec@gentoo.org> -gajim-0.15.ebuild,
+  gajim-0.15-r1.ebuild, +files/gajim-0.15-SA48695.patch:
+  Add backport fix for https://secunia.com/advisories/48695/, #412215
 
 *gajim-0.15-r1 (23 Apr 2012)
 
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 20208e29854e..19fbefda1125 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -5,6 +5,7 @@ AUX 0.14-python-version.patch 316 RMD160 0866674b1e3499e8f215f0b042e15f28a54e267
 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.14.4-debian_patches_unicode.patch 3590 RMD160 9fbf20005ef6f605bda540dfb6a4ed96b294ad8b SHA1 5515d29ebe502315c85b59c392fa379cf85a3910 SHA256 b9a95103317d9ed543ecfe0dc8ca8b680fbd600e494ba71888bd662937a40492
+AUX gajim-0.15-SA48695.patch 862 RMD160 595934164ec64a1b827084b3c76a4d3165becc79 SHA1 e90acd568fcf3679093532b6f3d77ecba2c224cc SHA256 9d6c0bef13e7161465e6fda2ad7031c383011e66e24b7322ce19df387d79db6d
 AUX gajim-0.15-plugin.patch 383 RMD160 bd2cc6b2c3ab3b2c75d5e87bcc40499b51b12c43 SHA1 83116cdc58f8a7162de5da9fb9d8791dc931178d SHA256 6003e53ca42b3efda9f132fd9253e5577f128ae596ce458ac7c2ce5a29c1759d
 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
@@ -12,14 +13,13 @@ DIST gajim-0.15.tar.bz2 4332305 RMD160 d16345dc19bfa94d657f531af63600809c6fdeb5
 EBUILD gajim-0.14.1-r2.ebuild 2434 RMD160 6d1066d07a6272f956e21425c6f0d84d56e615be SHA1 89c3789b4acba865b5aad1b3947808f4f6b92907 SHA256 de26ba938e2f4201c02e13ae6df24d3b3dd79cc6b279f68f6219a349058bd5d6
 EBUILD gajim-0.14.4-r1.ebuild 2169 RMD160 784175ac29df8633d821f6d39c466549651ecbab SHA1 c43415b7a4fa0dda3abc88b3c4f1119d247fcee5 SHA256 ac4e2067297f82e9f732e5f10afbe3df008af1278158629a494beef6053bb79b
 EBUILD gajim-0.14.4-r2.ebuild 2311 RMD160 13df45a1c8b93b71d351b604ecfde51bac9924d6 SHA1 87f835efddfecbf1d5994e21dd84da08acf6bed8 SHA256 7c87be6fecc1c037cc10c567a78561447628aa28b7a400ae52a15779f14df035
-EBUILD gajim-0.15-r1.ebuild 2227 RMD160 c24739afa785153ba63738f1fb8e5e1afc78f03f SHA1 88d25cf987e0e1e6d72670bf403021240f0ad2e0 SHA256 d5e8ab674c47f977dab6890d9e11583c438678d375d06582941cdab974c3bbbf
-EBUILD gajim-0.15.ebuild 2166 RMD160 2a3c96edf878aea3f49e607770beff4889ba938a SHA1 f9325b463976a7e54fbc11481c9d7ecdfea7c31a SHA256 56c980c4559f031680c4462953c4b642c6023300aa0f3039ffbf36c38e59a24b
-MISC ChangeLog 19842 RMD160 95ff93fb3ef7db278614609a3f005ba1a8da4307 SHA1 7bb8c0076215c8aae4ee35cf81cd8d99b2154190 SHA256 0b6ed6a3acd71d6f7ebe254f88199b2cae9cc95995154347b814d5b47bc1d271
+EBUILD gajim-0.15-r1.ebuild 2264 RMD160 1e0b08aea6d5a52258f26aa06891db35c2d47c29 SHA1 b0ff475f7a28c41aae83e3034c1053158c9c52b7 SHA256 b57dc5fc6742fc4ae076ec96ba2a63f806e33ed5c8a43dd35d7485983d1fa23c
+MISC ChangeLog 20037 RMD160 b5d570ecf728664aee493ed1195cfa33e4d54a04 SHA1 b4bd8a967827e82b984ae6e0e946ddf64f33dcfc SHA256 52ee99d27be48b805efed485c9a4101425491aa27a11289ce4c7c1e86049d8a7
 MISC metadata.xml 573 RMD160 dc721373fb3fd62f6880046dae4636883f227fcb SHA1 85cba4d5f576b219ece32f59461a57575309fe99 SHA256 cdbbf751d0c4736aceae69a53fddb805be8f9daa2fb5ef1929be06814d79de69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk+VspAACgkQgAnW8HDreRZ42wCfSalN/uQtRU3+iOoQ2qiAt8ZQ
-RdgAnA+iBrMktTLQiAfEJbPecib3CFax
-=LKk2
+iEYEAREKAAYFAk+VuW8ACgkQgAnW8HDreRYNmwCgj8lz8hTfD86UcMmAiNypCzIz
+ttIAoKxPXLyNq2aNDht2bfAxrKCvlTsY
+=LZ79
 -----END PGP SIGNATURE-----
diff --git a/net-im/gajim/files/gajim-0.15-SA48695.patch b/net-im/gajim/files/gajim-0.15-SA48695.patch
new file mode 100644
index 000000000000..93ee69ed1c3a
--- /dev/null
+++ b/net-im/gajim/files/gajim-0.15-SA48695.patch
@@ -0,0 +1,24 @@
+Index: src/common/latex.py
+===================================================================
+--- src/common/latex.py	(revision 13591)
++++ src/common/latex.py	(revision 13759)
+@@ -60,6 +60,17 @@
+ def get_tmpfile_name():
+     random.seed()
+-    int_ = random.randint(0, 100)
+-    return os.path.join(gettempdir(), 'gajimtex_' + int_.__str__())
++    while(nb < 100):
++        int_ = random.randint(0, 10000)
++        filename = os.path.join(gettempdir(), 'gajimtex_' + int_.__str__())
++        # Check if a file to not overwrite it
++        ok = True
++        extensions = ['.tex', '.log', '.aux', '.dvi']
++        for ext in extensions:
++            if os.path.exists(filename + ext):
++                ok = False
++                break
++        if ok:
++            return filename
++    return filename
+ 
+ def write_latex(filename, str_):
diff --git a/net-im/gajim/gajim-0.15-r1.ebuild b/net-im/gajim/gajim-0.15-r1.ebuild
index a79bf354824a..1997317608a6 100644
--- a/net-im/gajim/gajim-0.15-r1.ebuild
+++ b/net-im/gajim/gajim-0.15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15-r1.ebuild,v 1.1 2012/04/23 19:50:08 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15-r1.ebuild,v 1.2 2012/04/23 20:19:29 jlec Exp $
 
 EAPI=4
 
@@ -71,6 +71,7 @@ pkg_setup() {
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-plugin.patch \
+		"${FILESDIR}"/${P}-SA48695.patch \
 		"${FILESDIR}"/0.14-python-version.patch \
 		"${FILESDIR}"/0.14.1-testing.patch
 	echo '#!/bin/sh' > config/py-compile
diff --git a/net-im/gajim/gajim-0.15.ebuild b/net-im/gajim/gajim-0.15.ebuild
deleted file mode 100644
index df724d5f1e6d..000000000000
--- a/net-im/gajim/gajim-0.15.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15.ebuild,v 1.2 2012/03/26 23:13:11 naota Exp $
-
-EAPI=4
-
-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 kde idle jingle libnotify networkmanager nls spell srv X xhtml"
-
-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/pyasn1
-	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] )
-	kde? ( kde-base/kwallet )
-	networkmanager? (
-			dev-python/dbus-python
-			net-misc/networkmanager
-		)
-	srv? (
-		|| (
-			dev-python/libasyncns-python
-			net-dns/bind-tools )
-		)
-	spell? ( app-text/gtkspell:2 )
-	xhtml? ( dev-python/docutils )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/0.14-python-version.patch \
-		"${FILESDIR}"/0.14.1-testing.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() {
-	default
-
-	rm "${D}/usr/share/doc/${PF}/README.html" || die
-	dohtml README.html
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}