pool/weechat
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 186116 from server:irc

Browse Source 
- use system's default certificate store instead of hardcoding the
  path to a bundle file (weechat-0.4.1-capath.diff, bnc#829471) (forwarded request 186112 from lnussel)

OBS-URL: https://build.opensuse.org/request/show/186116
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/weechat?expand=0&rev=19
This commit is contained in:
Tomáš Chvátal 2013-08-07 08:45:20 +00:00 committed by Git OBS Bridge
commit fa74b8ab99
3 changed files with 58 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
weechat-0.4.1-capath.diff Normal file
View File

@ -0,0 +1,49 @@
From 209c09a6b1b2151a6ce83a2c2a3cb49a5a9bacb6 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <ludwig.nussel@suse.de>
Date: Tue, 6 Aug 2013 15:12:04 +0200
Subject: [PATCH] use system's default certificate store
---
CMakeLists.txt | 7 +++----
src/core/wee-config.c | 3 +++
src/core/wee-network.c | 6 ++++++
3 files changed, 12 insertions(+), 4 deletions(-)
Index: weechat-0.4.1/src/core/wee-config.c
===================================================================
--- weechat-0.4.1.orig/src/core/wee-config.c
+++ weechat-0.4.1/src/core/wee-config.c
@@ -61,7 +61,6 @@
#include "../gui/gui-window.h"
#include "../plugins/plugin.h"
-
struct t_config_file *weechat_config_file = NULL;
struct t_config_section *weechat_config_section_debug = NULL;
struct t_config_section *weechat_config_section_color = NULL;
@@ -2961,7 +2960,7 @@ config_weechat_init_options ()
"gnutls_ca_file", "string",
N_("file containing the certificate authorities (\"%h\" will be "
"replaced by WeeChat home, \"~/.weechat\" by default)"),
- NULL, 0, 0, "/etc/ssl/certs/ca-certificates.crt", NULL, 0, NULL, NULL,
+ NULL, 0, 0, NULL, NULL, 1, NULL, NULL,
&config_change_network_gnutls_ca_file, NULL, NULL, NULL);
config_network_gnutls_handshake_timeout = config_file_new_option (
weechat_config_file, ptr_section,
Index: weechat-0.4.1/src/core/wee-network.c
===================================================================
--- weechat-0.4.1.orig/src/core/wee-network.c
+++ weechat-0.4.1/src/core/wee-network.c
@@ -87,6 +87,12 @@ network_set_gnutls_ca_file ()
}
free (ca_path);
}
+#if LIBGNUTLS_VERSION_NUMBER >= 0x030013 // was introduced in 3.0.19
+ else
+ {
+ gnutls_certificate_set_x509_system_trust(gnutls_xcred);
+ }
+#endif
#endif
}

6
weechat.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Aug 6 13:57:58 UTC 2013 - lnussel@suse.de
- use system's default certificate store instead of hardcoding the
path to a bundle file (weechat-0.4.1-capath.diff, bnc#829471)
-------------------------------------------------------------------
Tue May 21 07:31:45 UTC 2013 - gber@opensuse.org

3
weechat.spec
View File

@ -28,6 +28,8 @@ License: GPL-3.0+
Group: Productivity/Networking/IRC
Source: http://www.weechat.org/files/src/weechat-%{version}.tar.bz2
Source1: weechat.desktop
# PATCH-FIX-UPSTREAM https://savannah.nongnu.org/patch/index.php?8153 lnussel@suse.de -- use system's default certificate store
Patch0: weechat-0.4.1-capath.diff
Url: http://www.weechat.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake
@ -137,6 +139,7 @@ Spell-checking support for %{name}, using the aspell library.
%prep
%setup -q
%patch0 -p1
modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"
DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\""
TIME="\"$(date -d "${modified}" "+%%R")\""