bind: update to 9.16.10

OpenIndiana · Dec 26, 2020 · 2f512bf · 2f512bf
1 parent 5086a45
commit 2f512bf
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 62 deletions.
diff --git a/components/network/bind/Makefile b/components/network/bind/Makefile
@@ -27,15 +27,14 @@ BUILD_BITS=		64
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		bind
-COMPONENT_VERSION=	9.16.6
-COMPONENT_REVISION=	1
+COMPONENT_VERSION=	9.16.10
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
-COMPONENT_PROJECT_URL=	http://www.isc.org/software/bind/
+COMPONENT_PROJECT_URL=	https://www.isc.org/software/bind/
 COMPONENT_ARCHIVE_HASH=	 \
-	sha256:b567b0f3b47dd03b345a4848af7f2acdd3f5cea2bd804edd85d9ef50743571cb
+	sha256:bc47fc019c6205e6a6bfb839c544a1472321df0537ba905b846a4cbffe3362b3
 COMPONENT_ARCHIVE_URL=	\
-	http://ftp.isc.org/isc/bind9/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
+	https://ftp.isc.org/isc/bind9/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 COMPONENT_LICENSE=	MPL v2.0
 COMPONENT_LICENSE_FILE=	COPYRIGHT
 
@@ -106,15 +105,16 @@ COMPONENT_TEST_TRANSFORMS += \
 $(TEST_64):	$(INSTALL_64)
 
 # Auto-generated dependencies
+REQUIRED_PACKAGES += SUNWcs
 REQUIRED_PACKAGES += database/lmdb
 REQUIRED_PACKAGES += library/json-c
 REQUIRED_PACKAGES += library/libedit
 REQUIRED_PACKAGES += library/libuv
 REQUIRED_PACKAGES += library/libxml2
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += library/zlib
+REQUIRED_PACKAGES += network/dns/bind
 REQUIRED_PACKAGES += runtime/python-35
 REQUIRED_PACKAGES += service/security/kerberos-5
-REQUIRED_PACKAGES += SUNWcs
 REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/library/security/gss
diff --git a/components/network/bind/bindc.p5m b/components/network/bind/bindc.p5m
@@ -58,27 +58,27 @@ link path=usr/sbin/nslookup target=../bin/nslookup
 link path=usr/sbin/nsupdate target=../bin/nsupdate
 
 # Libraries
-link path=usr/lib/dns/$(MACH64)/libbind9.so target=libbind9.so.1600.0.5
-link path=usr/lib/dns/$(MACH64)/libbind9.so.1600 target=libbind9.so.1600.0.5
-file path=usr/lib/dns/$(MACH64)/libbind9.so.1600.0.5
-link path=usr/lib/dns/$(MACH64)/libdns.so target=libdns.so.1605.1.0
-link path=usr/lib/dns/$(MACH64)/libdns.so.1605 target=libdns.so.1605.1.0
-file path=usr/lib/dns/$(MACH64)/libdns.so.1605.1.0
+link path=usr/lib/dns/$(MACH64)/libbind9.so target=libbind9.so.1600.0.6
+link path=usr/lib/dns/$(MACH64)/libbind9.so.1600 target=libbind9.so.1600.0.6
+file path=usr/lib/dns/$(MACH64)/libbind9.so.1600.0.6
+link path=usr/lib/dns/$(MACH64)/libdns.so target=libdns.so.1610.0.0
+link path=usr/lib/dns/$(MACH64)/libdns.so.1610 target=libdns.so.1610.0.0
+file path=usr/lib/dns/$(MACH64)/libdns.so.1610.0.0
 link path=usr/lib/dns/$(MACH64)/libirs.so target=libirs.so.1601.0.0
 link path=usr/lib/dns/$(MACH64)/libirs.so.1601 target=libirs.so.1601.0.0
 file path=usr/lib/dns/$(MACH64)/libirs.so.1601.0.0
-link path=usr/lib/dns/$(MACH64)/libisc.so target=libisc.so.1606.0.0
-link path=usr/lib/dns/$(MACH64)/libisc.so.1606 target=libisc.so.1606.0.0
-file path=usr/lib/dns/$(MACH64)/libisc.so.1606.0.0
+link path=usr/lib/dns/$(MACH64)/libisc.so target=libisc.so.1608.0.1
+link path=usr/lib/dns/$(MACH64)/libisc.so.1608 target=libisc.so.1608.0.1
+file path=usr/lib/dns/$(MACH64)/libisc.so.1608.0.1
 link path=usr/lib/dns/$(MACH64)/libisccc.so target=libisccc.so.1600.0.2
 link path=usr/lib/dns/$(MACH64)/libisccc.so.1600 target=libisccc.so.1600.0.2
 file path=usr/lib/dns/$(MACH64)/libisccc.so.1600.0.2
