sysutils/synergy-1: Update 1.11.0 -> 1.11.1

Reported by:	portscout
This commit is contained in:
Yuri Victorovich
2020-03-22 17:37:45 +00:00
parent c9b0231f13
commit 6c9c23fc58
4 changed files with 10 additions and 44 deletions

View File

@@ -1,10 +1,14 @@
# $FreeBSD$
PORTNAME= synergy-1
DISTVERSION= 1.11.0
DISTVERSIONPREFIX= v
DISTVERSION= 1.11.1
DISTVERSIONSUFFIX= -stable
CATEGORIES= sysutils
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES= e4a2b0f95cd3a18b9772b3282fdd91561956e5e3.patch:-p1 # https://github.com/symless/synergy-core/pull/6649/
MAINTAINER= yuri@FreeBSD.org
COMMENT= Mouse and keyboard sharing utility

View File

@@ -1,3 +1,5 @@
TIMESTAMP = 1577756405
SHA256 (symless-synergy-core-1.11.0-stable_GH0.tar.gz) = c9c9eee0b33c464addfb6cebdbce89c68030dee50964ed8a2b626912da4dbc24
SIZE (symless-synergy-core-1.11.0-stable_GH0.tar.gz) = 7593731
TIMESTAMP = 1584896801
SHA256 (symless-synergy-core-v1.11.1-stable_GH0.tar.gz) = 338e5fda0323f8c24259d8fc26e513bdc4f0f249bf66e9722953bb8e6311f88b
SIZE (symless-synergy-core-v1.11.1-stable_GH0.tar.gz) = 7556850
SHA256 (e4a2b0f95cd3a18b9772b3282fdd91561956e5e3.patch) = bd6343cf732e643c7241dca95e56e48ea32fec64d673519aff077bc74588a493
SIZE (e4a2b0f95cd3a18b9772b3282fdd91561956e5e3.patch) = 1584

View File

@@ -1,29 +0,0 @@
--- CMakeLists.txt.orig 2019-05-09 16:52:59 UTC
+++ CMakeLists.txt
@@ -300,7 +300,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Da
${OPENSSL_ROOT}/lib/libssl.a
${OPENSSL_ROOT}/lib/libcrypto.a
)
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux|.*BSD|DragonFly")
set (OPENSSL_LIBS ssl crypto)
else()
message (FATAL_ERROR "Couldn't find OpenSSL")
@@ -337,7 +337,7 @@ macro (configure_files srcDir destDir)
endmacro (configure_files)
macro(generate_versionfile)
- if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux|.*BSD|DragonFly")
FILE(WRITE ${CMAKE_BINARY_DIR}/version
"export SYNERGY_VERSION_MAJOR=\"${SYNERGY_VERSION_MAJOR}\"\n"
"export SYNERGY_VERSION_MINOR=\"${SYNERGY_VERSION_MINOR}\"\n"
@@ -380,7 +380,7 @@ endif()
#
# Linux installation
#
-if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+if (${CMAKE_SYSTEM_NAME} MATCHES "Linux|.*BSD|DragonFly")
configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/rpm ${CMAKE_BINARY_DIR}/rpm)
install(FILES res/synergy.svg DESTINATION share/icons/hicolor/scalable/apps)
if("${VERSION_MAJOR}" STREQUAL "2")

View File

@@ -1,11 +0,0 @@
--- src/lib/net/SecureSocket.cpp.orig 2019-05-09 16:52:59 UTC
+++ src/lib/net/SecureSocket.cpp
@@ -812,7 +812,7 @@ SecureSocket::showSecureCipherInfo()
showCipherStackDesc(sStack);
}
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
// 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;