Update synergy to 1.4.15

testing and ok okan@
This commit is contained in:
bcallah 2013-11-18 23:56:35 +00:00
parent a4c11dfceb
commit b781cf1af3
8 changed files with 26 additions and 27 deletions

View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.21 2013/08/07 21:32:27 naddy Exp $
# $OpenBSD: Makefile,v 1.22 2013/11/18 23:56:35 bcallah Exp $
COMMENT= mouse and keyboard sharing utility
V= 1.4.12
V= 1.4.15
DISTNAME= synergy-${V}-Source
PKGNAME= synergy-${V}
REVISION= 1
CATEGORIES= net x11
MAINTAINER= Brian Callahan <bcallah@openbsd.org>

View File

@ -1,2 +1,2 @@
SHA256 (synergy-1.4.12-Source.tar.gz) = NbYMjXM2igy5DapinmT2YXG5NKeZqCQnQxl5zKcmCEk=
SIZE (synergy-1.4.12-Source.tar.gz) = 3954996
SHA256 (synergy-1.4.15-Source.tar.gz) = ZDdFiI7GFQ50y22pgT+MdXLy+HzzXwvU9kzB5GfvNVA=
SIZE (synergy-1.4.15-Source.tar.gz) = 4122349

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-CMakeLists_txt,v 1.3 2013/05/17 18:53:24 dcoppa Exp $
--- CMakeLists.txt.orig Fri May 17 20:20:00 2013
+++ CMakeLists.txt Fri May 17 20:38:46 2013
$OpenBSD: patch-CMakeLists_txt,v 1.4 2013/11/18 23:56:35 bcallah Exp $
--- CMakeLists.txt.orig Sun Nov 17 15:00:17 2013
+++ CMakeLists.txt Sun Nov 17 15:00:17 2013
@@ -87,7 +87,7 @@ if (UNIX)
check_include_files(strings.h HAVE_STRINGS_H)
check_include_files(string.h HAVE_STRING_H)
@ -140,7 +140,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.3 2013/05/17 18:53:24 dcoppa Exp $
# For config.h, set some static values; it may be a good idea to make
# these values dynamic for non-standard UNIX compilers.
@@ -303,7 +284,6 @@ if (VNC_SUPPORT)
@@ -295,7 +276,6 @@ else (UNIX)
endif()
add_subdirectory(src)

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_lib_synergy_CCryptoMode_h,v 1.1 2013/05/17 18:53:24 dcoppa Exp $
--- src/lib/synergy/CCryptoMode.h.orig Fri May 17 14:10:03 2013
+++ src/lib/synergy/CCryptoMode.h Fri May 17 14:10:34 2013
$OpenBSD: patch-src_lib_io_CCryptoMode_h,v 1.1 2013/11/18 23:56:35 bcallah Exp $
--- src/lib/io/CCryptoMode.h.orig Sun Nov 17 15:03:30 2013
+++ src/lib/io/CCryptoMode.h Sun Nov 17 15:03:44 2013
@@ -17,9 +17,9 @@
#pragma once

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_lib_synergy_CCryptoStream_h,v 1.1 2013/05/17 18:53:24 dcoppa Exp $
--- src/lib/synergy/CCryptoStream.h.orig Fri May 17 14:10:14 2013
+++ src/lib/synergy/CCryptoStream.h Fri May 17 14:10:46 2013
$OpenBSD: patch-src_lib_io_CCryptoStream_h,v 1.1 2013/11/18 23:56:35 bcallah Exp $
--- src/lib/io/CCryptoStream.h.orig Sun Nov 17 15:04:03 2013
+++ src/lib/io/CCryptoStream.h Sun Nov 17 15:04:14 2013
@@ -20,8 +20,8 @@
#include "BasicTypes.h"
#include "CStreamFilter.h"

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-src_lib_ipc_CIpcClientProxy_cpp,v 1.4 2013/07/04 14:49:26 landry Exp $
$OpenBSD: patch-src_lib_ipc_CIpcClientProxy_cpp,v 1.5 2013/11/18 23:56:35 bcallah Exp $
On loongson/sparc64/hppa:
Same as CIpcServerProxy.cpp
--- src/lib/ipc/CIpcClientProxy.cpp.orig Mon Sep 3 22:09:56 2012
+++ src/lib/ipc/CIpcClientProxy.cpp Thu Apr 18 10:50:31 2013
@@ -144,7 +144,11 @@ CIpcClientProxy::send(const CIpcMessage& message)
--- src/lib/ipc/CIpcClientProxy.cpp.orig Sat Jun 29 10:17:49 2013
+++ src/lib/ipc/CIpcClientProxy.cpp Sun Nov 17 15:00:17 2013
@@ -146,7 +146,11 @@ CIpcClientProxy::send(const CIpcMessage& message)
case kIpcLogLine: {
const CIpcLogLineMessage& llm = static_cast<const CIpcLogLineMessage&>(message);
CString logLine = llm.logLine();

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_lib_ipc_CIpcServerProxy_cpp,v 1.4 2013/07/04 14:49:26 landry Exp $
$OpenBSD: patch-src_lib_ipc_CIpcServerProxy_cpp,v 1.5 2013/11/18 23:56:35 bcallah Exp $
On loongson/sparc64/hppa:
CIpcServerProxy.cpp: In member function 'void CIpcServerProxy::send(const CIpcMessage&)':
@ -10,9 +10,9 @@ CIpcServerProxy.cpp:93: error: within this context
gcc bug fixed in 4.3.3
--- src/lib/ipc/CIpcServerProxy.cpp.orig Mon Sep 3 22:09:56 2012
+++ src/lib/ipc/CIpcServerProxy.cpp Thu Apr 18 10:50:31 2013
@@ -91,7 +91,11 @@ CIpcServerProxy::send(const CIpcMessage& message)
--- src/lib/ipc/CIpcServerProxy.cpp.orig Sat Jun 29 10:17:49 2013
+++ src/lib/ipc/CIpcServerProxy.cpp Sun Nov 17 15:00:17 2013
@@ -94,7 +94,11 @@ CIpcServerProxy::send(const CIpcMessage& message)
case kIpcCommand: {
const CIpcCommandMessage& cm = static_cast<const CIpcCommandMessage&>(message);
CString command = cm.command();

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-src_lib_server_CClientProxy1_4_cpp,v 1.2 2013/07/04 14:49:27 landry Exp $
$OpenBSD: patch-src_lib_server_CClientProxy1_4_cpp,v 1.3 2013/11/18 23:56:35 bcallah Exp $
On loongson/sparc64/hppa:
Same issue as CIpcServerProxy.cpp
--- src/lib/server/CClientProxy1_4.cpp.orig Sat May 11 12:46:51 2013
+++ src/lib/server/CClientProxy1_4.cpp Sat May 11 12:56:15 2013
@@ -102,7 +102,11 @@ CClientProxy1_4::cryptoIv()
--- src/lib/server/CClientProxy1_4.cpp.orig Fri Aug 16 14:06:30 2013
+++ src/lib/server/CClientProxy1_4.cpp Sun Nov 17 15:00:17 2013
@@ -81,7 +81,11 @@ CClientProxy1_4::cryptoIv()
CString data(reinterpret_cast<const char*>(iv), CRYPTO_IV_SIZE);
LOG((CLOG_DEBUG2 "send crypto iv change to \"%s\"", getName().c_str()));