[arch-commits] Commit in synergy/trunk (PKGBUILD openssl11.patch)

[Levente Polyak]

    Date: Thursday, March 16, 2017 @ 20:25:11
  Author: anthraxx
Revision: 216808

upgpkg: synergy 1.8.8-2 (openssl rebuild)

Added:
  synergy/trunk/openssl11.patch
Modified:
  synergy/trunk/PKGBUILD

-----------------+
 PKGBUILD        |    5 ++++-
 openssl11.patch |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-16 20:22:36 UTC (rev 216807)
+++ PKGBUILD	2017-03-16 20:25:11 UTC (rev 216808)
@@ -12,7 +12,7 @@
 # update and just generally don't seem to care much.
 pkgname=synergy
 pkgver=1.8.8
-pkgrel=1
+pkgrel=2
 pkgdesc='Share a single mouse and keyboard between multiple computers'
 url='https://symless.com/synergy/'
 arch=('i686' 'x86_64')
@@ -21,10 +21,12 @@
 makedepends=('libxt' 'cmake' 'qt5-base' 'gmock' 'gtest')
 optdepends=('qt5-base: gui support')
 source=(synergy-${pkgver}.tar.gz::https://github.com/symless/synergy/archive/v${pkgver}-stable.tar.gz
+        openssl11.patch
         system-gtest.patch
         synergys.socket
         synergys.service)
 sha512sums=('b4909930af7da10d877297e674df4c042ec54333eed585334da4a8c834c0ca3ad7c93fd2436c7d8d2f0e9e039d7bd385bb9e8a8c706750cbab3c3664a9b16bc6'
+            'ba93295d5638581ac0a82c293016563e2faf4228b6c920bfe1df86b254841a88baf55f220574e93af1c718d689a8f8f1ad494c2ca685f8ea01a506a1bc6e1642'
             '4bef039f59b565d08079a8187df76f9773cfddeb81376ccc42f5570049389f114559721ed7b0464c4a4d1431ba72a736b11755573019583d0075d9da08c03ed2'
             'f9c124533dfd0bbbb1b5036b7f4b06f7f86f69165e88b9146ff17798377119eb9f1a4666f3b2ee9840bc436558d715cdbfe2fdfd7624348fae64871f785a1a62'
             '9663a11b915e10e60317e732a4d1191e8f8ff19176994c27dd20aa445daab7565bd624e5575c9c639d144293879fbe8376834a076723f778fd322ebd1c9f2029')
@@ -34,6 +36,7 @@
   mkdir build
   # get rid of shitty bundled gtest and gmock
   patch -p1 < "${srcdir}/system-gtest.patch"
+  patch -p1 < "${srcdir}/openssl11.patch"
 }
 
 build() {

Added: openssl11.patch
===================================================================
--- openssl11.patch	                        (rev 0)
+++ openssl11.patch	2017-03-16 20:25:11 UTC (rev 216808)
@@ -0,0 +1,33 @@
+From 9385083cfc27ecaadf1eaf1d014cd6907860072b Mon Sep 17 00:00:00 2001
+From: Joshua Honeycutt <joshua.honeycutt at gmail.com>
+Date: Sun, 20 Nov 2016 17:49:30 -0600
+Subject: [PATCH] Adjust showSecureCipherInfo() to build with newer openssl
+ versions
+
+---
+ src/lib/net/SecureSocket.cpp | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/lib/net/SecureSocket.cpp b/src/lib/net/SecureSocket.cpp
+index 7076c76..1e35c21 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 {