Merge branch '2692-grep-from-freebsd-13-0-stumbles-on-r-in-digdelv-test' into 'v9_16'

Do not use escape codes for matching with grep

See merge request isc-projects/bind9!5023

bin/tests/system/digdelv/tests.sh

@@ -975,7 +975,8 @@ if [ -x "$DIG" ] ; then
   echo_i "check that dig +bufsize=0 +edns sends EDNS with bufsize of 0 ($n)"
   ret=0
   dig_with_opts @10.53.0.3 a.example +bufsize=0 +edns +qr > dig.out.test$n 2>&1 || ret=1
-  grep -E 'EDNS:.* udp: 0\r{0,1}$' dig.out.test$n > /dev/null|| ret=1
+  pat='EDNS:.* udp: 0$'
+  tr -d '\r' < dig.out.test$n | grep -E "$pat" > /dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
   status=$((status+ret))