nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 04:50:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #184579: unbound: fix CVE-2022-30698 and CVE-2022-30699

Browse Source 
...into staging-22.05
This commit is contained in:
Vladimír Čunát
2022-08-19 20:09:12 +02:00
parent a238e82fb5 5e718d78c1
commit 644b92f9c0
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/networking/unbound/default.nix
View File

@@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchurl
, fetchpatch
, openssl
, nettle
, expat
@@ -107,6 +108,16 @@ stdenv.mkDerivation rec {
doCheck = true;
patches = [
# Fix CVE-2022-30698 and CVE-2022-30699
(fetchpatch {
url = "https://github.com/NLnetLabs/unbound/commit/f6753a0f1018133df552347a199e0362fc1dac68.patch";
name = "CVE-2022-30698.CVE-2022-30699.patch";
hash = "sha256-tLHkQoAbtYqLr3ASYfYX6pGtjD2TWT4B5NUubT4EN90=";
excludes = [ "doc/Changelog" ];
})
];
postPatch = lib.optionalString withPythonModule ''
substituteInPlace Makefile.in \
--replace "\$(DESTDIR)\$(PYTHON_SITE_PKG)" "$out/${python.sitePackages}"

2
pkgs/tools/networking/unbound/python.nix
View File

@@ -5,7 +5,7 @@ let
in
stdenv.mkDerivation rec {
pname = "pyunbound";
inherit (unbound) version src;
inherit (unbound) version src patches;
nativeBuildInputs = [ swig ];