[Python-modules-commits] r19210 - in packages/papyon/tags (7 files)
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Thu Nov 10 08:32:51 UTC 2011
Date: Thursday, November 10, 2011 @ 08:32:49
Author: bigon
Revision: 19210
[svn-buildpackage] Tagging papyon 0.5.5-3
Added:
packages/papyon/tags/0.5.5-3/
packages/papyon/tags/0.5.5-3/debian/changelog
(from rev 19209, packages/papyon/trunk/debian/changelog)
packages/papyon/tags/0.5.5-3/debian/patches/01-add-redirect-support.patch
(from rev 19208, packages/papyon/trunk/debian/patches/01-add-redirect-support.patch)
packages/papyon/tags/0.5.5-3/debian/patches/series
(from rev 19208, packages/papyon/trunk/debian/patches/series)
Deleted:
packages/papyon/tags/0.5.5-3/debian/changelog
packages/papyon/tags/0.5.5-3/debian/patches/01-bypass-url-redirect.patch
packages/papyon/tags/0.5.5-3/debian/patches/series
Deleted: packages/papyon/tags/0.5.5-3/debian/changelog
===================================================================
--- packages/papyon/trunk/debian/changelog 2011-11-09 10:34:17 UTC (rev 19204)
+++ packages/papyon/tags/0.5.5-3/debian/changelog 2011-11-10 08:32:49 UTC (rev 19210)
@@ -1,159 +0,0 @@
-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 ]
- * Add 00-twice_handle_QNG.diff patch to fix a nasty bug in MSNP
- notification. Thanks to c10ud for this.
-
- -- Devid Antonio Filoni <d.filoni at ubuntu.com> Sat, 23 Apr 2011 10:28:04 +0200
-
-papyon (0.5.5-1) unstable; urgency=low
-
- [ Laurent Bigonville ]
- * debian/rules:
- - Use python2 sequence
- * debian/control:
- - Drop python-support build-dependency
- - Bump python build-dependency to >= 2.6.6-3~
- - Bump Standards-Version to 3.9.2 (no further changes)
- - Drop XB-Python-Version
-
- -- Devid Antonio Filoni <d.filoni at ubuntu.com> Sat, 16 Apr 2011 10:31:35 +0200
-
-papyon (0.5.4-2) unstable; urgency=low
-
- * Upload to unstable.
-
- -- Devid Antonio Filoni <d.filoni at ubuntu.com> Fri, 04 Mar 2011 19:53:48 +0100
-
-papyon (0.5.4-1) experimental; urgency=low
-
- * New upstream release
-
- -- Laurent Bigonville <bigon at debian.org> Thu, 30 Dec 2010 18:29:03 +0100
-
-papyon (0.5.2-1) experimental; urgency=low
-
- * New upstream release
- - Fix connection to MSN (Closes: #600928)
-
- -- Laurent Bigonville <bigon at debian.org> Thu, 21 Oct 2010 23:42:39 +0200
-
-papyon (0.4.10-1) unstable; urgency=high
-
- * New upstream release
- - Fix connection to MSN (Closes: #600928)
- * debian/control:
- - Update Homepage URL
- - Bump Standards-Version to 3.9.1 (no further changes)
- * debian/watch: Update URL
-
- -- Laurent Bigonville <bigon at debian.org> Thu, 21 Oct 2010 23:07:19 +0200
-
-papyon (0.5.1-1) experimental; urgency=low
-
- * New upstream release.
-
- -- Devid Antonio Filoni <d.filoni at ubuntu.com> Wed, 15 Sep 2010 16:04:07 +0200
-
-papyon (0.5.0-1) experimental; urgency=low
-
- * New upstream release
- * debian/control:
- - Update Homepage URL
- - Bump Standards-Version to 3.9.1 (no further changes)
- * debian/watch: Update URL
-
- -- Laurent Bigonville <bigon at debian.org> Thu, 19 Aug 2010 16:32:28 +0200
-
-papyon (0.4.9-1) unstable; urgency=low
-
- * New upstream release
- - Initial file transfert support
- * debian/control:
- - Bump Standards-Version to 3.9.0 (no further changes)
- - Add XB-Python-Version field
-
- -- Laurent Bigonville <bigon at debian.org> Sat, 10 Jul 2010 18:42:38 +0200
-
-papyon (0.4.8-1) unstable; urgency=low
-
- * New upstream release
-
- -- Laurent Bigonville <bigon at debian.org> Fri, 28 May 2010 15:01:57 +0200
-
-papyon (0.4.7-1) unstable; urgency=low
-
- * New upstream release
- - debian/control: Add python-crypto {build-}dependency
- * Add myself as Uploaders
-
- -- Laurent Bigonville <bigon at debian.org> Sun, 23 May 2010 00:51:43 +0200
-
-papyon (0.4.5-1) unstable; urgency=low
-
- * New upstream release.
- * Update debian/copyright.
-
- -- Devid Antonio Filoni <d.filoni at ubuntu.com> Mon, 15 Mar 2010 15:30:45 +0100
-
-papyon (0.4.4-1) unstable; urgency=low
-
- * New upstream release.
- * debian/rules: remove override_dh_auto_install target, not needed anymore.
- * debian/control: update python-gobject to >= 2.10 in Build-Depends and
- Depends fields.
- * debian/control: update python-openssl to >= 0.6 in Build-Depends and
- Depends fields.
- * Update Debian packaging copyright.
- * debian/control: remove python (>= 2.5) from Depends field.
- * Bump Standards-Version to 3.8.4.
-
- -- Devid Antonio Filoni <d.filoni at ubuntu.com> Sat, 30 Jan 2010 14:10:58 +0100
-
-papyon (0.4.3-1) unstable; urgency=low
-
- * New upstream release.
- * debian/control: add python-farsight to Depends field.
- * debian/copyright: add Olivier Lê Thanh Duong to Upstream Authors field.
-
- -- Devid Antonio Filoni <d.filoni at ubuntu.com> Tue, 13 Oct 2009 18:00:46 +0200
-
-papyon (0.4.2-1) unstable; urgency=low
-
- * New upstream release.
- * debian/control: remove python-crypto from Build-Depends-Indep and Depends
- fields, papyon does not depend on it anymore.
- * debian/control: add missing Provides field.
- * debian/control: add python-gst0.10 to Depends field.
- * debian/control: move python (>= 2.5), python-gobject, python-openssl from
- Build-Depends-Indep to Build-Depends field, they are needed in clean rule.
- * debian/rules: do not install useless/wrong files.
- * Update debian/copyright.
- * Bump Standards-Version to 3.8.3.
-
- -- Devid Antonio Filoni <d.filoni at ubuntu.com> Tue, 08 Sep 2009 19:34:10 +0200
-
-papyon (0.4.1-1) unstable; urgency=low
-
- * New upstream release.
- * debian/copyright: add pyiso8601 license and copyright.
- * debian/control: modify XS-Python-Version to >= 2.5, python-gobject
- doesn't provide extensions for Python 2.4 anymore.
- * debian/control: remove python-elementtree from Depends and
- Build-Depends-Indep fields.
-
- -- Devid Antonio Filoni <d.filoni at ubuntu.com> Mon, 10 Aug 2009 16:26:39 +0200
-
-papyon (0.4.0-1) unstable; urgency=low
-
- * Initial release (Closes: #535701).
-
- -- Devid Antonio Filoni <d.filoni at ubuntu.com> Sun, 05 Jul 2009 17:46:03 +0200
Copied: packages/papyon/tags/0.5.5-3/debian/changelog (from rev 19209, packages/papyon/trunk/debian/changelog)
===================================================================
--- packages/papyon/tags/0.5.5-3/debian/changelog (rev 0)
+++ packages/papyon/tags/0.5.5-3/debian/changelog 2011-11-10 08:32:49 UTC (rev 19210)
@@ -0,0 +1,159 @@
+papyon (0.5.5-3) unstable; urgency=high
+
+ * High urgency as MSN connection is broken in testing
+ * Add 01-add-redirect-support.patch to add redirect support (Closes: #648163)
+ * debian/control: Update Vcs-* fields to new URL
+
+ -- Laurent Bigonville <bigon at debian.org> Thu, 10 Nov 2011 09:22:57 +0100
+
+papyon (0.5.5-2) unstable; urgency=low
+
+ [ Devid Antonio Filoni ]
+ * Add 00-twice_handle_QNG.diff patch to fix a nasty bug in MSNP
+ notification. Thanks to c10ud for this.
+
+ -- Devid Antonio Filoni <d.filoni at ubuntu.com> Sat, 23 Apr 2011 10:28:04 +0200
+
+papyon (0.5.5-1) unstable; urgency=low
+
+ [ Laurent Bigonville ]
+ * debian/rules:
+ - Use python2 sequence
+ * debian/control:
+ - Drop python-support build-dependency
+ - Bump python build-dependency to >= 2.6.6-3~
+ - Bump Standards-Version to 3.9.2 (no further changes)
+ - Drop XB-Python-Version
+
+ -- Devid Antonio Filoni <d.filoni at ubuntu.com> Sat, 16 Apr 2011 10:31:35 +0200
+
+papyon (0.5.4-2) unstable; urgency=low
+
+ * Upload to unstable.
+
+ -- Devid Antonio Filoni <d.filoni at ubuntu.com> Fri, 04 Mar 2011 19:53:48 +0100
+
+papyon (0.5.4-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Laurent Bigonville <bigon at debian.org> Thu, 30 Dec 2010 18:29:03 +0100
+
+papyon (0.5.2-1) experimental; urgency=low
+
+ * New upstream release
+ - Fix connection to MSN (Closes: #600928)
+
+ -- Laurent Bigonville <bigon at debian.org> Thu, 21 Oct 2010 23:42:39 +0200
+
+papyon (0.4.10-1) unstable; urgency=high
+
+ * New upstream release
+ - Fix connection to MSN (Closes: #600928)
+ * debian/control:
+ - Update Homepage URL
+ - Bump Standards-Version to 3.9.1 (no further changes)
+ * debian/watch: Update URL
+
+ -- Laurent Bigonville <bigon at debian.org> Thu, 21 Oct 2010 23:07:19 +0200
+
+papyon (0.5.1-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Devid Antonio Filoni <d.filoni at ubuntu.com> Wed, 15 Sep 2010 16:04:07 +0200
+
+papyon (0.5.0-1) experimental; urgency=low
+
+ * New upstream release
+ * debian/control:
+ - Update Homepage URL
+ - Bump Standards-Version to 3.9.1 (no further changes)
+ * debian/watch: Update URL
+
+ -- Laurent Bigonville <bigon at debian.org> Thu, 19 Aug 2010 16:32:28 +0200
+
+papyon (0.4.9-1) unstable; urgency=low
+
+ * New upstream release
+ - Initial file transfert support
+ * debian/control:
+ - Bump Standards-Version to 3.9.0 (no further changes)
+ - Add XB-Python-Version field
+
+ -- Laurent Bigonville <bigon at debian.org> Sat, 10 Jul 2010 18:42:38 +0200
+
+papyon (0.4.8-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Laurent Bigonville <bigon at debian.org> Fri, 28 May 2010 15:01:57 +0200
+
+papyon (0.4.7-1) unstable; urgency=low
+
+ * New upstream release
+ - debian/control: Add python-crypto {build-}dependency
+ * Add myself as Uploaders
+
+ -- Laurent Bigonville <bigon at debian.org> Sun, 23 May 2010 00:51:43 +0200
+
+papyon (0.4.5-1) unstable; urgency=low
+
+ * New upstream release.
+ * Update debian/copyright.
+
+ -- Devid Antonio Filoni <d.filoni at ubuntu.com> Mon, 15 Mar 2010 15:30:45 +0100
+
+papyon (0.4.4-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/rules: remove override_dh_auto_install target, not needed anymore.
+ * debian/control: update python-gobject to >= 2.10 in Build-Depends and
+ Depends fields.
+ * debian/control: update python-openssl to >= 0.6 in Build-Depends and
+ Depends fields.
+ * Update Debian packaging copyright.
+ * debian/control: remove python (>= 2.5) from Depends field.
+ * Bump Standards-Version to 3.8.4.
+
+ -- Devid Antonio Filoni <d.filoni at ubuntu.com> Sat, 30 Jan 2010 14:10:58 +0100
+
+papyon (0.4.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control: add python-farsight to Depends field.
+ * debian/copyright: add Olivier Lê Thanh Duong to Upstream Authors field.
+
+ -- Devid Antonio Filoni <d.filoni at ubuntu.com> Tue, 13 Oct 2009 18:00:46 +0200
+
+papyon (0.4.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control: remove python-crypto from Build-Depends-Indep and Depends
+ fields, papyon does not depend on it anymore.
+ * debian/control: add missing Provides field.
+ * debian/control: add python-gst0.10 to Depends field.
+ * debian/control: move python (>= 2.5), python-gobject, python-openssl from
+ Build-Depends-Indep to Build-Depends field, they are needed in clean rule.
+ * debian/rules: do not install useless/wrong files.
+ * Update debian/copyright.
+ * Bump Standards-Version to 3.8.3.
+
+ -- Devid Antonio Filoni <d.filoni at ubuntu.com> Tue, 08 Sep 2009 19:34:10 +0200
+
+papyon (0.4.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/copyright: add pyiso8601 license and copyright.
+ * debian/control: modify XS-Python-Version to >= 2.5, python-gobject
+ doesn't provide extensions for Python 2.4 anymore.
+ * debian/control: remove python-elementtree from Depends and
+ Build-Depends-Indep fields.
+
+ -- Devid Antonio Filoni <d.filoni at ubuntu.com> Mon, 10 Aug 2009 16:26:39 +0200
+
+papyon (0.4.0-1) unstable; urgency=low
+
+ * Initial release (Closes: #535701).
+
+ -- Devid Antonio Filoni <d.filoni at ubuntu.com> Sun, 05 Jul 2009 17:46:03 +0200
Copied: packages/papyon/tags/0.5.5-3/debian/patches/01-add-redirect-support.patch (from rev 19208, packages/papyon/trunk/debian/patches/01-add-redirect-support.patch)
===================================================================
--- packages/papyon/tags/0.5.5-3/debian/patches/01-add-redirect-support.patch (rev 0)
+++ packages/papyon/tags/0.5.5-3/debian/patches/01-add-redirect-support.patch 2011-11-10 08:32:49 UTC (rev 19210)
@@ -0,0 +1,147 @@
+From: Louis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne at collabora.co.uk>
+Date: Tue, 08 Nov 2011 16:56:02 +0000
+Subject: bugfix: use the right server for AB and Sharing services and allow HTTP redirection (fdo #42689)
+
+---
+--- a/papyon/gnet/parser.py
++++ b/papyon/gnet/parser.py
+@@ -212,4 +212,3 @@
+ response.parse(self._receive_buffer)
+ self.emit("received", response)
+ self._reset_state()
+-
+--- a/papyon/gnet/protocol/HTTP.py
++++ b/papyon/gnet/protocol/HTTP.py
+@@ -25,6 +25,8 @@
+ from papyon.gnet.parser import HTTPParser
+ from papyon.gnet.proxy.factory import ProxyFactory
+
++from urlparse import urlsplit
++
+ import gobject
+ import base64
+ import logging
+@@ -71,7 +73,10 @@
+ self._transport = None
+ self._http_parser = None
+ self._outgoing_queue = []
++ self._redirected = False
+ self._waiting_response = False
++ self._parser_handles = []
++ self._transport_handles = []
+
+ if self._proxies and self._proxies.get('http', None):
+ if self._proxies['http'].type == 'http':
+@@ -100,17 +105,32 @@
+
+ def _setup_parser(self):
+ self._http_parser = HTTPParser(self._transport)
+- self._http_parser.connect("received", self._on_response_received)
+- self._transport.connect("notify::status", self._on_status_change)
+- self._transport.connect("error", self._on_error)
+- self._transport.connect("sent", self._on_request_sent)
++ self._parser_handles.append(self._http_parser.connect("received",
++ self._on_response_received))
++
++ self._transport_handles.append(self._transport.connect("notify::status",
++ self._on_status_change))
++ self._transport_handles.append(self._transport.connect("error",
++ self._on_error))
++ self._transport_handles.append(self._transport.connect("sent",
++ self._on_request_sent))
++
++ def _clean_transport(self):
++ if self._http_parser:
++ self._http_parser.disable()
++ for handle in self._parser_handles:
++ self._http_parser.disconnect(handle)
++ self._http_parser = None
++ if self._transport:
++ for handle in self._transport_handles:
++ self._transport.disconnect(handle)
+
+ def _on_status_change(self, transport, param):
+ if transport.get_property("status") == IoStatus.OPEN:
+ self._process_queue()
+ elif transport.get_property("status") == IoStatus.CLOSED and\
+ (self._waiting_response or len(self._outgoing_queue) > 0) and\
+- not self._errored:
++ not (self._errored or self._redirected):
+ self._waiting_response = False
+ self._setup_transport()
+
+@@ -124,23 +144,30 @@
+ return
+ if not self._waiting_response:
+ logger.warning("Received response but wasn't waiting for one")
++ logger.warning("<<< " + str(response))
+ return
+- #if response.status in (301, 302): # UNTESTED: please test
+- # location = response.headers['Location']
+
+- # location = location.rsplit("://", 1)
+- # if len(location) == 2:
+- # scheme = location[0]
+- # location = location[1]
+- # if scheme == "http":
+- # location = location.rsplit(":", 1)
+- # self._host = location[0]
+- # if len(location) == 2:
+- # self._port = int(location[1])
+- # self._outgoing_queue[0].headers['Host'] = response.headers['Location']
+- # self._setup_transport()
+- # return
+ self._waiting_response = False
++
++ if response.status in (301, 302):
++ self.close()
++ location = response.headers['Location']
++ logger.info("Server moved to %s" % location)
++ logger.info("<<< " + str(response))
++
++ protocol, host, path, query, fragment = urlsplit(location)
++ self._redirected = True
++ self._outgoing_queue[0].headers['Host'] = host
++ try:
++ host, port = host.rsplit(":", 1)
++ port = int(port)
++ except:
++ port = None
++ self._host = host
++ self._redirected = False
++ self._setup_transport()
++ return
++
+ if len(self._outgoing_queue) > 0:
+ self._outgoing_queue.pop(0) # pop the request from the queue
+ if response.status >= 400:
+@@ -186,5 +213,7 @@
+ self._process_queue()
+
+ def close(self):
++ self._clean_transport()
+ if self._transport:
+ self._transport.close()
++ self._transport = None
+--- 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 = "https://omega.contacts.msn.com/abservice/abservice.asmx"
+
+ from constants import *
+
+--- 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 = "https://omega.contacts.msn.com/abservice/SharingService.asmx"
+
+ import FindMembership
+ import AddMember
Deleted: packages/papyon/tags/0.5.5-3/debian/patches/01-bypass-url-redirect.patch
===================================================================
--- packages/papyon/trunk/debian/patches/01-bypass-url-redirect.patch 2011-11-09 10:34:17 UTC (rev 19204)
+++ packages/papyon/tags/0.5.5-3/debian/patches/01-bypass-url-redirect.patch 2011-11-10 08:32:49 UTC (rev 19210)
@@ -1,63 +0,0 @@
-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
-
Deleted: packages/papyon/tags/0.5.5-3/debian/patches/series
===================================================================
--- packages/papyon/trunk/debian/patches/series 2011-11-09 10:34:17 UTC (rev 19204)
+++ packages/papyon/tags/0.5.5-3/debian/patches/series 2011-11-10 08:32:49 UTC (rev 19210)
@@ -1,2 +0,0 @@
-00-twice_handle_QNG.diff
-01-bypass-url-redirect.patch
Copied: packages/papyon/tags/0.5.5-3/debian/patches/series (from rev 19208, packages/papyon/trunk/debian/patches/series)
===================================================================
--- packages/papyon/tags/0.5.5-3/debian/patches/series (rev 0)
+++ packages/papyon/tags/0.5.5-3/debian/patches/series 2011-11-10 08:32:49 UTC (rev 19210)
@@ -0,0 +1,2 @@
+00-twice_handle_QNG.diff
+01-add-redirect-support.patch
More information about the Python-modules-commits
mailing list