From f27be47546ab8c37cfef8ea3214453fea04d4f97 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Wed, 28 Oct 2026 18:16:29 +0100 Subject: frr: T9526: upgrade to stable/10.7 commit e42337c8d3b80 The upgrade also drops a patch which is now mainlined, build option --enable-pcre2posix. --- scripts/package-build/frr/package.toml | 2 +- ...001-Enable-PCRE2-in-Debian-package-builds.patch | 24 ---------------------- 2 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 scripts/package-build/frr/patches/frr/0001-Enable-PCRE2-in-Debian-package-builds.patch diff --git a/scripts/package-build/frr/package.toml b/scripts/package-build/frr/package.toml index a614c41b..14be336d 100644 --- a/scripts/package-build/frr/package.toml +++ b/scripts/package-build/frr/package.toml @@ -6,7 +6,7 @@ build_cmd = "pipx run apkg build -i && find pkg/pkgs -type f -name *.deb -exec m [[packages]] name = "frr" -commit_id = "45b345f38f51f" # stable/10.7 branch +commit_id = "e42337c8d3b80" # stable/10.7 branch scm_url = "https://github.com/FRRouting/frr.git" build_cmd = "sudo dpkg -i ../*.deb; dpkg-buildpackage -us -uc -tc -b -Ppkg.frr.rtrlib,pkg.frr.lua" diff --git a/scripts/package-build/frr/patches/frr/0001-Enable-PCRE2-in-Debian-package-builds.patch b/scripts/package-build/frr/patches/frr/0001-Enable-PCRE2-in-Debian-package-builds.patch deleted file mode 100644 index fc837fb0..00000000 --- a/scripts/package-build/frr/patches/frr/0001-Enable-PCRE2-in-Debian-package-builds.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 20ff690dcf8ab7e800e1dc0c4fd83041d039fb3d Mon Sep 17 00:00:00 2001 -From: Daniil Baturin -Date: Wed, 6 Nov 2024 15:58:10 +0000 -Subject: [PATCH] Enable PCRE2 in Debian package builds - ---- - debian/rules | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/debian/rules b/debian/rules -index 21094c62d9..ea248ff528 100755 ---- a/debian/rules -+++ b/debian/rules -@@ -89,6 +89,7 @@ override_dh_auto_configure: - --enable-vty-group=frrvty \ - --enable-configfile-mask=0640 \ - --enable-logfile-mask=0640 \ -+ --enable-pcre2posix \ - # end - - override_dh_auto_install: --- -2.39.5 - -- cgit v1.2.3