~olbohlen/oi-userland.git

parent: 0ad2124f | patch | commit | ignore whitespace

fritzkink

2023-02-26 716456fbeb7a6ade74366dd95e99f07c6e5cad07

bind - update to version 9.18.12

4 files deleted

1 files added

6 files modified

1 files renamed

	components/network/bind/Makefile	41 ●●●●● patch \| view \| raw \| blame \| history
	components/network/bind/bind.p5m	99 ●●●●● patch \| view \| raw \| blame \| history
	components/network/bind/bindc.p5m	53 ●●●●● patch \| view \| raw \| blame \| history
	components/network/bind/manifests/sample-manifest.p5m	134 ●●●●● patch \| view \| raw \| blame \| history
	components/network/bind/patches/01-remove-zrelax-transtls.patch	31 ●●●●● patch \| view \| raw \| blame \| history
	components/network/bind/patches/02-man-named.patch	18 ●●●●● patch \| view \| raw \| blame \| history
	components/network/bind/patches/02-python-vendor-packages.patch	36 ●●●●● patch \| view \| raw \| blame \| history
	components/network/bind/patches/03-use-cc-for-linking.patch	22 ●●●●● patch \| view \| raw \| blame \| history
	components/network/bind/patches/04-remove-zrelax-transtls.patch	23 ●●●●● patch \| view \| raw \| blame \| history
	components/network/bind/patches/05-config.threads.patch	11 ●●●●● patch \| view \| raw \| blame \| history
	components/network/bind/pkg5	3 ●●●●● patch \| view \| raw \| blame \| history
	components/network/bind/test/results-all.master	128 ●●●●● patch \| view \| raw \| blame \| history

 components/network/bind/Makefile

@@ -21,19 +21,24 @@
# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2020, Michal Nowak
# Copyright (c) 2022, Niklas Poslovski
# Copyright (c) 2023, Friedrich Kink
#

USE_OPENSSL11= yes
include ../../../make-rules/shared-macros.mk

COMPONENT_NAME=        bind
COMPONENT_VERSION=    9.16.38
COMPONENT_VERSION=    9.18.12
COMPONENT_SUMMARY=    BIND DNS name server and configuration tools.
COMPONENT_DESCRIPTION=    BIND is open source software that implements the Domain Name System \
                        (DNS) protocols for the Internet.  This package contains the DNS \
                        server 'named' and tools used to setup and validate configuration.
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.xz
COMPONENT_PROJECT_URL=    https://www.isc.org/software/bind/
COMPONENT_ARCHIVE_HASH=    sha256:8df44c9d9a84a28ab8b49d55f3c33b624b90ef8f6a8b9ee6a4c33cc17c14c50f
COMPONENT_ARCHIVE_HASH=    sha256:47766bb7b063aabbad054386b190aa7f6c14524427afd427c30ec426512027e7
COMPONENT_ARCHIVE_URL=    https://ftp.isc.org/isc/bind9/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_FMRI=            network/dns/$(COMPONENT_NAME)
COMPONENT_FMRI=        network/dns/$(COMPONENT_NAME)
COMPONENT_CLASSIFICATION=    Applications/Internet
COMPONENT_LICENSE=    MPL v2.0
COMPONENT_LICENSE_FILE=    COPYRIGHT
@@ -59,21 +64,17 @@
CONFIGURE_LIBDIR.64= $(CONFIGURE_PREFIX)/lib/dns/$(MACH64)

CONFIGURE_OPTIONS += --disable-static
CONFIGURE_OPTIONS += --with-libtool
CONFIGURE_OPTIONS += --sysconfdir=/etc
CONFIGURE_OPTIONS += --localstatedir=/var
CONFIGURE_OPTIONS += --with-openssl=/usr
CONFIGURE_OPTIONS += --enable-devpoll=yes
CONFIGURE_OPTIONS += --enable-fixed-rrset
CONFIGURE_OPTIONS += --with-pkcs11=/usr/lib/$(MACH64)/libpkcs11.so
CONFIGURE_OPTIONS += --enable-full-report
CONFIGURE_OPTIONS += --with-gssapi
CONFIGURE_OPTIONS += --with-libidn2
CONFIGURE_OPTIONS += --with-libxml2
CONFIGURE_OPTIONS += --with-python-install-dir=$(PYTHON_VENDOR_PACKAGES.32)
CONFIGURE_OPTIONS += --with-json-c

CONFIGURE_ENV += PYTHON=$(PYTHON)

COMPONENT_BUILD_ENV += PYTHON_VENDOR_DIR=$(PYTHON_VENDOR_PACKAGES)
COMPONENT_INSTALL_ENV += PYTHON_VENDOR_DIR=$(PYTHON_VENDOR_PACKAGES)
CONFIGURE_OPTIONS += --disable-linux-caps

# Install.
#
@@ -94,24 +95,26 @@
COMPONENT_TEST_TARGETS= test
COMPONENT_TEST_TRANSFORMS += \
    ' -n ' \
    ' -e "/^R:.*:FAIL/p"' \
    ' -e "/^I:System test result summary/p"' \
    ' -e "/^I:.* PASS$$/p"' \
    ' -e "/^I:.* FAIL$$/p"' \
    ' -e "/^I:.* SKIPPED$$/p"' \
    ' -e "/^I:.* UNTESTED$$/p"'
    ' -e "/TOTAL:/p"' \
    ' -e "/PASS:/p"' \
    ' -e "/SKIP:/p"' \
    ' -e "/XFAIL:/p"' \
    ' -e "/FAIL:/p"' \
    ' -e "/XPASS:/p"' \
    ' -e "/ERROR:/p"'

# Auto-generated dependencies
PYTHON_REQUIRED_PACKAGES += runtime/python
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += database/lmdb
REQUIRED_PACKAGES += library/json-c
REQUIRED_PACKAGES += library/libedit
REQUIRED_PACKAGES += library/libidn2
REQUIRED_PACKAGES += library/libuv
REQUIRED_PACKAGES += library/libxml2
REQUIRED_PACKAGES += library/nghttp2
REQUIRED_PACKAGES += library/security/openssl-11
REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += service/security/kerberos-5
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/security/gss

 components/network/bind/bind.p5m

@@ -20,20 +20,17 @@
#
# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2020, Michal Nowak
# Copyright (c) 2023, Friedrich Kink
#

<transform file path=usr/share/doc/bind/html/(.+)$ -> \
    set action.hash doc/arm/%<\1> >

set name=pkg.fmri \
    value=pkg:/service/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(COMPONENT_VERSION)
set name=pkg.description \
    value="BIND is open source software that implements the Domain Name System (DNS) protocols for the Internet.  This package contains the DNS server 'named' and tools used to setup and validate configuration."
set name=pkg.summary \
    value="BIND DNS name server and configuration tools."
set name=info.classification \
    value="org.opensolaris.category.2008:System/Services"
set name=pkg.fmri value=pkg:/service/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=pkg.description value="$(COMPONENT_DESCRIPTION)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
@@ -50,51 +47,67 @@
file Solaris/migration.txt path=usr/share/doc/bind/migration.txt

# Libs
file path=usr/lib/dns/$(MACH64)/named/filter-aaaa.so
file path=usr/lib/dns/$(MACH64)/bind/filter-aaaa.so
file path=usr/lib/dns/$(MACH64)/bind/filter-a.so

# Tools
file path=usr/bin/dnssec-cds
file path=usr/bin/dnssec-dsfromkey
file path=usr/bin/dnssec-importkey
file path=usr/bin/dnssec-keyfromlabel
file path=usr/bin/dnssec-keygen
file path=usr/bin/dnssec-revoke
file path=usr/bin/dnssec-settime
file path=usr/bin/dnssec-signzone
file path=usr/bin/dnssec-verify
file path=usr/bin/named-checkconf
file path=usr/bin/named-checkzone
hardlink path=usr/bin/named-compilezone target=named-checkzone
file path=usr/bin/named-journalprint
file path=usr/bin/named-nzd2nzf
file path=usr/bin/named-rrchecker
file path=usr/bin/nsec3hash
file path=usr/sbin/ddns-confgen
link path=usr/sbin/tsig-keygen target=ddns-confgen
file path=usr/sbin/dnssec-cds
file path=usr/sbin/dnssec-checkds
file path=usr/sbin/dnssec-coverage
file path=usr/sbin/dnssec-dsfromkey
file path=usr/sbin/dnssec-importkey
file path=usr/sbin/dnssec-keyfromlabel
file path=usr/sbin/dnssec-keygen
file path=usr/sbin/dnssec-revoke
file path=usr/sbin/dnssec-settime
file path=usr/sbin/dnssec-signzone
file path=usr/sbin/dnssec-verify
hardlink path=usr/sbin/tsig-keygen target=ddns-confgen
file path=usr/sbin/named
file path=usr/sbin/named-checkconf
file path=usr/sbin/named-checkzone
link path=usr/sbin/named-compilezone target=named-checkzone
file path=usr/sbin/named-journalprint
file path=usr/sbin/named-nzd2nzf
link path=usr/sbin/named-rrchecker target=../bin/named-rrchecker

# Compatibiliy symlinks
link path=usr/sbin/dnssec-cds target=../bin/dnssec-cds
link path=usr/sbin/dnssec-dsfromkey target=../bin/dnssec-dsfromkey
link path=usr/sbin/dnssec-importkey target=../bin/dnssec-importkey
link path=usr/sbin/dnssec-keyfromlabel target=../bin/dnssec-keyfromlabel
link path=usr/sbin/dnssec-keygen target=../bin/dnssec-keygen
link path=usr/sbin/dnssec-revoke target=../bin/dnssec-revoke
link path=usr/sbin/dnssec-settime target=../bin/dnssec-settime
link path=usr/sbin/dnssec-signzone target=../bin/dnssec-signzone
link path=usr/sbin/dnssec-verify target=../bin/dnssec-verify
link path=usr/sbin/named-checkconf target=../bin/named-checkconf
link path=usr/sbin/named-checkzone target=../bin/named-checkzone
link path=usr/sbin/named-compilezone target=../bin/named-checkzone
link path=usr/sbin/named-journalprint target=../bin/named-journalprint
link path=usr/sbin/named-nzd2nzf target=../bin/named-nzd2nzf

