Accepting request 320404 from server:irc

- Ensure we use system CA ca-bundle.pem file by hardcoding it
- Remove patch:
  * weechat-capath.patch

OBS-URL: https://build.opensuse.org/request/show/320404
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/weechat?expand=0&rev=33

weechat-capath.patch

@@ -1,49 +0,0 @@
-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-1.2/src/core/wee-config.c
-===================================================================
---- weechat-1.2.orig/src/core/wee-config.c
-+++ weechat-1.2/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;
-@@ -3520,7 +3519,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, CA_FILE, 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-1.2/src/core/wee-network.c
-===================================================================
---- weechat-1.2.orig/src/core/wee-network.c
-+++ weechat-1.2/src/core/wee-network.c
-@@ -111,6 +111,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 /* HAVE_GNUTLS */
- }
- 

weechat.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Aug  4 13:28:23 UTC 2015 - tchvatal@suse.com
+
+- Ensure we use system CA ca-bundle.pem file by hardcoding it
+- Remove patch:
+  * weechat-capath.patch
+
 -------------------------------------------------------------------
 Sat Jul  4 12:47:38 UTC 2015 - tchvatal@suse.com
 

weechat.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package weechat
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,9 +25,8 @@ Group:          Productivity/Networking/IRC
 Url:            http://www.weechat.org
 Source:         http://www.weechat.org/files/src/%{name}-%{version}.tar.bz2
 Source1:        weechat.desktop
-# PATCH-FIX-UPSTREAM weechat-capath.patch https://savannah.nongnu.org/patch/index.php?8153 lnussel@suse.de -- use system's default certificate store
-Patch0:         weechat-capath.patch
 BuildRequires:  asciidoc
+BuildRequires:  ca-certificates
 BuildRequires:  cmake
 BuildRequires:  curl-devel
 BuildRequires:  docbook-xsl-stylesheets
@@ -50,6 +49,7 @@ BuildRequires:  python-devel
 BuildRequires:  ruby-devel
 BuildRequires:  tcl-devel
 BuildRequires:  update-desktop-files
+Requires:       ca-certificates
 Requires:       hicolor-icon-theme
 Recommends:     %{name}-lang = %{version}
 # without scripts it is bit annoying
@@ -148,7 +148,6 @@ 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")\""
@@ -165,7 +164,8 @@ export CFLAGS="%{optflags}"
     -DPYTHON_LIBRARY="%{_libdir}/libpython%{py_ver}.so" \
     -DENABLE_ENCHANT=ON \
     -DENABLE_DOC=ON \
-    -DENABLE_MAN=ON
+    -DENABLE_MAN=ON \
+    -DCA_FILE=%{_sysconfdir}/ssl/ca-bundle.pem
 make %{?_smp_mflags}
 
 %install