diff options
| author | nicoo <nicoo@debian.org> | 2024-05-22 15:08:42 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-22 15:08:42 +0000 |
| commit | a39290dfdf0a769a3fda56b61fdf40f7d9db7ea1 (patch) | |
| tree | 76c19db837db291c1040b108844611d58a4a2226 | |
| parent | Merge pull request #313655 from fabaff/distorm3-py312 (diff) | |
| parent | doc/release-notes: add frr 10.0 BGP (diff) | |
| download | nixpkgs-a39290dfdf0a769a3fda56b61fdf40f7d9db7ea1.tar.gz | |
Merge #304232: frr 9.1 → 10.0
Addresses
CVE-2024-31948
CVE-2024-31949
CVE-2024-31950
CVE-2024-31951
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2405.section.md | 2 | ||||
| -rw-r--r-- | pkgs/servers/frr/default.nix | 13 |
2 files changed, 4 insertions, 11 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 14143c3037c6..7ac0fc579bb0 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -435,6 +435,8 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi - `services.archisteamfarm` no longer uses the abbreviation `asf` for its state directory (`/var/lib/asf`), user and group (both `asf`). Instead the long name `archisteamfarm` is used. Configurations with `system.stateVersion` 23.11 or earlier, default to the old stateDirectory until the 24.11 release and must either set the option explicitly or move the data to the new directory. +- `frr` was updated to 10.0, which introduces the default of `enforce-first-as` for BGP. Please disable again if needed. + - `services.aria2.rpcSecret` has been replaced with `services.aria2.rpcSecretFile`. This was done so that secrets aren't stored in the world-readable nix store. To migrate, you will have to create a file with the same exact string, and change diff --git a/pkgs/servers/frr/default.nix b/pkgs/servers/frr/default.nix index d4adb5ed34fa..ba1f46414f6a 100644 --- a/pkgs/servers/frr/default.nix +++ b/pkgs/servers/frr/default.nix @@ -86,24 +86,15 @@ lib.warnIf (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) stdenv.mkDerivation rec { pname = "frr"; - version = "9.1"; + version = "10.0"; src = fetchFromGitHub { owner = "FRRouting"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-oDPr51vI+tlT1IiUPufmZh/UE0TNKWrn4RqpnGoGxNo="; + hash = "sha256-vvh9z2hmjvAA7OXgrUmlcrrTE5MRedZzfmhX5FEDKwE="; }; - patches = [ - # fixes crash in OSPF TE parsing - (fetchpatch { - name = "CVE-2024-27913.patch"; - url = "https://github.com/FRRouting/frr/commit/541503eecd302d2cc8456167d130014cd2cf1134.patch"; - hash = "sha256-7NxPlQK/6lbLs/NqNi4OZ2uBWfXw99SiXDR6okNvJlg="; - }) - ]; - nativeBuildInputs = [ autoreconfHook bison |