net-im/gajim: Backport upstream patch for servers without STARTTLS support, #462294

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

4 files changed, 145 insertions, 6 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 60985519f07b..e1e7a7fe4443 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.173 2013/03/18 08:45:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.174 2013/03/21 09:50:37 jlec Exp $
+
+*gajim-0.15.3-r1 (21 Mar 2013)
+
+  21 Mar 2013; Justin Lecher <jlec@gentoo.org> +gajim-0.15.3-r1.ebuild,
+  +files/gajim-0.15.3-starttls.patch:
+  Backport upstream patch for servers without STARTTLS support, #462294
 
 *gajim-0.15.3 (18 Mar 2013)
 
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 8181539ec516..7278b2ae0bd5 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 0.14-python-version.patch 316 SHA256 b4aba8ebc6241442f9eb1c335ba22c2eb5a3b3a24533cb2f944f3f812e06b687 SHA512 e7fc69f87b3106e171bc8c9db786217e1c903c5e82d2b60035f00203e32b17f73be17e64f1d013afd32ce280c53c32af2c46a6c9f33d25e9cf52db6dfb7ece3e WHIRLPOOL 107ac113d5ae3645155ba9eb1e215eb0d9750e2e440976ab0a3da28da1526b408eb37eeafe74e3a0a1bae79a1af5af724fe2ec9a6d7a044392d0b236479efc92
 AUX 0.14.1-testing.patch 237 SHA256 128da6d0a8ae48132df78f9027dc5ef5d8167e561fe12b1d774c628a5fc33638 SHA512 8c6df58972e22886599f99e1b9d59b088a155dcf1c5ccdff9002d8fd4a12a9ec2d38dc62f30f191342190200c0aebb60a19f2cbf1b2073449ad61bdd0adff6d5 WHIRLPOOL 5fc62c7beadb6c2bd39d2c966ab7bfd9ef857d799f0c06d80a9cece681f8d9bfc19657c8a7463d9743bff61708a8795e01b55d28a794b7d5a812670fa8430f70
@@ -10,18 +10,20 @@ AUX gajim-0.15-SA48695.patch 862 SHA256 9d6c0bef13e7161465e6fda2ad7031c383011e66
 AUX gajim-0.15-plugin.patch 383 SHA256 6003e53ca42b3efda9f132fd9253e5577f128ae596ce458ac7c2ce5a29c1759d SHA512 a8bf05e69547cb62db119e1faeaff6a4cfc27a44e4b925921cb43f22b4970d19c08c97d00d5166d4d439dcf706e972f617d20ff58f040cfe28dc5cf6389e408f WHIRLPOOL 6a16b97758015c7e51f43df45614ccbae3d682f5c75270118ea06b780a9f10a2184650265ae1aa3e663dc06d7ed803f263b8054433a8b64552c3b71f8be938c7
 AUX gajim-0.15.2-CVE-2012-5524.patch 2607 SHA256 9641f4497008fc965522d9114712fe4be5d7cbaec289c74dc038d93a5ee7ce92 SHA512 7751060ecc45b54a2ba00c9fd7e26e36324a6f5095be791ed222a4b75b130eb76fe15448fe98184599e26f23f3bd1e84c93154c3c042ea03606db736e5bbd6d1 WHIRLPOOL 2bb832e01e2963d0941ba3bc4531cc25ea11b9a757950d565dc3c810f271a2f8112a91cb543b90891dc8ae9c3e94543652f3f065e004216870f3a2a1a5b6f758
 AUX gajim-0.15.3-roster.patch 1450 SHA256 ffbbbfbc6198fff03a566d69f2e6872898dd87df6598dea380e1642e34aba768 SHA512 4b229b8ee655856b24205cd2a23f86ff32212d869abef07abf6b410f30ad11fc84f9d6d4222cde6c58e761cc11f1cbf2787f088198e8310683334543723d944a WHIRLPOOL a00d5abf54a86543c2e2af35d441dc3aa0c38e0e569677128cd20da1f778aa445f487668d2f9bdfe0f558190cf27786bbc7fa2c807b10273c38975ebd6e8a293
