0d23942aca
- Clean slate: removing all previous patches. - The following patches were obsoleted: - 0001-disable-zmq-test.patch - harden_frr.service.patch - 0003-tools-Run-as-FRR_USER-install-chown-commands-to-avoi.patch - 0004-tools-remove-backslash-from-declare-check-regex.patch - 0005-root-ok-in-account-frr.pam.patch - 0006-bgpd-Check-7-bytes-for-Long-lived-Graceful-Restart-c.patch - 0007-bgpd-Ensure-stream-received-has-enough-data.patch - 0008-bgpd-Don-t-read-the-first-byte-of-ORF-header-if-we-a.patch - 0009-bgpd-Do-not-process-NLRIs-if-the-attribute-length-is.patch - 0010-bgpd-Use-treat-as-withdraw-for-tunnel-encapsulation-.patch - 0011-babeld-fix-11808-to-avoid-infinite-loops.patch - 0012-bgpd-Limit-flowspec-to-no-attribute-means-a-implicit.patch - 0013-bgpd-Check-mandatory-attributes-more-carefully-for-U.patch - 0014-bgpd-Handle-MP_REACH_NLRI-malformed-packets-with-ses.patch - 0015-bgpd-Treat-EOR-as-withdrawn-to-avoid-unwanted-handli.patch - 0016-bgpd-Ignore-handling-NLRIs-if-we-received-MP_UNREACH.patch - 0017-bgpd-Fix-use-beyond-end-of-stream-of-labeled-unicast.patch - 0018-bgpd-Flowspec-overflow-issue.patch - 0019-bgpd-fix-error-handling-when-receiving-BGP-Prefix-SID-attribute.patch - 0020-ospfd-Solved-crash-in-OSPF-TE-parsing.patch - 0021-ospfd-Solved-crash-in-RI-parsing-with-OSPF-TE.patch - 0022-ospfd-Correct-Opaque-LSA-Extended-parser.patch - 0023-ospfd-protect-call-to-get_edge-in-ospf_te.c.patch OBS-URL: https://build.opensuse.org/package/show/network/frr?expand=0&rev=69
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
|
|
|