diff options
| author | Robin Gloster <mail@glob.in> | 2017-03-26 16:30:01 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-03-26 16:41:22 +0200 |
| commit | 6b9c81aa1829611094464e4885e6f1b47adf4685 (patch) | |
| tree | 7b0aeb290088a4db459df8358aba789341a7f8e8 /pkgs/development/libraries/pcre/default.nix | |
| parent | c1a9dc3d3753ee02eff4ffdcf6a0238554afd243 (diff) | |
| download | nixpkgs-6b9c81aa1829611094464e4885e6f1b47adf4685.tar nixpkgs-6b9c81aa1829611094464e4885e6f1b47adf4685.tar.gz nixpkgs-6b9c81aa1829611094464e4885e6f1b47adf4685.tar.bz2 nixpkgs-6b9c81aa1829611094464e4885e6f1b47adf4685.tar.lz nixpkgs-6b9c81aa1829611094464e4885e6f1b47adf4685.tar.xz nixpkgs-6b9c81aa1829611094464e4885e6f1b47adf4685.tar.zst nixpkgs-6b9c81aa1829611094464e4885e6f1b47adf4685.zip | |
pcre: 8.39 -> 8.40 + security fix
CVE-2017-7186 refs nixos/security#57 #24319
Diffstat (limited to 'pkgs/development/libraries/pcre/default.nix')
| -rw-r--r-- | pkgs/development/libraries/pcre/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index d3499f3e15c..21de038f7d6 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; assert elem variant [ null "cpp" "pcre16" "pcre32" ]; let - version = "8.39"; + version = "8.40"; pname = if (variant == null) then "pcre" else if (variant == "cpp") then "pcre-cpp" else variant; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${version}.tar.bz2"; - sha256 = "12wyajlqx2v7dsh39ra9v9m5hibjkrl129q90bp32c28haghjn5q"; + sha256 = "1x7lpjn7jhk0n3sdvggxrlrhab8kkfjwl7qix0ypw9nlx8lpmqh0"; }; outputs = [ "bin" "dev" "out" "doc" "man" ]; @@ -29,6 +29,8 @@ in stdenv.mkDerivation rec { ] ++ optional (variant != null) "--enable-${variant}"; + patches = [ ./CVE-2017-7186.patch ]; + doCheck = with stdenv; !(isCygwin || isFreeBSD); # XXX: test failure on Cygwin # we are running out of stack on both freeBSDs on Hydra |