Various fixes for BIND 9.16.6:
* Install *.rst instead of *.html doc files * Fix up change of test == to test =
This commit is contained in:
Havard Eidnes
parent
8d6998a9ff
commit
43cc4c8063
|
|
@ -15,7 +15,7 @@ CONFLICTS+= host-[0-9]*
|
|||
|
||||
MAKE_JOBS_SAFE= no
|
||||
|
||||
BIND_VERSION= 9.16.4
|
||||
BIND_VERSION= 9.16.6
|
||||
|
||||
# For libatomic and 64-bit operations
|
||||
#USE_PKGSRC_GCC= yes
|
||||
|
|
@ -83,7 +83,7 @@ post-install:
|
|||
.for f in ${DOCS}
|
||||
${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${DOCDIR}
|
||||
.endfor
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${DESTDIR}${PREFIX}/${DOCDIR}/arm
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/arm/*.rst ${DESTDIR}${PREFIX}/${DOCDIR}/arm
|
||||
|
||||
.include "../../security/openssl/buildlink3.mk"
|
||||
.include "../../devel/zlib/buildlink3.mk"
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@ include/dns/keytable.h
|
|||
include/dns/keyvalues.h
|
||||
include/dns/lib.h
|
||||
include/dns/librpz.h
|
||||
include/dns/lmdb.h
|
||||
include/dns/log.h
|
||||
include/dns/lookup.h
|
||||
include/dns/master.h
|
||||
|
|
@ -220,6 +221,7 @@ include/isc/time.h
|
|||
include/isc/timer.h
|
||||
include/isc/tm.h
|
||||
include/isc/types.h
|
||||
include/isc/utf8.h
|
||||
include/isc/util.h
|
||||
include/isc/version.h
|
||||
include/isccc/alist.h
|
||||
|
|
@ -284,10 +286,13 @@ man/man5/named.conf.5
|
|||
man/man5/rndc.conf.5
|
||||
man/man8/ddns-confgen.8
|
||||
man/man8/dnssec-cds.8
|
||||
man/man8/dnssec-checkds.8
|
||||
man/man8/dnssec-coverage.8
|
||||
man/man8/dnssec-dsfromkey.8
|
||||
man/man8/dnssec-importkey.8
|
||||
man/man8/dnssec-keyfromlabel.8
|
||||
man/man8/dnssec-keygen.8
|
||||
man/man8/dnssec-keymgr.8
|
||||
man/man8/dnssec-revoke.8
|
||||
man/man8/dnssec-settime.8
|
||||
man/man8/dnssec-signzone.8
|
||||
|
|
@ -325,55 +330,24 @@ share/doc/bind9/CHANGES
|
|||
share/doc/bind9/HISTORY
|
||||
share/doc/bind9/OPTIONS
|
||||
share/doc/bind9/README
|
||||
share/doc/bind9/arm/Bv9ARM.ch01.html
|
||||
share/doc/bind9/arm/Bv9ARM.ch02.html
|
||||
share/doc/bind9/arm/Bv9ARM.ch03.html
|
||||
share/doc/bind9/arm/Bv9ARM.ch04.html
|
||||
share/doc/bind9/arm/Bv9ARM.ch05.html
|
||||
share/doc/bind9/arm/Bv9ARM.ch06.html
|
||||
share/doc/bind9/arm/Bv9ARM.ch07.html
|
||||
share/doc/bind9/arm/Bv9ARM.ch08.html
|
||||
share/doc/bind9/arm/Bv9ARM.ch09.html
|
||||
share/doc/bind9/arm/Bv9ARM.ch10.html
|
||||
share/doc/bind9/arm/Bv9ARM.ch11.html
|
||||
share/doc/bind9/arm/Bv9ARM.ch12.html
|
||||
share/doc/bind9/arm/Bv9ARM.html
|
||||
share/doc/bind9/arm/man.arpaname.html
|
||||
share/doc/bind9/arm/man.ddns-confgen.html
|
||||
share/doc/bind9/arm/man.delv.html
|
||||
share/doc/bind9/arm/man.dig.html
|
||||
share/doc/bind9/arm/man.dnssec-cds.html
|
||||
share/doc/bind9/arm/man.dnssec-checkds.html
|
||||
share/doc/bind9/arm/man.dnssec-coverage.html
|
||||
share/doc/bind9/arm/man.dnssec-dsfromkey.html
|
||||
share/doc/bind9/arm/man.dnssec-importkey.html
|
||||
share/doc/bind9/arm/man.dnssec-keyfromlabel.html
|
||||
share/doc/bind9/arm/man.dnssec-keygen.html
|
||||
share/doc/bind9/arm/man.dnssec-keymgr.html
|
||||
share/doc/bind9/arm/man.dnssec-revoke.html
|
||||
share/doc/bind9/arm/man.dnssec-settime.html
|
||||
share/doc/bind9/arm/man.dnssec-signzone.html
|
||||
share/doc/bind9/arm/man.dnssec-verify.html
|
||||
share/doc/bind9/arm/man.dnstap-read.html
|
||||
share/doc/bind9/arm/man.filter-aaaa.html
|
||||
share/doc/bind9/arm/man.host.html
|
||||
share/doc/bind9/arm/man.mdig.html
|
||||
share/doc/bind9/arm/man.named-checkconf.html
|
||||
share/doc/bind9/arm/man.named-checkzone.html
|
||||
share/doc/bind9/arm/man.named-journalprint.html
|
||||
share/doc/bind9/arm/man.named-nzd2nzf.html
|
||||
share/doc/bind9/arm/man.named-rrchecker.html
|
||||
share/doc/bind9/arm/man.named.conf.html
|
||||
share/doc/bind9/arm/man.named.html
|
||||
share/doc/bind9/arm/man.nsec3hash.html
|
||||
share/doc/bind9/arm/man.nslookup.html
|
||||
share/doc/bind9/arm/man.nsupdate.html
|
||||
share/doc/bind9/arm/man.pkcs11-destroy.html
|
||||
share/doc/bind9/arm/man.pkcs11-keygen.html
|
||||
share/doc/bind9/arm/man.pkcs11-list.html
|
||||
share/doc/bind9/arm/man.pkcs11-tokens.html
|
||||
share/doc/bind9/arm/man.rndc-confgen.html
|
||||
share/doc/bind9/arm/man.rndc.conf.html
|
||||
share/doc/bind9/arm/man.rndc.html
|
||||
share/doc/bind9/arm/notes.html
|
||||
share/doc/bind9/arm/advanced.rst
|
||||
share/doc/bind9/arm/catz.rst
|
||||
share/doc/bind9/arm/configuration.rst
|
||||
share/doc/bind9/arm/dlz.rst
|
||||
share/doc/bind9/arm/dnssec.rst
|
||||
share/doc/bind9/arm/dyndb.rst
|
||||
share/doc/bind9/arm/general.rst
|
||||
share/doc/bind9/arm/history.rst
|
||||
share/doc/bind9/arm/index.rst
|
||||
share/doc/bind9/arm/introduction.rst
|
||||
share/doc/bind9/arm/logging-categories.rst
|
||||
share/doc/bind9/arm/managed-keys.rst
|
||||
share/doc/bind9/arm/manpages.rst
|
||||
share/doc/bind9/arm/notes.rst
|
||||
share/doc/bind9/arm/pkcs11.rst
|
||||
share/doc/bind9/arm/plugins.rst
|
||||
share/doc/bind9/arm/reference.rst
|
||||
share/doc/bind9/arm/requirements.rst
|
||||
share/doc/bind9/arm/security.rst
|
||||
share/doc/bind9/arm/troubleshooting.rst
|
||||
share/examples/bind9/bind.keys
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
$NetBSD: distinfo,v 1.14 2020/02/20 16:37:06 taca Exp $
|
||||
|
||||
SHA1 (bind-9.16.4.tar.xz) = e6cb05910a6bb9dbc36b3b6d88de7b28fa78c299
|
||||
RMD160 (bind-9.16.4.tar.xz) = 6debe010ff34a7e9f137fb089753d6d0ecc9d52c
|
||||
SHA512 (bind-9.16.4.tar.xz) = b1cf0607b0d7569ea594e02848eed601b8faf31c527fc17d379cfff3cd45c0c8b849364af0312e9b65bc14875aad87de379281603c150a07bf021ec740e92860
|
||||
Size (bind-9.16.4.tar.xz) = 3465172 bytes
|
||||
SHA1 (bind-9.16.6.tar.xz) = f8a4c1bd074cc0305a4c50971e71da5a3b810d78
|
||||
RMD160 (bind-9.16.6.tar.xz) = 3b296d967a6a5a709b599efbffc9697060c5f91b
|
||||
SHA512 (bind-9.16.6.tar.xz) = 37f57db6d1633cc85a4d954a69bbb3372c65ac43fef965df5aee8dcdd32153bb5b0c6d0d5f00f353dd4464c71d74dc8e801937b930e2b8f6799fa77af5f243e0
|
||||
Size (bind-9.16.6.tar.xz) = 3228368 bytes
|
||||
SHA1 (patch-bin_named_Makefile.in) = 8ef44cfa5b7c66562d9e26b0d3052ccd53388b6f
|
||||
SHA1 (patch-bin_named_main.c) = c62eb07ae859d022a77d2b3cbaa48df73e4fa8d4
|
||||
SHA1 (patch-bin_named_pfilter.c) = b54f872c883c8fbc2d9c04df65c185dc057cc36b
|
||||
|
|
@ -11,7 +11,7 @@ SHA1 (patch-bin_named_pfilter.h) = c14617cb266a4b5d33ba6e5db98562e806792833
|
|||
SHA1 (patch-bin_named_server.c) = 57f43d4556588447f44980c5acd36cb00cc528cc
|
||||
SHA1 (patch-bin_nsupdate_nsupdate.c) = f71213385ec7c78243c1f93a6940caa111cb5072
|
||||
SHA1 (patch-bin_pkcs11_pkcs11-keygen.c) = d953bf48aadcdf7e95975d335167cc50f54ef91e
|
||||
SHA1 (patch-bin_tests_system_kasp_tests.sh) = 644857a9cdbdb4baba3de004f58945f9542aad55
|
||||
SHA1 (patch-bin_tests_system_kasp_tests.sh) = 76d49ddc9781dd9f03420f1a0b212cc7d0a4e1e3
|
||||
SHA1 (patch-bin_tests_system_metadata_tests.sh) = d01a492d0b7738760bdbff714248e279a78fef28
|
||||
SHA1 (patch-bin_tests_system_rpz_tests.sh) = 1bc5e0d5c0cc50608e6314c2d2664bd1dc3f6e34
|
||||
SHA1 (patch-bin_tools_arpaname.c) = b17050df38ca9734f40351a37a6faf581481e2da
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ $NetBSD$
|
|||
|
||||
Portability in shell script, don't use == with test.
|
||||
|
||||
--- bin/tests/system/kasp/tests.sh.orig 2020-05-06 09:59:35.000000000 +0000
|
||||
--- bin/tests/system/kasp/tests.sh.orig 2020-08-10 09:31:13.000000000 +0000
|
||||
+++ bin/tests/system/kasp/tests.sh
|
||||
@@ -320,7 +320,7 @@ check_key() {
|
||||
# Check file existence.
|
||||
|
|
@ -139,7 +139,7 @@ Portability in shell script, don't use == with test.
|
|||
grep "Published: " "$STATE_FILE" > /dev/null && log_error "unexpected publish in $STATE_FILE"
|
||||
grep "Active: " "$STATE_FILE" > /dev/null && log_error "unexpected active in $STATE_FILE"
|
||||
grep "Retired: " "$STATE_FILE" > /dev/null && log_error "unexpected retired in $STATE_FILE"
|
||||
@@ -1286,7 +1286,7 @@ set_keytimes_algorithm_policy() {
|
||||
@@ -1324,7 +1324,7 @@ set_keytimes_algorithm_policy() {
|
||||
set_keytime "KEY1" "PUBLISHED" "${created}"
|
||||
set_keytime "KEY1" "ACTIVE" "${created}"
|
||||
# Key was pregenerated.
|
||||
|
|
@ -148,7 +148,7 @@ Portability in shell script, don't use == with test.
|
|||
keyfile=$(key_get KEY1 BASEFILE)
|
||||
grep "; Publish:" "${keyfile}.key" > published.test${n}.key1
|
||||
published=$(awk '{print $3}' < published.test${n}.key1)
|
||||
@@ -1313,7 +1313,7 @@ set_keytimes_algorithm_policy() {
|
||||
@@ -1351,7 +1351,7 @@ set_keytimes_algorithm_policy() {
|
||||
set_keytime "KEY2" "PUBLISHED" "${created}"
|
||||
set_keytime "KEY2" "ACTIVE" "${created}"
|
||||
# Key was pregenerated.
|
||||
|
|
@ -157,16 +157,16 @@ Portability in shell script, don't use == with test.
|
|||
keyfile=$(key_get KEY2 BASEFILE)
|
||||
grep "; Publish:" "${keyfile}.key" > published.test${n}.key2
|
||||
published=$(awk '{print $3}' < published.test${n}.key2)
|
||||
@@ -1336,7 +1336,7 @@ set_keytimes_algorithm_policy() {
|
||||
set_keytime "KEY3" "PUBLISHED" "${published}"
|
||||
set_keytime "KEY3" "ACTIVE" "${published}"
|
||||
@@ -1374,7 +1374,7 @@ set_keytimes_algorithm_policy() {
|
||||
set_keytime "KEY3" "PUBLISHED" "${created}"
|
||||
set_keytime "KEY3" "ACTIVE" "${created}"
|
||||
# Key was pregenerated.
|
||||
- if [ "$1" == "pregenerated" ]; then
|
||||
+ if [ "$1" = "pregenerated" ]; then
|
||||
keyfile=$(key_get KEY3 BASEFILE)
|
||||
grep "; Publish:" "${keyfile}.key" > published.test${n}.key3
|
||||
published=$(awk '{print $3}' < published.test${n}.key3)
|
||||
@@ -2469,12 +2469,12 @@ rollover_predecessor_keytimes() {
|
||||
@@ -2541,12 +2541,12 @@ rollover_predecessor_keytimes() {
|
||||
set_addkeytime "KEY1" "PUBLISHED" "${_created}" "${_addtime}"
|
||||
set_addkeytime "KEY1" "SYNCPUBLISH" "${_created}" "${_addtime}"
|
||||
set_addkeytime "KEY1" "ACTIVE" "${_created}" "${_addtime}"
|
||||
|
|
@ -181,7 +181,7 @@ Portability in shell script, don't use == with test.
|
|||
}
|
||||
|
||||
# Key properties.
|
||||
@@ -2922,7 +2922,7 @@ csk_rollover_predecessor_keytimes() {
|
||||
@@ -2994,7 +2994,7 @@ csk_rollover_predecessor_keytimes() {
|
||||
set_addkeytime "KEY1" "PUBLISHED" "${_created}" "${_addksktime}"
|
||||
set_addkeytime "KEY1" "SYNCPUBLISH" "${_created}" "${_addzsktime}"
|
||||
set_addkeytime "KEY1" "ACTIVE" "${_created}" "${_addzsktime}"
|
||||
|
|
@ -190,7 +190,7 @@ Portability in shell script, don't use == with test.
|
|||
}
|
||||
|
||||
#
|
||||
@@ -3824,8 +3824,8 @@ dnssec_verify
|
||||
@@ -3908,8 +3908,8 @@ dnssec_verify
|
||||
n=$((n+1))
|
||||
echo_i "check that of zone ${ZONE} migration to dnssec-policy uses the same keys ($n)"
|
||||
ret=0
|
||||
|
|
@ -201,7 +201,7 @@ Portability in shell script, don't use == with test.
|
|||
status=$((status+ret))
|
||||
|
||||
# Test migration to dnssec-policy, existing keys do not match key algorithm.
|
||||
@@ -3939,8 +3939,8 @@ dnssec_verify
|
||||
@@ -4024,8 +4024,8 @@ dnssec_verify
|
||||
n=$((n+1))
|
||||
echo_i "check that of zone ${ZONE} migration to dnssec-policy keeps existing keys ($n)"
|
||||
ret=0
|
||||
|
|
@ -212,7 +212,7 @@ Portability in shell script, don't use == with test.
|
|||
status=$((status+ret))
|
||||
|
||||
# Test migration to dnssec-policy, existing keys do not match key length.
|
||||
@@ -4055,8 +4055,8 @@ dnssec_verify
|
||||
@@ -4141,8 +4141,8 @@ dnssec_verify
|
||||
n=$((n+1))
|
||||
echo_i "check that of zone ${ZONE} migration to dnssec-policy keeps existing keys ($n)"
|
||||
ret=0
|
||||
|
|
|
|||
Loading…
Reference in New Issue