Merge pull request #12676 from BKPepe/bind-openwrt19.07

[19.07] bind: update to version 9.16.x

net/bind/Makefile

@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2006-2012 OpenWrt.org
-#               2014-2017 Noah Meyerhans <frodo@morgul.net>
+#               2014-2020 Noah Meyerhans <frodo@morgul.net>
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,8 +9,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bind
-PKG_VERSION:=9.14.12
+PKG_VERSION:=9.16.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 USERID:=bind=57:bind=57
 
 PKG_MAINTAINER:=Noah Meyerhans <frodo@morgul.net>
@@ -18,11 +18,11 @@ PKG_LICENSE:=MPL-2.0
 PKG_LICENSE_FILES:=LICENSE
 PKG_CPE_ID:=cpe:/a:isc:bind
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:= \
 	https://www.mirrorservice.org/sites/ftp.isc.org/isc/bind9/$(PKG_VERSION) \
 	https://ftp.isc.org/isc/bind9/$(PKG_VERSION)
-PKG_HASH:=9c4de493bf7dfaa68b0273135369601d474175ab504ab572ffbb42a6db6ef4c8
+PKG_HASH:=27ac6513de5f8d0db34b9f241da53baa15a14b2ad21338d0cde0826eaf564f7e
 
 PKG_FIXUP:=autoreconf
 PKG_REMOVE_FILES:=aclocal.m4 libtool.m4
@@ -35,12 +35,7 @@ PKG_CONFIG_DEPENDS := \
 	CONFIG_BIND_LIBJSON \
 	CONFIG_BIND_LIBXML2
 
-ifdef CONFIG_BIND_LIBXML2
+PKG_BUILD_DEPENDS += BIND_LIBXML2:libxml2 BIND_LIBJSON:libjson-c
-  PKG_BUILD_DEPENDS += libxml2
-endif
-ifdef CONFIG_BIND_LIBJSON
-  PKG_BUILD_DEPENDS += libjson-c
-endif
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -56,15 +51,10 @@ endef
 define Package/bind-libs
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+libopenssl +zlib +libpthread +libatomic
+  DEPENDS:=+libopenssl +zlib +libpthread +libatomic +libuv \
+	+BIND_LIBXML2:libxml2 +BIND_LIBJSON:libjson-c
   TITLE:=bind shared libraries
   URL:=https://www.isc.org/software/bind
-ifdef CONFIG_BIND_LIBJSON
-  DEPENDS+= +libjson-c
-endif
-ifdef CONFIG_BIND_LIBXML2
-  DEPENDS+= +libxml2
-endif
 endef
 
 define Package/bind-server
@@ -78,7 +68,7 @@ endef
 
 define Package/bind-server-filter-aaaa
   $(call Package/bind-server)
-  DEPENDS:=+bind-server
+  DEPENDS:=bind-server
   TITLE+= filter AAAA plugin
 endef
 
@@ -93,6 +83,7 @@ define Package/bind-tools
 	DEPENDS:= \
 	+bind-check \
 	+bind-dig \
+	+bind-nslookup \
 	+bind-dnssec \
 	+bind-host \
 	+bind-rndc
@@ -123,6 +114,13 @@ define Package/bind-dig
   TITLE+= DNS excavation tool
 endef
 
+define Package/bind-nslookup
+  $(call Package/bind/Default)
+  TITLE+= nslookup utility
+  ALTERNATIVES:= \
+	  200:/usr/bin/nslookup:/usr/libexec/nslookup-bind
+endef
+
 export BUILD_CC="$(TARGET_CC)"
 
 TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
@@ -139,19 +137,20 @@ CONFIGURE_ARGS += \
 	--sysconfdir=/etc/bind
 
 ifdef CONFIG_BIND_LIBJSON
+	TARGET_CFLAGS += -DHAVE_JSON_C -UHAVE_JSON
 	CONFIGURE_ARGS += \
-		--with-libjson="$(STAGING_DIR)/usr"
+		--with-json-c=yes
 else
 	CONFIGURE_ARGS += \
-		--without-libjson
+		--with-json-c=no
 endif
 
 ifdef CONFIG_BIND_LIBXML2
 	CONFIGURE_ARGS += \
-		--with-libxml2="$(STAGING_DIR)/usr"
+		--with-libxml2=yes
 else
 	CONFIGURE_ARGS += \
-		--without-libxml2
+		--with-libxml2=no
 endif
 
 CONFIGURE_VARS += \
@@ -243,6 +242,11 @@ define Package/bind-dig/install
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dig $(1)/usr/bin/
 endef
 
+define Package/bind-nslookup/install
+	$(INSTALL_DIR) $(1)/usr/libexec
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nslookup $(1)/usr/libexec/nslookup-bind
+endef
+
 $(eval $(call BuildPackage,bind-libs))
 $(eval $(call BuildPackage,bind-server))
 $(eval $(call BuildPackage,bind-server-filter-aaaa))
@@ -253,3 +257,4 @@ $(eval $(call BuildPackage,bind-check))
 $(eval $(call BuildPackage,bind-dnssec))
 $(eval $(call BuildPackage,bind-host))
 $(eval $(call BuildPackage,bind-dig))
+$(eval $(call BuildPackage,bind-nslookup))