| 1 |
pacho 11/11/28 20:31:54 |
| 2 |
|
| 3 |
Added: emesene-1.6.3-update-servers.patch |
| 4 |
Log: |
| 5 |
Workaround problems to connect to servers, bug #389955 |
| 6 |
|
| 7 |
(Portage version: 2.1.10.38/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-im/emesene/files/emesene-1.6.3-update-servers.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/emesene/files/emesene-1.6.3-update-servers.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/emesene/files/emesene-1.6.3-update-servers.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: emesene-1.6.3-update-servers.patch |
| 16 |
=================================================================== |
| 17 |
diff -ur emesene-1.6.3.old//emesenelib/ProfileManager.py emesene-1.6.3/emesenelib/ProfileManager.py |
| 18 |
--- emesene-1.6.3.old//emesenelib/ProfileManager.py 2010-07-13 00:13:14.000000000 +0200 |
| 19 |
+++ emesene-1.6.3/emesenelib/ProfileManager.py 2011-11-28 21:27:10.542693399 +0100 |
| 20 |
@@ -658,7 +658,7 @@ |
| 21 |
|
| 22 |
soap.manager.do_request(self.proxy,\ |
| 23 |
'http://www.msn.com/webservices/AddressBook/ABGroupAdd', |
| 24 |
- 'contacts.msn.com', 443, '/abservice/abservice.asmx', |
| 25 |
+ 'local-bay.contacts.msn.com', 443, '/abservice/abservice.asmx', |
| 26 |
soap.templates.addGroup % (group,), |
| 27 |
self.onGroupAdded, (group,)) |
| 28 |
|
| 29 |
@@ -690,7 +690,7 @@ |
| 30 |
|
| 31 |
soap.manager.do_request(self.proxy,\ |
| 32 |
'http://www.msn.com/webservices/AddressBook/ABGroupDelete', \ |
| 33 |
- 'contacts.msn.com', 443, '/abservice/abservice.asmx', \ |
| 34 |
+ 'local-bay.contacts.msn.com', 443, '/abservice/abservice.asmx', \ |
| 35 |
soap.templates.deleteGroup % (gid,), \ |
| 36 |
self.onGroupRemoved, (gid, groupObj)) |
| 37 |
|
| 38 |
@@ -732,7 +732,7 @@ |
| 39 |
self.emit('group-attr-changed', objOldGroup, group) |
| 40 |
soap.manager.do_request(self.proxy,\ |
| 41 |
'http://www.msn.com/webservices/AddressBook/ABGroupUpdate', \ |
| 42 |
- 'contacts.msn.com', 443, '/abservice/abservice.asmx', \ |
| 43 |
+ 'local-bay.contacts.msn.com', 443, '/abservice/abservice.asmx', \ |
| 44 |
soap.templates.renameGroup % (gid, common.escape(newGroup)), \ |
| 45 |
self.onGroupRenamed, (oldGroup, newGroup)) |
| 46 |
|
| 47 |
diff -ur emesene-1.6.3.old//emesenelib/soap/requests.py emesene-1.6.3/emesenelib/soap/requests.py |
| 48 |
--- emesene-1.6.3.old//emesenelib/soap/requests.py 2010-07-13 00:13:14.000000000 +0200 |
| 49 |
+++ emesene-1.6.3/emesenelib/soap/requests.py 2011-11-28 21:27:10.542693399 +0100 |
| 50 |
@@ -22,59 +22,59 @@ |
| 51 |
common.debug("soap.requests: membership list", "soap") |
| 52 |
soap.manager.do_request(proxy, |
| 53 |
'http://www.msn.com/webservices/AddressBook/FindMembership', |
| 54 |
- 'contacts.msn.com', 443, '/abservice/SharingService.asmx', |
| 55 |
+ 'local-bay.contacts.msn.com', 443, '/abservice/SharingService.asmx', |
| 56 |
soap.templates.membershipList, callback) |
| 57 |
|
| 58 |
def address_book(proxy, callback): |
| 59 |
common.debug("soap.requests: address book", "soap") |
| 60 |
soap.manager.do_request(proxy, |
| 61 |
'http://www.msn.com/webservices/AddressBook/ABFindAll', |
| 62 |
- 'contacts.msn.com', 443, '/abservice/abservice.asmx', |
| 63 |
+ 'local-bay.contacts.msn.com', 443, '/abservice/abservice.asmx', |
| 64 |
soap.templates.addressBook, callback) |
| 65 |
|
| 66 |
def change_alias(proxy, contactID, alias, callback, *args): |
| 67 |
alias = str(common.escape(alias)) |
| 68 |
soap.manager.do_request(proxy, |
| 69 |
'http://www.msn.com/webservices/AddressBook/ABContactUpdate', |
| 70 |
- 'contacts.msn.com', 443, '/abservice/abservice.asmx', |
| 71 |
+ 'local-bay.contacts.msn.com', 443, '/abservice/abservice.asmx', |
| 72 |
soap.templates.renameContact % (str(contactID), alias), |
| 73 |
callback, args) |
| 74 |
|
| 75 |
def add_contact(proxy, email, callback, *args): |
| 76 |
soap.manager.do_request(proxy, |
| 77 |
'http://www.msn.com/webservices/AddressBook/ABContactAdd', |
| 78 |
- 'contacts.msn.com', 443, '/abservice/abservice.asmx', |
| 79 |
+ 'local-bay.contacts.msn.com', 443, '/abservice/abservice.asmx', |
| 80 |
soap.templates.contactAdd % (email, ), callback, args) |
| 81 |
|
| 82 |
def remove_contact(proxy, contactID, callback, *args): |
| 83 |
soap.manager.do_request(proxy, |
| 84 |
'http://www.msn.com/webservices/AddressBook/ABContactDelete', |
| 85 |
- 'contacts.msn.com', 443, '/abservice/abservice.asmx', |
| 86 |
+ 'local-bay.contacts.msn.com', 443, '/abservice/abservice.asmx', |
| 87 |
soap.templates.contactRemove % (contactID, ), callback, args) |
| 88 |
|
| 89 |
def add_to_group(proxy, gid, contactID, callback, *args): |
| 90 |
soap.manager.do_request(proxy, |
| 91 |
'http://www.msn.com/webservices/AddressBook/ABGroupContactAdd', |
| 92 |
- 'contacts.msn.com', 443, '/abservice/abservice.asmx', |
| 93 |
+ 'local-bay.contacts.msn.com', 443, '/abservice/abservice.asmx', |
| 94 |
soap.templates.moveUserToGroup % (gid, contactID), callback, args) |
| 95 |
|
| 96 |
def remove_from_group(proxy, contactID, sourceGid, callback, *args): |
| 97 |
soap.manager.do_request(proxy, |
| 98 |
'http://www.msn.com/webservices/AddressBook/ABGroupContactDelete', |
| 99 |
- 'contacts.msn.com', 443, '/abservice/abservice.asmx', |
| 100 |
+ 'local-bay.contacts.msn.com', 443, '/abservice/abservice.asmx', |
| 101 |
soap.templates.deleteUserFromGroup % (contactID, sourceGid), |
| 102 |
callback, args) |
| 103 |
|
| 104 |
def add_role(proxy, role, email, callback, *args): |
| 105 |
soap.manager.do_request(proxy, |
| 106 |
'http://www.msn.com/webservices/AddressBook/AddMember', |
| 107 |
- 'contacts.msn.com', 443, '/abservice/SharingService.asmx', |
| 108 |
+ 'local-bay.contacts.msn.com', 443, '/abservice/SharingService.asmx', |
| 109 |
soap.templates.addMember % (role, email), callback, args) |
| 110 |
|
| 111 |
def delete_role(proxy, role, email, callback, *args): |
| 112 |
soap.manager.do_request(proxy, |
| 113 |
'http://www.msn.com/webservices/AddressBook/DeleteMember', |
| 114 |
- 'contacts.msn.com', 443, '/abservice/SharingService.asmx', |
| 115 |
+ 'local-bay.contacts.msn.com', 443, '/abservice/SharingService.asmx', |
| 116 |
soap.templates.deleteMember % (role, email), callback, args) |
| 117 |
|
| 118 |
def get_profile(proxy, cid, callback): |
| 119 |
diff -ur emesene-1.6.3.old//emesenelib/soap/templates.py emesene-1.6.3/emesenelib/soap/templates.py |
| 120 |
--- emesene-1.6.3.old//emesenelib/soap/templates.py 2010-07-13 00:13:14.000000000 +0200 |
| 121 |
+++ emesene-1.6.3/emesenelib/soap/templates.py 2011-11-28 21:27:10.545693399 +0100 |
| 122 |
@@ -68,7 +68,7 @@ |
| 123 |
<wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType> |
| 124 |
<wsp:AppliesTo> |
| 125 |
<wsa:EndpointReference> |
| 126 |
- <wsa:Address>contacts.msn.com</wsa:Address> |
| 127 |
+ <wsa:Address>local-bay.contacts.msn.com</wsa:Address> |
| 128 |
</wsa:EndpointReference> |
| 129 |
</wsp:AppliesTo> |
| 130 |
<wsse:PolicyReference URI="MBI"></wsse:PolicyReference> |
| 131 |
@@ -147,7 +147,7 @@ |
| 132 |
# the secont parameter should specify the member by contactId |
| 133 |
# POST /abservice/abservice.asmx HTTP/1.1 |
| 134 |
# SOAPAction: http://www.msn.com/webservices/AddressBook/ABGroupContactAdd |
| 135 |
-# Host: omega.contacts.msn.com |
| 136 |
+# Host: omega.local-bay.contacts.msn.com |
| 137 |
|
| 138 |
oldaddUserToGroup = '''<?xml version="1.0" encoding="utf-8"?> |
| 139 |
<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" |
| 140 |
@@ -217,7 +217,7 @@ |
| 141 |
# the first %s is Allow or Block, the second is the passport mail |
| 142 |
# POST /abservice/SharingService.asmx HTTP/1.1 |
| 143 |
# SOAPAction: http://www.msn.com/webservices/AddressBook/AddMember |
| 144 |
-# Host: omega.contacts.msn.com |
| 145 |
+# Host: omega.local-bay.contacts.msn.com |
| 146 |
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/"> |
| 147 |
<soap:Header><ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook"><ApplicationId>CFE80F9D-180F-4399-82AB-413F33A1FA11</ApplicationId><IsMigration>false</IsMigration><PartnerScenario></PartnerScenario></ABApplicationHeader> |
| 148 |
<ABAuthHeader xmlns="http://www.msn.com/webservices/AddressBook"><ManagedGroupRequest>false</ManagedGroupRequest><TicketToken>&tickettoken;</TicketToken></ABAuthHeader></soap:Header> |
| 149 |
@@ -236,7 +236,7 @@ |
| 150 |
# the first %s is Allow or Block, the second is the passport mail |
| 151 |
# POST /abservice/SharingService.asmx HTTP/1.1 |
| 152 |
# SOAPAction: http://www.msn.com/webservices/AddressBook/DeleteMember |
| 153 |
-# Host: omega.contacts.msn.com |
| 154 |
+# Host: omega.local-bay.contacts.msn.com |
| 155 |
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/"> |
| 156 |
<soap:Header><ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook"><ApplicationId>CFE80F9D-180F-4399-82AB-413F33A1FA11</ApplicationId><IsMigration>false</IsMigration><PartnerScenario></PartnerScenario></ABApplicationHeader> |
| 157 |
<ABAuthHeader xmlns="http://www.msn.com/webservices/AddressBook"><ManagedGroupRequest>false</ManagedGroupRequest><TicketToken>&tickettoken;</TicketToken></ABAuthHeader></soap:Header> |
| 158 |
@@ -245,7 +245,7 @@ |
| 159 |
# %s is the group name |
| 160 |
# POST /abservice/abservice.asmx HTTP/1.1 |
| 161 |
# SOAPAction: http://www.msn.com/webservices/AddressBook/ABGroupAdd |
| 162 |
-# Host: by6.omega.contacts.msn.com |
| 163 |
+# Host: by6.omega.local-bay.contacts.msn.com |
| 164 |
|
| 165 |
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/"> |
| 166 |
<soap:Header><ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook"><ApplicationId>CFE80F9D-180F-4399-82AB-413F33A1FA11</ApplicationId><IsMigration>false</IsMigration><PartnerScenario>Timer</PartnerScenario></ABApplicationHeader> |
| 167 |
@@ -256,7 +256,7 @@ |
| 168 |
# the %s is the gid |
| 169 |
# POST /abservice/abservice.asmx HTTP/1.1 |
| 170 |
# SOAPAction: http://www.msn.com/webservices/AddressBook/ABGroupDelete |
| 171 |
-# Host: by6.omega.contacts.msn.com |
| 172 |
+# Host: by6.omega.local-bay.contacts.msn.com |
| 173 |
|
| 174 |
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/"> |
| 175 |
<soap:Header><ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook"><ApplicationId>CFE80F9D-180F-4399-82AB-413F33A1FA11</ApplicationId><IsMigration>false</IsMigration><PartnerScenario>Timer</PartnerScenario></ABApplicationHeader> |
| 176 |
@@ -266,7 +266,7 @@ |
| 177 |
# gid, name |
| 178 |
# POST abservice/abservice.asmx HTTP/1.1 |
| 179 |
# SOAPAction: http://www.msn.com/webservices/AddressBook/ABGroupUpdate |
| 180 |
-# Host: omega.contacts.msn.com/ |
| 181 |
+# Host: omega.local-bay.contacts.msn.com/ |
| 182 |
|
| 183 |
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/"> |
| 184 |
<soap:Header><ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook"><ApplicationId>CFE80F9D-180F-4399-82AB-413F33A1FA11</ApplicationId><IsMigration>false</IsMigration><PartnerScenario>Timer</PartnerScenario></ABApplicationHeader> |
Archives