diff options
author | Robert Scott <code@humanleg.org.uk> | 2021-09-22 19:09:25 +0100 |
---|---|---|
committer | Robert Scott <code@humanleg.org.uk> | 2021-09-22 19:11:12 +0100 |
commit | 4afafc0893ebc86f036404966e594632514e01b9 (patch) | |
tree | 8193a41bb534a521a55512b55f89c153b685c25e /pkgs/development | |
parent | be290af6dbb9514198fe7d08ad4458512b723e35 (diff) |
gd: 2.3.0 -> 2.3.2, add patch for partial CVE-2021-40812 fix
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/gd/default.nix | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index 36a9309560335..3a64cc5639798 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -14,25 +14,19 @@ stdenv.mkDerivation rec { pname = "gd"; - version = "2.3.0"; + version = "2.3.2"; src = fetchurl { url = "https://github.com/libgd/libgd/releases/download/${pname}-${version}/libgd-${version}.tar.xz"; - sha256 = "0n5czhxzinvjvmhkf5l9fwjdx5ip69k5k7pj6zwb6zs1k9dibngc"; + sha256 = "1yypywkh8vphcy4qqpf51kxpb0a3r7rjqk3fc61rpn70hiq092j7"; }; hardeningDisable = [ "format" ]; patches = [ - # Fixes an issue where some other packages would fail to build - # their documentation with an error like: - # "Error: Problem doing text layout" - # - # Can be removed if Wayland can still be built successfully with - # documentation. (fetchpatch { - url = "https://github.com/libgd/libgd/commit/3dd0e308cbd2c24fde2fc9e9b707181252a2de95.patch"; - excludes = [ "tests/gdimagestringft/.gitignore" ]; - sha256 = "12iqlanl9czig9d7c3rvizrigw2iacimnmimfcny392dv9iazhl1"; + name = "CVE-2021-40812.partial.patch"; + url = "https://github.com/libgd/libgd/commit/6f5136821be86e7068fcdf651ae9420b5d42e9a9.patch"; + sha256 = "11rvhd23bl05ksj8z39hwrhqqjm66svr4hl3y230wrc64rvnd2d2"; }) ]; |