[Python-modules-commits] r19204 - in packages/papyon/trunk/debian (4 files)

[bigon at users.alioth.debian.org]

    Date: Wednesday, November 9, 2011 @ 10:34:17
  Author: bigon
Revision: 19204

* Add 01-bypass-url-redirect.patch patch to fix backtrace due to unexpected
  redirect (Closes: #648163)
* debian/control: Update Vcs-* fields to new URL

Added:
  packages/papyon/trunk/debian/patches/01-bypass-url-redirect.patch
Modified:
  packages/papyon/trunk/debian/changelog
  packages/papyon/trunk/debian/control
  packages/papyon/trunk/debian/patches/series

Modified: packages/papyon/trunk/debian/changelog
===================================================================
--- packages/papyon/trunk/debian/changelog	2011-11-09 07:05:29 UTC (rev 19203)
+++ packages/papyon/trunk/debian/changelog	2011-11-09 10:34:17 UTC (rev 19204)
@@ -1,3 +1,11 @@
+papyon (0.5.5-3) UNRELEASED; urgency=high
+
+  * Add 01-bypass-url-redirect.patch patch to fix backtrace due to unexpected
+    redirect (Closes: #648163)
+  * debian/control: Update Vcs-* fields to new URL
+
+ -- Laurent Bigonville <bigon at debian.org>  Wed, 09 Nov 2011 11:09:55 +0100
+
 papyon (0.5.5-2) unstable; urgency=low
 
   [ Devid Antonio Filoni ]

Modified: packages/papyon/trunk/debian/control
===================================================================
--- packages/papyon/trunk/debian/control	2011-11-09 07:05:29 UTC (rev 19203)
+++ packages/papyon/trunk/debian/control	2011-11-09 10:34:17 UTC (rev 19204)
@@ -9,8 +9,8 @@
 X-Python-Version: >= 2.5
 Standards-Version: 3.9.2
 Homepage: http://www.freedesktop.org/wiki/Software/papyon
-Vcs-Svn: svn://svn.debian.org/svn/python-modules/packages/papyon/trunk/
-Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/papyon/trunk/
+Vcs-Svn: svn://anonscm.debian.org/svn/python-modules/packages/papyon/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/papyon/trunk/
 
 Package: python-papyon
 Architecture: all

Added: packages/papyon/trunk/debian/patches/01-bypass-url-redirect.patch
===================================================================
--- packages/papyon/trunk/debian/patches/01-bypass-url-redirect.patch	                        (rev 0)
+++ packages/papyon/trunk/debian/patches/01-bypass-url-redirect.patch	2011-11-09 10:34:17 UTC (rev 19204)
@@ -0,0 +1,63 @@
+From 011201e47004538e732f247bfeb21634c6e1d97f Mon Sep 17 00:00:00 2001
+From: Mike Ruprecht <mike.ruprecht at collabora.co.uk>
+Date: Tue, 8 Nov 2011 05:29:03 -0600
+Subject: [PATCH] Fix login failure due to trying to interact to an obsolete
+ server
+
+The ABFindAll and FindMembership requests were getting HTTP 301
+Permanently Moved responses with empty ABFindAllResponse nodes.
+This was causing an assertion when trying to access a nonexistent
+part of the ABFindAllResponse packet and therefore impossible
+to log in.
+
+This patch replaces occurrences of the obsolete 'contacts.msn.com'
+with the preferred address (according to the responses) of
+'local-bay.contacts.msn.com'.
+---
+ papyon/service/description/AB/__init__.py          |    2 +-
+ papyon/service/description/Sharing/__init__.py     |    2 +-
+ .../SingleSignOn/RequestMultipleSecurityTokens.py  |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/papyon/service/description/AB/__init__.py b/papyon/service/description/AB/__init__.py
+index 48af7e2..2f116de 100644
+--- a/papyon/service/description/AB/__init__.py
++++ b/papyon/service/description/AB/__init__.py
+@@ -20,7 +20,7 @@
+ name = "AB"
+ description = "Hotmail address book service"
+ 
+-url = "http://contacts.msn.com/abservice/abservice.asmx"
++url = "http://local-bay.contacts.msn.com/abservice/abservice.asmx"
+ 
+ from constants import *
+ 
+diff --git a/papyon/service/description/Sharing/__init__.py b/papyon/service/description/Sharing/__init__.py
+index 20423c9..253c972 100644
+--- a/papyon/service/description/Sharing/__init__.py
++++ b/papyon/service/description/Sharing/__init__.py
+@@ -20,7 +20,7 @@
+ name = "Sharing"
+ description = "Membership address book service"
+ 
+-url = "http://contacts.msn.com/abservice/SharingService.asmx"
++url = "http://local-bay.contacts.msn.com/abservice/SharingService.asmx"
+ 
+ import FindMembership
+ import AddMember
+diff --git a/papyon/service/description/SingleSignOn/RequestMultipleSecurityTokens.py b/papyon/service/description/SingleSignOn/RequestMultipleSecurityTokens.py
+index 42d7497..af7b6f3 100644
+--- a/papyon/service/description/SingleSignOn/RequestMultipleSecurityTokens.py
++++ b/papyon/service/description/SingleSignOn/RequestMultipleSecurityTokens.py
+@@ -21,7 +21,7 @@
+ import xml.sax.saxutils as xml
+ 
+ class LiveService(object):
+-    CONTACTS = ("contacts.msn.com", "MBI")
++    CONTACTS = ("local-bay.contacts.msn.com", "MBI")
+     MESSENGER = ("messenger.msn.com", "?id=507")
+     MESSENGER_CLEAR = ("messengerclear.live.com", "MBI_KEY_OLD")
+     MESSENGER_SECURE = ("messengersecure.live.com", "MBI_SSL")
+-- 
+1.7.5.4
+

Modified: packages/papyon/trunk/debian/patches/series
===================================================================
--- packages/papyon/trunk/debian/patches/series	2011-11-09 07:05:29 UTC (rev 19203)
+++ packages/papyon/trunk/debian/patches/series	2011-11-09 10:34:17 UTC (rev 19204)
@@ -1 +1,2 @@
 00-twice_handle_QNG.diff
+01-bypass-url-redirect.patch