+AUX gajim-0.15.3-starttls.patch 502 SHA256 24a7d4c15be003daa8a10f26730eec27ce75c0e8d0d727c5f5d8c1b7f7305be6 SHA512 5ac3b926d971eb37898a241af7e2b77189ed7874a144d3bb9955ed09f7c1e6f5373e04f94dbaac337903622ebc5825428018e3c2843cafd3e8ba9e50c0bba0f5 WHIRLPOOL 3e84c618d56e19750062e752f67ada26c260b51cc4f2bb749ec5516b5e53be18b1d4627c174ad35ac084f19bc1bad6b2d4bbec6124b40d4fc24d87398770fd7d
 DIST gajim-0.15.2.tar.bz2 4473077 SHA256 7e71ee82e44303992792644803c749cb89ecad7ec7547db4f9841fcbeec49940 SHA512 ea1e64de54bd15a5af40e3fdfcc46808467555e671a8a86708f22400f7a329290d9d921d9e3ae56e7f47b90842c49b4f8d432d0df4fed7471d457ed2092f552a WHIRLPOOL 0faec1b189d48d83beed5aaf89a1a9d6351e30fda5b86abc8c57ffaf6c867d1a6531318c30c66a0b280899cef584068c7a684286d0be78c118fa528f54f6afbf
 DIST gajim-0.15.3.tar.bz2 4473787 SHA256 4848e98b25b523e28014528a8b89289bf987d5ce9419dd78ccff74a35aa583f4 SHA512 2315a281945b31a0fcfea0892fcdea72b79b4b85f75f4a810fb2d1530585c3325648562d546c3aa26e36f3153da1c96bc7123b255fca691e8d22e02a457b5049 WHIRLPOOL e5efed228b4c9704c00deb0fd68e6601a69a04ca7e18ee9348e729609eb87bf034f5fe23259b50806b7a6002f5155765562772077cfc4c8f430a7a9599e6800a
 DIST gajim-tests-0.15.2.tar.xz 22228 SHA256 9b972efa685ed854cfbaadb37f3fe5629fac65995100e20c3ca8294a4e0ee756 SHA512 0f5a6233be1db55e9cc7dab7f638d503b6ea71237c4039d43b8ff69421742c5c92034cdd40dd662f57a8a519e088b98b1c30040c30c3fec1546e10a4b41d301d WHIRLPOOL ddb53abd70533a60e62ae317864d5b396820373a9822f17f175c885dc9bd31f20ac1653ddc637e569141f3ab31283865114255095dd973ebf0826dd34ff8d3ca
 EBUILD gajim-0.15.2-r3.ebuild 2257 SHA256 37fa9e82002538209c07d64fab09aee1f332fa0a63ec2fc4b5885f5fcae605fe SHA512 d8554b8c587a7a388a8660fac90bf4b18cf53614af8c5a54f0773fec59de88507cf7b64ab464052ea918654983503a0cbc5a102cf158b007ff598924888758dc WHIRLPOOL 1fba4f11aa5415f6316cfbdffc140e50398a2397cea0909c575eea46d2fc0856bdf2987e9220c09315529da21409c32e8cd43f2a0740a00622df93fa54c3738a
 EBUILD gajim-0.15.2-r4.ebuild 2841 SHA256 88264497bec6a9364899fb2fa0f93712f6dab308de0ca5b3a81c1a8f1dc163e4 SHA512 9a2ea50cd4e135ebf9d9928cc9c0191d6cfde1beb07da2459098598e43e2185980675e0d4b44f66c10303007ce3ecfce420dca072c51a2dd0a41e42750b55847 WHIRLPOOL 4bd18b04a348e0493f0cc3c2f85d5269eedac0722bd885c81016db81311468544fc374d0721f47a4bdbf668c143ba16a566ddd857fbff2a2dcd815bf1d217b4f
+EBUILD gajim-0.15.3-r1.ebuild 2870 SHA256 4857ce53572ea9711f632e3b3d514fe87d6861797aeb820553255e417db4ade6 SHA512 fc45a945058e2609c3f342efe5d88ee6e6ee0c31d0110783c099ecddf6935229a5111eb67248cfa395cca6c74c21c1eb78fbe3b262095245d258772937604b9a WHIRLPOOL 2c02ee47ad03b8ff74f33225aa045ba1b1e084903f8eb7e1e0ba5499bd7aa50dcf240c8a0eb0beed0306796ad79482e867017bec76fe29cd6ae174eccbdf14e6
 EBUILD gajim-0.15.3.ebuild 2833 SHA256 98ccbb273a45341c9d03be0bcf2aa52e03f3c6774a93417e2f3a2b29f0697139 SHA512 8fb162e302302577c2be56f4a7487df0f83aea29f2bdb81c9eea4045d7d2289b7b96087584a5274576218847232a8b4264cf926c9f08da5476f99c5b4d59afda WHIRLPOOL ce1943100c1a2fe92fd4d3f7884e887495ac2d4665faad3b5b29fd97bd460300891c7f6dc119c47c5275934137882d35dddbe5810942472f6f2ebfb39466d595
