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: a5f9d585dfbc
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: d6f63659a702
Choose a head ref
  • 14 commits
  • 20 files changed
  • 6 contributors

Commits on Mar 29, 2021

  1. gstreamer: 1.16.2 -> 1.16.3 

    https://www.openwall.com/lists/oss-security/2021/01/20/1

Fixes: CVE-2021-3185
    @mweinelt
    mweinelt committed Mar 29, 2021
    Copy the full SHA
    608c436 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2021

  1. python3Packages.pillow: add patches for multiple vulnerabilities 

    those being CVE-2021-25289, CVE-2021-25290, CVE-2021-25291, CVE-2021-25292,
CVE-2021-25293, CVE-2021-27921, CVE-2021-27922, CVE-2021-27923

binary parts fetched separately again to allow accompanying tests to run
    @risicle
    risicle committed Mar 30, 2021
    Copy the full SHA
    e4d3b27 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2021

  1. python3Packages.pillow: add patch for CVE-2021-25287 & CVE-2021-25288 

    patch needing adaptation because upstream ran clang-format on their tree
    @risicle
    risicle committed Apr 3, 2021
    Copy the full SHA
    17a7154 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #118097 from risicle/ris-pillow-CVEs-2021-03-r20.09 

    [20.09] python3Packages.pillow: add patches for multiple vulnerabilities
    @mweinelt
    mweinelt committed Apr 3, 2021
    Copy the full SHA
    df53d17 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #117993 from mweinelt/20.09/gstreamer 

    [20.09] gstreamer: 1.16.2 -> 1.16.3
    @mweinelt
    mweinelt committed Apr 3, 2021
    Copy the full SHA
    704566f View commit details
    Browse the repository at this point in the history

  4. samba: 4.12.11 -> 4.12.14

    @risicle
    risicle committed Apr 3, 2021
    Copy the full SHA
    89546cc View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2021

  1. openldap: 2.4.57 -> 2.4.58 

    (cherry picked from commit 37e7ad0)
    @r-ryantm @risicle
    r-ryantm authored and risicle committed Apr 4, 2021
    Copy the full SHA
    c336508 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #118402 from risicle/ris-samba-4.12.14-r20.09 

    [20.09] samba: 4.12.11 -> 4.12.14
    @risicle
    risicle committed Apr 4, 2021
    Copy the full SHA
    67fe7b4 View commit details
    Browse the repository at this point in the history

  3. curl: add patches for CVE-2021-22876, CVE-2021-22890 

    hand-backported from upstream fixes

(cherry picked from commit 6808269)
    @risicle @erictapen
    risicle authored and erictapen committed Apr 4, 2021
    Copy the full SHA
    85378dc View commit details
    Browse the repository at this point in the history

  4. Merge pull request #118469 from erictapen/20.09/curl-cve-2021-22876 

    [20.09] curl: add patches for CVE-2021-22876, CVE-2021-22890
    @mweinelt
    mweinelt committed Apr 4, 2021
    Copy the full SHA
    26e33dc View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2021

  1. Merge pull request #118457 from risicle/ris-openldap-2.4.58-r20.09 

    [20.09] openldap: 2.4.57 -> 2.4.58, addressing CVE-2021-27212
    @SuperSandro2000
    SuperSandro2000 committed Apr 5, 2021
    Copy the full SHA
    46a5356 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2021

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

    @vcunat
    vcunat committed Apr 7, 2021
    Copy the full SHA
    95d1726 View commit details
    Browse the repository at this point in the history

  2. python3Packages.gst-python: drop patch that's been included 

    It wouldn't apply due to being included in the last update
(commit 608c436, PR #117993).  The other patch still applies.
    @vcunat
    vcunat committed Apr 7, 2021
    Copy the full SHA
    3dbf8ed View commit details
    Browse the repository at this point in the history

  3. Merge branch 'staging-20.09' into release-20.09 

    https://hydra.nixos.org/eval/1661214
Darwin is lagging behind, but that doesn't seem a sufficient reason
to delay.
    @vcunat
    vcunat committed Apr 7, 2021
    Copy the full SHA
    d6f6365 View commit details
    Browse the repository at this point in the history