Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fad125262b77
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bca2ee28db44
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 22, 2018

  1. cyrus-sasl: use cve tag in patchname for vulnix auto-detection

    @pSub
    pSub committed Apr 22, 2018
    Copy the full SHA
    11b4c86 View commit details

  2. xorg.libXfixes: 5.0.2 -> 5.0.3 

    Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 5.0.3 with grep in /nix/store/g5hcg35wmg25sgfjp7mvi4cx3shldbxd-libXfixes-5.0.3
- directory tree listing: https://gist.github.com/7398ada0908969ebbd1e7e629a1e0ef7

(cherry picked from commit 0e443ce)
Only fixes CVE-2016-7944; /cc #38994.
(cherry picked from commit ce86b8f)
    @ryantm @pSub
    ryantm authored and pSub committed Apr 22, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    veprbl Dmitry Kalinkin
    GPG key ID: 5157B3EC8B2CA333
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bca2ee2 View commit details
Showing with 5 additions and 4 deletions.
  1. +2 −1 pkgs/development/libraries/cyrus-sasl/default.nix
  2. +3 −3 pkgs/servers/x11/xorg/default.nix
3 changes: 2 additions & 1 deletion pkgs/development/libraries/cyrus-sasl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,8 @@ stdenv.mkDerivation rec {

patches = [
./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519
(fetchpatch { # CVE-2013-4122
(fetchpatch {
name = "CVE-2013-4122.patch";
url = "http://sourceforge.net/projects/miscellaneouspa/files/glibc217/cyrus-sasl-2.1.26-glibc217-crypt.diff";
sha256 = "05l7dh1w9d5fvzg0pjwzqh0fy4ah8y5cv6v67s4ssbq8xwd4pkf2";
})
6 changes: 3 additions & 3 deletions pkgs/servers/x11/xorg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -768,11 +768,11 @@ let
}) // {inherit libX11 xextproto xproto ;};

libXfixes = (mkDerivation "libXfixes" {
name = "libXfixes-5.0.2";
name = "libXfixes-5.0.3";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2;
sha256 = "1slsk898386xii0r3l7szwwq3s6y2m4dsj0x93ninjh8xkghxllv";
url = mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2;
sha256 = "1miana3y4hwdqdparsccmygqr3ic3hs5jrqfzp70hvi2zwxd676y";
};
buildInputs = [pkgconfig fixesproto libX11 xextproto xproto ];
meta.platforms = stdenv.lib.platforms.unix;