summaryrefslogtreecommitdiff
path: root/net/synergy/patches
diff options
context:
space:
mode:
authortnn <tnn>2015-03-14 23:37:54 +0000
committertnn <tnn>2015-03-14 23:37:54 +0000
commitd2da39540351b4cf8baedba22abde18f4b8e88ce (patch)
tree6e85a49f2362432c3c9c10a768adee7aa8d475fb /net/synergy/patches
parent32efa0609191586b5ae4177844804988e41ca77f (diff)
downloadpkgsrc-d2da39540351b4cf8baedba22abde18f4b8e88ce.tar.gz
Update to synergy-1.7.0.
Enhancement #4313 - SSL encrypted secure connection Enhancement #4168 - Plugin manager for GUI Enhancement #4307 - Always show client auto-detect dialog Enhancement #4397 - Modernize Mac build script (deployment and signing) Enhancement #4398 - Remove obsolete Mac database cleaner Enhancement #4337 - Remove IStreamFilterFactory dead code
Diffstat (limited to 'net/synergy/patches')
-rw-r--r--net/synergy/patches/patch-src_lib_server_CClientProxy1__4.cpp23
-rw-r--r--net/synergy/patches/patch-tools_cryptopp562_wake.cpp25
2 files changed, 0 insertions, 48 deletions
diff --git a/net/synergy/patches/patch-src_lib_server_CClientProxy1__4.cpp b/net/synergy/patches/patch-src_lib_server_CClientProxy1__4.cpp
deleted file mode 100644
index 471c1da0611..00000000000
--- a/net/synergy/patches/patch-src_lib_server_CClientProxy1__4.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-src_lib_server_CClientProxy1__4.cpp,v 1.2 2015/02/03 18:49:34 tnn Exp $
-
-g++ on sparc64 complains: ISO C++ says that these are ambiguous:
-synergy/ProtocolUtil.h:82:16: note: candidate 1: static void ProtocolUtil::writef(void*, const char*, va_list)
- static void writef(void*, const char* fmt, va_list);
- ^
-synergy/ProtocolUtil.h:53:16: note: candidate 2: static void ProtocolUtil::writef(synergy::IStream*, const char*, ...)
- static void writef(synergy::IStream*,
- ^
-synergy/ProtocolUtil.h:82:16: error: 'static void ProtocolUtil::writef(void*, const char*, va_list)' is private
- static void writef(void*, const char* fmt, va_list);
-
---- src/lib/server/ClientProxy1_4.cpp.orig 2014-12-02 15:03:19.000000000 +0000
-+++ src/lib/server/ClientProxy1_4.cpp
-@@ -83,7 +83,7 @@ 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()));
-- ProtocolUtil::writef(getStream(), kMsgDCryptoIv, &data);
-+ ProtocolUtil::writef(getStream(), kMsgDCryptoIv, "%s", &data);
-
- // change IV only after we've sent the current IV, otherwise
- // the client won't be able to decrypt the new IV.
diff --git a/net/synergy/patches/patch-tools_cryptopp562_wake.cpp b/net/synergy/patches/patch-tools_cryptopp562_wake.cpp
deleted file mode 100644
index 0cbae7c3013..00000000000
--- a/net/synergy/patches/patch-tools_cryptopp562_wake.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-tools_cryptopp562_wake.cpp,v 1.2 2015/02/03 18:49:34 tnn Exp $
-
---- ext/cryptopp562/wake.cpp.orig 2014-09-08 10:35:18.000000000 +0000
-+++ ext/cryptopp562/wake.cpp
-@@ -23,15 +23,15 @@ void WAKE_Base::GenKey(word32 k0, word32
- signed int x, z, p;
- // x and z were declared as "long" in Wheeler's paper, which is a signed type. I don't know if that was intentional, but it's too late to change it now. -- Wei 7/4/2010
- CRYPTOPP_COMPILE_ASSERT(sizeof(x) == 4);
-- static int tt[10]= {
-+ static int tt[8]= {
- 0x726a8f3b, // table
-- 0xe69a3b5c,
-- 0xd3c71fe5,
-- 0xab3c73d2,
-+ (int)0xe69a3b5c,
-+ (int)0xd3c71fe5,
-+ (int)0xab3c73d2,
- 0x4d3a8eb3,
- 0x0396d6e8,
- 0x3d4c2f7a,
-- 0x9ee27cf3, } ;
-+ (int)0x9ee27cf3, } ;
- t[0] = k0;
- t[1] = k1;
- t[2] = k2;