gd: 2.3.0 -> 2.3.2, add patch for partial CVE-2021-40812 fix

This commit is contained in:
Robert Scott 2021-09-22 19:09:25 +01:00
parent be290af6db
commit 4afafc0893

View File

@ -14,25 +14,19 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gd"; pname = "gd";
version = "2.3.0"; version = "2.3.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/libgd/libgd/releases/download/${pname}-${version}/libgd-${version}.tar.xz"; url = "https://github.com/libgd/libgd/releases/download/${pname}-${version}/libgd-${version}.tar.xz";
sha256 = "0n5czhxzinvjvmhkf5l9fwjdx5ip69k5k7pj6zwb6zs1k9dibngc"; sha256 = "1yypywkh8vphcy4qqpf51kxpb0a3r7rjqk3fc61rpn70hiq092j7";
}; };
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
patches = [ 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 { (fetchpatch {
url = "https://github.com/libgd/libgd/commit/3dd0e308cbd2c24fde2fc9e9b707181252a2de95.patch"; name = "CVE-2021-40812.partial.patch";
excludes = [ "tests/gdimagestringft/.gitignore" ]; url = "https://github.com/libgd/libgd/commit/6f5136821be86e7068fcdf651ae9420b5d42e9a9.patch";
sha256 = "12iqlanl9czig9d7c3rvizrigw2iacimnmimfcny392dv9iazhl1"; sha256 = "11rvhd23bl05ksj8z39hwrhqqjm66svr4hl3y230wrc64rvnd2d2";
}) })
]; ];