From c01a5b54429864c3b925928f825fa796f784cc3c Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 19 Oct 2013 19:49:10 +0200 Subject: synergy: Update to version 1.4.14. This new upstream release comes with the following changes: New features: * Drag and drop between computers (Windows and Mac) Fixed bugs: * Mac does not wake up * Unstable service (synergyd) * Exploit: C:\Program.exe (if it exists) is run by service (elevated) * Encryption broken (GCM, CTR and OFB) * Start button is visible when Synergy is running * Apply button is disabled for Mac and Linux Release announcement with links to detailed descriptions about each change can be found here: http://synergy-foss.org/blog/synergy-1-4-14/ Signed-off-by: aszlig --- pkgs/applications/misc/synergy/cryptopp.patch | 12 ++++++------ pkgs/applications/misc/synergy/default.nix | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/synergy/cryptopp.patch b/pkgs/applications/misc/synergy/cryptopp.patch index f20ef9544a22..d0aebb872610 100644 --- a/pkgs/applications/misc/synergy/cryptopp.patch +++ b/pkgs/applications/misc/synergy/cryptopp.patch @@ -20,10 +20,10 @@ index 3b61fc0..2206646 100644 if (WIN32) # add /analyze in order to unconver potential bugs in the source code -diff --git a/src/lib/synergy/CCryptoMode.h b/src/lib/synergy/CCryptoMode.h +diff --git a/src/lib/io/CCryptoMode.h b/src/lib/io/CCryptoMode.h index 9b7e8ad..0d659ac 100644 ---- a/src/lib/synergy/CCryptoMode.h -+++ b/src/lib/synergy/CCryptoMode.h +--- a/src/lib/io/CCryptoMode.h ++++ b/src/lib/io/CCryptoMode.h @@ -17,9 +17,9 @@ #pragma once @@ -37,10 +37,10 @@ index 9b7e8ad..0d659ac 100644 #include "ECryptoMode.h" #include "CString.h" -diff --git a/src/lib/synergy/CCryptoStream.h b/src/lib/synergy/CCryptoStream.h +diff --git a/src/lib/io/CCryptoStream.h b/src/lib/io/CCryptoStream.h index 104b1f6..09c4dc4 100644 ---- a/src/lib/synergy/CCryptoStream.h -+++ b/src/lib/synergy/CCryptoStream.h +--- a/src/lib/io/CCryptoStream.h ++++ b/src/lib/io/CCryptoStream.h @@ -20,8 +20,8 @@ #include "BasicTypes.h" #include "CStreamFilter.h" diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 0b3734ea147a..72282ad0f3eb 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -7,11 +7,11 @@ assert !stdenv.isLinux -> unzip != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "synergy-1.4.12"; + name = "synergy-1.4.14"; src = fetchurl { - url = "http://synergy.googlecode.com/files/${name}-Source.tar.gz"; - sha256 = "0j884skwqy8r8ckj9a4rlwsbjwb1yrj9wqma1nwhr2inff6hrdim"; + url = "http://synergy.googlecode.com/files/${name}-Source.tar.gz"; + sha256 = "1sprg3yb0gjhl2927l4c5nymmqhg318ar6dpki8dr42dgvx3d2ir"; }; patches = optional stdenv.isLinux ./cryptopp.patch; -- cgit 1.4.1