CVS commit: pkgsrc/net/synergy

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Mar  7 09:14:17 UTC 2020

Modified Files:
        pkgsrc/net/synergy: Makefile distinfo
        pkgsrc/net/synergy/patches: patch-CMakeLists.txt

Log Message:
synergy: update to 1.11.0

6518 Key combination that will force a server restart
6588 Version number header with update check
6569 Unable to run on macOS 10.15 Catalina
6561 Debian buster no longer supports CA key length of 1024
6556 Function missing error from OpenSSL/TLS
6566 Debug message output mistakenly as info message
5959 User interface failed to load local fingerprint


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/net/synergy/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/net/synergy/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/synergy/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/synergy/Makefile
diff -u pkgsrc/net/synergy/Makefile:1.59 pkgsrc/net/synergy/Makefile:1.60
--- pkgsrc/net/synergy/Makefile:1.59    Sat Jan 18 21:50:26 2020
+++ pkgsrc/net/synergy/Makefile Sat Mar  7 09:14:17 2020
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.59 2020/01/18 21:50:26 jperkin Exp $
+# $NetBSD: Makefile,v 1.60 2020/03/07 09:14:17 tnn Exp $
 
-DISTNAME=              synergy-core-1.10.3
+DISTNAME=              synergy-core-1.11.0
 PKGNAME=               ${DISTNAME:S/-core//}
-PKGREVISION=           2
 CATEGORIES=            net x11
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=symless/}
 GITHUB_PROJECT=                synergy-core
-GITHUB_TAG=            v${PKGVERSION_NOREV}-stable
+GITHUB_TAG=            ${PKGVERSION_NOREV}-stable
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://synergy-project.org/

Index: pkgsrc/net/synergy/distinfo
diff -u pkgsrc/net/synergy/distinfo:1.30 pkgsrc/net/synergy/distinfo:1.31
--- pkgsrc/net/synergy/distinfo:1.30    Wed Sep  4 11:58:54 2019
+++ pkgsrc/net/synergy/distinfo Sat Mar  7 09:14:17 2020
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.30 2019/09/04 11:58:54 tnn Exp $
+$NetBSD: distinfo,v 1.31 2020/03/07 09:14:17 tnn Exp $
 
-SHA1 (synergy-core-1.10.3.tar.gz) = fc406fb77e0b89d156b2d8cd5e978a3e90be7ddb
-RMD160 (synergy-core-1.10.3.tar.gz) = f6d588c7b6d780dac7f0ccb2612b4e2100a1a161
-SHA512 (synergy-core-1.10.3.tar.gz) = 01497fe362395dd9d26d44f7468ca5c01ee7cd2f590b6c28a67e094f969fdca3b8f78570cca4f188c16fc2575ca895daf8d6ffd07378964ed01da1540db05c8e
-Size (synergy-core-1.10.3.tar.gz) = 7596446 bytes
-SHA1 (patch-CMakeLists.txt) = 09d8e49897c99fba3e7f9b58da72b6d3f6e3c4f1
+SHA1 (synergy-core-1.11.0.tar.gz) = f8bbc1812f6efb7a0ec34e9e7666afc8e284d3a0
+RMD160 (synergy-core-1.11.0.tar.gz) = fd46c277a245bb9836d6708fff16c1ede6c249af
+SHA512 (synergy-core-1.11.0.tar.gz) = 1d894233867156113776957e46ba1bfb5079d9eb938c1f78b40ab73486fac915ae371b0b4c745d6441ef0d3b13339688210efde0d3e0ce69d2a638b28f8ef4c0
+Size (synergy-core-1.11.0.tar.gz) = 7593731 bytes
+SHA1 (patch-CMakeLists.txt) = caedc76c85272bb9d72c690a136f49a2a1210a00
 SHA1 (patch-src_lib_server_CConfig.cpp) = 94c5e9a57f9880ab8fcb75320bd2dbb306540966
 SHA1 (patch-tools_gmock-1.6.0_configure) = 0a3a23076b15858b79a8b3c2a9144ddaaad7ebe3
 SHA1 (patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h) = 70d0f775e952a67b2680c480f757e60eb183e5be

Index: pkgsrc/net/synergy/patches/patch-CMakeLists.txt
diff -u pkgsrc/net/synergy/patches/patch-CMakeLists.txt:1.3 pkgsrc/net/synergy/patches/patch-CMakeLists.txt:1.4
--- pkgsrc/net/synergy/patches/patch-CMakeLists.txt:1.3 Wed Sep  4 11:58:54 2019
+++ pkgsrc/net/synergy/patches/patch-CMakeLists.txt     Sat Mar  7 09:14:17 2020
@@ -1,10 +1,10 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2019/09/04 11:58:54 tnn Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2020/03/07 09:14:17 tnn Exp $
 
 Don't use hardcoded paths for finding libcrypto and libssl.
 
---- CMakeLists.txt.orig        2019-09-03 08:41:49.000000000 +0000
+--- CMakeLists.txt.orig        2019-12-16 10:03:44.000000000 +0000
 +++ CMakeLists.txt
-@@ -279,36 +279,7 @@ endif()
+@@ -279,31 +279,7 @@ endif()
  #
  # OpenSSL
  #
@@ -22,12 +22,7 @@ Don't use hardcoded paths for finding li
 -        ${OPENSSL_ROOT}/lib/libcrypto.lib
 -    )
 -elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
--    #Try use 1.1 for the latest features. otherwise use the default
--    IF(EXISTS /usr/local/opt/openssl@1.1)
--        set (OPENSSL_ROOT /usr/local/opt/openssl@1.1)
--    else()
--        set (OPENSSL_ROOT /usr/local/opt/openssl)
--    endif()
+-    set (OPENSSL_ROOT /usr/local/opt/openssl)
 -    include_directories (BEFORE SYSTEM ${OPENSSL_ROOT}/include)
 -    set (OPENSSL_LIBS
 -        ${OPENSSL_ROOT}/lib/libssl.a