Merge pull request #106 from coypoop/master

Small patches for netbsd

.travis.yml

@@ -1,10 +1,34 @@
 language: cpp
-before_install:
+
-- sudo apt-get update -qq
+matrix:
-- sudo apt-get install -qq libxtst-dev
+  include:
-- sudo apt-get install -qq qtdeclarative5-dev
+    - os: linux
-- sudo apt-get install -qq libavahi-compat-libdnssd-dev
+      sudo: false
-script: sh -x ./clean_build.sh
+      dist: trusty
-# skip install phase since we have a customized install package
+      addons:
-# creation tool for each supported platform
+        apt:
+          packages:
+            - libxtst-dev
+            - qtdeclarative5-dev
+            - libavahi-compat-libdnssd-dev
+      script: sh -x ./clean_build.sh
+
+    - os: osx
+      osx_image: xcode9
+      script:
+        - export COLUMNS=80
+        - curl -LO https://raw.githubusercontent.com/GiovanniBussi/macports-ci/master/macports-ci
+        - chmod +x ./macports-ci
+        - ./macports-ci install
+        - PATH="$PATH:/opt/local/bin"
+        - sudo port -N install qt5-qtbase openssl
+        - sh -x ./clean_build.sh
+
+    - os: osx
+      osx_image: xcode9
+      script:
+        - brew update
+        - brew install qt openssl
+        - sh -x ./clean_build.sh
+
 install: true

CMakeLists.txt

@@ -63,6 +63,7 @@ if (UNIX)
     include (CheckIncludeFileCXX)
     include (CheckSymbolExists)
     include (CheckCSourceCompiles)
+    include (FindPkgConfig)
 
     check_include_file_cxx (istream HAVE_ISTREAM)
     check_include_file_cxx (ostream HAVE_OSTREAM)
@@ -131,7 +132,9 @@ if (UNIX)
     # curl is used on both Linux and Mac
     find_package (CURL)
     if (CURL_FOUND)
-        list (APPEND libs curl)
+        include_directories(${CURL_INCLUDE_DIRS})
+        list (APPEND libs ${CURL_LIBRARIES})
+
     else()
         message (FATAL_ERROR "Missing library: curl")
     endif()
@@ -163,6 +166,12 @@ if (UNIX)
             link_directories("/usr/local/lib")
         endif()
 
+        if (${PKG_CONFIG_FOUND})
+            pkg_check_modules (AVAHI_COMPAT REQUIRED avahi-compat-libdns_sd)
+            include_directories (BEFORE SYSTEM ${AVAHI_COMPAT_INCLUDE_DIRS})
+            set (CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${AVAHI_COMPAT_INCLUDE_DIRS}")
+        endif ()
+
         set (XKBlib "X11/Xlib.h;X11/XKBlib.h")
         set (CMAKE_EXTRA_INCLUDE_FILES "${XKBlib};X11/extensions/Xrandr.h")
         check_type_size ("XRRNotifyEvent" X11_EXTENSIONS_XRANDR_H)
@@ -302,13 +311,28 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
         ${OPENSSL_ROOT}/lib/ssleay32.lib
     )
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    set (OPENSSL_ROOT /usr/local/opt/openssl)
 
-    include_directories (BEFORE SYSTEM ${OPENSSL_ROOT}/include)
+    if (IS_DIRECTORY /opt/local)
-    set (OPENSSL_LIBS
+        # macports
-        ${OPENSSL_ROOT}/lib/libssl.a
+        set (OPENSSL_ROOT /opt/local)
-        ${OPENSSL_ROOT}/lib/libcrypto.a
+
-    )
+        set (OPENSSL_LIBS
+            ${OPENSSL_ROOT}/lib/libssl.a
+            ${OPENSSL_ROOT}/lib/libcrypto.a
+            z
+        )
+    elseif (IS_DIRECTORY /usr/local/opt/openssl)
+        # brew
+        set (OPENSSL_ROOT /usr/local/opt/openssl)
+
+        include_directories (BEFORE SYSTEM ${OPENSSL_ROOT}/include)
+
+        set (OPENSSL_LIBS
+            ${OPENSSL_ROOT}/lib/libssl.a
+            ${OPENSSL_ROOT}/lib/libcrypto.a
+        )
+    endif()
+
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     set (OPENSSL_LIBS ssl crypto)
 else()

README.md

@@ -10,7 +10,7 @@ Barrier is KVM software forked from Symless's synergy 1.9 codebase. Synergy was
 
 ### 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.
+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). It's that simple.
 
 ### Project goals
 

clean_build.bat

@@ -3,8 +3,8 @@
 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_VER=5.11.1
-set B_QT_MSVC=msvc2015_64
+set B_QT_MSVC=msvc2017_64
 set B_BONJOUR=C:\Program Files\Bonjour SDK
 
 set savedir=%cd%

clean_build.sh

