summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJoachim F <joachifm@users.noreply.github.com>2018-02-19 18:44:51 +0000
committerGitHub <noreply@github.com>2018-02-19 18:44:51 +0000
commitbad8b21c2824172df7d70c114d5194788c34139f (patch)
treeb517a83e82d7ff0ad65b53b862551a39ec9a7ee8 /pkgs
parent8d0c8d21f07bdaa9068ec49b4bfa7824c801b1ee (diff)
parent7dea2ababce54d1313a8f10778bb4fe615c8d0bd (diff)
downloadnixlib-bad8b21c2824172df7d70c114d5194788c34139f.tar
nixlib-bad8b21c2824172df7d70c114d5194788c34139f.tar.gz
nixlib-bad8b21c2824172df7d70c114d5194788c34139f.tar.bz2
nixlib-bad8b21c2824172df7d70c114d5194788c34139f.tar.lz
nixlib-bad8b21c2824172df7d70c114d5194788c34139f.tar.xz
nixlib-bad8b21c2824172df7d70c114d5194788c34139f.tar.zst
nixlib-bad8b21c2824172df7d70c114d5194788c34139f.zip
Merge pull request #35155 from volth/patch-91
xrdp: 0.9.3 -> 0.9.5 [CVE-2017-16927]
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/networking/remote/xrdp/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix
index b6b1f6542af3..ed1abfcba99d 100644
--- a/pkgs/applications/networking/remote/xrdp/default.nix
+++ b/pkgs/applications/networking/remote/xrdp/default.nix
@@ -3,13 +3,13 @@
 let
   xorgxrdp = stdenv.mkDerivation rec {
     name = "xorgxrdp-${version}";
-    version = "0.2.3";
+    version = "0.2.5";
 
     src = fetchFromGitHub {
       owner = "neutrinolabs";
       repo = "xorgxrdp";
       rev = "v${version}";
-      sha256 = "0l1b38j3q9mxyb8ffpdplbqs6rnabj92i8wngrwlkhfh2c88szn1";
+      sha256 = "05ix0bvbgpg0l0f6pyxp64a4785yv16dxf522y7k84b0rag4bxr7";
     };
 
     nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ];
@@ -34,7 +34,7 @@ let
   };
 
   xrdp = stdenv.mkDerivation rec {
-    version = "0.9.3";
+    version = "0.9.5";
     name = "xrdp-${version}";
 
     src = fetchFromGitHub {
@@ -42,7 +42,7 @@ let
       repo = "xrdp";
       rev = "refs/heads/runtime-cfg-path-${version}";  # Fixes https://github.com/neutrinolabs/xrdp/issues/609; not a patch on top of the official repo because "xorgxrdp.configureFlags" above includes "xrdp.src" which must be patched already
       fetchSubmodules = true;
-      sha256 = "0xqyg3m688fj442zgg9fqmbz7nnzvqpd7a9ki2cwh1hyibacpmz7";
+      sha256 = "1sm994dic72zvxgwxw9z6an6050976nlnnn2my42pnzj9l5842d8";
     };
 
     nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ];