From da6b9f47e9090a2e5d6e5eb0372c47f1ad2ad24e Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sat, 24 Sep 2016 07:21:15 -0400 Subject: [PATCH] fcgi: Patch to protect against stack smashing --- pkgs/development/libraries/fcgi/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix index 6808ea52adf..63adb5afd1c 100644 --- a/pkgs/development/libraries/fcgi/default.nix +++ b/pkgs/development/libraries/fcgi/default.nix @@ -1,14 +1,24 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { - name = "fcgi-2.4.0"; + name = "fcgi-${version}"; + version = "2.4.0"; src = fetchurl { - url = "http://www.fastcgi.com/dist/${name}.tar.gz"; + url = "https://launchpad.net/debian/+archive/primary/+files/libfcgi_${version}.orig.tar.gz"; + # url = "http://www.fastcgi.com/dist/${name}.tar.gz"; sha256 = "1f857wnl1d6jfrgfgfpz3zdaj8fch3vr13mnpcpvy8bang34bz36"; }; - patches = [ ./gcc-4.4.diff ]; + patches = [ + ./gcc-4.4.diff + (fetchpatch { + # Fix a stack-smashing bug: + # xhttps://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681591 + url = "https://bugs.launchpad.net/ubuntu/+source/libfcgi/+bug/933417/+attachment/2745025/+files/poll.patch"; + sha256 = "0v3gw0smjvrxh1bv3zx9xp633gbv5dd5bcn3ipj6ckqjyv4i6i7m"; + }) + ]; postInstall = "ln -s . $out/include/fastcgi";