@@ -14,7 +14,7 @@ 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"
+    B_CMAKE_FLAGS="-DCMAKE_OSX_SYSROOT=$(xcode-select --print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 $B_CMAKE_FLAGS"
 fi
 # allow local customizations to build environment
 [ -r ./build_env.sh ] && . ./build_env.sh

cmake/Version.cmake

@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 3.4)
 
 set (BARRIER_VERSION_MAJOR 2)
-set (BARRIER_VERSION_MINOR 1)
+set (BARRIER_VERSION_MINOR 2)
 set (BARRIER_VERSION_PATCH 0)
 
 #

dist/inno/barrier.iss.in

@@ -6,6 +6,7 @@
 #define MyAppServiceName "Barrier"
 #define MyAppServiceExe "barrierd.exe"
 #define MyAppServiceDesc "Manages the Barrier background processes."
+#define MyAppListenerDesc "Barrier Listener"
 
 [Setup]
 AppId={{41036EA6-3F7A-4803-8AE0-469E5E91EFCC}
@@ -40,6 +41,10 @@ Name: "{commonprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
 Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
 
 [Run]
+; there's no "check if exists" or "insert if not exists" for netsh's firewall commands
+; to avoid duplicate entries remove the existing rule (fails if it doesn't exist) before adding
+Filename: {sys}\netsh.exe; Parameters: "advfirewall firewall delete rule name=""{#MyAppListenerDesc}"""; Flags: runhidden
+Filename: {sys}\netsh.exe; Parameters: "advfirewall firewall add rule name=""{#MyAppListenerDesc}"" protocol=TCP dir=in localport=24800 action=allow"; Flags: runhidden
 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
@@ -51,6 +56,7 @@ 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
+Filename: {sys}\netsh.exe; Parameters: "advfirewall firewall delete rule name=""{#MyAppListenerDesc}"""; Flags: runhidden
 
 [CustomMessages]
 DependenciesDir="redist"
@@ -68,7 +74,7 @@ begin
 	// initialize windows version
 	initwinversion();
 
-  vcredist2017('14'); // min allowed version is 14.0
+	vcredist2017('14'); // min allowed version is 14.0
 
 	Result := true;
 end;

osx_environment.sh

@@ -1,16 +1,37 @@
-#!/bin/sh
+#!/bin/bash
 
 if [ ! $BARRIER_BUILD_ENV ]; then
 
     printf "Modifying environment for Barrier build..."
 
-    QT_PATH=$(brew --prefix qt)
+    if command -v port; then
-    OPENSSL_PATH=$(brew --prefix openssl)
+        printf "Detected Macports"
+
+        if [ ! -d /opt/local/lib/cmake/Qt5 ]; then
+            printf "Please install qt5-qtbase port"
+        fi
+        export BARRIER_BUILD_MACPORTS=1
+        export CMAKE_PREFIX_PATH="/opt/local/lib/cmake/Qt5:$CMAKE_PREFIX_PATH"
+        export LD_LIBRARY_PATH="/opt/local/lib:$LD_LIBRARY_PATH"
+        export CPATH="/opt/local/include:$CPATH"
+        export PKG_CONFIG_PATH="/opt/local/libexec/qt5/lib/pkgconfig:$PKG_CONFIG_PATH"
+
+    elif command -v brew; then
+        printf "Detected Homebrew"
+        QT_PATH=$(brew --prefix qt)
+        OPENSSL_PATH=$(brew --prefix openssl)
+
+        export BARRIER_BUILD_BREW=1
+        export CMAKE_PREFIX_PATH="$QT_PATH:$CMAKE_PREFIX_PATH"
+        export LD_LIBRARY_PATH="$OPENSSL_PATH/lib:$LD_LIBRARY_PATH"
+        export CPATH="$OPENSSL_PATH/include:$CPATH"
+        export PKG_CONFIG_PATH="$OPENSSL_PATH/lib/pkgconfig:$PKG_CONFIG_PATH"
+
+    else
+        printf "Neither Homebrew nor Macports is installed. Can't get dependency paths"
+        exit 1
+    fi
 
-    export CMAKE_PREFIX_PATH="$QT_PATH:$CMAKE_PREFIX_PATH"
-    export LD_LIBRARY_PATH="$OPENSSL_PATH/lib:$LD_LIBRARY_PATH"
-    export CPATH="$OPENSSL_PATH/include:$CPATH"
-    export PKG_CONFIG_PATH="$OPENSSL_PATH/lib/pkgconfig:$PKG_CONFIG_PATH"
     export BARRIER_BUILD_ENV=1
 
     printf "done\n"

src/cmd/barrierc/CMakeLists.txt

@@ -29,6 +29,7 @@ if (WIN32)
         tb_idle.ico
         tb_run.ico
         tb_wait.ico
+        barrierc.exe.manifest
     )
 elseif (APPLE)
     file(GLOB arch_headers "OSX*.h")

src/cmd/barrierc/barrierc.exe.manifest

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"><trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"><security><requestedPrivileges><requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel></requestedPrivileges></security></trustInfo><application xmlns="urn:schemas-microsoft-com:asm.v3"><windowsSettings><dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware></windowsSettings></application></assembly>

src/cmd/barriers/CMakeLists.txt

@@ -29,6 +29,7 @@ if (WIN32)
         tb_idle.ico
         tb_run.ico
         tb_wait.ico
+        barriers.exe.manifest
     )
 elseif (APPLE)
     file(GLOB arch_headers "OSX*.h")

