The branch releng/13.0 has been updated by gjb:
URL:
https://cgit.FreeBSD.org/src/commit/?id=e011488bae5ae688a839e77b77e15f2231a5c148
commit e011488bae5ae688a839e77b77e15f2231a5c148
Author: Dag-Erling Smørgrav <d...@freebsd.org>
AuthorDate: 2021-03-10 14:01:38 +0000
Commit: Glen Barber <g...@freebsd.org>
CommitDate: 2021-03-24 01:47:57 +0000
MFC: Fix local-unbound setup for some IPv6 deployments.
On behalf of: des
PR: 250984
Sponsored by: Rubicon Communications, LLC ("Netgate")
Approved by: re (cperciva)
(cherry picked from commit e5f02c140bf1e519a95bd6331382e8a2a1b6219f)
(cherry picked from commit 34e12e9a177a1d2386a855eb5a497f6f8a680180)
---
usr.sbin/unbound/setup/local-unbound-setup.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr.sbin/unbound/setup/local-unbound-setup.sh
b/usr.sbin/unbound/setup/local-unbound-setup.sh
index c51145cf2312..3be78339b0ba 100755
--- a/usr.sbin/unbound/setup/local-unbound-setup.sh
+++ b/usr.sbin/unbound/setup/local-unbound-setup.sh
@@ -66,7 +66,7 @@ bkext=$(date "+%Y%m%d.%H%M%S")
RE_octet="([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])"
RE_ipv4="(${RE_octet}(\\.${RE_octet}){3})"
RE_word="([0-9A-Fa-f]{1,4})"
-RE_ipv6="((${RE_word}:){1,}(:|(:${RE_word})*)|::1)"
+RE_ipv6="((${RE_word}:){1,}(:|${RE_word}?(:${RE_word})*)|::1)"
RE_port="([1-9][0-9]{0,3}|[1-5][0-9]{4,4}|6([0-4][0-9]{3}|5([0-4][0-9]{2}|5([0-2][0-9]|3[0-5]))))"
RE_dnsname="([0-9A-Za-z-]{1,}(\\.[0-9A-Za-z-]{1,})*\\.?)"
RE_forward_addr="((${RE_ipv4}|${RE_ipv6})(@${RE_port})?)"
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
