Use corresponding Bonjour libs for different versions of OS

v1.9.0-stable
Update OpenSSL to v1.0.2n
2026-02-12 22:55:53 +08:00 · 2018-03-20 11:41:38 +00:00 · 2018-03-19 12:21:20 +00:00 · 2018-03-19 11:27:34 +00:00 · 2018-03-18 20:50:26 +00:00 · 2018-02-28 01:14:41 +00:00
853 changed files with 10569 additions and 8451 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,16 +1,15 @@
 ### Operating Systems ###

 Server: microOS Tiara
-
 Client: Applesoft Windy OS 10

 **READ ME, DELETE ME**: On Windows, hold the Windows key and press 'r', type 'winver' and hit return to get your OS version. On Mac, hit the Apple menu (top left of the screen) and check 'About this Mac'. Linux users... you know what you're using ;)

-### Barrier Version ###
+### Synergy Version ###

-1.9.π
+1.8.π

-**READ ME, DELETE ME**: Go to the 'Help' (on Windows) or 'Barrier' (on macOS) menu and then 'About Barrier' to check your version. Verify that you are using the same version across all of your machines, and that your issue still occurs with the latest release available at https://github.com/debauchee/barrier/
+**READ ME, DELETE ME**: Go to the 'Help' (on Windows) or 'Synergy' (on macOS) menu and then 'About Synergy' to check your version. Verify that you are using the same version across all of your machines, and that your issue still occurs with the latest release available at https://symless.com/account/login

 ### Steps to reproduce bug ###

@@ -20,11 +19,14 @@ Client: Applesoft Windy OS 10
 2. Type things.
 3. Bug occurs.
 4. ... 
+5. Profit?

 ### Other info ###

 * When did the problem start to occur? When I...
 * Is there a way to work around it? No/Yes, you can...
-* Does this bug prevent you from using Barrier entirely? Yes/No
+* Does this bug prevent you from using Synergy entirely? Yes/No
+
+Please follow the link below to send us logs from both your server and client sides if it's appropriate. https://github.com/symless/synergy/wiki/Sending-logs

 Put anything else you can think of here.
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-build_env.*
 config.h
 .DS_Store
 *.pyc
@@ -19,4 +18,4 @@ config.h
 src/gui/gui.pro.user*
 src/gui/.qmake.stash
 src/gui/.rnd
-src/setup/win32/barrier.suo
+src/setup/win32/synergy.suo
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +0,0 @@
-language: cpp
-before_install:
- sudo apt-get update -qq
- sudo apt-get install -qq libxtst-dev
- sudo apt-get install -qq qtdeclarative5-dev
- sudo apt-get install -qq libavahi-compat-libdnssd-dev
-script: sh -x ./clean_build.sh
-# skip install phase since we have a customized install package
-# creation tool for each supported platform
-install: true
--- a/Build.properties
+++ b/Build.properties
@@ -1,7 +1,7 @@
 #
-# Barrier build parameters
+# Synergy build parameters
 #
-BARRIER_VERSION_MAJOR = 1
-BARRIER_VERSION_MINOR = 9
-BARRIER_VERSION_PATCH = 0
-BARRIER_VERSION_STAGE = snapshot
+SYNERGY_VERSION_MAJOR = 1
+SYNERGY_VERSION_MINOR = 9
+SYNERGY_VERSION_PATCH = 0
+SYNERGY_VERSION_STAGE = stable
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,4 @@
-# Barrier -- mouse and keyboard sharing utility
-# Copyright (C) 2018 Debauchee Open Source Group
+# Synergy -- mouse and keyboard sharing utility
 # Copyright (C) 2012-2016 Symless Ltd.
 # Copyright (C) 2009 Nick Bolton
 #
@@ -16,10 +15,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

 cmake_minimum_required (VERSION 3.4)
-project (barrier C CXX)
+project (synergy C CXX)

-option (BARRIER_BUILD_GUI "Build the GUI" ON)
-option (BARRIER_BUILD_INSTALLER "Build the installer" ON)
+option (SYNERGY_BUILD_LEGACY_GUI "Build the legacy GUI" ON)
+option (SYNERGY_BUILD_LEGACY_SERVICE "Build the legacy service (synergyd)" ON)
+option (SYNERGY_BUILD_LEGACY_INSTALLER "Build the legacy installer" ON)

 set (CMAKE_CXX_STANDARD 14)
 set (CMAKE_CXX_EXTENSIONS OFF)
@@ -31,8 +31,10 @@ if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
    add_definitions (-DNDEBUG)
 endif()

+#
+# Synergy version
+#
 include (cmake/Version.cmake)
-include (cmake/Package.cmake)

 # TODO: Find out why we need these, and remove them
 if (COMMAND cmake_policy)
@@ -42,9 +44,9 @@ endif()

 # Add headers to source list
 if (${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
-    set (BARRIER_ADD_HEADERS FALSE)
+    set (SYNERGY_ADD_HEADERS FALSE)
 else()
-    set (BARRIER_ADD_HEADERS TRUE)
+    set (SYNERGY_ADD_HEADERS TRUE)
 endif()

 set (libs)
@@ -154,14 +156,9 @@ if (UNIX)
        )

    else() # not-apple
-        # FreeBSD uses /usr/local for anything not part of base
-        # Also package avahi-libdns puts dns_sd.h a bit deeper
-        if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
-            set (CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};/usr/local/include;/usr/local/include/avahi-compat-libdns_sd")
-            set (CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -L/usr/local/lib")
-            include_directories("/usr/local/include" "/usr/local/include/avahi-compat-libdns_sd")
-            link_directories("/usr/local/lib")
-        endif()
+
+        # add include dir for bsd (posix uses /usr/include/)
+        set (CMAKE_INCLUDE_PATH "${CMAKE_INCLUDE_PATH}:/usr/local/include")

        set (XKBlib "X11/Xlib.h;X11/XKBlib.h")
        set (CMAKE_EXTRA_INCLUDE_FILES "${XKBlib};X11/extensions/Xrandr.h")
@@ -176,7 +173,6 @@ if (UNIX)
        check_include_files ("X11/extensions/XTest.h" HAVE_X11_EXTENSIONS_XTEST_H)
        check_include_files ("${XKBlib}" HAVE_X11_XKBLIB_H)
        check_include_files ("X11/extensions/XInput2.h" HAVE_XI2)
-        check_include_files ("dns_sd.h" HAVE_DNSSD)

        if (HAVE_X11_EXTENSIONS_DPMS_H)
            # Assume that function prototypes declared, when include exists.
@@ -187,10 +183,6 @@ if (UNIX)
            message (FATAL_ERROR "Missing header: " ${XKBlib})
        endif()

-        if (NOT HAVE_DNSSD)
-            message (FATAL_ERROR "Missing header: dns_sd.h")
-        endif()
-
        check_library_exists ("SM;ICE" IceConnectionNumber "" HAVE_ICE)
        check_library_exists ("Xext;X11" DPMSQueryExtension "" HAVE_Xext)
        check_library_exists ("Xtst;Xext;X11" XTestQueryExtension "" HAVE_Xtst)
@@ -209,7 +201,7 @@ if (UNIX)
        if (HAVE_Xtst)

            # Xtxt depends on X11.
-            set (HAVE_X11 1)
+            set (HAVE_X11)
            list (APPEND libs Xtst X11)

        else()
@@ -280,7 +272,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
        /DWIN32
        /D_WINDOWS
        /D_CRT_SECURE_NO_WARNINGS
-        /DBARRIER_VERSION=\"${BARRIER_VERSION}\"
+        /DSYNERGY_VERSION=\"${SYNERGY_VERSION}\"
        /D_XKEYCHECK_H
    )
 endif()
@@ -312,14 +304,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
    set (OPENSSL_LIBS ssl crypto)
 else()
-    find_library (lib_ssl ssl)
-    find_library (lib_crypto crypto)
-    if (NOT lib_ssl)
-        message(FATAL_ERROR "openssl library not found")
-    elseif (NOT lib_crypto)
-        message(FATAL_ERROR "crypto library not found")
-    endif()
-    set (OPENSSL_LIBS ${lib_ssl} ${lib_crypto})
+    message (FATAL_ERROR "Couldn't find OpenSSL")
 endif()

 #
@@ -352,28 +337,26 @@ macro (configure_files srcDir destDir)
    endforeach (templateFile)
 endmacro (configure_files)

-if (${BARRIER_BUILD_INSTALLER})
+if (${SYNERGY_BUILD_LEGACY_INSTALLER})
 #
 # macOS app Bundle
 #
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
    set (CMAKE_INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks")
-    set (BARRIER_BUNDLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dist/macos/bundle)
-    set (BARRIER_BUNDLE_DIR ${CMAKE_BINARY_DIR}/bundle)
-    set (BARRIER_BUNDLE_APP_DIR ${BARRIER_BUNDLE_DIR}/Barrier.app)
-    set (BARRIER_BUNDLE_BINARY_DIR ${BARRIER_BUNDLE_APP_DIR}/Contents/MacOS)
+    set (SYNERGY_BUNDLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dist/macos/bundle)
+    set (SYNERGY_BUNDLE_DIR ${CMAKE_BINARY_DIR}/bundle)
+    set (SYNERGY_BUNDLE_APP_DIR ${SYNERGY_BUNDLE_DIR}/Synergy.app)
+    set (SYNERGY_BUNDLE_BINARY_DIR ${SYNERGY_BUNDLE_APP_DIR}/Contents/MacOS)

-    configure_files (${BARRIER_BUNDLE_SOURCE_DIR} ${BARRIER_BUNDLE_DIR})
+    configure_files (${SYNERGY_BUNDLE_SOURCE_DIR} ${SYNERGY_BUNDLE_DIR})
 endif()

 #
 # Windows installer
 #
 if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-        message (STATUS "Configuring the wix installer")
-        configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/wix ${CMAKE_BINARY_DIR}/installer-wix)
-        message (STATUS "Configuring the inno installer")
-        configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/inno ${CMAKE_BINARY_DIR}/installer-inno)
+        message (STATUS "Configuring the v1 installer")
+        configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/wix ${CMAKE_BINARY_DIR}/installer)
 endif()

 #
@@ -381,15 +364,15 @@ endif()
 #
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
    configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/rpm ${CMAKE_BINARY_DIR}/rpm)
-    install(FILES res/barrier.svg DESTINATION share/icons/hicolor/scalable/apps)
+    install(FILES res/synergy.svg DESTINATION share/icons/hicolor/scalable/apps)
    if("${VERSION_MAJOR}" STREQUAL "2") 
-        install(FILES res/barrier2.desktop DESTINATION share/applications)
+        install(FILES res/synergy2.desktop DESTINATION share/applications)
    else()
-        install(FILES res/barrier.desktop DESTINATION share/applications)
+        install(FILES res/synergy.desktop DESTINATION share/applications)
    endif()
 endif()

 else()
-    message (STATUS "NOT configuring the installer")
+    message (STATUS "NOT configuring the v1 installer")
 endif()
 add_subdirectory (src)
--- a/1
+++ b/1
@@ -1,4 +1,3 @@
-Copyright (C) 2018 Debauchee Open Source Group
 Copyright (C) 2012-2016 Symless Ltd.
 Copyright (C) 2008-2014 Nick Bolton
 Copyright (C) 2002-2014 Chris Schoeneman
