public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #45086 from andir/staging/libxml2

Browse Source 
libxml2: fix CVE-2018-14567 & CVE-2018-14404
This commit is contained in:
Andreas Rammhold 2018-08-16 10:50:32 +02:00 committed by GitHub
commit 9632b1734f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/libxml2/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl { stdenv, lib, fetchurl, fetchpatch
, zlib, xz, python2, findXMLCatalogs , zlib, xz, python2, findXMLCatalogs
, buildPlatform, hostPlatform , buildPlatform, hostPlatform
, pythonSupport ? buildPlatform == hostPlatform , pythonSupport ? buildPlatform == hostPlatform
@ -20,9 +20,15 @@ in stdenv.mkDerivation rec {
}; };
patches = [ patches = [
(fetchurl { # CVE-2018-9251 (fetchpatch {
url = https://gitlab.gnome.org/GNOME/libxml2/commit/2240fbf5912054af025fb6e01e26375100275e74.diff; name = "CVE-2018-14567_CVE-2018-9251.patch";
sha256 = "01c5dnipz2rmv2dgma1ycvhyiyfvy9makyn6ywahm10jwk5chn3i"; url = https://gitlab.gnome.org/GNOME/libxml2/commit/2240fbf5912054af025fb6e01e26375100275e74.patch;
sha256 = "1xpqsfkzhrqasza51c821mnds5l317djrz8086fmzpyf68vld03h";
})
(fetchpatch {
name = "CVE-2018-14404.patch";
url = https://gitlab.gnome.org/GNOME/libxml2/commit/a436374994c47b12d5de1b8b1d191a098fa23594.patch;
sha256 = "19vp7p32vrninnfa7vk9ipw7n4cl1gg16xxbhjy2d0kwp1crvzqh";
}) })
]; ];