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: f82e9b88c983
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: ff1b66eaea43
Choose a head ref
  • 9 commits
  • 3 files changed
  • 6 contributors

Commits on Jun 24, 2020

  1. curl: 7.68.0 -> 7.69.1 

    (cherry picked from commit e4df9d6)
    @r-ryantm @mweinelt
    r-ryantm authored and mweinelt committed Jun 24, 2020
    Copy the full SHA
    9188171 View commit details
    Browse the repository at this point in the history

  2. curl: 7.69.1 -> 7.70.0 

    (cherry picked from commit 9efd23e)
    @peterhoeg @mweinelt
    peterhoeg authored and mweinelt committed Jun 24, 2020
    Copy the full SHA
    f1693d6 View commit details
    Browse the repository at this point in the history

  3. pcre: 8.43 -> 8.44 

    https://lists.exim.org/lurker/message/20200212.174850.6edd8277.en.html
(cherry picked from commit 4f97819)

Fixes: CVE-2020-14155
Closes: #91311
    @zowoq @mweinelt
    zowoq authored and mweinelt committed Jun 24, 2020
    Copy the full SHA
    2599ba3 View commit details
    Browse the repository at this point in the history

  4. curl: apply patches for CVE-2020-8169 and CVE-2020-8177

    @mweinelt
    mweinelt committed Jun 24, 2020
    Copy the full SHA
    039c3c9 View commit details
    Browse the repository at this point in the history

  5. Merge #91408: curl: 7.68.0 -> 7.70.0 + patches 

    ... into staging-20.03.  CVE-2020-8169 and CVE-2020-8177.
    @vcunat
    vcunat committed Jun 24, 2020
    Copy the full SHA
    aa5c726 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'release-20.03' into staging-20.03

    @vcunat
    vcunat committed Jun 24, 2020
    Copy the full SHA
    5e6916f View commit details
    Browse the repository at this point in the history

  7. wolfssl: v4.3.0 -> v4.4.0 

    Fixes: CVE-2020-11713
(cherry picked from commit 6baa4e7)
    @mweinelt
    mweinelt committed Jun 24, 2020
    Copy the full SHA
    29f44d0 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2020

  1. Merge pull request #86999 from mweinelt/20.03/pr/wolfssl

    @Mic92
    Mic92 committed Jun 25, 2020
    Copy the full SHA
    3f21f10 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2020

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

    @vcunat
    vcunat committed Jun 28, 2020
    Copy the full SHA
    ff1b66e View commit details
    Browse the repository at this point in the history