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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ec1070d4d404
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bcc3c118bfae
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 4, 2019

  1. unbound: patch CVE-2019-16866 (DoS, minor one IMHO) 

    https://www.nlnetlabs.nl/projects/unbound/security-advisories/#vulnerability-in-parsing-notify-queries
The patch should be available here but web is down ATM:
https://nlnetlabs.nl/downloads/unbound/patch_cve_2019-16866.diff
    @vcunat
    vcunat committed Oct 4, 2019
    Copy the full SHA
    bcc3c11 View commit details
Showing with 10 additions and 1 deletion.
  1. +10 −1 pkgs/tools/networking/unbound/default.nix
11 changes: 10 additions & 1 deletion pkgs/tools/networking/unbound/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, openssl, nettle, expat, libevent, dns-root-data }:
{ stdenv, fetchurl, fetchpatch, openssl, nettle, expat, libevent, dns-root-data }:

stdenv.mkDerivation rec {
name = "unbound-${version}";
@@ -9,6 +9,15 @@ stdenv.mkDerivation rec {
sha256 = "05xrb8havr2vgjsdy7n85kgnvk1mg7qwhjp4a8n6pg4jhd5zjnj1";
};

patches = [
(fetchpatch {
name = "cve-2019-16866.diff";
url = "https://github.com/NLnetLabs/unbound/commit/b60c4a472c8.diff";
includes = [ "util/data/msgparse.c" ];
sha256 = "0id0mac9413pbc3z6yjha1sg7syxnari1qinxv5dp5jl98n1752p";
})
];

outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB

buildInputs = [ openssl nettle expat libevent ];