Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 92e6251c50c7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f708c4da179b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 26, 2019

  1. ghostscript: add patch for CVE-2019-6116 

    This is tagged as version 9.26a in the ghostpdl repo, but unfortunately
there are no tarballs released with that version number so far. We'll
continue calling this version 9.26 for now for simplicity's sake (and we
can switch to 9.26a and remove the patch when it's properly released).

Fixes #58262
Fixes #58089
    @delroth
    delroth committed Mar 26, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    zimbatm Jonas Chevalier
    GPG key ID: 71BAF6D40C1D63D7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    91c46d1 View commit details

Commits on Mar 28, 2019

  1. Merge pull request #58314 from delroth/ghostscript-cve-2019-6116 

    ghostscript: add patch for CVE-2019-6116
    @flokli
    flokli authored Mar 28, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    zimbatm Jonas Chevalier
    GPG key ID: 71BAF6D40C1D63D7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f708c4d View commit details
Showing with 6 additions and 1 deletion.
  1. +6 −1 pkgs/misc/ghostscript/default.nix
7 changes: 6 additions & 1 deletion pkgs/misc/ghostscript/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ config, stdenv, lib, fetchurl, pkgconfig, zlib, expat, openssl, autoconf
, libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec
, libiconv, ijs, lcms2
, libiconv, ijs, lcms2, fetchpatch
, cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin), cups ? null
, x11Support ? cupsSupport, xlibsWrapper ? null # with CUPS, X11 only adds very little
}:
@@ -46,6 +46,11 @@ stdenv.mkDerivation rec {
patches = [
./urw-font-files.patch
./doc-no-ref.diff
(fetchpatch {
name = "CVE-2019-6116";
url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=d3537a54740d78c5895ec83694a07b3e4f616f61";
sha256 = "1hr8bpi87bbg1kvv28kflmfh1dhzxw66p9q0ddvbrj72qd86p3kx";
})
];

outputs = [ "out" "man" "doc" ];