Commit 84ee03a4 authored by Chris Knadle's avatar Chris Knadle
Browse files

debian/patches: remove 43-initialize-SSL.diff, similar patch incorporated upstream

parent 418e946e
Description: the SSL library must be initialized, otherwise mumble and
mumble-server both fail to find the available ciphers after a rebuild
with openssl_1.0.2d-3. The two calls used are based on:
https://wiki.openssl.org/index.php/SSL/TLS_Client#Initialization
Author: Colomban Wendling <lists.ban@herbesfolles.org>
Christohper Knadle <Chris.Knadle@coredump.us>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804363
Bug-Mumble: https://github.com/mumble-voip/mumble/issues/1876
Last-Updated: 2015-11-10
--- a/src/mumble/main.cpp
+++ b/src/mumble/main.cpp
@@ -174,6 +174,9 @@
os_init();
#endif
+ SSL_library_init();
+ SSL_load_error_strings();
+
bool bAllowMultiple = false;
QUrl url;
if (a.arguments().count() > 1) {
--- a/src/murmur/main.cpp
+++ b/src/murmur/main.cpp
@@ -203,6 +203,9 @@
qsrand(QDateTime::currentDateTime().toTime_t());
qInstallMsgHandler(murmurMessageOutput);
+ SSL_library_init();
+ SSL_load_error_strings();
+
#ifdef Q_OS_WIN
Tray tray(NULL, &le);
#endif
......@@ -4,7 +4,6 @@
19-move-xlib-initializtion-earlier.diff
25-make-logfiles-readable-by-adm.diff
35-add-dpkg-buildflags.diff
43-initialize-SSL.diff
44-add-speechd-header.diff
46-var-run-to-run.diff
48-systemd-workaround.diff
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment