cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.6.2 - tarballs moved to GitHub

Browse Source
This commit is contained in:
bcallah 2015-01-03 04:59:27 +00:00
parent 59fec241d0
commit ccccf0d3ed
7 changed files with 45 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
net/synergy/Makefile
View File

@ -1,37 +1,31 @@
# $OpenBSD: Makefile,v 1.25 2014/06/03 13:45:41 bcallah Exp $
# $OpenBSD: Makefile,v 1.26 2015/01/03 04:59:27 bcallah Exp $
COMMENT= mouse and keyboard sharing utility
V= 1.5.0
DISTNAME= synergy-${V}-r2278-Source
PKGNAME= synergy-${V}
DISTNAME= synergy-${GH_TAGNAME}
CATEGORIES= net x11
MAINTAINER= Brian Callahan <bcallah@openbsd.org>
HOMEPAGE= http://synergy-foss.org/
GH_ACCOUNT= synergy
GH_PROJECT= synergy
GH_TAGNAME= 1.6.2
GH_COMMIT= ebba77fd33f4c9ab347fe72ff6f530eff08297b7
# GPLv2
HOMEPAGE= http://synergy-foss.org/
MAINTAINER= Brian Callahan <bcallah@openbsd.org>
# GPLv2 only
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= ICE SM X11 Xext Xi Xinerama Xrandr Xtst \
c cryptopp curl m pthread stdc++
MASTER_SITES= http://synergy-project.org/files/packages/
BUILD_DEPENDS= archivers/gtar
LIB_DEPENDS= devel/cryptopp \
net/curl
# tar: Invalid header, starting valid header search.
TAR= ${LOCALBASE}/bin/gtar
MODULES= devel/cmake
NO_TEST= Yes
WRKDIST= ${WRKDIR}/synergy-${V}-Source
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/synergy[cds] ${PREFIX}/bin/
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/synergy

4
net/synergy/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (synergy-1.5.0-r2278-Source.tar.gz) = Zr9gFqLnGysrJvxEXSgyTR0oa2/KeuPp0Z/TAHaa8CQ=
SIZE (synergy-1.5.0-r2278-Source.tar.gz) = 4350894
SHA256 (synergy-1.6.2.tar.gz) = NsCiyeocOhOmE0zh52rY3S9EIQDdYHXFPzGzmdJUO6M=
SIZE (synergy-1.6.2.tar.gz) = 4411385

10
net/synergy/patches/patch-CMakeLists_txt
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-CMakeLists_txt,v 1.6 2014/06/03 13:45:41 bcallah Exp $
--- CMakeLists.txt.orig Fri May 23 11:43:58 2014
+++ CMakeLists.txt Fri May 23 14:42:41 2014
$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)
# warnings as errors:
@ -36,7 +36,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.6 2014/06/03 13:45:41 bcallah Exp $
# curl is used on both Linux and Mac
find_package(CURL)
if (CURL_FOUND)
@@ -193,78 +194,60 @@ if (UNIX)
@@ -196,78 +197,60 @@ if (UNIX)
else() # not-apple
@ -151,7 +151,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.6 2014/06/03 13:45:41 bcallah Exp $
endif()
@@ -316,7 +299,6 @@ else() # not-unix
@@ -319,7 +302,6 @@ else() # not-unix
endif()
add_subdirectory(src)

16
net/synergy/patches/patch-src_lib_ipc_IpcClientProxy_cpp
View File

@ -1,18 +1,18 @@
$OpenBSD: patch-src_lib_ipc_IpcClientProxy_cpp,v 1.1 2014/08/20 07:20:10 landry Exp $
$OpenBSD: patch-src_lib_ipc_IpcClientProxy_cpp,v 1.2 2015/01/03 04:59:27 bcallah Exp $
On loongson/sparc64/hppa:
Same as CIpcServerProxy.cpp
--- src/lib/ipc/IpcClientProxy.cpp.orig Wed Aug 20 01:15:34 2014
+++ src/lib/ipc/IpcClientProxy.cpp Wed Aug 20 01:16:23 2014
@@ -147,7 +147,11 @@ CIpcClientProxy::send(const CIpcMessage& message)
--- src/lib/ipc/IpcClientProxy.cpp.orig Mon Dec 22 16:14:25 2014
+++ src/lib/ipc/IpcClientProxy.cpp Mon Dec 22 16:15:48 2014
@@ -147,7 +147,11 @@ IpcClientProxy::send(const IpcMessage& message)
case kIpcLogLine: {
const CIpcLogLineMessage& llm = static_cast<const CIpcLogLineMessage&>(message);
CString logLine = llm.logLine();
const IpcLogLineMessage& llm = static_cast<const IpcLogLineMessage&>(message);
String logLine = llm.logLine();
+#if defined(__mips64__) || defined(__sparc64__) || defined(__hppa__)
+ CProtocolUtil::writef(static_cast<void*>(&m_stream), static_cast<const char*>(kIpcMsgLogLine), &logLine);
+ ProtocolUtil::writef(static_cast<void*>(&m_stream), static cast<const char*>(kIpcMsgLogLine), &logLine);
+#else
CProtocolUtil::writef(&m_stream, kIpcMsgLogLine, &logLine);
ProtocolUtil::writef(&m_stream, kIpcMsgLogLine, &logLine);
+#endif
break;
}

