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: 28647d337e8e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: efe5a9770a80
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 28, 2017

  1. xorg.libXcursor: security 1.1.14 -> 1.1.15 

    Fix heap overflows when parsing malicious files. (CVE-2017-16612)

(cherry picked from commit 98e3af0)
    @vcunat
    vcunat committed Nov 28, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4f12cdf View commit details

  2. xorg.libXfont*: security update for CVE-2017-16611 

    (cherry picked from commit db6adec)
    @vcunat
    vcunat committed Nov 28, 2017
    Copy the full SHA
    efe5a97 View commit details
Showing with 12 additions and 12 deletions.
  1. +9 −9 pkgs/servers/x11/xorg/default.nix
  2. +3 −3 pkgs/servers/x11/xorg/tarballs-7.7.list
18 changes: 9 additions & 9 deletions pkgs/servers/x11/xorg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -724,11 +724,11 @@ let
}) // {inherit compositeproto libX11 libXfixes xproto ;};

libXcursor = (mkDerivation "libXcursor" {
name = "libXcursor-1.1.14";
name = "libXcursor-1.1.15";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/lib/libXcursor-1.1.14.tar.bz2;
sha256 = "1prkdicl5y5yx32h1azh6gjfbijvjp415javv8dsakd13jrarilv";
url = mirror://xorg/individual/lib/libXcursor-1.1.15.tar.bz2;
sha256 = "0syzlfvh29037p0vnlc8f3jxz8nl55k65blswsakklkwsc6nfki9";
};
buildInputs = [pkgconfig fixesproto libX11 libXfixes xproto libXrender ];
meta.platforms = stdenv.lib.platforms.unix;
@@ -779,22 +779,22 @@ let
}) // {inherit fixesproto libX11 xextproto xproto ;};

libXfont = (mkDerivation "libXfont" {
name = "libXfont-1.5.3";
name = "libXfont-1.5.4";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/lib/libXfont-1.5.3.tar.bz2;
sha256 = "1l4k3i3xzqdmaszykh6bb2ah78p6c3z7fak7xzgq2d38s87w31db";
url = mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2;
sha256 = "0hiji1bvpl78aj3a3141hkk353aich71wv8l5l2z51scfy878zqs";
};
buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ];
meta.platforms = stdenv.lib.platforms.unix;
}) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};

libXfont2 = (mkDerivation "libXfont2" {
name = "libXfont2-2.0.2";
name = "libXfont2-2.0.3";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/lib/libXfont2-2.0.2.tar.bz2;
sha256 = "04f1lswh1ridkycgaivf1hrr77l5ap8smbfr2rqjrm7phwxqs24l";
url = mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2;
sha256 = "0klwmimmhm3axpj8pwn5l41lbggh47r5aazhw63zxkbwfgyvg2hf";
};
buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ];
meta.platforms = stdenv.lib.platforms.unix;
6 changes: 3 additions & 3 deletions pkgs/servers/x11/xorg/tarballs-7.7.list
View file
Original file line number Diff line number Diff line change
@@ -63,13 +63,13 @@ mirror://xorg/individual/lib/libX11-1.6.5.tar.bz2
mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2
mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2
mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2
mirror://xorg/individual/lib/libXcursor-1.1.14.tar.bz2
mirror://xorg/individual/lib/libXcursor-1.1.15.tar.bz2
mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2
mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2
mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2
mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2
mirror://xorg/individual/lib/libXfont-1.5.3.tar.bz2
mirror://xorg/individual/lib/libXfont2-2.0.2.tar.bz2
mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2
mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2
mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2
mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2
mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2