Hello community, here is the log from the commit of package gajim for openSUSE:Factory checked in at 2015-08-03 17:21:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gajim (Old) and /work/SRC/openSUSE:Factory/.gajim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gajim" Changes: -------- --- /work/SRC/openSUSE:Factory/gajim/gajim.changes 2015-08-01 11:36:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gajim.new/gajim.changes 2015-08-03 17:22:02.000000000 +0200 @@ -1,0 +2,8 @@ +Sun Aug 2 09:32:36 UTC 2015 - [email protected] + +- Update to 0.16.3: + * Fix reading secret file. + * Fix reconnection after suspend. + * Fix sending GPG-encrypted file to non-trusted key. + +------------------------------------------------------------------- Old: ---- gajim-0.16.2.tar.gz New: ---- gajim-0.16.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gajim.spec ++++++ --- /var/tmp/diff_new_pack.4gdB0H/_old 2015-08-03 17:22:03.000000000 +0200 +++ /var/tmp/diff_new_pack.4gdB0H/_new 2015-08-03 17:22:03.000000000 +0200 @@ -18,7 +18,7 @@ %define _version 0.16 Name: gajim -Version: 0.16.2 +Version: 0.16.3 Release: 0 Summary: Full-featured XMPP client written in Python and Gtk2 License: GPL-3.0+ @@ -40,7 +40,7 @@ Requires: python-pyOpenSSL >= 0.12 Requires: python-pyasn1 Requires: python-xml -Recommends: %{name}-lang = %{version} +Recommends: %{name}-lang # nslookup for SRV support. Recommends: bind-utils Recommends: gtkspell @@ -65,23 +65,23 @@ require neither to run. Features: -* Tabbed chat window and single window modes -* Group chat support (with Multi-User Chat protocol), invitation, + * Tabbed chat window and single window modes + * Group chat support (with Multi-User Chat protocol), invitation, chat to group chat transformation, minimize group chat to roster -* Emoticons, avatars, PEP (user activity, mood and tune) -* Audio / video conferences -* File transfer, room bookmarks -* Metacontacts support -* Trayicon, speller, extended chat history functionalities -* TLS, GPG and End-To-End encryption support (with SSL legacy support) -* Transport registration support -* Service discovery including nodes, user search -* Wikipedia, dictionary and search engine lookup -* Multiple accounts support -* DBus capabilities. Read more information -* XML console -* Link local (bonjour / zeroconf), BOSH -* Other features via plugins + * Emoticons, avatars, PEP (user activity, mood and tune) + * Audio / video conferences + * File transfer, room bookmarks + * Metacontacts support + * Trayicon, speller, extended chat history functionalities + * TLS, GPG and End-To-End encryption support (with SSL legacy support) + * Transport registration support + * Service discovery including nodes, user search + * Wikipedia, dictionary and search engine lookup + * Multiple accounts support + * DBus capabilities. Read more information + * XML console + * Link local (bonjour / zeroconf), BOSH + * Other features via plugins %lang_package ++++++ gajim-0.16.2.tar.gz -> gajim-0.16.3.tar.gz ++++++ ++++ 1967 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gajim-0.16.2/ChangeLog new/gajim-0.16.3/ChangeLog --- old/gajim-0.16.2/ChangeLog 2015-07-24 21:59:32.000000000 +0200 +++ new/gajim-0.16.3/ChangeLog 2015-07-31 14:27:49.000000000 +0200 @@ -1,4 +1,10 @@ -Gajim 0.16.2 (20 July 2015) +Gajim 0.16.3 (31 July 2015) + + * Fix reading secret file + * Fix reconnection after suspend + * Fix sending GPG-encrypted file to non-trusted key + +Gajim 0.16.2 (24 July 2015) * improve Zeroconf under windows and with IPv6 * Fix errors with GnuPG diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gajim-0.16.2/autogen.sh new/gajim-0.16.3/autogen.sh --- old/gajim-0.16.2/autogen.sh 2015-07-24 21:59:32.000000000 +0200 +++ new/gajim-0.16.3/autogen.sh 2015-07-31 14:27:49.000000000 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.16.2" + gajimversion="0.16.3" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gajim-0.16.2/config/compile new/gajim-0.16.3/config/compile --- old/gajim-0.16.2/config/compile 2015-07-24 21:59:38.000000000 +0200 +++ new/gajim-0.16.3/config/compile 2015-07-31 14:27:55.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gajim-0.16.2/config/missing new/gajim-0.16.3/config/missing --- old/gajim-0.16.2/config/missing 2015-07-24 21:59:38.000000000 +0200 +++ new/gajim-0.16.3/config/missing 2015-07-31 14:27:55.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gajim-0.16.2/config/py-compile new/gajim-0.16.3/config/py-compile --- old/gajim-0.16.2/config/py-compile 2015-07-24 21:59:38.000000000 +0200 +++ new/gajim-0.16.3/config/py-compile 2015-07-31 14:27:55.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2011-06-08.12; # UTC -# Copyright (C) 2000-2013 Free Software Foundation, Inc. +# Copyright (C) 2000-2014 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gajim-0.16.2/gajim.nsi new/gajim-0.16.3/gajim.nsi --- old/gajim-0.16.2/gajim.nsi 2015-07-24 21:59:32.000000000 +0200 +++ new/gajim-0.16.3/gajim.nsi 2015-07-31 14:27:49.000000000 +0200 @@ -212,7 +212,7 @@ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\bin\Gajim.exe" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.16" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.16.3" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/"; WriteUninstaller "$INSTDIR\Uninstall.exe" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gajim-0.16.2/m4/hgversion.m4 new/gajim-0.16.3/m4/hgversion.m4 --- old/gajim-0.16.2/m4/hgversion.m4 2015-07-24 21:59:33.000000000 +0200 +++ new/gajim-0.16.3/m4/hgversion.m4 2015-07-31 14:27:50.000000000 +0200 @@ -1 +1 @@ -define([AC_PACKAGE_VERSION], [0.16.2]) +define([AC_PACKAGE_VERSION], [0.16.3]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gajim-0.16.2/setup_win32.py new/gajim-0.16.3/setup_win32.py --- old/gajim-0.16.2/setup_win32.py 2015-07-24 21:59:33.000000000 +0200 +++ new/gajim-0.16.3/setup_win32.py 2015-07-31 14:27:50.000000000 +0200 @@ -56,7 +56,7 @@ setup( name='Gajim', - version='0.16', + version='0.16.3', description='A full featured Jabber client', author='Gajim Development Team', url='http://gajim.org/', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gajim-0.16.2/src/common/connection.py new/gajim-0.16.3/src/common/connection.py --- old/gajim-0.16.2/src/common/connection.py 2015-07-24 21:59:33.000000000 +0200 +++ new/gajim-0.16.3/src/common/connection.py 2015-07-31 14:27:50.000000000 +0200 @@ -884,6 +884,7 @@ self.connection.disconnect() self.last_connection = None self.connection = None + def set_oldst(self): # Set old state if self.old_show: self.connected = gajim.SHOW_LIST.index(self.old_show) @@ -912,6 +913,9 @@ self.sm.enabled = False gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, show='error')) + if self.connection: + self.connection.UnregisterDisconnectHandler( + self._disconnectedReconnCB) self.disconnect() if gajim.config.get_per('accounts', self.name, 'autoreconnect'): self.connected = -1 @@ -1510,7 +1514,7 @@ if self.on_connect_auth: self.on_connect_auth(None) self.on_connect_auth = None - return + return if not self.connected: # We went offline during connecting process if self.on_connect_auth: self.on_connect_auth(None) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gajim-0.16.2/src/common/defs.py new/gajim-0.16.3/src/common/defs.py --- old/gajim-0.16.2/src/common/defs.py 2015-07-24 21:59:33.000000000 +0200 +++ new/gajim-0.16.3/src/common/defs.py 2015-07-31 14:27:50.000000000 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.16.2' +version = '0.16.3' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gajim-0.16.2/src/common/gnupg.py new/gajim-0.16.3/src/common/gnupg.py --- old/gajim-0.16.2/src/common/gnupg.py 2015-07-24 21:59:33.000000000 +0200 +++ new/gajim-0.16.3/src/common/gnupg.py 2015-07-31 14:27:50.000000000 +0200 @@ -612,7 +612,8 @@ if key in ("USERID_HINT", "NEED_PASSPHRASE", "BAD_PASSPHRASE", "GOOD_PASSPHRASE", "BEGIN_SIGNING", "CARDCTRL", "INV_SGNR", "NO_SGNR", "MISSING_PASSPHRASE", "NEED_PASSPHRASE_PIN", - "SC_OP_FAILURE", "SC_OP_SUCCESS", "PROGRESS"): + "SC_OP_FAILURE", "SC_OP_SUCCESS", "PROGRESS", + "PINENTRY_LAUNCHED"): pass elif key in ("KEYEXPIRED", "SIGEXPIRED"): self.status = 'key expired' @@ -1094,7 +1095,7 @@ getattr(result, keyword)(L) return result - def list_keys(self, secret=False): + def list_keys(self, secret=False, keys=None): """ list the keys currently in the keyring >>> import shutil @@ -1116,6 +1117,9 @@ which='secret-keys' args = ["--list-%s" % which, "--fixed-list-mode", "--fingerprint", "--with-colons"] + if keys: + for key in keys: + args.append(key) p = self._open_subprocess(args) return self._get_list_output(p, 'list') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gajim-0.16.2/src/common/gpg.py new/gajim-0.16.3/src/common/gpg.py --- old/gajim-0.16.2/src/common/gpg.py 2015-07-24 21:59:33.000000000 +0200 +++ new/gajim-0.16.3/src/common/gpg.py 2015-07-31 14:27:50.000000000 +0200 @@ -54,12 +54,16 @@ for key in recipients: if key not in self.always_trust: trust = False + if not trust: + # check that we'll be able to encrypt + result = super(GnuPG, self).list_keys(recipients, + keys=recipients) + for key in result: + if key['trust'] not in ('f', 'u'): + return '', 'NOT_TRUSTED' result = super(GnuPG, self).encrypt(str_, recipients, always_trust=trust, passphrase=self.passphrase) - if result.status == 'invalid recipient': - return '', 'NOT_TRUSTED' - if result.ok: error = '' else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gajim-0.16.2/src/gui_interface.py new/gajim-0.16.3/src/gui_interface.py --- old/gajim-0.16.2/src/gui_interface.py 2015-07-24 21:59:33.000000000 +0200 +++ new/gajim-0.16.3/src/gui_interface.py 2015-07-31 14:27:50.000000000 +0200 @@ -2936,7 +2936,8 @@ def gnome_screensaver_ActiveChanged_cb(active): if not active: for account in gajim.connections: - if gajim.sleeper_state[account] == 'autoaway-forced': + if gajim.account_is_connected(account) and \ + gajim.sleeper_state[account] == 'autoaway-forced': # We came back online ofter gnome-screensaver # autoaway self.roster.send_status(account, 'online', @@ -2952,6 +2953,8 @@ not gajim.sleeper_state[account]: continue if gajim.sleeper_state[account] == 'online': + if not gajim.account_is_connected(account): + continue # we save out online status gajim.status_before_autoaway[account] = \ gajim.connections[account].status diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gajim-0.16.2/src/message_window.py new/gajim-0.16.3/src/message_window.py --- old/gajim-0.16.2/src/message_window.py 2015-07-24 21:59:33.000000000 +0200 +++ new/gajim-0.16.3/src/message_window.py 2015-07-31 14:27:50.000000000 +0200 @@ -519,7 +519,8 @@ if control.type_id == message_control.TYPE_GC: name = control.room_jid.split('@')[0] - urgent = control.attention_flag + urgent = control.attention_flag or \ + gajim.config.get('notify_on_all_muc_messages') else: name = control.contact.get_shown_name() if control.resource: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gajim-0.16.2/src/secrets.py new/gajim-0.16.3/src/secrets.py --- old/gajim-0.16.2/src/secrets.py 2015-07-24 21:59:33.000000000 +0200 +++ new/gajim-0.16.3/src/secrets.py 2015-07-31 14:27:50.000000000 +0200 @@ -31,7 +31,7 @@ secrets_filename = gajimpaths['SECRETS_FILE'] secrets_cache = None -class Secrets(object): +class Secrets(): def __init__(self, filename): self.filename = filename self.srs = {} @@ -95,13 +95,23 @@ return pk def load_secrets(filename): - f = open(filename, 'r') + global Secrets + f = open(filename, 'rb') try: secrets = pickle.load(f) except (KeyError, EOFError): f.close() secrets = Secrets(filename) + except (AttributeError, TypeError): + class Secrets(object, Secrets): + pass + try: + f.seek(0) + secrets = pickle.load(f) + except (KeyError, EOFError): + f.close() + secrets = Secrets(filename) return secrets