# Man
file path=usr/share/man/man1/dnssec-cds.1
file path=usr/share/man/man1/dnssec-dsfromkey.1
file path=usr/share/man/man1/dnssec-importkey.1
file path=usr/share/man/man1/dnssec-keyfromlabel.1
file path=usr/share/man/man1/dnssec-keygen.1
file path=usr/share/man/man1/dnssec-revoke.1
file path=usr/share/man/man1/dnssec-settime.1
file path=usr/share/man/man1/dnssec-signzone.1
file path=usr/share/man/man1/dnssec-verify.1
file path=usr/share/man/man1/named-checkconf.1
file path=usr/share/man/man1/named-checkzone.1
file path=usr/share/man/man1/named-compilezone.1
file path=usr/share/man/man1/named-journalprint.1
file path=usr/share/man/man1/named-nzd2nzf.1
file path=usr/share/man/man1/named-rrchecker.1
file path=usr/share/man/man1/nsec3hash.1
file path=usr/share/man/man5/named.conf.5
file path=usr/share/man/man8/ddns-confgen.8
file path=usr/share/man/man8/dnssec-cds.8
file path=usr/share/man/man8/dnssec-checkds.8
file path=usr/share/man/man8/dnssec-coverage.8
file path=usr/share/man/man8/dnssec-dsfromkey.8
file path=usr/share/man/man8/dnssec-importkey.8
file path=usr/share/man/man8/dnssec-keyfromlabel.8
file path=usr/share/man/man8/dnssec-keygen.8
file path=usr/share/man/man8/dnssec-revoke.8
file path=usr/share/man/man8/dnssec-settime.8
file path=usr/share/man/man8/dnssec-signzone.8
file path=usr/share/man/man8/dnssec-verify.8
file path=usr/share/man/man8/filter-a.8
file path=usr/share/man/man8/filter-aaaa.8
file path=usr/share/man/man8/named-checkconf.8
file path=usr/share/man/man8/named-checkzone.8
file path=usr/share/man/man8/named-compilezone.8
file path=usr/share/man/man8/named-journalprint.8
file path=usr/share/man/man8/named.8
file path=usr/share/man/man8/tsig-keygen.8


 components/network/bind/bindc.p5m

@@ -21,6 +21,7 @@
# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2020, Michal Nowak
# Copyright (c) 2022, Niklas Poslovski
# Copyright (c) 2023, Friedrich Kink
#

set name=pkg.fmri \
@@ -57,52 +58,30 @@
link path=usr/sbin/nsupdate target=../bin/nsupdate

# Libraries
file path=usr/lib/dns/$(MACH64)/libbind9-$(COMPONENT_VERSION).so
link path=usr/lib/dns/$(MACH64)/libbind9.so \
    target=libbind9-$(COMPONENT_VERSION).so
file path=usr/lib/dns/$(MACH64)/libdns-$(COMPONENT_VERSION).so
link path=usr/lib/dns/$(MACH64)/libdns.so target=libdns-$(COMPONENT_VERSION).so
file path=usr/lib/dns/$(MACH64)/libirs-$(COMPONENT_VERSION).so
link path=usr/lib/dns/$(MACH64)/libirs.so target=libirs-$(COMPONENT_VERSION).so
file path=usr/lib/dns/$(MACH64)/libisc-$(COMPONENT_VERSION).so
link path=usr/lib/dns/$(MACH64)/libisc.so target=libisc-$(COMPONENT_VERSION).so
file path=usr/lib/dns/$(MACH64)/libisccc-$(COMPONENT_VERSION).so
link path=usr/lib/dns/$(MACH64)/libisccc.so \
    target=libisccc-$(COMPONENT_VERSION).so
file path=usr/lib/dns/$(MACH64)/libisccfg-$(COMPONENT_VERSION).so
file path=usr/lib/dns/$(MACH64)/libbind9-$(HUMAN_VERSION).so
link path=usr/lib/dns/$(MACH64)/libbind9.so target=libbind9-$(HUMAN_VERSION).so
file path=usr/lib/dns/$(MACH64)/libdns-$(HUMAN_VERSION).so
link path=usr/lib/dns/$(MACH64)/libdns.so target=libdns-$(HUMAN_VERSION).so
file path=usr/lib/dns/$(MACH64)/libirs-$(HUMAN_VERSION).so
link path=usr/lib/dns/$(MACH64)/libirs.so target=libirs-$(HUMAN_VERSION).so
file path=usr/lib/dns/$(MACH64)/libisc-$(HUMAN_VERSION).so
link path=usr/lib/dns/$(MACH64)/libisc.so target=libisc-$(HUMAN_VERSION).so
file path=usr/lib/dns/$(MACH64)/libisccc-$(HUMAN_VERSION).so
link path=usr/lib/dns/$(MACH64)/libisccc.so target=libisccc-$(HUMAN_VERSION).so
file path=usr/lib/dns/$(MACH64)/libisccfg-$(HUMAN_VERSION).so
link path=usr/lib/dns/$(MACH64)/libisccfg.so \
    target=libisccfg-$(COMPONENT_VERSION).so
file path=usr/lib/dns/$(MACH64)/libns-$(COMPONENT_VERSION).so
link path=usr/lib/dns/$(MACH64)/libns.so target=libns-$(COMPONENT_VERSION).so

# Python packages
file path=usr/lib/python$(PYVER)/vendor-packages/isc-2.0-py$(PYVER).egg-info/PKG-INFO
file path=usr/lib/python$(PYVER)/vendor-packages/isc-2.0-py$(PYVER).egg-info/SOURCES.txt
file path=usr/lib/python$(PYVER)/vendor-packages/isc-2.0-py$(PYVER).egg-info/dependency_links.txt
file path=usr/lib/python$(PYVER)/vendor-packages/isc-2.0-py$(PYVER).egg-info/top_level.txt
file path=usr/lib/python$(PYVER)/vendor-packages/isc/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/isc/checkds.py
file path=usr/lib/python$(PYVER)/vendor-packages/isc/coverage.py
file path=usr/lib/python$(PYVER)/vendor-packages/isc/dnskey.py
file path=usr/lib/python$(PYVER)/vendor-packages/isc/eventlist.py
file path=usr/lib/python$(PYVER)/vendor-packages/isc/keydict.py
file path=usr/lib/python$(PYVER)/vendor-packages/isc/keyevent.py
file path=usr/lib/python$(PYVER)/vendor-packages/isc/keymgr.py
file path=usr/lib/python$(PYVER)/vendor-packages/isc/keyseries.py
file path=usr/lib/python$(PYVER)/vendor-packages/isc/keyzone.py
file path=usr/lib/python$(PYVER)/vendor-packages/isc/parsetab.py
file path=usr/lib/python$(PYVER)/vendor-packages/isc/policy.py
file path=usr/lib/python$(PYVER)/vendor-packages/isc/rndc.py
file path=usr/lib/python$(PYVER)/vendor-packages/isc/utils.py
    target=libisccfg-$(HUMAN_VERSION).so
file path=usr/lib/dns/$(MACH64)/libns-$(HUMAN_VERSION).so
link path=usr/lib/dns/$(MACH64)/libns.so target=libns-$(HUMAN_VERSION).so

# Man
file path=usr/share/man/man1/arpaname.1
file path=usr/share/man/man1/delv.1
file path=usr/share/man/man1/dig.1
file path=usr/share/man/man1/host.1
file path=usr/share/man/man1/mdig.1
file path=usr/share/man/man1/nslookup.1
file path=usr/share/man/man1/nsupdate.1
file path=usr/share/man/man8/named-nzd2nzf.8
file path=usr/share/man/man8/rndc.8
file path=usr/share/man/man8/rndc-confgen.8
file path=usr/share/man/man5/rndc.conf.5

 components/network/bind/manifests/sample-manifest.p5m

@@ -10,7 +10,7 @@
#

