729276ccdc
- Migration to /usr/etc: Conditionally moved /etc/logrotate.d/frr file to vendor specific directory /usr/etc/logrotate.d and added saving of user changed configuration files in /etc and restoring them while an RPM update. - Declare root as sufficient also in the pam account verification; without vtysh use causes to log a pam frr:account warnings (https://github.com/FRRouting/frr/pull/12308) [+ 0005-root-ok-in-account-frr.pam.patch] - Applied fix removing a not needed backslash causing to log a warning (https://github.com/FRRouting/frr/pull/12307) [+ 0004-tools-remove-backslash-from-declare-check-regex.patch] - Applied upstream fixes for frrinit.sh to avoid a privilege escalation from frr to root in frr config creation (bsc#1204124,CVE-2022-42917, https://github.com/FRRouting/frr/pull/12157). [+ 0003-tools-Run-as-FRR_USER-install-chown-commands-to-avoi.patch] - Removed obsolete patches provided in the 8.4 source archive: [- 0003-babeld-fix-10487-by-adding-a-check-on-packet-length.patch, - 0004-babeld-fix-10502-10503-by-repairing-the-checks-on-le.patch, - 0005-isisd-fix-router-capability-TLV-parsing-issues.patch, - 0006-isisd-fix-10505-using-base64-encoding.patch, - 0007-bgpd-Make-sure-hdr-length-is-at-a-minimum-of-what-is.patch, - 0008-isisd-Ensure-rcap-is-freed-in-error-case.patch] - Update to version 8.4, see https://frrouting.org/release/8.4/ * New BGP command (neighbor PEER soo) to configure SoO to prevent routing loops and suboptimal routing on dual-homed sites. * Command debug bgp allow-martian replaced to bgp allow-martian-nexthop because previously we allowed using martian next-hops when debug is turned on. * Implement BGP Prefix Origin Validation State Extended Community rfc8097 * Implement Route Leak Prevention and Detection Using Roles in UPDATE OBS-URL: https://build.opensuse.org/request/show/1035289 OBS-URL: https://build.opensuse.org/package/show/network/frr?expand=0&rev=43
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From 3474b220e036497e6bbe23428645217c275f9f87 Mon Sep 17 00:00:00 2001
|
|
From: Marius Tomaschewski <mt@suse.com>
|
|
Date: Fri, 11 Nov 2022 12:26:04 +0100
|
|
References: https://github.com/FRRouting/frr/pull/12307
|
|
Upstream: submitted
|
|
Subject: [PATCH] tools: remove backslash from declare check regex
|
|
|
|
The backslash in `grep -q '^declare \-a'` is not needed and
|
|
causes `grep: warning: stray \ before -` warning in grep-3.8.
|
|
---
|
|
tools/frrcommon.sh.in | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/tools/frrcommon.sh.in b/tools/frrcommon.sh.in
|
|
index 61f1abb378..3c16c27c6d 100755
|
|
--- a/tools/frrcommon.sh.in
|
|
+++ b/tools/frrcommon.sh.in
|
|
@@ -335,7 +335,7 @@ if [ -z "$FRR_PATHSPACE" ]; then
|
|
load_old_config "/etc/sysconfig/frr"
|
|
fi
|
|
|
|
-if { declare -p watchfrr_options 2>/dev/null || true; } | grep -q '^declare \-a'; then
|
|
+if { declare -p watchfrr_options 2>/dev/null || true; } | grep -q '^declare -a'; then
|
|
log_warning_msg "watchfrr_options contains a bash array value." \
|
|
"The configured value is intentionally ignored since it is likely wrong." \
|
|
"Please remove or fix the setting."
|
|
--
|
|
2.35.3
|
|
|