SHA256
1
0
forked from pool/gajim

- update to 1.2.2:

see https://gajim.org/post/2020-06-21-gajim-1.2.0-released/ 
  * bugfixes
- remove ssl_use_system_certs.patch (obsolete)

OBS-URL: https://build.opensuse.org/package/show/network/gajim?expand=0&rev=73
This commit is contained in:
Dirk Mueller 2020-08-26 19:54:03 +00:00 committed by Git OBS Bridge
parent 55fc163caf
commit c44da1a730
5 changed files with 13 additions and 54 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:261c85444b9cc150f775a5cc5b7dea6031c8fb03f9fe6a9a81cd93d62ee3fd2f
size 8013585

3
gajim-1.2.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fd0d1653fb3f7f97207fecc3218d38915adb1d741bf95a7eef83605bd6b8ccbd
size 9416794

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Aug 26 19:53:25 UTC 2020 - Dirk Mueller <dmueller@suse.com>
- update to 1.2.2:
see https://gajim.org/post/2020-06-21-gajim-1.2.0-released/
* bugfixes
- remove ssl_use_system_certs.patch (obsolete)
-------------------------------------------------------------------
Sun Jan 5 14:46:17 UTC 2020 - Benoît Monin <benoit.monin@gmx.fr>

View File

@ -16,16 +16,14 @@
#
%define _version 1.1
Name: gajim
Version: 1.1.3
Version: 1.2.2
Release: 0
Summary: XMPP client written in Python and Gtk3
License: GPL-3.0-only
Group: Productivity/Networking/Talk/Clients
URL: https://gajim.org/
Source: https://gajim.org/downloads/%{_version}/%{name}-%{version}.tar.bz2
Patch: ssl_use_system_certs.patch
Source: https://gajim.org/downloads/1.2/gajim-%{version}.tar.gz
BuildRequires: ca-certificates-mozilla
BuildRequires: fdupes
BuildRequires: gobject-introspection-devel
@ -103,7 +101,6 @@ Features:
%prep
%setup -q
%autopatch -p1
sed -i '/^Keywords/d' data/org.gajim.Gajim.desktop.in
# FIXME: Some leftover.

View File

@ -1,46 +0,0 @@
---
gajim/data/plugins/plugin_installer/DST_Root_CA_X3.pem | 20 ----------------
gajim/data/plugins/plugin_installer/plugin_installer.py | 8 ------
2 files changed, 1 insertion(+), 27 deletions(-)
--- gajim-1.1.3.orig/gajim/data/plugins/plugin_installer/DST_Root_CA_X3.pem
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/
-MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow
-PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
-Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O
-rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq
-OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b
-xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw
-7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD
-aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
-HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG
-SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69
-ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr
-AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz
-R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5
-JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo
-Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
------END CERTIFICATE-----
\ No newline at end of file
--- gajim-1.1.3.orig/gajim/data/plugins/plugin_installer/plugin_installer.py
+++ gajim-1.1.3/gajim/data/plugins/plugin_installer/plugin_installer.py
@@ -463,13 +463,7 @@ class DownloadAsync(threading.Thread):
def download_url(self, url):
log.info('Fetching %s', url)
ssl_args = {}
- if self.secure:
- ssl_args['context'] = ssl.create_default_context(
- cafile=self.plugin.local_file_path('DST_Root_CA_X3.pem'))
- else:
- ssl_args['context'] = ssl.create_default_context()
- ssl_args['context'].check_hostname = False
- ssl_args['context'].verify_mode = ssl.CERT_NONE
+ ssl_args['context'] = ssl.create_default_context()
for flag in ('OP_NO_SSLv2', 'OP_NO_SSLv3',
'OP_NO_TLSv1', 'OP_NO_TLSv1_1',