bind: Update to version 9.20.1

- Update from version 9.16.50 to 9.20.1
- Update of rootfile
- The use of liburcu has replaced isc_qsbr in 9.19.4 and therefore the position of
   liburcu in make.sh had to be changed.
- --enable-threads, --with-libtool, --without-python & --disable-linux-caps are no longer
   reconised configure options (it looks like not recognised for a while.
   --without-python is explicitly mentioned as being removed in version 9.15.7
   The others are not mentioned in the changelog notes.
- The lib/bind9 and lib/irs directories in the source tarball have been removed. The
   The comtents of lib/bind9 have been moved to lib/isc and lib/isccfg and the contents
   of lib/irs have been moved to dns.
- The order of the make instructions had to be changed as lib/isccfg required the results
   of lib/dns and the build failed without it. Changing the order solved the build problem.
- A large number of CVE fixes have been applied between the new and old version.
	5	9.20.0
	2	9.19.21
	3	9.19.20
	1	9.19.17
	1	9.19.14
	3	9.19.9
	5	9.19.5
	1	9.19.1
	4	9.19.0
	1	9.17.19
	1	9.17.17
	2	9.17.12
	5	9.17.4
	4	9.17.2
- Changelog is too long to include here - around 5000 lines. For details see the NEWS file
   in the source tarball.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind
index 86383fb741d0bef7bf576f2bd69bbf725b6d5f58..74d3b93e5e9868eb09af1b2f77bfa38548cdac3e 100644 (file)
--- a/config/rootfiles/common/bind
+++ b/config/rootfiles/common/bind
@@ -3,10 +3,6 @@ usr/bin/dig
 usr/bin/host
 usr/bin/nslookup
 usr/bin/nsupdate
-#usr/include/bind9
-#usr/include/bind9/check.h
-#usr/include/bind9/getaddresses.h
-#usr/include/bind9/version.h
 #usr/include/dns
 #usr/include/dns/acl.h
 #usr/include/dns/adb.h
@@ -22,7 +18,6 @@ usr/bin/nsupdate
 #usr/include/dns/compress.h
 #usr/include/dns/db.h
 #usr/include/dns/dbiterator.h
-#usr/include/dns/dbtable.h
 #usr/include/dns/diff.h
 #usr/include/dns/dispatch.h
 #usr/include/dns/dlz.h
@@ -34,12 +29,10 @@ usr/bin/nsupdate
 #usr/include/dns/ds.h
 #usr/include/dns/dsdigest.h
 #usr/include/dns/dyndb.h
-#usr/include/dns/ecdb.h
 #usr/include/dns/ecs.h
 #usr/include/dns/edns.h
 #usr/include/dns/enumclass.h
 #usr/include/dns/enumtype.h
-#usr/include/dns/events.h
 #usr/include/dns/fixedname.h
 #usr/include/dns/forward.h
 #usr/include/dns/geoip.h
@@ -50,17 +43,16 @@ usr/bin/nsupdate
 #usr/include/dns/keydata.h
 #usr/include/dns/keyflags.h
 #usr/include/dns/keymgr.h
+#usr/include/dns/keystore.h
 #usr/include/dns/keytable.h
 #usr/include/dns/keyvalues.h
-#usr/include/dns/lib.h
 #usr/include/dns/librpz.h
-#usr/include/dns/lmdb.h
 #usr/include/dns/log.h
-#usr/include/dns/lookup.h
 #usr/include/dns/master.h
 #usr/include/dns/masterdump.h
 #usr/include/dns/message.h
 #usr/include/dns/name.h
+#usr/include/dns/nametree.h
 #usr/include/dns/ncache.h
 #usr/include/dns/nsec.h
 #usr/include/dns/nsec3.h
@@ -68,8 +60,8 @@ usr/bin/nsupdate
 #usr/include/dns/opcode.h
 #usr/include/dns/order.h
 #usr/include/dns/peer.h
-#usr/include/dns/portlist.h
 #usr/include/dns/private.h
+#usr/include/dns/qp.h
 #usr/include/dns/rbt.h
 #usr/include/dns/rcode.h
 #usr/include/dns/rdata.h
@@ -80,6 +72,7 @@ usr/bin/nsupdate
 #usr/include/dns/rdataslab.h
 #usr/include/dns/rdatastruct.h
 #usr/include/dns/rdatatype.h
+#usr/include/dns/remote.h
 #usr/include/dns/request.h
 #usr/include/dns/resolver.h
 #usr/include/dns/result.h
@@ -87,24 +80,21 @@ usr/bin/nsupdate
 #usr/include/dns/rpz.h
 #usr/include/dns/rriterator.h
 #usr/include/dns/rrl.h
-#usr/include/dns/sdb.h
 #usr/include/dns/sdlz.h
 #usr/include/dns/secalg.h
 #usr/include/dns/secproto.h
 #usr/include/dns/soa.h
 #usr/include/dns/ssu.h
 #usr/include/dns/stats.h
-#usr/include/dns/tcpmsg.h
 #usr/include/dns/time.h
-#usr/include/dns/timer.h
 #usr/include/dns/tkey.h
-#usr/include/dns/tsec.h
+#usr/include/dns/trace.h
+#usr/include/dns/transport.h
 #usr/include/dns/tsig.h
 #usr/include/dns/ttl.h
 #usr/include/dns/types.h
 #usr/include/dns/update.h
 #usr/include/dns/validator.h
-#usr/include/dns/version.h
 #usr/include/dns/view.h
 #usr/include/dns/xfrin.h
 #usr/include/dns/zone.h
@@ -114,60 +104,50 @@ usr/bin/nsupdate
 #usr/include/dst
 #usr/include/dst/dst.h
 #usr/include/dst/gssapi.h
-#usr/include/dst/result.h
 #usr/include/irs
-#usr/include/irs/context.h
-#usr/include/irs/dnsconf.h
-#usr/include/irs/netdb.h
-#usr/include/irs/platform.h
 #usr/include/irs/resconf.h
-#usr/include/irs/types.h
-#usr/include/irs/version.h
 #usr/include/isc
-#usr/include/isc/aes.h
-#usr/include/isc/align.h
-#usr/include/isc/app.h
+#usr/include/isc/ascii.h
 #usr/include/isc/assertions.h
-#usr/include/isc/astack.h
+#usr/include/isc/async.h
 #usr/include/isc/atomic.h
+#usr/include/isc/attributes.h
 #usr/include/isc/backtrace.h
 #usr/include/isc/barrier.h
 #usr/include/isc/base32.h
 #usr/include/isc/base64.h
-#usr/include/isc/bind9.h
 #usr/include/isc/buffer.h
-#usr/include/isc/bufferlist.h
-#usr/include/isc/cmocka.h
 #usr/include/isc/commandline.h
 #usr/include/isc/condition.h
 #usr/include/isc/counter.h
 #usr/include/isc/crc64.h
-#usr/include/isc/deprecated.h
 #usr/include/isc/dir.h
+#usr/include/isc/dnsstream.h
 #usr/include/isc/endian.h
+#usr/include/isc/entropy.h
 #usr/include/isc/errno.h
 #usr/include/isc/error.h
-#usr/include/isc/event.h
-#usr/include/isc/eventclass.h
 #usr/include/isc/file.h
+#usr/include/isc/fips.h
 #usr/include/isc/formatcheck.h
-#usr/include/isc/fsaccess.h
 #usr/include/isc/fuzz.h
+#usr/include/isc/getaddresses.h
 #usr/include/isc/hash.h
+#usr/include/isc/hashmap.h
 #usr/include/isc/heap.h
 #usr/include/isc/hex.h
+#usr/include/isc/histo.h
 #usr/include/isc/hmac.h
 #usr/include/isc/ht.h
 #usr/include/isc/httpd.h
 #usr/include/isc/interfaceiter.h
 #usr/include/isc/iterated_hash.h
+#usr/include/isc/job.h
 #usr/include/isc/lang.h
 #usr/include/isc/lex.h
-#usr/include/isc/lfsr.h
-#usr/include/isc/lib.h
-#usr/include/isc/likely.h
 #usr/include/isc/list.h
 #usr/include/isc/log.h
+#usr/include/isc/loop.h
 #usr/include/isc/magic.h
 #usr/include/isc/managers.h
 #usr/include/isc/md.h
@@ -177,18 +157,17 @@ usr/bin/nsupdate
 #usr/include/isc/mutexblock.h
 #usr/include/isc/net.h
 #usr/include/isc/netaddr.h
-#usr/include/isc/netdb.h
 #usr/include/isc/netmgr.h
 #usr/include/isc/netscope.h
 #usr/include/isc/nonce.h
-#usr/include/isc/offset.h
 #usr/include/isc/once.h
 #usr/include/isc/os.h
+#usr/include/isc/overflow.h
 #usr/include/isc/parseint.h
-#usr/include/isc/platform.h
-#usr/include/isc/pool.h
+#usr/include/isc/pause.h
 #usr/include/isc/portset.h
-#usr/include/isc/print.h
+#usr/include/isc/proxy2.h
+#usr/include/isc/queue.h
 #usr/include/isc/quota.h
 #usr/include/isc/radix.h
 #usr/include/isc/random.h
@@ -196,62 +175,58 @@ usr/bin/nsupdate
 #usr/include/isc/refcount.h
 #usr/include/isc/regex.h
 #usr/include/isc/region.h
-#usr/include/isc/resource.h
 #usr/include/isc/result.h
-#usr/include/isc/resultclass.h
 #usr/include/isc/rwlock.h
 #usr/include/isc/safe.h
 #usr/include/isc/serial.h
+#usr/include/isc/signal.h
 #usr/include/isc/siphash.h
 #usr/include/isc/sockaddr.h
-#usr/include/isc/socket.h
-#usr/include/isc/stat.h
+#usr/include/isc/spinlock.h
 #usr/include/isc/stats.h
-#usr/include/isc/stdatomic.h
 #usr/include/isc/stdio.h
 #usr/include/isc/stdtime.h
 #usr/include/isc/strerr.h
 #usr/include/isc/string.h
 #usr/include/isc/symtab.h
 #usr/include/isc/syslog.h
-#usr/include/isc/task.h
-#usr/include/isc/taskpool.h
 #usr/include/isc/thread.h
+#usr/include/isc/tid.h
 #usr/include/isc/time.h
 #usr/include/isc/timer.h
+#usr/include/isc/tls.h
 #usr/include/isc/tm.h
 #usr/include/isc/types.h
+#usr/include/isc/urcu.h
 #usr/include/isc/url.h
 #usr/include/isc/utf8.h
 #usr/include/isc/util.h
-#usr/include/isc/version.h
+#usr/include/isc/uv.h
+#usr/include/isc/work.h
+#usr/include/isc/xml.h
 #usr/include/isccc
 #usr/include/isccc/alist.h
 #usr/include/isccc/base64.h
 #usr/include/isccc/cc.h
 #usr/include/isccc/ccmsg.h
-#usr/include/isccc/events.h
-#usr/include/isccc/result.h
 #usr/include/isccc/sexpr.h
 #usr/include/isccc/symtab.h
 #usr/include/isccc/symtype.h
 #usr/include/isccc/types.h
 #usr/include/isccc/util.h
-#usr/include/isccc/version.h
 #usr/include/isccfg
 #usr/include/isccfg/aclconf.h
 #usr/include/isccfg/cfg.h
-#usr/include/isccfg/dnsconf.h
+#usr/include/isccfg/check.h
+#usr/include/isccfg/duration.h
 #usr/include/isccfg/grammar.h
 #usr/include/isccfg/kaspconf.h
 #usr/include/isccfg/log.h
 #usr/include/isccfg/namedconf.h
-#usr/include/isccfg/version.h
 #usr/include/ns
 #usr/include/ns/client.h
 #usr/include/ns/hooks.h
 #usr/include/ns/interfacemgr.h
-#usr/include/ns/lib.h
 #usr/include/ns/listenlist.h
 #usr/include/ns/log.h
 #usr/include/ns/notify.h
@@ -261,34 +236,19 @@ usr/bin/nsupdate
 #usr/include/ns/stats.h
 #usr/include/ns/types.h
 #usr/include/ns/update.h
-#usr/include/ns/version.h
 #usr/include/ns/xfrout.h
-#usr/include/pk11
-#usr/include/pk11/constants.h
-#usr/include/pk11/internal.h
-#usr/include/pk11/pk11.h
-#usr/include/pk11/result.h
-#usr/include/pk11/site.h
-#usr/include/pkcs11
-#usr/include/pkcs11/pkcs11.h
-usr/lib/libbind9-9.16.50.so
-#usr/lib/libbind9.la
-#usr/lib/libbind9.so
-usr/lib/libdns-9.16.50.so
+usr/lib/libdns-9.20.1.so
 #usr/lib/libdns.la
 #usr/lib/libdns.so
-usr/lib/libirs-9.16.50.so
-#usr/lib/libirs.la
-#usr/lib/libirs.so
-usr/lib/libisc-9.16.50.so
+usr/lib/libisc-9.20.1.so
 #usr/lib/libisc.la
 #usr/lib/libisc.so
-usr/lib/libisccc-9.16.50.so
+usr/lib/libisccc-9.20.1.so
 #usr/lib/libisccc.la
 #usr/lib/libisccc.so
-usr/lib/libisccfg-9.16.50.so
+usr/lib/libisccfg-9.20.1.so
 #usr/lib/libisccfg.la
 #usr/lib/libisccfg.so
-usr/lib/libns-9.16.50.so
+usr/lib/libns-9.20.1.so
 #usr/lib/libns.la
 #usr/lib/libns.so

diff --git a/lfs/bind b/lfs/bind
index a79020f032f35ea4496697c3e7b99c965b668af2..5833b9005992ffbbd1bf417c8973d4d66717c909 100644 (file)
--- a/lfs/bind
+++ b/lfs/bind
@@ -25,7 +25,7 @@
 
 include Config
 
-VER        = 9.16.50
+VER        = 9.20.1
 
 THISAPP    = bind-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 0464d1e246d0a5c39e20faf733b7f4ee21d192cc0ccce5bba2a22ae4303c82005ccfb319fe2da51872c7258852a747984d7327c70dec08414ab2d194c412199b
+$(DL_FILE)_BLAKE2 = 0607a2753bcda828cff0f01a7929c3192286050813243a0733d4cf29313c9d9532285d049864b67f3ce352b71cbb878bc22785a73fe186bf244ca807934fefdf
 
 install : $(TARGET)
 
@@ -77,31 +77,24 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && STD_CDEFINES="$(CPPFLAGS)" \
                ./configure \
                        --prefix=/usr \
-                       --enable-threads \
-                       --with-libtool \
-                       --without-python \
-                       --disable-linux-caps \
-                       --disable-static
+                       --disable-static \
+                       --disable-doh
 
        # Build required libraries
        cd $(DIR_APP) && make -C lib/isc $(MAKETUNING)
-       cd $(DIR_APP) && make -C lib/isccc $(MAKETUNING)
        cd $(DIR_APP) && make -C lib/dns $(MAKETUNING)
        cd $(DIR_APP) && make -C lib/ns $(MAKETUNING)
+       cd $(DIR_APP) && make -C lib/isccc $(MAKETUNING)
        cd $(DIR_APP) && make -C lib/isccfg $(MAKETUNING)
-       cd $(DIR_APP) && make -C lib/bind9 $(MAKETUNING)
-       cd $(DIR_APP) && make -C lib/irs $(MAKETUNING)
        cd $(DIR_APP) && make -C bin/dig $(MAKETUNING)
        cd $(DIR_APP) && make -C bin/nsupdate $(MAKETUNING)
 
        # Install utility programs
        cd $(DIR_APP) && make -C lib/isc install
-       cd $(DIR_APP) && make -C lib/isccc install
        cd $(DIR_APP) && make -C lib/dns install
        cd $(DIR_APP) && make -C lib/ns install
+       cd $(DIR_APP) && make -C lib/isccc install
        cd $(DIR_APP) && make -C lib/isccfg install
-       cd $(DIR_APP) && make -C lib/bind9 install
-       cd $(DIR_APP) && make -C lib/irs install
        cd $(DIR_APP) && make -C bin/dig install
        cd $(DIR_APP) && make -C bin/nsupdate install
 

diff --git a/make.sh b/make.sh
index dec7b3a457fbb7f57c291518eb9a6fb1f847233a..a0ea4a99d2a8acbff6fbd1baa029cb3d56c60ab9 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1547,6 +1547,7 @@ build_system() {
        lfsmake2 unbound
        lfsmake2 gnutls
        lfsmake2 libuv
+       lfsmake2 liburcu
        lfsmake2 bind
        lfsmake2 dhcp
        lfsmake2 dhcpcd
@@ -1698,7 +1699,6 @@ build_system() {
        lfsmake2 dosfstools
        lfsmake2 exfatprogs
        lfsmake2 reiserfsprogs
-       lfsmake2 liburcu
        lfsmake2 xfsprogs
        lfsmake2 sysfsutils
        lfsmake2 fuse