[packages/tkabber] - rel 2; use our default ca store

arekm arekm at pld-linux.org
Sun Aug 14 16:15:38 CEST 2016


commit 4263ddb2599040f0564ef84504f67562f6777306
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Aug 14 16:15:33 2016 +0200

    - rel 2; use our default ca store

 tkabber-ca.patch | 11 +++++++++++
 tkabber.spec     |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/tkabber.spec b/tkabber.spec
index 94c651a..1b673cd 100644
--- a/tkabber.spec
+++ b/tkabber.spec
@@ -6,7 +6,7 @@ Summary:	Tk Jabber client
 Summary(pl.UTF-8):	Klient Jabbera oparty o Tk
 Name:		tkabber
 Version:	1.1.2
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/Communications
 Source0:	http://files.jabber.ru/tkabber/%{name}-%{version}.tar.xz
@@ -15,6 +15,7 @@ Source1:	%{name}.desktop
 Source2:	%{name}.png
 Patch0:		%{name}-privacy.patch
 Patch1:		%{name}-chat-by-default.patch
+Patch2:		%{name}-ca.patch
 URL:		http://tkabber.jabber.ru/
 BuildRequires:	sed >= 4.0
 Requires:	tcl >= 8.4.0
@@ -66,6 +67,7 @@ Do pełnej funkcjonalności mogą być potrzebne dodatkowe pakiety:
 %setup -q
 %{?with_privacy:%patch0 -p1}
 %patch1 -p1
+%patch2 -p1
 
 sed -i -e 's#ifaceck##g' Makefile
 
diff --git a/tkabber-ca.patch b/tkabber-ca.patch
new file mode 100644
index 0000000..3e790c2
--- /dev/null
+++ b/tkabber-ca.patch
@@ -0,0 +1,11 @@
+--- tkabber-1.1.2/login.tcl~	2015-05-10 21:19:50.000000000 +0200
++++ tkabber-1.1.2/login.tcl	2016-08-14 16:12:23.307296050 +0200
+@@ -110,7 +110,7 @@ if {$use_tls} {
+     custom::defvar loginconf(sslcertfile) "" \
+ 	[::msgcat::mc "SSL certificate file (optional)."] \
+ 	-group Login -type file
+-    custom::defvar loginconf(sslcacertstore) "" \
++    custom::defvar loginconf(sslcacertstore) "/etc/certs/ca-certificates.crt" \
+ 	[::msgcat::mc "SSL certification authority file or directory (optional)."] \
+ 	-group Login -type file
+     custom::defvar loginconf(sslkeyfile) "" \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/tkabber.git/commitdiff/4263ddb2599040f0564ef84504f67562f6777306



More information about the pld-cvs-commit mailing list