Hello community, here is the log from the commit of package synergy for openSUSE:Factory checked in at 2018-01-06 18:48:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/synergy (Old) and /work/SRC/openSUSE:Factory/.synergy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "synergy" Sat Jan 6 18:48:22 2018 rev:17 rq:561658 version:1.8.8 Changes: -------- --- /work/SRC/openSUSE:Factory/synergy/synergy.changes 2017-05-06 18:30:13.338394317 +0200 +++ /work/SRC/openSUSE:Factory/.synergy.new/synergy.changes 2018-01-06 18:48:22.789500895 +0100 @@ -1,0 +2,5 @@ +Wed Jan 3 10:24:29 UTC 2018 - ohole...@suse.com + +- Add patch 0001-OpenSSL-1.1.0-build-fix.patch taken from upstream + +------------------------------------------------------------------- New: ---- 0001-OpenSSL-1.1.0-build-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ synergy.spec ++++++ --- /var/tmp/diff_new_pack.LwihUw/_old 2018-01-06 18:48:23.673459592 +0100 +++ /var/tmp/diff_new_pack.LwihUw/_new 2018-01-06 18:48:23.673459592 +0100 @@ -1,7 +1,7 @@ # # spec file for package synergy # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -22,13 +22,14 @@ Summary: Mouse, keyboard and clipboard sharing utility License: GPL-2.0+ Group: System/X11/Utilities -Url: http://synergy-project.org/ +URL: http://synergy-project.org/ Source0: https://github.com/symless/synergy/archive/v%{version}-stable.tar.gz Source1: synergy-firewall-services Source2: qsynergy.desktop Source3: qsynergy.png Source4: synergys.socket Source5: synergys.service +Patch1: 0001-OpenSSL-1.1.0-build-fix.patch # patches from Gentoo (taken from Mageia) Patch11: synergy-1.5.0-pthread.patch Patch14: synergy-1.5.0-disable-version-check.patch @@ -50,7 +51,6 @@ Requires(pre): %fillup_prereq Provides: synergy-plus = %{version} Obsoletes: synergy-plus < %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build %endif %description @@ -79,6 +79,7 @@ %prep %setup -q -n %{name}-%{version}-stable +%patch1 -p1 %patch11 -p1 %patch14 -p1 cp %{SOURCE2} . ++++++ 0001-OpenSSL-1.1.0-build-fix.patch ++++++ commit a73b65431b755aec1f007d11feccd017cc04af6c Author: Andrew Nelless <and...@symless.com> Date: Fri May 5 01:27:25 2017 +0100 Fix showSecureCipherInfo() to build with OpenSSL 1.1.0 diff --git a/src/lib/net/SecureSocket.cpp b/src/lib/net/SecureSocket.cpp index 843c24c2..c190750b 100644 --- a/src/lib/net/SecureSocket.cpp +++ b/src/lib/net/SecureSocket.cpp @@ -805,10 +805,15 @@ SecureSocket::showSecureCipherInfo() showCipherStackDesc(sStack); } - // m_ssl->m_ssl->session->ciphers is not forward compatable, In future release - // of OpenSSL, it's not visible, need to use SSL_get_client_ciphers() instead +#if OPENSSL_VERSION_NUMBER < 0x10100000L + // m_ssl->m_ssl->session->ciphers is not forward compatable, + // In future release of OpenSSL, it's not visible, STACK_OF(SSL_CIPHER) * cStack = m_ssl->m_ssl->session->ciphers; - if (cStack == NULL) { +#else + // Use SSL_get_client_ciphers() for newer versions + STACK_OF(SSL_CIPHER) * cStack = SSL_get_client_ciphers(m_ssl->m_ssl); +#endif + if (cStack == NULL) { LOG((CLOG_DEBUG1 "remote cipher list not available")); } else {
