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: 90b1b55e3e10
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ad34e9e24751
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on Aug 3, 2019

  1. pango: CVE-2019-1010238 

    Fixes #65650

(cherry picked from commit 0edd264337271a5b60b3c68f3bca45fa8d6859aa)
    @mmahut @FRidh
    mmahut authored and FRidh committed Aug 3, 2019
    Copy the full SHA
    451edb5 View commit details

  2. Merge branch 'release-19.03' into staging-19.03

    @vcunat
    vcunat committed Aug 3, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1011873 View commit details

  3. iptables: CVE-2019-11360 (release-19.03, PR #65662) 

    Fixes #65647
    @mmahut @vcunat
    mmahut authored and vcunat committed Aug 3, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fe419b6 View commit details

Commits on Aug 4, 2019

  1. Merge branch 'staging-19.03' into release-19.03

    @vcunat
    vcunat committed Aug 4, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ad34e9e View commit details
Showing with 14 additions and 1 deletion.
  1. +9 −1 pkgs/development/libraries/pango/default.nix
  2. +5 −0 pkgs/os-specific/linux/iptables/default.nix
10 changes: 9 additions & 1 deletion pkgs/development/libraries/pango/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz
, libintl, gobject-introspection, darwin, fribidi, gnome3
, libintl, gobject-introspection, darwin, fribidi, gnome3, fetchpatch
, gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf
}:

@@ -16,6 +16,14 @@ in stdenv.mkDerivation rec {
sha256 = "17bwb7dgbncrfsmchlib03k9n3xaalirb39g3yb43gg8cg6p8aqx";
};

patches = [
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/pango/commit/490f8979a260c16b1df055eab386345da18a2d54.patch";
name = "CVE-2019-1010238.patch";
sha256 = "1s0qclbaknkx3dkc3n6mlmx3fnhlr2pkncqjkywprpvahmmypr7k";
})
];

outputs = [ "bin" "dev" "out" "devdoc" ];

nativeBuildInputs = [ pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43 ];
5 changes: 5 additions & 0 deletions pkgs/os-specific/linux/iptables/default.nix
View file
Original file line number Diff line number Diff line change
@@ -36,6 +36,11 @@ stdenv.mkDerivation rec {
url = "https://git.netfilter.org/iptables/patch/?id=2908eda10bf9fc81119d4f3ad672c67918ab5955";
sha256 = "1dci4c8b7gcdrf77l2aicrcwlbp320xjz76fhavams0b4kgs6yr3";
})
(fetchpatch {
url = "https://git.netfilter.org/iptables/patch/iptables/xshared.c?id=2ae1099a42e6a0f06de305ca13a842ac83d4683e";
name = "CVE-2019-11360.patch";
sha256 = "0ssk2ad5lfb1ifa6jgk76s4mm68hdkz7g8bjmdzi2yv3l06lf2dp";
})
];

nativeBuildInputs = [ bison flex pkgconfig pruneLibtoolFiles ];