CVS commit: pkgsrc/net/synergy

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Jun 25 09:49:24 UTC 2021

Modified Files:
        pkgsrc/net/synergy: Makefile distinfo
        pkgsrc/net/synergy/patches: patch-src_lib_server_Config.cpp
Added Files:
        pkgsrc/net/synergy/patches: patch-src_lib_arch_unix_ArchNetworkBSD.cpp
Removed Files:
        pkgsrc/net/synergy/patches: patch-CMakeLists.txt

Log Message:
synergy: update to 1.14.0.4

- bug fixes
- build system fixes
- code quality improvements


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 pkgsrc/net/synergy/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/net/synergy/distinfo
cvs rdiff -u -r1.5 -r0 pkgsrc/net/synergy/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/synergy/patches/patch-src_lib_arch_unix_ArchNetworkBSD.cpp
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/synergy/patches/patch-src_lib_server_Config.cpp

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.66 pkgsrc/net/synergy/Makefile:1.67
--- pkgsrc/net/synergy/Makefile:1.66    Wed Apr 21 13:25:13 2021
+++ pkgsrc/net/synergy/Makefile Fri Jun 25 09:49:23 2021
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.66 2021/04/21 13:25:13 adam Exp $
+# $NetBSD: Makefile,v 1.67 2021/06/25 09:49:23 tnn Exp $
 
-DISTNAME=              synergy-core-1.12.0
+DISTNAME=              synergy-core-1.14.0.4
 PKGNAME=               ${DISTNAME:S/-core//}
-PKGREVISION=           1
 CATEGORIES=            net x11
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=symless/}
 GITHUB_PROJECT=                synergy-core
-GITHUB_TAG=            v${PKGVERSION_NOREV}-stable
+GITHUB_TAG=            ${PKGVERSION_NOREV}-stable
 DISTFILES=             ${DEFAULT_DISTFILES} googletest-1.10.0.tar.gz
 SITES.googletest-1.10.0.tar.gz=        \
        -${MASTER_SITE_GITHUB:=google/}googletest/archive/release-1.10.0.tar.gz
@@ -20,7 +19,7 @@ USE_LANGUAGES=                c c++11
 USE_CMAKE=             yes
 CMAKE_ARGS+=           -DSYNERGY_BUILD_LEGACY_GUI=OFF
 
-CONFIGURE_ENV+=                GIT_COMMIT=cb8064e8
+CONFIGURE_ENV+=                GIT_COMMIT=67d824b8
 
 EXAMPLES=      MacReadme.txt org.synergy-foss.org.synergyc.plist \
                org.synergy-foss.org.synergys.plist synergy.conf.example \

Index: pkgsrc/net/synergy/distinfo
diff -u pkgsrc/net/synergy/distinfo:1.33 pkgsrc/net/synergy/distinfo:1.34
--- pkgsrc/net/synergy/distinfo:1.33    Thu Oct 22 13:47:34 2020
+++ pkgsrc/net/synergy/distinfo Fri Jun 25 09:49:23 2021
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.33 2020/10/22 13:47:34 tnn Exp $
+$NetBSD: distinfo,v 1.34 2021/06/25 09:49:23 tnn Exp $
 
 SHA1 (googletest-1.10.0.tar.gz) = 9c89be7df9c5e8cb0bc20b3c4b39bf7e82686770
 RMD160 (googletest-1.10.0.tar.gz) = f2f7f96adf1ab8aae3f6204fdba3ff150fd4396b
 SHA512 (googletest-1.10.0.tar.gz) = bd52abe938c3722adc2347afad52ea3a17ecc76730d8d16b065e165bc7477d762bce0997a427131866a89f1001e3f3315198204ffa5d643a9355f1f4d0d7b1a9
 Size (googletest-1.10.0.tar.gz) = 904349 bytes
