Hi Ports,
As there is a new version of synergy released and including the comments
from the last diff I proposed, attached is an updated diff. Works ok for
me to Win 7 client.
Comments/tests welcome.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/synergy/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile 5 Apr 2015 13:31:14 -0000 1.28
+++ Makefile 12 Aug 2015 18:02:21 -0000
@@ -3,12 +3,13 @@
COMMENT= mouse and keyboard sharing utility
DISTNAME= synergy-${GH_TAGNAME}
-REVISION= 0
+PKGNAME= synergy-${V}
CATEGORIES= net x11
GH_ACCOUNT= synergy
GH_PROJECT= synergy
-GH_TAGNAME= 1.6.2
+GH_TAGNAME= v${V}-stable
+V= 1.7.4
HOMEPAGE= http://synergy-foss.org/
@@ -16,10 +17,9 @@ HOMEPAGE= http://synergy-foss.org/
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= ICE SM X11 Xext Xi Xinerama Xrandr Xtst \
- c cryptopp curl m pthread stdc++
+ c curl m pthread stdc++
-LIB_DEPENDS= devel/cryptopp \
- net/curl
+LIB_DEPENDS= net/curl
MODULES= devel/cmake
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/synergy/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 3 Jan 2015 04:59:27 -0000 1.11
+++ distinfo 12 Aug 2015 18:02:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (synergy-1.6.2.tar.gz) = NsCiyeocOhOmE0zh52rY3S9EIQDdYHXFPzGzmdJUO6M=
-SIZE (synergy-1.6.2.tar.gz) = 4411385
+SHA256 (synergy-v1.7.4-stable.tar.gz) = 215dc3918b9f3ddfb57cc963f8df6751e5e834fd90c0a8b2767091589b012bdf
+SIZE (synergy-v1.7.4-stable.tar.gz) = 13665193
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/net/synergy/patches/patch-CMakeLists_txt,v
retrieving revision 1.7
diff -u -p -r1.7 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 3 Jan 2015 04:59:27 -0000 1.7
+++ patches/patch-CMakeLists_txt 12 Aug 2015 18:02:21 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-CMakeLists_txt,v 1.7 2015/01/03 04:59:27 bcallah Exp $
---- CMakeLists.txt.orig Thu Nov 6 13:09:27 2014
-+++ CMakeLists.txt Thu Nov 6 19:59:59 2014
+--- CMakeLists.txt.orig Tue May 26 11:56:21 2015
++++ CMakeLists.txt Mon Aug 3 17:14:36 2015
@@ -76,7 +76,7 @@ if (UNIX)
# warnings as errors:
@@ -8,9 +8,9 @@ $OpenBSD: patch-CMakeLists_txt,v 1.7 201
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
- # For config.h, detect the libraries, functions, etc.
- include(CheckIncludeFiles)
-@@ -98,7 +98,7 @@ if (UNIX)
+ if (NOT APPLE)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+@@ -102,7 +102,7 @@ if (UNIX)
check_include_files(strings.h HAVE_STRINGS_H)
check_include_files(string.h HAVE_STRING_H)
check_include_files(sys/select.h HAVE_SYS_SELECT_H)
@@ -19,7 +19,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.7 201
check_include_files(sys/stat.h HAVE_SYS_STAT_H)
check_include_files(sys/time.h HAVE_SYS_TIME_H)
check_include_files(sys/utsname.h HAVE_SYS_UTSNAME_H)
-@@ -109,7 +109,6 @@ if (UNIX)
+@@ -113,7 +113,6 @@ if (UNIX)
check_function_exists(gmtime_r HAVE_GMTIME_R)
check_function_exists(nanosleep HAVE_NANOSLEEP)
check_function_exists(poll HAVE_POLL)
@@ -27,7 +27,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.7 201
check_function_exists(strftime HAVE_STRFTIME)
check_function_exists(vsnprintf HAVE_VSNPRINTF)
check_function_exists(inet_aton HAVE_INET_ATON)
-@@ -152,6 +151,8 @@ if (UNIX)
+@@ -156,6 +155,8 @@ if (UNIX)
message(FATAL_ERROR "Missing library: pthread")
endif()
@@ -36,7 +36,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.7 201
# curl is used on both Linux and Mac
find_package(CURL)
if (CURL_FOUND)
-@@ -196,78 +197,60 @@ if (UNIX)
+@@ -200,77 +201,59 @@ if (UNIX)
else() # not-apple
@@ -142,20 +142,11 @@ $OpenBSD: patch-CMakeLists_txt,v 1.7 201
+ if(X11_Xrandr_FOUND)
+ set(HAVE_X11_EXTENSIONS_XRANDR_H 1)
+ list(APPEND libs ${X11_Xrandr_LIB})
- endif()
++ endif()
+
+ if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+ include_directories(${OPENBSD_LOCALBASE}/include)
+ link_directories(${OPENBSD_LOCALBASE}/lib)
-+ endif()
+ endif()
endif()
-
-@@ -319,7 +302,6 @@ else() # not-unix
- endif()
-
- add_subdirectory(src)
--add_subdirectory(ext)
-
- if (WIN32)
- # TODO: consider using /analyze to uncover potential bugs in the source code.
Index: patches/patch-src_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/net/synergy/patches/patch-src_CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_CMakeLists_txt
--- patches/patch-src_CMakeLists_txt 1 May 2014 14:46:53 -0000 1.2
+++ patches/patch-src_CMakeLists_txt 12 Aug 2015 18:02:21 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-src_CMakeLists_txt,v 1.2 2014/05/01 14:46:53 bcallah Exp $
---- src/CMakeLists.txt.orig Tue Apr 15 22:26:08 2014
-+++ src/CMakeLists.txt Tue Apr 15 22:26:13 2014
-@@ -18,7 +18,3 @@ add_subdirectory(lib)
+--- src/CMakeLists.txt.orig Tue May 26 11:56:21 2015
++++ src/CMakeLists.txt Mon Aug 3 17:14:36 2015
+@@ -17,7 +17,3 @@
+ add_subdirectory(lib)
add_subdirectory(cmd)
- add_subdirectory(plugin)
add_subdirectory(micro)
-
-if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX")
Index: patches/patch-src_lib_arch_CMakeLists_txt
===================================================================
RCS file: patches/patch-src_lib_arch_CMakeLists_txt
diff -N patches/patch-src_lib_arch_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_lib_arch_CMakeLists_txt 12 Aug 2015 18:02:21 -0000
@@ -0,0 +1,10 @@
+$OpenBSD$
+--- src/lib/arch/CMakeLists.txt.orig Mon Aug 3 17:04:20 2015
++++ src/lib/arch/CMakeLists.txt Mon Aug 3 17:04:42 2015
+@@ -50,5 +50,5 @@ endif()
+ add_library(arch STATIC ${sources})
+
+ if (UNIX)
+- target_link_libraries(arch dl ${libs})
++ target_link_libraries(arch ${libs})
+ endif()
Index: patches/patch-src_lib_io_CryptoMode_cryptopp_h
===================================================================
RCS file: patches/patch-src_lib_io_CryptoMode_cryptopp_h
diff -N patches/patch-src_lib_io_CryptoMode_cryptopp_h
--- patches/patch-src_lib_io_CryptoMode_cryptopp_h 1 May 2014 14:46:53 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_lib_io_CryptoMode_cryptopp_h,v 1.1 2014/05/01 14:46:53 bcallah Exp $
---- src/lib/io/CryptoMode_cryptopp.h.orig Tue Apr 15 22:33:00 2014
-+++ src/lib/io/CryptoMode_cryptopp.h Tue Apr 15 22:33:25 2014
-@@ -25,6 +25,6 @@
- # pragma GCC system_header
- #endif
-
--#include <cryptopp562/gcm.h>
--#include <cryptopp562/modes.h>
--#include <cryptopp562/aes.h>
-+#include <cryptopp/gcm.h>
-+#include <cryptopp/modes.h>
-+#include <cryptopp/aes.h>
Index: patches/patch-src_lib_io_CryptoStream_cryptopp_h
===================================================================
RCS file: patches/patch-src_lib_io_CryptoStream_cryptopp_h
diff -N patches/patch-src_lib_io_CryptoStream_cryptopp_h
--- patches/patch-src_lib_io_CryptoStream_cryptopp_h 1 May 2014 14:46:53 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_lib_io_CryptoStream_cryptopp_h,v 1.1 2014/05/01 14:46:53 bcallah Exp $
---- src/lib/io/CryptoStream_cryptopp.h.orig Tue Apr 15 22:34:13 2014
-+++ src/lib/io/CryptoStream_cryptopp.h Tue Apr 15 22:34:21 2014
-@@ -25,5 +25,5 @@
- # pragma GCC system_header
- #endif
-
--#include <cryptopp562/osrng.h>
--#include <cryptopp562/sha.h>
-+#include <cryptopp/osrng.h>
-+#include <cryptopp/sha.h>
Index: patches/patch-src_lib_server_ClientProxy1_4_cpp
===================================================================
RCS file: patches/patch-src_lib_server_ClientProxy1_4_cpp
diff -N patches/patch-src_lib_server_ClientProxy1_4_cpp
--- patches/patch-src_lib_server_ClientProxy1_4_cpp 3 Jan 2015 04:59:27 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_lib_server_ClientProxy1_4_cpp,v 1.2 2015/01/03 04:59:27 bcallah Exp $
---- src/lib/server/ClientProxy1_4.cpp.orig Mon Dec 22 16:18:26 2014
-+++ src/lib/server/ClientProxy1_4.cpp Mon Dec 22 16:19:16 2014
-@@ -83,7 +83,11 @@ ClientProxy1_4::cryptoIv()
- String data(reinterpret_cast<const char*>(iv), CRYPTO_IV_SIZE);
-
- LOG((CLOG_DEBUG2 "send crypto iv change to \"%s\"", getName().c_str()));
-+#if defined(__mips64__) || defined(__sparc64__) || defined(__hppa__)
-+ ProtocolUtil::writef(static_cast<void*>(getStream()), static_cast<const char*>(kMsgDCryptoIv), &data);
-+#else
- ProtocolUtil::writef(getStream(), kMsgDCryptoIv, &data);
-+#endif
-
- // change IV only after we've sent the current IV, otherwise
- // the client won't be able to decrypt the new IV.
Index: patches/patch-src_test_CMakeLists_txt
===================================================================
RCS file: patches/patch-src_test_CMakeLists_txt
diff -N patches/patch-src_test_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_test_CMakeLists_txt 12 Aug 2015 18:02:21 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+--- src/test/CMakeLists.txt.orig Mon Aug 3 17:03:38 2015
++++ src/test/CMakeLists.txt Mon Aug 3 17:03:52 2015
+@@ -13,21 +13,3 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
+-
+-include_directories(
+- ../../ext/gtest-1.6.0
+- ../../ext/gtest-1.6.0/include
+- ../../ext/gmock-1.6.0
+- ../../ext/gmock-1.6.0/include)
+-
+-add_library(gtest STATIC ../../ext/gtest-1.6.0/src/gtest-all.cc)
+-add_library(gmock STATIC ../../ext/gmock-1.6.0/src/gmock-all.cc)
+-
+-if (UNIX)
+- # ignore warnings in gtest and gmock
+- set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-w")
+- set_target_properties(gmock PROPERTIES COMPILE_FLAGS "-w")
+-endif()
+-
+-add_subdirectory(integtests)
+-add_subdirectory(unittests)
