pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/bind916 net/bind916: update to 9.16.9
details: https://anonhg.NetBSD.org/pkgsrc/rev/e4614f339d88
branches: trunk
changeset: 442576:e4614f339d88
user: taca <taca%pkgsrc.org@localhost>
date: Thu Nov 26 13:21:51 2020 +0000
description:
net/bind916: update to 9.16.9
--- 9.16.9 released ---
5533. [func] Add the "stale-refresh-time" option, a time window that
starts after a failed lookup, during which a stale RRset
is served directly from cache before a new attempt to
refresh it is made. [GL #2066]
5530. [bug] dnstap did not capture responses to forwarded UPDATE
requests. [GL #2252]
5527. [bug] A NULL pointer dereference occurred when creating an NTA
recheck query failed. [GL #2244]
5525. [bug] Change 5503 inadvertently broke cross-compilation by
replacing a call to AC_LINK_IFELSE() with a call to
AC_RUN_IFELSE() in configure.ac. This has been fixed,
making cross-compilation possible again. [GL #2237]
5523. [bug] The initial lookup in a zone transitioning to/from a
signed state could fail if the DNSKEY RRset was not
found. [GL #2236]
5522. [bug] Fixed a race/NULL dereference in TCPDNS send. [GL #2227]
5520. [bug] Fixed a number of shutdown races, reference counting
errors, and spurious log messages that could occur
in the network manager. [GL #2221]
5518. [bug] Stub zones now work correctly with primary servers using
"minimal-responses yes". [GL #1736]
5517. [bug] Do not treat UV_EOF as a TCP4RecvErr or a TCP6RecvErr.
[GL #2208]
--- 9.16.8 released ---
5516. [func] The default EDNS buffer size has been changed from 4096
to 1232 bytes. [GL #2183]
5515. [func] Add 'rndc dnssec -rollover' command to trigger a manual
rollover for a specific key. [GL #1749]
5514. [bug] Fix KASP expected key size for Ed25519 and Ed448.
[GL #2171]
5513. [doc] The ARM section describing the "rrset-order" statement
was rewritten to make it unambiguous and up-to-date with
the source code. [GL #2139]
5512. [bug] "rrset-order" rules using "order none" were causing
named to crash despite named-checkconf treating them as
valid. [GL #2139]
5511. [bug] 'dig -u +yaml' failed to display timestamps to the
microsecond. [GL #2190]
5510. [bug] Implement the attach/detach semantics for dns_message_t
to fix a data race in accessing an already-destroyed
fctx->rmessage. [GL #2124]
5509. [bug] filter-aaaa: named crashed upon shutdown if it was in
the process of recursing for A RRsets. [GL #1040]
5508. [func] Added new parameter "-expired" for "rndc dumpdb" that
also prints expired RRsets (awaiting cleanup) to the
dump file. [GL #1870]
5507. [bug] Named could compute incorrect SIG(0) responses.
[GL #2109]
5506. [bug] Properly handle failed sysconf() calls, so we don't
report invalid memory size. [GL #2166]
5505. [bug] Updating contents of a mixed-case RPZ could cause some
rules to be ignored. [GL #2169]
5503. [bug] Cleaned up reference counting of network manager
handles, now using isc_nmhandle_attach() and _detach()
instead of _ref() and _unref(). [GL #2122]
diffstat:
net/bind916/Makefile | 5 +-
net/bind916/PLIST | 3 +-
net/bind916/distinfo | 21 +-
net/bind916/patches/patch-bin_tests_system_kasp_tests.sh | 225 --------
net/bind916/patches/patch-bin_tests_system_metadata_tests.sh | 15 -
net/bind916/patches/patch-bin_tests_system_rpz_tests.sh | 15 -
net/bind916/patches/patch-config.guess | 259 +---------
net/bind916/patches/patch-config.sub | 151 +----
net/bind916/patches/patch-configure | 286 +----------
net/bind916/patches/patch-lib_dns_rbt.c | 41 +-
10 files changed, 81 insertions(+), 940 deletions(-)
diffs (truncated from 1489 to 300 lines):
diff -r 2f8e1efd7b02 -r e4614f339d88 net/bind916/Makefile
--- a/net/bind916/Makefile Thu Nov 26 12:32:29 2020 +0000
+++ b/net/bind916/Makefile Thu Nov 26 13:21:51 2020 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2020/11/05 09:08:50 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2020/11/26 13:21:51 taca Exp $
DISTNAME= bind-${BIND_VERSION}
PKGNAME= ${DISTNAME:S/-P/pl/}
-PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/
EXTRACT_SUFX= .tar.xz
@@ -16,7 +15,7 @@
MAKE_JOBS_SAFE= no
-BIND_VERSION= 9.16.7
+BIND_VERSION= 9.16.9
.include "../../mk/bsd.prefs.mk"
diff -r 2f8e1efd7b02 -r e4614f339d88 net/bind916/PLIST
--- a/net/bind916/PLIST Thu Nov 26 12:32:29 2020 +0000
+++ b/net/bind916/PLIST Thu Nov 26 13:21:51 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2020/08/09 17:06:32 taca Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/11/26 13:21:51 taca Exp $
bin/arpaname
bin/delv
bin/dig
@@ -136,6 +136,7 @@
include/isc/bind9.h
include/isc/buffer.h
include/isc/bufferlist.h
+include/isc/cmocka.h
include/isc/commandline.h
include/isc/condition.h
include/isc/counter.h
diff -r 2f8e1efd7b02 -r e4614f339d88 net/bind916/distinfo
--- a/net/bind916/distinfo Thu Nov 26 12:32:29 2020 +0000
+++ b/net/bind916/distinfo Thu Nov 26 13:21:51 2020 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2020/11/07 14:28:31 taca Exp $
+$NetBSD: distinfo,v 1.7 2020/11/26 13:21:51 taca Exp $
-SHA1 (bind-9.16.7.tar.xz) = 633667fac05ad1f87d89bddc504b3e1c3fe0549a
-RMD160 (bind-9.16.7.tar.xz) = 55a5a7cb173ff0bb2214f073c90c2e281daedbd1
-SHA512 (bind-9.16.7.tar.xz) = 176c84657e8a7b10a7ca93c939ca6a7fcdefb22f9200c3f01be59bcd8990dee27b8dc0970299225bcbe0f1aa8f49a67c80c4a9853895ffbcd685adb9674e7768
-Size (bind-9.16.7.tar.xz) = 3241476 bytes
+SHA1 (bind-9.16.9.tar.xz) = feeaa9493c6ed735d4ee9c16e694e2dcd179acab
+RMD160 (bind-9.16.9.tar.xz) = 8df1a370ae12387a3db00d686dd9d122cafeec61
+SHA512 (bind-9.16.9.tar.xz) = d5b7694c51d3756aa273efd19d08889d28dd0e80d4ee29660cd06de0fdbc16a77f4f0d2dd9faef527eea1e496ec3292d158a556a84d5aa3f42dbddbb9c890aac
+Size (bind-9.16.9.tar.xz) = 3260964 bytes
SHA1 (patch-bin_dig_dighost.c) = b1073911d80ecd519af98b6678968296ff8c0c98
SHA1 (patch-bin_dig_include_dig_dig.h) = 10166f5bb98b208c7b10d63eb31e8253f704acc8
SHA1 (patch-bin_named_Makefile.in) = f1367da6a226ba44d0ee13acf00b8abeb5b1b7eb
@@ -11,16 +11,13 @@
SHA1 (patch-bin_named_server.c) = 6e59d3f637ebb829eec2f76ba7c350fb5cf9be6d
SHA1 (patch-bin_nsupdate_nsupdate.c) = 4ccd0e503a972cf16905e999bcc574f8ee0dd85d
SHA1 (patch-bin_pkcs11_pkcs11-keygen.c) = d953bf48aadcdf7e95975d335167cc50f54ef91e
-SHA1 (patch-bin_tests_system_kasp_tests.sh) = 80b096debade569ca28305f8afee4ffdd1c0a908
-SHA1 (patch-bin_tests_system_metadata_tests.sh) = d01a492d0b7738760bdbff714248e279a78fef28
-SHA1 (patch-bin_tests_system_rpz_tests.sh) = 1bc5e0d5c0cc50608e6314c2d2664bd1dc3f6e34
SHA1 (patch-bin_tools_arpaname.c) = 868da4454d06dc823680cf06a764fa40b8474708
SHA1 (patch-bin_tools_nsec3hash.c) = 87c3891db62c45cd8ed2b484b17f7bf2e319bef3
-SHA1 (patch-config.guess) = b3edcb0b841ed7251f313af22ca21b5259ab0d04
+SHA1 (patch-config.guess) = f44c6344a297e7c623dcbf75b308eb35f797a537
SHA1 (patch-config.h.in) = b03a56721762a96439237f7e1fcaa4275c52be49
-SHA1 (patch-config.sub) = 021f252966d9499f76fcbc6e0dd84eb9d5babf5e
+SHA1 (patch-config.sub) = 7389c0f2500f2afe96d43979a2d3e0b9f8dff073
SHA1 (patch-config.threads.in) = fc5cc7097d87523a34c0e630cb8dd1d081d859e5
-SHA1 (patch-configure) = 8c48da70e8b93f19ce468ac8c10b289a660e3f49
+SHA1 (patch-configure) = 8b00a2808ff9ba43e0fab71e1d6f5cdc8c62cff5
SHA1 (patch-contrib_dlz_config.dlz.in) = 6c53d61aaaf1a952a867e4c4da0194db94f511d7
SHA1 (patch-contrib_dlz_modules_wildcard_dlz__wildcard__dynamic.c) = 37ba5f06f4970abaae6d98c4305f6372537a313f
SHA1 (patch-lib_dns_byaddr.c) = 647ddaaaf040233e18d1a87d83bc2bd63d2a20e3
@@ -29,7 +26,7 @@
SHA1 (patch-lib_dns_include_dns_zone.h) = 8abf4c18935629624e68a14361dbeaf00a440c90
SHA1 (patch-lib_dns_lookup.c) = 6c7463aca16abf6bd578aba1733a3217608a39d3
SHA1 (patch-lib_dns_peer.c) = 16cc26fd4e792a23caef6e091f94f974041179e7
-SHA1 (patch-lib_dns_rbt.c) = b52d5b965461a39192d4eab598bc82e54254ab80
+SHA1 (patch-lib_dns_rbt.c) = a9ef153a0548eb432567f1e3347c27ce5775a041
SHA1 (patch-lib_dns_rbtdb.c) = bb3f829cbed23bce624462766aa6d039a0153afe
SHA1 (patch-lib_dns_request.c) = 82560e819cba0259883da8d47618ffabead22c55
SHA1 (patch-lib_dns_sdb.c) = ed447ec7a134e620765b25ee36124a19dfd9fab0
diff -r 2f8e1efd7b02 -r e4614f339d88 net/bind916/patches/patch-bin_tests_system_kasp_tests.sh
--- a/net/bind916/patches/patch-bin_tests_system_kasp_tests.sh Thu Nov 26 12:32:29 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,225 +0,0 @@
-$NetBSD: patch-bin_tests_system_kasp_tests.sh,v 1.2 2020/09/19 13:09:27 taca Exp $
-
-Fix shell portability.
-
---- bin/tests/system/kasp/tests.sh.orig 2020-09-04 10:44:49.000000000 +0000
-+++ bin/tests/system/kasp/tests.sh
-@@ -320,7 +320,7 @@ check_key() {
- # Check file existence.
- [ -s "$KEY_FILE" ] || ret=1
- [ -s "$PRIVATE_FILE" ] || ret=1
-- if [ "$_legacy" == "no" ]; then
-+ if [ "$_legacy" = "no" ]; then
- [ -s "$STATE_FILE" ] || ret=1
- fi
- [ "$ret" -eq 0 ] || log_error "${BASE_FILE} files missing"
-@@ -331,7 +331,7 @@ check_key() {
- KEY_CREATED=$(awk '{print $3}' < "${ZONE}.${KEY_ID}.${_alg_num}.created")
-
- grep "Created: ${KEY_CREATED}" "$PRIVATE_FILE" > /dev/null || log_error "mismatch created in $PRIVATE_FILE"
-- if [ "$_legacy" == "no" ]; then
-+ if [ "$_legacy" = "no" ]; then
- grep "Generated: ${KEY_CREATED}" "$STATE_FILE" > /dev/null || log_error "mismatch generated in $STATE_FILE"
- fi
-
-@@ -344,9 +344,9 @@ check_key() {
- grep "Private-key-format: v1.3" "$PRIVATE_FILE" > /dev/null || log_error "mismatch private key format in $PRIVATE_FILE"
- grep "Algorithm: ${_alg_num} (${_alg_string})" "$PRIVATE_FILE" > /dev/null || log_error "mismatch algorithm in $PRIVATE_FILE"
- # Now check the key state file.
-- if [ "$_legacy" == "no" ]; then
-+ if [ "$_legacy" = "no" ]; then
- grep "This is the state of key ${_key_id}, for ${_zone}." "$STATE_FILE" > /dev/null || log_error "mismatch top comment in $STATE_FILE"
-- if [ "$_lifetime" == "none" ]; then
-+ if [ "$_lifetime" = "none" ]; then
- grep "Lifetime: " "$STATE_FILE" > /dev/null && log_error "unexpected lifetime in $STATE_FILE"
- else
- grep "Lifetime: ${_lifetime}" "$STATE_FILE" > /dev/null || log_error "mismatch lifetime in $STATE_FILE"
-@@ -438,13 +438,13 @@ check_timingmetadata() {
- if [ "$_published" = "none" ]; then
- grep "; Publish:" "${_key_file}" > /dev/null && log_error "unexpected publish comment in ${_key_file}"
- grep "Publish:" "${_private_file}" > /dev/null && log_error "unexpected publish in ${_private_file}"
-- if [ "$_legacy" == "no" ]; then
-+ if [ "$_legacy" = "no" ]; then
- grep "Published: " "${_state_file}" > /dev/null && log_error "unexpected publish in ${_state_file}"
- fi
- else
- grep "; Publish: $_published" "${_key_file}" > /dev/null || log_error "mismatch publish comment in ${_key_file} (expected ${_published})"
- grep "Publish: $_published" "${_private_file}" > /dev/null || log_error "mismatch publish in ${_private_file} (expected ${_published})"
-- if [ "$_legacy" == "no" ]; then
-+ if [ "$_legacy" = "no" ]; then
- grep "Published: $_published" "${_state_file}" > /dev/null || log_error "mismatch publish in ${_state_file} (expected ${_published})"
- fi
- fi
-@@ -452,13 +452,13 @@ check_timingmetadata() {
- if [ "$_syncpublish" = "none" ]; then
- grep "; SyncPublish:" "${_key_file}" > /dev/null && log_error "unexpected syncpublish comment in ${_key_file}"
- grep "SyncPublish:" "${_private_file}" > /dev/null && log_error "unexpected syncpublish in ${_private_file}"
-- if [ "$_legacy" == "no" ]; then
-+ if [ "$_legacy" = "no" ]; then
- grep "PublishCDS: " "${_state_file}" > /dev/null && log_error "unexpected syncpublish in ${_state_file}"
- fi
- else
- grep "; SyncPublish: $_syncpublish" "${_key_file}" > /dev/null || log_error "mismatch syncpublish comment in ${_key_file} (expected ${_syncpublish})"
- grep "SyncPublish: $_syncpublish" "${_private_file}" > /dev/null || log_error "mismatch syncpublish in ${_private_file} (expected ${_syncpublish})"
-- if [ "$_legacy" == "no" ]; then
-+ if [ "$_legacy" = "no" ]; then
- grep "PublishCDS: $_syncpublish" "${_state_file}" > /dev/null || log_error "mismatch syncpublish in ${_state_file} (expected ${_syncpublish})"
- fi
- fi
-@@ -466,13 +466,13 @@ check_timingmetadata() {
- if [ "$_active" = "none" ]; then
- grep "; Activate:" "${_key_file}" > /dev/null && log_error "unexpected active comment in ${_key_file}"
- grep "Activate:" "${_private_file}" > /dev/null && log_error "unexpected active in ${_private_file}"
-- if [ "$_legacy" == "no" ]; then
-+ if [ "$_legacy" = "no" ]; then
- grep "Active: " "${_state_file}" > /dev/null && log_error "unexpected active in ${_state_file}"
- fi
- else
- grep "; Activate: $_active" "${_key_file}" > /dev/null || log_error "mismatch active comment in ${_key_file} (expected ${_active})"
- grep "Activate: $_active" "${_private_file}" > /dev/null || log_error "mismatch active in ${_private_file} (expected ${_active})"
-- if [ "$_legacy" == "no" ]; then
-+ if [ "$_legacy" = "no" ]; then
- grep "Active: $_active" "${_state_file}" > /dev/null || log_error "mismatch active in ${_state_file} (expected ${_active})"
- fi
- fi
-@@ -480,13 +480,13 @@ check_timingmetadata() {
- if [ "$_retired" = "none" ]; then
- grep "; Inactive:" "${_key_file}" > /dev/null && log_error "unexpected retired comment in ${_key_file}"
- grep "Inactive:" "${_private_file}" > /dev/null && log_error "unexpected retired in ${_private_file}"
-- if [ "$_legacy" == "no" ]; then
-+ if [ "$_legacy" = "no" ]; then
- grep "Retired: " "${_state_file}" > /dev/null && log_error "unexpected retired in ${_state_file}"
- fi
- else
- grep "; Inactive: $_retired" "${_key_file}" > /dev/null || log_error "mismatch retired comment in ${_key_file} (expected ${_retired})"
- grep "Inactive: $_retired" "${_private_file}" > /dev/null || log_error "mismatch retired in ${_private_file} (expected ${_retired})"
-- if [ "$_legacy" == "no" ]; then
-+ if [ "$_legacy" = "no" ]; then
- grep "Retired: $_retired" "${_state_file}" > /dev/null || log_error "mismatch retired in ${_state_file} (expected ${_retired})"
- fi
- fi
-@@ -494,13 +494,13 @@ check_timingmetadata() {
- if [ "$_revoked" = "none" ]; then
- grep "; Revoke:" "${_key_file}" > /dev/null && log_error "unexpected revoked comment in ${_key_file}"
- grep "Revoke:" "${_private_file}" > /dev/null && log_error "unexpected revoked in ${_private_file}"
-- if [ "$_legacy" == "no" ]; then
-+ if [ "$_legacy" = "no" ]; then
- grep "Revoked: " "${_state_file}" > /dev/null && log_error "unexpected revoked in ${_state_file}"
- fi
- else
- grep "; Revoke: $_revoked" "${_key_file}" > /dev/null || log_error "mismatch revoked comment in ${_key_file} (expected ${_revoked})"
- grep "Revoke: $_revoked" "${_private_file}" > /dev/null || log_error "mismatch revoked in ${_private_file} (expected ${_revoked})"
-- if [ "$_legacy" == "no" ]; then
-+ if [ "$_legacy" = "no" ]; then
- grep "Revoked: $_revoked" "${_state_file}" > /dev/null || log_error "mismatch revoked in ${_state_file} (expected ${_revoked})"
- fi
- fi
-@@ -508,13 +508,13 @@ check_timingmetadata() {
- if [ "$_removed" = "none" ]; then
- grep "; Delete:" "${_key_file}" > /dev/null && log_error "unexpected removed comment in ${_key_file}"
- grep "Delete:" "${_private_file}" > /dev/null && log_error "unexpected removed in ${_private_file}"
-- if [ "$_legacy" == "no" ]; then
-+ if [ "$_legacy" = "no" ]; then
- grep "Removed: " "${_state_file}" > /dev/null && log_error "unexpected removed in ${_state_file}"
- fi
- else
- grep "; Delete: $_removed" "${_key_file}" > /dev/null || log_error "mismatch removed comment in ${_key_file} (expected ${_removed})"
- grep "Delete: $_removed" "${_private_file}" > /dev/null || log_error "mismatch removed in ${_private_file} (expected ${_removed})"
-- if [ "$_legacy" == "no" ]; then
-+ if [ "$_legacy" = "no" ]; then
- grep "Removed: $_removed" "${_state_file}" > /dev/null || log_error "mismatch removed in ${_state_file} (expected ${_removed})"
- fi
- fi
-@@ -586,7 +586,7 @@ key_unused() {
- grep "Revoke:" "$PRIVATE_FILE" > /dev/null && log_error "unexpected revoked in $PRIVATE_FILE"
- grep "Delete:" "$PRIVATE_FILE" > /dev/null && log_error "unexpected removed in $PRIVATE_FILE"
-
-- if [ "$_legacy" == "no" ]; then
-+ if [ "$_legacy" = "no" ]; then
- 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"
-@@ -1589,7 +1589,7 @@ set_keytimes_algorithm_policy() {
- set_keytime "KEY1" "PUBLISHED" "${created}"
- set_keytime "KEY1" "ACTIVE" "${created}"
- # Key was pregenerated.
-- if [ "$1" == "pregenerated" ]; then
-+ if [ "$1" = "pregenerated" ]; then
- keyfile=$(key_get KEY1 BASEFILE)
- grep "; Publish:" "${keyfile}.key" > published.test${n}.key1
- published=$(awk '{print $3}' < published.test${n}.key1)
-@@ -1616,7 +1616,7 @@ set_keytimes_algorithm_policy() {
- set_keytime "KEY2" "PUBLISHED" "${created}"
- set_keytime "KEY2" "ACTIVE" "${created}"
- # Key was pregenerated.
-- if [ "$1" == "pregenerated" ]; then
-+ if [ "$1" = "pregenerated" ]; then
- keyfile=$(key_get KEY2 BASEFILE)
- grep "; Publish:" "${keyfile}.key" > published.test${n}.key2
- published=$(awk '{print $3}' < published.test${n}.key2)
-@@ -1639,7 +1639,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)
-@@ -2822,12 +2822,12 @@ rollover_predecessor_keytimes() {
- set_addkeytime "KEY1" "PUBLISHED" "${_created}" "${_addtime}"
- set_addkeytime "KEY1" "SYNCPUBLISH" "${_created}" "${_addtime}"
- set_addkeytime "KEY1" "ACTIVE" "${_created}" "${_addtime}"
-- [ "$Lksk" == 0 ] || set_retired_removed "KEY1" "${Lksk}" "${IretKSK}"
-+ [ "$Lksk" = 0 ] || set_retired_removed "KEY1" "${Lksk}" "${IretKSK}"
-
- _created=$(key_get KEY2 CREATED)
- set_addkeytime "KEY2" "PUBLISHED" "${_created}" "${_addtime}"
- set_addkeytime "KEY2" "ACTIVE" "${_created}" "${_addtime}"
-- [ "$Lzsk" == 0 ] || set_retired_removed "KEY2" "${Lzsk}" "${IretZSK}"
-+ [ "$Lzsk" = 0 ] || set_retired_removed "KEY2" "${Lzsk}" "${IretZSK}"
- }
-
- # Key properties.
-@@ -3306,7 +3306,7 @@ csk_rollover_predecessor_keytimes() {
- set_addkeytime "KEY1" "PUBLISHED" "${_created}" "${_addtime}"
- set_addkeytime "KEY1" "SYNCPUBLISH" "${_created}" "${_addtime}"
- set_addkeytime "KEY1" "ACTIVE" "${_created}" "${_addtime}"
-- [ "$Lcsk" == 0 ] || set_retired_removed "KEY1" "${Lcsk}" "${IretCSK}"
-+ [ "$Lcsk" = 0 ] || set_retired_removed "KEY1" "${Lcsk}" "${IretCSK}"
- }
-
- #
-@@ -4272,8 +4272,8 @@ dnssec_verify
- n=$((n+1))
- echo_i "check that of zone ${ZONE} migration to dnssec-policy uses the same keys ($n)"
- ret=0
--[ $_migrate_ksk == $(key_get KEY1 ID) ] || log_error "mismatch ksk tag"
--[ $_migrate_zsk == $(key_get KEY2 ID) ] || log_error "mismatch zsk tag"
-+[ $_migrate_ksk = $(key_get KEY1 ID) ] || log_error "mismatch ksk tag"
-+[ $_migrate_zsk = $(key_get KEY2 ID) ] || log_error "mismatch zsk tag"
- status=$((status+ret))
-
- # Test migration to dnssec-policy, existing keys do not match key algorithm.
-@@ -4388,8 +4388,8 @@ dnssec_verify
- n=$((n+1))
- echo_i "check that of zone ${ZONE} migration to dnssec-policy keeps existing keys ($n)"
- ret=0
--[ $_migratenomatch_algnum_ksk == $(key_get KEY1 ID) ] || log_error "mismatch ksk tag"
--[ $_migratenomatch_algnum_zsk == $(key_get KEY2 ID) ] || log_error "mismatch zsk tag"
-+[ $_migratenomatch_algnum_ksk = $(key_get KEY1 ID) ] || log_error "mismatch ksk tag"
Home |
Main Index |
Thread Index |
Old Index