Workaround problems to connect to servers, bug #389955

(Portage version: 2.1.10.38/cvs/Linux x86_64)

3 files changed, 253 insertions, 1 deletions

diff --git a/net-im/emesene/ChangeLog b/net-im/emesene/ChangeLog
index 5ce5afc95f33..73fc4343c9b8 100644
--- a/net-im/emesene/ChangeLog
+++ b/net-im/emesene/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/emesene
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/emesene/ChangeLog,v 1.14 2011/11/13 20:41:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/emesene/ChangeLog,v 1.15 2011/11/28 20:31:54 pacho Exp $
+
+*emesene-1.6.3-r1 (28 Nov 2011)
+
+  28 Nov 2011; Pacho Ramos <pacho@gentoo.org> +emesene-1.6.3-r1.ebuild,
+  +files/emesene-1.6.3-update-servers.patch:
+  Workaround problems to connect to servers, bug #389955
 
 *emesene-2.11.11 (13 Nov 2011)
 
diff --git a/net-im/emesene/emesene-1.6.3-r1.ebuild b/net-im/emesene/emesene-1.6.3-r1.ebuild
new file mode 100644
index 000000000000..632c70f66e07
--- /dev/null
+++ b/net-im/emesene/emesene-1.6.3-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/emesene/emesene-1.6.3-r1.ebuild,v 1.1 2011/11/28 20:31:54 pacho Exp $
+
+EAPI="2"
+PYTHON_DEPEND="2"
+
+inherit python eutils
+
+DESCRIPTION="Platform independent MSN Messenger client written in Python+GTK"
+HOMEPAGE="http://www.emesene.org"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="webcam"
+
+RDEPEND="dev-python/pygtk:2
+	webcam? ( media-plugins/gst-plugins-meta[v4l]
+		dev-python/gst-python
+		media-libs/libmimic )"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	# Workaround problems to connect to servers, bug #389955
+	epatch "${FILESDIR}/${P}-update-servers.patch"
+
+	rm GPL PSF LGPL || die "rm license files failed"
+
+	if ! use webcam; then
+		rm -r libmimic || die "rm libmimic dir failed"
+	fi
+
+	python_convert_shebangs -r 2 .
+}
+
+src_compile() {
+	if use webcam ; then
+		$(PYTHON) ./setup.py build_ext -i || die "libmimic compile failed"
+	fi
+}
+
+src_install() {
+	if use webcam; then
+		rm -r build || die "rm build failed"
+	fi
+
+	insinto /usr/share/${PN}
+	doins -r * || die "doins failed"
+
+	fperms a+x /usr/share/${PN}/${PN} || die "fperms failed"
+	dosym /usr/share/${PN}/${PN} /usr/bin/${PN} || die "dosym failed"
+
+	doman misc/${PN}.1 || die "doman failed"
+
+	doicon misc/*.{svg,png} || die "doicon failed"
+
+	# install the desktop entry
+	domenu misc/${PN}.desktop || die "domenu failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/share/${PN}
+
+	elog "If you want to use the spell-checking feature, you should emerge"
+	elog "dev-python/gtkspell-python"
+	elog
+	elog "If you want to use EncryptMessage plugin, you should emerge"
+	elog "dev-python/pexpect"
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/share/${PN}
+}
diff --git a/net-im/emesene/files/emesene-1.6.3-update-servers.patch b/net-im/emesene/files/emesene-1.6.3-update-servers.patch
new file mode 100644
index 000000000000..cfc00036b7ed
--- /dev/null
+++ b/net-im/emesene/files/emesene-1.6.3-update-servers.patch
@@ -0,0 +1,168 @@
+diff -ur emesene-1.6.3.old//emesenelib/ProfileManager.py emesene-1.6.3/emesenelib/ProfileManager.py
+--- emesene-1.6.3.old//emesenelib/ProfileManager.py	2010-07-13 00:13:14.000000000 +0200
++++ emesene-1.6.3/emesenelib/ProfileManager.py	2011-11-28 21:27:10.542693399 +0100
+@@ -658,7 +658,7 @@
+ 
+         soap.manager.do_request(self.proxy,\
+             'http://www.msn.com/webservices/AddressBook/ABGroupAdd',
+-            'contacts.msn.com', 443, '/abservice/abservice.asmx',
++            'local-bay.contacts.msn.com', 443, '/abservice/abservice.asmx',
+             soap.templates.addGroup % (group,),
+             self.onGroupAdded, (group,))
+ 
+@@ -690,7 +690,7 @@
+ 
+             soap.manager.do_request(self.proxy,\
+                 'http://www.msn.com/webservices/AddressBook/ABGroupDelete', \
+-                'contacts.msn.com', 443, '/abservice/abservice.asmx', \
++                'local-bay.contacts.msn.com', 443, '/abservice/abservice.asmx', \
+                 soap.templates.deleteGroup % (gid,), \
+                 self.onGroupRemoved, (gid, groupObj))
+ 
+@@ -732,7 +732,7 @@
+             self.emit('group-attr-changed', objOldGroup, group)
+             soap.manager.do_request(self.proxy,\
+                 'http://www.msn.com/webservices/AddressBook/ABGroupUpdate', \
+-                'contacts.msn.com', 443, '/abservice/abservice.asmx', \
++                'local-bay.contacts.msn.com', 443, '/abservice/abservice.asmx', \
+                 soap.templates.renameGroup % (gid, common.escape(newGroup)), \
+                 self.onGroupRenamed, (oldGroup, newGroup))
+ 
+diff -ur emesene-1.6.3.old//emesenelib/soap/requests.py emesene-1.6.3/emesenelib/soap/requests.py
+--- emesene-1.6.3.old//emesenelib/soap/requests.py	2010-07-13 00:13:14.000000000 +0200
++++ emesene-1.6.3/emesenelib/soap/requests.py	2011-11-28 21:27:10.542693399 +0100
+@@ -22,59 +22,59 @@
+     common.debug("soap.requests: membership list", "soap")
+     soap.manager.do_request(proxy,
+         'http://www.msn.com/webservices/AddressBook/FindMembership',
+-        'contacts.msn.com', 443, '/abservice/SharingService.asmx',
++        'local-bay.contacts.msn.com', 443, '/abservice/SharingService.asmx',
+         soap.templates.membershipList, callback)
+ 
+ def address_book(proxy, callback):
+     common.debug("soap.requests: address book", "soap")
+     soap.manager.do_request(proxy,
+         'http://www.msn.com/webservices/AddressBook/ABFindAll',
+-        'contacts.msn.com', 443, '/abservice/abservice.asmx',
++        'local-bay.contacts.msn.com', 443, '/abservice/abservice.asmx',
+         soap.templates.addressBook, callback)
+ 
+ def change_alias(proxy, contactID, alias, callback, *args):
+     alias = str(common.escape(alias))
+     soap.manager.do_request(proxy,
+         'http://www.msn.com/webservices/AddressBook/ABContactUpdate',
+-        'contacts.msn.com', 443, '/abservice/abservice.asmx',
++        'local-bay.contacts.msn.com', 443, '/abservice/abservice.asmx',
+         soap.templates.renameContact % (str(contactID), alias),
+         callback, args)
+ 
+ def add_contact(proxy, email, callback, *args):
+     soap.manager.do_request(proxy,
+         'http://www.msn.com/webservices/AddressBook/ABContactAdd',
+-        'contacts.msn.com', 443, '/abservice/abservice.asmx',
++        'local-bay.contacts.msn.com', 443, '/abservice/abservice.asmx',
+         soap.templates.contactAdd % (email, ), callback, args)
+ 
+ def remove_contact(proxy, contactID, callback, *args):
+     soap.manager.do_request(proxy,
+         'http://www.msn.com/webservices/AddressBook/ABContactDelete',
+-        'contacts.msn.com', 443, '/abservice/abservice.asmx',
++        'local-bay.contacts.msn.com', 443, '/abservice/abservice.asmx',
+         soap.templates.contactRemove % (contactID, ), callback, args)
+ 
+ def add_to_group(proxy, gid, contactID, callback, *args):
+     soap.manager.do_request(proxy,
+         'http://www.msn.com/webservices/AddressBook/ABGroupContactAdd',
+-        'contacts.msn.com', 443, '/abservice/abservice.asmx',
++        'local-bay.contacts.msn.com', 443, '/abservice/abservice.asmx',
+         soap.templates.moveUserToGroup % (gid, contactID), callback, args)
+ 
+ def remove_from_group(proxy, contactID, sourceGid, callback, *args):
+     soap.manager.do_request(proxy,
+         'http://www.msn.com/webservices/AddressBook/ABGroupContactDelete',
+-        'contacts.msn.com', 443, '/abservice/abservice.asmx',
++        'local-bay.contacts.msn.com', 443, '/abservice/abservice.asmx',
+         soap.templates.deleteUserFromGroup % (contactID, sourceGid),
+         callback, args)
+ 
+ def add_role(proxy, role, email, callback, *args):
+     soap.manager.do_request(proxy,
+         'http://www.msn.com/webservices/AddressBook/AddMember',
+-        'contacts.msn.com', 443, '/abservice/SharingService.asmx',
++        'local-bay.contacts.msn.com', 443, '/abservice/SharingService.asmx',
+         soap.templates.addMember % (role, email), callback, args)
+ 
+ def delete_role(proxy, role, email, callback, *args):
+     soap.manager.do_request(proxy,
+         'http://www.msn.com/webservices/AddressBook/DeleteMember',
+-        'contacts.msn.com', 443, '/abservice/SharingService.asmx',
++        'local-bay.contacts.msn.com', 443, '/abservice/SharingService.asmx',
+         soap.templates.deleteMember % (role, email), callback, args)
+ 
+ def get_profile(proxy, cid, callback):
+diff -ur emesene-1.6.3.old//emesenelib/soap/templates.py emesene-1.6.3/emesenelib/soap/templates.py
+--- emesene-1.6.3.old//emesenelib/soap/templates.py	2010-07-13 00:13:14.000000000 +0200
++++ emesene-1.6.3/emesenelib/soap/templates.py	2011-11-28 21:27:10.545693399 +0100
+@@ -68,7 +68,7 @@
+             <wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>
+             <wsp:AppliesTo>
+                 <wsa:EndpointReference>
+-                    <wsa:Address>contacts.msn.com</wsa:Address>
++                    <wsa:Address>local-bay.contacts.msn.com</wsa:Address>
+                 </wsa:EndpointReference>
+             </wsp:AppliesTo>
+             <wsse:PolicyReference URI="MBI"></wsse:PolicyReference>
+@@ -147,7 +147,7 @@
+ # the secont parameter should specify the member by contactId
+ # POST /abservice/abservice.asmx HTTP/1.1
+ # SOAPAction: http://www.msn.com/webservices/AddressBook/ABGroupContactAdd
+-# Host: omega.contacts.msn.com
++# Host: omega.local-bay.contacts.msn.com
+ 
+ oldaddUserToGroup =  '''<?xml version="1.0" encoding="utf-8"?>
+ <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+@@ -217,7 +217,7 @@
+ # the first %s is Allow or Block, the second is the passport mail
+ # POST /abservice/SharingService.asmx HTTP/1.1
+ # SOAPAction: http://www.msn.com/webservices/AddressBook/AddMember
+-# Host: omega.contacts.msn.com
++# Host: omega.local-bay.contacts.msn.com
+ addMember='''<?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+ <soap:Header><ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook"><ApplicationId>CFE80F9D-180F-4399-82AB-413F33A1FA11</ApplicationId><IsMigration>false</IsMigration><PartnerScenario></PartnerScenario></ABApplicationHeader>
+ <ABAuthHeader xmlns="http://www.msn.com/webservices/AddressBook"><ManagedGroupRequest>false</ManagedGroupRequest><TicketToken>&tickettoken;</TicketToken></ABAuthHeader></soap:Header>
+@@ -236,7 +236,7 @@
+ # the first %s is Allow or Block, the second is the passport mail
+ # POST /abservice/SharingService.asmx HTTP/1.1
+ # SOAPAction: http://www.msn.com/webservices/AddressBook/DeleteMember
+-# Host: omega.contacts.msn.com
++# Host: omega.local-bay.contacts.msn.com
+ deleteMember='''<?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+ <soap:Header><ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook"><ApplicationId>CFE80F9D-180F-4399-82AB-413F33A1FA11</ApplicationId><IsMigration>false</IsMigration><PartnerScenario></PartnerScenario></ABApplicationHeader>
+ <ABAuthHeader xmlns="http://www.msn.com/webservices/AddressBook"><ManagedGroupRequest>false</ManagedGroupRequest><TicketToken>&tickettoken;</TicketToken></ABAuthHeader></soap:Header>
+@@ -245,7 +245,7 @@
+ # %s is the group name
+ # POST /abservice/abservice.asmx HTTP/1.1
+ # SOAPAction: http://www.msn.com/webservices/AddressBook/ABGroupAdd
+-# Host: by6.omega.contacts.msn.com
++# Host: by6.omega.local-bay.contacts.msn.com
+ 
+ addGroup='''<?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+ <soap:Header><ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook"><ApplicationId>CFE80F9D-180F-4399-82AB-413F33A1FA11</ApplicationId><IsMigration>false</IsMigration><PartnerScenario>Timer</PartnerScenario></ABApplicationHeader>
+@@ -256,7 +256,7 @@
+ # the %s is the gid
+ # POST /abservice/abservice.asmx HTTP/1.1
+ # SOAPAction: http://www.msn.com/webservices/AddressBook/ABGroupDelete
+-# Host: by6.omega.contacts.msn.com
++# Host: by6.omega.local-bay.contacts.msn.com
+ 
+ deleteGroup='''<?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+ <soap:Header><ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook"><ApplicationId>CFE80F9D-180F-4399-82AB-413F33A1FA11</ApplicationId><IsMigration>false</IsMigration><PartnerScenario>Timer</PartnerScenario></ABApplicationHeader>
+@@ -266,7 +266,7 @@
+ # gid, name
+ # POST abservice/abservice.asmx HTTP/1.1
+ # SOAPAction: http://www.msn.com/webservices/AddressBook/ABGroupUpdate
+-# Host: omega.contacts.msn.com/
++# Host: omega.local-bay.contacts.msn.com/
+ 
+ renameGroup='''<?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+ <soap:Header><ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook"><ApplicationId>CFE80F9D-180F-4399-82AB-413F33A1FA11</ApplicationId><IsMigration>false</IsMigration><PartnerScenario>Timer</PartnerScenario></ABApplicationHeader>