Merge pull request #179192 from sersorrel/xcftools-cve-2019-5086
This commit is contained in:
commit
0cd5eefaec
1 changed files with 10 additions and 2 deletions
|
@ -1,4 +1,4 @@
|
|||
{lib, stdenv, fetchurl, libpng, perl, gettext }:
|
||||
{lib, stdenv, fetchpatch, fetchurl, libpng, perl, gettext }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xcftools";
|
||||
|
@ -11,7 +11,15 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ libpng perl gettext ];
|
||||
|
||||
patchPhase = ''
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2019-5086.CVE-2019-5087.patch";
|
||||
url = "https://github.com/gladk/xcftools/commit/59c38e3e45b9112c2bcb4392bccf56e297854f8a.patch";
|
||||
sha256 = "sha256-a1Biv6viXzTSaLDzinOyu0HdDTUPsKITsdKu9B9Y8GE=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Required if building with libpng-1.6, innocuous otherwise
|
||||
substituteInPlace xcf2png.c \
|
||||
--replace png_voidp_NULL NULL \
|
||||
|
|
Loading…
Reference in a new issue