diff options
author | obache <obache@pkgsrc.org> | 2014-08-25 09:58:18 +0000 |
---|---|---|
committer | obache <obache@pkgsrc.org> | 2014-08-25 09:58:18 +0000 |
commit | deea77c5c99511b3f5ea0d77b924eb5a19c9a00a (patch) | |
tree | 4e7c94fc45b49ec694cd5f8b879469ff23e7fbb9 /net | |
parent | de9db4d1725ec2cb8f039932a39dc2d1d127db33 (diff) | |
download | pkgsrc-deea77c5c99511b3f5ea0d77b924eb5a19c9a00a.tar.gz |
Update synergy to 1.4.12.
Based on PR pkg/48141 by Tobias Nygren.
1.4.12
======
Bug #3565 - Encryption fails when typing fast (Invalid message from client)
Bug #3606 - GUI is elevated after setup
Bug #3572 - Mac caps lock causes disconnect
1.4.11
======
Feature #12 - Encryption
Feature #421 - Portable version
Bug #2855 - Mouse cursor remains hidden on Mac client (intermittently/randomly)
Bug #3281 - server start on OS X defaults to 'interactive'
Bug #3310 - P&ort in settings screen
1.4.10
======
Bug #2799 - Right shift broken (Windows server, Mac OS X client)
Bug #3302 - GUI does not show/hide when tray icon is double clicked (Windows)
Bug #3303 - Mac OS X IPC integ test fails intermittently
Feature #2974 - Gesture Support for Magic Mouse/Trackpad
Feature #3172 - Button to stop Synergy when in service mode
Feature #3241 - Option to elevate synergyc/s when in service mode
Feature #3242 - Show a list of available IP addresses and screen name on the main screen
Feature #3296 - 64-bit Windows installer should display helpful message on 32-bit Windows
Feature #3300 - Make service mode default mode (now that we have elevate option)
Feature #3301 - Add process mode option to settings (remove startup wizard page)
Feature #3306 - Gatekeeper compatibility on Mac OS X 10.8
1.4.9
=====
Bug #3159 - In service mode, server doesn't start unless GUI is running
Bug #3214 - Client sometimes can't connect if GUI is closed
Bug #56 - Mac OS X server not sending keystrokes to client
Bug #3161 - First time GUI appears, service doesn't send logging
Bug #3164 - In service mode, you need to add a firewall exception
Bug #3166 - Service shutdown stalls when GUI is closed
Bug #3216 - Fatal error if plugins folder doesn't exist
Bug #3221 - ERROR: could not connect to service, error: 2
Feature #3192 - Add support for JOYINFOEX structure to poll game device info
Feature #3202 - Plugin support (sending for primary screen events on Windows only)
Feature #3155 - Cross-platform TCP IPC between GUI and service
Task #3177 - Fix Mac buildslave to build multiple versions
Task #3193 - Add Micro Synergy to repository
Task #3275 - Change hostname label to "IP address or hostname"
Task #3276 - Installation recovery mechanism for synrgyhk.dll
1.4.8
=====
Bug #143: Cursor on Mac OS X goes to center when inactive
Bug #146: Screen Resize causes problems with moving off right-hand side of screen
Bug #3058: Modifier keys not working on Mac OS X server
Bug #3139: Double click too strict (click, move, click should not count)
Bug #3195: Service install can fail first time
Bug #3196: Wizard buttons not visible
Bug #3197: GUI doesn't take focus after install
Bug #3202: Hook DLL (synrgyhk.dll) is not released
Feature #3143: Setup wizard for first time users
Feature #3145: Check for updates
Feature #3174: Startup mode wizard page
Feature #3184: New service for process management
1.4.7
=====
Bug #3132: GUI hides before successful connection
Bug #3133: Can't un-hide GUI on Mac
Feature #3054: Hide synergy[cs] dock icon (Mac OS X)
Feature #3135: Integrate log into main window
Task #3134: Move hotkey warnings to DEBUG
1.4.6
=====
Bug #155: Build error on FreeBSD (missing sentinel in function call)
Bug #571: Synergy SegFaults with "Unknown Quartz Event type: 0x1d"
Bug #617: xrandr rotation on client confines cursor in wrong area
Bug #642: `synergyc --help` segfaults on sparc64 architecture
Bug #652: Stack overflow in getIDForKey
Bug #1071: Can't copy from the Firefox address bar on Linux
Bug #1662: Copying text from remote computer crashes java programs.
Bug #1731: YouTube can cause server to freeze randomly
Bug #2752: Use SAS for ctrl+alt+del on win7
Bug #2763: Double-click broken on Mac OS
Bug #2817: Keypad Subtract has wrong keycode on OS X
Bug #2958: GNOME 3 mouse problem (gnome-shell)
Bug #2962: Clipboard not working on mac client
Bug #3063: Segfault in copy buffer
Bug #3066: Server segfault on clipboard paste
Bug #3089: Comma and Period translated wrong when using the NEO2-layout
Bug #3092: Wrong screen rotation detected
Bug #3105: There doesn't seem to be a system tray available. Quitting
Bug #3116: Memory Leak due to the XInput2 patches
Bug #3117: Dual monitors not detected properly anymore
Feature #3073: Re-introduce auto-start GUI (Windows)
Feature #3076: Re-introduce auto-start backend
Feature #3077: Re-introduce hidden on start
Feature #3091: Add option to remap altgr modifier
Feature #3119: Mac OS X secondary screen
Task #2905: Unit tests: Clipboard classes
Task #3072: Downgrade Linux build machines
Task #3090: CXWindowsKeyState integ test args wrong
(no changelog for prior versions).
Diffstat (limited to 'net')
-rw-r--r-- | net/synergy/Makefile | 39 | ||||
-rw-r--r-- | net/synergy/distinfo | 11 | ||||
-rw-r--r-- | net/synergy/patches/patch-src_lib_ipc_CIpcClientProxy.cpp | 13 | ||||
-rw-r--r-- | net/synergy/patches/patch-src_lib_ipc_CIpcServerProxy.cpp | 13 | ||||
-rw-r--r-- | net/synergy/patches/patch-src_lib_server_CClientProxy1__4.cpp | 13 |
5 files changed, 68 insertions, 21 deletions
diff --git a/net/synergy/Makefile b/net/synergy/Makefile index 076ed1a44e7..15707352143 100644 --- a/net/synergy/Makefile +++ b/net/synergy/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2013/07/05 21:34:12 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2014/08/25 09:58:18 obache Exp $ # -DISTNAME= synergy-1.3.8-Source +DISTNAME= synergy-1.4.12-Source PKGNAME= ${DISTNAME:S/-Source//} -PKGREVISION= 1 CATEGORIES= net x11 MASTER_SITES= http://synergy.googlecode.com/files/ @@ -12,26 +11,26 @@ HOMEPAGE= http://synergy-foss.org/ COMMENT= Let a user share a mouse and keyboard among computers LICENSE= gnu-gpl-v2 +EXTRACT_USING= bsdtar USE_LANGUAGES= c c++ +USE_TOOLS+= unzip +USE_CMAKE= yes EXAMPLES= MacReadme.txt org.synergy-foss.org.synergyc.plist \ org.synergy-foss.org.synergys.plist synergy.conf.example \ synergy.conf.example-advanced synergy.conf.example-basic -# Below rpath fix is copypasted from graphics/vtk. -CMAKE_OPTS+= -DCMAKE_INSTALL_RPATH:STRING=${PREFIX}/lib:${X11BASE}/lib${LIBABISUFFIX:Q} \ -CMAKE_OPTS+= -DCMAKE_SKIP_BUILD_RPATH:BOOL=ON \ -CMAKE_OPTS+= -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \ -CMAKE_OPTS+= -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON - SUBST_CLASSES+= fix-paths SUBST_STAGE.fix-paths= pre-configure SUBST_MESSAGE.fix-paths= Fixing absolute paths. -SUBST_FILES.fix-paths= lib/arch/CArchFileUnix.cpp +SUBST_FILES.fix-paths= src/lib/arch/CArchFileUnix.cpp SUBST_SED.fix-paths= -e 's,"/etc","${PKG_SYSCONFDIR}",g' -do-configure: - cd ${WRKSRC} && ${PREFIX}/bin/cmake ${CMAKE_OPTS} . +BUILDLINK_TRANSFORM+= rm:-march=native + +post-extract: + ${MKDIR} ${WRKSRC}/tools/cryptopp562 + cd ${WRKSRC}/tools/cryptopp562 && unzip -aqo ../cryptopp562.zip INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/examples/${PKGBASE} @@ -40,10 +39,10 @@ post-build: ${CP} ${WRKSRC}/doc/synergys.man ${WRKSRC}/doc/synergys.1 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/synergyc ${DESTDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/bin/synergys ${DESTDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/doc/synergyc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/synergys.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 +.for p in synergyc synergys + ${INSTALL_PROGRAM} ${WRKSRC}/bin/${p} ${DESTDIR}${PREFIX}/bin/${p} + ${INSTALL_MAN} ${WRKSRC}/doc/${p}.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${p}.1 +.endfor .for f in ${EXAMPLES} ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DESTDIR}${PREFIX}/share/examples/${PKGBASE} .endfor @@ -53,10 +52,16 @@ do-install: _WRAP_EXTRA_ARGS.CXX+= -std=c++11 .endif -.include "../../devel/cmake/buildlink3.mk" +# tools/cryptopp562/GNUmakefile +.include "../../mk/bsd.prefs.mk" +.if !empty(MACHINE_PLATFORM:MNetBSD-[0-6].*-i386) +CXXFLAGS+= -DCRYPTOPP_DISABLE_ASM +.endif + .if !exists(/System/Library/Frameworks/Carbon.framework) .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXinerama/buildlink3.mk" +.include "../../x11/libXrandr/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .include "../../x11/libXtst/buildlink3.mk" .endif diff --git a/net/synergy/distinfo b/net/synergy/distinfo index 720f8fa100d..463414ac8ab 100644 --- a/net/synergy/distinfo +++ b/net/synergy/distinfo @@ -1,8 +1,11 @@ -$NetBSD: distinfo,v 1.11 2013/07/05 21:34:12 joerg Exp $ +$NetBSD: distinfo,v 1.12 2014/08/25 09:58:18 obache Exp $ -SHA1 (synergy-1.3.8-Source.tar.gz) = 82e80b22c6746e573d047aa4a1ad7b71c28cf7d3 -RMD160 (synergy-1.3.8-Source.tar.gz) = 3b02faec3b5e5dbea1853e6decd92e4cf6eca419 -Size (synergy-1.3.8-Source.tar.gz) = 2518396 bytes +SHA1 (synergy-1.4.12-Source.tar.gz) = d0f590835f30d8727987d4968d0f560bba90927f +RMD160 (synergy-1.4.12-Source.tar.gz) = 7af82a1edd9db6effc8f9adb08fd8c7616b19f03 +Size (synergy-1.4.12-Source.tar.gz) = 3954996 bytes +SHA1 (patch-src_lib_ipc_CIpcClientProxy.cpp) = fde36ceab778151f849604f669ae4bd71273fa4e +SHA1 (patch-src_lib_ipc_CIpcServerProxy.cpp) = b3669add3fec67f2fbc30457fcd36ae73e1cd57b +SHA1 (patch-src_lib_server_CClientProxy1__4.cpp) = dbaf92152e431048b229d7cecf80d0776e7653b1 SHA1 (patch-src_lib_server_CConfig.cpp) = 14b5434c3fe33efde44f26fd14da6897229aacc9 SHA1 (patch-src_lib_server_CConfig.h) = 6aa99efc189a3d8e067a30f4fee4d94874e4f3c6 SHA1 (patch-tools_gmock-1.6.0_configure) = 45cfbcdc8b55c1e745265ed4e2bbbfe41ef000a2 diff --git a/net/synergy/patches/patch-src_lib_ipc_CIpcClientProxy.cpp b/net/synergy/patches/patch-src_lib_ipc_CIpcClientProxy.cpp new file mode 100644 index 00000000000..82f809a01a5 --- /dev/null +++ b/net/synergy/patches/patch-src_lib_ipc_CIpcClientProxy.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-src_lib_ipc_CIpcClientProxy.cpp,v 1.1 2014/08/25 09:58:18 obache Exp $ + +--- src/lib/ipc/CIpcClientProxy.cpp.orig 2012-09-04 02:09:56.000000000 +0000 ++++ src/lib/ipc/CIpcClientProxy.cpp +@@ -144,7 +144,7 @@ CIpcClientProxy::send(const CIpcMessage& + case kIpcLogLine: { + const CIpcLogLineMessage& llm = static_cast<const CIpcLogLineMessage&>(message); + CString logLine = llm.logLine(); +- CProtocolUtil::writef(&m_stream, kIpcMsgLogLine, &logLine); ++ CProtocolUtil::writef(&m_stream, kIpcMsgLogLine, "%s", &logLine); + break; + } + diff --git a/net/synergy/patches/patch-src_lib_ipc_CIpcServerProxy.cpp b/net/synergy/patches/patch-src_lib_ipc_CIpcServerProxy.cpp new file mode 100644 index 00000000000..1814f933352 --- /dev/null +++ b/net/synergy/patches/patch-src_lib_ipc_CIpcServerProxy.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-src_lib_ipc_CIpcServerProxy.cpp,v 1.1 2014/08/25 09:58:18 obache Exp $ + +--- src/lib/ipc/CIpcServerProxy.cpp.orig 2012-09-04 02:09:56.000000000 +0000 ++++ src/lib/ipc/CIpcServerProxy.cpp +@@ -91,7 +91,7 @@ CIpcServerProxy::send(const CIpcMessage& + case kIpcCommand: { + const CIpcCommandMessage& cm = static_cast<const CIpcCommandMessage&>(message); + CString command = cm.command(); +- CProtocolUtil::writef(&m_stream, kIpcMsgCommand, &command); ++ CProtocolUtil::writef(&m_stream, kIpcMsgCommand, "%s", &command); + break; + } + diff --git a/net/synergy/patches/patch-src_lib_server_CClientProxy1__4.cpp b/net/synergy/patches/patch-src_lib_server_CClientProxy1__4.cpp new file mode 100644 index 00000000000..31e124a63f2 --- /dev/null +++ b/net/synergy/patches/patch-src_lib_server_CClientProxy1__4.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-src_lib_server_CClientProxy1__4.cpp,v 1.1 2014/08/25 09:58:18 obache Exp $ + +--- src/lib/server/CClientProxy1_4.cpp.orig 2013-05-01 15:53:22.000000000 +0000 ++++ src/lib/server/CClientProxy1_4.cpp +@@ -102,7 +102,7 @@ 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())); +- CProtocolUtil::writef(getStream(), kMsgDCryptoIv, &data); ++ CProtocolUtil::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. |