-MISC ChangeLog 25127 SHA256 433893d797b8e1e443cbddc47a171c7cb42756793b68264de0474bc44691898e SHA512 d61017ecb2d0c2d66e7b184cbd3abc14e2619a4aa0784866f401a3c2561a973516a4c5367efac87b597c9a4ec35e15923811d622136066cfd6986f9b552d63da WHIRLPOOL df72485f412590d26f55f1c158134fd976d98d93cb596e12f297af604af288ecb6c59da28488e419a2eb2586f627338d18de2b7b299f6a539d49751ffedd22ca
+MISC ChangeLog 25342 SHA256 f56c8add703f888522a47ec4fee193453ac7d36dc35ea428265de2908b479219 SHA512 c0f60ea2e8b7f4ad35ed7f3fb20b2611b7762f3a79e44f3bcef9ad48a92845f45785f2d724a9dcc9a1a35a4f2f2c96bead6bb430c4ae0cf5b2d760df1645589f WHIRLPOOL 472d43c7c777e1a642ef8631ecf2a657747b494681778c8960c2e7facd13263342770274f28f1cd6e3daa4c3a789b9a2aa013297d8fe180bc0afe07b0df7c41a
 MISC metadata.xml 503 SHA256 781012e83e7e3d1480ed6413a58f8a294e3a1b4c4968b1217c9bf7b41cca3ae5 SHA512 cfc7f159daf5007962ea035289002df56575042d567aa36c495b95dcf7ca7bb931be622599537e9ea67c25b7cb75014acf38a13bda349218af7a5eb576ebb0a4 WHIRLPOOL 3ff97b378ffe5c79d63ba206dec6c346480c42aa4988bed662066efbf5599e0986c83cd1ade54bded8bb2e2ad0ab6ad6f18c791b59f11215c2a52c4503721cbb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFG1DYACgkQgAnW8HDreRbE2wCglwUIsuj+VMeXUyZIkuuSphQt
-ZeUAn07VZGREuwjyt/CstARFstlUYhgp
-=G0Jn
+iEYEAREKAAYFAlFK1+8ACgkQgAnW8HDreRZzRgCdHOG0qMGUyuEpYFOA+mXJKQIL
+ZCMAoLssH0SmpM60xVPkzKKo90JW2dJW
+=RrBP
 -----END PGP SIGNATURE-----
diff --git a/net-im/gajim/files/gajim-0.15.3-starttls.patch b/net-im/gajim/files/gajim-0.15.3-starttls.patch
new file mode 100644
index 000000000000..91f0e4940234
--- /dev/null
+++ b/net-im/gajim/files/gajim-0.15.3-starttls.patch
@@ -0,0 +1,11 @@
+Index: src/common/connection.py

+===================================================================

+--- src/common/connection.py	(revision 14431)

++++ src/common/connection.py	(revision 14476)

+@@ -1329,5 +1329,5 @@

+                 return True

+             i += 1

+-        if hasattr(con.Connection, 'ssl_fingerprint_sha1'):

++        if con.Connection.ssl_fingerprint_sha1:

+             saved_fingerprint = gajim.config.get_per('accounts', self.name,

+                 'ssl_fingerprint_sha1')

diff --git a/net-im/gajim/gajim-0.15.3-r1.ebuild b/net-im/gajim/gajim-0.15.3-r1.ebuild
new file mode 100644
index 000000000000..77e733aa0755
--- /dev/null
+++ b/net-im/gajim/gajim-0.15.3-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15.3-r1.ebuild,v 1.1 2013/03/21 09:50:37 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="sqlite xml"
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils python-r1 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"
+#	test? ( http://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="avahi crypt dbus gnome kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
+
+REQUIRED_USE="
+	libnotify? ( dbus )
+	avahi? ( dbus )"
+
+COMMON_DEPEND="
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	x11-libs/gtk+:2"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40.1
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	crypt? (
+		app-crypt/gnupg
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+		)
+	dbus? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-libs/dbus-glib
+		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
+		avahi? ( net-dns/avahi[dbus,gtk,python] )
+		)
+	gnome? (
+		dev-python/libgnome-python
+		dev-python/gnome-keyring-python
+		dev-python/egg-python
+		)
+	idle? ( x11-libs/libXScrnSaver )
+	jingle? ( net-libs/farstream:0.1[python] )
+	kde? ( kde-base/kwallet )
+	networkmanager? (
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			net-misc/networkmanager
+		)
+	spell? ( app-text/gtkspell:2 )
+	srv? (
+		|| (
+			dev-python/libasyncns-python
+			net-dns/bind-tools )
+		)
+	xhtml? ( dev-python/docutils )"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-roster.patch
+	"${FILESDIR}"/${P}-starttls.patch
+	)
+
+src_prepare() {
+	echo "src/command_system/mapping.py" >> po/POTFILES.in
+	echo '#!/bin/sh' > config/py-compile
+	autotools-utils_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	configuration() {
+		local myeconfargs=(
+			$(use_enable nls)
+			$(use_with X x)
+			--docdir="/usr/share/doc/${PF}"
+			--libdir="$(python_get_sitedir)"
+			--enable-site-packages
+		)
+		run_in_build_dir autotools-utils_src_configure
+	}
+	python_foreach_impl configuration
+}
+
+src_compile() {
+	compilation() {
+		run_in_build_dir autotools-utils_src_compile
+	}
+	python_foreach_impl compilation
+}
+
+src_test() {
+	testing() {
+		run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die
+	}
+	python_foreach_impl testing
+}
+
+src_install() {
+	installation() {
+		run_in_build_dir autotools-utils_src_install
+		python_optimize "${ED}"/$(python_get_sitedir)
+	}
+	python_foreach_impl installation
+
+	rm "${D}/usr/share/doc/${PF}/README.html" || die
+	dohtml README.html
+}