From c4ab553c925f1cfb83eaea5a2b38b1480e8bb17e Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 10 Dec 2015 23:09:31 +0100 Subject: screen: patch CVE-2015-6806 Fixes a possible denial of service of the screen tool. Patch sourced from upstream GIT repository. --- pkgs/tools/misc/screen/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'pkgs/tools/misc/screen/default.nix') diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 8c132d5ba02f..3e130154e468 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, pam ? null }: +{ stdenv, fetchurl, fetchpatch, ncurses, pam ? null }: stdenv.mkDerivation rec { name = "screen-4.3.1"; @@ -13,8 +13,15 @@ stdenv.mkDerivation rec { sed -i -e "s|/usr/local|/non-existent|g" -e "s|/usr|/non-existent|g" configure Makefile.in */Makefile.in ''; - # TODO: remove when updating the version of screen. Only a patch for 4.3.1 - patches = stdenv.lib.optional stdenv.isDarwin (fetchurl { + # TODO: remove when updating the version of screen. Only patches for 4.3.1 + patches = [ + (fetchpatch { + name = "CVE-2015-6806.patch"; + stripLen = 1; + url = "http://git.savannah.gnu.org/cgit/screen.git/patch/?id=b7484c224738247b510ed0d268cd577076958f1b"; + sha256 = "160zhpzi80qkvwib78jdvx4jcm2c2h59q5ap7hgnbz4xbkb3k37l"; + }) + ] ++ stdenv.lib.optional stdenv.isDarwin (fetchurl { url = "http://savannah.gnu.org/file/screen-utmp.patch\?file_id=34815"; sha256 = "192dsa8hm1zw8m638avzhwhnrddgizhyrwaxgwa96zr9vwai2nvc"; }); -- cgit 1.4.1