Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package python-nbxmpp for openSUSE:Factory 
checked in at 2022-11-01 13:42:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-nbxmpp (Old)
 and      /work/SRC/openSUSE:Factory/.python-nbxmpp.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-nbxmpp"

Tue Nov  1 13:42:26 2022 rev:36 rq:1032517 version:3.2.5

Changes:
--------
--- /work/SRC/openSUSE:Factory/python-nbxmpp/python-nbxmpp.changes      
2022-10-11 18:04:48.954013622 +0200
+++ /work/SRC/openSUSE:Factory/.python-nbxmpp.new.2275/python-nbxmpp.changes    
2022-11-01 13:42:37.491914160 +0100
@@ -1,0 +2,8 @@
+Mon Oct 31 11:23:23 UTC 2022 - Alexei Sorokin <sor.ale...@meowr.ru>
+
+- Update to version 3.2.5:
+  * Add support for XEP-0421.
+  * MUC: Check correctly for muc subject.
+  * Client: Don???t override modified certification errors.
+
+-------------------------------------------------------------------

Old:
----
  python-nbxmpp-3.2.4.tar.bz2

New:
----
  python-nbxmpp-3.2.5.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-nbxmpp.spec ++++++
--- /var/tmp/diff_new_pack.WniIwu/_old  2022-11-01 13:42:37.959916649 +0100
+++ /var/tmp/diff_new_pack.WniIwu/_new  2022-11-01 13:42:37.963916671 +0100
@@ -22,7 +22,7 @@
 %define skip_python38 1
 %define _name   nbxmpp
 Name:           python-nbxmpp
-Version:        3.2.4
+Version:        3.2.5
 Release:        0
 Summary:        XMPP library by Gajim team
 License:        GPL-3.0-or-later

++++++ python-nbxmpp-3.2.4.tar.bz2 -> python-nbxmpp-3.2.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/python-nbxmpp-3.2.4/ChangeLog 
new/python-nbxmpp-3.2.5/ChangeLog
--- old/python-nbxmpp-3.2.4/ChangeLog   2022-10-08 16:37:57.000000000 +0200
+++ new/python-nbxmpp-3.2.5/ChangeLog   2022-10-31 11:49:38.000000000 +0100
@@ -1,3 +1,14 @@
+nbxmpp 3.2.5 (26 Oct 2022)
+
+  New
+
+  * Add support for XEP-0421
+
+  Bug Fixes
+
+  * MUC: Check correctly for muc subject
+  * Client: Don???t override modified certification errors
+
 nbxmpp 3.2.4 (05 Oct 2022)
 
   Improvements
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/python-nbxmpp-3.2.4/nbxmpp/__init__.py 
new/python-nbxmpp-3.2.5/nbxmpp/__init__.py
--- old/python-nbxmpp-3.2.4/nbxmpp/__init__.py  2022-10-08 16:37:57.000000000 
+0200
+++ new/python-nbxmpp-3.2.5/nbxmpp/__init__.py  2022-10-31 11:49:38.000000000 
+0100
@@ -4,4 +4,4 @@
 
 gi.require_version('Soup', '2.4')
 
-__version__: str = '3.2.4'
+__version__: str = '3.2.5'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/python-nbxmpp-3.2.4/nbxmpp/client.py 
new/python-nbxmpp-3.2.5/nbxmpp/client.py
--- old/python-nbxmpp-3.2.4/nbxmpp/client.py    2022-10-08 16:37:57.000000000 
+0200
+++ new/python-nbxmpp-3.2.5/nbxmpp/client.py    2022-10-31 11:49:38.000000000 
+0100
@@ -232,6 +232,8 @@
 
     @property
     def peer_certificate(self):
+        if self._con is not None:
+            return self._con.peer_certificate
         return self._peer_certificate, self._peer_certificate_errors
 
     @property
@@ -360,6 +362,8 @@
             return
 
         self.state = StreamState.CONNECTING
+        self._peer_certificate = None
+        self._peer_certificate_errors = None
         self._reset_error()
 
         self._con = self._get_connection(self._log_context,
@@ -375,7 +379,6 @@
         self._con.subscribe('data-sent', self._on_data_sent)
         self._con.subscribe('data-received', self._on_data_received)
         self._con.subscribe('bad-certificate', self._on_bad_certificate)
-        self._con.subscribe('certificate-set', self._on_certificate_set)
         self._con.connect()
 
     def _get_connection(self, *args):
@@ -537,12 +540,9 @@
             connection.peer_certificate
         self._set_error(StreamError.BAD_CERTIFICATE, 'bad certificate')
 
-    def _on_certificate_set(self, connection, _signal_name):
-        self._peer_certificate, self._peer_certificate_errors = \
-            connection.peer_certificate
-
     def accept_certificate(self):
         self._log.info('Certificate accepted')
+        assert self._peer_certificate is not None
         self._accepted_certificates.append(self._peer_certificate)
         self._connect()
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/python-nbxmpp-3.2.4/nbxmpp/connection.py 
new/python-nbxmpp-3.2.5/nbxmpp/connection.py
--- old/python-nbxmpp-3.2.4/nbxmpp/connection.py        2022-10-08 
16:37:57.000000000 +0200
+++ new/python-nbxmpp-3.2.5/nbxmpp/connection.py        2022-10-31 
11:49:38.000000000 +0100
@@ -37,7 +37,6 @@
         data-sent
         data-received
         bad-certificate
-        certificate-set
         connection-failed
         disconnected
     '''
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/python-nbxmpp-3.2.4/nbxmpp/modules/muc/muc.py 
new/python-nbxmpp-3.2.5/nbxmpp/modules/muc/muc.py
--- old/python-nbxmpp-3.2.4/nbxmpp/modules/muc/muc.py   2022-10-08 
16:37:57.000000000 +0200
+++ new/python-nbxmpp-3.2.5/nbxmpp/modules/muc/muc.py   2022-10-31 
11:49:38.000000000 +0100
@@ -116,6 +116,12 @@
         properties.muc_jid = properties.jid.new_as_bare()
         properties.muc_nickname = properties.jid.resource
 
+        occupant_id = stanza.getTagAttr('occupant-id',
+                                        'id',
+                                        namespace=Namespace.OCCUPANT_ID)
+
+        properties.occupant_id = occupant_id
+
     def _process_muc_user_presence(self, _client, stanza, properties):
         muc_user = stanza.getTag('x', namespace=Namespace.MUC_USER)
         if muc_user is None:
@@ -123,6 +129,13 @@
         properties.from_muc = True
         properties.muc_jid = properties.jid.new_as_bare()
 
+
+        occupant_id = stanza.getTagAttr('occupant-id',
+                                        'id',
+                                        namespace=Namespace.OCCUPANT_ID)
+
+        properties.occupant_id = occupant_id
+
         destroy = muc_user.getTag('destroy')
         if destroy is not None:
             alternate = destroy.getAttr('jid')
@@ -192,6 +205,12 @@
         properties.muc_jid = properties.jid.new_as_bare()
         properties.muc_nickname = properties.jid.resource
 
+        occupant_id = stanza.getTagAttr('occupant-id',
+                                        'id',
+                                        namespace=Namespace.OCCUPANT_ID)
+
+        properties.occupant_id = occupant_id
+
         muc_user = stanza.getTag('x', namespace=Namespace.MUC_USER)
         if muc_user is not None:
             try:
@@ -209,7 +228,7 @@
                 properties.muc_ofrom = JID.from_string(address.getAttr('jid'))
 
     def _process_message_after_decryption(self, _client, _stanza, properties):
-        if properties.body is None and properties.subject:
+        if properties.body is None and properties.subject is not None:
             properties.muc_subject = MucSubject(
                 text=properties.subject,
                 author=properties.muc_nickname,
@@ -220,6 +239,12 @@
         if muc_user is None:
             return
 
+        occupant_id = stanza.getTagAttr('occupant-id',
+                                        'id',
+                                        namespace=Namespace.OCCUPANT_ID)
+
+        properties.occupant_id = occupant_id
+
         # MUC Private message
         if (properties.type.is_chat or
                 properties.type.is_error and
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/python-nbxmpp-3.2.4/nbxmpp/namespaces.py 
new/python-nbxmpp-3.2.5/nbxmpp/namespaces.py
--- old/python-nbxmpp-3.2.4/nbxmpp/namespaces.py        2022-10-08 
16:37:57.000000000 +0200
+++ new/python-nbxmpp-3.2.5/nbxmpp/namespaces.py        2022-10-31 
11:49:38.000000000 +0100
@@ -114,6 +114,7 @@
     MUC_REQUEST: str = 'http://jabber.org/protocol/muc#request'
     MUC_INFO: str = 'http://jabber.org/protocol/muc#roominfo'
     NICK: str = 'http://jabber.org/protocol/nick'
+    OCCUPANT_ID: str = 'urn:xmpp:occupant-id:0'
     OMEMO_TEMP: str = 'eu.siacs.conversations.axolotl'
     OMEMO_TEMP_BUNDLE: str = 'eu.siacs.conversations.axolotl.bundles'
     OMEMO_TEMP_DL: str = 'eu.siacs.conversations.axolotl.devicelist'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/python-nbxmpp-3.2.4/nbxmpp/structs.py 
new/python-nbxmpp-3.2.5/nbxmpp/structs.py
--- old/python-nbxmpp-3.2.4/nbxmpp/structs.py   2022-10-08 16:37:57.000000000 
+0200
+++ new/python-nbxmpp-3.2.5/nbxmpp/structs.py   2022-10-31 11:49:38.000000000 
+0100
@@ -226,7 +226,7 @@
 
 
 class OMEMOMessage(NamedTuple):
-    sid: str
+    sid: int
     iv: bytes
     keys: dict[int, tuple[bytes, bool]]
     payload: bytes
@@ -963,6 +963,7 @@
     http_auth: Optional[HTTPAuthData] = None
     nickname: Optional[str] = None
     from_muc: bool = False
+    occupant_id: Optional[str] = None
     muc_jid: Optional[JID] = None
     muc_nickname: Optional[str] = None
     muc_status_codes: Optional[Set[StatusCode]] = None
@@ -1183,6 +1184,7 @@
     self_presence: bool = False
     self_bare: bool = False
     from_muc: bool = False
+    occupant_id: Optional[str] = None
     status: str = ''
     timestamp: float = field(default_factory=time.time)
     user_timestamp: Optional[float] = None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/python-nbxmpp-3.2.4/nbxmpp/tcp.py 
new/python-nbxmpp-3.2.5/nbxmpp/tcp.py
--- old/python-nbxmpp-3.2.4/nbxmpp/tcp.py       2022-10-08 16:37:57.000000000 
+0200
+++ new/python-nbxmpp-3.2.5/nbxmpp/tcp.py       2022-10-31 11:49:38.000000000 
+0100
@@ -125,11 +125,15 @@
         return False
 
     def _on_certificate_set(self, connection, _param):
-        self._peer_certificate = connection.props.peer_certificate
-        self._peer_certificate_errors = convert_tls_error_flags(
-            connection.props.peer_certificate_errors)
+        if self._peer_certificate is None:
+            # If the cert has errors _check_certificate() will set the cert and
+            # _accept_certificate() will modify the error set. If this is the
+            # case _accept_certificate() modifies the errors.
+            self._peer_certificate = connection.props.peer_certificate
+            self._peer_certificate_errors = convert_tls_error_flags(
+                connection.props.peer_certificate_errors)
+
         self._tls_handshake_in_progress = False
-        self.notify('certificate-set')
 
     def _on_connect_finished(self, client, result, _user_data):
         try:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/python-nbxmpp-3.2.4/nbxmpp/websocket.py 
new/python-nbxmpp-3.2.5/nbxmpp/websocket.py
--- old/python-nbxmpp-3.2.4/nbxmpp/websocket.py 2022-10-08 16:37:57.000000000 
+0200
+++ new/python-nbxmpp-3.2.5/nbxmpp/websocket.py 2022-10-31 11:49:38.000000000 
+0100
@@ -99,8 +99,6 @@
         self._peer_certificate = certificate
         self._peer_certificate_errors = convert_tls_error_flags(errors)
 
-        self.notify('certificate-set')
-
         if self._accept_certificate():
             return
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/python-nbxmpp-3.2.4/python-nbxmpp.doap 
new/python-nbxmpp-3.2.5/python-nbxmpp.doap
--- old/python-nbxmpp-3.2.4/python-nbxmpp.doap  2022-10-08 16:37:57.000000000 
+0200
+++ new/python-nbxmpp-3.2.5/python-nbxmpp.doap  2022-10-31 11:49:38.000000000 
+0100
@@ -403,6 +403,13 @@
     </implements>
     <implements>
       <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0421.html"/>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:version>0.1.0</xmpp:version>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
         <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0425.html"/>
         <xmpp:status>complete</xmpp:status>
         <xmpp:version>0.2.1</xmpp:version>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/python-nbxmpp-3.2.4/setup.cfg 
new/python-nbxmpp-3.2.5/setup.cfg
--- old/python-nbxmpp-3.2.4/setup.cfg   2022-10-08 16:37:57.000000000 +0200
+++ new/python-nbxmpp-3.2.5/setup.cfg   2022-10-31 11:49:38.000000000 +0100
@@ -1,6 +1,6 @@
 [metadata]
 name = nbxmpp
-version = 3.2.4
+version = 3.2.5
 description = XMPP Library
 author = Yann Leboulanger, Philipp Hoerist
 author_email = gajim-de...@gajim.org

Reply via email to