-link path=usr/lib/dns/$(MACH64)/libisccfg.so target=libisccfg.so.1600.0.4
-link path=usr/lib/dns/$(MACH64)/libisccfg.so.1600 target=libisccfg.so.1600.0.4
-file path=usr/lib/dns/$(MACH64)/libisccfg.so.1600.0.4
-link path=usr/lib/dns/$(MACH64)/libns.so target=libns.so.1604.0.1
-link path=usr/lib/dns/$(MACH64)/libns.so.1604 target=libns.so.1604.0.1
-file path=usr/lib/dns/$(MACH64)/libns.so.1604.0.1
+link path=usr/lib/dns/$(MACH64)/libisccfg.so target=libisccfg.so.1602.0.0
+link path=usr/lib/dns/$(MACH64)/libisccfg.so.1602 target=libisccfg.so.1602.0.0
+file path=usr/lib/dns/$(MACH64)/libisccfg.so.1602.0.0
+link path=usr/lib/dns/$(MACH64)/libns.so target=libns.so.1606.0.1
+link path=usr/lib/dns/$(MACH64)/libns.so.1606 target=libns.so.1606.0.1
+file path=usr/lib/dns/$(MACH64)/libns.so.1606.0.1
 
 # Python packages
 file path=usr/lib/python3.5/vendor-packages/isc-2.0-py3.5.egg-info

diff --git a/components/network/bind/manifests/sample-manifest.p5m b/components/network/bind/manifests/sample-manifest.p5m
@@ -159,6 +159,7 @@ file path=usr/include/isc/base64.h
 file path=usr/include/isc/bind9.h
 file path=usr/include/isc/buffer.h
 file path=usr/include/isc/bufferlist.h
+file path=usr/include/isc/cmocka.h
 file path=usr/include/isc/commandline.h
 file path=usr/include/isc/condition.h
 file path=usr/include/isc/counter.h
@@ -288,27 +289,27 @@ file path=usr/include/pk11/pk11.h
 file path=usr/include/pk11/result.h
 file path=usr/include/pk11/site.h
 file path=usr/include/pkcs11/pkcs11.h
-link path=usr/lib/dns/$(MACH64)/libbind9.so target=libbind9.so.1600.0.5
-link path=usr/lib/dns/$(MACH64)/libbind9.so.1600 target=libbind9.so.1600.0.5
-file path=usr/lib/dns/$(MACH64)/libbind9.so.1600.0.5
-link path=usr/lib/dns/$(MACH64)/libdns.so target=libdns.so.1605.1.0
-link path=usr/lib/dns/$(MACH64)/libdns.so.1605 target=libdns.so.1605.1.0
-file path=usr/lib/dns/$(MACH64)/libdns.so.1605.1.0
+link path=usr/lib/dns/$(MACH64)/libbind9.so target=libbind9.so.1600.0.6
+link path=usr/lib/dns/$(MACH64)/libbind9.so.1600 target=libbind9.so.1600.0.6
+file path=usr/lib/dns/$(MACH64)/libbind9.so.1600.0.6
+link path=usr/lib/dns/$(MACH64)/libdns.so target=libdns.so.1610.0.0
+link path=usr/lib/dns/$(MACH64)/libdns.so.1610 target=libdns.so.1610.0.0
+file path=usr/lib/dns/$(MACH64)/libdns.so.1610.0.0
 link path=usr/lib/dns/$(MACH64)/libirs.so target=libirs.so.1601.0.0
 link path=usr/lib/dns/$(MACH64)/libirs.so.1601 target=libirs.so.1601.0.0
 file path=usr/lib/dns/$(MACH64)/libirs.so.1601.0.0
-link path=usr/lib/dns/$(MACH64)/libisc.so target=libisc.so.1606.0.0
-link path=usr/lib/dns/$(MACH64)/libisc.so.1606 target=libisc.so.1606.0.0
-file path=usr/lib/dns/$(MACH64)/libisc.so.1606.0.0
+link path=usr/lib/dns/$(MACH64)/libisc.so target=libisc.so.1608.0.1
+link path=usr/lib/dns/$(MACH64)/libisc.so.1608 target=libisc.so.1608.0.1
+file path=usr/lib/dns/$(MACH64)/libisc.so.1608.0.1
 link path=usr/lib/dns/$(MACH64)/libisccc.so target=libisccc.so.1600.0.2
 link path=usr/lib/dns/$(MACH64)/libisccc.so.1600 target=libisccc.so.1600.0.2
 file path=usr/lib/dns/$(MACH64)/libisccc.so.1600.0.2
