Hello community, here is the log from the commit of package weechat for openSUSE:Factory checked in at 2013-08-07 10:45:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/weechat (Old) and /work/SRC/openSUSE:Factory/.weechat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "weechat" Changes: -------- --- /work/SRC/openSUSE:Factory/weechat/weechat.changes 2013-05-27 10:10:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.weechat.new/weechat.changes 2013-08-07 10:45:22.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Aug 6 13:57:58 UTC 2013 - [email protected] + +- use system's default certificate store instead of hardcoding the + path to a bundle file (weechat-0.4.1-capath.diff, bnc#829471) + +------------------------------------------------------------------- New: ---- weechat-0.4.1-capath.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ weechat.spec ++++++ --- /var/tmp/diff_new_pack.X3X8YY/_old 2013-08-07 10:45:23.000000000 +0200 +++ /var/tmp/diff_new_pack.X3X8YY/_new 2013-08-07 10:45:23.000000000 +0200 @@ -28,6 +28,8 @@ 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 [email protected] -- 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 @@ %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")\"" ++++++ weechat-0.4.1-capath.diff ++++++ >From 209c09a6b1b2151a6ce83a2c2a3cb49a5a9bacb6 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel <[email protected]> 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 } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
