Hi ports --
Attached is an update for Synergy. I'd appreciate some testing on weird
archs (and i386).
Works with my setup: amd64 server and macppc client. Build test on
loongson underway.
OK?
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/synergy/Makefile,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 Makefile
--- Makefile 7 Aug 2013 21:32:27 -0000 1.21
+++ Makefile 17 Nov 2013 20:29:14 -0000
@@ -2,10 +2,9 @@
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 <bcal...@openbsd.org>
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/synergy/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- distinfo 12 May 2013 16:09:04 -0000 1.7
+++ distinfo 17 Nov 2013 20:29:14 -0000
@@ -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
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/net/synergy/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 17 May 2013 18:53:24 -0000 1.3
+++ patches/patch-CMakeLists_txt 17 Nov 2013 20:29:14 -0000
@@ -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
+--- 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 201
# 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)
Index: patches/patch-src_lib_io_CCryptoMode_h
===================================================================
RCS file: patches/patch-src_lib_io_CCryptoMode_h
diff -N patches/patch-src_lib_io_CCryptoMode_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_lib_io_CCryptoMode_h 17 Nov 2013 20:29:14 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- 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
+
+-#include <cryptopp562/gcm.h>
+-#include <cryptopp562/modes.h>
+-#include <cryptopp562/aes.h>
++#include <cryptopp/gcm.h>
++#include <cryptopp/modes.h>
++#include <cryptopp/aes.h>
+ #include "ECryptoMode.h"
+ #include "CString.h"
+
Index: patches/patch-src_lib_io_CCryptoStream_h
===================================================================
RCS file: patches/patch-src_lib_io_CCryptoStream_h
diff -N patches/patch-src_lib_io_CCryptoStream_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_lib_io_CCryptoStream_h 17 Nov 2013 20:29:14 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- 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"
+ #include "CCryptoMode.h"
+-#include <cryptopp562/osrng.h>
+-#include <cryptopp562/sha.h>
++#include <cryptopp/osrng.h>
++#include <cryptopp/sha.h>
+
+ class CCryptoOptions;
+
Index: patches/patch-src_lib_ipc_CIpcClientProxy_cpp
===================================================================
RCS file: /cvs/ports/net/synergy/patches/patch-src_lib_ipc_CIpcClientProxy_cpp,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-src_lib_ipc_CIpcClientProxy_cpp
--- patches/patch-src_lib_ipc_CIpcClientProxy_cpp 4 Jul 2013 14:49:26
-0000 1.4
+++ patches/patch-src_lib_ipc_CIpcClientProxy_cpp 17 Nov 2013 20:29:14
-0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-src_lib_ipc_CIpcClientPr
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();
Index: patches/patch-src_lib_ipc_CIpcServerProxy_cpp
===================================================================
RCS file: /cvs/ports/net/synergy/patches/patch-src_lib_ipc_CIpcServerProxy_cpp,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-src_lib_ipc_CIpcServerProxy_cpp
--- patches/patch-src_lib_ipc_CIpcServerProxy_cpp 4 Jul 2013 14:49:26
-0000 1.4
+++ patches/patch-src_lib_ipc_CIpcServerProxy_cpp 17 Nov 2013 20:29:14
-0000
@@ -10,9 +10,9 @@ CIpcServerProxy.cpp:93: error: within th
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();
Index: patches/patch-src_lib_server_CClientProxy1_4_cpp
===================================================================
RCS file:
/cvs/ports/net/synergy/patches/patch-src_lib_server_CClientProxy1_4_cpp,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_lib_server_CClientProxy1_4_cpp
--- patches/patch-src_lib_server_CClientProxy1_4_cpp 4 Jul 2013 14:49:27
-0000 1.2
+++ patches/patch-src_lib_server_CClientProxy1_4_cpp 17 Nov 2013 20:29:14
-0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-src_lib_server_CClientPr
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()));
Index: patches/patch-src_lib_synergy_CCryptoMode_h
===================================================================
RCS file: patches/patch-src_lib_synergy_CCryptoMode_h
diff -N patches/patch-src_lib_synergy_CCryptoMode_h
--- patches/patch-src_lib_synergy_CCryptoMode_h 17 May 2013 18:53:24 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$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
-@@ -17,9 +17,9 @@
-
- #pragma once
-
--#include <cryptopp562/gcm.h>
--#include <cryptopp562/modes.h>
--#include <cryptopp562/aes.h>
-+#include <cryptopp/gcm.h>
-+#include <cryptopp/modes.h>
-+#include <cryptopp/aes.h>
- #include "ECryptoMode.h"
- #include "CString.h"
-
Index: patches/patch-src_lib_synergy_CCryptoStream_h
===================================================================
RCS file: patches/patch-src_lib_synergy_CCryptoStream_h
diff -N patches/patch-src_lib_synergy_CCryptoStream_h
--- patches/patch-src_lib_synergy_CCryptoStream_h 17 May 2013 18:53:24
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$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
-@@ -20,8 +20,8 @@
- #include "BasicTypes.h"
- #include "CStreamFilter.h"
- #include "CCryptoMode.h"
--#include <cryptopp562/osrng.h>
--#include <cryptopp562/sha.h>
-+#include <cryptopp/osrng.h>
-+#include <cryptopp/sha.h>
-
- class CCryptoOptions;
-