-link path=usr/lib/dns/$(MACH64)/libisccfg.so target=libisccfg.so.1600.0.4
-link path=usr/lib/dns/$(MACH64)/libisccfg.so.1600 target=libisccfg.so.1600.0.4
-file path=usr/lib/dns/$(MACH64)/libisccfg.so.1600.0.4
-link path=usr/lib/dns/$(MACH64)/libns.so target=libns.so.1604.0.1
-link path=usr/lib/dns/$(MACH64)/libns.so.1604 target=libns.so.1604.0.1
-file path=usr/lib/dns/$(MACH64)/libns.so.1604.0.1
+link path=usr/lib/dns/$(MACH64)/libisccfg.so target=libisccfg.so.1602.0.0
+link path=usr/lib/dns/$(MACH64)/libisccfg.so.1602 target=libisccfg.so.1602.0.0
+file path=usr/lib/dns/$(MACH64)/libisccfg.so.1602.0.0
+link path=usr/lib/dns/$(MACH64)/libns.so target=libns.so.1606.0.1
+link path=usr/lib/dns/$(MACH64)/libns.so.1606 target=libns.so.1606.0.1
+file path=usr/lib/dns/$(MACH64)/libns.so.1606.0.1
 file path=usr/lib/dns/$(MACH64)/named/filter-aaaa.so
 file path=usr/lib/python3.5/vendor-packages/isc-2.0-py3.5.egg-info
 file path=usr/lib/python3.5/vendor-packages/isc/__init__.py

diff --git a/components/network/bind/patches/04-remove-zrelax-transtls.patch b/components/network/bind/patches/04-remove-zrelax-transtls.patch
@@ -1,11 +1,3 @@
-Revert this Solaris-specific patch.
-
-From e87a18018741044322d6014ee9551de8f2cb05f7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
-Date: Wed, 19 Jun 2019 11:21:36 +0200
-Subject: [PATCH] Enforce usage -zrelax=transtls when GNU C Compiler is used on
- Solaris
-
 When GNU C Compiler is used on Solaris (11), the Thread Local Storage
 is completely broken.  The behaviour doesn't manifest when GNU ld is
 used.  Thus, we need to enforce usage of GNU ld when GNU C Compiler is
@@ -14,24 +6,18 @@ the compiler of choice.
 For more background for this change, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90912
 
 (cherry picked from commit d584223653e17930109f37f5203acecca4090ca6)
-
---- b/configure.ac
-+++ a/configure.ac
-@@ -355,17 +355,6 @@
- AC_PROG_CC
- AC_PROG_CC_C99
-
--#
--# Using Solaris linker with gcc on Solaris breaks Thread Local Storage
--#
--AS_CASE([$host],
+--- bind-9.16.10/configure.ac.orig	2020-12-07 09:16:53.000000000 +0000
++++ bind-9.16.10/configure.ac	2020-12-18 12:59:06.922199858 +0000
+@@ -377,12 +377,6 @@
+ # Using Solaris linker with gcc on Solaris breaks Thread Local Storage
+ #
+ AS_CASE([$host],
 -	[*-solaris*],[
 -	    AS_IF([test "$GCC" = "yes"],
 -		  [LDFLAGS="$LDFLAGS -zrelax=transtls"
 -		   AC_MSG_WARN([When using GNU C Compiler on Solaris, -zrelax=transtls linker flag is used to fix bug in Thread Local Storage])
 -		  ])
--	])
--
- #
- # CCNOOPT defaults to -O0 on gcc and disables optimization when is last
+-	],
+ 	[*-darwin*],[LDFLAGS="$LDFLAGS -Wl,-flat_namespace"])
+
  #
diff --git a/components/network/bind/patches/05-config.threads.patch b/components/network/bind/patches/05-config.threads.patch
@@ -0,0 +1,11 @@
+--- bind-9.16.10/config.threads.in.orig	2020-12-07 09:16:53.000000000 +0000
++++ bind-9.16.10/config.threads.in	2020-12-18 12:54:21.544651854 +0000
+@@ -88,7 +88,7 @@
+ 	# Search for / configure pthreads in a system-dependent fashion.
+ 	#
+ 	case "$host" in
+-		*-freebsd*)
++		*-freebsd* | *-solaris*)
+ 			# We don't want to set -lpthread as that break
+ 			# the ability to choose threads library at final
+ 			# link time and is not valid for all architectures.
diff --git a/components/network/bind/test/results-64.master b/components/network/bind/test/results-64.master
@@ -1,6 +1,9 @@
 R:cds:FAIL
+R:nsupdate:FAIL
+R:tsig:FAIL
+R:tsiggss:FAIL
 I:System test result summary:
-I:      1 FAIL
-I:     79 PASS
+I:      4 FAIL
+I:     74 PASS
 I:      3 SKIPPED
-I:     16 UNTESTED
+I:     19 UNTESTED