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

libxml2: 2.9.10 → 2.9.12 

https://mail.gnome.org/archives/xml/2021-May/msg00000.html

CVE-2021-3541
This commit is contained in:
Jan Tojnar 2021-05-13 18:11:20 +02:00 committed by Jonathan Ringer
parent ac6a4f7cf5
commit d01a4e3fe9
1 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, fetchpatch { stdenv, lib, fetchurl
, zlib, xz, libintl, python, gettext, ncurses, findXMLCatalogs , zlib, xz, libintl, python, gettext, ncurses, findXMLCatalogs
, pythonSupport ? enableShared && stdenv.buildPlatform == stdenv.hostPlatform , pythonSupport ? enableShared && stdenv.buildPlatform == stdenv.hostPlatform
, icuSupport ? false, icu ? null , icuSupport ? false, icu ? null
@ -8,11 +8,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libxml2"; pname = "libxml2";
version = "2.9.10"; version = "2.9.12";
src = fetchurl { src = fetchurl {
url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz"; url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz";
sha256 = "07xynh8hcxb2yb1fs051xrgszjvj37wnxvxgsj10rzmqzy9y3zma"; sha256 = "14hxwzmf5xqppx77z7i0ni9lpzg1a84dqpf8j8l1fvy570g6imn8";
}; };
patches = [ patches = [
# Upstream bugs: # Upstream bugs:
@ -27,28 +27,6 @@ stdenv.mkDerivation rec {
# https://github.com/NixOS/nixpkgs/pull/63174 # https://github.com/NixOS/nixpkgs/pull/63174
# https://github.com/NixOS/nixpkgs/pull/72342 # https://github.com/NixOS/nixpkgs/pull/72342
./utf8-xmlErrorFuncHandler.patch ./utf8-xmlErrorFuncHandler.patch
(fetchpatch {
name = "CVE-2019-20388.patch";
url = "https://gitlab.gnome.org/GNOME/libxml2/commit/6088a74bcf7d0c42e24cff4594d804e1d3c9fbca.patch";
sha256 = "070s7al2r2k92320h9cdfc2097jy4kk04d0disc98ddc165r80jl";
})
(fetchpatch {
name = "CVE-2020-7595.patch";
url = "https://gitlab.gnome.org/GNOME/libxml2/commit/0e1a49c8907645d2e155f0d89d4d9895ac5112b5.patch";
sha256 = "0klvaxkzakkpyq0m44l9xrpn5kwaii194sqsivfm6zhnb9hhl15l";
})
(fetchpatch {
name = "CVE-2020-24977.patch";
url = "https://gitlab.gnome.org/GNOME/libxml2/commit/50f06b3efb638efb0abd95dc62dca05ae67882c2.patch";
sha256 = "093f1ic5qfiq8nk9mc6b8p1qcs8m9hir3ardr6r5il4zi2dnjrj4";
})
# Fix compatibility with Python 3.9.
# https://gitlab.gnome.org/GNOME/libxml2/-/issues/149
(fetchpatch {
name = "python39.patch";
url = "https://gitlab.gnome.org/nwellnhof/libxml2/-/commit/e4fb36841800038c289997432ca547c9bfef9db1.patch";
sha256 = "0h3vpy9fg3339b14qa64640ypp65z3hrrrmpjl8qm72srkp24ci5";
})
]; ];
outputs = [ "bin" "dev" "out" "man" "doc" ] outputs = [ "bin" "dev" "out" "man" "doc" ]