[bitlbee] fix MSN login (upstream commit 823)

[Adam Williamson]

commit d653e1442bd2d2e64d98d5f6eb19f5cdee5450ad
Author: Adam Williamson <awilliam at redhat.com>
Date:   Fri Nov 11 18:10:26 2011 -0800

    fix MSN login (upstream commit 823)

 823_822.diff |   31 +++++++++++++++++++++++++++++++
 bitlbee.spec |    8 +++++++-
 2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/823_822.diff b/823_822.diff
new file mode 100644
index 0000000..992125f
--- /dev/null
+++ b/823_822.diff
@@ -0,0 +1,31 @@
+=== modified file 'protocols/msn/soap.h'
+--- protocols/msn/soap.h	2011-01-22 17:29:55 +0000
++++ protocols/msn/soap.h	2011-11-10 03:38:40 +0000
+@@ -115,7 +115,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 xmlns=\"http://schemas.xmlsoap.org/ws/2003/06/secext\" URI=\"MBI\"></wsse:PolicyReference>" \
+@@ -198,7 +198,7 @@
+   "</soap:Body>" \
+ "</soap:Envelope>"
+ 
+-#define SOAP_MEMLIST_URL "http://contacts.msn.com/abservice/SharingService.asmx"
++#define SOAP_MEMLIST_URL "http://local-bay.contacts.msn.com/abservice/SharingService.asmx"
+ #define SOAP_MEMLIST_ACTION "http://www.msn.com/webservices/AddressBook/FindMembership"
+ 
+ #define SOAP_MEMLIST_PAYLOAD \
+@@ -233,7 +233,7 @@
+ int msn_soap_memlist_edit( struct im_connection *ic, const char *handle, gboolean add, int list );
+ 
+ 
+-#define SOAP_ADDRESSBOOK_URL "http://contacts.msn.com/abservice/abservice.asmx"
++#define SOAP_ADDRESSBOOK_URL "http://local-bay.contacts.msn.com/abservice/abservice.asmx"
+ #define SOAP_ADDRESSBOOK_ACTION "http://www.msn.com/webservices/AddressBook/ABFindAll"
+ 
+ #define SOAP_ADDRESSBOOK_PAYLOAD \
+
diff --git a/bitlbee.spec b/bitlbee.spec
index ab38c0d..c4dedbf 100644
--- a/bitlbee.spec
+++ b/bitlbee.spec
@@ -1,7 +1,7 @@
 Summary:           IRC to other chat networks gateway
 Name:              bitlbee
 Version:           3.0.3
-Release:           5%{?dist}
+Release:           6%{?dist}
 License:           GPLv2+ and MIT
 Group:             System Environment/Daemons
 URL:               http://www.bitlbee.org/
@@ -22,6 +22,8 @@ Patch4:            bitlbee-des3-implement.patch
 Patch5:            bitlbee-forkdaemon.patch
 # Reopened http://bugs.bitlbee.org/bitlbee/ticket/738
 Patch6:            bitlbee-systemd.patch
+# Fix MSN login - upstream bug #850, rev #823
+Patch7:            823_822.diff
 Requires(pre):     shadow-utils
 Requires(preun):   /sbin/service
 BuildRequires:     glib2-devel >= 2.4, libxslt
@@ -73,6 +75,7 @@ completely stable and not 100% foolproof so use at your own risk.
 %patch5 -p1
 %patch6 -p1
 %endif
+%patch7 -p1
 
 %build
 # Note that we cannot use openssl in Fedora packages ... it breaks GPL
@@ -193,6 +196,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Nov 11 2011 Adam Williamson <awilliam at redhat.com> - 3.0.3-6
+- 823_822.diff: fix MSN login (upstream rev #823)
+
 * Thu Aug 04 2011 Matěj Cepl <mcepl at redhat.com> - 3.0.3-5
 - Tiny typo in systemd units.