Hello community, here is the log from the commit of package python-nbxmpp for openSUSE:Factory checked in at 2019-02-01 11:47:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-nbxmpp (Old) and /work/SRC/openSUSE:Factory/.python-nbxmpp.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-nbxmpp" Fri Feb 1 11:47:33 2019 rev:21 rq:670270 version:0.6.9 Changes: -------- --- /work/SRC/openSUSE:Factory/python-nbxmpp/python-nbxmpp.changes 2018-11-19 23:34:16.627032369 +0100 +++ /work/SRC/openSUSE:Factory/.python-nbxmpp.new.28833/python-nbxmpp.changes 2019-02-01 11:48:18.568376014 +0100 @@ -1,0 +2,7 @@ +Thu Jan 31 07:51:28 UTC 2019 - [email protected] + +- Update to version 0.6.9 (boo#1123247): + * Always bind after SM failed Fixes #64 + * Dont try and guess system language + +------------------------------------------------------------------- Old: ---- nbxmpp-0.6.8.tar.gz New: ---- nbxmpp-0.6.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-nbxmpp.spec ++++++ --- /var/tmp/diff_new_pack.YLZFqg/_old 2019-02-01 11:48:19.096375472 +0100 +++ /var/tmp/diff_new_pack.YLZFqg/_new 2019-02-01 11:48:19.100375468 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-nbxmpp # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,14 +12,14 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define _name nbxmpp Name: python-nbxmpp -Version: 0.6.8 +Version: 0.6.9 Release: 0 Summary: XMPP library by Gajim team License: GPL-3.0-or-later ++++++ nbxmpp-0.6.8.tar.gz -> nbxmpp-0.6.9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbxmpp-0.6.8/ChangeLog new/nbxmpp-0.6.9/ChangeLog --- old/nbxmpp-0.6.8/ChangeLog 2018-10-07 11:50:04.000000000 +0200 +++ new/nbxmpp-0.6.9/ChangeLog 2019-01-08 22:08:10.000000000 +0100 @@ -1,3 +1,8 @@ +python-nbxmpp 0.6.9 (10 January 2019) + + * Always bind after SM failed Fixes #64 + * Dont try and guess system language + python-nbxmpp 0.6.8 (07 October 2018) * Reset SM counter after receiving <enabled> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbxmpp-0.6.8/PKG-INFO new/nbxmpp-0.6.9/PKG-INFO --- old/nbxmpp-0.6.8/PKG-INFO 2018-10-07 13:11:01.000000000 +0200 +++ new/nbxmpp-0.6.9/PKG-INFO 2019-01-08 22:09:00.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: nbxmpp -Version: 0.6.8 +Version: 0.6.9 Summary: Non blocking Jabber/XMPP module Home-page: http://dev.gajim.org/gajim/python-nbxmpp Author: Yann Leboulanger diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbxmpp-0.6.8/nbxmpp/__init__.py new/nbxmpp-0.6.9/nbxmpp/__init__.py --- old/nbxmpp-0.6.8/nbxmpp/__init__.py 2018-10-07 11:50:04.000000000 +0200 +++ new/nbxmpp-0.6.9/nbxmpp/__init__.py 2019-01-08 22:08:10.000000000 +0100 @@ -17,4 +17,4 @@ from .plugin import PlugIn from .smacks import Smacks -__version__ = "0.6.8" +__version__ = "0.6.9" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbxmpp-0.6.8/nbxmpp/bosh.py new/nbxmpp-0.6.9/nbxmpp/bosh.py --- old/nbxmpp-0.6.8/nbxmpp/bosh.py 2018-05-02 13:56:23.000000000 +0200 +++ new/nbxmpp-0.6.9/nbxmpp/bosh.py 2019-01-08 22:08:10.000000000 +0100 @@ -44,10 +44,7 @@ idlequeue, estabilish_tls, certs, tls_version, cipher_list) self.bosh_sid = None - if locale.getdefaultlocale()[0]: - self.bosh_xml_lang = locale.getdefaultlocale()[0].split('_')[0] - else: - self.bosh_xml_lang = 'en' + self.bosh_xml_lang = self._owner.lang self.http_version = 'HTTP/1.1' self.http_persistent = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbxmpp-0.6.8/nbxmpp/client_nb.py new/nbxmpp-0.6.9/nbxmpp/client_nb.py --- old/nbxmpp-0.6.8/nbxmpp/client_nb.py 2018-05-19 20:52:45.000000000 +0200 +++ new/nbxmpp-0.6.9/nbxmpp/client_nb.py 2019-01-08 22:08:10.000000000 +0100 @@ -37,7 +37,7 @@ handling, whereas underlying modules take care of feature-specific logic """ - def __init__(self, domain, idlequeue, caller=None): + def __init__(self, domain, idlequeue, caller=None, lang='en'): """ Caches connection data @@ -48,6 +48,7 @@ """ self.Namespace = protocol.NS_CLIENT self.defaultNamespace = self.Namespace + self.lang = lang self.idlequeue = idlequeue self.disconnect_handlers = [] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbxmpp-0.6.8/nbxmpp/dispatcher_nb.py new/nbxmpp-0.6.9/nbxmpp/dispatcher_nb.py --- old/nbxmpp-0.6.8/nbxmpp/dispatcher_nb.py 2018-08-18 14:11:55.000000000 +0200 +++ new/nbxmpp-0.6.9/nbxmpp/dispatcher_nb.py 2019-01-08 22:08:10.000000000 +0100 @@ -194,9 +194,7 @@ self._metastream.setAttr('version', '1.0') self._metastream.setAttr('xmlns:stream', NS_STREAMS) self._metastream.setAttr('to', self._owner.Server) - if locale.getdefaultlocale()[0]: - self._metastream.setAttr('xml:lang', - locale.getdefaultlocale()[0].split('_')[0]) + self._metastream.setAttr('xml:lang', self._owner.lang) self._owner.send("%s%s>" % (XML_DECLARATION, str(self._metastream)[:-2])) def _check_stream_start(self, ns, tag, attrs): @@ -623,9 +621,7 @@ self._metastream.setAttr('version', '1.0') self._metastream.setAttr('xmlns:stream', NS_STREAMS) self._metastream.setAttr('to', self._owner.Server) - if locale.getdefaultlocale()[0]: - self._metastream.setAttr('xml:lang', - locale.getdefaultlocale()[0].split('_')[0]) + self._metastream.setAttr('xml:lang', self._owner.lang) self.restart = True self._owner.Connection.send_init(after_SASL=self.after_SASL) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbxmpp-0.6.8/nbxmpp/smacks.py new/nbxmpp-0.6.9/nbxmpp/smacks.py --- old/nbxmpp-0.6.8/nbxmpp/smacks.py 2018-10-07 11:50:04.000000000 +0200 +++ new/nbxmpp-0.6.9/nbxmpp/smacks.py 2019-01-08 22:08:10.000000000 +0100 @@ -184,43 +184,36 @@ self.old_uqueue = [] def error_handling(self, disp, stanza): - # If the server doesn't recognize previd, forget about resuming - # Ask for service discovery, etc.. - if stanza.getTag('item-not-found'): - self.resuming = False - self.enabled = False - # we need to bind a resource - self._owner.NonBlockingBind.resuming = False - self._owner.Dispatcher.Event(NS_STREAM_MGMT, 'RESUME FAILED', None) - self._owner._on_auth_bind(None) - self.failed_resume = True - - h = stanza.getAttr('h') - log.info('Session resumption failed (item-not-found), server h: %s' % str(h)) - if not h: - return - #prepare old_queue to contain only unacked stanzas for later resend (which is happening after our session is established properly) - h = int(h) - diff = self.out_h - h - - if diff < 0: - log.error('Server and client number of stanzas handled mismatch on session resumption (our h: %d, server h: %d, #queue: %d)' % (self.out_h, h, len(self.old_uqueue))) - self.old_uqueue = [] #that's weird, but we don't resend this stanzas if the server says we don't need to - elif len(self.old_uqueue) < diff: - log.error('Server and client number of stanzas handled mismatch on session resumption (our h: %d, server h: %d, #queue: %d)' % (self.out_h, h, len(self.old_uqueue))) - else: - log.info('Removing %d already acked stanzas from old outgoing queue (our h: %d, server h: %d, #queue: %d, remaining in queue: %d)' % (len(self.old_uqueue) - diff, self.out_h, h, len(self.old_uqueue), diff)) - while (len(self.old_uqueue) > diff): - self.old_uqueue.pop(0) - return - # Doesn't support resumption if stanza.getTag('feature-not-implemented'): log.info('Session resumption failed (feature-not-implemented)') self.negociate(False) return - if stanza.getTag('unexpected-request'): - log.error('Gajim failed to negociate Stream Management') - self.enabled = False + # If the server doesn't recognize previd, forget about resuming + # Ask for service discovery, etc.. + self.resuming = False + self.enabled = False + # we need to bind a resource + self._owner.NonBlockingBind.resuming = False + self._owner.Dispatcher.Event(NS_STREAM_MGMT, 'RESUME FAILED', None) + self._owner._on_auth_bind(None) + self.failed_resume = True + + h = stanza.getAttr('h') + log.info('Session resumption failed, server h: %s' % str(h)) + if not h: return + #prepare old_queue to contain only unacked stanzas for later resend (which is happening after our session is established properly) + h = int(h) + diff = self.out_h - h + + if diff < 0: + log.error('Server and client number of stanzas handled mismatch on session resumption (our h: %d, server h: %d, #queue: %d)' % (self.out_h, h, len(self.old_uqueue))) + self.old_uqueue = [] #that's weird, but we don't resend this stanzas if the server says we don't need to + elif len(self.old_uqueue) < diff: + log.error('Server and client number of stanzas handled mismatch on session resumption (our h: %d, server h: %d, #queue: %d)' % (self.out_h, h, len(self.old_uqueue))) + else: + log.info('Removing %d already acked stanzas from old outgoing queue (our h: %d, server h: %d, #queue: %d, remaining in queue: %d)' % (len(self.old_uqueue) - diff, self.out_h, h, len(self.old_uqueue), diff)) + while (len(self.old_uqueue) > diff): + self.old_uqueue.pop(0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbxmpp-0.6.8/setup.py new/nbxmpp-0.6.9/setup.py --- old/nbxmpp-0.6.8/setup.py 2018-10-07 11:50:04.000000000 +0200 +++ new/nbxmpp-0.6.9/setup.py 2019-01-08 22:08:10.000000000 +0100 @@ -3,7 +3,7 @@ from distutils.core import setup setup(name='nbxmpp', - version='0.6.8', + version='0.6.9', description='Non blocking Jabber/XMPP module', author='Yann Leboulanger', author_email='[email protected]',
