frr: 8.3.1 -> 8.4.1

https://github.com/FRRouting/frr/releases/tag/frr-8.4.1
https://github.com/FRRouting/frr/releases/tag/frr-8.4.0

This upgrade allows to cleanup the patches since the fix is available in 8.4.0.
This commit is contained in:
Thomas Gerbet 2022-11-27 14:31:11 +01:00
parent 537b31017d
commit a7e1d5114d

View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
# build time
, autoreconfHook
@ -33,23 +32,15 @@
stdenv.mkDerivation rec {
pname = "frr";
version = "8.3.1";
version = "8.4.1";
src = fetchFromGitHub {
owner = "FRRouting";
repo = pname;
rev = "${pname}-${version}";
hash = "sha256-+M4xTdjCp5TJh0U8ZfUmw84Y7O0TZ9mmUXhh2J/QOE0=";
hash = "sha256-SJKDIs6bL8NroSieNeSYBv+8JTGgFdhP4WYKUWYhpbk=";
};
patches = [
(fetchpatch {
name = "CVE-2022-37032.patch";
url = "https://github.com/FRRouting/frr/commit/ff6db1027f8f36df657ff2e5ea167773752537ed.patch";
sha256 = "sha256-b3nT6xco620hMSqlj/nTWTJCegf3ARAGaQbii4Yq6Ag=";
})
];
nativeBuildInputs = [
autoreconfHook
bison