From b101dd76fb4fd29cea53dbdabe7f302bdb48dca3 Mon Sep 17 00:00:00 2001
From: Eric Luehrsen <ericluehrsen@gmail.com>
Date: Sat, 11 Jan 2020 14:13:56 -0500
Subject: [PATCH] unbound: fix TLS forwards with optional suffix

Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
---
 net/unbound/Makefile         |  2 +-
 net/unbound/files/unbound.sh | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/net/unbound/Makefile b/net/unbound/Makefile
index d78f76ad7..aebcd203e 100644
--- a/net/unbound/Makefile
+++ b/net/unbound/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=unbound
 PKG_VERSION:=1.9.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://nlnetlabs.nl/downloads/unbound
diff --git a/net/unbound/files/unbound.sh b/net/unbound/files/unbound.sh
index 83717fefb..32a2e938a 100644
--- a/net/unbound/files/unbound.sh
+++ b/net/unbound/files/unbound.sh
@@ -126,7 +126,7 @@ bundle_lan_networks() {
     for ifsubnet in $UB_LIST_NETW_ALL ; do
       case $ifsubnet in
         "${ifdashname}"@*)
-          # Special GLA protection for local block; ULA protected as a catagory
+          # Special GLA protection for local block; ULA protected default
           UB_LIST_NETW_LAN="$UB_LIST_NETW_LAN $ifsubnet"
           ;;
       esac
@@ -472,7 +472,7 @@ unbound_zone() {
         for server in $UB_LIST_ZONE_SERVERS ; do
           if [ "$( valid_subnet_any $server )" = "not" ] ; then
             case $server in
-              *@[0-9]*)
+              *@[0-9]*|*#[A-Za-z0-9]*)
                 # unique Unbound option for server host name
                 servers_host="$servers_host $server"
                 ;;
@@ -483,11 +483,12 @@ unbound_zone() {
                 else
                   servers_host="$servers_host $server${port:+@${port}}"
                 fi
+                ;;
             esac
 
           else
             case $server in
-              *[0-9]@[0-9]*)
+              *@[0-9]*|*#[A-Za-z0-9]*)
                 # unique Unbound option for server address
                 servers_ip="$servers_ip $server"
                 ;;
@@ -498,6 +499,7 @@ unbound_zone() {
                 else
                   servers_ip="$servers_ip $server${port:+@${port}}"
                 fi
+                ;;
             esac
           fi
         done
@@ -1176,7 +1178,7 @@ unbound_hostname() {
                 namerec="  local-data: \"$name. 300 IN AAAA $ifaddr\""
                 echo "$namerec" >> $UB_HOST_CONF
               fi
-            ;;
+              ;;
           esac
         done
         echo >> $UB_HOST_CONF