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
base: e2ad04c513e8
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 2fc18e735c18
Choose a head ref
  • 12 commits
  • 4 files changed
  • 6 contributors

Commits on Jul 9, 2019

  1. Merge release-19.03 into staging-19.03

    @FRidh
    FRidh committed Jul 9, 2019
    Copy the full SHA
    a30a984 View commit details
    Browse the repository at this point in the history

  2. python36: 3.6.8 -> 3.6.9 

    (cherry picked from commit a88e319)
    @FRidh
    FRidh committed Jul 9, 2019
    Copy the full SHA
    79f957a View commit details
    Browse the repository at this point in the history

  3. python37: 3.7.3 -> 3.7.4 

    (cherry picked from commit 46d9141)
    @FRidh
    FRidh committed Jul 9, 2019
    Copy the full SHA
    931146a View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2019

  1. glib: fix CVE-2019-13012 

    CVE-2019-13012 Description:

The keyfile settings backend in GLib before 2.59.1 creates directories
using g_file_make_directory_with_parents (kfsb->dir, NULL, NULL) and
files using g_file_replace_contents (kfsb->file, contents, length, NULL, FALSE,
G_FILE_CREATE_REPLACE_DESTINATION, NULL, NULL, NULL).
Consequently, it does not properly restrict directory (and file) permissions.
Instead, for directories, 0777 permissions are used; for files, default file
permissions are used.

Patch Summary:

Changes the permissions when a directory is created,
using 700 instead 777 in gio/gkeyfilesettingsbackend.c
and changes test to run in a temp directory in gio/tests/gsettings.c.

Upstream Issue: https://gitlab.gnome.org/GNOME/glib/issues/1658
Upstream MR: https://gitlab.gnome.org/GNOME/glib/merge_requests/604

Fixes #64657
    @worldofpeace
    worldofpeace committed Jul 12, 2019
    Copy the full SHA
    35e28b4 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2019

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

    @vcunat
    vcunat committed Jul 13, 2019
    Copy the full SHA
    f7bd8d6 View commit details
    Browse the repository at this point in the history

  2. Merge #64679: glib: fix CVE-2019-13012 (in staging-19.03)

    @vcunat
    vcunat committed Jul 13, 2019
    Copy the full SHA
    45b4e23 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2019

  1. python37: fix distutils C++ patch (PR #64758) 

    Update distutils patch to the upstream changes.
See: python/cpython@6c0e0d1

(cherry picked from commit 7094a1a)
    @marsam @vcunat
    marsam authored and vcunat committed Jul 15, 2019
    Copy the full SHA
    198a6bd View commit details
    Browse the repository at this point in the history

  2. nss: 3.42.1 -> 3.43 

    https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_3.43_release_notes
(cherry picked from commit 354ccb2)
    @dtzWill @vcunat
    dtzWill authored and vcunat committed Jul 15, 2019
    Copy the full SHA
    ddcd81e View commit details
    Browse the repository at this point in the history

  3. nss: 3.43 -> 3.44 

    (cherry picked from commit 979970a)
    @dtzWill @vcunat
    dtzWill authored and vcunat committed Jul 15, 2019
    Copy the full SHA
    1015f72 View commit details
    Browse the repository at this point in the history

  4. nss: 3.44 -> 3.44.1 

    (cherry picked from commit 442fd85)
Fresh nss will be needed for further Firefox updates; /cc PR #64742
    @taku0 @vcunat
    taku0 authored and vcunat committed Jul 15, 2019
    Copy the full SHA
    2143d04 View commit details
    Browse the repository at this point in the history

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

    @vcunat
    vcunat committed Jul 15, 2019
    Copy the full SHA
    be61b5b View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2019

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

    @vcunat
    vcunat committed Jul 16, 2019
    Copy the full SHA
    2fc18e7 View commit details
    Browse the repository at this point in the history