src/cmd/barriers/barriers.exe.manifest

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"><trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"><security><requestedPrivileges><requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel></requestedPrivileges></security></trustInfo><application xmlns="urn:schemas-microsoft-com:asm.v3"><windowsSettings><dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware></windowsSettings></application></assembly>

src/gui/CMakeLists.txt

@@ -36,8 +36,7 @@ if (WIN32)
 elseif (APPLE)
     find_library(APPSERVICES_LIB ApplicationServices)
     target_link_libraries(barrier ${APPSERVICES_LIB})
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR
+else()
-        ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
     target_link_libraries (barrier dns_sd)
 endif()
 

src/gui/src/SettingsDialogBase.ui

@@ -167,7 +167,7 @@
       <item row="1" column="0">
        <widget class="QLabel" name="m_pLabel_21">
         <property name="text">
-         <string>&amp;Interface:</string>
+         <string>&amp;Address:</string>
         </property>
         <property name="buddy">
          <cstring>m_pLineEditInterface</cstring>

src/gui/src/SslCertificate.cpp

@@ -121,7 +121,7 @@ void SslCertificate::generateCertificate()
 
         // private key
         arguments.append("-newkey");
-        arguments.append("rsa:1024");
+        arguments.append("rsa:2048");
 
         QDir sslDir(sslDirPath);
         if (!sslDir.exists()) {

src/lib/arch/CMakeLists.txt

@@ -41,7 +41,5 @@ add_library(arch STATIC ${sources})
 
 if (UNIX)
     target_link_libraries(arch ${libs})
-    if (NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+    target_link_libraries(arch ${CMAKE_DL_LIBS})
-        target_link_libraries(arch dl)
-    endif()
 endif()

src/lib/barrier/ServerApp.cpp

@@ -145,7 +145,7 @@ ServerApp::help()
            << std::endl
            << "If no configuration file pathname is provided then the first of the" << std::endl
            << "following to load successfully sets the configuration:" << std::endl
-           << "  " << PathUtilities::concat(DataDirectories::profile(), SYS_CONFIG_NAME) << std::endl
+           << "  " << PathUtilities::concat(DataDirectories::profile(), USR_CONFIG_NAME) << std::endl
            << "  " << PathUtilities::concat(DataDirectories::systemconfig(), SYS_CONFIG_NAME) << std::endl;
 
     LOG((CLOG_PRINT "%s", buffer.str().c_str()));

src/lib/base/Unicode.cpp

@@ -628,25 +628,25 @@ Unicode::fromUTF8(const UInt8*& data, UInt32& n)
     case 4:
         c = ((static_cast<UInt32>(data[0]) & 0x07) << 18) |
             ((static_cast<UInt32>(data[1]) & 0x3f) << 12) |
-            ((static_cast<UInt32>(data[1]) & 0x3f) <<  6) |
+            ((static_cast<UInt32>(data[2]) & 0x3f) <<  6) |
-            ((static_cast<UInt32>(data[1]) & 0x3f)      );
+            ((static_cast<UInt32>(data[3]) & 0x3f)      );
         break;
 
     case 5:
         c = ((static_cast<UInt32>(data[0]) & 0x03) << 24) |
             ((static_cast<UInt32>(data[1]) & 0x3f) << 18) |
-            ((static_cast<UInt32>(data[1]) & 0x3f) << 12) |
+            ((static_cast<UInt32>(data[2]) & 0x3f) << 12) |
-            ((static_cast<UInt32>(data[1]) & 0x3f) <<  6) |
+            ((static_cast<UInt32>(data[3]) & 0x3f) <<  6) |
-            ((static_cast<UInt32>(data[1]) & 0x3f)      );
+            ((static_cast<UInt32>(data[4]) & 0x3f)      );
         break;
 
     case 6:
         c = ((static_cast<UInt32>(data[0]) & 0x01) << 30) |
             ((static_cast<UInt32>(data[1]) & 0x3f) << 24) |
-            ((static_cast<UInt32>(data[1]) & 0x3f) << 18) |
+            ((static_cast<UInt32>(data[2]) & 0x3f) << 18) |
-            ((static_cast<UInt32>(data[1]) & 0x3f) << 12) |
+            ((static_cast<UInt32>(data[3]) & 0x3f) << 12) |
-            ((static_cast<UInt32>(data[1]) & 0x3f) <<  6) |
+            ((static_cast<UInt32>(data[4]) & 0x3f) <<  6) |
-            ((static_cast<UInt32>(data[1]) & 0x3f)      );
+            ((static_cast<UInt32>(data[5]) & 0x3f)      );
         break;
 
     default: