rpm/gajim
SHA256
1
0
Fork 0
forked from pool/gajim
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/network/gajim?expand=0&rev=50

Browse Source
This commit is contained in:
Alexei Sorokin 2018-05-23 15:58:56 +00:00 committed by Git OBS Bridge
parent b522efed35
commit 71fed3d9d2
3 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gajim-do_not_ship_certificate.patch.in
View File

@ -1,11 +0,0 @@
--- a/gajim/data/plugins/plugin_installer/plugin_installer.py
+++ b/gajim/data/plugins/plugin_installer/plugin_installer.py
@@ -467,7 +467,7 @@ class DownloadAsync(threading.Thread):
ssl_args = {}
if self.secure:
ssl_args['context'] = ssl.create_default_context(
- cafile=self.plugin.local_file_path('DST_Root_CA_X3.pem'))
+ cafile='@TRUSTDIR_STATIC@/DST_Root_CA_X3.pem')
else:
ssl_args['context'] = ssl.create_default_context()
ssl_args['context'].check_hostname = False

8
gajim.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed May 23 14:42:41 UTC 2018 - sor.alexei@meowr.ru
- Symlink the system PEM certfiicate to the path where
Plugin Installer expects it to be instead of patching
Plugin Installer as it can be updated locally unpatched and thus
fail to work (boo#1094343).
-------------------------------------------------------------------
Sat May 19 14:32:00 UTC 2018 - mvetter@suse.com

18
gajim.spec
View File

@ -25,21 +25,20 @@ 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-FIX-OPENSUSE gajim-do_not_ship_certificate.patch.in vilene@posteo.net -- do not package PEM certificate
Source1: gajim-do_not_ship_certificate.patch.in
BuildRequires: ca-certificates-mozilla
BuildRequires: fdupes
BuildRequires: gobject-introspection-devel
BuildRequires: hicolor-icon-theme
BuildRequires: p11-kit-devel
BuildRequires: pkgconfig
BuildRequires: python3 >= 3.5.0
BuildRequires: python3-nbxmpp >= 0.6.5
BuildRequires: python3-nbxmpp >= 0.6.6
BuildRequires: python3-setuptools
BuildRequires: update-desktop-files
Requires: ca-certificates-mozilla
Requires: python3 >= 3.5.0
Requires: python3-docutils
Requires: python3-nbxmpp >= 0.6.5
Requires: python3-nbxmpp >= 0.6.6
Requires: python3-pyOpenSSL >= 0.12
Requires: python3-pycurl
Requires: python3-xml
@ -106,10 +105,6 @@ sed -i '/^Keywords/d' data/org.gajim.Gajim.desktop.in
# FIXME: Some leftover.
rm gajim/data/plugins/plugin_installer/config_dialog.ui~
# Do not package PEM certificate
sed 's|@TRUSTDIR_STATIC@|%{trustdir_static}|' %{SOURCE1} | patch -F0 -p1 --no-backup-if-mismatch
rm gajim/data/plugins/plugin_installer/*.pem
%build
python3 setup.py build
@ -121,6 +116,13 @@ mkdir -p %{buildroot}%{_datadir}/
mv %{buildroot}{%{python3_sitelib}/%{name}/data,%{_datadir}/%{name}}/
ln -s %{_datadir}/%{name} %{buildroot}%{python3_sitelib}/%{name}/data
# Do not package PEM certificates.
for cert in DST_Root_CA_X3.pem; do
[ -f "%{trustdir_static}/$cert" ]
rm "%{buildroot}%{_datadir}/%{name}/plugins/plugin_installer/$cert"
ln -s "%{trustdir_static}/$cert" %{buildroot}%{_datadir}/%{name}/plugins/plugin_installer/
done
%suse_update_desktop_file -r org.gajim.Gajim Network InstantMessaging
%fdupes %{buildroot}%{_prefix}/
%find_lang %{name}