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: 199de0468881
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: b2540c79ef3c
Choose a head ref
  • 8 commits
  • 4 files changed
  • 5 contributors

Commits on Jun 18, 2020

  1. json_c: add patch for CVE-2020-12762 

    Fixes: https://nvd.nist.gov/vuln/detail/CVE-2020-12762

(cherry picked from commit d3e1b77)
    @mmilata
    mmilata committed Jun 18, 2020
    Copy the full SHA
    5e1de95 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #90700 from mmilata/20.03/json-c-cve-2020-12762 

    [20.03] json_c: add patch for CVE-2020-12762
    @worldofpeace
    worldofpeace committed Jun 18, 2020
    Copy the full SHA
    e69158b View commit details
    Browse the repository at this point in the history

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

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

  4. libexif: 0.6.21 -> 0.6.22 

    Also:
- build from git
- enable cross compilation

(cherry picked from commit e761cfe)
    @erictapen
    erictapen committed Jun 18, 2020
    Copy the full SHA
    e3ca027 View commit details
    Browse the repository at this point in the history

  5. luajit*: patch CVE-2019-19391 

    - upstream argues that this kind of problems can't be called
  vulnerabilities
- the upstream patch is trivial, so why not fix the bug
- nixpkgs master uses git versions already containing that commit
Fixes #90875 (roundup ticket).
    @vcunat
    vcunat committed Jun 18, 2020
    1
    Copy the full SHA
    4e48231 View commit details
    Browse the repository at this point in the history

  6. libjpeg(-turbo): patch CVE-2020-13790 

    Fixes #90864 on 20.03 (roundup issue).
(cherry picked from commit d5fd2ed)
    @vcunat
    vcunat committed Jun 18, 2020
    Copy the full SHA
    0ba0883 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #90978 from erictapen/20.03-libexif-0.6.22 

    [20.03] libexif: 0.6.21 -> 0.6.22 for security fixes
    @flokli
    flokli committed Jun 18, 2020
    Copy the full SHA
    00e7d87 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2020

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

    A bunch of CVE fixes.  The libexif change has not been rebuilt on Hydra,
but it's only about a thousand rebuilds (when summed over all platforms).
    @vcunat
    vcunat committed Jun 19, 2020
    Copy the full SHA
    b2540c7 View commit details
    Browse the repository at this point in the history