From 8bd10a7dec0a1d5be65eef539eea04b6bd3e8c80 Mon Sep 17 00:00:00 2001 From: Lon Willett Date: Fri, 26 May 2017 12:51:37 +0200 Subject: [PATCH 1/2] gajim: added dependency on pyasn1 for plugin installer --- srcpkgs/gajim/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template index 017ac0e4c49..f5dbbf1b49b 100644 --- a/srcpkgs/gajim/template +++ b/srcpkgs/gajim/template @@ -1,12 +1,12 @@ # Template file for 'gajim' pkgname=gajim version=0.16.7 -revision=2 +revision=3 noarch=yes build_style=gnu-configure configure_args="--enable-site-packages PYTHON=python2" hostmakedepends="intltool python" -makedepends="python-dbus pygtk-devel python-openssl python-sqlite python-nbxmpp" +makedepends="python-dbus pygtk-devel python-openssl python-sqlite python-nbxmpp python-pyasn1" depends="${makedepends/-devel/}" pycompile_module="gajim" short_desc="Full featured Jabber/XMPP client" From 9ae31191afed9e1b73aae7220a5c3cd758997f82 Mon Sep 17 00:00:00 2001 From: Lon Willett Date: Fri, 26 May 2017 12:56:45 +0200 Subject: [PATCH 2/2] gajim: include root CA cert for plugin installer This really should be fixed upstream: the file DST_Root_CA_X3.pem is needed by the plugin installer for its cert pinning, but is not installed. This patch fixes the Makefile to do this. --- srcpkgs/gajim/patches/include-root-cert.patch | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 srcpkgs/gajim/patches/include-root-cert.patch diff --git a/srcpkgs/gajim/patches/include-root-cert.patch b/srcpkgs/gajim/patches/include-root-cert.patch new file mode 100644 index 00000000000..f650a50e37f --- /dev/null +++ b/srcpkgs/gajim/patches/include-root-cert.patch @@ -0,0 +1,22 @@ +--- plugins/Makefile.am.orig 2017-02-01 14:16:03.000000000 +0100 ++++ plugins/Makefile.am 2017-05-22 17:25:16.121616663 +0200 +@@ -7,7 +7,7 @@ + + pluginsdirs = ${sort ${dir ${wildcard ${srcdir}/*/ ${srcdir}/*/*/}}} + +-pluginsfiles = $(wildcard ${p}/*.py ${p}/manifest.ini ${p}/*.ui ${p}/*.png) ++pluginsfiles = $(wildcard ${p}/*.py ${p}/manifest.ini ${p}/*.pem ${p}/*.ui ${p}/*.png) + + nobase_gajimplugins_DATA = $(foreach p, ${pluginsdirs}, $(pluginsfiles)) + +--- plugins/Makefile.in.orig 2017-03-05 22:58:32.000000000 +0100 ++++ plugins/Makefile.in 2017-05-22 17:40:36.897800490 +0200 +@@ -316,7 +316,7 @@ + gajimpluginsdir = $(gajim_pluginsdir) + dist_gajimplugins_PYTHON = + pluginsdirs = ${sort ${dir ${wildcard ${srcdir}/*/ ${srcdir}/*/*/}}} +-pluginsfiles = $(wildcard ${p}/*.py ${p}/manifest.ini ${p}/*.ui ${p}/*.png) ++pluginsfiles = $(wildcard ${p}/*.py ${p}/manifest.ini ${p}/*.pem ${p}/*.ui ${p}/*.png) + nobase_gajimplugins_DATA = $(foreach p, ${pluginsdirs}, $(pluginsfiles)) + MAINTAINERCLEANFILES = Makefile.in + all: all-am