bind: Update to 9.16.33

Niklas Poslovski

2022-09-29 1ce162baf48d8de8f99224d600eb9235a27cd0b5

bind: Update to 9.16.33

 components/network/bind/Makefile

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

BUILD_BITS=            64
@@ -27,11 +28,11 @@
include ../../../make-rules/shared-macros.mk

COMPONENT_NAME=        bind
COMPONENT_VERSION=    9.16.29
COMPONENT_VERSION=    9.16.33
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:c8408f98ebbd566fc396a28cbda2d94d57efcb98a359618866dec229c8907466
COMPONENT_ARCHIVE_HASH=    sha256:ec4fbea4b2e368d1824971509e33fa159224ad14b436034c6bcd46104c328d91
COMPONENT_ARCHIVE_URL=    https://ftp.isc.org/isc/bind9/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_FMRI=            network/dns/$(COMPONENT_NAME)
COMPONENT_CLASSIFICATION=    Applications/Internet
@@ -40,7 +41,7 @@

include $(WS_MAKE_RULES)/common.mk

PYTHON_VERSION=3.5
PYTHON_VERSION=3.9

COMPONENT_PREP_ACTION =    (cd $(@D) && autoreconf -fi)

@@ -107,7 +108,6 @@
$(TEST_64):    $(INSTALL_64)

# Auto-generated dependencies
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += database/lmdb
REQUIRED_PACKAGES += library/json-c
REQUIRED_PACKAGES += library/libedit
@@ -115,9 +115,9 @@
REQUIRED_PACKAGES += library/libxml2
REQUIRED_PACKAGES += library/security/openssl-11
REQUIRED_PACKAGES += library/zlib
#REQUIRED_PACKAGES += network/dns/bind
REQUIRED_PACKAGES += runtime/python-35
REQUIRED_PACKAGES += runtime/python-39
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/bindc.p5m

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

set name=pkg.fmri \
@@ -75,24 +76,24 @@
link path=usr/lib/dns/$(MACH64)/libns.so target=libns-$(COMPONENT_VERSION).so

# Python packages
file path=usr/lib/python3.5/vendor-packages/isc-2.0-py3.5.egg-info/PKG-INFO
file path=usr/lib/python3.5/vendor-packages/isc-2.0-py3.5.egg-info/SOURCES.txt
file path=usr/lib/python3.5/vendor-packages/isc-2.0-py3.5.egg-info/dependency_links.txt
file path=usr/lib/python3.5/vendor-packages/isc-2.0-py3.5.egg-info/top_level.txt
file path=usr/lib/python3.5/vendor-packages/isc/__init__.py
file path=usr/lib/python3.5/vendor-packages/isc/checkds.py
file path=usr/lib/python3.5/vendor-packages/isc/coverage.py
file path=usr/lib/python3.5/vendor-packages/isc/dnskey.py
file path=usr/lib/python3.5/vendor-packages/isc/eventlist.py
file path=usr/lib/python3.5/vendor-packages/isc/keydict.py
file path=usr/lib/python3.5/vendor-packages/isc/keyevent.py
file path=usr/lib/python3.5/vendor-packages/isc/keymgr.py
file path=usr/lib/python3.5/vendor-packages/isc/keyseries.py
file path=usr/lib/python3.5/vendor-packages/isc/keyzone.py
file path=usr/lib/python3.5/vendor-packages/isc/parsetab.py
file path=usr/lib/python3.5/vendor-packages/isc/policy.py
file path=usr/lib/python3.5/vendor-packages/isc/rndc.py
file path=usr/lib/python3.5/vendor-packages/isc/utils.py
file path=usr/lib/python3.9/vendor-packages/isc-2.0-py3.9.egg-info/PKG-INFO
file path=usr/lib/python3.9/vendor-packages/isc-2.0-py3.9.egg-info/SOURCES.txt
file path=usr/lib/python3.9/vendor-packages/isc-2.0-py3.9.egg-info/dependency_links.txt
file path=usr/lib/python3.9/vendor-packages/isc-2.0-py3.9.egg-info/top_level.txt
file path=usr/lib/python3.9/vendor-packages/isc/__init__.py
file path=usr/lib/python3.9/vendor-packages/isc/checkds.py
file path=usr/lib/python3.9/vendor-packages/isc/coverage.py
file path=usr/lib/python3.9/vendor-packages/isc/dnskey.py
file path=usr/lib/python3.9/vendor-packages/isc/eventlist.py
file path=usr/lib/python3.9/vendor-packages/isc/keydict.py
file path=usr/lib/python3.9/vendor-packages/isc/keyevent.py
file path=usr/lib/python3.9/vendor-packages/isc/keymgr.py
file path=usr/lib/python3.9/vendor-packages/isc/keyseries.py
file path=usr/lib/python3.9/vendor-packages/isc/keyzone.py
file path=usr/lib/python3.9/vendor-packages/isc/parsetab.py
file path=usr/lib/python3.9/vendor-packages/isc/policy.py
file path=usr/lib/python3.9/vendor-packages/isc/rndc.py
file path=usr/lib/python3.9/vendor-packages/isc/utils.py

