diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-08-17 18:34:17 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-08-17 18:34:17 +0200 |
| commit | 8f2ea38f8fda5876cfaf963097b9fe709159f3ff (patch) | |
| tree | 5b5e304fec50ede4c46c475c9ed1d0414e54ab6b /pkgs/development/libraries/libxslt | |
| parent | 9289365627ce6b82d9ec2f3029e82aa8fc93e655 (diff) | |
| parent | 31eea73f994b8cca50d3f88d6a4fadd98e09e798 (diff) | |
| download | nixlib-8f2ea38f8fda5876cfaf963097b9fe709159f3ff.tar nixlib-8f2ea38f8fda5876cfaf963097b9fe709159f3ff.tar.gz nixlib-8f2ea38f8fda5876cfaf963097b9fe709159f3ff.tar.bz2 nixlib-8f2ea38f8fda5876cfaf963097b9fe709159f3ff.tar.lz nixlib-8f2ea38f8fda5876cfaf963097b9fe709159f3ff.tar.xz nixlib-8f2ea38f8fda5876cfaf963097b9fe709159f3ff.tar.zst nixlib-8f2ea38f8fda5876cfaf963097b9fe709159f3ff.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/development/libraries/libxslt')
| -rw-r--r-- | pkgs/development/libraries/libxslt/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 8a24b700ecf5..1c27b6e3233b 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -17,7 +17,14 @@ stdenv.mkDerivation rec { sha256 = "1klh81xbm9ppzgqk339097i39b7fnpmlj8lzn8bpczl3aww6x5xm"; }; - patches = stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch; + patches = [ + (fetchpatch { + name = "CVE-2017-5029"; + url = "https://git.gnome.org/browse/libxslt/" + + "patch/?id=08ab2774b870de1c7b5a48693df75e8154addae5"; + sha256 = "10azfmyffjf9d7b5js4ipxw9f20qi0kw3zq34bpqmbcpq3l338ky"; + }) + ] ++ stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch; # fixes: can't build x86_64-unknown-cygwin shared library unless -no-undefined is specified postPatch = optionalString hostPlatform.isCygwin '' |