--- a/README.md
+++ b/README.md
@@ -1,31 +0,0 @@
-# Barrier
-
-Eliminate the barrier between your machines.
-
-Master branch build status: &nbsp; [![Build Status](https://travis-ci.org/debauchee/barrier.svg?branch=master)](https://travis-ci.org/debauchee/barrier)
-
-### What is it?
-
-Barrier is KVM software forked from Symless's synergy 1.9 codebase. Synergy was a commercialized reimplementation of the original CosmoSynergy written by Chris Schoeneman.
-
-### What's different?
-
-Whereas synergy has moved beyond its goals from the 1.x era, barrier aims to maintain that simplicity. Barrier will let you use your keyboard and mouse from machine A to control machine B (or more). That's it.
-
-### Project goals
-
-Hassle-free reliability. We are users, too. Barrier was created so that we could solve the issues we had with synergy and then share these fixes with other users.
-
-Compatibility. We use more than one operating system and you probably do, too. Windows, OSX, Linux, FreeBSD... Barrier should "just work". We will also have our eye on Wayland when the time comes.
-
-Communication. Everything we do is in the open. Our issue tracker will let you see if others are having the same problem you're having and will allow you to add additional information. You will also be able to see when progress is made and how the issue gets resolved.
-
-### Contact & support
-
-Please be aware that the *only* way to draw our attention to a bug is to create a new PR in the issue tracker. Write a clear, concise, detailed report and you will get a clear, concise, detailed response. Priority is always give to issues that affect a wider range of users.
-
-For short and simple questions or to just say hello find us on the Freenode IRC network in the #barrier channel.
-
-### Contributions
-
-At this time we are looking for developers to help fix the issues found in the issue tracker. Submit pull requests once you've polished up your patch and we'll review and possibly merge it.
--- a/_config.yml
+++ b/_config.yml
@@ -1 +0,0 @@
-theme: jekyll-theme-slate
--- a/build_installer.bat
+++ b/build_installer.bat
@@ -1,35 +0,0 @@
-@echo off
-set WIX_ROOT=C:\Program Files (x86)\WiX Toolset v3.11
-
-set savedir=%cd%
-cd /d %~dp0
-
-if not exist build\bin\Release goto buildproject
-
-cd build\installer
-if ERRORLEVEL 1 goto buildproject
-
-echo Building 64-bit Windows installer...
-"%WIX_ROOT%\bin\candle.exe" -nologo -arch x64 -dConfiguration=Release -dPlatform=x64 -ext WixUtilExtension -ext WixFirewallExtension Product.wxs -o Barrier.wixobj
-if ERRORLEVEL 1 goto failed
-"%WIX_ROOT%\bin\light.exe" -nologo -ext WixUtilExtension -ext WixFirewallExtension -ext WixUIExtension Barrier.wixobj -o bin\Barrier.msi
-if ERRORLEVEL 1 goto failed
-echo Build completed successfully
-goto done
-
-:buildproject
-echo To build a 64-bit Windows installer:
-echo  - set Q_BUILD_TYPE=Release in build_env.bat
-echo  - also set other environmental overrides necessary for your build environment
-echo  - run clean_build.bat to build Barrier and verify that it succeeds
-echo  - re-run this script to create the installation package
-goto done
-
-:failed
-echo Build failed
-
-:done
-set WIX_ROOT=
-
-cd /d %savedir%
-set savedir=
--- a/clean_build.bat
+++ b/clean_build.bat
@@ -1,71 +0,0 @@
-@echo off
-
-REM defaults - override them by creating a build_env.bat file
-set B_BUILD_TYPE=Debug
-set B_QT_ROOT=C:\Qt
-set B_QT_VER=5.6.3
-set B_QT_MSVC=msvc2015_64
-set B_BONJOUR=C:\Program Files\Bonjour SDK
-
-set savedir=%cd%
-cd /d %~dp0
-
-if exist build_env.bat call build_env.bat
-
-REM needed by cmake to set bonjour include dir
-set BONJOUR_SDK_HOME=%B_BONJOUR%
-
-REM full path to Qt stuff we need
-set B_QT_FULLPATH=%B_QT_ROOT%\%B_QT_VER%\%B_QT_MSVC%
-
-echo Bonjour: %BONJOUR_SDK_HOME%
-echo Qt: %B_QT_FULLPATH%
-
-rmdir /q /s build
-mkdir build
-if ERRORLEVEL 1 goto failed
-cd build
-cmake -G "Visual Studio 15 2017 Win64" -D CMAKE_BUILD_TYPE=%B_BUILD_TYPE% -D CMAKE_PREFIX_PATH="%B_QT_FULLPATH%" -D DNSSD_LIB="%B_BONJOUR%\Lib\x64\dnssd.lib" -D QT_VERSION=%B_QT_VER% ..
-if ERRORLEVEL 1 goto failed
-echo @msbuild barrier.sln /p:Platform="x64" /p:Configuration=%B_BUILD_TYPE% /m %B_BUILD_OPTIONS% > make.bat
-call make.bat
-if ERRORLEVEL 1 goto failed
-if exist bin\Debug (
-    copy %B_QT_FULLPATH%\bin\Qt5Cored.dll bin\Debug\ > NUL
-    copy %B_QT_FULLPATH%\bin\Qt5Guid.dll bin\Debug\ > NUL
-    copy %B_QT_FULLPATH%\bin\Qt5Networkd.dll bin\Debug\ > NUL
-    copy %B_QT_FULLPATH%\bin\Qt5Widgetsd.dll bin\Debug\ > NUL
-    copy %B_QT_FULLPATH%\bin\Qt5Cored.dll bin\Debug\ > NUL
-    copy ..\ext\openssl\windows\x64\bin\* bin\Debug\ > NUL
-    copy ..\res\openssl\barrier.conf bin\Debug\ > NUL
-) else if exist bin\Release (
-    copy %B_QT_FULLPATH%\bin\Qt5Core.dll bin\Release\ > NUL
-    copy %B_QT_FULLPATH%\bin\Qt5Gui.dll bin\Release\ > NUL
-    copy %B_QT_FULLPATH%\bin\Qt5Network.dll bin\Release\ > NUL
-    copy %B_QT_FULLPATH%\bin\Qt5Widgets.dll bin\Release\ > NUL
-    copy %B_QT_FULLPATH%\bin\Qt5Core.dll bin\Release\ > NUL
-    copy ..\ext\openssl\windows\x64\bin\* bin\Release\ > NUL
-    copy ..\res\openssl\barrier.conf bin\Release\ > NUL
-    mkdir bin\Release\platforms
-    copy %B_QT_FULLPATH%\plugins\platforms\qwindows.dll bin\Release\platforms\ > NUL
-) else (
-    echo Remember to copy supporting binaries and confiuration files!
-)
-
-echo Build completed successfully
-goto done
-
-:failed
-echo Build failed
-
-:done
-cd /d %savedir%
-
-set B_BUILD_TYPE=
-set B_QT_ROOT=
-set B_QT_VER=
-set B_QT_MSVC=
-set B_BONJOUR=
-set BONJOUR_SDK_HOME=
-set B_QT_FULLPATH=
-set savedir=
--- a/clean_build.sh
+++ b/clean_build.sh
@@ -1,28 +0,0 @@
-#!/bin/sh
-cd "$(dirname $0)" || exit 1
-# some environments have cmake v2 as 'cmake' and v3 as 'cmake3'
-# check for cmake3 first then fallback to just cmake
-B_CMAKE=`type cmake3 2>/dev/null`
-if [ $? -eq 0 ]; then
-    B_CMAKE=`echo $B_CMAKE | cut -d' ' -f3`
-else
-    B_CMAKE=cmake
-fi
-# default build configuration
-B_BUILD_TYPE=${B_BUILD_TYPE:-Debug}
-if [ "$(uname)" = "Darwin" ]; then
-    # OSX needs a lot of extra help, poor thing
-    # run the osx_environment.sh script to fix paths
-    . ./osx_environment.sh
-    B_CMAKE_FLAGS="-DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 $B_CMAKE_FLAGS"
-fi
-# allow local customizations to build environment
-[ -r ./build_env.sh ] && . ./build_env.sh
-B_CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=$B_BUILD_TYPE $B_CMAKE_FLAGS"
-rm -rf build
-mkdir build || exit 1
-cd build || exit 1
-echo Starting Barrier $B_BUILD_TYPE build...
-$B_CMAKE $B_CMAKE_FLAGS .. || exit 1
-make || exit 1
-echo "Build completed successfully"
--- a/cmake/Package.cmake
+++ b/cmake/Package.cmake
@@ -1,9 +0,0 @@
-if (UNIX)
-    set (CPACK_PACKAGE_VERSION_MAJOR ${BARRIER_VERSION_MAJOR})
-    set (CPACK_PACKAGE_VERSION_MINOR ${BARRIER_VERSION_MINOR})
-    set (CPACK_PACKAGE_VERSION_PATCH ${BARRIER_VERSION_PATCH})
-    set (CPACK_GENERATOR "TBZ2")
-    set (CPACK_SOURCE_GENERATOR "TXZ")
-    set (CPACK_SOURCE_IGNORE_FILES "/build/;\.gitignore$;/\.git/;/.github/;\.swp$;build_env\.*")
-    include (CPack)
-endif()
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -1,94 +1,90 @@
 cmake_minimum_required (VERSION 3.4)

-set (BARRIER_VERSION_MAJOR 2)
-set (BARRIER_VERSION_MINOR 1)
-set (BARRIER_VERSION_PATCH 0)
-
 #
-# Barrier Version
+# Synergy Version
 #
-if (NOT DEFINED BARRIER_VERSION_MAJOR)
-    if (DEFINED ENV{BARRIER_VERSION_MAJOR})
-        set (BARRIER_VERSION_MAJOR $ENV{BARRIER_VERSION_MAJOR})
+if (NOT DEFINED SYNERGY_VERSION_MAJOR)
+    if (DEFINED ENV{SYNERGY_VERSION_MAJOR})
+        set (SYNERGY_VERSION_MAJOR $ENV{SYNERGY_VERSION_MAJOR})
    else()
-        set (BARRIER_VERSION_MAJOR 1)
+        set (SYNERGY_VERSION_MAJOR 1)
    endif()
 endif()

-if (NOT DEFINED BARRIER_VERSION_MINOR)
-    if (DEFINED ENV{BARRIER_VERSION_MINOR})
-        set (BARRIER_VERSION_MINOR $ENV{BARRIER_VERSION_MINOR})
+if (NOT DEFINED SYNERGY_VERSION_MINOR)
+    if (DEFINED ENV{SYNERGY_VERSION_MINOR})
+        set (SYNERGY_VERSION_MINOR $ENV{SYNERGY_VERSION_MINOR})
    else()
-        set (BARRIER_VERSION_MINOR 9)
+        set (SYNERGY_VERSION_MINOR 9)
    endif()
 endif()

-if (NOT DEFINED BARRIER_VERSION_PATCH)
-    if (DEFINED ENV{BARRIER_VERSION_PATCH})
-        set (BARRIER_VERSION_PATCH $ENV{BARRIER_VERSION_PATCH})
+if (NOT DEFINED SYNERGY_VERSION_PATCH)
+    if (DEFINED ENV{SYNERGY_VERSION_PATCH})
+        set (SYNERGY_VERSION_PATCH $ENV{SYNERGY_VERSION_PATCH})
    else()
-        set (BARRIER_VERSION_PATCH 0)
-        message (WARNING "Barrier version wasn't set. Set to ${BARRIER_VERSION_MAJOR}.${BARRIER_VERSION_MINOR}.${BARRIER_VERSION_PATCH}")
+        set (SYNERGY_VERSION_PATCH 0)
+        message (WARNING "Synergy version wasn't set. Set to ${SYNERGY_VERSION_MAJOR}.${SYNERGY_VERSION_MINOR}.${SYNERGY_VERSION_PATCH}")
    endif()
 endif()

-if (NOT DEFINED BARRIER_VERSION_STAGE)
-    if (DEFINED ENV{BARRIER_VERSION_STAGE})
-        set (BARRIER_VERSION_STAGE $ENV{BARRIER_VERSION_STAGE})
+if (NOT DEFINED SYNERGY_VERSION_STAGE)
+    if (DEFINED ENV{SYNERGY_VERSION_STAGE})
+        set (SYNERGY_VERSION_STAGE $ENV{SYNERGY_VERSION_STAGE})
    else()
-        set (BARRIER_VERSION_STAGE "snapshot")
+        set (SYNERGY_VERSION_STAGE "snapshot")
    endif()
 endif()

-if (NOT DEFINED BARRIER_REVISION)
+if (NOT DEFINED SYNERGY_REVISION)
    if (DEFINED ENV{GIT_COMMIT})
-        string (SUBSTRING $ENV{GIT_COMMIT} 0 8 BARRIER_REVISION)
-    else()
-        find_program (GIT_BINARY git)
-        if (NOT GIT_BINARY STREQUAL "GIT_BINARY-NOTFOUND")
-            execute_process (
-                COMMAND git rev-parse --short=8 HEAD
-                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-                OUTPUT_VARIABLE BARRIER_REVISION
-                OUTPUT_STRIP_TRAILING_WHITESPACE
-            )
-        endif()
+        string (SUBSTRING $ENV{GIT_COMMIT} 0 8 SYNERGY_REVISION)
+    elseif (SYNERGY_VERSION_STAGE STREQUAL "snapshot")
+        execute_process (
+            COMMAND git rev-parse --short=8 HEAD
+            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+            OUTPUT_VARIABLE SYNERGY_REVISION
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
    endif()
 endif()

-string(LENGTH "${BARRIER_REVISION}" BARRIER_REVISION_LENGTH)
-if (NOT BARRIER_REVISION_LENGTH EQUAL 8 OR NOT BARRIER_REVISION MATCHES "^[a-f0-9]+")
-    set (BARRIER_REVISION "00000000")
-    message (WARNING "revision not found. setting to ${BARRIER_REVISION}")
+if (DEFINED SYNERGY_REVISION)
+    string(LENGTH ${SYNERGY_REVISION} SYNERGY_REVISION_LENGTH)
+    if (NOT ((SYNERGY_REVISION MATCHES "^[a-f0-9]+") AND (SYNERGY_REVISION_LENGTH EQUAL "8")))
+        message (FATAL_ERROR "SYNERGY_REVISION ('${SYNERGY_REVISION}') should be a short commit hash")
+    endif()
+    unset (SYNERGY_REVISION_LENGTH)
+else()
+	set (SYNERGY_REVISION "0badc0de")
 endif()
-unset (BARRIER_REVISION_LENGTH)

 if (DEFINED ENV{BUILD_NUMBER})
-    set (BARRIER_BUILD_NUMBER $ENV{BUILD_NUMBER})
+    set (SYNERGY_BUILD_NUMBER $ENV{BUILD_NUMBER})
 else()
-    set (BARRIER_BUILD_NUMBER 1)
+    set (SYNERGY_BUILD_NUMBER 1)
 endif()

-string (TIMESTAMP BARRIER_BUILD_DATE "%Y%m%d" UTC)
-set (BARRIER_SNAPSHOT_INFO ".${BARRIER_VERSION_STAGE}.${BARRIER_REVISION}")
+string (TIMESTAMP SYNERGY_BUILD_DATE "%Y%m%d" UTC)
+set (SYNERGY_SNAPSHOT_INFO ".${SYNERGY_VERSION_STAGE}.${SYNERGY_REVISION}")

-if (BARRIER_VERSION_STAGE STREQUAL "snapshot")
-    set (BARRIER_VERSION_TAG "${BARRIER_VERSION_STAGE}.b${BARRIER_BUILD_NUMBER}-${BARRIER_REVISION}")
+if (SYNERGY_VERSION_STAGE STREQUAL "snapshot")
+    set (SYNERGY_VERSION_TAG "${SYNERGY_VERSION_STAGE}.b${SYNERGY_BUILD_NUMBER}-${SYNERGY_REVISION}")
 else()
-    set (BARRIER_VERSION_TAG "${BARRIER_VERSION_STAGE}")
+    set (SYNERGY_VERSION_TAG "${SYNERGY_VERSION_STAGE}")
 endif()

-set (BARRIER_VERSION "${BARRIER_VERSION_MAJOR}.${BARRIER_VERSION_MINOR}.${BARRIER_VERSION_PATCH}-${BARRIER_VERSION_STAGE}")
-set (BARRIER_VERSION_STRING "${BARRIER_VERSION}-${BARRIER_VERSION_TAG}")
-message (STATUS "Full Barrier version string is '" ${BARRIER_VERSION_STRING} "'")
+set (SYNERGY_VERSION "${SYNERGY_VERSION_MAJOR}.${SYNERGY_VERSION_MINOR}.${SYNERGY_VERSION_PATCH}")
+set (SYNERGY_VERSION_STRING "${SYNERGY_VERSION}-${SYNERGY_VERSION_TAG}")
+message (STATUS "Full Synergy version string is '" ${SYNERGY_VERSION_STRING} "'")

-add_definitions (-DBARRIER_VERSION="${BARRIER_VERSION}")
-add_definitions (-DBARRIER_VERSION_STRING="${BARRIER_VERSION_STRING}")
-add_definitions (-DBARRIER_REVISION="${BARRIER_REVISION}")
-add_definitions (-DBARRIER_BUILD_DATE="${BARRIER_BUILD_DATE}")
-add_definitions (-DBARRIER_BUILD_NUMBER=${BARRIER_BUILD_NUMBER})
+add_definitions (-DSYNERGY_VERSION="${SYNERGY_VERSION}")
+add_definitions (-DSYNERGY_VERSION_STRING="${SYNERGY_VERSION_STRING}")
+add_definitions (-DSYNERGY_REVISION="${SYNERGY_REVISION}")
+add_definitions (-DSYNERGY_BUILD_DATE="${SYNERGY_BUILD_DATE}")
+add_definitions (-DSYNERGY_BUILD_NUMBER=${SYNERGY_BUILD_NUMBER})

-if (BARRIER_DEVELOPER_MODE)
-    add_definitions (-DBARRIER_DEVELOPER_MODE=1)
+if (SYNERGY_DEVELOPER_MODE)
+    add_definitions (-DSYNERGY_DEVELOPER_MODE=1)
 endif()

--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,17 @@
-Source: barrier
+Source: synergy
 Section: utils
 Priority: optional
 Standards-Version: 3.9.7
-Homepage: https://github.com/debauchee/barrier/
-Maintainer: Debauchee Open Source Group <todo@mail.com>
+Homepage: https://www.symless.com/
+Maintainer: Symless <engineering@symless.com>

-Package: barrier
+Package: synergy
 Architecture: amd64
 Section: utils
 Priority: optional
 Depends: ${shlibs:Depends},
         ${misc:Depends}
 Description: Keyboard and mouse sharing solution
- Barrier allows you to share one mouse and keyboard between multiple computers.
+ Synergy allows you to share one mouse and keyboard between multiple computers.
 Work seamlessly across Windows, macOS and Linux.
-Homepage: https://github.com/debauchee/barrier/
+Homepage: https://symless.com/synergy
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Barrier
-Source: https://github.com/debauchee/barrier/
+Upstream-Name: Synergy
+Source: https://www.symless.com/synergy
 Disclaimer: This package is not part of the Debian project as it contains closed source proprietary components
-Copyright: Copyright (C) 2018 Debauchee Open Source Group
+Copyright: Copyright (C) 2012-2017 Symless Ltd
--- a/dist/inno/barrier.iss.in
+++ b/dist/inno/barrier.iss.in
@@ -1,74 +0,0 @@
-#define MyAppName "Barrier"
-#define MyAppVersion "@BARRIER_VERSION@"
-#define MyAppPublisher "Debauchee Open Source Group"
-#define MyAppURL "https://github.com/debauchee/barrier/wiki"
-#define MyAppExeName "barrier.exe"
-#define MyAppServiceName "Barrier"
-#define MyAppServiceExe "barrierd.exe"
-#define MyAppServiceDesc "Manages the Barrier background processes."
-
-[Setup]
-AppId={{41036EA6-3F7A-4803-8AE0-469E5E91EFCC}
-AppName={#MyAppName}
-AppVersion={#MyAppVersion}
-AppVerName={#MyAppName} {#MyAppVersion}
-AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
-AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\{#MyAppName}
-DisableProgramGroupPage=yes
-LicenseFile=@CMAKE_CURRENT_SOURCE_DIR@/res/License.rtf
-OutputDir=@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/../installer-inno/bin
-OutputBaseFilename=BarrierSetup-{#MyAppVersion}
-SetupIconFile=@CMAKE_CURRENT_SOURCE_DIR@/res/barrier.ico
-Compression=lzma
-SolidCompression=yes
-ArchitecturesInstallIn64BitMode=x64 ia64
-
-#include "scripts\lang\english.iss"
-
-[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-
-[Files]
-Source: "@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/Release/*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-[Icons]
-Name: "{commonprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
-Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
-
-[Run]
-Filename: {sys}\sc.exe; Parameters: "create {#MyAppServiceName} start= auto binPath= ""{app}\{#MyAppServiceExe}"""; Flags: runhidden
-Filename: {sys}\sc.exe; Parameters: "description {#MyAppServiceName} ""{#MyAppServiceDesc}"""; Flags: runhidden
-Filename: {sys}\sc.exe; Parameters: "start {#MyAppServiceName}"; Flags: runhidden
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
-
-[UninstallDelete]
-Type: files; Name: "{app}\barrierd.log"
-
-[UninstallRun]
-Filename: {sys}\sc.exe; Parameters: "stop {#MyAppServiceName}"; Flags: runhidden
-Filename: {sys}\sc.exe; Parameters: "delete {#MyAppServiceName}"; Flags: runhidden
-
-[CustomMessages]
-DependenciesDir="redist"
-
-; shared code for installing the products
-#include "scripts\products.iss"
-#include "scripts\products\stringversion.iss"
-#include "scripts\products\winversion.iss"
-#include "scripts\products\msiproduct.iss"
-#include "scripts\products\vcredist2017.iss"
-
-[Code]
-function InitializeSetup(): boolean;
-begin
-	// initialize windows version
-	initwinversion();
-
-  vcredist2017('14'); // min allowed version is 14.0
-
-	Result := true;
-end;
--- a/dist/inno/scripts/isxdl/english.ini
+++ b/dist/inno/scripts/isxdl/english.ini
@@ -1,49 +0,0 @@
-[strings]
-; General
-100=File download
-101=Do you want to cancel the download?
-102=%1 (%2 of %3)
-103=%1 KB
-104=%1 KB of %2 KB (%3%)
-
-; Status information
-110=Getting file information...
-111=Redirecting to %1
-112=Sending request...
-113=Resolving %1
-114=Connected to %1
-115=Receiving...
-116=Connecting to %1
-
-; Error messages
-120=Error connecting to the internet.\n\n%1
-121=Error opening %1.\n\nThe server returned status code %2.
-122=Error reading URL.\n\n%1
-123=Error writing file %1.\n\n%2
-124=Error opening file %1.\n\n%2
-125='%1' is an invalid URL.
-126=Error opening %1.\n\n%2
-127=Error sending request.\n\n%1
-128=Unsupported protocol. Only HTTP and FTP protocols are supported.
-129=Failed to connect to %1.\n\n%2
-130=Failed to query status code.\n\n%1
-131=Error requesting file.\n\n%1
-
-; Other
-144=About...
-146=Download
-147=Setup is now downloading additional files to your computer.
-
-; labels
-160=File:
-161=Speed:
-162=Status:
-163=Elapsed Time:
-164=Remaining Time:
-165=Current File:
-166=Overall Progress:
-167=Cancel
-168=OK
-169=User Name and Password
-170=User Name:
-171=Password:
--- a/dist/inno/scripts/isxdl/isxdl.dll
+++ b/dist/inno/scripts/isxdl/isxdl.dll
--- a/dist/inno/scripts/isxdl/isxdl.iss
+++ b/dist/inno/scripts/isxdl/isxdl.iss
@@ -1,14 +0,0 @@
-[Files]
-Source: "scripts\isxdl\isxdl.dll"; Flags: dontcopy
-
-[Code]
-procedure isxdl_AddFile(URL, Filename: PAnsiChar);
-external 'isxdl_AddFile@files:isxdl.dll stdcall';
-
-function isxdl_DownloadFiles(hWnd: Integer): Integer;
-external 'isxdl_DownloadFiles@files:isxdl.dll stdcall';
-
-function isxdl_SetOption(Option, Value: PAnsiChar): Integer;
-external 'isxdl_SetOption@files:isxdl.dll stdcall';
-
-[Setup]
--- a/dist/inno/scripts/lang/english.iss
+++ b/dist/inno/scripts/lang/english.iss
@@ -1,18 +0,0 @@
-[Languages]
-Name: "en"; MessagesFile: "compiler:Default.isl"
-
-[CustomMessages]
-;http://www.microsoft.com/globaldev/reference/lcid-all.mspx
-en.lcid=1033
-en.depdownload_msg=The following applications are required before setup can continue:%n%n%1%nDownload and install now?
-en.depdownload_memo_title=Download dependencies
-en.depinstall_memo_title=Install dependencies
-en.depinstall_title=Installing dependencies
-en.depinstall_description=Please wait while Setup installs dependencies on your computer.
-en.depinstall_status=Installing %1...
-en.depinstall_missing=%1 must be installed before setup can continue. Please install %1 and run Setup again.
-en.depinstall_error=An error occured while installing the dependencies. Please restart the computer and run the setup again or install the following dependencies manually:%n
-
-en.isxdl_langfile=
-
-[Files]
--- a/dist/inno/scripts/products.iss
+++ b/dist/inno/scripts/products.iss
@@ -1,6 +0,0 @@
-#include "isxdl\isxdl.iss"
-
-[Code]
-#include "products.pas"
-
-[Setup]
--- a/dist/inno/scripts/products.pas
+++ b/dist/inno/scripts/products.pas
@@ -1,329 +0,0 @@
-{
-	--- TYPES AND VARIABLES ---
-}
-type
-	TProduct = record
-		File: String;
-		Title: String;
-		Parameters: String;
-		ForceSuccess : boolean;
-		InstallClean : boolean;
-		MustRebootAfter : boolean;
-	end;
-
-	InstallResult = (InstallSuccessful, InstallRebootRequired, InstallError);
-
-var
-	installMemo, downloadMessage: string;
-	products: array of TProduct;
-	delayedReboot, isForcedX86: boolean;
-	DependencyPage: TOutputProgressWizardPage;
-
-procedure AddProduct(filename, parameters, title, size, url: string; forceSuccess, installClean, mustRebootAfter : boolean);
-{
-	Adds a product to the list of products to download.
-	Parameters:
-		filename: the file name under which to save the file
-		parameters: the parameters with which to run the file
-		title: the product title
-		size: the file size
-		url: the URL to download from
-		forceSuccess: whether to continue in case of setup failure
-		installClean: whether the product needs a reboot before installing
-		mustRebootAfter: whether the product needs a reboot after installing
-}
-var
-	path: string;
-	i: Integer;
-begin
-	installMemo := installMemo + '%1' + title + #13;
-
-	path := ExpandConstant('{src}{\}') + CustomMessage('DependenciesDir') + '\' + filename;
-	if not FileExists(path) then begin
-		path := ExpandConstant('{tmp}{\}') + filename;
-
-		if not FileExists(path) then begin
-			isxdl_AddFile(url, path);
-
-			downloadMessage := downloadMessage + '%1' + title + ' (' + size + ')' + #13;
-		end;
-	end;
-
-	i := GetArrayLength(products);
-	SetArrayLength(products, i + 1);
-	products[i].File := path;
-	products[i].Title := title;
-	products[i].Parameters := parameters;
-	products[i].ForceSuccess := forceSuccess;
-	products[i].InstallClean := installClean;
-	products[i].MustRebootAfter := mustRebootAfter;
-end;
-
-function SmartExec(product : TProduct; var resultcode : Integer): boolean;
-{
-	Executes a product and returns the exit code.
-	Parameters:
-		product: the product to install
-		resultcode: the exit code
-}
-begin
-	if (LowerCase(Copy(product.File, Length(product.File) - 2, 3)) = 'exe') then begin
-		Result := Exec(product.File, product.Parameters, '', SW_SHOWNORMAL, ewWaitUntilTerminated, resultcode);
-	end else begin
-		Result := ShellExec('', product.File, product.Parameters, '', SW_SHOWNORMAL, ewWaitUntilTerminated, resultcode);
-	end;
-end;
-
-function PendingReboot: boolean;
-{
-	Checks whether the machine has a pending reboot.
-}
-var	names: String;
-begin
-	if (RegQueryMultiStringValue(HKEY_LOCAL_MACHINE, 'SYSTEM\CurrentControlSet\Control\Session Manager', 'PendingFileRenameOperations', names)) then begin
-		Result := true;
-	end else if ((RegQueryMultiStringValue(HKEY_LOCAL_MACHINE, 'SYSTEM\CurrentControlSet\Control\Session Manager', 'SetupExecute', names)) and (names <> ''))  then begin
-		Result := true;
-	end else begin
-		Result := false;
-	end;
-end;
-
-function InstallProducts: InstallResult;
-{
-	Installs the downloaded products
-}
-var
-	resultCode, i, productCount, finishCount: Integer;
-begin
-	Result := InstallSuccessful;
-	productCount := GetArrayLength(products);
-
-	if productCount > 0 then begin
-		DependencyPage := CreateOutputProgressPage(CustomMessage('depinstall_title'), CustomMessage('depinstall_description'));
-		DependencyPage.Show;
-
-		for i := 0 to productCount - 1 do begin
-			if (products[i].InstallClean and (delayedReboot or PendingReboot())) then begin
-				Result := InstallRebootRequired;
-				break;
-			end;
-
-			DependencyPage.SetText(FmtMessage(CustomMessage('depinstall_status'), [products[i].Title]), '');
-			DependencyPage.SetProgress(i, productCount);
-
-			while true do begin
-				// set 0 as used code for shown error if SmartExec fails
-				resultCode := 0;
-				if SmartExec(products[i], resultCode) then begin
-					// setup executed; resultCode contains the exit code
-					if (products[i].MustRebootAfter) then begin
-						// delay reboot after install if we installed the last dependency anyways
-						if (i = productCount - 1) then begin
-							delayedReboot := true;
-						end else begin
-							Result := InstallRebootRequired;
-						end;
-						break;
-					end else if (resultCode = 0) or (products[i].ForceSuccess) then begin
-						finishCount := finishCount + 1;
-						break;
-					end else if (resultCode = 3010) then begin
-						// Windows Installer resultCode 3010: ERROR_SUCCESS_REBOOT_REQUIRED
-						delayedReboot := true;
-						finishCount := finishCount + 1;
-						break;
-					end;
-				end;
-
-				case MsgBox(FmtMessage(SetupMessage(msgErrorFunctionFailed), [products[i].Title, IntToStr(resultCode)]), mbError, MB_ABORTRETRYIGNORE) of
-					IDABORT: begin
-						Result := InstallError;
-						break;
-					end;
-					IDIGNORE: begin
-						break;
-					end;
-				end;
-			end;
-
-			if Result <> InstallSuccessful then begin
-				break;
-			end;
-		end;
-
-		// only leave not installed products for error message
-		for i := 0 to productCount - finishCount - 1 do begin
-			products[i] := products[i+finishCount];
-		end;
-		SetArrayLength(products, productCount - finishCount);
-
-		DependencyPage.Hide;
-	end;
-end;
-
-{
-	--------------------
-	INNO EVENT FUNCTIONS
-	--------------------
-}
-
-function PrepareToInstall(var NeedsRestart: boolean): String;
-{
-	Before the "preparing to install" page.
-	See: http://www.jrsoftware.org/ishelp/index.php?topic=scriptevents
-}
-var
-	i: Integer;
-	s: string;
-begin
-	delayedReboot := false;
-
-	case InstallProducts() of
-		InstallError: begin
-			s := CustomMessage('depinstall_error');
-
-			for i := 0 to GetArrayLength(products) - 1 do begin
-				s := s + #13 + '	' + products[i].Title;
-			end;
-
-			Result := s;
-			end;
-		InstallRebootRequired: begin
-			Result := products[0].Title;
-			NeedsRestart := true;
-
-			// write into the registry that the installer needs to be executed again after restart
-			RegWriteStringValue(HKEY_CURRENT_USER, 'SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce', 'InstallBootstrap', ExpandConstant('{srcexe}'));
-			end;
-	end;
-end;
-
-function NeedRestart : boolean;
-{
-	Checks whether a restart is needed at the end of install
-	See: http://www.jrsoftware.org/ishelp/index.php?topic=scriptevents
-}
-begin
-	Result := delayedReboot;
-end;
-
-function UpdateReadyMemo(Space, NewLine, MemoUserInfoInfo, MemoDirInfo, MemoTypeInfo, MemoComponentsInfo, MemoGroupInfo, MemoTasksInfo: String): String;
-{
-	Just before the "ready" page.
-	See: http://www.jrsoftware.org/ishelp/index.php?topic=scriptevents
-}
-var
-	s: string;
-begin
-	if downloadMessage <> '' then
-		s := s + CustomMessage('depdownload_memo_title') + ':' + NewLine + FmtMessage(downloadMessage, [Space]) + NewLine;
-	if installMemo <> '' then
-		s := s + CustomMessage('depinstall_memo_title') + ':' + NewLine + FmtMessage(installMemo, [Space]) + NewLine;
-
-	if MemoDirInfo <> '' then
-		s := s + MemoDirInfo + NewLine + NewLine;
-	if MemoGroupInfo <> '' then
-		s := s + MemoGroupInfo + NewLine + NewLine;
-	if MemoTasksInfo <> '' then
-		s := s + MemoTasksInfo;
-
-	Result := s
-end;
-
-function NextButtonClick(CurPageID: Integer): boolean;
-{
-	At each "next" button click
-	See: http://www.jrsoftware.org/ishelp/index.php?topic=scriptevents
-}
-begin
-	Result := true;
-
-	if CurPageID = wpReady then begin
-		if downloadMessage <> '' then begin
-			// change isxdl language only if it is not english because isxdl default language is already english
-			if (ActiveLanguage() <> 'en') then begin
-				ExtractTemporaryFile(CustomMessage('isxdl_langfile'));
-				isxdl_SetOption('language', ExpandConstant('{tmp}{\}') + CustomMessage('isxdl_langfile'));
-			end;
-			//isxdl_SetOption('title', FmtMessage(SetupMessage(msgSetupWindowTitle), [CustomMessage('appname')]));
-
-			//if SuppressibleMsgBox(FmtMessage(CustomMessage('depdownload_msg'), [FmtMessage(downloadMessage, [''])]), mbConfirmation, MB_YESNO, IDYES) = IDNO then
-			//	Result := false
-			//else if
-			if isxdl_DownloadFiles(StrToInt(ExpandConstant('{wizardhwnd}'))) = 0 then
-				Result := false;
-		end;
-	end;
-end;
-
-{
-	-----------------------------
-	ARCHITECTURE HELPER FUNCTIONS
-	-----------------------------
-}
-
-function IsX86: boolean;
-{
-	Gets whether the computer is x86 (32 bits).
-}
-begin
-	Result := isForcedX86 or (ProcessorArchitecture = paX86) or (ProcessorArchitecture = paUnknown);
-end;
-
-function IsX64: boolean;
-{
-	Gets whether the computer is x64 (64 bits).
-}
-begin
-	Result := (not isForcedX86) and Is64BitInstallMode and (ProcessorArchitecture = paX64);
-end;
-
-function IsIA64: boolean;
-{
-	Gets whether the computer is IA64 (Itanium 64 bits).
-}
-begin
-	Result := (not isForcedX86) and Is64BitInstallMode and (ProcessorArchitecture = paIA64);
-end;
-
-function GetString(x86, x64, ia64: String): String;
-{
-	Gets a string depending on the computer architecture.
-	Parameters:
-		x86: the string if the computer is x86
-		x64: the string if the computer is x64
-		ia64: the string if the computer is IA64
-}
-begin
-	if IsX64() and (x64 <> '') then begin
-		Result := x64;
-	end else if IsIA64() and (ia64 <> '') then begin
-		Result := ia64;
-	end else begin
-		Result := x86;
-	end;
-end;
-
-function GetArchitectureString(): String;
-{
-	Gets the "standard" architecture suffix string.
-	Returns either _x64, _ia64 or nothing.
-}
-begin
-	if IsX64() then begin
-		Result := '_x64';
-	end else if IsIA64() then begin
-		Result := '_ia64';
-	end else begin
-		Result := '';
-	end;
-end;
-
-procedure SetForceX86(value: boolean);
-{
-	Forces the setup to use X86 products
-}
-begin
-	isForcedX86 := value;
-end;
--- a/dist/inno/scripts/products/msiproduct.iss
+++ b/dist/inno/scripts/products/msiproduct.iss
@@ -1,49 +0,0 @@
-[Code]
-#ifdef UNICODE
-	#define AW "W"
-#else
-	#define AW "A"
-#endif
-
-type
-	INSTALLSTATE = Longint;
-const
-	INSTALLSTATE_INVALIDARG = -2;	// An invalid parameter was passed to the function.
-	INSTALLSTATE_UNKNOWN = -1;		// The product is neither advertised or installed.
-	INSTALLSTATE_ADVERTISED = 1;	// The product is advertised but not installed.
-	INSTALLSTATE_ABSENT = 2;		// The product is installed for a different user.
-	INSTALLSTATE_DEFAULT = 5;		// The product is installed for the current user.
-
-function MsiQueryProductState(szProduct: string): INSTALLSTATE;
-external 'MsiQueryProductState{#AW}@msi.dll stdcall';
-
-function MsiEnumRelatedProducts(szUpgradeCode: string; nReserved: dword; nIndex: dword; szProductCode: string): integer;
-external 'MsiEnumRelatedProducts{#AW}@msi.dll stdcall';
-
-function MsiGetProductInfo(szProductCode: string; szProperty: string; szValue: string; var nvalueSize: dword): integer;
-external 'MsiGetProductInfo{#AW}@msi.dll stdcall';
-
-function msiproduct(productID: string): boolean;
-begin
-	Result := MsiQueryProductState(productID) = INSTALLSTATE_DEFAULT;
-end;
-
-function msiproductupgrade(upgradeCode: string; minVersion: string): boolean;
-var
-	productCode, version: string;
-	valueSize: dword;
-begin
-	SetLength(productCode, 39);
-	Result := false;
-
-	if (MsiEnumRelatedProducts(upgradeCode, 0, 0, productCode) = 0) then begin
-		SetLength(version, 39);
-		valueSize := Length(version);
-
-		if (MsiGetProductInfo(productCode, 'VersionString', version, valueSize) = 0) then begin
-			Result := compareversion(version, minVersion) >= 0;
-		end;
-	end;
-end;
-
-[Setup]
--- a/dist/inno/scripts/products/stringversion.iss
+++ b/dist/inno/scripts/products/stringversion.iss
@@ -1,62 +0,0 @@
-[Code]
-function stringtoversion(var temp: String): Integer;
-var
-	part: String;
-	pos1: Integer;
-
-begin
-	if (Length(temp) = 0) then begin
-		Result := -1;
-		Exit;
-	end;
-
-	pos1 := Pos('.', temp);
-	if (pos1 = 0) then begin
-		Result := StrToInt(temp);
-		temp := '';
-	end else begin
-		part := Copy(temp, 1, pos1 - 1);
-		temp := Copy(temp, pos1 + 1, Length(temp));
-		Result := StrToInt(part);
-	end;
-end;
-
-function compareinnerversion(var x, y: String): Integer;
-var
-	num1, num2: Integer;
-
-begin
-	num1 := stringtoversion(x);
-	num2 := stringtoversion(y);
-	if (num1 = -1) and (num2 = -1) then begin
-		Result := 0;
-		Exit;
-	end;
-
-	if (num1 < 0) then begin
-		num1 := 0;
-	end;
-	if (num2 < 0) then begin
-		num2 := 0;
-	end;
-
-	if (num1 < num2) then begin
-		Result := -1;
-	end else if (num1 > num2) then begin
-		Result := 1;
-	end else begin
-		Result := compareinnerversion(x, y);
-	end;
-end;
-
-function compareversion(versionA, versionB: String): Integer;
-var
-  temp1, temp2: String;
-
-begin
-	temp1 := versionA;
-	temp2 := versionB;
-	Result := compareinnerversion(temp1, temp2);
-end;
-
-[Setup]
--- a/dist/inno/scripts/products/vcredist2017.iss
+++ b/dist/inno/scripts/products/vcredist2017.iss
@@ -1,32 +0,0 @@
-; requires Windows 10, Windows 7 Service Pack 1, Windows 8, Windows 8.1, Windows Server 2003 Service Pack 2, Windows Server 2008 R2 SP1, Windows Server 2008 Service Pack 2, Windows Server 2012, Windows Vista Service Pack 2, Windows XP Service Pack 3
-; http://www.visualstudio.com/en-us/downloads/
-
-[CustomMessages]
-vcredist2017_title=Visual C++ 2017 Redistributable
-vcredist2017_title_x64=Visual C++ 2017 64-Bit Redistributable
-
-vcredist2017_size=13.7 MB
-vcredist2017_size_x64=14.5 MB
-
-[Code]
-const
-	vcredist2017_url = 'http://download.microsoft.com/download/1/f/e/1febbdb2-aded-4e14-9063-39fb17e88444/vc_redist.x86.exe';
-	vcredist2017_url_x64 = 'http://download.microsoft.com/download/3/b/f/3bf6e759-c555-4595-8973-86b7b4312927/vc_redist.x64.exe';
-
-	vcredist2017_upgradecode = '{65E5BD06-6392-3027-8C26-853107D3CF1A}';
-	vcredist2017_upgradecode_x64 = '{36F68A90-239C-34DF-B58C-64B30153CE35}';
-
-procedure vcredist2017(minVersion: string);
-begin
-	if (not IsIA64()) then begin
-		if (not msiproductupgrade(GetString(vcredist2017_upgradecode, vcredist2017_upgradecode_x64, ''), minVersion)) then
-			AddProduct('vcredist2017' + GetArchitectureString() + '.exe',
-				'/passive /norestart',
-				CustomMessage('vcredist2017_title' + GetArchitectureString()),
-				CustomMessage('vcredist2017_size' + GetArchitectureString()),
-				GetString(vcredist2017_url, vcredist2017_url_x64, ''),
-				false, false, false);
-	end;
-end;
-
-[Setup]
--- a/dist/inno/scripts/products/winversion.iss
+++ b/dist/inno/scripts/products/winversion.iss
@@ -1,49 +0,0 @@
-[Code]
-var
-	WindowsVersion: TWindowsVersion;
-
-procedure initwinversion();
-begin
-	GetWindowsVersionEx(WindowsVersion);
-end;
-
-function exactwinversion(MajorVersion, MinorVersion: integer): boolean;
-begin
-	Result := (WindowsVersion.Major = MajorVersion) and (WindowsVersion.Minor = MinorVersion);
-end;
-
-function minwinversion(MajorVersion, MinorVersion: integer): boolean;
-begin
-	Result := (WindowsVersion.Major > MajorVersion) or ((WindowsVersion.Major = MajorVersion) and (WindowsVersion.Minor >= MinorVersion));
-end;
-
-function maxwinversion(MajorVersion, MinorVersion: integer): boolean;
-begin
-	Result := (WindowsVersion.Major < MajorVersion) or ((WindowsVersion.Major = MajorVersion) and (WindowsVersion.Minor <= MinorVersion));
-end;
-
-function exactwinspversion(MajorVersion, MinorVersion, SpVersion: integer): boolean;
-begin
-	if exactwinversion(MajorVersion, MinorVersion) then
-		Result := WindowsVersion.ServicePackMajor = SpVersion
-	else
-		Result := true;
-end;
-
-function minwinspversion(MajorVersion, MinorVersion, SpVersion: integer): boolean;
-begin
-	if exactwinversion(MajorVersion, MinorVersion) then
-		Result := WindowsVersion.ServicePackMajor >= SpVersion
-	else
-		Result := true;
-end;
-
-function maxwinspversion(MajorVersion, MinorVersion, SpVersion: integer): boolean;
-begin
-	if exactwinversion(MajorVersion, MinorVersion) then
-		Result := WindowsVersion.ServicePackMajor <= SpVersion
-	else
-		Result := true;
-end;
-
-[Setup]
--- a/dist/macos/bundle/Barrier.app/Contents/Resources/Barrier.icns
+++ b/dist/macos/bundle/Barrier.app/Contents/Resources/Barrier.icns
--- a/dist/macos/bundle/Synergy.app/Contents/Info.plist.in
+++ b/dist/macos/bundle/Synergy.app/Contents/Info.plist.in
@@ -4,28 +4,28 @@
    <key>CFBundleDevelopmentRegion</key>
    <string>English</string>
    <key>CFBundleDisplayName</key>
-    <string>Barrier</string>
+    <string>Synergy</string>
    <key>CFBundleExecutable</key>
-    <string>barrier.sh</string>
+    <string>synergy</string>
    <key>CFBundleIconFile</key>
-    <string>Barrier.icns</string>
+    <string>Synergy.icns</string>
    <key>CFBundleIdentifier</key>
-    <string>barrier</string>
+    <string>synergy</string>
    <!-- TODO: Fix this in v2.0 //-->
    <key>CFBundleInfoDictionaryVersion</key>
    <string>6.0</string>
    <key>CFBundleName</key>
-    <string>Barrier</string>
+    <string>Synergy</string>
    <key>CFBundlePackageType</key>
    <string>APPL</string>
    <key>CFBundleSignature</key>
    <string>SYN1</string>
    <key>CFBundleShortVersionString</key>
-    <string>@BARRIER_VERSION@</string>
+    <string>@SYNERGY_VERSION@</string>
    <key>CFBundleVersion</key>
-    <string>@BARRIER_VERSION@</string>
+    <string>@SYNERGY_VERSION@</string>
    <key>NSHumanReadableCopyright</key>
-    <string>© 2018 Debauchee Open Source Group</string>
+    <string>© 2012-2016, Symless Ltd</string>
    <key>LSMinimumSystemVersion</key>
    <string>10.9.0</string>
  </dict>
--- a/dist/macos/bundle/Synergy.app/Contents/PkgInfo
+++ b/dist/macos/bundle/Synergy.app/Contents/PkgInfo
--- a/dist/macos/bundle/Synergy.app/Contents/Resources/Synergy.icns
+++ b/dist/macos/bundle/Synergy.app/Contents/Resources/Synergy.icns
--- a/dist/macos/bundle/build_installer.sh.in
+++ b/dist/macos/bundle/build_installer.sh.in
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-# change this to rename the installer package
-B_DMG="Barrier-@BARRIER_VERSION@.dmg"
-
-# sanity check so we don't distribute packages full of debug symbols
-if [ "@CMAKE_BUILD_TYPE@" != "Release" ]; then
-    echo Will only build installers for Release builds
-    exit 1
-fi
-
-cd @CMAKE_CURRENT_SOURCE_DIR@/build/bundle || exit 1
-
-B_REREF_SCRIPT=@CMAKE_CURRENT_SOURCE_DIR@/build/bundle/reref_dylibs.sh
-if [ ! -x $B_REREF_SCRIPT ]; then
-    echo Missing script: $B_REREF_SCRIPT
-    exit 1
-fi
-
-# remove any old copies so there's no confusion about whether this
-# process completes successfully or not
-rm -rf temp.dmg $B_DMG
-
-cd Barrier.app/Contents 2>/dev/null
-if [ $? -ne 0 ]; then
-    echo Please make sure that the build completed successfully
-    echo before trying to create the installer.
-    exit 1
-fi
-
-# MacOS folder holds the executables, non-system libraries,
-# and the startup script
-rm -rf MacOS
-mkdir MacOS || exit 1
-cd MacOS || exit 1
-
-# copy all executables
-cp @CMAKE_RUNTIME_OUTPUT_DIRECTORY@/* . || exit 1
-
-# copy the qt platform plugin
-# TODO: this is hacky and will probably break if there is more than one qt
-# version installed. need a better way to find this library
-B_COCOA=$(find /usr/local/Cellar/qt -type f -name libqcocoa.dylib | head -1)
-if [ $? -ne 0 ] || [ "x$B_COCOA" = "x" ]; then
-    echo "Could not find cocoa platform plugin"
-    exit 1
-fi
-mkdir platforms
-cp $B_COCOA platforms/ || exit 1
-
-# make sure we can r/w all these binaries
-chmod -R u+rw * || exit 1
-
-# only one executable (barrier) needs non-system libraries although it's
-# libraries can call each other. use a recursive script to handle the
-# re-referencing
-$B_REREF_SCRIPT barrier || exit 1
-# the cocoa platform plugin also needs to know where to find the qt libraries.
-# because it exists in a subdirectory we append ../ to the relative path of the
-# libraries in its metadata
-$B_REREF_SCRIPT platforms/libqcocoa.dylib ../ || exit 1
-
-# create a startup script that will change to the binary directory
-# before starting barrier
-printf "%s\n" "#!/bin/sh" "cd \$(dirname \$0)" "exec ./barrier" > barrier.sh
-chmod +x barrier.sh
-
-# create the DMG to be distributed in build/bundle
-cd ../../..
-hdiutil create -size 64m -fs HFS+ -volname "Barrier" temp.dmg || exit 1
-hdiutil attach temp.dmg -mountpoint mnt || exit 1
-cp -r Barrier.app mnt/ || exit 1
-hdiutil detach mnt || exit 1
-hdiutil convert temp.dmg -format UDZO -o $B_DMG || exit 1
-rm temp.dmg
-
-echo "Installer created successfully"
--- a/dist/macos/bundle/reref_dylibs.sh
+++ b/dist/macos/bundle/reref_dylibs.sh
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-# $1 = binary (program or dylib)
-B_TARGET=$1
-if [ "x$B_TARGET" = "x" ]; then
-    echo Which binary needs to be re-referenced?
-    exit 1
-fi
-
-cd $(dirname $B_TARGET) || exit 1
-
-# where to find non-system libraries relative to target's directory.
-# the vast majority of the time this should be empty
-B_REL_PATH=$2
-
-# we're in target's directory now. trim off the path
-B_TARGET=$(basename $B_TARGET)
-
-# get a list of non-system libraries and make local copies
-B_LIBS=$(otool -XL $B_TARGET | awk '{ print $1 }' | grep -Ev '^(/usr/lib|/System)')
-[ $? -ne 0 ] && exit 1
-for B_LIB in $B_LIBS; do
-    B_LIB_NAME=$(basename $B_LIB)
-
-    # ignore self-references
-    [ "$B_TARGET" = "$B_LIB_NAME" ] && continue
-
-    B_DST=${B_REL_PATH}${B_LIB_NAME}
-    if [ ! -e $B_DST ]; then
-        cp $B_LIB $B_DST || exit 1
-        chmod u+rw $B_DST || exit 1
-        # recursively call this script on libraries purposefully not passing
-        # $B_REL_PATH so that it is only used explicitly
-        $0 $B_DST
-    fi
-
-    # adjust the target's metadata to point to the local copy
-    # rather than the system-wide copy which would only exist on
-    # a development machine
-    install_name_tool -change $B_LIB @loader_path/$B_DST  $B_TARGET || exit 1
-done
--- a/dist/rpm/barrier.spec.in
+++ b/dist/rpm/barrier.spec.in
@@ -1,26 +0,0 @@
-Name: barrier
-Version: @BARRIER_VERSION@
-Summary: Keyboard and mouse sharing solution
-Group: Applications/Productivity
-URL: https://github.com/debauchee/barrier/
-Source: https://github.com/debauchee/barrier/
-Vendor: Debauchee
-Packager: Debauchee <todo@mail.com>
-License: GPLv2
-Release: @BARRIER_BUILD_NUMBER@@BARRIER_SNAPSHOT_INFO@%{?dist}
-
-%description
-Barrier allows you to share one mouse and keyboard between multiple computers.
-Work seamlessly across Windows, macOS and Linux.
-
-%files
-%defattr(755,root,root,-)
-%{_bindir}/barrier
-%{_bindir}/barrierc
-%{_bindir}/barriers
-%attr(644,-,-) %{_datarootdir}/applications/barrier.desktop
-%attr(644,-,-) %{_datarootdir}/icons/hicolor/scalable/apps/barrier.svg
-
-%changelog
-* Sat Jan 27 2018 Debauchee <todo@mail.com>
- Initial version of the package
--- a/dist/rpm/synergy.spec.in
+++ b/dist/rpm/synergy.spec.in
@@ -0,0 +1,27 @@
+Name: synergy
+Version: @SYNERGY_VERSION@
+Summary: Keyboard and mouse sharing solution
+Group: Applications/Productivity
+URL: https://symless.com/synergy
+Source: https://symless.com/synergy/downloads
+Vendor: Symless
+Packager: Symless <engineering@symless.com>
+License: GPLv2
+Release: @SYNERGY_BUILD_NUMBER@@SYNERGY_SNAPSHOT_INFO@%{?dist}
+
+%description
+Synergy allows you to share one mouse and keyboard between multiple computers.
+Work seamlessly across Windows, macOS and Linux.
+
+%files
+%defattr(755,root,root,-)
+%{_bindir}/synergy
+%{_bindir}/synergyc
+%{_bindir}/synergys
+%{_bindir}/syntool
+%attr(644,-,-) %{_datarootdir}/applications/synergy.desktop
+%attr(644,-,-) %{_datarootdir}/icons/hicolor/scalable/apps/synergy.svg
+
+%changelog
+* Wed Apr 26 2017 Symless <engineering@symless.com>
+- Initial version of the package
--- a/dist/wix/Include.wxi.in
+++ b/dist/wix/Include.wxi.in
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
-    <?define Name="Barrier" ?>
-    <?define Version="@BARRIER_VERSION@" ?>
-    <?define QtVersion="@QT_VERSION@" ?>
-    <?define Author="Debauchee Open Source Group" ?>
+    <?define Name="Synergy" ?>
+    <?define Version="@SYNERGY_VERSION@" ?>
+    <?define QtVersion="5.9.4" ?> <!-- TODO: Configure this externally //--> 
+    <?define Author="Symless Ltd" ?>
    <?define BinPath="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/$(var.Configuration)" ?>
    <?define ResPath="@CMAKE_CURRENT_SOURCE_DIR@/res" ?>
    <?define ExtPath="@CMAKE_CURRENT_SOURCE_DIR@/ext" ?>
@@ -11,15 +11,19 @@
        <?define ProgramFilesFolder="ProgramFiles64Folder" ?>
        <?define PlatformSimpleName="64-bit" ?>
        <?define UpgradeGuid="E8A4FA54-14B9-4FD1-8E00-7BC46555FDA0" ?>
-        <?define QtPath="E:\Qt\$(var.QtVersion)\msvc2015_64" ?>
+        <?define QtPath="C:\Qt\$(var.QtVersion)\msvc2015_64" ?>
    <?else ?>
        <?define ProgramFilesFolder="ProgramFilesFolder" ?>
        <?define PlatformSimpleName="32-bit" ?>
        <?define UpgradeGuid="BE0B9FD8-45E2-4A8E-A0D8-1F774D074A78" ?>
-        <?define QtPath="E:\Qt\$(var.QtVersion)\msvc2015" ?>
+        <?define QtPath="C:\Qt\$(var.QtVersion)\msvc2015" ?>
    <?endif ?>
    <?define QtBinPath="$(var.QtPath)\bin" ?>
    <?define QtPlatformPath="$(var.QtPath)\plugins\platforms" ?>
    <?define OpenSSLPath="$(var.ExtPath)\openssl\windows\$(var.Platform)" ?>
    <?define OpenSSLBinPath="$(var.OpenSSLPath)\bin" ?>
+    <?if $(var.Configuration) = "Debug" ?>
+        <?define DebugCRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_DebugCRT_$(var.Platform).msm" ?>
+    <?endif ?>
+    <?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_$(var.Platform).msm" ?>
 </Include>
--- a/dist/wix/Product.wxs
+++ b/dist/wix/Product.wxs
@@ -12,25 +12,36 @@
 		</Upgrade>
 		<Feature Id="ProductFeature" Title="$(var.Name)">
 			<ComponentGroupRef Id="ProductComponents"/>
+			<ComponentGroupRef Id="OpenSSLComponents"/>
 			<ComponentGroupRef Id="ProductQtPluginComponents"/>
+			<MergeRef Id="CRT"/>
+            <?if $(var.Configuration) = "Debug" ?>
+			    <MergeRef Id="DebugCRT"/>
+	        <?endif ?>
 			<ComponentRef Id="RegistryEntries"/>
 		</Feature>
 		<DirectoryRef Id="TARGETDIR">
 			<Component Guid="7CF3564D-1F8E-4D3D-9781-E1EE22D5BD67" Id="RegistryEntries">
 				<RegistryKey ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Key="Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers" Root="HKLM">
-					<RegistryValue Name="[INSTALLFOLDER]barriers.exe" Type="string" Value="~ HIGHDPIAWARE WIN7RTM"/>
+					<RegistryValue Name="[INSTALLFOLDER]synergys.exe" Type="string" Value="~ HIGHDPIAWARE WIN7RTM"/>
 				</RegistryKey>
 				<!-- Windows 8 and later only -->
 				<Condition><![CDATA[Installed OR (VersionNT >= 602)]]></Condition>
 			</Component>
 		</DirectoryRef>
-		<Icon Id="barrier.ico" SourceFile="$(var.ResPath)/barrier.ico"/>
+		<Icon Id="synergy.ico" SourceFile="$(var.ResPath)/synergy.ico"/>
 		<WixVariable Id="WixUILicenseRtf" Value="$(var.ResPath)\License.rtf"/>
 		<WixVariable Id="WixUIBannerBmp" Value="$(var.ResPath)\banner.bmp"/>
 		<WixVariable Id="WixUIDialogBmp" Value="$(var.ResPath)\dialog.bmp"/>
-		<Property Id="ARPPRODUCTICON" Value="barrier.ico"/>
+		<Property Id="ARPPRODUCTICON" Value="synergy.ico"/>
 		<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER"/>
 		<Property Id="MSIRESTARTMANAGERCONTROL" Value="Disable"/>
+		<Property Id="LEGACY_UNINSTALL_EXISTS">
+			<RegistrySearch Id="LegacyRegistrySearch" Key="SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Synergy" Name="UninstallString" Root="HKLM" Type="file" Win64="no">
+				<FileSearch Id="LegacyFileSearch" Name="uninstall.exe"/>
+			</RegistrySearch>
+		</Property>
+		<Condition Message="An existing installation of $(var.Name) was detected, please uninstall it before continuing.">NOT LEGACY_UNINSTALL_EXISTS
    </Condition>
 		<CustomAction ExeCommand="" FileKey="GuiProgram" Id="StartGui" Return="asyncNoWait"/>
 		<UI>
@@ -41,6 +52,10 @@
 		<Directory Id="TARGETDIR" Name="SourceDir">
 			<Directory Id="$(var.ProgramFilesFolder)">
 				<Directory Id="INSTALLFOLDER" Name="$(var.Name)">
+					<Merge DiskId="1" Id="CRT" Language="0" SourceFile="$(var.CRT)"/>
+					<?if $(var.Configuration) = "Debug" ?>
+					    <Merge DiskId="1" Id="DebugCRT" Language="0" SourceFile="$(var.DebugCRT)"/>
+				    <?endif ?>
 					<Directory Id="OpenSSLDir" Name="OpenSSL"/>
 					<Directory Id="PlatformsDir" Name="Platforms"/>
 				</Directory>
@@ -51,23 +66,23 @@
 	<Fragment>
 		<ComponentGroup Directory="INSTALLFOLDER" Id="ProductComponents">
 			<Component Guid="EC9AD3B0-277C-4157-B5C8-5FD5B6A5F4AD" Id="Core">
-				<File KeyPath="yes" Source="$(var.BinPath)/barrierd.exe"/>
-				<ServiceInstall Description="Controls the $(var.Name) foreground processes." DisplayName="$(var.Name)" ErrorControl="normal" Id="ServiceInstall" Name="Barrier" Start="auto" Type="ownProcess">
+				<File KeyPath="yes" Source="$(var.BinPath)/synergyd.exe"/>
+				<ServiceInstall Description="Controls the $(var.Name) foreground processes." DisplayName="$(var.Name)" ErrorControl="normal" Id="ServiceInstall" Name="Synergy" Start="auto" Type="ownProcess">
 					<util:ServiceConfig FirstFailureActionType="restart" ResetPeriodInDays="1" RestartServiceDelayInSeconds="1" SecondFailureActionType="restart" ThirdFailureActionType="restart"/>
 				</ServiceInstall>
-				<ServiceControl Id="ServiceControl" Name="Barrier" Remove="uninstall" Start="install" Stop="both"/>
-				<File Source="$(var.BinPath)/barriers.exe">
+				<ServiceControl Id="ServiceControl" Name="Synergy" Remove="uninstall" Start="install" Stop="both"/>
+				<File Source="$(var.BinPath)/synergys.exe">
 					<fire:FirewallException Id="ServerFirewallException" IgnoreFailure="yes" Name="$(var.Name)" Scope="any"/>
 				</File>
-				<File Source="$(var.BinPath)/barrierc.exe"/>
+				<File Source="$(var.BinPath)/synergyc.exe"/>
+				<File Source="$(var.BinPath)/syntool.exe"/>
+				<File Source="$(var.BinPath)/synwinhk.dll"/>
 				<File Source="$(var.OpenSSLBinPath)/libeay32.dll"/>
 				<File Source="$(var.OpenSSLBinPath)/ssleay32.dll"/>
-				<File Source="$(var.OpenSSLBinPath)/openssl.exe"/>
-				<File Source="$(var.ResPath)/openssl/barrier.conf"/>
 			</Component>
 			<Component Guid="BAC8149B-6287-45BF-9C27-43D71ED40214" Id="Gui">
-				<File Id="GuiProgram" KeyPath="yes" Source="$(var.BinPath)/barrier.exe">
-					<Shortcut Advertise="yes" Directory="ProgramMenuFolder" Icon="barrier.ico" Id="GuiShortcut" Name="$(var.Name)"/>
+				<File Id="GuiProgram" KeyPath="yes" Source="$(var.BinPath)/synergy.exe">
+					<Shortcut Advertise="yes" Directory="ProgramMenuFolder" Icon="synergy.ico" Id="GuiShortcut" Name="$(var.Name)"/>
 					<fire:FirewallException Id="GuiFirewallException" IgnoreFailure="yes" Name="$(var.Name)" Scope="any"/>
 				</File>
 				<?if $(var.Configuration) = "Debug" ?>
@@ -100,5 +115,13 @@
 				<?endif ?>
 			</Component>
 		</ComponentGroup>
+		<ComponentGroup Directory="OpenSSLDir" Id="OpenSSLComponents">
+			<Component Guid="92648F77-65A6-4B16-AC59-A1F37BD341B1" Id="OpenSSL">
+				<File Id="OpenSSLDll1" Source="$(var.OpenSSLBinPath)/libeay32.dll"/>
+				<File Id="OpenSSLDll2" Source="$(var.OpenSSLBinPath)/ssleay32.dll"/>
+				<File Source="$(var.OpenSSLBinPath)/openssl.exe"/>
+				<File Source="$(var.ResPath)/openssl/synergy.conf"/>
+			</Component>
+		</ComponentGroup>
 	</Fragment>
-</Wix>
+</Wix>
--- a/dist/wix/Synergy.sln
+++ b/dist/wix/Synergy.sln
@@ -2,7 +2,7 @@
 # Visual Studio 14
 VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Barrier", "Barrier.wixproj", "{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}"
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Synergy", "Synergy.wixproj", "{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
--- a/dist/wix/Synergy.wixproj
+++ b/dist/wix/Synergy.wixproj
@@ -4,7 +4,7 @@
        <ProductVersion>3.10</ProductVersion>
        <ProjectGuid>{d4ba9f39-6a35-4c8f-9cb2-67fcbe5cab17}</ProjectGuid>
        <SchemaVersion>2.0</SchemaVersion>
-        <OutputName>Barrier</OutputName>
+        <OutputName>Synergy</OutputName>
        <OutputType>Package</OutputType>
        <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
        <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
--- a/doc/MacReadme.txt
+++ b/doc/MacReadme.txt
@@ -5,11 +5,14 @@ To install on Mac OS X with the .zip distribution (first seen in 1.3.6) you must

  1. Extract the zip file to any location (usually double click will do this)
  2. Open Terminal, and cd to the extracted directory (e.g. /Users/my-name/Downloads/extracted-dir/)
-  3. Copy the binaries to /usr/bin using: sudo cp barrier* /usr/bin
-  4. Correct the permissions and ownership: sudo chown root:wheel /usr/bin/barrier*; sudo chmod 555 /usr/bin/barrier*
+  3. Copy the binaries to /usr/bin using: sudo cp synergy* /usr/bin
+  4. Correct the permissions and ownership: sudo chown root:wheel /usr/bin/synergy*; sudo chmod 555 /usr/bin/synergy*

 Alternatively, you can copy the binaries as root. How to enable the root user in Mac OS X:
  http://support.apple.com/en-us/ht1528

 Once the binaries have been copied to /usr/bin, you should follow the configuration guide:
  http://synergy2.sourceforge.net/configuration.html
+
+If you have any problems, see the [[Support]] page:
+  http://symless.com/help/
--- a/doc/QtCodeStyle.xml
+++ b/doc/QtCodeStyle.xml
@@ -34,7 +34,7 @@
 </data>
 <data>
  <variable>DisplayName</variable>
-  <value type="QString">Barrier</value>
+  <value type="QString">Synergy</value>
 </data>
 </qtcreator>
 <?xml version="1.0" encoding="UTF-8"?>
@@ -73,7 +73,7 @@
 </data>
 <data>
  <variable>DisplayName</variable>
-  <value type="QString">Barrier</value>
+  <value type="QString">Synergy</value>
 </data>
 </qtcreator>
 <?xml version="1.0" encoding="UTF-8"?>
@@ -112,7 +112,7 @@
 </data>
 <data>
  <variable>DisplayName</variable>
-  <value type="QString">Barrier</value>
+  <value type="QString">Synergy</value>
 </data>
 </qtcreator>
 <?xml version="1.0" encoding="UTF-8"?>
@@ -151,7 +151,7 @@
 </data>
 <data>
  <variable>DisplayName</variable>
-  <value type="QString">Barrier</value>
+  <value type="QString">Synergy</value>
 </data>
 </qtcreator>
 <?xml version="1.0" encoding="UTF-8"?>
@@ -190,7 +190,7 @@
 </data>
 <data>
  <variable>DisplayName</variable>
-  <value type="QString">Barrier</value>
+  <value type="QString">Synergy</value>
 </data>
 </qtcreator>
 <?xml version="1.0" encoding="UTF-8"?>
@@ -229,6 +229,6 @@
 </data>
 <data>
  <variable>DisplayName</variable>
-  <value type="QString">Barrier</value>
+  <value type="QString">Synergy</value>
 </data>
 </qtcreator>
--- a/doc/UpdateManpages.txt
+++ b/doc/UpdateManpages.txt
@@ -1,5 +0,0 @@
-To recreate the barrierc manpage use a command like:
-  help2man -N --output=barrierc.1 --name='Barrier Keyboard/Mouse Client' /path/to/barrierc
-
-And for barriers:
-  help2man -N --output=barriers.1 --name='Barrier Keyboard/Mouse Server' /path/to/barriers
--- a/doc/barrierc.1
+++ b/doc/barrierc.1
@@ -1,73 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH BARRIERC "1" "May 2018" "barrierc 2.1.0-snapshot" "User Commands"
-.SH NAME
-barrierc \- Barrier Keyboard/Mouse Client
-.SH SYNOPSIS
-.B barrierc
-[\fI\,--yscroll <delta>\/\fR] [\fI\,--display <display>\/\fR] [\fI\,--no-xinitthreads\/\fR] [\fI\,--daemon|--no-daemon\/\fR] [\fI\,--name <screen-name>\/\fR] [\fI\,--restart|--no-restart\/\fR] [\fI\,--debug <level>\/\fR] \fI\,<server-address>\/\fR
-.SH DESCRIPTION
-Start the barrier client and connect to a remote server component.
-.SH OPTIONS
-.TP
-\fB\-d\fR, \fB\-\-debug\fR <level>
-filter out log messages with priority below level.
-level may be: FATAL, ERROR, WARNING, NOTE, INFO,
-DEBUG, DEBUG1, DEBUG2.
-.TP
-\fB\-n\fR, \fB\-\-name\fR <screen\-name> use screen\-name instead the hostname to identify
-this screen in the configuration.
-.TP
-\fB\-1\fR, \fB\-\-no\-restart\fR
-do not try to restart on failure.
-.TP
-\fB\-\-restart\fR
-restart the server automatically if it fails. (*)
-.TP
-\fB\-l\fR  \fB\-\-log\fR <file>
-write log messages to file.
-.TP
-\fB\-\-no\-tray\fR
-disable the system tray icon.
-.TP
-\fB\-\-enable\-drag\-drop\fR
-enable file drag & drop.
-.TP
-\fB\-\-enable\-crypto\fR
-enable the crypto (ssl) plugin.
-.TP
-\fB\-\-display\fR <display>
-connect to the X server at <display>
-.TP
-\fB\-\-no\-xinitthreads\fR
-do not call XInitThreads()
-.TP
-\fB\-f\fR, \fB\-\-no\-daemon\fR
-run in the foreground.
-.TP
-\fB\-\-daemon\fR
-run as a daemon. (*)
-.TP
-\fB\-\-yscroll\fR <delta>
-defines the vertical scrolling delta, which is
-120 by default.
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-display this help and exit.
-.TP
-\fB\-\-version\fR
-display version information and exit.
-.PP
-Default options are marked with a *
-.PP
-The server address is of the form: [<hostname>][:<port>]. The hostname
-must be the address or hostname of the server. Placing brackets around
-an IPv6 address is required when also specifying a port number and
-optional otherwise. The default port number is 24800.
-.SH COPYRIGHT
-Copyright \(co 2018 Debauchee Open Source Group
-.br
-Copyright \(co 2012\-2016 Symless Ltd.
-.br
-Copyright \(co 2008\-2014 Nick Bolton
-.br
-Copyright \(co 2002\-2014 Chris Schoeneman
--- a/doc/barriers.1
+++ b/doc/barriers.1
@@ -1,82 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH BARRIERS "1" "May 2018" "barriers 2.1.0-snapshot" "User Commands"
-.SH NAME
-barriers \- Barrier Keyboard/Mouse Server
-.SH SYNOPSIS
-.B barriers
-[\fI\,--address <address>\/\fR] [\fI\,--config <pathname>\/\fR] [\fI\,--display <display>\/\fR] [\fI\,--no-xinitthreads\/\fR] [\fI\,--daemon|--no-daemon\/\fR] [\fI\,--name <screen-name>\/\fR] [\fI\,--restart|--no-restart\/\fR] [\fI\,--debug <level>\/\fR]
-.SH DESCRIPTION
-Start the barrier server component.
-.SH OPTIONS
-.TP
-\fB\-a\fR, \fB\-\-address\fR <address>
-listen for clients on the given address.
-.TP
-\fB\-c\fR, \fB\-\-config\fR <pathname>
-use the named configuration file instead.
-.TP
-\fB\-d\fR, \fB\-\-debug\fR <level>
-filter out log messages with priority below level.
-level may be: FATAL, ERROR, WARNING, NOTE, INFO,
-DEBUG, DEBUG1, DEBUG2.
-.TP
-\fB\-n\fR, \fB\-\-name\fR <screen\-name> use screen\-name instead the hostname to identify
-this screen in the configuration.
-.TP
-\fB\-1\fR, \fB\-\-no\-restart\fR
-do not try to restart on failure.
-.TP
-\fB\-\-restart\fR
-restart the server automatically if it fails. (*)
-.TP
-\fB\-l\fR  \fB\-\-log\fR <file>
-write log messages to file.
-.TP
-\fB\-\-no\-tray\fR
-disable the system tray icon.
-.TP
-\fB\-\-enable\-drag\-drop\fR
-enable file drag & drop.
-.TP
-\fB\-\-enable\-crypto\fR
-enable the crypto (ssl) plugin.
-.TP
-\fB\-\-display\fR <display>
-connect to the X server at <display>
-.TP
-\fB\-\-no\-xinitthreads\fR
-do not call XInitThreads()
-.TP
-\fB\-f\fR, \fB\-\-no\-daemon\fR
-run in the foreground.
-.TP
-\fB\-\-daemon\fR
-run as a daemon. (*)
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-display this help and exit.
-.TP
-\fB\-\-version\fR
-display version information and exit.
-.PP
-Default options are marked with a *
-.PP
-The argument for \fB\-\-address\fR is of the form: [<hostname>][:<port>].  The
-hostname must be the address or hostname of an interface on the system.
-Placing brackets around an IPv6 address is required when also specifying
-a port number and optional otherwise. The default is to listen on all
-interfaces using port number 24800.
-.PP
-If no configuration file pathname is provided then the first of the
-following to load successfully sets the configuration:
-.IP
-$HOME/.local/share/barrier/barrier.conf
-\fI\,/etc/barrier.conf\/\fP
-.SH COPYRIGHT
-Copyright \(co 2018 Debauchee Open Source Group
-.br
-Copyright \(co 2012\-2016 Symless Ltd.
-.br
-Copyright \(co 2008\-2014 Nick Bolton
-.br
-Copyright \(co 2002\-2014 Chris Schoeneman
--- a/doc/org.synergy-foss.org.synergyc.plist
+++ b/doc/org.synergy-foss.org.synergyc.plist
@@ -2,16 +2,16 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
    "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<!-- Mac OSX only: Copy this plist file into [~]/Library/LaunchAgents to start barrier client automatically. Make sure you change the IP below. -->
+<!-- Mac OSX only: Copy this plist file into [~]/Library/LaunchAgents to start synergy client automatically. Make sure you change the IP below. -->
 <dict>
     <key>Label</key>
-     <string>org.debauchee.com.barrierc.plist</string>
+     <string>org.symless.com.synergyc.plist</string>
     <key>OnDemand</key>
     <false/>
     <key>ProgramArguments</key>
     <array>
-        <string>/usr/bin/barrierc</string>
-        <!-- Replace this IP with the IP of your barriers server -->
+        <string>/usr/bin/synergyc</string>
+        <!-- Replace this IP with the IP of your synergys server -->
        <string>192.168.0.2</string>
     </array>
     <key>RunAtLoad</key>
--- a/doc/org.synergy-foss.org.synergys.plist
+++ b/doc/org.synergy-foss.org.synergys.plist
@@ -2,19 +2,19 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
    "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<!-- Mac OSX only: Copy this plist file into [~]/Library/LaunchAgents to start barrier server automatically. Make sure you change configuration file below -->
+<!-- Mac OSX only: Copy this plist file into [~]/Library/LaunchAgents to start synergy server automatically. Make sure you change configuration file below -->
 <dict>
     <key>Label</key>
-     <string>org.debauchee.com.barriers.plist</string>
+     <string>org.symless.com.synergys.plist</string>
     <key>OnDemand</key>
     <false/>
     <key>ProgramArguments</key>
     <array>
-        <string>/usr/bin/barriers</string>
+        <string>/usr/bin/synergys</string>
            <string>--no-daemon</string>
            <string>--config</string>
-            <!-- Replace this path with the path to your barrier configuration -->
-            <string>/Users/snorp/.barrier.conf</string>
+            <!-- Replace this path with the path to your synergy configuration -->
+            <string>/Users/snorp/.synergy.conf</string>
    </array>
    <key>RunAtLoad</key>
    <true/>
--- a/doc/synergy.conf.example
+++ b/doc/synergy.conf.example
@@ -1,4 +1,4 @@
-# sample barrier configuration file
+# sample synergy configuration file
 #
 # comments begin with the # character and continue to the end of
 # line.  comments may appear anywhere the syntax permits.
--- a/doc/synergy.conf.example-advanced
+++ b/doc/synergy.conf.example-advanced
@@ -1,4 +1,4 @@
-# sample barrier configuration file
+# sample synergy configuration file
 #
 # comments begin with the # character and continue to the end of
 # line.  comments may appear anywhere the syntax permits.
--- a/doc/synergy.conf.example-basic
+++ b/doc/synergy.conf.example-basic
@@ -1,4 +1,4 @@
-# sample barrier configuration file
+# sample synergy configuration file
 #
 # comments begin with the # character and continue to the end of
 # line.  comments may appear anywhere the syntax permits.
--- a/doc/synergyc.man
+++ b/doc/synergyc.man
@@ -0,0 +1,47 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.38.2.
+.TH SYNERGYC "1" "June 2010" "synergyc 1.5.0, protocol version 1.3" "User Commands"
+.SH NAME
+synergyc \- manual page for synergyc 1.5.0, protocol version 1.3
+.SH SYNOPSIS
+.B synergyc
+[\fI--yscroll <delta>\fR] [\fI--daemon|--no-daemon\fR] [\fI--name <screen-name>\fR] [\fI--restart|--no-restart\fR] [\fI--debug <level>\fR] \fI<server-address>\fR
+.SH DESCRIPTION
+Connect to a synergy mouse/keyboard sharing server.
+.TP
+\fB\-d\fR, \fB\-\-debug\fR <level>
+filter out log messages with priority below level.
+level may be: FATAL, ERROR, WARNING, NOTE, INFO,
+DEBUG, DEBUGn (1\-5).
+.TP
+\fB\-n\fR, \fB\-\-name\fR <screen\-name> use screen\-name instead the hostname to identify
+this screen in the configuration.
+.TP
+\fB\-1\fR, \fB\-\-no\-restart\fR
+do not try to restart on failure.
+.PP
+*     \fB\-\-restart\fR            restart the server automatically if it fails.
+.TP
+\fB\-l\fR  \fB\-\-log\fR <file>
+write log messages to file.
+.TP
+\fB\-f\fR, \fB\-\-no\-daemon\fR
+run in the foreground.
+.PP
+*     \fB\-\-daemon\fR             run as a daemon.
+.TP
+\fB\-\-yscroll\fR <delta>
+defines the vertical scrolling delta, which is
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+display this help and exit.
+.TP
+\fB\-\-version\fR
+display version information and exit.
+.PP
+* marks defaults.
+.PP
+The server address is of the form: [<hostname>][:<port>].  The hostname
+must be the address or hostname of the server.  The port overrides the
+default port, 24800.
+.SH COPYRIGHT
+Copyright \(co 2010 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
--- a/doc/synergys.man
+++ b/doc/synergys.man
@@ -0,0 +1,57 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.38.2.
+.TH SYNERGYS "1" "June 2010" "synergys 1.5.0, protocol version 1.3" "User Commands"
+.SH NAME
+synergys \- manual page for synergys 1.5.0, protocol version 1.3
+.SH SYNOPSIS
+.B synergys
+[\fI--address <address>\fR] [\fI--config <pathname>\fR] [\fI--daemon|--no-daemon\fR] [\fI--name <screen-name>\fR] [\fI--restart|--no-restart\fR] [\fI--debug <level>\fR]
+.SH DESCRIPTION
+Start the synergy mouse/keyboard sharing server.
+.TP
+\fB\-a\fR, \fB\-\-address\fR <address>
+listen for clients on the given address.
+.TP
+\fB\-c\fR, \fB\-\-config\fR <pathname>
+use the named configuration file instead.
+.TP
+\fB\-d\fR, \fB\-\-debug\fR <level>
+filter out log messages with priority below level.
+level may be: FATAL, ERROR, WARNING, NOTE, INFO,
+DEBUG, DEBUGn (1\-5).
+.TP
+\fB\-n\fR, \fB\-\-name\fR <screen\-name> use screen\-name instead the hostname to identify
+this screen in the configuration.
+.TP
+\fB\-1\fR, \fB\-\-no\-restart\fR
+do not try to restart on failure.
+.PP
+*     \fB\-\-restart\fR            restart the server automatically if it fails.
+.TP
+\fB\-l\fR  \fB\-\-log\fR <file>
+write log messages to file.
+.TP
+\fB\-f\fR, \fB\-\-no\-daemon\fR
+run in the foreground.
+.PP
+*     \fB\-\-daemon\fR             run as a daemon.
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+display this help and exit.
+.TP
+\fB\-\-version\fR
+display version information and exit.
+.PP
+* marks defaults.
+.PP
+The argument for \fB\-\-address\fR is of the form: [<hostname>][:<port>].  The
+hostname must be the address or hostname of an interface on the system.
+The default is to listen on all interfaces.  The port overrides the
+default port, 24800.
+.PP
+If no configuration file pathname is provided then the first of the
+following to load successfully sets the configuration:
+.IP
+$HOME/.synergy.conf
+/etc/synergy.conf
+.SH COPYRIGHT
+Copyright \(co 2010 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
--- a/ext/gmock/build-aux/config.guess
+++ b/ext/gmock/build-aux/config.guess
@@ -461,7 +461,7 @@ EOF
    Motorola:*:4.3:PL8-*)
 	echo powerpc-harris-powermax
 	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Barrier:PowerMAX_OS:*:*)
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
 	echo powerpc-harris-powermax
 	exit ;;
    Night_Hawk:Power_UNIX:*:*)
--- a/ext/gmock/build-aux/config.sub
+++ b/ext/gmock/build-aux/config.sub
--- a/ext/gmock/build-aux/depcomp
+++ b/ext/gmock/build-aux/depcomp
--- a/ext/gmock/build-aux/install-sh
+++ b/ext/gmock/build-aux/install-sh
--- a/ext/gmock/build-aux/missing
+++ b/ext/gmock/build-aux/missing
--- a/ext/gmock/configure
+++ b/ext/gmock/configure
--- a/ext/gmock/scripts/fuse_gmock_files.py
+++ b/ext/gmock/scripts/fuse_gmock_files.py
--- a/ext/gmock/scripts/generator/cpp/ast.py
+++ b/ext/gmock/scripts/generator/cpp/ast.py
--- a/ext/gmock/scripts/generator/cpp/gmock_class.py
+++ b/ext/gmock/scripts/generator/cpp/gmock_class.py
--- a/ext/gmock/scripts/generator/cpp/keywords.py
+++ b/ext/gmock/scripts/generator/cpp/keywords.py
--- a/ext/gmock/scripts/generator/cpp/tokenize.py
+++ b/ext/gmock/scripts/generator/cpp/tokenize.py
--- a/ext/gmock/scripts/generator/cpp/utils.py
+++ b/ext/gmock/scripts/generator/cpp/utils.py
--- a/ext/gmock/scripts/generator/gmock_gen.py
+++ b/ext/gmock/scripts/generator/gmock_gen.py
--- a/ext/gmock/scripts/gmock-config.in
+++ b/ext/gmock/scripts/gmock-config.in
--- a/ext/gmock/test/gmock_leak_test.py
+++ b/ext/gmock/test/gmock_leak_test.py
--- a/ext/gmock/test/gmock_output_test.py
+++ b/ext/gmock/test/gmock_output_test.py
--- a/ext/gmock/test/gmock_test_utils.py
+++ b/ext/gmock/test/gmock_test_utils.py
--- a/ext/gtest/build-aux/config.guess
+++ b/ext/gtest/build-aux/config.guess
@@ -461,7 +461,7 @@ EOF
    Motorola:*:4.3:PL8-*)
 	echo powerpc-harris-powermax
 	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Barrier:PowerMAX_OS:*:*)
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
 	echo powerpc-harris-powermax
 	exit ;;
    Night_Hawk:Power_UNIX:*:*)
--- a/ext/gtest/build-aux/config.sub
+++ b/ext/gtest/build-aux/config.sub
--- a/ext/gtest/build-aux/depcomp
+++ b/ext/gtest/build-aux/depcomp
--- a/ext/gtest/build-aux/install-sh
+++ b/ext/gtest/build-aux/install-sh
--- a/ext/gtest/build-aux/missing
+++ b/ext/gtest/build-aux/missing
--- a/ext/gtest/configure
+++ b/ext/gtest/configure
--- a/ext/gtest/scripts/fuse_gtest_files.py
+++ b/ext/gtest/scripts/fuse_gtest_files.py
--- a/ext/gtest/scripts/gen_gtest_pred_impl.py
+++ b/ext/gtest/scripts/gen_gtest_pred_impl.py
--- a/ext/gtest/scripts/gtest-config.in
+++ b/ext/gtest/scripts/gtest-config.in
--- a/ext/gtest/scripts/pump.py
+++ b/ext/gtest/scripts/pump.py
--- a/ext/gtest/test/gtest_break_on_failure_unittest.py
+++ b/ext/gtest/test/gtest_break_on_failure_unittest.py
--- a/ext/gtest/test/gtest_catch_exceptions_test.py
+++ b/ext/gtest/test/gtest_catch_exceptions_test.py
--- a/ext/gtest/test/gtest_color_test.py
+++ b/ext/gtest/test/gtest_color_test.py
--- a/ext/gtest/test/gtest_env_var_test.py
+++ b/ext/gtest/test/gtest_env_var_test.py
--- a/ext/gtest/test/gtest_filter_unittest.py
+++ b/ext/gtest/test/gtest_filter_unittest.py
--- a/ext/gtest/test/gtest_help_test.py
+++ b/ext/gtest/test/gtest_help_test.py
--- a/ext/gtest/test/gtest_list_tests_unittest.py
+++ b/ext/gtest/test/gtest_list_tests_unittest.py
--- a/ext/gtest/test/gtest_output_test.py
+++ b/ext/gtest/test/gtest_output_test.py
--- a/ext/gtest/test/gtest_shuffle_test.py
+++ b/ext/gtest/test/gtest_shuffle_test.py
--- a/ext/gtest/test/gtest_test_utils.py
+++ b/ext/gtest/test/gtest_test_utils.py
--- a/ext/gtest/test/gtest_throw_on_failure_test.py
+++ b/ext/gtest/test/gtest_throw_on_failure_test.py
--- a/ext/gtest/test/gtest_uninitialized_test.py
+++ b/ext/gtest/test/gtest_uninitialized_test.py
--- a/ext/gtest/test/gtest_xml_outfiles_test.py
+++ b/ext/gtest/test/gtest_xml_outfiles_test.py
--- a/ext/gtest/test/gtest_xml_output_unittest.py
+++ b/ext/gtest/test/gtest_xml_output_unittest.py
--- a/ext/gtest/test/gtest_xml_test_utils.py
+++ b/ext/gtest/test/gtest_xml_test_utils.py
--- a/ext/gtest/xcode/Samples/FrameworkSample/runtests.sh
+++ b/ext/gtest/xcode/Samples/FrameworkSample/runtests.sh
--- a/ext/gtest/xcode/Scripts/runtests.sh
+++ b/ext/gtest/xcode/Scripts/runtests.sh
--- a/ext/gtest/xcode/Scripts/versiongenerate.py
+++ b/ext/gtest/xcode/Scripts/versiongenerate.py
--- a/ext/openssl/windows/x64/bin/libeay32.dll
+++ b/ext/openssl/windows/x64/bin/libeay32.dll
--- a/ext/openssl/windows/x64/bin/openssl.exe
+++ b/ext/openssl/windows/x64/bin/openssl.exe
--- a/ext/openssl/windows/x64/bin/ssleay32.dll
+++ b/ext/openssl/windows/x64/bin/ssleay32.dll
--- a/ext/openssl/windows/x64/include/openssl/dh.h
+++ b/ext/openssl/windows/x64/include/openssl/dh.h
@@ -257,11 +257,13 @@ DH *DH_get_1024_160(void);
 DH *DH_get_2048_224(void);
 DH *DH_get_2048_256(void);

+# ifndef OPENSSL_NO_CMS
 /* RFC2631 KDF */
 int DH_KDF_X9_42(unsigned char *out, size_t outlen,
                 const unsigned char *Z, size_t Zlen,
                 ASN1_OBJECT *key_oid,
                 const unsigned char *ukm, size_t ukmlen, const EVP_MD *md);
+# endif

 # define EVP_PKEY_CTX_set_dh_paramgen_prime_len(ctx, len) \
        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN, \
--- a/ext/openssl/windows/x64/include/openssl/evp.h
+++ b/ext/openssl/windows/x64/include/openssl/evp.h
@@ -1363,6 +1363,98 @@ void EVP_PKEY_meth_set_ctrl(EVP_PKEY_METHOD *pmeth,
                                             const char *type,
                                             const char *value));

+void EVP_PKEY_meth_get_init(EVP_PKEY_METHOD *pmeth,
+                            int (**pinit) (EVP_PKEY_CTX *ctx));
+
+void EVP_PKEY_meth_get_copy(EVP_PKEY_METHOD *pmeth,
+                            int (**pcopy) (EVP_PKEY_CTX *dst,
+                                           EVP_PKEY_CTX *src));
+
+void EVP_PKEY_meth_get_cleanup(EVP_PKEY_METHOD *pmeth,
+                               void (**pcleanup) (EVP_PKEY_CTX *ctx));
+
+void EVP_PKEY_meth_get_paramgen(EVP_PKEY_METHOD *pmeth,
+                                int (**pparamgen_init) (EVP_PKEY_CTX *ctx),
+                                int (**pparamgen) (EVP_PKEY_CTX *ctx,
+                                                   EVP_PKEY *pkey));
+
+void EVP_PKEY_meth_get_keygen(EVP_PKEY_METHOD *pmeth,
+                              int (**pkeygen_init) (EVP_PKEY_CTX *ctx),
+                              int (**pkeygen) (EVP_PKEY_CTX *ctx,
+                                               EVP_PKEY *pkey));
+
+void EVP_PKEY_meth_get_sign(EVP_PKEY_METHOD *pmeth,
+                            int (**psign_init) (EVP_PKEY_CTX *ctx),
+                            int (**psign) (EVP_PKEY_CTX *ctx,
+                                           unsigned char *sig, size_t *siglen,
+                                           const unsigned char *tbs,
+                                           size_t tbslen));
+
+void EVP_PKEY_meth_get_verify(EVP_PKEY_METHOD *pmeth,
+                              int (**pverify_init) (EVP_PKEY_CTX *ctx),
+                              int (**pverify) (EVP_PKEY_CTX *ctx,
+                                               const unsigned char *sig,
+                                               size_t siglen,
+                                               const unsigned char *tbs,
+                                               size_t tbslen));
+
+void EVP_PKEY_meth_get_verify_recover(EVP_PKEY_METHOD *pmeth,
+                                      int (**pverify_recover_init) (EVP_PKEY_CTX
+                                                                    *ctx),
+                                      int (**pverify_recover) (EVP_PKEY_CTX
+                                                               *ctx,
+                                                               unsigned char
+                                                               *sig,
+                                                               size_t *siglen,
+                                                               const unsigned
+                                                               char *tbs,
+                                                               size_t tbslen));
+
+void EVP_PKEY_meth_get_signctx(EVP_PKEY_METHOD *pmeth,
+                               int (**psignctx_init) (EVP_PKEY_CTX *ctx,
+                                                      EVP_MD_CTX *mctx),
+                               int (**psignctx) (EVP_PKEY_CTX *ctx,
+                                                 unsigned char *sig,
+                                                 size_t *siglen,
+                                                 EVP_MD_CTX *mctx));
+
+void EVP_PKEY_meth_get_verifyctx(EVP_PKEY_METHOD *pmeth,
+                                 int (**pverifyctx_init) (EVP_PKEY_CTX *ctx,
+                                                          EVP_MD_CTX *mctx),
+                                 int (**pverifyctx) (EVP_PKEY_CTX *ctx,
+                                                     const unsigned char *sig,
+                                                     int siglen,
+                                                     EVP_MD_CTX *mctx));
+
+void EVP_PKEY_meth_get_encrypt(EVP_PKEY_METHOD *pmeth,
+                               int (**pencrypt_init) (EVP_PKEY_CTX *ctx),
+                               int (**pencryptfn) (EVP_PKEY_CTX *ctx,
+                                                   unsigned char *out,
+                                                   size_t *outlen,
+                                                   const unsigned char *in,
+                                                   size_t inlen));
+
+void EVP_PKEY_meth_get_decrypt(EVP_PKEY_METHOD *pmeth,
+                               int (**pdecrypt_init) (EVP_PKEY_CTX *ctx),
+                               int (**pdecrypt) (EVP_PKEY_CTX *ctx,
+                                                 unsigned char *out,
+                                                 size_t *outlen,
+                                                 const unsigned char *in,
+                                                 size_t inlen));
+
+void EVP_PKEY_meth_get_derive(EVP_PKEY_METHOD *pmeth,
+                              int (**pderive_init) (EVP_PKEY_CTX *ctx),
+                              int (**pderive) (EVP_PKEY_CTX *ctx,
+                                               unsigned char *key,
+                                               size_t *keylen));
+
+void EVP_PKEY_meth_get_ctrl(EVP_PKEY_METHOD *pmeth,
+                            int (**pctrl) (EVP_PKEY_CTX *ctx, int type, int p1,
+                                           void *p2),
+                            int (**pctrl_str) (EVP_PKEY_CTX *ctx,
+                                               const char *type,
+                                               const char *value));
+
 void EVP_add_alg_module(void);

 /* BEGIN ERROR CODES */
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jerry (Xinyu Hou)	1e8e48d65b	Use corresponding Bonjour libs for different versions of OS	2018-03-20 11:41:38 +00:00
Andrew Nelless	5bd12f2376	v1.9.0-stable	2018-03-19 12:21:20 +00:00
Andrew Nelless	1d3e86dd55	Update OpenSSL to v1.0.2n	2018-03-19 11:27:34 +00:00
Andrew Nelless	4a3a5d5b0f	#6251 Attempt to fix Windows event loop hang	2018-03-18 20:50:26 +00:00
Andrew Nelless	a2929a7920	Bump Qt version	2018-02-28 01:14:41 +00:00