#
# Copyright 2022 <contributor>
# Copyright 2023 <contributor>
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -27,14 +27,28 @@
file path=usr/bin/arpaname
file path=usr/bin/delv
file path=usr/bin/dig
file path=usr/bin/dnssec-cds
file path=usr/bin/dnssec-dsfromkey
file path=usr/bin/dnssec-importkey
file path=usr/bin/dnssec-keyfromlabel
file path=usr/bin/dnssec-keygen
file path=usr/bin/dnssec-revoke
file path=usr/bin/dnssec-settime
file path=usr/bin/dnssec-signzone
file path=usr/bin/dnssec-verify
file path=usr/bin/host
file path=usr/bin/mdig
file path=usr/bin/named-checkconf
file path=usr/bin/named-checkzone
hardlink path=usr/bin/named-compilezone target=named-checkzone
file path=usr/bin/named-journalprint
file path=usr/bin/named-nzd2nzf
file path=usr/bin/named-rrchecker
file path=usr/bin/nsec3hash
file path=usr/bin/nslookup
file path=usr/bin/nsupdate
file path=usr/include/bind9/check.h
file path=usr/include/bind9/getaddresses.h
file path=usr/include/bind9/version.h
file path=usr/include/dns/acl.h
file path=usr/include/dns/adb.h
file path=usr/include/dns/badcache.h
@@ -49,7 +63,6 @@
file path=usr/include/dns/compress.h
file path=usr/include/dns/db.h
file path=usr/include/dns/dbiterator.h
file path=usr/include/dns/dbtable.h
file path=usr/include/dns/diff.h
file path=usr/include/dns/dispatch.h
file path=usr/include/dns/dlz.h
@@ -61,7 +74,6 @@
file path=usr/include/dns/ds.h
file path=usr/include/dns/dsdigest.h
file path=usr/include/dns/dyndb.h
file path=usr/include/dns/ecdb.h
file path=usr/include/dns/ecs.h
file path=usr/include/dns/edns.h
file path=usr/include/dns/enumclass.h
@@ -79,9 +91,7 @@
file path=usr/include/dns/keymgr.h
file path=usr/include/dns/keytable.h
file path=usr/include/dns/keyvalues.h
file path=usr/include/dns/lib.h
file path=usr/include/dns/librpz.h
file path=usr/include/dns/lmdb.h
file path=usr/include/dns/log.h
file path=usr/include/dns/lookup.h
file path=usr/include/dns/master.h
@@ -95,7 +105,6 @@
file path=usr/include/dns/opcode.h
file path=usr/include/dns/order.h
file path=usr/include/dns/peer.h
file path=usr/include/dns/portlist.h
file path=usr/include/dns/private.h
file path=usr/include/dns/rbt.h
file path=usr/include/dns/rcode.h
@@ -121,17 +130,15 @@
file path=usr/include/dns/soa.h
file path=usr/include/dns/ssu.h
file path=usr/include/dns/stats.h
file path=usr/include/dns/tcpmsg.h
file path=usr/include/dns/time.h
file path=usr/include/dns/timer.h
file path=usr/include/dns/tkey.h
file path=usr/include/dns/transport.h
file path=usr/include/dns/tsec.h
file path=usr/include/dns/tsig.h
file path=usr/include/dns/ttl.h
file path=usr/include/dns/types.h
file path=usr/include/dns/update.h
file path=usr/include/dns/validator.h
file path=usr/include/dns/version.h
file path=usr/include/dns/view.h
file path=usr/include/dns/xfrin.h
file path=usr/include/dns/zone.h
@@ -140,27 +147,20 @@
file path=usr/include/dns/zt.h
file path=usr/include/dst/dst.h
file path=usr/include/dst/gssapi.h
file path=usr/include/dst/result.h
file path=usr/include/irs/context.h
file path=usr/include/irs/dnsconf.h
file path=usr/include/irs/netdb.h
file path=usr/include/irs/platform.h
file path=usr/include/irs/resconf.h
file path=usr/include/irs/types.h
file path=usr/include/irs/version.h
file path=usr/include/isc/aes.h
file path=usr/include/isc/align.h
file path=usr/include/isc/app.h
file path=usr/include/isc/assertions.h
file path=usr/include/isc/astack.h
file path=usr/include/isc/atomic.h
file path=usr/include/isc/attributes.h
file path=usr/include/isc/backtrace.h
file path=usr/include/isc/barrier.h
file path=usr/include/isc/base32.h
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
@@ -177,6 +177,7 @@
file path=usr/include/isc/formatcheck.h
file path=usr/include/isc/fsaccess.h
file path=usr/include/isc/fuzz.h
file path=usr/include/isc/glob.h
file path=usr/include/isc/hash.h
file path=usr/include/isc/heap.h
file path=usr/include/isc/hex.h
@@ -187,9 +188,6 @@
file path=usr/include/isc/iterated_hash.h
file path=usr/include/isc/lang.h
file path=usr/include/isc/lex.h
file path=usr/include/isc/lfsr.h
file path=usr/include/isc/lib.h
file path=usr/include/isc/likely.h
file path=usr/include/isc/list.h
file path=usr/include/isc/log.h
file path=usr/include/isc/magic.h
@@ -209,7 +207,6 @@
file path=usr/include/isc/once.h
file path=usr/include/isc/os.h
file path=usr/include/isc/parseint.h
file path=usr/include/isc/platform.h
file path=usr/include/isc/pool.h
file path=usr/include/isc/portset.h
file path=usr/include/isc/print.h
@@ -222,13 +219,11 @@
file path=usr/include/isc/region.h
file path=usr/include/isc/resource.h
file path=usr/include/isc/result.h
file path=usr/include/isc/resultclass.h
file path=usr/include/isc/rwlock.h
file path=usr/include/isc/safe.h
file path=usr/include/isc/serial.h
file path=usr/include/isc/siphash.h
file path=usr/include/isc/sockaddr.h
file path=usr/include/isc/socket.h
file path=usr/include/isc/stat.h
file path=usr/include/isc/stats.h
file path=usr/include/isc/stdatomic.h
@@ -243,36 +238,33 @@
file path=usr/include/isc/thread.h
file path=usr/include/isc/time.h
file path=usr/include/isc/timer.h
file path=usr/include/isc/tls.h
file path=usr/include/isc/tm.h
file path=usr/include/isc/types.h
file path=usr/include/isc/url.h
file path=usr/include/isc/utf8.h
file path=usr/include/isc/util.h
file path=usr/include/isc/version.h
file path=usr/include/isccc/alist.h
file path=usr/include/isccc/base64.h
file path=usr/include/isccc/cc.h
file path=usr/include/isccc/ccmsg.h
file path=usr/include/isccc/events.h
file path=usr/include/isccc/result.h
file path=usr/include/isccc/sexpr.h
file path=usr/include/isccc/symtab.h
file path=usr/include/isccc/symtype.h
file path=usr/include/isccc/types.h
file path=usr/include/isccc/util.h
file path=usr/include/isccc/version.h
file path=usr/include/isccfg/aclconf.h
file path=usr/include/isccfg/cfg.h
file path=usr/include/isccfg/dnsconf.h
file path=usr/include/isccfg/duration.h
file path=usr/include/isccfg/grammar.h
file path=usr/include/isccfg/kaspconf.h
file path=usr/include/isccfg/log.h
file path=usr/include/isccfg/namedconf.h
file path=usr/include/isccfg/version.h
file path=usr/include/ns/client.h
file path=usr/include/ns/events.h
file path=usr/include/ns/hooks.h
file path=usr/include/ns/interfacemgr.h
file path=usr/include/ns/lib.h
file path=usr/include/ns/listenlist.h
file path=usr/include/ns/log.h
file path=usr/include/ns/notify.h
@@ -282,14 +274,9 @@
file path=usr/include/ns/stats.h
file path=usr/include/ns/types.h
file path=usr/include/ns/update.h
file path=usr/include/ns/version.h
file path=usr/include/ns/xfrout.h
file path=usr/include/pk11/constants.h
file path=usr/include/pk11/internal.h
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
file path=usr/lib/dns/$(MACH64)/bind/filter-a.so
file path=usr/lib/dns/$(MACH64)/bind/filter-aaaa.so
file path=usr/lib/dns/$(MACH64)/libbind9-$(HUMAN_VERSION).so
link path=usr/lib/dns/$(MACH64)/libbind9.so target=libbind9-$(HUMAN_VERSION).so
file path=usr/lib/dns/$(MACH64)/libdns-$(HUMAN_VERSION).so
@@ -305,79 +292,40 @@
    target=libisccfg-$(HUMAN_VERSION).so
file path=usr/lib/dns/$(MACH64)/libns-$(HUMAN_VERSION).so
link path=usr/lib/dns/$(MACH64)/libns.so target=libns-$(HUMAN_VERSION).so
file path=usr/lib/dns/$(MACH64)/named/filter-aaaa.so
file path=usr/lib/python$(PYVER)/vendor-packages/isc-2.0-py$(PYVER).egg-info/PKG-INFO
file path=usr/lib/python$(PYVER)/vendor-packages/isc-2.0-py$(PYVER).egg-info/SOURCES.txt
file path=usr/lib/python$(PYVER)/vendor-packages/isc-2.0-py$(PYVER).egg-info/dependency_links.txt
file path=usr/lib/python$(PYVER)/vendor-packages/isc-2.0-py$(PYVER).egg-info/top_level.txt
file path=usr/lib/python$(PYVER)/vendor-packages/isc/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/isc/checkds.py
file path=usr/lib/python$(PYVER)/vendor-packages/isc/coverage.py
file path=usr/lib/python$(PYVER)/vendor-packages/isc/dnskey.py
file path=usr/lib/python$(PYVER)/vendor-packages/isc/eventlist.py
file path=usr/lib/python$(PYVER)/vendor-packages/isc/keydict.py
file path=usr/lib/python$(PYVER)/vendor-packages/isc/keyevent.py
file path=usr/lib/python$(PYVER)/vendor-packages/isc/keymgr.py
file path=usr/lib/python$(PYVER)/vendor-packages/isc/keyseries.py
file path=usr/lib/python$(PYVER)/vendor-packages/isc/keyzone.py
file path=usr/lib/python$(PYVER)/vendor-packages/isc/parsetab.py
file path=usr/lib/python$(PYVER)/vendor-packages/isc/policy.py
file path=usr/lib/python$(PYVER)/vendor-packages/isc/rndc.py
file path=usr/lib/python$(PYVER)/vendor-packages/isc/utils.py
file path=usr/sbin/ddns-confgen
file path=usr/sbin/dnssec-cds
file path=usr/sbin/dnssec-checkds
file path=usr/sbin/dnssec-coverage
file path=usr/sbin/dnssec-dsfromkey
file path=usr/sbin/dnssec-importkey
file path=usr/sbin/dnssec-keyfromlabel
file path=usr/sbin/dnssec-keygen
file path=usr/sbin/dnssec-keymgr
file path=usr/sbin/dnssec-revoke
file path=usr/sbin/dnssec-settime
file path=usr/sbin/dnssec-signzone
file path=usr/sbin/dnssec-verify
file path=usr/sbin/named
file path=usr/sbin/named-checkconf
file path=usr/sbin/named-checkzone
link path=usr/sbin/named-compilezone target=named-checkzone
file path=usr/sbin/named-journalprint
file path=usr/sbin/named-nzd2nzf
file path=usr/sbin/nsec3hash
file path=usr/sbin/rndc
file path=usr/sbin/rndc-confgen
link path=usr/sbin/tsig-keygen target=ddns-confgen
hardlink path=usr/sbin/tsig-keygen target=ddns-confgen
file path=usr/share/man/man1/arpaname.1
file path=usr/share/man/man1/delv.1
file path=usr/share/man/man1/dig.1
file path=usr/share/man/man1/dnssec-cds.1
file path=usr/share/man/man1/dnssec-dsfromkey.1
file path=usr/share/man/man1/dnssec-importkey.1
file path=usr/share/man/man1/dnssec-keyfromlabel.1
file path=usr/share/man/man1/dnssec-keygen.1
file path=usr/share/man/man1/dnssec-revoke.1
file path=usr/share/man/man1/dnssec-settime.1
file path=usr/share/man/man1/dnssec-signzone.1
file path=usr/share/man/man1/dnssec-verify.1
file path=usr/share/man/man1/host.1
file path=usr/share/man/man1/mdig.1
file path=usr/share/man/man1/named-checkconf.1
file path=usr/share/man/man1/named-checkzone.1
file path=usr/share/man/man1/named-compilezone.1
file path=usr/share/man/man1/named-journalprint.1
file path=usr/share/man/man1/named-nzd2nzf.1
file path=usr/share/man/man1/named-rrchecker.1
file path=usr/share/man/man1/nsec3hash.1
file path=usr/share/man/man1/nslookup.1
file path=usr/share/man/man1/nsupdate.1
file path=usr/share/man/man5/named.conf.5
file path=usr/share/man/man5/rndc.conf.5
file path=usr/share/man/man8/ddns-confgen.8
file path=usr/share/man/man8/dnssec-cds.8
file path=usr/share/man/man8/dnssec-checkds.8
file path=usr/share/man/man8/dnssec-coverage.8
file path=usr/share/man/man8/dnssec-dsfromkey.8
file path=usr/share/man/man8/dnssec-importkey.8
file path=usr/share/man/man8/dnssec-keyfromlabel.8
file path=usr/share/man/man8/dnssec-keygen.8
file path=usr/share/man/man8/dnssec-keymgr.8
file path=usr/share/man/man8/dnssec-revoke.8
file path=usr/share/man/man8/dnssec-settime.8
file path=usr/share/man/man8/dnssec-signzone.8
file path=usr/share/man/man8/dnssec-verify.8
file path=usr/share/man/man8/filter-a.8
file path=usr/share/man/man8/filter-aaaa.8
file path=usr/share/man/man8/named-checkconf.8
file path=usr/share/man/man8/named-checkzone.8
file path=usr/share/man/man8/named-compilezone.8
file path=usr/share/man/man8/named-journalprint.8
file path=usr/share/man/man8/named-nzd2nzf.8
file path=usr/share/man/man8/named.8
file path=usr/share/man/man8/nsec3hash.8
file path=usr/share/man/man8/rndc-confgen.8
file path=usr/share/man/man8/rndc.8
file path=usr/share/man/man8/tsig-keygen.8

 components/network/bind/patches/01-remove-zrelax-transtls.patch

