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: 4a154d476238
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: a565a2165ab6
Choose a head ref
  • 5 commits
  • 1 file changed
  • 5 contributors

Commits on Apr 24, 2021

  1. dnsmasq: 2.83 -> 2.84 

    (cherry picked from commit 0d4e6f5)
    @r-ryantm @LeSuisse
    r-ryantm authored and LeSuisse committed Apr 24, 2021
    Copy the full SHA
    46446ec View commit details
    Browse the repository at this point in the history

  2. dnsmasq: 2.84 -> 2.85 

    Fixes CVE-2021-3448.
https://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2021q1/014835.html

(cherry picked from commit 380bb61)
    @LeSuisse
    LeSuisse committed Apr 24, 2021
    Copy the full SHA
    a2ff87a View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2021

  1. Merge pull request #120518 from LeSuisse/dnsmasq-2.85-20.09

    @mweinelt
    mweinelt committed Apr 27, 2021
    Copy the full SHA
    af715f0 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2021

  1. Merge remote-tracking branch 'upstream/release-20.09' into staging-20.09

    @roberth
    roberth committed May 3, 2021
    Copy the full SHA
    8bea046 View commit details
    Browse the repository at this point in the history

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

    @vcunat
    vcunat committed May 3, 2021
    Copy the full SHA
    a565a21 View commit details
    Browse the repository at this point in the history