Update synergy to 1.7.4.
Tested by Michael Lesniewski <lesniewskister at gmail dot com>. ok abieber@
This commit is contained in:
jturner
parent
dfdf28f57a
commit
c143e5672d
@ -1,14 +1,14 @@
|
||||
# $OpenBSD: Makefile,v 1.28 2015/04/05 13:31:14 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.29 2015/10/21 19:51:28 jturner Exp $
|
||||
|
||||
COMMENT= mouse and keyboard sharing utility
|
||||
|
||||
DISTNAME= synergy-${GH_TAGNAME}
|
||||
REVISION= 0
|
||||
VERSION= 1.7.4
|
||||
DISTNAME= synergy-${VERSION}
|
||||
CATEGORIES= net x11
|
||||
|
||||
GH_ACCOUNT= synergy
|
||||
GH_PROJECT= synergy
|
||||
GH_TAGNAME= 1.6.2
|
||||
GH_TAGNAME= v${VERSION}-stable
|
||||
|
||||
HOMEPAGE= http://synergy-foss.org/
|
||||
|
||||
@ -16,10 +16,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
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (synergy-1.6.2.tar.gz) = NsCiyeocOhOmE0zh52rY3S9EIQDdYHXFPzGzmdJUO6M=
|
||||
SIZE (synergy-1.6.2.tar.gz) = 4411385
|
||||
SHA256 (synergy-1.7.4.tar.gz) = IV3DkYufPd+1fMlj+N9nUeXoNP2QwKiydnCRWJsBK98=
|
||||
SIZE (synergy-1.7.4.tar.gz) = 13665193
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
$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
|
||||
@@ -76,7 +76,7 @@ if (UNIX)
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.8 2015/10/21 19:51:28 jturner Exp $
|
||||
--- CMakeLists.txt.orig Fri Aug 7 18:56:23 2015
|
||||
+++ CMakeLists.txt Thu Oct 15 17:57:00 2015
|
||||
@@ -77,7 +77,7 @@ if (UNIX)
|
||||
|
||||
# warnings as errors:
|
||||
# we have a problem with people checking in code with warnings.
|
||||
- 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")
|
||||
@@ -103,7 +103,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 2015/01/03 04:59:27 bcallah Exp $
|
||||
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)
|
||||
@@ -114,7 +114,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 2015/01/03 04:59:27 bcallah Exp $
|
||||
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)
|
||||
@@ -157,6 +156,8 @@ if (UNIX)
|
||||
message(FATAL_ERROR "Missing library: pthread")
|
||||
endif()
|
||||
|
||||
@ -36,7 +36,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.7 2015/01/03 04:59:27 bcallah Exp $
|
||||
# curl is used on both Linux and Mac
|
||||
find_package(CURL)
|
||||
if (CURL_FOUND)
|
||||
@@ -196,78 +197,60 @@ if (UNIX)
|
||||
@@ -201,77 +202,59 @@ if (UNIX)
|
||||
|
||||
else() # not-apple
|
||||
|
||||
@ -142,20 +142,11 @@ $OpenBSD: patch-CMakeLists_txt,v 1.7 2015/01/03 04:59:27 bcallah Exp $
|
||||
+ 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.
|
||||
|
||||
@ -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)
|
||||
$OpenBSD: patch-src_CMakeLists_txt,v 1.3 2015/10/21 19:51:28 jturner Exp $
|
||||
--- src/CMakeLists.txt.orig Fri Aug 7 18:56:23 2015
|
||||
+++ src/CMakeLists.txt Thu Oct 15 17:57:00 2015
|
||||
@@ -17,7 +17,3 @@
|
||||
add_subdirectory(lib)
|
||||
add_subdirectory(cmd)
|
||||
add_subdirectory(plugin)
|
||||
add_subdirectory(micro)
|
||||
-
|
||||
-if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX")
|
||||
|
||||
10
net/synergy/patches/patch-src_lib_arch_CMakeLists_txt
Normal file
10
net/synergy/patches/patch-src_lib_arch_CMakeLists_txt
Normal file
@ -0,0 +1,10 @@
|
||||
$OpenBSD: patch-src_lib_arch_CMakeLists_txt,v 1.1 2015/10/21 19:51:28 jturner Exp $
|
||||
--- src/lib/arch/CMakeLists.txt.orig Thu Oct 15 21:09:45 2015
|
||||
+++ src/lib/arch/CMakeLists.txt Thu Oct 15 21:09:51 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()
|
||||
@ -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>
|
||||
@ -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>
|
||||
@ -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.
|
||||
Loading…
Reference in New Issue
Block a user