New file
@@ -0,0 +1,31 @@
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
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)
--- bind-9.18.12/configure.ac    2023-02-03 12:25:47.438145409 +0100
+++ bind-9.18.12/configure.ac.new    2023-02-25 17:58:08.392224650 +0100
@@ -280,13 +280,13 @@
 #
 # 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])
-          ])
-    ])
+#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])
+#          ])
+#    ])
 
 AC_CHECK_HEADERS([fcntl.h regex.h sys/time.h unistd.h sys/mman.h sys/sockio.h sys/select.h sys/param.h sys/sysctl.h net/if6.h sys/socket.h net/route.h linux/netlink.h linux/rtnetlink.h], [], [],
          [$ac_includes_default

 components/network/bind/patches/02-man-named.patch

File was renamed from components/network/bind/patches/07-man-named.patch
@@ -1,8 +1,8 @@
--- bind-9.16.29/doc/man/named.8in.orig    2022-05-10 11:02:21.000000000 +0000
+++ bind-9.16.29/doc/man/named.8in    2022-05-25 12:47:55.165879458 +0000
@@ -229,6 +229,100 @@
 developers and may be removed or changed in a future release.
 .UNINDENT
--- bind-9.18.12/doc/man/named.8in    2023-02-03 12:27:09.125770285 +0100
+++ bind-9.18.12/doc/man/named.8in.new    2023-02-25 18:46:41.520580373 +0100
@@ -255,6 +255,100 @@
 Use of this option overrides the \fBlock\-file\fP option in
 \fI\%named.conf\fP\&. If set to \fBnone\fP, the lock file check is disabled.
 .UNINDENT
+.SH AUTOMATIC SERVICE MANAGEMENT (SMF)
+.sp
@@ -22,7 +22,7 @@
+be queried using the \fBsvcs\fP(1) command.
+.LP
+\fBDNS\fP on illumos is managed via the service management facility described in
+\fBsmf\fP(7). There are several options controlled by services properties which 
+\fBsmf\fP(7). There are several options controlled by services properties which
+can be set by the system administrator. The available options can be listed by
+executing the following command:
+.INDENT 0.0
@@ -70,7 +70,7 @@
+which will be used to listen for DNS requests.
+If not specified, the server listens on port 53.
+Equivalent to command line option '-p <integer>'.
+.TP 
+.TP
+.BR options/debug_level
+An integer that specifies the default debug level.  The
+default is 0; no debugging. The higher the number the
@@ -101,11 +101,11 @@
 .SH SIGNALS
 .sp
 In routine operation, signals should not be used to control the
@@ -264,7 +358,8 @@
@@ -290,7 +384,8 @@
 .UNINDENT
 .SH SEE ALSO
 .sp
-\fI\%RFC 1033\fP, \fI\%RFC 1034\fP, \fI\%RFC 1035\fP, \fBnamed\-checkconf(8)\fP, \fBnamed\-checkzone(8)\fP, \fBrndc(8)\fP, \fBnamed.conf(5)\fP, BIND 9 Administrator Reference Manual.
-\fI\%RFC 1033\fP, \fI\%RFC 1034\fP, \fI\%RFC 1035\fP, \fI\%named\-checkconf(8)\fP, \fI\%named\-checkzone(8)\fP, \fI\%rndc(8)\fP, \fI\%named.conf(5)\fP, BIND 9 Administrator Reference Manual.
+\fI\%RFC 1033\fP, \fI\%RFC 1034\fP, \fI\%RFC 1035\fP, \fBnamed\-checkconf(8)\fP, \fBnamed\-checkzone(8)\fP, \fBrndc(8)\fP, \fBnamed.conf(5)\fP, BIND 9 Administrator Reference Manual,
+\fBsmf\fP(7), \fBsvcadm\fP(8), \fBsvcs\fP(1), \fBchroot\fP(2).
 .SH AUTHOR

 components/network/bind/patches/02-python-vendor-packages.patch

File was deleted

 components/network/bind/patches/03-use-cc-for-linking.patch

File was deleted

 components/network/bind/patches/04-remove-zrelax-transtls.patch

File was deleted

 components/network/bind/patches/05-config.threads.patch

File was deleted

 components/network/bind/pkg5

@@ -4,11 +4,12 @@
        "database/lmdb",
        "library/json-c",
        "library/libedit",
        "library/libidn2",
        "library/libuv",
        "library/libxml2",
        "library/nghttp2",
        "library/security/openssl-11",
        "library/zlib",
        "runtime/python-39",
        "service/security/kerberos-5",
        "shell/ksh93",
        "system/library",

 components/network/bind/test/results-all.master

@@ -1,8 +1,120 @@
R:cds:FAIL
R:nsupdate:FAIL
R:runtime:FAIL
R:tsiggss:FAIL
I:System test result summary:
I:      4 FAIL
I:     99 PASS
I:      2 SKIPPED
PASS: serve-stale
PASS: rpzrecurse
FAIL: doth
PASS: acl
PASS: additional
PASS: addzone
PASS: allow-query
PASS: auth
PASS: autosign
PASS: builtin
PASS: cacheclean
PASS: case
PASS: catz
FAIL: cds
PASS: checkconf
PASS: checknames
PASS: checkzone
PASS: database
PASS: dialup
PASS: dlzexternal
PASS: dns64
PASS: dsdigest
PASS: dupsigs
PASS: dyndb
PASS: ecdsa
PASS: eddsa
PASS: ednscompliance
PASS: emptyzones
SKIP: enginepkcs11
PASS: filter-aaaa
PASS: formerr
SKIP: geoip2
PASS: glue
PASS: idna
PASS: include-multiplecfg
PASS: inline
PASS: integrity
PASS: hooks
PASS: host
PASS: journal
PASS: keepalive
SKIP: keyfromlabel
PASS: legacy
PASS: limits
PASS: logfileconfig
PASS: masterfile
PASS: masterformat
PASS: metadata
PASS: mirror
PASS: mkeys
PASS: names
PASS: notify
PASS: nsec3
PASS: nslookup
PASS: padding
PASS: pending
PASS: redirect
PASS: rndc
PASS: rootkeysentinel
PASS: rpz
PASS: rrchecker
PASS: rrl
PASS: rrsetorder
PASS: rsabigexponent
PASS: runtime
PASS: sfcache
PASS: smartsign
PASS: sortlist
PASS: spf
PASS: staticstub
PASS: stub
FAIL: synthfromdnssec
PASS: tkey
PASS: tools
PASS: transport-acl
PASS: tsig
FAIL: tsiggss
PASS: ttl
PASS: unknown
PASS: verify
PASS: views
PASS: wildcard
PASS: xferquota
PASS: zonechecks
PASS: nzd2nzf
PASS: fetchlimit
PASS: ixfr
FAIL: nsupdate
PASS: resolver
FAIL: statistics
PASS: stress
PASS: upforwd
PASS: zero
FAIL: statschannel
PASS: xfer
PASS: reclimit
PASS: kasp
PASS: keymgr2kasp
PASS: tcp
PASS: pipelined
PASS: checkds
PASS: dispatch
PASS: rpzextra
PASS: shutdown
PASS: timeouts
PASS: qmin
PASS: cookie
PASS: digdelv
PASS: dnssec
PASS: forward
PASS: chain
# TOTAL: 111
# PASS:  101
# SKIP:  3
# XFAIL: 0
# XFAIL: 0
# FAIL:  7
# XPASS: 0
# XPASS: 0
# ERROR: 0

			@@ -21,19 +21,24 @@
			# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
			# Copyright (c) 2020, Michal Nowak
			# Copyright (c) 2022, Niklas Poslovski
			# Copyright (c) 2023, Friedrich Kink
			#

			USE_OPENSSL11= yes
			include ../../../make-rules/shared-macros.mk

			COMPONENT_NAME= bind
			COMPONENT_VERSION= 9.16.38
			COMPONENT_VERSION= 9.18.12
			COMPONENT_SUMMARY= BIND DNS name server and configuration tools.
			COMPONENT_DESCRIPTION= BIND is open source software that implements the Domain Name System \
			(DNS) protocols for the Internet. This package contains the DNS \
			server 'named' and tools used to setup and validate configuration.
			COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
			COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz
			COMPONENT_PROJECT_URL= https://www.isc.org/software/bind/
			COMPONENT_ARCHIVE_HASH= sha256:8df44c9d9a84a28ab8b49d55f3c33b624b90ef8f6a8b9ee6a4c33cc17c14c50f
			COMPONENT_ARCHIVE_HASH= sha256:47766bb7b063aabbad054386b190aa7f6c14524427afd427c30ec426512027e7
			COMPONENT_ARCHIVE_URL= https://ftp.isc.org/isc/bind9/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
			COMPONENT_FMRI= network/dns/$(COMPONENT_NAME)
			COMPONENT_FMRI= network/dns/$(COMPONENT_NAME)
			COMPONENT_CLASSIFICATION= Applications/Internet
			COMPONENT_LICENSE= MPL v2.0
			COMPONENT_LICENSE_FILE= COPYRIGHT
			@@ -59,21 +64,17 @@
			CONFIGURE_LIBDIR.64= $(CONFIGURE_PREFIX)/lib/dns/$(MACH64)

			CONFIGURE_OPTIONS += --disable-static
			CONFIGURE_OPTIONS += --with-libtool
			CONFIGURE_OPTIONS += --sysconfdir=/etc
			CONFIGURE_OPTIONS += --localstatedir=/var
			CONFIGURE_OPTIONS += --with-openssl=/usr
			CONFIGURE_OPTIONS += --enable-devpoll=yes
			CONFIGURE_OPTIONS += --enable-fixed-rrset
			CONFIGURE_OPTIONS += --with-pkcs11=/usr/lib/$(MACH64)/libpkcs11.so
			CONFIGURE_OPTIONS += --enable-full-report
			CONFIGURE_OPTIONS += --with-gssapi
			CONFIGURE_OPTIONS += --with-libidn2
			CONFIGURE_OPTIONS += --with-libxml2
			CONFIGURE_OPTIONS += --with-python-install-dir=$(PYTHON_VENDOR_PACKAGES.32)
			CONFIGURE_OPTIONS += --with-json-c

			CONFIGURE_ENV += PYTHON=$(PYTHON)

			COMPONENT_BUILD_ENV += PYTHON_VENDOR_DIR=$(PYTHON_VENDOR_PACKAGES)
			COMPONENT_INSTALL_ENV += PYTHON_VENDOR_DIR=$(PYTHON_VENDOR_PACKAGES)
			CONFIGURE_OPTIONS += --disable-linux-caps

			# Install.
			#
			@@ -94,24 +95,26 @@
			COMPONENT_TEST_TARGETS= test
			COMPONENT_TEST_TRANSFORMS += \
			' -n ' \
			' -e "/^R:.*:FAIL/p"' \
			' -e "/^I:System test result summary/p"' \
			' -e "/^I:.* PASS$$/p"' \
			' -e "/^I:.* FAIL$$/p"' \
			' -e "/^I:.* SKIPPED$$/p"' \
			' -e "/^I:.* UNTESTED$$/p"'
			' -e "/TOTAL:/p"' \
			' -e "/PASS:/p"' \
			' -e "/SKIP:/p"' \
			' -e "/XFAIL:/p"' \
			' -e "/FAIL:/p"' \
			' -e "/XPASS:/p"' \
			' -e "/ERROR:/p"'

			# Auto-generated dependencies
			PYTHON_REQUIRED_PACKAGES += runtime/python
			REQUIRED_PACKAGES += SUNWcs
			REQUIRED_PACKAGES += database/lmdb
			REQUIRED_PACKAGES += library/json-c
			REQUIRED_PACKAGES += library/libedit
			REQUIRED_PACKAGES += library/libidn2
			REQUIRED_PACKAGES += library/libuv
			REQUIRED_PACKAGES += library/libxml2
			REQUIRED_PACKAGES += library/nghttp2
			REQUIRED_PACKAGES += library/security/openssl-11
			REQUIRED_PACKAGES += library/zlib
			REQUIRED_PACKAGES += service/security/kerberos-5
			REQUIRED_PACKAGES += shell/ksh93
			REQUIRED_PACKAGES += SUNWcs
			REQUIRED_PACKAGES += system/library
			REQUIRED_PACKAGES += system/library/security/gss

			@@ -20,20 +20,17 @@
			#
			# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
			# Copyright (c) 2020, Michal Nowak
			# Copyright (c) 2023, Friedrich Kink
			#

			<transform file path=usr/share/doc/bind/html/(.+)$ -> \
			set action.hash doc/arm/%<\1> >

			set name=pkg.fmri \
			value=pkg:/service/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
			set name=pkg.human-version value=$(COMPONENT_VERSION)
			set name=pkg.description \
			value="BIND is open source software that implements the Domain Name System (DNS) protocols for the Internet. This package contains the DNS server 'named' and tools used to setup and validate configuration."
			set name=pkg.summary \
			value="BIND DNS name server and configuration tools."
			set name=info.classification \
			value="org.opensolaris.category.2008:System/Services"
			set name=pkg.fmri value=pkg:/service/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
			set name=pkg.human-version value=$(HUMAN_VERSION)
			set name=pkg.summary value="$(COMPONENT_SUMMARY)"
			set name=pkg.description value="$(COMPONENT_DESCRIPTION)"
			set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
			set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
			set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
			set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
			@@ -50,51 +47,67 @@
			file Solaris/migration.txt path=usr/share/doc/bind/migration.txt

			# Libs
			file path=usr/lib/dns/$(MACH64)/named/filter-aaaa.so
			file path=usr/lib/dns/$(MACH64)/bind/filter-aaaa.so
			file path=usr/lib/dns/$(MACH64)/bind/filter-a.so

			# Tools
			file path=usr/bin/dnssec-cds
			file path=usr/bin/dnssec-dsfromkey
			file path=usr/bin/dnssec-importkey
			file path=usr/bin/dnssec-keyfromlabel
			file path=usr/bin/dnssec-keygen
			file path=usr/bin/dnssec-revoke
			file path=usr/bin/dnssec-settime
			file path=usr/bin/dnssec-signzone
			file path=usr/bin/dnssec-verify
			file path=usr/bin/named-checkconf
			file path=usr/bin/named-checkzone
			hardlink path=usr/bin/named-compilezone target=named-checkzone
			file path=usr/bin/named-journalprint
			file path=usr/bin/named-nzd2nzf
			file path=usr/bin/named-rrchecker
			file path=usr/bin/nsec3hash
			file path=usr/sbin/ddns-confgen
			link path=usr/sbin/tsig-keygen target=ddns-confgen
			file path=usr/sbin/dnssec-cds
			file path=usr/sbin/dnssec-checkds
			file path=usr/sbin/dnssec-coverage
			file path=usr/sbin/dnssec-dsfromkey
			file path=usr/sbin/dnssec-importkey
			file path=usr/sbin/dnssec-keyfromlabel
			file path=usr/sbin/dnssec-keygen
			file path=usr/sbin/dnssec-revoke
			file path=usr/sbin/dnssec-settime
			file path=usr/sbin/dnssec-signzone
			file path=usr/sbin/dnssec-verify
			hardlink path=usr/sbin/tsig-keygen target=ddns-confgen
			file path=usr/sbin/named
			file path=usr/sbin/named-checkconf
			file path=usr/sbin/named-checkzone
			link path=usr/sbin/named-compilezone target=named-checkzone
			file path=usr/sbin/named-journalprint
			file path=usr/sbin/named-nzd2nzf
			link path=usr/sbin/named-rrchecker target=../bin/named-rrchecker

			# Compatibiliy symlinks
			link path=usr/sbin/dnssec-cds target=../bin/dnssec-cds
			link path=usr/sbin/dnssec-dsfromkey target=../bin/dnssec-dsfromkey
			link path=usr/sbin/dnssec-importkey target=../bin/dnssec-importkey
			link path=usr/sbin/dnssec-keyfromlabel target=../bin/dnssec-keyfromlabel
			link path=usr/sbin/dnssec-keygen target=../bin/dnssec-keygen
			link path=usr/sbin/dnssec-revoke target=../bin/dnssec-revoke
			link path=usr/sbin/dnssec-settime target=../bin/dnssec-settime
			link path=usr/sbin/dnssec-signzone target=../bin/dnssec-signzone
			link path=usr/sbin/dnssec-verify target=../bin/dnssec-verify
			link path=usr/sbin/named-checkconf target=../bin/named-checkconf
			link path=usr/sbin/named-checkzone target=../bin/named-checkzone
			link path=usr/sbin/named-compilezone target=../bin/named-checkzone
			link path=usr/sbin/named-journalprint target=../bin/named-journalprint
			link path=usr/sbin/named-nzd2nzf target=../bin/named-nzd2nzf

			# Man
			file path=usr/share/man/man1/dnssec-cds.1
			file path=usr/share/man/man1/dnssec-dsfromkey.1
			file path=usr/share/man/man1/dnssec-importkey.1
			file path=usr/share/man/man1/dnssec-keyfromlabel.1
			file path=usr/share/man/man1/dnssec-keygen.1
			file path=usr/share/man/man1/dnssec-revoke.1
			file path=usr/share/man/man1/dnssec-settime.1
			file path=usr/share/man/man1/dnssec-signzone.1
			file path=usr/share/man/man1/dnssec-verify.1
			file path=usr/share/man/man1/named-checkconf.1
			file path=usr/share/man/man1/named-checkzone.1
			file path=usr/share/man/man1/named-compilezone.1
			file path=usr/share/man/man1/named-journalprint.1
			file path=usr/share/man/man1/named-nzd2nzf.1
			file path=usr/share/man/man1/named-rrchecker.1
			file path=usr/share/man/man1/nsec3hash.1
			file path=usr/share/man/man5/named.conf.5
			file path=usr/share/man/man8/ddns-confgen.8
			file path=usr/share/man/man8/dnssec-cds.8
			file path=usr/share/man/man8/dnssec-checkds.8
			file path=usr/share/man/man8/dnssec-coverage.8
			file path=usr/share/man/man8/dnssec-dsfromkey.8
			file path=usr/share/man/man8/dnssec-importkey.8
			file path=usr/share/man/man8/dnssec-keyfromlabel.8
			file path=usr/share/man/man8/dnssec-keygen.8
			file path=usr/share/man/man8/dnssec-revoke.8
			file path=usr/share/man/man8/dnssec-settime.8
			file path=usr/share/man/man8/dnssec-signzone.8
			file path=usr/share/man/man8/dnssec-verify.8
			file path=usr/share/man/man8/filter-a.8
			file path=usr/share/man/man8/filter-aaaa.8
			file path=usr/share/man/man8/named-checkconf.8
			file path=usr/share/man/man8/named-checkzone.8
			file path=usr/share/man/man8/named-compilezone.8
			file path=usr/share/man/man8/named-journalprint.8
			file path=usr/share/man/man8/named.8
			file path=usr/share/man/man8/tsig-keygen.8

			@@ -21,6 +21,7 @@
			# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
			# Copyright (c) 2020, Michal Nowak
			# Copyright (c) 2022, Niklas Poslovski
			# Copyright (c) 2023, Friedrich Kink
			#

			set name=pkg.fmri \
			@@ -57,52 +58,30 @@
			link path=usr/sbin/nsupdate target=../bin/nsupdate

			# Libraries
			file path=usr/lib/dns/$(MACH64)/libbind9-$(COMPONENT_VERSION).so
			link path=usr/lib/dns/$(MACH64)/libbind9.so \
			target=libbind9-$(COMPONENT_VERSION).so
			file path=usr/lib/dns/$(MACH64)/libdns-$(COMPONENT_VERSION).so
			link path=usr/lib/dns/$(MACH64)/libdns.so target=libdns-$(COMPONENT_VERSION).so
			file path=usr/lib/dns/$(MACH64)/libirs-$(COMPONENT_VERSION).so
			link path=usr/lib/dns/$(MACH64)/libirs.so target=libirs-$(COMPONENT_VERSION).so
			file path=usr/lib/dns/$(MACH64)/libisc-$(COMPONENT_VERSION).so
			link path=usr/lib/dns/$(MACH64)/libisc.so target=libisc-$(COMPONENT_VERSION).so
			file path=usr/lib/dns/$(MACH64)/libisccc-$(COMPONENT_VERSION).so
			link path=usr/lib/dns/$(MACH64)/libisccc.so \
			target=libisccc-$(COMPONENT_VERSION).so
			file path=usr/lib/dns/$(MACH64)/libisccfg-$(COMPONENT_VERSION).so
			file path=usr/lib/dns/$(MACH64)/libbind9-$(HUMAN_VERSION).so
			link path=usr/lib/dns/$(MACH64)/libbind9.so target=libbind9-$(HUMAN_VERSION).so
			file path=usr/lib/dns/$(MACH64)/libdns-$(HUMAN_VERSION).so
			link path=usr/lib/dns/$(MACH64)/libdns.so target=libdns-$(HUMAN_VERSION).so
			file path=usr/lib/dns/$(MACH64)/libirs-$(HUMAN_VERSION).so
			link path=usr/lib/dns/$(MACH64)/libirs.so target=libirs-$(HUMAN_VERSION).so
			file path=usr/lib/dns/$(MACH64)/libisc-$(HUMAN_VERSION).so
			link path=usr/lib/dns/$(MACH64)/libisc.so target=libisc-$(HUMAN_VERSION).so
			file path=usr/lib/dns/$(MACH64)/libisccc-$(HUMAN_VERSION).so
			link path=usr/lib/dns/$(MACH64)/libisccc.so target=libisccc-$(HUMAN_VERSION).so
			file path=usr/lib/dns/$(MACH64)/libisccfg-$(HUMAN_VERSION).so
			link path=usr/lib/dns/$(MACH64)/libisccfg.so \
			target=libisccfg-$(COMPONENT_VERSION).so
			file path=usr/lib/dns/$(MACH64)/libns-$(COMPONENT_VERSION).so
			link path=usr/lib/dns/$(MACH64)/libns.so target=libns-$(COMPONENT_VERSION).so

			# Python packages
			file path=usr/lib/python$(PYVER)/vendor-packages/isc-2.0-py$(PYVER).egg-info/PKG-INFO
			file path=usr/lib/python$(PYVER)/vendor-packages/isc-2.0-py$(PYVER).egg-info/SOURCES.txt
			file path=usr/lib/python$(PYVER)/vendor-packages/isc-2.0-py$(PYVER).egg-info/dependency_links.txt
			file path=usr/lib/python$(PYVER)/vendor-packages/isc-2.0-py$(PYVER).egg-info/top_level.txt
			file path=usr/lib/python$(PYVER)/vendor-packages/isc/__init__.py
			file path=usr/lib/python$(PYVER)/vendor-packages/isc/checkds.py
			file path=usr/lib/python$(PYVER)/vendor-packages/isc/coverage.py
			file path=usr/lib/python$(PYVER)/vendor-packages/isc/dnskey.py
			file path=usr/lib/python$(PYVER)/vendor-packages/isc/eventlist.py
			file path=usr/lib/python$(PYVER)/vendor-packages/isc/keydict.py
			file path=usr/lib/python$(PYVER)/vendor-packages/isc/keyevent.py
			file path=usr/lib/python$(PYVER)/vendor-packages/isc/keymgr.py
			file path=usr/lib/python$(PYVER)/vendor-packages/isc/keyseries.py
			file path=usr/lib/python$(PYVER)/vendor-packages/isc/keyzone.py
			file path=usr/lib/python$(PYVER)/vendor-packages/isc/parsetab.py
			file path=usr/lib/python$(PYVER)/vendor-packages/isc/policy.py
			file path=usr/lib/python$(PYVER)/vendor-packages/isc/rndc.py
			file path=usr/lib/python$(PYVER)/vendor-packages/isc/utils.py
			target=libisccfg-$(HUMAN_VERSION).so
			file path=usr/lib/dns/$(MACH64)/libns-$(HUMAN_VERSION).so
			link path=usr/lib/dns/$(MACH64)/libns.so target=libns-$(HUMAN_VERSION).so

			# Man
			file path=usr/share/man/man1/arpaname.1
			file path=usr/share/man/man1/delv.1
			file path=usr/share/man/man1/dig.1
			file path=usr/share/man/man1/host.1
			file path=usr/share/man/man1/mdig.1
			file path=usr/share/man/man1/nslookup.1
			file path=usr/share/man/man1/nsupdate.1
			file path=usr/share/man/man8/named-nzd2nzf.8
			file path=usr/share/man/man8/rndc.8
			file path=usr/share/man/man8/rndc-confgen.8
			file path=usr/share/man/man5/rndc.conf.5

			@@ -10,7 +10,7 @@
			#

			#
			# Copyright 2022 <contributor>
			# Copyright 2023 <contributor>
			#

			set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
			@@ -27,14 +27,28 @@
			file path=usr/bin/arpaname
			file path=usr/bin/delv
			file path=usr/bin/dig
			file path=usr/bin/dnssec-cds
			file path=usr/bin/dnssec-dsfromkey
			file path=usr/bin/dnssec-importkey
			file path=usr/bin/dnssec-keyfromlabel
			file path=usr/bin/dnssec-keygen
			file path=usr/bin/dnssec-revoke
			file path=usr/bin/dnssec-settime
			file path=usr/bin/dnssec-signzone
			file path=usr/bin/dnssec-verify
			file path=usr/bin/host
			file path=usr/bin/mdig
			file path=usr/bin/named-checkconf
			file path=usr/bin/named-checkzone
			hardlink path=usr/bin/named-compilezone target=named-checkzone
			file path=usr/bin/named-journalprint
			file path=usr/bin/named-nzd2nzf
			file path=usr/bin/named-rrchecker
			file path=usr/bin/nsec3hash
			file path=usr/bin/nslookup
			file path=usr/bin/nsupdate
			file path=usr/include/bind9/check.h
			file path=usr/include/bind9/getaddresses.h
			file path=usr/include/bind9/version.h
			file path=usr/include/dns/acl.h
			file path=usr/include/dns/adb.h
			file path=usr/include/dns/badcache.h
			@@ -49,7 +63,6 @@
			file path=usr/include/dns/compress.h
			file path=usr/include/dns/db.h
			file path=usr/include/dns/dbiterator.h
			file path=usr/include/dns/dbtable.h
			file path=usr/include/dns/diff.h
			file path=usr/include/dns/dispatch.h
			file path=usr/include/dns/dlz.h
			@@ -61,7 +74,6 @@
			file path=usr/include/dns/ds.h
			file path=usr/include/dns/dsdigest.h
			file path=usr/include/dns/dyndb.h
			file path=usr/include/dns/ecdb.h
			file path=usr/include/dns/ecs.h
			file path=usr/include/dns/edns.h
			file path=usr/include/dns/enumclass.h
			@@ -79,9 +91,7 @@
			file path=usr/include/dns/keymgr.h
			file path=usr/include/dns/keytable.h
			file path=usr/include/dns/keyvalues.h
			file path=usr/include/dns/lib.h
			file path=usr/include/dns/librpz.h
			file path=usr/include/dns/lmdb.h
			file path=usr/include/dns/log.h
			file path=usr/include/dns/lookup.h
			file path=usr/include/dns/master.h
			@@ -95,7 +105,6 @@
			file path=usr/include/dns/opcode.h
			file path=usr/include/dns/order.h
			file path=usr/include/dns/peer.h
			file path=usr/include/dns/portlist.h
			file path=usr/include/dns/private.h
			file path=usr/include/dns/rbt.h
			file path=usr/include/dns/rcode.h
			@@ -121,17 +130,15 @@
			file path=usr/include/dns/soa.h
			file path=usr/include/dns/ssu.h
			file path=usr/include/dns/stats.h
			file path=usr/include/dns/tcpmsg.h
			file path=usr/include/dns/time.h
			file path=usr/include/dns/timer.h
			file path=usr/include/dns/tkey.h
			file path=usr/include/dns/transport.h
			file path=usr/include/dns/tsec.h
			file path=usr/include/dns/tsig.h
			file path=usr/include/dns/ttl.h
			file path=usr/include/dns/types.h
			file path=usr/include/dns/update.h
			file path=usr/include/dns/validator.h
			file path=usr/include/dns/version.h
			file path=usr/include/dns/view.h
			file path=usr/include/dns/xfrin.h
			file path=usr/include/dns/zone.h
			@@ -140,27 +147,20 @@
			file path=usr/include/dns/zt.h
			file path=usr/include/dst/dst.h
			file path=usr/include/dst/gssapi.h
			file path=usr/include/dst/result.h
			file path=usr/include/irs/context.h
			file path=usr/include/irs/dnsconf.h
			file path=usr/include/irs/netdb.h
			file path=usr/include/irs/platform.h
			file path=usr/include/irs/resconf.h
			file path=usr/include/irs/types.h
			file path=usr/include/irs/version.h
			file path=usr/include/isc/aes.h
			file path=usr/include/isc/align.h
			file path=usr/include/isc/app.h
			file path=usr/include/isc/assertions.h
			file path=usr/include/isc/astack.h
			file path=usr/include/isc/atomic.h
			file path=usr/include/isc/attributes.h
			file path=usr/include/isc/backtrace.h
			file path=usr/include/isc/barrier.h
			file path=usr/include/isc/base32.h
			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
			@@ -177,6 +177,7 @@
			file path=usr/include/isc/formatcheck.h
			file path=usr/include/isc/fsaccess.h
			file path=usr/include/isc/fuzz.h
			file path=usr/include/isc/glob.h
			file path=usr/include/isc/hash.h
			file path=usr/include/isc/heap.h
			file path=usr/include/isc/hex.h
			@@ -187,9 +188,6 @@
			file path=usr/include/isc/iterated_hash.h
			file path=usr/include/isc/lang.h
			file path=usr/include/isc/lex.h
			file path=usr/include/isc/lfsr.h
			file path=usr/include/isc/lib.h
			file path=usr/include/isc/likely.h
			file path=usr/include/isc/list.h
			file path=usr/include/isc/log.h
			file path=usr/include/isc/magic.h
			@@ -209,7 +207,6 @@
			file path=usr/include/isc/once.h
			file path=usr/include/isc/os.h
			file path=usr/include/isc/parseint.h
			file path=usr/include/isc/platform.h
			file path=usr/include/isc/pool.h
			file path=usr/include/isc/portset.h
			file path=usr/include/isc/print.h
			@@ -222,13 +219,11 @@
			file path=usr/include/isc/region.h
			file path=usr/include/isc/resource.h
			file path=usr/include/isc/result.h
			file path=usr/include/isc/resultclass.h
			file path=usr/include/isc/rwlock.h
			file path=usr/include/isc/safe.h
			file path=usr/include/isc/serial.h
			file path=usr/include/isc/siphash.h
			file path=usr/include/isc/sockaddr.h
			file path=usr/include/isc/socket.h
			file path=usr/include/isc/stat.h
			file path=usr/include/isc/stats.h
			file path=usr/include/isc/stdatomic.h
			@@ -243,36 +238,33 @@
			file path=usr/include/isc/thread.h
			file path=usr/include/isc/time.h
			file path=usr/include/isc/timer.h
			file path=usr/include/isc/tls.h
			file path=usr/include/isc/tm.h
			file path=usr/include/isc/types.h
			file path=usr/include/isc/url.h
			file path=usr/include/isc/utf8.h
			file path=usr/include/isc/util.h
			file path=usr/include/isc/version.h
			file path=usr/include/isccc/alist.h
			file path=usr/include/isccc/base64.h
			file path=usr/include/isccc/cc.h
			file path=usr/include/isccc/ccmsg.h
			file path=usr/include/isccc/events.h
			file path=usr/include/isccc/result.h
			file path=usr/include/isccc/sexpr.h
			file path=usr/include/isccc/symtab.h
			file path=usr/include/isccc/symtype.h
			file path=usr/include/isccc/types.h
			file path=usr/include/isccc/util.h
			file path=usr/include/isccc/version.h
			file path=usr/include/isccfg/aclconf.h
			file path=usr/include/isccfg/cfg.h
			file path=usr/include/isccfg/dnsconf.h
			file path=usr/include/isccfg/duration.h
			file path=usr/include/isccfg/grammar.h
			file path=usr/include/isccfg/kaspconf.h
			file path=usr/include/isccfg/log.h
			file path=usr/include/isccfg/namedconf.h
			file path=usr/include/isccfg/version.h
			file path=usr/include/ns/client.h
			file path=usr/include/ns/events.h
			file path=usr/include/ns/hooks.h
			file path=usr/include/ns/interfacemgr.h
			file path=usr/include/ns/lib.h
			file path=usr/include/ns/listenlist.h
			file path=usr/include/ns/log.h
			file path=usr/include/ns/notify.h
			@@ -282,14 +274,9 @@
			file path=usr/include/ns/stats.h
			file path=usr/include/ns/types.h
			file path=usr/include/ns/update.h
			file path=usr/include/ns/version.h
			file path=usr/include/ns/xfrout.h
			file path=usr/include/pk11/constants.h
			file path=usr/include/pk11/internal.h
			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
			file path=usr/lib/dns/$(MACH64)/bind/filter-a.so
			file path=usr/lib/dns/$(MACH64)/bind/filter-aaaa.so
			file path=usr/lib/dns/$(MACH64)/libbind9-$(HUMAN_VERSION).so
			link path=usr/lib/dns/$(MACH64)/libbind9.so target=libbind9-$(HUMAN_VERSION).so
			file path=usr/lib/dns/$(MACH64)/libdns-$(HUMAN_VERSION).so
			@@ -305,79 +292,40 @@
			target=libisccfg-$(HUMAN_VERSION).so
			file path=usr/lib/dns/$(MACH64)/libns-$(HUMAN_VERSION).so
			link path=usr/lib/dns/$(MACH64)/libns.so target=libns-$(HUMAN_VERSION).so
			file path=usr/lib/dns/$(MACH64)/named/filter-aaaa.so
			file path=usr/lib/python$(PYVER)/vendor-packages/isc-2.0-py$(PYVER).egg-info/PKG-INFO
			file path=usr/lib/python$(PYVER)/vendor-packages/isc-2.0-py$(PYVER).egg-info/SOURCES.txt
			file path=usr/lib/python$(PYVER)/vendor-packages/isc-2.0-py$(PYVER).egg-info/dependency_links.txt
			file path=usr/lib/python$(PYVER)/vendor-packages/isc-2.0-py$(PYVER).egg-info/top_level.txt
			file path=usr/lib/python$(PYVER)/vendor-packages/isc/__init__.py
			file path=usr/lib/python$(PYVER)/vendor-packages/isc/checkds.py
			file path=usr/lib/python$(PYVER)/vendor-packages/isc/coverage.py
			file path=usr/lib/python$(PYVER)/vendor-packages/isc/dnskey.py
			file path=usr/lib/python$(PYVER)/vendor-packages/isc/eventlist.py
			file path=usr/lib/python$(PYVER)/vendor-packages/isc/keydict.py
			file path=usr/lib/python$(PYVER)/vendor-packages/isc/keyevent.py
			file path=usr/lib/python$(PYVER)/vendor-packages/isc/keymgr.py
			file path=usr/lib/python$(PYVER)/vendor-packages/isc/keyseries.py
			file path=usr/lib/python$(PYVER)/vendor-packages/isc/keyzone.py
			file path=usr/lib/python$(PYVER)/vendor-packages/isc/parsetab.py
			file path=usr/lib/python$(PYVER)/vendor-packages/isc/policy.py
			file path=usr/lib/python$(PYVER)/vendor-packages/isc/rndc.py
			file path=usr/lib/python$(PYVER)/vendor-packages/isc/utils.py
			file path=usr/sbin/ddns-confgen
			file path=usr/sbin/dnssec-cds
			file path=usr/sbin/dnssec-checkds
			file path=usr/sbin/dnssec-coverage
			file path=usr/sbin/dnssec-dsfromkey
			file path=usr/sbin/dnssec-importkey
			file path=usr/sbin/dnssec-keyfromlabel
			file path=usr/sbin/dnssec-keygen
			file path=usr/sbin/dnssec-keymgr
			file path=usr/sbin/dnssec-revoke
			file path=usr/sbin/dnssec-settime
			file path=usr/sbin/dnssec-signzone
			file path=usr/sbin/dnssec-verify
			file path=usr/sbin/named
			file path=usr/sbin/named-checkconf
			file path=usr/sbin/named-checkzone
			link path=usr/sbin/named-compilezone target=named-checkzone
			file path=usr/sbin/named-journalprint
			file path=usr/sbin/named-nzd2nzf
			file path=usr/sbin/nsec3hash
			file path=usr/sbin/rndc
			file path=usr/sbin/rndc-confgen
			link path=usr/sbin/tsig-keygen target=ddns-confgen
			hardlink path=usr/sbin/tsig-keygen target=ddns-confgen
			file path=usr/share/man/man1/arpaname.1
			file path=usr/share/man/man1/delv.1
			file path=usr/share/man/man1/dig.1
			file path=usr/share/man/man1/dnssec-cds.1
			file path=usr/share/man/man1/dnssec-dsfromkey.1
			file path=usr/share/man/man1/dnssec-importkey.1
			file path=usr/share/man/man1/dnssec-keyfromlabel.1
			file path=usr/share/man/man1/dnssec-keygen.1
			file path=usr/share/man/man1/dnssec-revoke.1
			file path=usr/share/man/man1/dnssec-settime.1
			file path=usr/share/man/man1/dnssec-signzone.1
			file path=usr/share/man/man1/dnssec-verify.1
			file path=usr/share/man/man1/host.1
			file path=usr/share/man/man1/mdig.1
			file path=usr/share/man/man1/named-checkconf.1
			file path=usr/share/man/man1/named-checkzone.1
			file path=usr/share/man/man1/named-compilezone.1
			file path=usr/share/man/man1/named-journalprint.1
			file path=usr/share/man/man1/named-nzd2nzf.1
			file path=usr/share/man/man1/named-rrchecker.1
			file path=usr/share/man/man1/nsec3hash.1
			file path=usr/share/man/man1/nslookup.1
			file path=usr/share/man/man1/nsupdate.1
			file path=usr/share/man/man5/named.conf.5
			file path=usr/share/man/man5/rndc.conf.5
			file path=usr/share/man/man8/ddns-confgen.8
			file path=usr/share/man/man8/dnssec-cds.8
			file path=usr/share/man/man8/dnssec-checkds.8
			file path=usr/share/man/man8/dnssec-coverage.8
			file path=usr/share/man/man8/dnssec-dsfromkey.8
			file path=usr/share/man/man8/dnssec-importkey.8
			file path=usr/share/man/man8/dnssec-keyfromlabel.8
			file path=usr/share/man/man8/dnssec-keygen.8
			file path=usr/share/man/man8/dnssec-keymgr.8
			file path=usr/share/man/man8/dnssec-revoke.8
			file path=usr/share/man/man8/dnssec-settime.8
			file path=usr/share/man/man8/dnssec-signzone.8
			file path=usr/share/man/man8/dnssec-verify.8
			file path=usr/share/man/man8/filter-a.8
			file path=usr/share/man/man8/filter-aaaa.8
			file path=usr/share/man/man8/named-checkconf.8
			file path=usr/share/man/man8/named-checkzone.8
			file path=usr/share/man/man8/named-compilezone.8
			file path=usr/share/man/man8/named-journalprint.8
			file path=usr/share/man/man8/named-nzd2nzf.8
			file path=usr/share/man/man8/named.8
			file path=usr/share/man/man8/nsec3hash.8
			file path=usr/share/man/man8/rndc-confgen.8
			file path=usr/share/man/man8/rndc.8
			file path=usr/share/man/man8/tsig-keygen.8

New file
			@@ -0,0 +1,31 @@
			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
			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)
			--- bind-9.18.12/configure.ac 2023-02-03 12:25:47.438145409 +0100
			+++ bind-9.18.12/configure.ac.new 2023-02-25 17:58:08.392224650 +0100
			@@ -280,13 +280,13 @@
			#
			# 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])
			- ])
			- ])
			+#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])
			+# ])
			+# ])

			AC_CHECK_HEADERS([fcntl.h regex.h sys/time.h unistd.h sys/mman.h sys/sockio.h sys/select.h sys/param.h sys/sysctl.h net/if6.h sys/socket.h net/route.h linux/netlink.h linux/rtnetlink.h], [], [],
			[$ac_includes_default

File was renamed from components/network/bind/patches/07-man-named.patch
			@@ -1,8 +1,8 @@
			--- bind-9.16.29/doc/man/named.8in.orig 2022-05-10 11:02:21.000000000 +0000
			+++ bind-9.16.29/doc/man/named.8in 2022-05-25 12:47:55.165879458 +0000
			@@ -229,6 +229,100 @@
			developers and may be removed or changed in a future release.
			.UNINDENT
			--- bind-9.18.12/doc/man/named.8in 2023-02-03 12:27:09.125770285 +0100
			+++ bind-9.18.12/doc/man/named.8in.new 2023-02-25 18:46:41.520580373 +0100
			@@ -255,6 +255,100 @@
			Use of this option overrides the \fBlock\-file\fP option in
			\fI\%named.conf\fP\&. If set to \fBnone\fP, the lock file check is disabled.
			.UNINDENT
			+.SH AUTOMATIC SERVICE MANAGEMENT (SMF)
			+.sp
			@@ -22,7 +22,7 @@
			+be queried using the \fBsvcs\fP(1) command.
			+.LP
			+\fBDNS\fP on illumos is managed via the service management facility described in
			+\fBsmf\fP(7). There are several options controlled by services properties which
			+\fBsmf\fP(7). There are several options controlled by services properties which
			+can be set by the system administrator. The available options can be listed by
			+executing the following command:
			+.INDENT 0.0
			@@ -70,7 +70,7 @@
			+which will be used to listen for DNS requests.
			+If not specified, the server listens on port 53.
			+Equivalent to command line option '-p <integer>'.
			+.TP
			+.TP
			+.BR options/debug_level
			+An integer that specifies the default debug level. The
			+default is 0; no debugging. The higher the number the
			@@ -101,11 +101,11 @@
			.SH SIGNALS
			.sp
			In routine operation, signals should not be used to control the
			@@ -264,7 +358,8 @@
			@@ -290,7 +384,8 @@
			.UNINDENT
			.SH SEE ALSO
			.sp
			-\fI\%RFC 1033\fP, \fI\%RFC 1034\fP, \fI\%RFC 1035\fP, \fBnamed\-checkconf(8)\fP, \fBnamed\-checkzone(8)\fP, \fBrndc(8)\fP, \fBnamed.conf(5)\fP, BIND 9 Administrator Reference Manual.
			-\fI\%RFC 1033\fP, \fI\%RFC 1034\fP, \fI\%RFC 1035\fP, \fI\%named\-checkconf(8)\fP, \fI\%named\-checkzone(8)\fP, \fI\%rndc(8)\fP, \fI\%named.conf(5)\fP, BIND 9 Administrator Reference Manual.
			+\fI\%RFC 1033\fP, \fI\%RFC 1034\fP, \fI\%RFC 1035\fP, \fBnamed\-checkconf(8)\fP, \fBnamed\-checkzone(8)\fP, \fBrndc(8)\fP, \fBnamed.conf(5)\fP, BIND 9 Administrator Reference Manual,
			+\fBsmf\fP(7), \fBsvcadm\fP(8), \fBsvcs\fP(1), \fBchroot\fP(2).
			.SH AUTHOR

			@@ -4,11 +4,12 @@
			"database/lmdb",
			"library/json-c",
			"library/libedit",
			"library/libidn2",
			"library/libuv",
			"library/libxml2",
			"library/nghttp2",
			"library/security/openssl-11",
			"library/zlib",
			"runtime/python-39",
			"service/security/kerberos-5",
			"shell/ksh93",
			"system/library",

			@@ -1,8 +1,120 @@
			R:cds:FAIL
			R:nsupdate:FAIL
			R:runtime:FAIL
			R:tsiggss:FAIL
			I:System test result summary:
			I: 4 FAIL
			I: 99 PASS
			I: 2 SKIPPED
			PASS: serve-stale
			PASS: rpzrecurse
			FAIL: doth
			PASS: acl
			PASS: additional
			PASS: addzone
			PASS: allow-query
			PASS: auth
			PASS: autosign
			PASS: builtin
			PASS: cacheclean
			PASS: case
			PASS: catz
			FAIL: cds
			PASS: checkconf
			PASS: checknames
			PASS: checkzone
			PASS: database
			PASS: dialup
			PASS: dlzexternal
			PASS: dns64
			PASS: dsdigest
			PASS: dupsigs
			PASS: dyndb
			PASS: ecdsa
			PASS: eddsa
			PASS: ednscompliance
			PASS: emptyzones
			SKIP: enginepkcs11
			PASS: filter-aaaa
			PASS: formerr
			SKIP: geoip2
			PASS: glue
			PASS: idna
			PASS: include-multiplecfg
			PASS: inline
			PASS: integrity
			PASS: hooks
			PASS: host
			PASS: journal
			PASS: keepalive
			SKIP: keyfromlabel
			PASS: legacy
			PASS: limits
			PASS: logfileconfig
			PASS: masterfile
			PASS: masterformat
			PASS: metadata
			PASS: mirror
			PASS: mkeys
			PASS: names
			PASS: notify
			PASS: nsec3
			PASS: nslookup
			PASS: padding
			PASS: pending
			PASS: redirect
			PASS: rndc
			PASS: rootkeysentinel
			PASS: rpz
			PASS: rrchecker
			PASS: rrl
			PASS: rrsetorder
			PASS: rsabigexponent
			PASS: runtime
			PASS: sfcache
			PASS: smartsign
			PASS: sortlist
			PASS: spf
			PASS: staticstub
			PASS: stub
			FAIL: synthfromdnssec
			PASS: tkey
			PASS: tools
			PASS: transport-acl
			PASS: tsig
			FAIL: tsiggss
			PASS: ttl
			PASS: unknown
			PASS: verify
			PASS: views
			PASS: wildcard
			PASS: xferquota
			PASS: zonechecks
			PASS: nzd2nzf
			PASS: fetchlimit
			PASS: ixfr
			FAIL: nsupdate
			PASS: resolver
			FAIL: statistics
			PASS: stress
			PASS: upforwd
			PASS: zero
			FAIL: statschannel
			PASS: xfer
			PASS: reclimit
			PASS: kasp
			PASS: keymgr2kasp
			PASS: tcp
			PASS: pipelined
			PASS: checkds
			PASS: dispatch
			PASS: rpzextra
			PASS: shutdown
			PASS: timeouts
			PASS: qmin
			PASS: cookie
			PASS: digdelv
			PASS: dnssec
			PASS: forward
			PASS: chain
			# TOTAL: 111
			# PASS: 101
			# SKIP: 3
			# XFAIL: 0
			# XFAIL: 0
			# FAIL: 7
			# XPASS: 0
			# XPASS: 0
			# ERROR: 0