summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Scott <code@humanleg.org.uk>2022-09-20 23:25:24 +0100
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-10-01 17:35:00 +0000
commit40a5c796cf4b9b08a95afcffb7b2f556e30017bf (patch)
tree45606591207c842afde0ba9486d4357c5978e788
parentMerge pull request #193721 from helsinki-systems/backport-193653-to-release-2... (diff)
downloadnixpkgs-origin/backport-192146-to-release-22.05.tar.gz
frr: add patch for CVE-2022-37032origin/backport-192146-to-release-22.05
(cherry picked from commit 118179f32ad4e18e166daf2f4f612a79d1558b80)
-rw-r--r--pkgs/servers/frr/default.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/servers/frr/default.nix b/pkgs/servers/frr/default.nix
index 5e5cd767002d..b78063840e86 100644
--- a/pkgs/servers/frr/default.nix
+++ b/pkgs/servers/frr/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
# build time
, autoreconfHook
@@ -41,6 +42,14 @@ stdenv.mkDerivation rec {
hash = "sha256-zuOgbRxyyhFdBplH/K1fpyD+KUWa7FXPDmGKF5Kb7SQ=";
};
+ patches = [
+ (fetchpatch {
+ name = "CVE-2022-37032.patch";
+ url = "https://github.com/FRRouting/frr/commit/ff6db1027f8f36df657ff2e5ea167773752537ed.patch";
+ sha256 = "sha256-b3nT6xco620hMSqlj/nTWTJCegf3ARAGaQbii4Yq6Ag=";
+ })
+ ];
+
nativeBuildInputs = [
autoreconfHook
bison