1From 5216a05b32390a64efeb598051411e1776042624 Mon Sep 17 00:00:00 2001 2From: Marius Tomaschewski <mt@suse.com> 3Date: Fri, 11 Nov 2022 12:26:04 +0100 4Subject: [PATCH] tools: remove backslash from declare check regex 5 6The backslash in `grep -q '^declare \-a'` is not needed and 7causes `grep: warning: stray \ before -` warning in grep-3.8. 8 9Signed-off-by: Marius Tomaschewski <mt@suse.com> 10 11CVE: CVE-2022-42917 12 13Upstream-Status: Backport 14[https://github.com/FRRouting/frr/commit/5216a05b32390a64efeb598051411e1776042624] 15 16Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 17--- 18 tools/frrcommon.sh.in | 2 +- 19 1 file changed, 1 insertion(+), 1 deletion(-) 20 21diff --git a/tools/frrcommon.sh.in b/tools/frrcommon.sh.in 22index 61f1abb37..3c16c27c6 100755 23--- a/tools/frrcommon.sh.in 24+++ b/tools/frrcommon.sh.in 25@@ -335,7 +335,7 @@ if [ -z "$FRR_PATHSPACE" ]; then 26 load_old_config "/etc/sysconfig/frr" 27 fi 28 29-if { declare -p watchfrr_options 2>/dev/null || true; } | grep -q '^declare \-a'; then 30+if { declare -p watchfrr_options 2>/dev/null || true; } | grep -q '^declare -a'; then 31 log_warning_msg "watchfrr_options contains a bash array value." \ 32 "The configured value is intentionally ignored since it is likely wrong." \ 33 "Please remove or fix the setting." 34-- 352.25.1 36 37