# Man
file path=usr/share/man/man1/delv.1

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

@@ -181,7 +181,6 @@
file path=usr/include/isc/heap.h
file path=usr/include/isc/hex.h
file path=usr/include/isc/hmac.h
file path=usr/include/isc/hp.h
file path=usr/include/isc/ht.h
file path=usr/include/isc/httpd.h
file path=usr/include/isc/interfaceiter.h
@@ -214,7 +213,6 @@
file path=usr/include/isc/pool.h
file path=usr/include/isc/portset.h
file path=usr/include/isc/print.h
file path=usr/include/isc/queue.h
file path=usr/include/isc/quota.h
file path=usr/include/isc/radix.h
file path=usr/include/isc/random.h
@@ -310,24 +308,24 @@
file path=usr/lib/dns/$(MACH64)/libns-$(COMPONENT_VERSION).so
link path=usr/lib/dns/$(MACH64)/libns.so target=libns-$(COMPONENT_VERSION).so
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/PKG-INFO
file path=usr/lib/python3.5/vendor-packages/isc-2.0-py3.5.egg-info/SOURCES.txt
file path=usr/lib/python3.5/vendor-packages/isc-2.0-py3.5.egg-info/dependency_links.txt
file path=usr/lib/python3.5/vendor-packages/isc-2.0-py3.5.egg-info/top_level.txt
file path=usr/lib/python3.5/vendor-packages/isc/__init__.py
file path=usr/lib/python3.5/vendor-packages/isc/checkds.py
file path=usr/lib/python3.5/vendor-packages/isc/coverage.py
file path=usr/lib/python3.5/vendor-packages/isc/dnskey.py
file path=usr/lib/python3.5/vendor-packages/isc/eventlist.py
file path=usr/lib/python3.5/vendor-packages/isc/keydict.py
file path=usr/lib/python3.5/vendor-packages/isc/keyevent.py
file path=usr/lib/python3.5/vendor-packages/isc/keymgr.py
file path=usr/lib/python3.5/vendor-packages/isc/keyseries.py
file path=usr/lib/python3.5/vendor-packages/isc/keyzone.py
file path=usr/lib/python3.5/vendor-packages/isc/parsetab.py
file path=usr/lib/python3.5/vendor-packages/isc/policy.py
file path=usr/lib/python3.5/vendor-packages/isc/rndc.py
file path=usr/lib/python3.5/vendor-packages/isc/utils.py
file path=usr/lib/python3.9/vendor-packages/isc-2.0-py3.9.egg-info/PKG-INFO
file path=usr/lib/python3.9/vendor-packages/isc-2.0-py3.9.egg-info/SOURCES.txt
file path=usr/lib/python3.9/vendor-packages/isc-2.0-py3.9.egg-info/dependency_links.txt
file path=usr/lib/python3.9/vendor-packages/isc-2.0-py3.9.egg-info/top_level.txt
file path=usr/lib/python3.9/vendor-packages/isc/__init__.py
file path=usr/lib/python3.9/vendor-packages/isc/checkds.py
file path=usr/lib/python3.9/vendor-packages/isc/coverage.py
file path=usr/lib/python3.9/vendor-packages/isc/dnskey.py
file path=usr/lib/python3.9/vendor-packages/isc/eventlist.py
file path=usr/lib/python3.9/vendor-packages/isc/keydict.py
file path=usr/lib/python3.9/vendor-packages/isc/keyevent.py
file path=usr/lib/python3.9/vendor-packages/isc/keymgr.py
file path=usr/lib/python3.9/vendor-packages/isc/keyseries.py
file path=usr/lib/python3.9/vendor-packages/isc/keyzone.py
file path=usr/lib/python3.9/vendor-packages/isc/parsetab.py
file path=usr/lib/python3.9/vendor-packages/isc/policy.py
file path=usr/lib/python3.9/vendor-packages/isc/rndc.py
file path=usr/lib/python3.9/vendor-packages/isc/utils.py
file path=usr/sbin/ddns-confgen
file path=usr/sbin/dnssec-cds
file path=usr/sbin/dnssec-checkds

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

@@ -1,38 +1,36 @@
OpenIndiana uses the folder vendor-packages instead of site-packages.