16
net/synergy/patches/patch-src_lib_ipc_IpcServerProxy_cpp
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_lib_ipc_IpcServerProxy_cpp,v 1.1 2014/08/20 07:20:10 landry Exp $
$OpenBSD: patch-src_lib_ipc_IpcServerProxy_cpp,v 1.2 2015/01/03 04:59:27 bcallah Exp $
On loongson/sparc64/hppa:
CIpcServerProxy.cpp: In member function 'void CIpcServerProxy::send(const CIpcMessage&)':
@ -10,16 +10,16 @@ CIpcServerProxy.cpp:93: error: within this context
gcc bug fixed in 4.3.3
--- src/lib/ipc/IpcServerProxy.cpp.orig Fri Feb 28 05:36:45 2014
+++ src/lib/ipc/IpcServerProxy.cpp Wed Aug 20 01:09:24 2014
@@ -95,7 +95,11 @@ CIpcServerProxy::send(const CIpcMessage& message)
--- src/lib/ipc/IpcServerProxy.cpp.orig Mon Dec 22 16:16:07 2014
+++ src/lib/ipc/IpcServerProxy.cpp Mon Dec 22 16:17:43 2014
@@ -95,7 +95,11 @@ IpcServerProxy::send(const IpcMessage& message)
case kIpcCommand: {
const CIpcCommandMessage& cm = static_cast<const CIpcCommandMessage&>(message);
CString command = cm.command();
const IpcCommandMessage& cm = static_cast<const IpcCommandMessage&>(message);
String command = cm.command();
+#if defined(__mips64__) || defined(__sparc64__) || defined(__hppa__)
+ CProtocolUtil::writef(static_cast<void*>(&m_stream), static_cast<const char*>(kIpcMsgCommand), &command);
+ ProtocolUtil::writef(static_cast<void*>(&m_stream), static_cast<const char*>(kIpcMsgCommand), &command);
+#else
CProtocolUtil::writef(&m_stream, kIpcMsgCommand, &command);
ProtocolUtil::writef(&m_stream, kIpcMsgCommand, &command);
+#endif
break;
}

14
net/synergy/patches/patch-src_lib_server_ClientProxy1_4_cpp
View File

@ -1,14 +1,14 @@
$OpenBSD: patch-src_lib_server_ClientProxy1_4_cpp,v 1.1 2014/08/20 07:20:10 landry Exp $
--- src/lib/server/ClientProxy1_4.cpp.orig Fri Feb 28 05:36:45 2014
+++ src/lib/server/ClientProxy1_4.cpp Wed Aug 20 01:01:34 2014
@@ -83,7 +83,11 @@ CClientProxy1_4::cryptoIv()
CString data(reinterpret_cast<const char*>(iv), CRYPTO_IV_SIZE);
$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__)
+ CProtocolUtil::writef(static_cast<void*>(getStream()), static_cast<const char*>(kMsgDCryptoIv), &data);
+ ProtocolUtil::writef(static_cast<void*>(getStream()), static_cast<const char*>(kMsgDCryptoIv), &data);
+#else
CProtocolUtil::writef(getStream(), kMsgDCryptoIv, &data);
ProtocolUtil::writef(getStream(), kMsgDCryptoIv, &data);
+#endif
// change IV only after we've sent the current IV, otherwise

10
net/synergy/patches/patch-src_lib_synergy_ProtocolUtil_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_lib_synergy_ProtocolUtil_h,v 1.1 2014/08/20 07:20:10 landry Exp $
--- src/lib/synergy/ProtocolUtil.h.orig Wed Aug 20 00:54:08 2014
+++ src/lib/synergy/ProtocolUtil.h Wed Aug 20 01:01:59 2014
@@ -52,6 +52,7 @@ class CProtocolUtil { (public)
$OpenBSD: patch-src_lib_synergy_ProtocolUtil_h,v 1.2 2015/01/03 04:59:27 bcallah Exp $
--- src/lib/synergy/ProtocolUtil.h.orig Tue Dec 2 10:03:19 2014
+++ src/lib/synergy/ProtocolUtil.h Mon Dec 22 16:20:12 2014
@@ -52,6 +52,7 @@ class ProtocolUtil { (public)
*/
static void writef(synergy::IStream*,
const char* fmt, ...);
@ -9,7 +9,7 @@ $OpenBSD: patch-src_lib_synergy_ProtocolUtil_h,v 1.1 2014/08/20 07:20:10 landry
//! Read formatted data
/*!
@@ -79,7 +80,6 @@ class CProtocolUtil { (public)
@@ -79,7 +80,6 @@ class ProtocolUtil { (public)
const char* fmt, va_list);
static UInt32 getLength(const char* fmt, va_list);