public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rdesktop: update from 1.8.2 to 1.8.3

Browse Source
This commit is contained in:
Pascal Wittmann 2015-03-02 16:48:09 +01:00
parent 95800b2991
commit b9540c5b70
2 changed files with 3 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/remote/rdesktop/default.nix
View File

@ -2,16 +2,14 @@
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
pname = "rdesktop"; pname = "rdesktop";
version = "1.8.2"; version = "1.8.3";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/${pname}/${name}.tar.gz"; url = "mirror://sourceforge/${pname}/${name}.tar.gz";
sha256 = "0y0s0qjfsflp4drcn75ykx6as7mn13092bcvlp2ibhilkpa27gzv"; sha256 = "1r7c1rjmw2xzq8fw0scyb453gy9z19774z1z8ldmzzsfndb03cl8";
}; };
patches = [ ./enable_windows_key.patch ];
buildInputs = [openssl libX11]; buildInputs = [openssl libX11];
configureFlags = [ configureFlags = [
@ -24,6 +22,6 @@ stdenv.mkDerivation (rec {
description = "Open source client for Windows Terminal Services"; description = "Open source client for Windows Terminal Services";
homepage = http://www.rdesktop.org/; homepage = http://www.rdesktop.org/;
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
}; };
}) })

29
pkgs/applications/networking/remote/rdesktop/enable_windows_key.patch
View File

@ -1,29 +0,0 @@
http://sourceforge.net/p/rdesktop/code/1816/
Fix constant naming and enabled windowskey by default.
Index: trunk/rdesktop.c
===================================================================
--- trunk/rdesktop.c (revision 1815)
+++ trunk/rdesktop.c (revision 1816)
@@ -554,7 +554,7 @@
act.sa_flags = 0;
sigaction(SIGPIPE, &act, NULL);
- flags = RDP_LOGON_NORMAL;
+ flags = RDP_LOGON_NORMAL | RDP_LOGON_ENABLEWINDOWSKEY;
prompt_password = False;
g_seamless_spawn_cmd[0] = domain[0] = g_password[0] = shell[0] = directory[0] = 0;
g_embed_wnd = 0;
Index: trunk/constants.h
===================================================================
--- trunk/constants.h (revision 1815)
+++ trunk/constants.h (revision 1816)
@@ -321,7 +321,7 @@
#define RDP_LOGON_AUTO 0x0008
#define RDP_LOGON_NORMAL 0x0033
#define RDP_LOGON_COMPRESSION 0x0080 /* mppc compression with 8kB histroy buffer */
-#define RDP_LOGON_BLOB 0x0100
+#define RDP_LOGON_ENABLEWINDOWSKEY 0x0100
#define RDP_LOGON_COMPRESSION2 0x0200 /* rdp5 mppc compression with 64kB history buffer */
#define RDP_LOGON_LEAVE_AUDIO 0x2000
#define RDP_LOGON_PASSWORD_IS_SC_PIN 0x40000