diff -ur bind-9.14.3/bin/python/dnssec-checkds.py.in bind-9.14.3-patched/bin/python/dnssec-checkds.py.in
--- bind-9.14.3/bin/python/dnssec-checkds.py.in    2019-06-04 18:20:04.000000000 +0000
+++ bind-9.14.3-patched/bin/python/dnssec-checkds.py.in    2019-06-23 16:46:42.639989194 +0000
@@ -19,7 +19,7 @@
         sys.path.insert(1, '@PYTHON_INSTALL_DIR@')
     else:
         sys.path.insert(1, os.path.join('@prefix@', 'lib',
-                        'python' + sys.version[:3], 'site-packages'))
+                        'python' + sys.version[:3], 'vendor-packages'))
diff -Nru bind-9.16.33.orig/bin/python/dnssec-checkds.py.in bind-9.16.33/bin/python/dnssec-checkds.py.in
--- bind-9.16.33.orig/bin/python/dnssec-checkds.py.in    2022-09-08 15:01:23.000000000 +0000
+++ bind-9.16.33/bin/python/dnssec-checkds.py.in    2022-09-28 11:10:25.444562876 +0000
@@ -22,7 +22,7 @@
         sys.path.insert(
             1,
             os.path.join(
-                "@prefix@", "lib", "python" + sys.version[:3], "site-packages"
+                "@prefix@", "lib", "python" + sys.version[:3], "vendor-packages"
             ),
         )
 
 import isc.checkds
diff -Nru bind-9.16.33.orig/bin/python/dnssec-coverage.py.in bind-9.16.33/bin/python/dnssec-coverage.py.in
--- bind-9.16.33.orig/bin/python/dnssec-coverage.py.in    2022-09-08 15:01:23.000000000 +0000
+++ bind-9.16.33/bin/python/dnssec-coverage.py.in    2022-09-28 11:10:33.515339741 +0000
@@ -22,7 +22,7 @@
         sys.path.insert(
             1,
             os.path.join(
-                "@prefix@", "lib", "python" + sys.version[:3], "site-packages"
+                "@prefix@", "lib", "python" + sys.version[:3], "vendor-packages"
             ),
         )
 
diff -ur bind-9.14.3/bin/python/dnssec-coverage.py.in bind-9.14.3-patched/bin/python/dnssec-coverage.py.in
--- bind-9.14.3/bin/python/dnssec-coverage.py.in    2019-06-04 18:20:04.000000000 +0000
+++ bind-9.14.3-patched/bin/python/dnssec-coverage.py.in    2019-06-23 16:46:27.245745285 +0000
@@ -19,7 +19,7 @@
         sys.path.insert(1, '@PYTHON_INSTALL_DIR@')
     else:
         sys.path.insert(1, os.path.join('@prefix@', 'lib',
-                        'python' + sys.version[:3], 'site-packages'))
+                        'python' + sys.version[:3], 'vendor-packages'))
 
 import isc.coverage
 
diff -ur bind-9.14.3/bin/python/dnssec-keymgr.py.in bind-9.14.3-patched/bin/python/dnssec-keymgr.py.in
--- bind-9.14.3/bin/python/dnssec-keymgr.py.in    2019-06-04 18:20:04.000000000 +0000
+++ bind-9.14.3-patched/bin/python/dnssec-keymgr.py.in    2019-06-23 16:46:57.198420733 +0000
@@ -19,7 +19,7 @@
         sys.path.insert(1, '@PYTHON_INSTALL_DIR@')
     else:
         sys.path.insert(1, os.path.join('@prefix@', 'lib',
-                        'python' + sys.version[:3], 'site-packages'))
+                        'python' + sys.version[:3], 'vendor-packages'))
 
 import isc.keymgr
diff -Nru bind-9.16.33.orig/bin/python/dnssec-keymgr.py.in bind-9.16.33/bin/python/dnssec-keymgr.py.in
--- bind-9.16.33.orig/bin/python/dnssec-keymgr.py.in    2022-09-08 15:01:23.000000000 +0000
+++ bind-9.16.33/bin/python/dnssec-keymgr.py.in    2022-09-28 11:10:42.164733437 +0000
@@ -22,7 +22,7 @@
         sys.path.insert(
             1,
             os.path.join(
-                "@prefix@", "lib", "python" + sys.version[:3], "site-packages"
+                "@prefix@", "lib", "python" + sys.version[:3], "vendor-packages"
             ),
         )
 

 components/network/bind/pkg5

@@ -8,7 +8,7 @@
        "library/libxml2",
        "library/security/openssl-11",
        "library/zlib",
        "runtime/python-35",
        "runtime/python-39",
        "service/security/kerberos-5",
        "shell/ksh93",
        "system/library",

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