-SHA1 (synergy-core-1.12.0.tar.gz) = 48d70c1d09b4c6c93cf3866ad0da289825bbba36
-RMD160 (synergy-core-1.12.0.tar.gz) = bcef3d62a1c67e97089fbb85f5a1439e0db92f38
-SHA512 (synergy-core-1.12.0.tar.gz) = 234e8eb42624f006aa45dfcf50a80089a82347c7151da040f10066b412f729adf01600bc9ec2274a0941965e91ab7bab74abd398287a20906dd4a70b1948db5a
-Size (synergy-core-1.12.0.tar.gz) = 8237539 bytes
-SHA1 (patch-CMakeLists.txt) = 76fc21ec8ed63b35e71ed3a08012a05b7ef65ddf
-SHA1 (patch-src_lib_server_Config.cpp) = 94c5e9a57f9880ab8fcb75320bd2dbb306540966
+SHA1 (synergy-core-1.14.0.4.tar.gz) = 7eade0b84b983968b2c4f859cd878765519498cf
+RMD160 (synergy-core-1.14.0.4.tar.gz) = 1de0d7b0a298e00354dbf67fe682a8c95e7b2cfa
+SHA512 (synergy-core-1.14.0.4.tar.gz) = 278ff319c5d308052e9f89a8ae53a99aacaa2b394d28e353b3779a4ee672cb09d91f37a4b0564788456d8e0bed90936d924739e74f7aa2a85482926164dc2fc8
+Size (synergy-core-1.14.0.4.tar.gz) = 8835907 bytes
+SHA1 (patch-src_lib_arch_unix_ArchNetworkBSD.cpp) = 17e0e3253ddc47c662a836aa4d01836c31ab588b
+SHA1 (patch-src_lib_server_Config.cpp) = dc6a00fd33e71480a5f002cf15b8f876143f82a3

Index: pkgsrc/net/synergy/patches/patch-src_lib_server_Config.cpp
diff -u pkgsrc/net/synergy/patches/patch-src_lib_server_Config.cpp:1.1 pkgsrc/net/synergy/patches/patch-src_lib_server_Config.cpp:1.2
--- pkgsrc/net/synergy/patches/patch-src_lib_server_Config.cpp:1.1      Thu Oct 22 13:47:34 2020
+++ pkgsrc/net/synergy/patches/patch-src_lib_server_Config.cpp  Fri Jun 25 09:49:24 2021
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_lib_server_Config.cpp,v 1.1 2020/10/22 13:47:34 tnn Exp $
+$NetBSD: patch-src_lib_server_Config.cpp,v 1.2 2021/06/25 09:49:24 tnn Exp $
 
 Fix for some EOF problem. Not sure it's still required as the
 previous patch has been adapted to upstream changes.
 
---- src/lib/server/Config.cpp.orig     2014-12-02 15:03:19.000000000 +0000
+--- src/lib/server/Config.cpp.orig     2021-06-08 13:44:14.000000000 +0000
 +++ src/lib/server/Config.cpp
-@@ -1931,7 +1931,7 @@ ConfigReadContext::getLineNumber() const
+@@ -1974,7 +1974,7 @@ ConfigReadContext::getLineNumber() const
  bool
  ConfigReadContext::operator!() const
  {

Added files:

Index: pkgsrc/net/synergy/patches/patch-src_lib_arch_unix_ArchNetworkBSD.cpp
diff -u /dev/null pkgsrc/net/synergy/patches/patch-src_lib_arch_unix_ArchNetworkBSD.cpp:1.1
--- /dev/null   Fri Jun 25 09:49:24 2021
+++ pkgsrc/net/synergy/patches/patch-src_lib_arch_unix_ArchNetworkBSD.cpp       Fri Jun 25 09:49:24 2021
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_lib_arch_unix_ArchNetworkBSD.cpp,v 1.1 2021/06/25 09:49:24 tnn Exp $
+
+https://github.com/symless/synergy-core/issues/7045
+
+--- src/lib/arch/unix/ArchNetworkBSD.cpp.orig  2021-06-08 13:44:14.000000000 +0000
++++ src/lib/arch/unix/ArchNetworkBSD.cpp
+@@ -679,6 +679,7 @@ ArchNetworkBSD::nameToAddr(const std::st
+     char ipstr[INET6_ADDRSTRLEN];
+     struct addrinfo hints;
+     struct addrinfo *pResult;
++    struct addrinfo *pOrigResult;
+     struct in6_addr serveraddr;
+     int ret;
+ 
+@@ -703,6 +704,7 @@ ArchNetworkBSD::nameToAddr(const std::st
+         ARCH->unlockMutex(m_mutex);
+         throwNameError(ret);
+     }
++    pOrigResult = pResult;
+ 
+     for(; pResult != nullptr; pResult = pResult->ai_next ) {
+         addresses.push_back(new ArchNetAddressImpl);
+@@ -715,7 +717,7 @@ ArchNetworkBSD::nameToAddr(const std::st
+         memcpy(&addresses.back()->m_addr, pResult->ai_addr, addresses.back()->m_len);
+     }
+ 
+-    freeaddrinfo(pResult);
++    freeaddrinfo(pOrigResult);
+     ARCH->unlockMutex(m_mutex);
+ 
+     return addresses;