diff options
| author | Vladimír Čunát <vladimir.cunat@nic.cz> | 2022-09-21 14:34:46 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vladimir.cunat@nic.cz> | 2022-09-22 14:04:37 +0200 |
| commit | e390ffa73250c3ce76d69724a066ce7ff308ba37 (patch) | |
| tree | 9d59baa0d323c4f71eecc243ea5cc5488bdb1953 | |
| parent | knot-resolver: run more tests also on *-darwin (diff) | |
| download | nixpkgs-e390ffa73250c3ce76d69724a066ce7ff308ba37.tar.gz | |
knot-resolver: 5.5.2 -> 5.5.3
CVE-2022-40188 and also the patches were included in the release.
https://gitlab.nic.cz/knot/knot-resolver/-/tags/v5.5.3
(cherry picked from commit 14384cf3cae6bbd85224e438ffead3136ae36eb6)
| -rw-r--r-- | pkgs/servers/dns/knot-resolver/default.nix | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index dc14049b9dbb..cccc366c9291 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, fetchurl -, fetchpatch # native deps. , runCommand, pkg-config, meson, ninja, makeWrapper # build+runtime deps. @@ -18,28 +17,15 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.5.2"; + version = "5.5.3"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "3f78aa69c3f28edc42b5900b9788fba39498d8bffda7fb9c772bb470865780cb"; + sha256 = "a38f57c68b7d237d662784d8406e6098aad66a148f44dcf498d1e9664c5fed2d"; }; outputs = [ "out" "dev" ]; - patches = [ - (fetchpatch { - name = "fix-config-tests-on-darwin.patch"; - url = "https://gitlab.nic.cz/knot/knot-resolver/-/commit/48ad9d436cf80f58c107774c313a561d852148a0.diff"; - sha256 = "CEX1XkeYLUSe31xUhNdMRMl1VUXtKFCs5noNJaqL5x0="; - }) - (fetchpatch { - name = "fix-config-tests-on-aarch64-darwin.patch"; - url = "https://gitlab.nic.cz/knot/knot-resolver/-/commit/adaac913c50a5db2f226a081ddc419b0d56d1757.diff"; - sha256 = "1LrL74luzPTyJ7VBi7fskDga4lYAh7cSUmDcd1BNO78="; - }) - ]; - # Path fixups for the NixOS service. postPatch = '' patch meson.build <<EOF |