Fixed connection issues with current MSN servers (bug #234049).

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.26 x86_64

4 files changed, 97 insertions, 5 deletions

diff --git a/net-im/pymsn-t/ChangeLog b/net-im/pymsn-t/ChangeLog
index cf4d5c7ba2aa..6d4255ca5472 100644
--- a/net-im/pymsn-t/ChangeLog
+++ b/net-im/pymsn-t/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/pymsn-t
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pymsn-t/ChangeLog,v 1.12 2008/05/29 17:41:37 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pymsn-t/ChangeLog,v 1.13 2008/08/07 17:25:41 griffon26 Exp $
+
+*pymsn-t-0.11.3-r1 (07 Aug 2008)
+
+  07 Aug 2008; Maurice van der Pot <griffon26@gentoo.org>
+  +files/pymsn-t-0.11.3-protocol-version.patch, +pymsn-t-0.11.3-r1.ebuild:
+  Added patch to fix connection issues with current MSN servers as reported by
+  Goudal Francois <goudalf@free.fr> in bug #234049.
 
   29 May 2008; Ali Polatel <hawking@gentoo.org> pymsn-t-0.11.2.ebuild,
   pymsn-t-0.11.3.ebuild, pymsn-t-0.11a-r4.ebuild:
diff --git a/net-im/pymsn-t/Manifest b/net-im/pymsn-t/Manifest
index 9ba0f7c23b7b..71d109e62db0 100644
--- a/net-im/pymsn-t/Manifest
+++ b/net-im/pymsn-t/Manifest
@@ -3,19 +3,21 @@ Hash: SHA1
 
 AUX pymsn-t-0.11.2-initd 683 RMD160 7dfd35f2d31800e04ffd764efc1b65845311d32f SHA1 878d12e1d722d97eca2a9ba001e2dcc8797b4ceb SHA256 df24c7a7f4e8eb394daea3a5b79b0a861f72a2b56ec5c52871fb514d731231b2
 AUX pymsn-t-0.11.2-twisted-2.5.patch 547 RMD160 c0bf484934b47ca3025618336e4acbae8c93ddfd SHA1 26b10892c7a564b3be0f7e98e568211c8d664d1e SHA256 52388d68cadce48e31588364b1168240dffd1be3f06f2844adcfdfa3736c1d0d
+AUX pymsn-t-0.11.3-protocol-version.patch 609 RMD160 f7cc7e2f6829861f11016db35a98396d5a0cd7c8 SHA1 7144ebaac17a61767aee92ef1b4e972c86eb5325 SHA256 008aedc95f1c2020a156d941c74784ca1385f12426342885fa7ff8474365b5a3
 AUX pymsn-t.initd 692 RMD160 5c510398a6712e15a3ea5a0d6970943f86ffdaf1 SHA1 e1fc82f1a4c6d9077252208a1c788f57bc7ee54b SHA256 35865c76f77a5b84082650734723c05a0abf4ce52dc1e89b3ed67045e4c62137
 DIST pymsnt-0.11.2.tar.gz 311947 RMD160 f3b952832400a67407c9c9e713953f7bcae5fbfa SHA1 631743956339435e05d69548142e390fd95263ae SHA256 d0d7064f50133453d170008e075de2d3ec0138e593c5bc9ec4052cfb2fe28459
 DIST pymsnt-0.11.3.tar.gz 162549 RMD160 59e2af9eee9aa1d5b7a408b05fd520f0355556e1 SHA1 093ce984446f9edeec9d9d35a07a3958f5f656b1 SHA256 777195feb6a70b683d691c54269099d319747fad7195cca36d86df366360ce2c
 DIST pymsnt-0.11a.tar.gz 257753 RMD160 2066a93c59e3361626fab7aae56aa706a75ab8fc SHA1 d7907ffe36caeba7c851e5e0aa64d0a5649f8087 SHA256 e083a4ca50a074bfd9fd924279b27379e1cf042c90355bb25eb7f40328bdccce
 EBUILD pymsn-t-0.11.2.ebuild 2055 RMD160 9a47777c6c9f7e41bf6b69d87ae8972660aa5c99 SHA1 3718c6f04edea3d3e43f7c292bd0488bd28e2945 SHA256 c0605a2e7f2070ef5f4804b693e61bf7fb87dab3952e60cb79b57e7af9977663
+EBUILD pymsn-t-0.11.3-r1.ebuild 2003 RMD160 db7a8112c5aad215239f5d6f124de0ac9ad4bb50 SHA1 14a464f6ad70e23263f58fdcab33290f71347ae0 SHA256 d4cf3d4a15c0b305507f5e079c812c39de2285b0ef7a361fee88f8350a320b53
 EBUILD pymsn-t-0.11.3.ebuild 1881 RMD160 1c068d65d7166bad8f896e853a2787acb9903920 SHA1 a3cc0e3c964572ff1da568c22e718b33dc982359 SHA256 fbb9c56c6f4c5fcef2f7f444de3eae3c3a4748901a66acbd5541d50756ed0518
 EBUILD pymsn-t-0.11a-r4.ebuild 1945 RMD160 9806f7cd18f96afd580f08e74618242e9d01f7f0 SHA1 34a6c1b925f9ad5cd204aa713b71bb35353c4682 SHA256 53320dbd4ffa699d5e67fb06686115ab180cdf1a0f590d15e954941a4efa397a
-MISC ChangeLog 2720 RMD160 0c6f11fa08e8f8694660d8024c71295acff59646 SHA1 b7c2e6ca31996012f2d06886f230262fcfe93dc9 SHA256 a7a2f25bba3de44f94e6911a7c67e781e5f45ea6336f31245f1f95d82b0d9453
+MISC ChangeLog 3021 RMD160 550159dd1ff9455f3a7333eaff33fc83ceef7bfc SHA1 2d69faae27000c09750fe3cf69cd3e42c581aeac SHA256 0c892a46fa0248cce08481ad17f13c68196939b620376cecfee4754ae410fc05
 MISC metadata.xml 298 RMD160 bf178db6163d9777f6aec41efeb2e62ab6634a83 SHA1 bff4dfd7b7efc532399df203152564ede084589f SHA256 32651d5277d9073b5b5ea63ebfe8489f6baf6ecbc961dc7efa038552496c2d9b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkg+6tQACgkQQU4yORhF8iAXMACgzWenykUA3cL7zW/z012w1Mqf
-JegAn2eOprSVrB8gYu0oY1XCPI5LqxWt
-=ghHp
+iEYEARECAAYFAkibMB0ACgkQMGnpIbeahxzeywCdH/5iv4aUFBZsVVXpr+4Ornco
+9bEAn1EfF6RmXgWJHPkjBCly//pleQRk
+=stLc
 -----END PGP SIGNATURE-----
diff --git a/net-im/pymsn-t/files/pymsn-t-0.11.3-protocol-version.patch b/net-im/pymsn-t/files/pymsn-t-0.11.3-protocol-version.patch
new file mode 100644
index 000000000000..ffb6ae8339cb
--- /dev/null
+++ b/net-im/pymsn-t/files/pymsn-t-0.11.3-protocol-version.patch
@@ -0,0 +1,12 @@
+diff -a -u -d -r pymsnt.a/src/legacy/msn/msn.py pymsnt.b/src/legacy/msn/msn.py
+--- pymsnt.a/src/legacy/msn/msn.py	2008-02-08 16:55:07.000000000 +0300
++++ pymsnt.b/src/legacy/msn/msn.py	2008-08-05 20:40:46.000000000 +0400
+@@ -110,7 +110,7 @@
+ from urllib import quote, unquote
+ 
+ 
+-MSN_PROTOCOL_VERSION = "MSNP11 CVR0"      # protocol version
++MSN_PROTOCOL_VERSION = "MSNP11"      # protocol version
+ MSN_PORT             = 1863               # default dispatch server port
+ MSN_MAX_MESSAGE      = 1664               # max message length
+ MSN_CVR_STR          = "0x040c winnt 5.1 i386 MSNMSGR 7.0.0777 msmsgs"
diff --git a/net-im/pymsn-t/pymsn-t-0.11.3-r1.ebuild b/net-im/pymsn-t/pymsn-t-0.11.3-r1.ebuild
new file mode 100644
index 000000000000..b8d7bc64ae1e
--- /dev/null
+++ b/net-im/pymsn-t/pymsn-t-0.11.3-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/pymsn-t/pymsn-t-0.11.3-r1.ebuild,v 1.1 2008/08/07 17:25:41 griffon26 Exp $
+
+NEED_PYTHON=2.3
+
+inherit eutils multilib python
+
+MY_PN="pymsnt"
+S=${WORKDIR}/${MY_PN}-${PV}
+DESCRIPTION="Python based jabber transport for MSN"
+HOMEPAGE="http://msn-transport.jabberstudio.org/"
+SRC_URI="http://msn-transport.jabberstudio.org/tarballs/${MY_PN}-${PV}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc"
+IUSE=""
+
+DEPEND="net-im/jabber-base"
+RDEPEND="${DEPEND}
+	>=dev-python/twisted-2.5.0
+	>=dev-python/twisted-words-0.5.0
+	>=dev-python/twisted-web-0.7.0
+	>=dev-python/imaging-1.1"
+
+src_unpack() {
+	unpack ${A} && cd "${S}" || die "unpack failed"
+	epatch "${FILESDIR}/${P}-protocol-version.patch"
+}
+
+src_install() {
+	local inspath
+
+	python_version
+	inspath=/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
+	insinto ${inspath}
+	doins -r data src
+	newins PyMSNt.py ${PN}.py
+
+	insinto /etc/jabber
+	newins config-example.xml ${PN}.xml
+	fperms 600 /etc/jabber/${PN}.xml
+	fowners jabber:jabber /etc/jabber/${PN}.xml
+	dosed \
+		"s:<!-- <spooldir>[^\<]*</spooldir> -->:<spooldir>/var/spool/jabber</spooldir>:" \
+		/etc/jabber/${PN}.xml
+	dosed \
+		"s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \
+		/etc/jabber/${PN}.xml
+	dosed \
+		"s:<host>[^\<]*</host>:<host>example.org</host>:" \
+		/etc/jabber/${PN}.xml
+	dosed \
+		"s:<jid>msn</jid>:<jid>msn.example.org</jid>:" \
+		/etc/jabber/${PN}.xml
+
+	newinitd "${FILESDIR}/${PN}-0.11.2-initd" ${PN}
+	dosed "s:INSPATH:${inspath}:" /etc/init.d/${PN}
+}
+
+pkg_postinst() {
+	python_version
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
+
+	elog "A sample configuration file has been installed in /etc/jabber/${PN}.xml."
+	elog "Please edit it and the configuration of your Jabber server to match."
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/${PN}
+}