From: Eric Luehrsen <ericluehrsen@gmail.com>
Date: Wed, 19 Jun 2019 04:37:17 +0000 (-0400)
Subject: unbound: update to 1.9.2 with package bug fixes
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=88a7f98bd2ba095e99065ea3eb1d61eed6bb369b;p=feed%2Fpackages.git

unbound: update to 1.9.2 with package bug fixes

- fix package makefile resulted in resolved symlink and copied
double file contents of libunbound.so during install
- treat RFC6762 'local.' as nxdomain because avahi and other services
will disable if SOA or NS records appear in central DNS
- NLNetLabs has moved download and documentation sites

cherry-pick and squash from openwrt-19.07
add3e6c699e148460fa7bca4011b9fbf95a0ef75
936a71739c062772b4580ed06e4d57874d53a822
4618c741502d392212864b10fe1f671424f9a79e

Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
---

diff --git a/net/unbound/Makefile b/net/unbound/Makefile
index 5275505359..977295b1be 100644
--- a/net/unbound/Makefile
+++ b/net/unbound/Makefile
@@ -8,16 +8,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=unbound
-PKG_VERSION:=1.9.1
-PKG_RELEASE:=3
+PKG_VERSION:=1.9.2
+PKG_RELEASE:=1
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Eric Luehrsen <ericluehrsen@gmail.com>
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.unbound.net/downloads
-PKG_HASH:=c3c0bf9b86ccba4ca64f93dd4fe7351308ab54293f297a67de5a8914c1dc59c5
+PKG_SOURCE_URL:=https://nlnetlabs.nl/downloads/unbound
+PKG_HASH:=6f7acec5cf451277fcda31729886ae7dd62537c4f506855603e3aa153fcb6b95
 
 PKG_BUILD_PARALLEL:=1
 PKG_FIXUP:=autoreconf
@@ -27,7 +27,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define Package/unbound/Default
   TITLE:=Validating Recursive DNS Server
-  URL:=http://www.unbound.net/
+  URL:=https://nlnetlabs.nl/projects/unbound/about
   DEPENDS:=+libopenssl
 endef
 
@@ -185,7 +185,7 @@ endef
 
 define Package/libunbound/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libunbound.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libunbound.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,unbound))
diff --git a/net/unbound/files/unbound.sh b/net/unbound/files/unbound.sh
index e03d93c647..06bd8273e3 100644
--- a/net/unbound/files/unbound.sh
+++ b/net/unbound/files/unbound.sh
@@ -1017,13 +1017,13 @@ unbound_hostname() {
 
     case "$UNBOUND_D_DOMAIN_TYPE" in
     deny|inform_deny|refuse|static)
-      {
-        # avoid upstream involvement in RFC6762 like responses (link only)
-        echo "  local-zone: local. $UNBOUND_D_DOMAIN_TYPE"
-        echo "  domain-insecure: local"
-        echo "  private-domain: local"
-        echo
-      } >> $UNBOUND_CONFFILE
+      if [ "$UNBOUND_TXT_DOMAIN" != "local" ] ; then
+        {
+          # avoid involvement in RFC6762, unless it is the local zone name
+          echo "  local-zone: local always_nxdomain"
+          echo
+        } >> $UNBOUND_CONFFILE
+      fi
       ;;
     esac