Merge ~lvoytek/ubuntu/+source/bind9:mre-9.18.24-jammy into ubuntu/+source/bind9:ubuntu/jammy-devel

Proposed by Lena Voytek
Status: Merged
Approved by: Andreas Hasenack
Approved revision: 9c277ca9cc2ca4e631866f6e805c8082bb880b22
Merge reported by: Andreas Hasenack
Merged at revision: 9c277ca9cc2ca4e631866f6e805c8082bb880b22
Proposed branch: ~lvoytek/ubuntu/+source/bind9:mre-9.18.24-jammy
Merge into: ubuntu/+source/bind9:ubuntu/jammy-devel
Diff against target: 132174 lines (+42515/-34605)
713 files modified
CHANGES (+186/-0)
CONTRIBUTING.md (+1/-16)
ChangeLog (+186/-0)
Makefile.in (+8/-10)
NEWS (+186/-0)
README.md (+3/-11)
SECURITY.md (+35/-0)
aclocal.m4 (+325/-122)
ar-lib (+1/-1)
bin/Makefile.in (+6/-7)
bin/check/Makefile.in (+6/-7)
bin/confgen/Makefile.in (+6/-7)
bin/delv/Makefile.in (+6/-7)
bin/dig/Makefile.in (+6/-7)
bin/dig/dighost.c (+2/-0)
bin/dnssec/Makefile.in (+6/-7)
bin/dnssec/dnssec-signzone.c (+1/-1)
bin/named/Makefile.in (+6/-7)
bin/named/config.c (+2/-2)
bin/named/os.c (+11/-10)
bin/named/server.c (+21/-19)
bin/nsupdate/Makefile.in (+6/-7)
bin/nsupdate/nsupdate.c (+27/-16)
bin/plugins/Makefile.in (+6/-7)
bin/rndc/Makefile.in (+6/-7)
bin/rndc/rndc.rst (+3/-1)
bin/tests/Makefile.in (+6/-7)
bin/tests/system/Makefile.am (+52/-76)
bin/tests/system/Makefile.in (+420/-335)
bin/tests/system/README (+25/-10)
bin/tests/system/acl/ns2/named1.conf.in (+1/-1)
bin/tests/system/acl/ns2/named2.conf.in (+1/-1)
bin/tests/system/acl/ns2/named3.conf.in (+1/-1)
bin/tests/system/acl/ns2/named4.conf.in (+1/-1)
bin/tests/system/acl/ns2/named5.conf.in (+1/-1)
bin/tests/system/acl/tests.sh (+106/-53)
bin/tests/system/additional/ns1/named1.conf.in (+1/-1)
bin/tests/system/additional/ns1/named2.conf.in (+1/-1)
bin/tests/system/additional/ns1/named3.conf.in (+1/-1)
bin/tests/system/additional/ns1/named4.conf.in (+1/-1)
bin/tests/system/additional/tests.sh (+272/-246)
bin/tests/system/addzone/ns1/named.conf.in (+1/-1)
bin/tests/system/addzone/ns2/named1.conf.in (+2/-2)
bin/tests/system/addzone/ns2/named2.conf.in (+3/-3)
bin/tests/system/addzone/ns2/named3.conf.in (+4/-4)
bin/tests/system/addzone/ns3/named1.conf.in (+1/-1)
bin/tests/system/addzone/ns3/named2.conf.in (+1/-1)
bin/tests/system/addzone/tests.sh (+261/-260)
bin/tests/system/addzone/tests_rndc_deadlock.py (+1/-1)
bin/tests/system/allow-query/ns2/named01.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named02.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named03.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named04.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named05.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named06.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named07.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named08.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named09.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named10.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named11.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named12.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named21.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named22.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named23.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named24.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named25.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named26.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named27.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named28.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named29.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named30.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named31.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named32.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named33.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named34.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named40.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named53.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named54.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named55.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named56.conf.in (+1/-1)
bin/tests/system/allow-query/ns2/named57.conf.in (+1/-1)
bin/tests/system/allow-query/ns3/named1.conf.in (+1/-1)
bin/tests/system/allow-query/ns3/named2.conf.in (+1/-1)
bin/tests/system/allow-query/ns3/named3.conf.in (+1/-1)
bin/tests/system/allow-query/ns3/named4.conf.in (+1/-1)
bin/tests/system/allow-query/setup.sh (+4/-4)
bin/tests/system/allow-query/tests.sh (+209/-210)
bin/tests/system/allow-query/tests_sh_allow_query.py (+1/-1)
bin/tests/system/auth/tests.sh (+70/-72)
bin/tests/system/autosign/ns1/keygen.sh (+13/-13)
bin/tests/system/autosign/ns2/keygen.sh (+17/-19)
bin/tests/system/autosign/ns2/named.conf.in (+1/-1)
bin/tests/system/autosign/ns3/keygen.sh (+155/-147)
bin/tests/system/autosign/ns3/named.conf.in (+10/-1)
bin/tests/system/autosign/ns3/nsec3-to-nsec3.example.db.in (+26/-0)
bin/tests/system/autosign/ns4/named.conf.in (+1/-1)
bin/tests/system/autosign/ns5/named.conf.in (+1/-1)
bin/tests/system/autosign/tests.sh (+589/-548)
bin/tests/system/builtin/ns1/named.conf.in (+1/-1)
bin/tests/system/builtin/ns2/named.conf.in (+1/-1)
bin/tests/system/builtin/ns3/named.conf.in (+1/-1)
bin/tests/system/builtin/tests.sh (+93/-54)
bin/tests/system/cacheclean/ns2/named.conf.in (+1/-1)
bin/tests/system/cacheclean/tests.sh (+61/-49)
bin/tests/system/case/tests.sh (+28/-30)
bin/tests/system/catz/ns1/named.conf.in (+1/-1)
bin/tests/system/catz/ns2/named1.conf.in (+1/-1)
bin/tests/system/catz/ns2/named2.conf.in (+1/-1)
bin/tests/system/catz/ns3/named.conf.in (+1/-1)
bin/tests/system/catz/ns4/named.conf.in (+1/-1)
bin/tests/system/catz/tests.sh (+925/-930)
bin/tests/system/cds/setup.sh (+24/-24)
bin/tests/system/cds/tests.sh (+35/-31)
bin/tests/system/chain/ans3/ans.pl (+14/-2)
bin/tests/system/chain/ns2/sign.sh (+5/-5)
bin/tests/system/chain/ns5/named.conf.in (+1/-1)
bin/tests/system/chain/prereq.sh (+31/-0)
bin/tests/system/chain/tests.sh (+129/-129)
bin/tests/system/checkconf/deprecated.conf (+7/-2)
bin/tests/system/checkconf/tests.sh (+405/-265)
bin/tests/system/checkds/ns1/setup.sh (+6/-6)
bin/tests/system/checkds/ns2/named.conf.in (+1/-1)
bin/tests/system/checkds/ns2/setup.sh (+10/-11)
bin/tests/system/checkds/ns3/named.conf.in (+1/-1)
bin/tests/system/checkds/ns5/named.conf.in (+1/-1)
bin/tests/system/checkds/ns5/setup.sh (+4/-4)
bin/tests/system/checkds/ns6/named.conf.in (+1/-1)
bin/tests/system/checkds/ns7/named.conf.in (+1/-1)
bin/tests/system/checkds/ns9/named.conf.in (+1/-1)
bin/tests/system/checkds/ns9/setup.sh (+25/-27)
bin/tests/system/checkds/setup.sh (+8/-8)
bin/tests/system/checkds/tests_checkds.py (+5/-0)
bin/tests/system/checknames/tests.sh (+47/-47)
bin/tests/system/checkzone/setup.sh (+1/-1)
bin/tests/system/checkzone/tests.sh (+88/-90)
bin/tests/system/ckdnsrps.sh (+64/-59)
bin/tests/system/cleanall.sh (+7/-10)
bin/tests/system/conf.sh.common (+7/-7)
bin/tests/system/conf.sh.in (+9/-9)
bin/tests/system/conftest.py (+601/-572)
bin/tests/system/convert-junit-to-trs.py (+70/-0)
bin/tests/system/cookie/prereq.sh (+21/-0)
bin/tests/system/cookie/tests.sh (+207/-210)
bin/tests/system/custom-test-driver (+69/-42)
bin/tests/system/database/tests.sh (+10/-11)
bin/tests/system/dialup/tests.sh (+19/-23)
bin/tests/system/digdelv/ns2/named.conf.in (+1/-1)
bin/tests/system/digdelv/ns2/sign.sh (+5/-5)
bin/tests/system/digdelv/ns3/named.conf.in (+1/-1)
bin/tests/system/digdelv/prereq.sh (+26/-0)
bin/tests/system/digdelv/tests.sh (+639/-639)
bin/tests/system/dispatch/ns2/named.conf.in (+1/-1)
bin/tests/system/dlzexternal/driver/Makefile.am (+1/-1)
bin/tests/system/dlzexternal/driver/Makefile.in (+16/-16)
bin/tests/system/dlzexternal/prereq.sh (+2/-2)
bin/tests/system/dlzexternal/setup.sh (+1/-1)
bin/tests/system/dlzexternal/tests.sh (+72/-72)
bin/tests/system/dns64/ns1/named.conf1.in (+1/-1)
bin/tests/system/dns64/ns1/named.conf2.in (+1/-1)
bin/tests/system/dns64/ns1/named.conf3.in (+1/-1)
bin/tests/system/dns64/ns1/sign.sh (+2/-2)
bin/tests/system/dns64/ns2/named.conf.in (+1/-1)
bin/tests/system/dns64/tests.sh (+484/-488)
bin/tests/system/dnssec/ns1/sign.sh (+10/-10)
bin/tests/system/dnssec/ns2/named.conf.in (+1/-1)
bin/tests/system/dnssec/ns2/sign.sh (+71/-73)
bin/tests/system/dnssec/ns3/named.conf.in (+1/-1)
bin/tests/system/dnssec/ns3/secure.example.db.in (+5/-0)
bin/tests/system/dnssec/ns3/sign.sh (+163/-162)
bin/tests/system/dnssec/ns4/named1.conf.in (+1/-1)
bin/tests/system/dnssec/ns4/named2.conf.in (+1/-1)
bin/tests/system/dnssec/ns4/named3.conf.in (+1/-1)
bin/tests/system/dnssec/ns4/named4.conf.in (+1/-1)
bin/tests/system/dnssec/ns5/named1.conf.in (+1/-1)
bin/tests/system/dnssec/ns5/sign.sh (+6/-6)
bin/tests/system/dnssec/ns6/named.conf.in (+1/-1)
bin/tests/system/dnssec/ns6/sign.sh (+2/-2)
bin/tests/system/dnssec/ns7/named.conf.in (+1/-1)
bin/tests/system/dnssec/ns7/sign.sh (+3/-3)
bin/tests/system/dnssec/ns8/named.conf.in (+1/-1)
bin/tests/system/dnssec/prereq.sh (+26/-0)
bin/tests/system/dnssec/setup.sh (+11/-11)
bin/tests/system/dnssec/tests.sh (+2160/-2146)
bin/tests/system/dnstap/clean.sh (+1/-1)
bin/tests/system/dnstap/ns2/named.conf.in (+1/-1)
bin/tests/system/dnstap/ns3/named.conf.in (+1/-1)
bin/tests/system/dnstap/ns4/named.conf.in (+1/-1)
bin/tests/system/dnstap/prereq.sh (+2/-2)
bin/tests/system/dnstap/tests.sh (+446/-422)
bin/tests/system/dnstap/tests_dnstap.py (+1/-1)
bin/tests/system/doth/ns1/named.conf.in (+26/-1)
bin/tests/system/doth/ns2/named.conf.in (+2/-2)
bin/tests/system/doth/ns3/named.conf.in (+2/-2)
bin/tests/system/doth/ns4/named.conf.in (+2/-2)
bin/tests/system/doth/ns5/named.conf.in (+83/-0)
bin/tests/system/doth/prereq.sh (+2/-2)
bin/tests/system/doth/setup.sh (+8/-7)
bin/tests/system/doth/stress_http_quota.py (+2/-2)
bin/tests/system/doth/tests.sh (+354/-323)
bin/tests/system/dsdigest/ns1/sign.sh (+3/-3)
bin/tests/system/dsdigest/ns2/named.conf.in (+1/-1)
bin/tests/system/dsdigest/ns2/sign.sh (+6/-7)
bin/tests/system/dsdigest/ns3/named.conf.in (+1/-1)
bin/tests/system/dsdigest/ns4/named.conf.in (+1/-1)
bin/tests/system/dsdigest/tests.sh (+11/-11)
bin/tests/system/dupsigs/ns1/reset_keys.sh (+3/-4)
bin/tests/system/dupsigs/setup.sh (+4/-1)
bin/tests/system/dupsigs/tests.sh (+19/-20)
bin/tests/system/dyndb/driver/Makefile.am (+1/-1)
bin/tests/system/dyndb/driver/Makefile.in (+16/-16)
bin/tests/system/dyndb/prereq.sh (+3/-3)
bin/tests/system/dyndb/tests.sh (+74/-76)
bin/tests/system/ecdsa/ns1/sign.sh (+17/-17)
bin/tests/system/ecdsa/ns2/named.conf.in (+1/-1)
bin/tests/system/ecdsa/ns3/named.conf.in (+1/-1)
bin/tests/system/ecdsa/setup.sh (+4/-4)
bin/tests/system/ecdsa/tests.sh (+21/-21)
bin/tests/system/eddsa/ns1/sign.sh (+17/-17)
bin/tests/system/eddsa/ns2/named.conf.in (+1/-1)
bin/tests/system/eddsa/ns2/sign.sh (+6/-7)
bin/tests/system/eddsa/ns3/named.conf.in (+1/-1)
bin/tests/system/eddsa/ns3/sign.sh (+6/-7)
bin/tests/system/eddsa/prereq.sh (+2/-2)
bin/tests/system/eddsa/setup.sh (+8/-8)
bin/tests/system/eddsa/tests.sh (+50/-50)
bin/tests/system/ednscompliance/tests.sh (+109/-34)
bin/tests/system/emptyzones/tests.sh (+5/-5)
bin/tests/system/enginepkcs11/prereq.sh (+1/-1)
bin/tests/system/enginepkcs11/setup.sh (+80/-83)
bin/tests/system/enginepkcs11/tests.sh (+115/-118)
bin/tests/system/fetchlimit/prereq.sh (+21/-0)
bin/tests/system/fetchlimit/tests.sh (+99/-90)
bin/tests/system/filter-aaaa/ns1/sign.sh (+4/-4)
bin/tests/system/filter-aaaa/ns4/sign.sh (+3/-3)
bin/tests/system/filter-aaaa/tests.sh (+500/-515)
bin/tests/system/formerr/tests.sh (+12/-12)
bin/tests/system/forward/ns1/sign.sh (+3/-3)
bin/tests/system/forward/prereq.sh (+26/-0)
bin/tests/system/forward/setup.sh (+2/-2)
bin/tests/system/forward/tests.sh (+159/-159)
bin/tests/system/genzone.sh (+2/-3)
bin/tests/system/geoip2/prereq.sh (+2/-2)
bin/tests/system/geoip2/setup.sh (+2/-2)
bin/tests/system/geoip2/tests.sh (+103/-116)
bin/tests/system/get_core_dumps.sh (+33/-33)
bin/tests/system/get_ports.sh (+23/-20)
bin/tests/system/glue/tests.sh (+1/-1)
bin/tests/system/hooks/driver/Makefile.am (+1/-1)
bin/tests/system/hooks/driver/Makefile.in (+16/-16)
bin/tests/system/host/tests.sh (+33/-33)
bin/tests/system/idna/tests.sh (+247/-251)
bin/tests/system/ifconfig.sh.in (+195/-197)
bin/tests/system/include-multiplecfg/setup.sh (+1/-1)
bin/tests/system/include-multiplecfg/tests.sh (+13/-10)
bin/tests/system/inline/clean.sh (+13/-13)
bin/tests/system/inline/ns1/sign.sh (+2/-2)
bin/tests/system/inline/ns2/named.conf.in (+1/-1)
bin/tests/system/inline/ns3/named.conf.in (+1/-1)
bin/tests/system/inline/ns3/sign.sh (+37/-40)
bin/tests/system/inline/ns5/named.conf.post (+1/-1)
bin/tests/system/inline/ns5/named.conf.pre (+1/-1)
bin/tests/system/inline/ns6/named.conf.in (+2/-2)
bin/tests/system/inline/ns7/named.conf.in (+1/-1)
bin/tests/system/inline/ns8/named.conf.in (+1/-1)
bin/tests/system/inline/ns8/sign.sh (+4/-5)
bin/tests/system/inline/setup.sh (+16/-4)
bin/tests/system/inline/tests.sh (+550/-550)
bin/tests/system/integrity/ns1/named.conf.in (+1/-1)
bin/tests/system/integrity/tests.sh (+36/-36)
bin/tests/system/isctest/__init__.py (+2/-3)
bin/tests/system/isctest/check.py (+34/-0)
bin/tests/system/isctest/query.py (+35/-0)
bin/tests/system/ixfr/prereq.sh (+21/-0)
bin/tests/system/ixfr/setup.sh (+16/-16)
bin/tests/system/ixfr/tests.sh (+95/-94)
bin/tests/system/journal/setup.sh (+1/-1)
bin/tests/system/journal/tests.sh (+52/-54)
bin/tests/system/kasp.sh (+902/-905)
bin/tests/system/kasp/clean.sh (+1/-0)
bin/tests/system/kasp/ns3/named-fips.conf.in (+21/-0)
bin/tests/system/kasp/ns3/setup.sh (+396/-378)
bin/tests/system/kasp/ns4/setup.sh (+6/-7)
bin/tests/system/kasp/ns5/setup.sh (+6/-7)
bin/tests/system/kasp/ns6/setup.sh (+187/-188)
bin/tests/system/kasp/setup.sh (+21/-23)
bin/tests/system/kasp/tests.sh (+1252/-1235)
bin/tests/system/keepalive/ns2/named.conf.in (+1/-1)
bin/tests/system/keepalive/ns3/named.conf.in (+1/-1)
bin/tests/system/keepalive/tests.sh (+20/-20)
bin/tests/system/keyfromlabel/prereq.sh (+1/-1)
bin/tests/system/keyfromlabel/setup.sh (+1/-1)
bin/tests/system/keyfromlabel/tests.sh (+58/-60)
bin/tests/system/keymgr2kasp/clean.sh (+0/-1)
bin/tests/system/keymgr2kasp/ns3/setup.sh (+56/-56)
bin/tests/system/keymgr2kasp/ns4/setup.sh (+5/-5)
bin/tests/system/keymgr2kasp/setup.sh (+4/-4)
bin/tests/system/keymgr2kasp/tests.sh (+301/-304)
bin/tests/system/legacy.run.sh.in (+124/-185)
bin/tests/system/legacy/ns6/sign.sh (+3/-3)
bin/tests/system/legacy/ns7/sign.sh (+4/-4)
bin/tests/system/legacy/tests.sh (+94/-94)
bin/tests/system/limits/tests.sh (+10/-10)
bin/tests/system/logfileconfig/named1.args (+1/-1)
bin/tests/system/logfileconfig/named2.args (+1/-1)
bin/tests/system/logfileconfig/tests.sh (+119/-123)
bin/tests/system/masterfile/ns2/named.conf.in (+1/-1)
bin/tests/system/masterfile/tests.sh (+5/-5)
bin/tests/system/masterformat/ns1/compile.sh (+11/-11)
bin/tests/system/masterformat/setup.sh (+1/-1)
bin/tests/system/masterformat/tests.sh (+117/-118)
bin/tests/system/metadata/setup.sh (+12/-13)
bin/tests/system/metadata/tests.sh (+40/-40)
bin/tests/system/mirror/ns1/sign.sh (+7/-7)
bin/tests/system/mirror/ns2/sign.sh (+35/-35)
bin/tests/system/mirror/ns3/named.conf.in (+1/-1)
bin/tests/system/mirror/setup.sh (+3/-3)
bin/tests/system/mirror/tests.sh (+194/-194)
bin/tests/system/mkeys/ns1/sign.sh (+12/-12)
bin/tests/system/mkeys/ns2/named.conf.in (+1/-1)
bin/tests/system/mkeys/ns3/named.conf.in (+1/-1)
bin/tests/system/mkeys/ns4/named.conf.in (+1/-1)
bin/tests/system/mkeys/ns4/sign.sh (+2/-2)
bin/tests/system/mkeys/ns5/named.conf.in (+1/-1)
bin/tests/system/mkeys/ns6/named.conf.in (+1/-1)
bin/tests/system/mkeys/ns6/setup.sh (+1/-1)
bin/tests/system/mkeys/ns7/named.conf.in (+2/-2)
bin/tests/system/mkeys/setup.sh (+5/-5)
bin/tests/system/mkeys/tests.sh (+275/-241)
bin/tests/system/names/tests.sh (+14/-11)
bin/tests/system/notify/ns2/named.conf.in (+1/-1)
bin/tests/system/notify/ns3/named.conf.in (+1/-1)
bin/tests/system/notify/ns4/named.conf.in (+1/-1)
bin/tests/system/notify/tests.sh (+59/-62)
bin/tests/system/nsec3/ns3/setup.sh (+32/-32)
bin/tests/system/nsec3/setup.sh (+4/-4)
bin/tests/system/nsec3/tests.sh (+217/-219)
bin/tests/system/nslookup/tests.sh (+46/-46)
bin/tests/system/nsupdate/krb/setup.sh (+2/-3)
bin/tests/system/nsupdate/ns3/sign.sh (+3/-3)
bin/tests/system/nsupdate/prereq.sh (+21/-0)
bin/tests/system/nsupdate/setup.sh (+28/-25)
bin/tests/system/nsupdate/tests.sh (+1156/-764)
bin/tests/system/nzd2nzf/prereq.sh (+2/-2)
bin/tests/system/nzd2nzf/tests.sh (+22/-22)
bin/tests/system/padding/ns2/named.conf.in (+1/-1)
bin/tests/system/padding/ns3/named.conf.in (+1/-1)
bin/tests/system/padding/ns4/named.conf.in (+1/-1)
bin/tests/system/padding/tests.sh (+37/-31)
bin/tests/system/parallel.sh (+4/-4)
bin/tests/system/pending/ns1/sign.sh (+4/-4)
bin/tests/system/pending/ns2/named.conf.in (+1/-1)
bin/tests/system/pending/ns2/sign.sh (+8/-8)
bin/tests/system/pending/ns3/named.conf.in (+1/-1)
bin/tests/system/pending/ns4/named.conf.in (+1/-1)
bin/tests/system/pending/tests.sh (+18/-19)
bin/tests/system/pipelined/ns2/named.conf.in (+1/-1)
bin/tests/system/pipelined/ns3/named.conf.in (+1/-1)
bin/tests/system/pipelined/ns4/named.conf.in (+1/-1)
bin/tests/system/pipelined/tests.sh (+31/-19)
bin/tests/system/pytest_custom_markers.py (+18/-0)
bin/tests/system/qmin/ns5/named.conf.in (+1/-1)
bin/tests/system/qmin/ns6/named.conf.in (+1/-1)
bin/tests/system/qmin/ns7/named.conf.in (+1/-1)
bin/tests/system/qmin/prereq.sh (+21/-0)
bin/tests/system/qmin/tests.sh (+175/-175)
bin/tests/system/qmin/tests_sh_qmin.py (+4/-0)
bin/tests/system/reclimit/ans7/ans.pl (+14/-2)
bin/tests/system/reclimit/prereq.sh (+26/-0)
bin/tests/system/reclimit/tests.sh (+103/-88)
bin/tests/system/reclimit/tests_sh_reclimit.py (+4/-0)
bin/tests/system/redirect/ns1/sign.sh (+4/-4)
bin/tests/system/redirect/ns2/named.conf.in (+1/-1)
bin/tests/system/redirect/ns3/sign.sh (+4/-4)
bin/tests/system/redirect/ns5/sign.sh (+8/-8)
bin/tests/system/redirect/setup.sh (+3/-3)
bin/tests/system/redirect/tests.sh (+190/-192)
bin/tests/system/resolver/ns6/keygen.sh (+5/-5)
bin/tests/system/resolver/prereq.sh (+21/-0)
bin/tests/system/resolver/tests.sh (+525/-492)
bin/tests/system/rndc/ns2/named.conf.in (+1/-1)
bin/tests/system/rndc/ns3/named.conf.in (+1/-1)
bin/tests/system/rndc/ns5/named.conf.in (+1/-1)
bin/tests/system/rndc/setup.sh (+8/-8)
bin/tests/system/rndc/tests.sh (+352/-337)
bin/tests/system/rndc/tests_cve-2023-3341.py (+57/-0)
bin/tests/system/rootkeysentinel/ns1/sign.sh (+4/-4)
bin/tests/system/rootkeysentinel/ns2/sign.sh (+11/-11)
bin/tests/system/rootkeysentinel/tests.sh (+104/-104)
bin/tests/system/rpz/clean.sh (+22/-19)
bin/tests/system/rpz/qperf.sh (+5/-5)
bin/tests/system/rpz/setup.sh (+37/-31)
bin/tests/system/rpz/tests.sh (+546/-536)
bin/tests/system/rpzextra/ns3/named.args (+1/-1)
bin/tests/system/rpzrecurse/ns3/named1.conf.in (+1/-1)
bin/tests/system/rpzrecurse/ns3/named2.conf.in (+1/-1)
bin/tests/system/rpzrecurse/ns3/named3.conf.in (+1/-1)
bin/tests/system/rpzrecurse/prereq.sh (+21/-0)
bin/tests/system/rpzrecurse/setup.sh (+31/-27)
bin/tests/system/rpzrecurse/tests.sh (+168/-162)
bin/tests/system/rrchecker/tests.sh (+54/-41)
bin/tests/system/rrl/clean.sh (+1/-1)
bin/tests/system/rrl/tests.sh (+143/-142)
bin/tests/system/rrl/tests_sh_rrl.py (+4/-0)
bin/tests/system/rrsetorder/ns3/named.conf.in (+1/-1)
bin/tests/system/rrsetorder/ns4/named.conf.in (+1/-1)
bin/tests/system/rrsetorder/ns5/named.conf.in (+1/-1)
bin/tests/system/rrsetorder/tests.sh (+209/-243)
bin/tests/system/rsabigexponent/bigkey.c (+3/-0)
bin/tests/system/rsabigexponent/ns1/sign.sh (+3/-3)
bin/tests/system/rsabigexponent/ns2/named.conf.in (+1/-1)
bin/tests/system/rsabigexponent/ns2/sign.sh (+4/-5)
bin/tests/system/rsabigexponent/ns3/named.conf.in (+1/-1)
bin/tests/system/rsabigexponent/tests.sh (+17/-19)
bin/tests/system/run.sh (+6/-3)
bin/tests/system/runall.sh (+33/-33)
bin/tests/system/runsequential.sh (+2/-3)
bin/tests/system/runtime/tests.sh (+108/-104)
bin/tests/system/serve-stale/ns1/root.db (+2/-0)
bin/tests/system/serve-stale/ns3/named.conf.in (+27/-8)
bin/tests/system/serve-stale/ns3/serve.stale.db (+18/-0)
bin/tests/system/serve-stale/ns6/named.conf.in (+44/-0)
bin/tests/system/serve-stale/ns6/serve.stale.db (+16/-0)
bin/tests/system/serve-stale/ns6/stale.db (+17/-0)
bin/tests/system/serve-stale/prereq.sh (+21/-0)
bin/tests/system/serve-stale/setup.sh (+2/-1)
bin/tests/system/serve-stale/tests.sh (+1290/-1236)
bin/tests/system/setup.sh (+10/-7)
bin/tests/system/sfcache/ns1/sign.sh (+5/-5)
bin/tests/system/sfcache/ns2/named.conf.in (+1/-1)
bin/tests/system/sfcache/ns2/sign.sh (+2/-2)
bin/tests/system/sfcache/ns5/named.conf.in (+1/-1)
bin/tests/system/sfcache/ns5/sign.sh (+1/-1)
bin/tests/system/sfcache/tests.sh (+40/-40)
bin/tests/system/shutdown/tests_shutdown.py (+3/-3)
bin/tests/system/smartsign/tests.sh (+181/-130)
bin/tests/system/sortlist/tests.sh (+9/-9)
bin/tests/system/spf/tests.sh (+12/-13)
bin/tests/system/start.pl (+6/-15)
bin/tests/system/staticstub/ns2/named.conf.in (+1/-1)
bin/tests/system/staticstub/ns3/sign.sh (+7/-7)
bin/tests/system/staticstub/ns4/sign.sh (+2/-2)
bin/tests/system/staticstub/setup.sh (+2/-2)
bin/tests/system/staticstub/tests.sh (+70/-74)
bin/tests/system/statistics/ns2/named.conf.in (+1/-1)
bin/tests/system/statistics/ns2/named2.conf.in (+1/-1)
bin/tests/system/statistics/prereq.sh (+21/-0)
bin/tests/system/statistics/tests.sh (+99/-99)
bin/tests/system/statschannel/clean.sh (+3/-1)
bin/tests/system/statschannel/conftest.py (+3/-11)
bin/tests/system/statschannel/generic.py (+134/-11)
bin/tests/system/statschannel/ns2/sign.sh (+10/-10)
bin/tests/system/statschannel/prereq.sh (+26/-0)
bin/tests/system/statschannel/setup.sh (+1/-1)
bin/tests/system/statschannel/tests.sh (+354/-269)
bin/tests/system/statschannel/tests_json.py (+5/-8)
bin/tests/system/statschannel/tests_xml.py (+5/-8)
bin/tests/system/stop.pl (+1/-1)
bin/tests/system/stopall.sh (+2/-3)
bin/tests/system/stress/clean.sh (+0/-6)
bin/tests/system/stress/ns2/named.conf.in (+27/-4)
bin/tests/system/stress/ns2/zone.template.db (+21/-0)
bin/tests/system/stress/ns3/named.conf.in (+30/-6)
bin/tests/system/stress/ns4/named.conf.in (+26/-4)
bin/tests/system/stress/prereq.sh (+21/-0)
bin/tests/system/stress/setup.sh (+5/-6)
bin/tests/system/stress/tests_stress_update.py (+79/-0)
bin/tests/system/stub/ns2/named.conf.in (+1/-1)
bin/tests/system/stub/ns3/named.conf.in (+1/-1)
bin/tests/system/stub/ns5/named.conf.in (+1/-1)
bin/tests/system/stub/tests.sh (+58/-46)
bin/tests/system/synthfromdnssec/ns1/sign.sh (+15/-15)
bin/tests/system/synthfromdnssec/setup.sh (+2/-2)
bin/tests/system/synthfromdnssec/tests.sh (+732/-743)
bin/tests/system/tcp/ns2/named.conf.in (+1/-1)
bin/tests/system/tcp/ns3/named.conf.in (+1/-1)
bin/tests/system/tcp/ns4/named.conf.in (+1/-1)
bin/tests/system/tcp/ns5/named.conf.in (+1/-1)
bin/tests/system/tcp/tests.sh (+32/-32)
bin/tests/system/testcrypto.sh (+58/-59)
bin/tests/system/testsummary.sh (+23/-23)
bin/tests/system/timeouts/ns1/named.conf.in (+1/-1)
bin/tests/system/timeouts/prereq.sh (+9/-11)
bin/tests/system/timeouts/setup.sh (+1/-1)
bin/tests/system/timeouts/tests_tcp_timeouts.py (+1/-0)
bin/tests/system/tkey/tests.sh (+93/-94)
bin/tests/system/tools/tests.sh (+78/-40)
bin/tests/system/transport-acl/ns1/named.conf.in (+1/-1)
bin/tests/system/transport-acl/setup.sh (+1/-1)
bin/tests/system/transport-acl/tests.sh (+20/-20)
bin/tests/system/tsig/setup.sh (+2/-3)
bin/tests/system/tsig/tests.sh (+187/-163)
bin/tests/system/tsiggss/prereq.sh (+3/-3)
bin/tests/system/tsiggss/setup.sh (+1/-1)
bin/tests/system/tsiggss/tests.sh (+73/-72)
bin/tests/system/ttl/ns1/named.conf.in (+1/-1)
bin/tests/system/unknown/setup.sh (+4/-1)
bin/tests/system/unknown/tests.sh (+118/-117)
bin/tests/system/upforwd/prereq.sh (+21/-0)
bin/tests/system/upforwd/setup.sh (+9/-12)
bin/tests/system/upforwd/tests.sh (+163/-122)
bin/tests/system/verify/tests.sh (+73/-75)
bin/tests/system/verify/zones/genzones.sh (+110/-110)
bin/tests/system/views/ns2/named1.conf.in (+1/-1)
bin/tests/system/views/ns2/named2.conf.in (+2/-2)
bin/tests/system/views/ns3/named1.conf.in (+1/-1)
bin/tests/system/views/ns3/named2.conf.in (+1/-1)
bin/tests/system/views/ns5/named.conf.in (+1/-1)
bin/tests/system/views/setup.sh (+6/-6)
bin/tests/system/views/tests.sh (+51/-43)
bin/tests/system/wildcard/ns1/sign.sh (+22/-22)
bin/tests/system/wildcard/ns2/named.conf.in (+1/-1)
bin/tests/system/wildcard/ns3/named.conf.in (+1/-1)
bin/tests/system/wildcard/ns5/named.conf.in (+1/-1)
bin/tests/system/wildcard/tests.sh (+112/-102)
bin/tests/system/xfer/ns1/named1.conf.in (+1/-1)
bin/tests/system/xfer/ns1/named2.conf.in (+1/-1)
bin/tests/system/xfer/ns1/named3.conf.in (+1/-1)
bin/tests/system/xfer/ns2/named.conf.in (+1/-1)
bin/tests/system/xfer/ns3/named.conf.in (+1/-1)
bin/tests/system/xfer/ns6/named.conf.in (+2/-2)
bin/tests/system/xfer/ns7/named.conf.in (+2/-2)
bin/tests/system/xfer/ns8/named.conf.in (+1/-1)
bin/tests/system/xfer/prereq.sh (+9/-5)
bin/tests/system/xfer/setup.sh (+3/-3)
bin/tests/system/xfer/tests.sh (+210/-211)
bin/tests/system/xferquota/ns2/named.conf.in (+1/-1)
bin/tests/system/xferquota/tests.sh (+19/-19)
bin/tests/system/zero/prereq.sh (+21/-0)
bin/tests/system/zero/setup.sh (+1/-1)
bin/tests/system/zero/tests.sh (+95/-67)
bin/tests/system/zonechecks/setup.sh (+10/-10)
bin/tests/system/zonechecks/tests.sh (+124/-129)
bin/tests/wire_test.c (+1/-1)
bin/tools/Makefile.in (+6/-7)
bin/tools/dnstap-read.c (+0/-13)
compile (+1/-1)
config.guess (+887/-613)
config.h.in (+81/-22)
config.sub (+1349/-1260)
configure (+8237/-5845)
configure.ac (+1/-24)
contrib/dlz/modules/common/dlz_dbi.c (+1/-1)
contrib/scripts/zone-edit.sh.in (+100/-108)
debian/changelog (+45/-0)
debian/patches/always-use-standard-library-stdatomic.patch (+27/-0)
debian/patches/series (+1/-6)
depcomp (+1/-1)
dev/null (+0/-33)
doc/Makefile.in (+6/-7)
doc/arm/Makefile.in (+6/-5)
doc/arm/conf.py (+39/-0)
doc/arm/notes.rst (+6/-0)
doc/arm/platforms.inc.rst (+10/-9)
doc/arm/reference.rst (+39/-9)
doc/arm/requirements.txt (+4/-4)
doc/arm/security.inc.rst (+50/-0)
doc/dnssec-guide/introduction.rst (+1/-1)
doc/dnssec-guide/validation.rst (+1/-1)
doc/man/Makefile.in (+6/-5)
doc/man/arpaname.1in (+1/-1)
doc/man/ddns-confgen.8in (+1/-1)
doc/man/delv.1in (+1/-1)
doc/man/dig.1in (+1/-1)
doc/man/dnssec-cds.1in (+1/-1)
doc/man/dnssec-dsfromkey.1in (+1/-1)
doc/man/dnssec-importkey.1in (+1/-1)
doc/man/dnssec-keyfromlabel.1in (+1/-1)
doc/man/dnssec-keygen.1in (+1/-1)
doc/man/dnssec-revoke.1in (+1/-1)
doc/man/dnssec-settime.1in (+1/-1)
doc/man/dnssec-signzone.1in (+1/-1)
doc/man/dnssec-verify.1in (+1/-1)
doc/man/dnstap-read.1in (+1/-1)
doc/man/filter-a.8in (+1/-1)
doc/man/filter-aaaa.8in (+1/-1)
doc/man/host.1in (+1/-1)
doc/man/mdig.1in (+1/-1)
doc/man/named-checkconf.1in (+1/-1)
doc/man/named-checkzone.1in (+1/-1)
doc/man/named-compilezone.1in (+1/-1)
doc/man/named-journalprint.1in (+1/-1)
doc/man/named-nzd2nzf.1in (+1/-1)
doc/man/named-rrchecker.1in (+1/-1)
doc/man/named.8in (+1/-1)
doc/man/named.conf.5in (+9/-9)
doc/man/nsec3hash.1in (+1/-1)
doc/man/nslookup.1in (+1/-1)
doc/man/nsupdate.1in (+1/-1)
doc/man/rndc-confgen.8in (+1/-1)
doc/man/rndc.8in (+4/-2)
doc/man/rndc.conf.5in (+1/-1)
doc/man/tsig-keygen.8in (+1/-1)
doc/misc/Makefile.in (+6/-7)
doc/misc/options (+8/-8)
doc/notes/notes-9.18.1.rst (+4/-4)
doc/notes/notes-9.18.11.rst (+3/-3)
doc/notes/notes-9.18.16.rst (+2/-2)
doc/notes/notes-9.18.19.rst (+96/-0)
doc/notes/notes-9.18.20.rst (+44/-0)
doc/notes/notes-9.18.21.rst (+31/-0)
doc/notes/notes-9.18.22.rst (+19/-0)
doc/notes/notes-9.18.23.rst (+20/-0)
doc/notes/notes-9.18.24.rst (+65/-0)
doc/notes/notes-9.18.3.rst (+1/-1)
doc/notes/notes-9.18.7.rst (+5/-5)
fuzz/Makefile.in (+6/-7)
fuzz/dns_message_checksig.c (+2/-2)
lib/Makefile.in (+6/-7)
lib/bind9/Makefile.in (+6/-7)
lib/bind9/check.c (+4/-0)
lib/dns/Makefile.in (+6/-7)
lib/dns/adb.c (+5/-5)
lib/dns/cache.c (+1/-0)
lib/dns/catz.c (+16/-0)
lib/dns/diff.c (+34/-0)
lib/dns/dst_api.c (+20/-9)
lib/dns/include/dns/catz.h (+3/-5)
lib/dns/include/dns/dispatch.h (+1/-1)
lib/dns/include/dns/message.h (+1/-39)
lib/dns/include/dns/name.h (+17/-20)
lib/dns/include/dns/rbt.h (+13/-0)
lib/dns/include/dns/rpz.h (+1/-4)
lib/dns/include/dns/stats.h (+1/-1)
lib/dns/include/dns/validator.h (+1/-0)
lib/dns/include/dst/dst.h (+4/-0)
lib/dns/master.c (+1/-1)
lib/dns/message.c (+241/-134)
lib/dns/name.c (+1/-0)
lib/dns/ncache.c (+1/-1)
lib/dns/nsec3.c (+4/-10)
lib/dns/openssl_link.c (+1/-0)
lib/dns/opensslecdsa_link.c (+14/-5)
lib/dns/openssleddsa_link.c (+1/-1)
lib/dns/opensslrsa_link.c (+40/-18)
lib/dns/private.c (+4/-4)
lib/dns/rbt.c (+8/-0)
lib/dns/rbtdb.c (+169/-68)
lib/dns/rdata.c (+1/-1)
lib/dns/resolver.c (+16/-14)
lib/dns/rootns.c (+47/-6)
lib/dns/stats.c (+6/-4)
lib/dns/tsig.c (+14/-8)
lib/dns/update.c (+28/-25)
lib/dns/validator.c (+30/-37)
lib/dns/xfrin.c (+32/-11)
lib/dns/zone.c (+74/-82)
lib/irs/Makefile.in (+6/-7)
lib/isc/Makefile.in (+6/-7)
lib/isc/hmac.c (+39/-32)
lib/isc/ht.c (+51/-4)
lib/isc/httpd.c (+28/-12)
lib/isc/include/isc/atomic.h (+1/-1)
lib/isc/include/isc/endian.h (+17/-17)
lib/isc/include/isc/mem.h (+36/-0)
lib/isc/include/isc/net.h (+2/-2)
lib/isc/include/isc/netmgr.h (+3/-0)
lib/isc/include/isc/radix.h (+1/-1)
lib/isc/include/isc/result.h (+1/-0)
lib/isc/include/isc/types.h (+6/-4)
lib/isc/iterated_hash.c (+6/-1)
lib/isc/jemalloc_shim.h (+4/-1)
lib/isc/md.c (+12/-2)
lib/isc/mem.c (+167/-17)
lib/isc/mem_p.h (+11/-0)
lib/isc/netaddr.c (+1/-1)
lib/isc/netmgr/http.c (+10/-9)
lib/isc/netmgr/netmgr-int.h (+1/-0)
lib/isc/netmgr/netmgr.c (+24/-14)
lib/isc/netmgr/tcp.c (+3/-3)
lib/isc/netmgr/tcpdns.c (+9/-2)
lib/isc/netmgr/tlsdns.c (+84/-4)
lib/isc/netmgr/tlsstream.c (+6/-6)
lib/isc/netmgr/udp.c (+6/-4)
lib/isc/netmgr/uv-compat.h (+1/-1)
lib/isc/result.c (+2/-0)
lib/isc/stats.c (+17/-8)
lib/isc/tls.c (+7/-1)
lib/isc/trampoline.c (+3/-2)
lib/isc/url.c (+3/-2)
lib/isccc/Makefile.in (+6/-7)
lib/isccc/cc.c (+38/-19)
lib/isccfg/Makefile.in (+6/-7)
lib/isccfg/namedconf.c (+6/-5)
lib/ns/Makefile.in (+6/-7)
lib/ns/client.c (+76/-33)
lib/ns/include/ns/client.h (+1/-0)
lib/ns/query.c (+37/-15)
lib/ns/server.c (+5/-0)
lib/ns/update.c (+9/-2)
lib/ns/xfrout.c (+1/-1)
ltmain.sh (+512/-315)
m4/libtool.m4 (+131/-98)
m4/ltoptions.m4 (+2/-2)
m4/ltsugar.m4 (+1/-1)
m4/ltversion.m4 (+7/-6)
m4/lt~obsolete.m4 (+2/-2)
missing (+1/-1)
srcid (+1/-1)
test-driver (+7/-4)
tests/Makefile.in (+6/-7)
tests/dns/Makefile.am (+10/-2)
tests/dns/Makefile.in (+41/-23)
tests/dns/rdata_test.c (+28/-0)
tests/irs/Makefile.in (+6/-7)
tests/isc/Makefile.in (+6/-7)
tests/isc/hmac_test.c (+108/-104)
tests/isc/ht_test.c (+50/-0)
tests/isc/netmgr_test.c (+175/-3)
tests/isccfg/Makefile.in (+6/-7)
tests/libtest/Makefile.in (+6/-7)
tests/libtest/ns.c (+1/-1)
tests/ns/Makefile.in (+6/-7)
tests/unit-test-driver.sh.in (+24/-24)
Reviewer Review Type Date Requested Status
Mitchell Dzurick (community) Approve
Canonical Server Reporter Pending
Canonical Server Pending
Review via email: mp+464214@code.launchpad.net

Description of the change

Update jammy bind9 version to match noble

This mp has the exact same changes as the mantic version here: https://code.launchpad.net/~lvoytek/ubuntu/+source/bind9/+git/bind9/+merge/464213
It updates to 9.18.24, removes old CVE patches, and adds always-use-standard-library-stdatomic.patch.

PPA: https://launchpad.net/~lvoytek/+archive/ubuntu/bind9-mre

autopkgtest results:

bind-dyndb-ldap @ amd64:
  12.04.24 15:28:34 Log 🗒️ ✅ Triggers: bind-dyndb-ldap/11.9-5ubuntu0.22.04.7~ppa1
bind9 @ amd64:
  12.04.24 15:40:04 Log 🗒️ ✅ Triggers: bind9/1:9.18.24-0ubuntu0.22.04.1~ppa2
bind-dyndb-ldap @ arm64:
  12.04.24 15:10:41 Log 🗒️ ✅ Triggers: bind-dyndb-ldap/11.9-5ubuntu0.22.04.7~ppa1
bind9 @ arm64:
  12.04.24 15:20:16 Log 🗒️ ✅ Triggers: bind9/1:9.18.24-0ubuntu0.22.04.1~ppa2
bind-dyndb-ldap @ armhf:
  12.04.24 14:43:20 Log 🗒️ ✅ Triggers: bind-dyndb-ldap/11.9-5ubuntu0.22.04.7~ppa1
bind9 @ armhf:
  12.04.24 15:17:09 Log 🗒️ ✅ Triggers: bind9/1:9.18.24-0ubuntu0.22.04.1~ppa2
bind-dyndb-ldap @ ppc64el:
  12.04.24 15:06:20 Log 🗒️ ✅ Triggers: bind-dyndb-ldap/11.9-5ubuntu0.22.04.7~ppa1
bind9 @ ppc64el:
  12.04.24 15:26:33 Log 🗒️ ✅ Triggers: bind9/1:9.18.24-0ubuntu0.22.04.1~ppa2
bind-dyndb-ldap @ s390x:
  12.04.24 15:11:51 Log 🗒️ ✅ Triggers: bind-dyndb-ldap/11.9-5ubuntu0.22.04.7~ppa1
bind9 @ s390x:
  12.04.24 15:22:52 Log 🗒️ ✅ Triggers: bind9/1:9.18.24-0ubuntu0.22.04.1~ppa2

To post a comment you must log in.
Revision history for this message
Mitchell Dzurick (mitchdz) wrote :

Same comments are the mantic MRE.

I tested a jammy VM updating all bin9* packages and the updates happen without issues.

+1 from me.

review: Approve
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

This is in proposed already, marking as merged.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/CHANGES b/CHANGES
index 3f4e364..9bd4f51 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,189 @@
1 --- 9.18.24 released ---
2
36343. [bug] Fix case insensitive setting for isc_ht hashtable.
4 [GL #4568]
5
6 --- 9.18.23 released ---
7
86322. [security] Specific DNS answers could cause a denial-of-service
9 condition due to DNS validation taking a long time.
10 (CVE-2023-50387) [GL #4424]
11
126321. [security] Change 6315 inadvertently introduced regressions that
13 could cause named to crash. [GL #4234]
14
156320. [bug] Under some circumstances, the DoT code in client
16 mode could process more than one message at a time when
17 that was not expected. That has been fixed. [GL #4487]
18
19 --- 9.18.22 released ---
20
216319. [func] Limit isc_task_send() overhead for RBTDB tree pruning.
22 [GL #4383]
23
246317. [security] Restore DNS64 state when handling a serve-stale timeout.
25 (CVE-2023-5679) [GL #4334]
26
276316. [security] Specific queries could trigger an assertion check with
28 nxdomain-redirect enabled. (CVE-2023-5517) [GL #4281]
29
306315. [security] Speed up parsing of DNS messages with many different
31 names. (CVE-2023-4408) [GL #4234]
32
336314. [bug] Address race conditions in dns_tsigkey_find().
34 [GL #4182]
35
366312. [bug] Conversion from NSEC3 signed to NSEC signed could
37 temporarily put the zone into a state where it was
38 treated as unsigned until the NSEC chain was built.
39 Additionally conversion from one set of NSEC3 parameters
40 to another could also temporarily put the zone into a
41 state where it was treated as unsigned until the new
42 NSEC3 chain was built. [GL #1794] [GL #4495]
43
446310. [bug] Memory leak in zone.c:sign_zone. When named signed a
45 zone it could leak dst_keys due to a misplaced
46 'continue'. [GL #4488]
47
486306. [func] Log more details about the cause of "not exact" errors.
49 [GL #4500]
50
516304. [bug] The wrong time was being used to determine what RRSIGs
52 where to be generated when dnssec-policy was in use.
53 [GL #4494]
54
556302. [func] The "trust-anchor-telemetry" statement is no longer
56 marked as experimental. This silences a relevant log
57 message that was emitted even when the feature was
58 explicitly disabled. [GL #4497]
59
606300. [bug] Fix statistics export to use full 64 bit signed numbers
61 instead of truncating values to unsigned 32 bits.
62 [GL #4467]
63
646299. [port] NetBSD has added 'hmac' to libc which collides with our
65 use of 'hmac'. [GL #4478]
66
67 --- 9.18.21 released ---
68
696297. [bug] Improve LRU cleaning behaviour. [GL #4448]
70
716296. [func] The "resolver-nonbackoff-tries" and
72 "resolver-retry-interval" options are deprecated;
73 a warning will be logged if they are used. [GL #4405]
74
756294. [bug] BIND might sometimes crash after startup or
76 re-configuration when one 'tls' entry is used multiple
77 times to connect to remote servers due to initialisation
78 attempts from contexts of multiple threads. That has
79 been fixed. [GL #4464]
80
816290. [bug] Dig +yaml will now report "no servers could be reached"
82 also for UDP setup failure when no other servers or
83 tries are left. [GL #1229]
84
856287. [bug] Recognize escapes when reading the public key from file.
86 [GL !8502]
87
886286. [bug] Dig +yaml will now report "no servers could be reached"
89 on TCP connection failure as well as for UDP timeouts.
90 [GL #4396]
91
926282. [func] Deprecate AES-based DNS cookies. [GL #4421]
93
94 --- 9.18.20 released ---
95
966280. [bug] Fix missing newlines in the output of "rndc nta -dump".
97 [GL !8454]
98
996277. [bug] Take into account local authoritative zones when
100 falling back to serve-stale. [GL #4355]
101
1026275. [bug] Fix assertion failure when using lock-file configuration
103 option together -X argument to named. [GL #4386]
104
1056274. [bug] The 'lock-file' file was being removed when it
106 shouldn't have been making it ineffective if named was
107 started 3 or more times. [GL #4387]
108
1096271. [bug] Fix a shutdown race in dns__catz_update_cb(). [GL #4381]
110
1116269. [maint] B.ROOT-SERVERS.NET addresses are now 170.247.170.2 and
112 2801:1b8:10::b. [GL #4101]
113
1146267. [func] The timeouts for resending zone refresh queries over UDP
115 were lowered to enable named to more quickly determine
116 that a primary is down. [GL #4260]
117
1186265. [bug] Don't schedule resign operations on the raw version
119 of an inline-signing zone. [GL #4350]
120
1216261. [bug] Fix a possible assertion failure on an error path in
122 resolver.c:fctx_query(), when using an uninitialized
123 link. [GL #4331]
124
1256254. [cleanup] Add semantic patch to do an explicit cast from char
126 to unsigned char in ctype.h class of functions.
127 [GL #4327]
128
1296252. [test] Python system tests have to be executed by invoking
130 pytest directly. Executing them with the legacy test
131 runner is no longer supported. [GL #4250]
132
1336250. [bug] The wrong covered value was being set by
134 dns_ncache_current for RRSIG records in the returned
135 rdataset structure. This resulted in TYPE0 being
136 reported as the covered value of the RRSIG when dumping
137 the cache contents. [GL #4314]
138
139 --- 9.18.19 released ---
140
1416246. [security] Fix use-after-free error in TLS DNS code when sending
142 data. (CVE-2023-4236) [GL #4242]
143
1446245. [security] Limit the amount of recursion that can be performed
145 by isccc_cc_fromwire. (CVE-2023-3341) [GL #4152]
146
1476244. [bug] Adjust log levels on malformed messages to NOTICE when
148 transferring in a zone. [GL #4290]
149
1506241. [bug] Take into account the possibility of partial TLS writes
151 in TLS DNS code. That helps to prevent DNS messages
152 corruption on long DNS over TLS streams. [GL #4255]
153
1546240. [bug] Use dedicated per-worker thread jemalloc memory
155 arenas for send buffers allocation to reduce memory
156 consumption and avoid lock contention. [GL #4038]
157
1586239. [func] Deprecate the 'dnssec-must-be-secure' option.
159 [GL #3700]
160
1616237. [bug] Address memory leaks due to not clearing OpenSSL error
162 stack. [GL #4159]
163
1646235. [doc] Clarify BIND 9 time formats. [GL #4266]
165
1666234. [bug] Restore stale-refresh-time value after flushing the
167 cache. [GL #4278]
168
1696232. [bug] Following the introduction of krb5-subdomain-self-rhs
170 and ms-subdomain-self-rhs update rules, removal of
171 nonexistent PTR and SRV records via UPDATE could fail.
172 [GL #4280]
173
1746231. [func] Make nsupdate honor -v for SOA requests if the server
175 is specified. [GL #1181]
176
1776230. [bug] Prevent an unnecessary query restart if a synthesized
178 CNAME target points to the CNAME owner. [GL #3835]
179
1806227. [bug] Check the statistics-channel HTTP Content-length
181 to prevent negative or overflowing values from
182 causing a crash. [GL #4125]
183
1846224. [bug] Check the If-Modified-Since value length to prevent
185 out-of-bounds write. [GL #4124]
186
1 --- 9.18.18 released ---187 --- 9.18.18 released ---
2188
36220. [func] Deprecate the 'dialup' and 'heartbeat-interval'1896220. [func] Deprecate the 'dialup' and 'heartbeat-interval'
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4b3db89..c108dbe 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -102,22 +102,7 @@ Twitter, or Facebook.
102102
103### Reporting possible security issues103### Reporting possible security issues
104104
105If you think you may be seeing a potential security vulnerability in BIND105See `SECURITY.md`.
106(for example, a crash with REQUIRE, INSIST, or ASSERT failure), please
107report it immediately by emailing to security-officer@isc.org. Plain-text
108e-mail is not a secure choice for communications concerning undisclosed
109security issues so please encrypt your communications to us if possible,
110using the [ISC Security Officer public key](https://www.isc.org/pgpkey/).
111
112Do not discuss undisclosed security vulnerabilities on any public mailing list.
113ISC has a long history of handling reported vulnerabilities promptly and
114effectively and we respect and acknowledge responsible reporters.
115
116ISC's Security Vulnerability Disclosure Policy is documented at
117[https://kb.isc.org/docs/aa-00861](https://kb.isc.org/docs/aa-00861).
118
119If you have a crash, you may want to consult
120["What to do if your BIND or DHCP server has crashed."](https://kb.isc.org/docs/aa-00340)
121106
122### <a name="contrib"></a>Contributing code107### <a name="contrib"></a>Contributing code
123108
diff --git a/ChangeLog b/ChangeLog
index 3f4e364..9bd4f51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,189 @@
1 --- 9.18.24 released ---
2
36343. [bug] Fix case insensitive setting for isc_ht hashtable.
4 [GL #4568]
5
6 --- 9.18.23 released ---
7
86322. [security] Specific DNS answers could cause a denial-of-service
9 condition due to DNS validation taking a long time.
10 (CVE-2023-50387) [GL #4424]
11
126321. [security] Change 6315 inadvertently introduced regressions that
13 could cause named to crash. [GL #4234]
14
156320. [bug] Under some circumstances, the DoT code in client
16 mode could process more than one message at a time when
17 that was not expected. That has been fixed. [GL #4487]
18
19 --- 9.18.22 released ---
20
216319. [func] Limit isc_task_send() overhead for RBTDB tree pruning.
22 [GL #4383]
23
246317. [security] Restore DNS64 state when handling a serve-stale timeout.
25 (CVE-2023-5679) [GL #4334]
26
276316. [security] Specific queries could trigger an assertion check with
28 nxdomain-redirect enabled. (CVE-2023-5517) [GL #4281]
29
306315. [security] Speed up parsing of DNS messages with many different
31 names. (CVE-2023-4408) [GL #4234]
32
336314. [bug] Address race conditions in dns_tsigkey_find().
34 [GL #4182]
35
366312. [bug] Conversion from NSEC3 signed to NSEC signed could
37 temporarily put the zone into a state where it was
38 treated as unsigned until the NSEC chain was built.
39 Additionally conversion from one set of NSEC3 parameters
40 to another could also temporarily put the zone into a
41 state where it was treated as unsigned until the new
42 NSEC3 chain was built. [GL #1794] [GL #4495]
43
446310. [bug] Memory leak in zone.c:sign_zone. When named signed a
45 zone it could leak dst_keys due to a misplaced
46 'continue'. [GL #4488]
47
486306. [func] Log more details about the cause of "not exact" errors.
49 [GL #4500]
50
516304. [bug] The wrong time was being used to determine what RRSIGs
52 where to be generated when dnssec-policy was in use.
53 [GL #4494]
54
556302. [func] The "trust-anchor-telemetry" statement is no longer
56 marked as experimental. This silences a relevant log
57 message that was emitted even when the feature was
58 explicitly disabled. [GL #4497]
59
606300. [bug] Fix statistics export to use full 64 bit signed numbers
61 instead of truncating values to unsigned 32 bits.
62 [GL #4467]
63
646299. [port] NetBSD has added 'hmac' to libc which collides with our
65 use of 'hmac'. [GL #4478]
66
67 --- 9.18.21 released ---
68
696297. [bug] Improve LRU cleaning behaviour. [GL #4448]
70
716296. [func] The "resolver-nonbackoff-tries" and
72 "resolver-retry-interval" options are deprecated;
73 a warning will be logged if they are used. [GL #4405]
74
756294. [bug] BIND might sometimes crash after startup or
76 re-configuration when one 'tls' entry is used multiple
77 times to connect to remote servers due to initialisation
78 attempts from contexts of multiple threads. That has
79 been fixed. [GL #4464]
80
816290. [bug] Dig +yaml will now report "no servers could be reached"
82 also for UDP setup failure when no other servers or
83 tries are left. [GL #1229]
84
856287. [bug] Recognize escapes when reading the public key from file.
86 [GL !8502]
87
886286. [bug] Dig +yaml will now report "no servers could be reached"
89 on TCP connection failure as well as for UDP timeouts.
90 [GL #4396]
91
926282. [func] Deprecate AES-based DNS cookies. [GL #4421]
93
94 --- 9.18.20 released ---
95
966280. [bug] Fix missing newlines in the output of "rndc nta -dump".
97 [GL !8454]
98
996277. [bug] Take into account local authoritative zones when
100 falling back to serve-stale. [GL #4355]
101
1026275. [bug] Fix assertion failure when using lock-file configuration
103 option together -X argument to named. [GL #4386]
104
1056274. [bug] The 'lock-file' file was being removed when it
106 shouldn't have been making it ineffective if named was
107 started 3 or more times. [GL #4387]
108
1096271. [bug] Fix a shutdown race in dns__catz_update_cb(). [GL #4381]
110
1116269. [maint] B.ROOT-SERVERS.NET addresses are now 170.247.170.2 and
112 2801:1b8:10::b. [GL #4101]
113
1146267. [func] The timeouts for resending zone refresh queries over UDP
115 were lowered to enable named to more quickly determine
116 that a primary is down. [GL #4260]
117
1186265. [bug] Don't schedule resign operations on the raw version
119 of an inline-signing zone. [GL #4350]
120
1216261. [bug] Fix a possible assertion failure on an error path in
122 resolver.c:fctx_query(), when using an uninitialized
123 link. [GL #4331]
124
1256254. [cleanup] Add semantic patch to do an explicit cast from char
126 to unsigned char in ctype.h class of functions.
127 [GL #4327]
128
1296252. [test] Python system tests have to be executed by invoking
130 pytest directly. Executing them with the legacy test
131 runner is no longer supported. [GL #4250]
132
1336250. [bug] The wrong covered value was being set by
134 dns_ncache_current for RRSIG records in the returned
135 rdataset structure. This resulted in TYPE0 being
136 reported as the covered value of the RRSIG when dumping
137 the cache contents. [GL #4314]
138
139 --- 9.18.19 released ---
140
1416246. [security] Fix use-after-free error in TLS DNS code when sending
142 data. (CVE-2023-4236) [GL #4242]
143
1446245. [security] Limit the amount of recursion that can be performed
145 by isccc_cc_fromwire. (CVE-2023-3341) [GL #4152]
146
1476244. [bug] Adjust log levels on malformed messages to NOTICE when
148 transferring in a zone. [GL #4290]
149
1506241. [bug] Take into account the possibility of partial TLS writes
151 in TLS DNS code. That helps to prevent DNS messages
152 corruption on long DNS over TLS streams. [GL #4255]
153
1546240. [bug] Use dedicated per-worker thread jemalloc memory
155 arenas for send buffers allocation to reduce memory
156 consumption and avoid lock contention. [GL #4038]
157
1586239. [func] Deprecate the 'dnssec-must-be-secure' option.
159 [GL #3700]
160
1616237. [bug] Address memory leaks due to not clearing OpenSSL error
162 stack. [GL #4159]
163
1646235. [doc] Clarify BIND 9 time formats. [GL #4266]
165
1666234. [bug] Restore stale-refresh-time value after flushing the
167 cache. [GL #4278]
168
1696232. [bug] Following the introduction of krb5-subdomain-self-rhs
170 and ms-subdomain-self-rhs update rules, removal of
171 nonexistent PTR and SRV records via UPDATE could fail.
172 [GL #4280]
173
1746231. [func] Make nsupdate honor -v for SOA requests if the server
175 is specified. [GL #1181]
176
1776230. [bug] Prevent an unnecessary query restart if a synthesized
178 CNAME target points to the CNAME owner. [GL #3835]
179
1806227. [bug] Check the statistics-channel HTTP Content-length
181 to prevent negative or overflowing values from
182 causing a crash. [GL #4125]
183
1846224. [bug] Check the If-Modified-Since value length to prevent
185 out-of-bounds write. [GL #4124]
186
1 --- 9.18.18 released ---187 --- 9.18.18 released ---
2188
36220. [func] Deprecate the 'dialup' and 'heartbeat-interval'1896220. [func] Deprecate the 'dialup' and 'heartbeat-interval'
diff --git a/Makefile.in b/Makefile.in
index ff5f0bb..01d583f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
1# Makefile.in generated by automake 1.16.3 from Makefile.am.1# Makefile.in generated by automake 1.16.5 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994-2020 Free Software Foundation, Inc.4# Copyright (C) 1994-2021 Free Software Foundation, Inc.
55
6# This Makefile.in is free software; the Free Software Foundation6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it,7# gives unlimited permission to copy and/or distribute it,
@@ -104,11 +104,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
104 $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \104 $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \
105 $(top_srcdir)/m4/ax_jemalloc.m4 \105 $(top_srcdir)/m4/ax_jemalloc.m4 \
106 $(top_srcdir)/m4/ax_lib_lmdb.m4 \106 $(top_srcdir)/m4/ax_lib_lmdb.m4 \
107 $(top_srcdir)/m4/ax_perl_module.m4 \
108 $(top_srcdir)/m4/ax_posix_shell.m4 \107 $(top_srcdir)/m4/ax_posix_shell.m4 \
109 $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \108 $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \
110 $(top_srcdir)/m4/ax_pthread.m4 \109 $(top_srcdir)/m4/ax_pthread.m4 \
111 $(top_srcdir)/m4/ax_python_module.m4 \
112 $(top_srcdir)/m4/ax_restore_flags.m4 \110 $(top_srcdir)/m4/ax_restore_flags.m4 \
113 $(top_srcdir)/m4/ax_save_flags.m4 $(top_srcdir)/m4/ax_tls.m4 \111 $(top_srcdir)/m4/ax_save_flags.m4 $(top_srcdir)/m4/ax_tls.m4 \
114 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \112 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -209,16 +207,13 @@ am__define_uniq_tagged_files = \
209 unique=`for i in $$list; do \207 unique=`for i in $$list; do \
210 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \208 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
211 done | $(am__uniquify_input)`209 done | $(am__uniquify_input)`
212ETAGS = etags
213CTAGS = ctags
214CSCOPE = cscope
215DIST_SUBDIRS = . lib doc bin fuzz tests210DIST_SUBDIRS = . lib doc bin fuzz tests
216am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \211am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
217 $(top_srcdir)/Makefile.top \212 $(top_srcdir)/Makefile.top \
218 $(top_srcdir)/doc/doxygen/doxygen-input-filter.in \213 $(top_srcdir)/doc/doxygen/doxygen-input-filter.in \
219 $(top_srcdir)/util/check-make-install.in AUTHORS COPYING \214 $(top_srcdir)/util/check-make-install.in AUTHORS COPYING \
220 ChangeLog NEWS ar-lib compile config.guess config.sub \215 ChangeLog NEWS README.md ar-lib compile config.guess \
221 install-sh ltmain.sh missing216 config.sub install-sh ltmain.sh missing
222DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)217DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
223distdir = $(PACKAGE)-$(VERSION)218distdir = $(PACKAGE)-$(VERSION)
224top_distdir = $(distdir)219top_distdir = $(distdir)
@@ -284,6 +279,8 @@ CPP = @CPP@
284CPPFLAGS = @CPPFLAGS@279CPPFLAGS = @CPPFLAGS@
285CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@280CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
286CPP_FOR_BUILD = @CPP_FOR_BUILD@281CPP_FOR_BUILD = @CPP_FOR_BUILD@
282CSCOPE = @CSCOPE@
283CTAGS = @CTAGS@
287CURL = @CURL@284CURL = @CURL@
288CYGPATH_W = @CYGPATH_W@285CYGPATH_W = @CYGPATH_W@
289DEFS = @DEFS@286DEFS = @DEFS@
@@ -299,8 +296,10 @@ ECHO_C = @ECHO_C@
299ECHO_N = @ECHO_N@296ECHO_N = @ECHO_N@
300ECHO_T = @ECHO_T@297ECHO_T = @ECHO_T@
301EGREP = @EGREP@298EGREP = @EGREP@
299ETAGS = @ETAGS@
302EXEEXT = @EXEEXT@300EXEEXT = @EXEEXT@
303FGREP = @FGREP@301FGREP = @FGREP@
302FILECMD = @FILECMD@
304FSTRM_CAPTURE = @FSTRM_CAPTURE@303FSTRM_CAPTURE = @FSTRM_CAPTURE@
305FUZZ_LDFLAGS = @FUZZ_LDFLAGS@304FUZZ_LDFLAGS = @FUZZ_LDFLAGS@
306FUZZ_LOG_COMPILER = @FUZZ_LOG_COMPILER@305FUZZ_LOG_COMPILER = @FUZZ_LOG_COMPILER@
@@ -724,7 +723,6 @@ cscopelist-am: $(am__tagged_files)
724distclean-tags:723distclean-tags:
725 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags724 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
726 -rm -f cscope.out cscope.in.out cscope.po.out cscope.files725 -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
727
728distdir: $(BUILT_SOURCES)726distdir: $(BUILT_SOURCES)
729 $(MAKE) $(AM_MAKEFLAGS) distdir-am727 $(MAKE) $(AM_MAKEFLAGS) distdir-am
730728
diff --git a/NEWS b/NEWS
index 3f4e364..9bd4f51 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,189 @@
1 --- 9.18.24 released ---
2
36343. [bug] Fix case insensitive setting for isc_ht hashtable.
4 [GL #4568]
5
6 --- 9.18.23 released ---
7
86322. [security] Specific DNS answers could cause a denial-of-service
9 condition due to DNS validation taking a long time.
10 (CVE-2023-50387) [GL #4424]
11
126321. [security] Change 6315 inadvertently introduced regressions that
13 could cause named to crash. [GL #4234]
14
156320. [bug] Under some circumstances, the DoT code in client
16 mode could process more than one message at a time when
17 that was not expected. That has been fixed. [GL #4487]
18
19 --- 9.18.22 released ---
20
216319. [func] Limit isc_task_send() overhead for RBTDB tree pruning.
22 [GL #4383]
23
246317. [security] Restore DNS64 state when handling a serve-stale timeout.
25 (CVE-2023-5679) [GL #4334]
26
276316. [security] Specific queries could trigger an assertion check with
28 nxdomain-redirect enabled. (CVE-2023-5517) [GL #4281]
29
306315. [security] Speed up parsing of DNS messages with many different
31 names. (CVE-2023-4408) [GL #4234]
32
336314. [bug] Address race conditions in dns_tsigkey_find().
34 [GL #4182]
35
366312. [bug] Conversion from NSEC3 signed to NSEC signed could
37 temporarily put the zone into a state where it was
38 treated as unsigned until the NSEC chain was built.
39 Additionally conversion from one set of NSEC3 parameters
40 to another could also temporarily put the zone into a
41 state where it was treated as unsigned until the new
42 NSEC3 chain was built. [GL #1794] [GL #4495]
43
446310. [bug] Memory leak in zone.c:sign_zone. When named signed a
45 zone it could leak dst_keys due to a misplaced
46 'continue'. [GL #4488]
47
486306. [func] Log more details about the cause of "not exact" errors.
49 [GL #4500]
50
516304. [bug] The wrong time was being used to determine what RRSIGs
52 where to be generated when dnssec-policy was in use.
53 [GL #4494]
54
556302. [func] The "trust-anchor-telemetry" statement is no longer
56 marked as experimental. This silences a relevant log
57 message that was emitted even when the feature was
58 explicitly disabled. [GL #4497]
59
606300. [bug] Fix statistics export to use full 64 bit signed numbers
61 instead of truncating values to unsigned 32 bits.
62 [GL #4467]
63
646299. [port] NetBSD has added 'hmac' to libc which collides with our
65 use of 'hmac'. [GL #4478]
66
67 --- 9.18.21 released ---
68
696297. [bug] Improve LRU cleaning behaviour. [GL #4448]
70
716296. [func] The "resolver-nonbackoff-tries" and
72 "resolver-retry-interval" options are deprecated;
73 a warning will be logged if they are used. [GL #4405]
74
756294. [bug] BIND might sometimes crash after startup or
76 re-configuration when one 'tls' entry is used multiple
77 times to connect to remote servers due to initialisation
78 attempts from contexts of multiple threads. That has
79 been fixed. [GL #4464]
80
816290. [bug] Dig +yaml will now report "no servers could be reached"
82 also for UDP setup failure when no other servers or
83 tries are left. [GL #1229]
84
856287. [bug] Recognize escapes when reading the public key from file.
86 [GL !8502]
87
886286. [bug] Dig +yaml will now report "no servers could be reached"
89 on TCP connection failure as well as for UDP timeouts.
90 [GL #4396]
91
926282. [func] Deprecate AES-based DNS cookies. [GL #4421]
93
94 --- 9.18.20 released ---
95
966280. [bug] Fix missing newlines in the output of "rndc nta -dump".
97 [GL !8454]
98
996277. [bug] Take into account local authoritative zones when
100 falling back to serve-stale. [GL #4355]
101
1026275. [bug] Fix assertion failure when using lock-file configuration
103 option together -X argument to named. [GL #4386]
104
1056274. [bug] The 'lock-file' file was being removed when it
106 shouldn't have been making it ineffective if named was
107 started 3 or more times. [GL #4387]
108
1096271. [bug] Fix a shutdown race in dns__catz_update_cb(). [GL #4381]
110
1116269. [maint] B.ROOT-SERVERS.NET addresses are now 170.247.170.2 and
112 2801:1b8:10::b. [GL #4101]
113
1146267. [func] The timeouts for resending zone refresh queries over UDP
115 were lowered to enable named to more quickly determine
116 that a primary is down. [GL #4260]
117
1186265. [bug] Don't schedule resign operations on the raw version
119 of an inline-signing zone. [GL #4350]
120
1216261. [bug] Fix a possible assertion failure on an error path in
122 resolver.c:fctx_query(), when using an uninitialized
123 link. [GL #4331]
124
1256254. [cleanup] Add semantic patch to do an explicit cast from char
126 to unsigned char in ctype.h class of functions.
127 [GL #4327]
128
1296252. [test] Python system tests have to be executed by invoking
130 pytest directly. Executing them with the legacy test
131 runner is no longer supported. [GL #4250]
132
1336250. [bug] The wrong covered value was being set by
134 dns_ncache_current for RRSIG records in the returned
135 rdataset structure. This resulted in TYPE0 being
136 reported as the covered value of the RRSIG when dumping
137 the cache contents. [GL #4314]
138
139 --- 9.18.19 released ---
140
1416246. [security] Fix use-after-free error in TLS DNS code when sending
142 data. (CVE-2023-4236) [GL #4242]
143
1446245. [security] Limit the amount of recursion that can be performed
145 by isccc_cc_fromwire. (CVE-2023-3341) [GL #4152]
146
1476244. [bug] Adjust log levels on malformed messages to NOTICE when
148 transferring in a zone. [GL #4290]
149
1506241. [bug] Take into account the possibility of partial TLS writes
151 in TLS DNS code. That helps to prevent DNS messages
152 corruption on long DNS over TLS streams. [GL #4255]
153
1546240. [bug] Use dedicated per-worker thread jemalloc memory
155 arenas for send buffers allocation to reduce memory
156 consumption and avoid lock contention. [GL #4038]
157
1586239. [func] Deprecate the 'dnssec-must-be-secure' option.
159 [GL #3700]
160
1616237. [bug] Address memory leaks due to not clearing OpenSSL error
162 stack. [GL #4159]
163
1646235. [doc] Clarify BIND 9 time formats. [GL #4266]
165
1666234. [bug] Restore stale-refresh-time value after flushing the
167 cache. [GL #4278]
168
1696232. [bug] Following the introduction of krb5-subdomain-self-rhs
170 and ms-subdomain-self-rhs update rules, removal of
171 nonexistent PTR and SRV records via UPDATE could fail.
172 [GL #4280]
173
1746231. [func] Make nsupdate honor -v for SOA requests if the server
175 is specified. [GL #1181]
176
1776230. [bug] Prevent an unnecessary query restart if a synthesized
178 CNAME target points to the CNAME owner. [GL #3835]
179
1806227. [bug] Check the statistics-channel HTTP Content-length
181 to prevent negative or overflowing values from
182 causing a crash. [GL #4125]
183
1846224. [bug] Check the If-Modified-Since value length to prevent
185 out-of-bounds write. [GL #4124]
186
1 --- 9.18.18 released ---187 --- 9.18.18 released ---
2188
36220. [func] Deprecate the 'dialup' and 'heartbeat-interval'1896220. [func] Deprecate the 'dialup' and 'heartbeat-interval'
diff --git a/README.md b/README.md
index 07cf1de..6e39de5 100644
--- a/README.md
+++ b/README.md
@@ -74,17 +74,9 @@ contents of your configuration file in a non-confidential issue, it is
74advisable to obscure key secrets; this can be done automatically by74advisable to obscure key secrets; this can be done automatically by
75using `named-checkconf -px`.75using `named-checkconf -px`.
7676
77If you are reporting a bug that is a potential security issue, such as an77For information about ISC's Security Vulnerability Disclosure Policy and
78assertion failure or other crash in `named`, please do *NOT* use GitLab to78information about reporting potential security issues, please see
79report it. Instead, send mail to79`SECURITY.md`.
80[security-officer@isc.org](mailto:security-officer@isc.org) using our
81OpenPGP key to secure your message. (Information about OpenPGP and links
82to our key can be found at
83[https://www.isc.org/pgpkey](https://www.isc.org/pgpkey).) Please do not
84discuss the bug on any public mailing list.
85
86For a general overview of ISC security policies, read the Knowledgebase
87article at [https://kb.isc.org/docs/aa-00861](https://kb.isc.org/docs/aa-00861).
8880
89Professional support and training for BIND are available from81Professional support and training for BIND are available from
90ISC. Contact us at [https://www.isc.org/contact](https://www.isc.org/contact)82ISC. Contact us at [https://www.isc.org/contact](https://www.isc.org/contact)
diff --git a/SECURITY.md b/SECURITY.md
91new file mode 10064483new file mode 100644
index 0000000..2c63605
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,35 @@
1<!--
2Copyright (C) Internet Systems Consortium, Inc. ("ISC")
3
4SPDX-License-Identifier: MPL-2.0
5
6This Source Code Form is subject to the terms of the Mozilla Public
7License, v. 2.0. If a copy of the MPL was not distributed with this
8file, you can obtain one at https://mozilla.org/MPL/2.0/.
9
10See the COPYRIGHT file distributed with this work for additional
11information regarding copyright ownership.
12-->
13# Security Policy
14
15ISC's Security Vulnerability Disclosure Policy is documented in the
16relevant [ISC Knowledgebase article][1].
17
18## Reporting possible security issues
19
20If you think you may be seeing a potential security vulnerability in
21BIND (for example, a crash with a REQUIRE, INSIST, or ASSERT failure),
22please report it immediately by [opening a confidential GitLab issue][2]
23(preferred) or emailing bind-security@isc.org.
24
25Please do not discuss undisclosed security vulnerabilities on any public
26mailing list. ISC has a long history of handling reported
27vulnerabilities promptly and effectively and we respect and acknowledge
28responsible reporters.
29
30If you have a crash, you may want to consult the Knowledgebase article
31entitled ["What to do if your BIND or DHCP server has crashed"][3].
32
33[1]: https://kb.isc.org/docs/aa-00861
34[2]: https://gitlab.isc.org/isc-projects/bind9/-/issues/new?issue[confidential]=true&issuable_template=Bug
35[3]: https://kb.isc.org/docs/aa-00340
diff --git a/aclocal.m4 b/aclocal.m4
index 6d817df..6e826f5 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
1# generated automatically by aclocal 1.16.3 -*- Autoconf -*-1# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
22
3# Copyright (C) 1996-2020 Free Software Foundation, Inc.3# Copyright (C) 1996-2021 Free Software Foundation, Inc.
44
5# This file is free software; the Free Software Foundation5# This file is free software; the Free Software Foundation
6# gives unlimited permission to copy and/or distribute it,6# gives unlimited permission to copy and/or distribute it,
@@ -14,13 +14,13 @@
14m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])14m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
15m4_ifndef([AC_AUTOCONF_VERSION],15m4_ifndef([AC_AUTOCONF_VERSION],
16 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl16 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
17m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,17m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],,
18[m4_warning([this file was generated for autoconf 2.69.18[m4_warning([this file was generated for autoconf 2.71.
19You have another version of autoconf. It may work, but is not guaranteed to.19You have another version of autoconf. It may work, but is not guaranteed to.
20If you have problems, you may need to regenerate the build system entirely.20If you have problems, you may need to regenerate the build system entirely.
21To do so, use the procedure documented by the package, typically 'autoreconf'.])])21To do so, use the procedure documented by the package, typically 'autoreconf'.])])
2222
23# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-23# pkg.m4 - Macros to locate and use pkg-config. -*- Autoconf -*-
24# serial 12 (pkg-config-0.29.2)24# serial 12 (pkg-config-0.29.2)
2525
26dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.26dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
@@ -108,7 +108,7 @@ dnl Check to see whether a particular set of modules exists. Similar to
108dnl PKG_CHECK_MODULES(), but does not set variables or print errors.108dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
109dnl109dnl
110dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])110dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
111dnl only at the first occurence in configure.ac, so if the first place111dnl only at the first occurrence in configure.ac, so if the first place
112dnl it's called might be skipped (such as if it is within an "if", you112dnl it's called might be skipped (such as if it is within an "if", you
113dnl have to call PKG_CHECK_EXISTS manually113dnl have to call PKG_CHECK_EXISTS manually
114AC_DEFUN([PKG_CHECK_EXISTS],114AC_DEFUN([PKG_CHECK_EXISTS],
@@ -177,14 +177,14 @@ if test $pkg_failed = yes; then
177 AC_MSG_RESULT([no])177 AC_MSG_RESULT([no])
178 _PKG_SHORT_ERRORS_SUPPORTED178 _PKG_SHORT_ERRORS_SUPPORTED
179 if test $_pkg_short_errors_supported = yes; then179 if test $_pkg_short_errors_supported = yes; then
180 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`180 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
181 else181 else
182 $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`182 $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
183 fi183 fi
184 # Put the nasty error message in config.log where it belongs184 # Put the nasty error message in config.log where it belongs
185 echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD185 echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
186186
187 m4_default([$4], [AC_MSG_ERROR(187 m4_default([$4], [AC_MSG_ERROR(
188[Package requirements ($2) were not met:188[Package requirements ($2) were not met:
189189
190$$1_PKG_ERRORS190$$1_PKG_ERRORS
@@ -196,7 +196,7 @@ _PKG_TEXT])[]dnl
196 ])196 ])
197elif test $pkg_failed = untried; then197elif test $pkg_failed = untried; then
198 AC_MSG_RESULT([no])198 AC_MSG_RESULT([no])
199 m4_default([$4], [AC_MSG_FAILURE(199 m4_default([$4], [AC_MSG_FAILURE(
200[The pkg-config script could not be found or is too old. Make sure it200[The pkg-config script could not be found or is too old. Make sure it
201is in your PATH or set the PKG_CONFIG environment variable to the full201is in your PATH or set the PKG_CONFIG environment variable to the full
202path to pkg-config.202path to pkg-config.
@@ -206,10 +206,10 @@ _PKG_TEXT
206To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl206To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
207 ])207 ])
208else208else
209 $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS209 $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
210 $1[]_LIBS=$pkg_cv_[]$1[]_LIBS210 $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
211 AC_MSG_RESULT([yes])211 AC_MSG_RESULT([yes])
212 $3212 $3
213fi[]dnl213fi[]dnl
214])dnl PKG_CHECK_MODULES214])dnl PKG_CHECK_MODULES
215215
@@ -296,7 +296,75 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
296AS_VAR_IF([$1], [""], [$5], [$4])dnl296AS_VAR_IF([$1], [""], [$5], [$4])dnl
297])dnl PKG_CHECK_VAR297])dnl PKG_CHECK_VAR
298298
299# Copyright (C) 2002-2020 Free Software Foundation, Inc.299dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
300dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
301dnl [DESCRIPTION], [DEFAULT])
302dnl ------------------------------------------
303dnl
304dnl Prepare a "--with-" configure option using the lowercase
305dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and
306dnl PKG_CHECK_MODULES in a single macro.
307AC_DEFUN([PKG_WITH_MODULES],
308[
309m4_pushdef([with_arg], m4_tolower([$1]))
310
311m4_pushdef([description],
312 [m4_default([$5], [build with ]with_arg[ support])])
313
314m4_pushdef([def_arg], [m4_default([$6], [auto])])
315m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])
316m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])
317
318m4_case(def_arg,
319 [yes],[m4_pushdef([with_without], [--without-]with_arg)],
320 [m4_pushdef([with_without],[--with-]with_arg)])
321
322AC_ARG_WITH(with_arg,
323 AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
324 [AS_TR_SH([with_]with_arg)=def_arg])
325
326AS_CASE([$AS_TR_SH([with_]with_arg)],
327 [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],
328 [auto],[PKG_CHECK_MODULES([$1],[$2],
329 [m4_n([def_action_if_found]) $3],
330 [m4_n([def_action_if_not_found]) $4])])
331
332m4_popdef([with_arg])
333m4_popdef([description])
334m4_popdef([def_arg])
335
336])dnl PKG_WITH_MODULES
337
338dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
339dnl [DESCRIPTION], [DEFAULT])
340dnl -----------------------------------------------
341dnl
342dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
343dnl check._[VARIABLE-PREFIX] is exported as make variable.
344AC_DEFUN([PKG_HAVE_WITH_MODULES],
345[
346PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
347
348AM_CONDITIONAL([HAVE_][$1],
349 [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
350])dnl PKG_HAVE_WITH_MODULES
351
352dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
353dnl [DESCRIPTION], [DEFAULT])
354dnl ------------------------------------------------------
355dnl
356dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
357dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make
358dnl and preprocessor variable.
359AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
360[
361PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
362
363AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
364 [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
365])dnl PKG_HAVE_DEFINE_WITH_MODULES
366
367# Copyright (C) 2002-2021 Free Software Foundation, Inc.
300#368#
301# This file is free software; the Free Software Foundation369# This file is free software; the Free Software Foundation
302# gives unlimited permission to copy and/or distribute it,370# gives unlimited permission to copy and/or distribute it,
@@ -311,7 +379,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
311[am__api_version='1.16'379[am__api_version='1.16'
312dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to380dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
313dnl require some minimum version. Point them to the right macro.381dnl require some minimum version. Point them to the right macro.
314m4_if([$1], [1.16.3], [],382m4_if([$1], [1.16.5], [],
315 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl383 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
316])384])
317385
@@ -327,12 +395,12 @@ m4_define([_AM_AUTOCONF_VERSION], [])
327# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.395# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
328# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.396# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
329AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],397AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
330[AM_AUTOMAKE_VERSION([1.16.3])dnl398[AM_AUTOMAKE_VERSION([1.16.5])dnl
331m4_ifndef([AC_AUTOCONF_VERSION],399m4_ifndef([AC_AUTOCONF_VERSION],
332 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl400 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
333_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])401_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
334402
335# Copyright (C) 2011-2020 Free Software Foundation, Inc.403# Copyright (C) 2011-2021 Free Software Foundation, Inc.
336#404#
337# This file is free software; the Free Software Foundation405# This file is free software; the Free Software Foundation
338# gives unlimited permission to copy and/or distribute it,406# gives unlimited permission to copy and/or distribute it,
@@ -394,7 +462,7 @@ AC_SUBST([AR])dnl
394462
395# AM_AUX_DIR_EXPAND -*- Autoconf -*-463# AM_AUX_DIR_EXPAND -*- Autoconf -*-
396464
397# Copyright (C) 2001-2020 Free Software Foundation, Inc.465# Copyright (C) 2001-2021 Free Software Foundation, Inc.
398#466#
399# This file is free software; the Free Software Foundation467# This file is free software; the Free Software Foundation
400# gives unlimited permission to copy and/or distribute it,468# gives unlimited permission to copy and/or distribute it,
@@ -446,7 +514,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
446514
447# AM_CONDITIONAL -*- Autoconf -*-515# AM_CONDITIONAL -*- Autoconf -*-
448516
449# Copyright (C) 1997-2020 Free Software Foundation, Inc.517# Copyright (C) 1997-2021 Free Software Foundation, Inc.
450#518#
451# This file is free software; the Free Software Foundation519# This file is free software; the Free Software Foundation
452# gives unlimited permission to copy and/or distribute it,520# gives unlimited permission to copy and/or distribute it,
@@ -477,7 +545,7 @@ AC_CONFIG_COMMANDS_PRE(
477Usually this means the macro was only invoked conditionally.]])545Usually this means the macro was only invoked conditionally.]])
478fi])])546fi])])
479547
480# Copyright (C) 1999-2020 Free Software Foundation, Inc.548# Copyright (C) 1999-2021 Free Software Foundation, Inc.
481#549#
482# This file is free software; the Free Software Foundation550# This file is free software; the Free Software Foundation
483# gives unlimited permission to copy and/or distribute it,551# gives unlimited permission to copy and/or distribute it,
@@ -668,7 +736,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
668736
669# Generate code to set up dependency tracking. -*- Autoconf -*-737# Generate code to set up dependency tracking. -*- Autoconf -*-
670738
671# Copyright (C) 1999-2020 Free Software Foundation, Inc.739# Copyright (C) 1999-2021 Free Software Foundation, Inc.
672#740#
673# This file is free software; the Free Software Foundation741# This file is free software; the Free Software Foundation
674# gives unlimited permission to copy and/or distribute it,742# gives unlimited permission to copy and/or distribute it,
@@ -736,7 +804,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
736804
737# AM_EXTRA_RECURSIVE_TARGETS -*- Autoconf -*-805# AM_EXTRA_RECURSIVE_TARGETS -*- Autoconf -*-
738806
739# Copyright (C) 2012-2020 Free Software Foundation, Inc.807# Copyright (C) 2012-2021 Free Software Foundation, Inc.
740#808#
741# This file is free software; the Free Software Foundation809# This file is free software; the Free Software Foundation
742# gives unlimited permission to copy and/or distribute it,810# gives unlimited permission to copy and/or distribute it,
@@ -753,7 +821,7 @@ AC_DEFUN([AM_EXTRA_RECURSIVE_TARGETS], [])
753821
754# Do all the work for Automake. -*- Autoconf -*-822# Do all the work for Automake. -*- Autoconf -*-
755823
756# Copyright (C) 1996-2020 Free Software Foundation, Inc.824# Copyright (C) 1996-2021 Free Software Foundation, Inc.
757#825#
758# This file is free software; the Free Software Foundation826# This file is free software; the Free Software Foundation
759# gives unlimited permission to copy and/or distribute it,827# gives unlimited permission to copy and/or distribute it,
@@ -781,6 +849,10 @@ m4_defn([AC_PROG_CC])
781# release and drop the old call support.849# release and drop the old call support.
782AC_DEFUN([AM_INIT_AUTOMAKE],850AC_DEFUN([AM_INIT_AUTOMAKE],
783[AC_PREREQ([2.65])dnl851[AC_PREREQ([2.65])dnl
852m4_ifdef([_$0_ALREADY_INIT],
853 [m4_fatal([$0 expanded multiple times
854]m4_defn([_$0_ALREADY_INIT]))],
855 [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl
784dnl Autoconf wants to disallow AM_ names. We explicitly allow856dnl Autoconf wants to disallow AM_ names. We explicitly allow
785dnl the ones we care about.857dnl the ones we care about.
786m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl858m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -817,7 +889,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
817[_AM_SET_OPTIONS([$1])dnl889[_AM_SET_OPTIONS([$1])dnl
818dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.890dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
819m4_if(891m4_if(
820 m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),892 m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]),
821 [ok:ok],,893 [ok:ok],,
822 [m4_fatal([AC_INIT should be called with package and version arguments])])dnl894 [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
823 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl895 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
@@ -869,6 +941,20 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
869 [m4_define([AC_PROG_OBJCXX],941 [m4_define([AC_PROG_OBJCXX],
870 m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl942 m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
871])943])
944# Variables for tags utilities; see am/tags.am
945if test -z "$CTAGS"; then
946 CTAGS=ctags
947fi
948AC_SUBST([CTAGS])
949if test -z "$ETAGS"; then
950 ETAGS=etags
951fi
952AC_SUBST([ETAGS])
953if test -z "$CSCOPE"; then
954 CSCOPE=cscope
955fi
956AC_SUBST([CSCOPE])
957
872AC_REQUIRE([AM_SILENT_RULES])dnl958AC_REQUIRE([AM_SILENT_RULES])dnl
873dnl The testsuite driver may need to know about EXEEXT, so add the959dnl The testsuite driver may need to know about EXEEXT, so add the
874dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This960dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
@@ -950,7 +1036,7 @@ for _am_header in $config_headers :; do
950done1036done
951echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])1037echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
9521038
953# Copyright (C) 2001-2020 Free Software Foundation, Inc.1039# Copyright (C) 2001-2021 Free Software Foundation, Inc.
954#1040#
955# This file is free software; the Free Software Foundation1041# This file is free software; the Free Software Foundation
956# gives unlimited permission to copy and/or distribute it,1042# gives unlimited permission to copy and/or distribute it,
@@ -971,7 +1057,7 @@ if test x"${install_sh+set}" != xset; then
971fi1057fi
972AC_SUBST([install_sh])])1058AC_SUBST([install_sh])])
9731059
974# Copyright (C) 2003-2020 Free Software Foundation, Inc.1060# Copyright (C) 2003-2021 Free Software Foundation, Inc.
975#1061#
976# This file is free software; the Free Software Foundation1062# This file is free software; the Free Software Foundation
977# gives unlimited permission to copy and/or distribute it,1063# gives unlimited permission to copy and/or distribute it,
@@ -993,7 +1079,7 @@ AC_SUBST([am__leading_dot])])
993# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-1079# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
994# From Jim Meyering1080# From Jim Meyering
9951081
996# Copyright (C) 1996-2020 Free Software Foundation, Inc.1082# Copyright (C) 1996-2021 Free Software Foundation, Inc.
997#1083#
998# This file is free software; the Free Software Foundation1084# This file is free software; the Free Software Foundation
999# gives unlimited permission to copy and/or distribute it,1085# gives unlimited permission to copy and/or distribute it,
@@ -1028,7 +1114,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
10281114
1029# Check to see how 'make' treats includes. -*- Autoconf -*-1115# Check to see how 'make' treats includes. -*- Autoconf -*-
10301116
1031# Copyright (C) 2001-2020 Free Software Foundation, Inc.1117# Copyright (C) 2001-2021 Free Software Foundation, Inc.
1032#1118#
1033# This file is free software; the Free Software Foundation1119# This file is free software; the Free Software Foundation
1034# gives unlimited permission to copy and/or distribute it,1120# gives unlimited permission to copy and/or distribute it,
@@ -1071,7 +1157,7 @@ AC_SUBST([am__quote])])
10711157
1072# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-1158# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
10731159
1074# Copyright (C) 1997-2020 Free Software Foundation, Inc.1160# Copyright (C) 1997-2021 Free Software Foundation, Inc.
1075#1161#
1076# This file is free software; the Free Software Foundation1162# This file is free software; the Free Software Foundation
1077# gives unlimited permission to copy and/or distribute it,1163# gives unlimited permission to copy and/or distribute it,
@@ -1105,7 +1191,7 @@ fi
11051191
1106# Helper functions for option handling. -*- Autoconf -*-1192# Helper functions for option handling. -*- Autoconf -*-
11071193
1108# Copyright (C) 2001-2020 Free Software Foundation, Inc.1194# Copyright (C) 2001-2021 Free Software Foundation, Inc.
1109#1195#
1110# This file is free software; the Free Software Foundation1196# This file is free software; the Free Software Foundation
1111# gives unlimited permission to copy and/or distribute it,1197# gives unlimited permission to copy and/or distribute it,
@@ -1134,7 +1220,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
1134AC_DEFUN([_AM_IF_OPTION],1220AC_DEFUN([_AM_IF_OPTION],
1135[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])1221[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
11361222
1137# Copyright (C) 1999-2020 Free Software Foundation, Inc.1223# Copyright (C) 1999-2021 Free Software Foundation, Inc.
1138#1224#
1139# This file is free software; the Free Software Foundation1225# This file is free software; the Free Software Foundation
1140# gives unlimited permission to copy and/or distribute it,1226# gives unlimited permission to copy and/or distribute it,
@@ -1181,7 +1267,7 @@ AC_LANG_POP([C])])
1181# For backward compatibility.1267# For backward compatibility.
1182AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])1268AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
11831269
1184# Copyright (C) 1999-2020 Free Software Foundation, Inc.1270# Copyright (C) 1999-2021 Free Software Foundation, Inc.
1185#1271#
1186# This file is free software; the Free Software Foundation1272# This file is free software; the Free Software Foundation
1187# gives unlimited permission to copy and/or distribute it,1273# gives unlimited permission to copy and/or distribute it,
@@ -1216,6 +1302,7 @@ AC_DEFUN([AM_PATH_PYTHON],
1216 dnl supported. (2.0 was released on October 16, 2000).1302 dnl supported. (2.0 was released on October 16, 2000).
1217 m4_define_default([_AM_PYTHON_INTERPRETER_LIST],1303 m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
1218[python python2 python3 dnl1304[python python2 python3 dnl
1305 python3.11 python3.10 dnl
1219 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 dnl1306 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 dnl
1220 python3.2 python3.1 python3.0 dnl1307 python3.2 python3.1 python3.0 dnl
1221 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 dnl1308 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 dnl
@@ -1260,7 +1347,7 @@ AC_DEFUN([AM_PATH_PYTHON],
1260 ])1347 ])
12611348
1262 if test "$PYTHON" = :; then1349 if test "$PYTHON" = :; then
1263 dnl Run any user-specified action, or abort.1350 dnl Run any user-specified action, or abort.
1264 m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])1351 m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
1265 else1352 else
12661353
@@ -1269,27 +1356,132 @@ AC_DEFUN([AM_PATH_PYTHON],
1269 dnl trailing zero was eliminated. So now we output just the major1356 dnl trailing zero was eliminated. So now we output just the major
1270 dnl and minor version numbers, as numbers. Apparently the tertiary1357 dnl and minor version numbers, as numbers. Apparently the tertiary
1271 dnl version is not of interest.1358 dnl version is not of interest.
12721359 dnl
1273 AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],1360 AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
1274 [am_cv_python_version=`$PYTHON -c "import sys; print('%u.%u' % sys.version_info[[:2]])"`])1361 [am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info[[:2]])"`])
1275 AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])1362 AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
12761363
1277 dnl Use the values of $prefix and $exec_prefix for the corresponding1364 dnl At times, e.g., when building shared libraries, you may want
1278 dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made
1279 dnl distinct variables so they can be overridden if need be. However,
1280 dnl general consensus is that you shouldn't need this ability.
1281
1282 AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
1283 AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
1284
1285 dnl At times (like when building shared libraries) you may want
1286 dnl to know which OS platform Python thinks this is.1365 dnl to know which OS platform Python thinks this is.
12871366 dnl
1288 AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],1367 AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],
1289 [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`])1368 [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`])
1290 AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])1369 AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
12911370
1292 # Just factor out some code duplication.1371 dnl emacs-page
1372 dnl If --with-python-sys-prefix is given, use the values of sys.prefix
1373 dnl and sys.exec_prefix for the corresponding values of PYTHON_PREFIX
1374 dnl and PYTHON_EXEC_PREFIX. Otherwise, use the GNU ${prefix} and
1375 dnl ${exec_prefix} variables.
1376 dnl
1377 dnl The two are made distinct variables so they can be overridden if
1378 dnl need be, although general consensus is that you shouldn't need
1379 dnl this separation.
1380 dnl
1381 dnl Also allow directly setting the prefixes via configure options,
1382 dnl overriding any default.
1383 dnl
1384 if test "x$prefix" = xNONE; then
1385 am__usable_prefix=$ac_default_prefix
1386 else
1387 am__usable_prefix=$prefix
1388 fi
1389
1390 # Allow user to request using sys.* values from Python,
1391 # instead of the GNU $prefix values.
1392 AC_ARG_WITH([python-sys-prefix],
1393 [AS_HELP_STRING([--with-python-sys-prefix],
1394 [use Python's sys.prefix and sys.exec_prefix values])],
1395 [am_use_python_sys=:],
1396 [am_use_python_sys=false])
1397
1398 # Allow user to override whatever the default Python prefix is.
1399 AC_ARG_WITH([python_prefix],
1400 [AS_HELP_STRING([--with-python_prefix],
1401 [override the default PYTHON_PREFIX])],
1402 [am_python_prefix_subst=$withval
1403 am_cv_python_prefix=$withval
1404 AC_MSG_CHECKING([for explicit $am_display_PYTHON prefix])
1405 AC_MSG_RESULT([$am_cv_python_prefix])],
1406 [
1407 if $am_use_python_sys; then
1408 # using python sys.prefix value, not GNU
1409 AC_CACHE_CHECK([for python default $am_display_PYTHON prefix],
1410 [am_cv_python_prefix],
1411 [am_cv_python_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"`])
1412
1413 dnl If sys.prefix is a subdir of $prefix, replace the literal value of
1414 dnl $prefix with a variable reference so it can be overridden.
1415 case $am_cv_python_prefix in
1416 $am__usable_prefix*)
1417 am__strip_prefix=`echo "$am__usable_prefix" | sed 's|.|.|g'`
1418 am_python_prefix_subst=`echo "$am_cv_python_prefix" | sed "s,^$am__strip_prefix,\\${prefix},"`
1419 ;;
1420 *)
1421 am_python_prefix_subst=$am_cv_python_prefix
1422 ;;
1423 esac
1424 else # using GNU prefix value, not python sys.prefix
1425 am_python_prefix_subst='${prefix}'
1426 am_python_prefix=$am_python_prefix_subst
1427 AC_MSG_CHECKING([for GNU default $am_display_PYTHON prefix])
1428 AC_MSG_RESULT([$am_python_prefix])
1429 fi])
1430 # Substituting python_prefix_subst value.
1431 AC_SUBST([PYTHON_PREFIX], [$am_python_prefix_subst])
1432
1433 # emacs-page Now do it all over again for Python exec_prefix, but with yet
1434 # another conditional: fall back to regular prefix if that was specified.
1435 AC_ARG_WITH([python_exec_prefix],
1436 [AS_HELP_STRING([--with-python_exec_prefix],
1437 [override the default PYTHON_EXEC_PREFIX])],
1438 [am_python_exec_prefix_subst=$withval
1439 am_cv_python_exec_prefix=$withval
1440 AC_MSG_CHECKING([for explicit $am_display_PYTHON exec_prefix])
1441 AC_MSG_RESULT([$am_cv_python_exec_prefix])],
1442 [
1443 # no explicit --with-python_exec_prefix, but if
1444 # --with-python_prefix was given, use its value for python_exec_prefix too.
1445 AS_IF([test -n "$with_python_prefix"],
1446 [am_python_exec_prefix_subst=$with_python_prefix
1447 am_cv_python_exec_prefix=$with_python_prefix
1448 AC_MSG_CHECKING([for python_prefix-given $am_display_PYTHON exec_prefix])
1449 AC_MSG_RESULT([$am_cv_python_exec_prefix])],
1450 [
1451 # Set am__usable_exec_prefix whether using GNU or Python values,
1452 # since we use that variable for pyexecdir.
1453 if test "x$exec_prefix" = xNONE; then
1454 am__usable_exec_prefix=$am__usable_prefix
1455 else
1456 am__usable_exec_prefix=$exec_prefix
1457 fi
1458 #
1459 if $am_use_python_sys; then # using python sys.exec_prefix, not GNU
1460 AC_CACHE_CHECK([for python default $am_display_PYTHON exec_prefix],
1461 [am_cv_python_exec_prefix],
1462 [am_cv_python_exec_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)"`])
1463 dnl If sys.exec_prefix is a subdir of $exec_prefix, replace the
1464 dnl literal value of $exec_prefix with a variable reference so it can
1465 dnl be overridden.
1466 case $am_cv_python_exec_prefix in
1467 $am__usable_exec_prefix*)
1468 am__strip_prefix=`echo "$am__usable_exec_prefix" | sed 's|.|.|g'`
1469 am_python_exec_prefix_subst=`echo "$am_cv_python_exec_prefix" | sed "s,^$am__strip_prefix,\\${exec_prefix},"`
1470 ;;
1471 *)
1472 am_python_exec_prefix_subst=$am_cv_python_exec_prefix
1473 ;;
1474 esac
1475 else # using GNU $exec_prefix, not python sys.exec_prefix
1476 am_python_exec_prefix_subst='${exec_prefix}'
1477 am_python_exec_prefix=$am_python_exec_prefix_subst
1478 AC_MSG_CHECKING([for GNU default $am_display_PYTHON exec_prefix])
1479 AC_MSG_RESULT([$am_python_exec_prefix])
1480 fi])])
1481 # Substituting python_exec_prefix_subst.
1482 AC_SUBST([PYTHON_EXEC_PREFIX], [$am_python_exec_prefix_subst])
1483
1484 # Factor out some code duplication into this shell variable.
1293 am_python_setup_sysconfig="\1485 am_python_setup_sysconfig="\
1294import sys1486import sys
1295# Prefer sysconfig over distutils.sysconfig, for better compatibility1487# Prefer sysconfig over distutils.sysconfig, for better compatibility
@@ -1309,96 +1501,109 @@ try:
1309except ImportError:1501except ImportError:
1310 pass"1502 pass"
13111503
1312 dnl Set up 4 directories:1504 dnl emacs-page Set up 4 directories:
13131505
1314 dnl pythondir -- where to install python scripts. This is the1506 dnl 1. pythondir: where to install python scripts. This is the
1315 dnl site-packages directory, not the python standard library1507 dnl site-packages directory, not the python standard library
1316 dnl directory like in previous automake betas. This behavior1508 dnl directory like in previous automake betas. This behavior
1317 dnl is more consistent with lispdir.m4 for example.1509 dnl is more consistent with lispdir.m4 for example.
1318 dnl Query distutils for this directory.1510 dnl Query distutils for this directory.
1319 AC_CACHE_CHECK([for $am_display_PYTHON script directory],1511 dnl
1320 [am_cv_python_pythondir],1512 AC_CACHE_CHECK([for $am_display_PYTHON script directory (pythondir)],
1321 [if test "x$prefix" = xNONE1513 [am_cv_python_pythondir],
1322 then1514 [if test "x$am_cv_python_prefix" = x; then
1323 am_py_prefix=$ac_default_prefix1515 am_py_prefix=$am__usable_prefix
1324 else1516 else
1325 am_py_prefix=$prefix1517 am_py_prefix=$am_cv_python_prefix
1326 fi1518 fi
1327 am_cv_python_pythondir=`$PYTHON -c "1519 am_cv_python_pythondir=`$PYTHON -c "
1328$am_python_setup_sysconfig1520$am_python_setup_sysconfig
1329if can_use_sysconfig:1521if can_use_sysconfig:
1330 sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})1522 if hasattr(sysconfig, 'get_default_scheme'):
1523 scheme = sysconfig.get_default_scheme()
1524 else:
1525 scheme = sysconfig._get_default_scheme()
1526 if scheme == 'posix_local':
1527 # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/
1528 scheme = 'posix_prefix'
1529 sitedir = sysconfig.get_path('purelib', scheme, vars={'base':'$am_py_prefix'})
1331else:1530else:
1332 from distutils import sysconfig1531 from distutils import sysconfig
1333 sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')1532 sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
1334sys.stdout.write(sitedir)"`1533sys.stdout.write(sitedir)"`
1335 case $am_cv_python_pythondir in1534 #
1336 $am_py_prefix*)1535 case $am_cv_python_pythondir in
1337 am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`1536 $am_py_prefix*)
1338 am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`1537 am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
1339 ;;1538 am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,\\${PYTHON_PREFIX},"`
1340 *)1539 ;;
1341 case $am_py_prefix in1540 *)
1342 /usr|/System*) ;;1541 case $am_py_prefix in
1343 *)1542 /usr|/System*) ;;
1344 am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages1543 *) am_cv_python_pythondir="\${PYTHON_PREFIX}/lib/python$PYTHON_VERSION/site-packages"
1345 ;;1544 ;;
1346 esac
1347 ;;
1348 esac1545 esac
1349 ])1546 ;;
1547 esac
1548 ])
1350 AC_SUBST([pythondir], [$am_cv_python_pythondir])1549 AC_SUBST([pythondir], [$am_cv_python_pythondir])
13511550
1352 dnl pkgpythondir -- $PACKAGE directory under pythondir. Was1551 dnl 2. pkgpythondir: $PACKAGE directory under pythondir. Was
1353 dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is1552 dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is
1354 dnl more consistent with the rest of automake.1553 dnl more consistent with the rest of automake.
13551554 dnl
1356 AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])1555 AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])
13571556
1358 dnl pyexecdir -- directory for installing python extension modules1557 dnl 3. pyexecdir: directory for installing python extension modules
1359 dnl (shared libraries)1558 dnl (shared libraries).
1360 dnl Query distutils for this directory.1559 dnl Query distutils for this directory.
1361 AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],1560 dnl
1362 [am_cv_python_pyexecdir],1561 AC_CACHE_CHECK([for $am_display_PYTHON extension module directory (pyexecdir)],
1363 [if test "x$exec_prefix" = xNONE1562 [am_cv_python_pyexecdir],
1364 then1563 [if test "x$am_cv_python_exec_prefix" = x; then
1365 am_py_exec_prefix=$am_py_prefix1564 am_py_exec_prefix=$am__usable_exec_prefix
1366 else1565 else
1367 am_py_exec_prefix=$exec_prefix1566 am_py_exec_prefix=$am_cv_python_exec_prefix
1368 fi1567 fi
1369 am_cv_python_pyexecdir=`$PYTHON -c "1568 am_cv_python_pyexecdir=`$PYTHON -c "
1370$am_python_setup_sysconfig1569$am_python_setup_sysconfig
1371if can_use_sysconfig:1570if can_use_sysconfig:
1372 sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})1571 if hasattr(sysconfig, 'get_default_scheme'):
1572 scheme = sysconfig.get_default_scheme()
1573 else:
1574 scheme = sysconfig._get_default_scheme()
1575 if scheme == 'posix_local':
1576 # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/
1577 scheme = 'posix_prefix'
1578 sitedir = sysconfig.get_path('platlib', scheme, vars={'platbase':'$am_py_exec_prefix'})
1373else:1579else:
1374 from distutils import sysconfig1580 from distutils import sysconfig
1375 sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')1581 sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_exec_prefix')
1376sys.stdout.write(sitedir)"`1582sys.stdout.write(sitedir)"`
1377 case $am_cv_python_pyexecdir in1583 #
1378 $am_py_exec_prefix*)1584 case $am_cv_python_pyexecdir in
1379 am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`1585 $am_py_exec_prefix*)
1380 am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`1586 am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
1381 ;;1587 am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,\\${PYTHON_EXEC_PREFIX},"`
1382 *)1588 ;;
1383 case $am_py_exec_prefix in1589 *)
1384 /usr|/System*) ;;1590 case $am_py_exec_prefix in
1385 *)1591 /usr|/System*) ;;
1386 am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages1592 *) am_cv_python_pyexecdir="\${PYTHON_EXEC_PREFIX}/lib/python$PYTHON_VERSION/site-packages"
1387 ;;1593 ;;
1388 esac
1389 ;;
1390 esac1594 esac
1391 ])1595 ;;
1596 esac
1597 ])
1392 AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])1598 AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
13931599
1394 dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)1600 dnl 4. pkgpyexecdir: $(pyexecdir)/$(PACKAGE)
13951601 dnl
1396 AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])1602 AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])
13971603
1398 dnl Run any user-specified action.1604 dnl Run any user-specified action.
1399 $21605 $2
1400 fi1606 fi
1401
1402])1607])
14031608
14041609
@@ -1421,7 +1626,7 @@ for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]
1421sys.exit(sys.hexversion < minverhex)"1626sys.exit(sys.hexversion < minverhex)"
1422 AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])1627 AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
14231628
1424# Copyright (C) 2001-2020 Free Software Foundation, Inc.1629# Copyright (C) 2001-2021 Free Software Foundation, Inc.
1425#1630#
1426# This file is free software; the Free Software Foundation1631# This file is free software; the Free Software Foundation
1427# gives unlimited permission to copy and/or distribute it,1632# gives unlimited permission to copy and/or distribute it,
@@ -1440,7 +1645,7 @@ AC_DEFUN([AM_RUN_LOG],
14401645
1441# Check to make sure that the build environment is sane. -*- Autoconf -*-1646# Check to make sure that the build environment is sane. -*- Autoconf -*-
14421647
1443# Copyright (C) 1996-2020 Free Software Foundation, Inc.1648# Copyright (C) 1996-2021 Free Software Foundation, Inc.
1444#1649#
1445# This file is free software; the Free Software Foundation1650# This file is free software; the Free Software Foundation
1446# gives unlimited permission to copy and/or distribute it,1651# gives unlimited permission to copy and/or distribute it,
@@ -1521,7 +1726,7 @@ AC_CONFIG_COMMANDS_PRE(
1521rm -f conftest.file1726rm -f conftest.file
1522])1727])
15231728
1524# Copyright (C) 2009-2020 Free Software Foundation, Inc.1729# Copyright (C) 2009-2021 Free Software Foundation, Inc.
1525#1730#
1526# This file is free software; the Free Software Foundation1731# This file is free software; the Free Software Foundation
1527# gives unlimited permission to copy and/or distribute it,1732# gives unlimited permission to copy and/or distribute it,
@@ -1581,7 +1786,7 @@ AC_SUBST([AM_BACKSLASH])dnl
1581_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl1786_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
1582])1787])
15831788
1584# Copyright (C) 2001-2020 Free Software Foundation, Inc.1789# Copyright (C) 2001-2021 Free Software Foundation, Inc.
1585#1790#
1586# This file is free software; the Free Software Foundation1791# This file is free software; the Free Software Foundation
1587# gives unlimited permission to copy and/or distribute it,1792# gives unlimited permission to copy and/or distribute it,
@@ -1609,7 +1814,7 @@ fi
1609INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"1814INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
1610AC_SUBST([INSTALL_STRIP_PROGRAM])])1815AC_SUBST([INSTALL_STRIP_PROGRAM])])
16111816
1612# Copyright (C) 2006-2020 Free Software Foundation, Inc.1817# Copyright (C) 2006-2021 Free Software Foundation, Inc.
1613#1818#
1614# This file is free software; the Free Software Foundation1819# This file is free software; the Free Software Foundation
1615# gives unlimited permission to copy and/or distribute it,1820# gives unlimited permission to copy and/or distribute it,
@@ -1628,7 +1833,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
16281833
1629# Check how to create a tarball. -*- Autoconf -*-1834# Check how to create a tarball. -*- Autoconf -*-
16301835
1631# Copyright (C) 2004-2020 Free Software Foundation, Inc.1836# Copyright (C) 2004-2021 Free Software Foundation, Inc.
1632#1837#
1633# This file is free software; the Free Software Foundation1838# This file is free software; the Free Software Foundation
1634# gives unlimited permission to copy and/or distribute it,1839# gives unlimited permission to copy and/or distribute it,
@@ -1765,11 +1970,9 @@ m4_include([m4/ax_check_openssl.m4])
1765m4_include([m4/ax_gcc_func_attribute.m4])1970m4_include([m4/ax_gcc_func_attribute.m4])
1766m4_include([m4/ax_jemalloc.m4])1971m4_include([m4/ax_jemalloc.m4])
1767m4_include([m4/ax_lib_lmdb.m4])1972m4_include([m4/ax_lib_lmdb.m4])
1768m4_include([m4/ax_perl_module.m4])
1769m4_include([m4/ax_posix_shell.m4])1973m4_include([m4/ax_posix_shell.m4])
1770m4_include([m4/ax_prog_cc_for_build.m4])1974m4_include([m4/ax_prog_cc_for_build.m4])
1771m4_include([m4/ax_pthread.m4])1975m4_include([m4/ax_pthread.m4])
1772m4_include([m4/ax_python_module.m4])
1773m4_include([m4/ax_restore_flags.m4])1976m4_include([m4/ax_restore_flags.m4])
1774m4_include([m4/ax_save_flags.m4])1977m4_include([m4/ax_save_flags.m4])
1775m4_include([m4/ax_tls.m4])1978m4_include([m4/ax_tls.m4])
diff --git a/ar-lib b/ar-lib
index 1e9388e..c349042 100755
--- a/ar-lib
+++ b/ar-lib
@@ -4,7 +4,7 @@
4me=ar-lib4me=ar-lib
5scriptversion=2019-07-04.01; # UTC5scriptversion=2019-07-04.01; # UTC
66
7# Copyright (C) 2010-2020 Free Software Foundation, Inc.7# Copyright (C) 2010-2021 Free Software Foundation, Inc.
8# Written by Peter Rosin <peda@lysator.liu.se>.8# Written by Peter Rosin <peda@lysator.liu.se>.
9#9#
10# This program is free software; you can redistribute it and/or modify10# This program is free software; you can redistribute it and/or modify
diff --git a/bin/Makefile.in b/bin/Makefile.in
index 3b50ade..d13002c 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -1,7 +1,7 @@
1# Makefile.in generated by automake 1.16.3 from Makefile.am.1# Makefile.in generated by automake 1.16.5 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994-2020 Free Software Foundation, Inc.4# Copyright (C) 1994-2021 Free Software Foundation, Inc.
55
6# This Makefile.in is free software; the Free Software Foundation6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it,7# gives unlimited permission to copy and/or distribute it,
@@ -96,11 +96,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
96 $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \96 $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \
97 $(top_srcdir)/m4/ax_jemalloc.m4 \97 $(top_srcdir)/m4/ax_jemalloc.m4 \
98 $(top_srcdir)/m4/ax_lib_lmdb.m4 \98 $(top_srcdir)/m4/ax_lib_lmdb.m4 \
99 $(top_srcdir)/m4/ax_perl_module.m4 \
100 $(top_srcdir)/m4/ax_posix_shell.m4 \99 $(top_srcdir)/m4/ax_posix_shell.m4 \
101 $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \100 $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \
102 $(top_srcdir)/m4/ax_pthread.m4 \101 $(top_srcdir)/m4/ax_pthread.m4 \
103 $(top_srcdir)/m4/ax_python_module.m4 \
104 $(top_srcdir)/m4/ax_restore_flags.m4 \102 $(top_srcdir)/m4/ax_restore_flags.m4 \
105 $(top_srcdir)/m4/ax_save_flags.m4 $(top_srcdir)/m4/ax_tls.m4 \103 $(top_srcdir)/m4/ax_save_flags.m4 $(top_srcdir)/m4/ax_tls.m4 \
106 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \104 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -167,8 +165,6 @@ am__define_uniq_tagged_files = \
167 unique=`for i in $$list; do \165 unique=`for i in $$list; do \
168 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \166 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
169 done | $(am__uniquify_input)`167 done | $(am__uniquify_input)`
170ETAGS = etags
171CTAGS = ctags
172DIST_SUBDIRS = $(SUBDIRS)168DIST_SUBDIRS = $(SUBDIRS)
173am__DIST_COMMON = $(srcdir)/Makefile.in169am__DIST_COMMON = $(srcdir)/Makefile.in
174DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)170DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -218,6 +214,8 @@ CPP = @CPP@
218CPPFLAGS = @CPPFLAGS@214CPPFLAGS = @CPPFLAGS@
219CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@215CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
220CPP_FOR_BUILD = @CPP_FOR_BUILD@216CPP_FOR_BUILD = @CPP_FOR_BUILD@
217CSCOPE = @CSCOPE@
218CTAGS = @CTAGS@
221CURL = @CURL@219CURL = @CURL@
222CYGPATH_W = @CYGPATH_W@220CYGPATH_W = @CYGPATH_W@
223DEFS = @DEFS@221DEFS = @DEFS@
@@ -233,8 +231,10 @@ ECHO_C = @ECHO_C@
233ECHO_N = @ECHO_N@231ECHO_N = @ECHO_N@
234ECHO_T = @ECHO_T@232ECHO_T = @ECHO_T@
235EGREP = @EGREP@233EGREP = @EGREP@
234ETAGS = @ETAGS@
236EXEEXT = @EXEEXT@235EXEEXT = @EXEEXT@
237FGREP = @FGREP@236FGREP = @FGREP@
237FILECMD = @FILECMD@
238FSTRM_CAPTURE = @FSTRM_CAPTURE@238FSTRM_CAPTURE = @FSTRM_CAPTURE@
239FUZZ_LDFLAGS = @FUZZ_LDFLAGS@239FUZZ_LDFLAGS = @FUZZ_LDFLAGS@
240FUZZ_LOG_COMPILER = @FUZZ_LOG_COMPILER@240FUZZ_LOG_COMPILER = @FUZZ_LOG_COMPILER@
@@ -537,7 +537,6 @@ cscopelist-am: $(am__tagged_files)
537537
538distclean-tags:538distclean-tags:
539 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags539 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
540
541distdir: $(BUILT_SOURCES)540distdir: $(BUILT_SOURCES)
542 $(MAKE) $(AM_MAKEFLAGS) distdir-am541 $(MAKE) $(AM_MAKEFLAGS) distdir-am
543542
diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in
index 7bd5132..7926d5f 100644
--- a/bin/check/Makefile.in
+++ b/bin/check/Makefile.in
@@ -1,7 +1,7 @@
1# Makefile.in generated by automake 1.16.3 from Makefile.am.1# Makefile.in generated by automake 1.16.5 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994-2020 Free Software Foundation, Inc.4# Copyright (C) 1994-2021 Free Software Foundation, Inc.
55
6# This Makefile.in is free software; the Free Software Foundation6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it,7# gives unlimited permission to copy and/or distribute it,
@@ -105,11 +105,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
105 $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \105 $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \
106 $(top_srcdir)/m4/ax_jemalloc.m4 \106 $(top_srcdir)/m4/ax_jemalloc.m4 \
107 $(top_srcdir)/m4/ax_lib_lmdb.m4 \107 $(top_srcdir)/m4/ax_lib_lmdb.m4 \
108 $(top_srcdir)/m4/ax_perl_module.m4 \
109 $(top_srcdir)/m4/ax_posix_shell.m4 \108 $(top_srcdir)/m4/ax_posix_shell.m4 \
110 $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \109 $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \
111 $(top_srcdir)/m4/ax_pthread.m4 \110 $(top_srcdir)/m4/ax_pthread.m4 \
112 $(top_srcdir)/m4/ax_python_module.m4 \
113 $(top_srcdir)/m4/ax_restore_flags.m4 \111 $(top_srcdir)/m4/ax_restore_flags.m4 \
114 $(top_srcdir)/m4/ax_save_flags.m4 $(top_srcdir)/m4/ax_tls.m4 \112 $(top_srcdir)/m4/ax_save_flags.m4 $(top_srcdir)/m4/ax_tls.m4 \
115 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \113 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -208,8 +206,6 @@ am__define_uniq_tagged_files = \
208 unique=`for i in $$list; do \206 unique=`for i in $$list; do \
209 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \207 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
210 done | $(am__uniquify_input)`208 done | $(am__uniquify_input)`
211ETAGS = etags
212CTAGS = ctags
213am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.top \209am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.top \
214 $(top_srcdir)/depcomp210 $(top_srcdir)/depcomp
215DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)211DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -234,6 +230,8 @@ CPP = @CPP@
234CPPFLAGS = @CPPFLAGS@230CPPFLAGS = @CPPFLAGS@
235CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@231CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
236CPP_FOR_BUILD = @CPP_FOR_BUILD@232CPP_FOR_BUILD = @CPP_FOR_BUILD@
233CSCOPE = @CSCOPE@
234CTAGS = @CTAGS@
237CURL = @CURL@235CURL = @CURL@
238CYGPATH_W = @CYGPATH_W@236CYGPATH_W = @CYGPATH_W@
239DEFS = @DEFS@237DEFS = @DEFS@
@@ -249,8 +247,10 @@ ECHO_C = @ECHO_C@
249ECHO_N = @ECHO_N@247ECHO_N = @ECHO_N@
250ECHO_T = @ECHO_T@248ECHO_T = @ECHO_T@
251EGREP = @EGREP@249EGREP = @EGREP@
250ETAGS = @ETAGS@
252EXEEXT = @EXEEXT@251EXEEXT = @EXEEXT@
253FGREP = @FGREP@252FGREP = @FGREP@
253FILECMD = @FILECMD@
254FSTRM_CAPTURE = @FSTRM_CAPTURE@254FSTRM_CAPTURE = @FSTRM_CAPTURE@
255FUZZ_LDFLAGS = @FUZZ_LDFLAGS@255FUZZ_LDFLAGS = @FUZZ_LDFLAGS@
256FUZZ_LOG_COMPILER = @FUZZ_LOG_COMPILER@256FUZZ_LOG_COMPILER = @FUZZ_LOG_COMPILER@
@@ -677,7 +677,6 @@ cscopelist-am: $(am__tagged_files)
677677
678distclean-tags:678distclean-tags:
679 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags679 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
680
681distdir: $(BUILT_SOURCES)680distdir: $(BUILT_SOURCES)
682 $(MAKE) $(AM_MAKEFLAGS) distdir-am681 $(MAKE) $(AM_MAKEFLAGS) distdir-am
683682
diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in
index c899429..872f567 100644
--- a/bin/confgen/Makefile.in
+++ b/bin/confgen/Makefile.in
@@ -1,7 +1,7 @@
1# Makefile.in generated by automake 1.16.3 from Makefile.am.1# Makefile.in generated by automake 1.16.5 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994-2020 Free Software Foundation, Inc.4# Copyright (C) 1994-2021 Free Software Foundation, Inc.
55
6# This Makefile.in is free software; the Free Software Foundation6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it,7# gives unlimited permission to copy and/or distribute it,
@@ -105,11 +105,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
105 $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \105 $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \
106 $(top_srcdir)/m4/ax_jemalloc.m4 \106 $(top_srcdir)/m4/ax_jemalloc.m4 \
107 $(top_srcdir)/m4/ax_lib_lmdb.m4 \107 $(top_srcdir)/m4/ax_lib_lmdb.m4 \
108 $(top_srcdir)/m4/ax_perl_module.m4 \
109 $(top_srcdir)/m4/ax_posix_shell.m4 \108 $(top_srcdir)/m4/ax_posix_shell.m4 \
110 $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \109 $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \
111 $(top_srcdir)/m4/ax_pthread.m4 \110 $(top_srcdir)/m4/ax_pthread.m4 \
112 $(top_srcdir)/m4/ax_python_module.m4 \
113 $(top_srcdir)/m4/ax_restore_flags.m4 \111 $(top_srcdir)/m4/ax_restore_flags.m4 \
114 $(top_srcdir)/m4/ax_save_flags.m4 $(top_srcdir)/m4/ax_tls.m4 \112 $(top_srcdir)/m4/ax_save_flags.m4 $(top_srcdir)/m4/ax_tls.m4 \
115 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \113 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -204,8 +202,6 @@ am__define_uniq_tagged_files = \
204 unique=`for i in $$list; do \202 unique=`for i in $$list; do \
205 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \203 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
206 done | $(am__uniquify_input)`204 done | $(am__uniquify_input)`
207ETAGS = etags
208CTAGS = ctags
209am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.top \205am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.top \
210 $(top_srcdir)/depcomp206 $(top_srcdir)/depcomp
211DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)207DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -230,6 +226,8 @@ CPP = @CPP@
230CPPFLAGS = @CPPFLAGS@226CPPFLAGS = @CPPFLAGS@
231CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@227CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
232CPP_FOR_BUILD = @CPP_FOR_BUILD@228CPP_FOR_BUILD = @CPP_FOR_BUILD@
229CSCOPE = @CSCOPE@
230CTAGS = @CTAGS@
233CURL = @CURL@231CURL = @CURL@
234CYGPATH_W = @CYGPATH_W@232CYGPATH_W = @CYGPATH_W@
235DEFS = @DEFS@233DEFS = @DEFS@
@@ -245,8 +243,10 @@ ECHO_C = @ECHO_C@
245ECHO_N = @ECHO_N@243ECHO_N = @ECHO_N@
246ECHO_T = @ECHO_T@244ECHO_T = @ECHO_T@
247EGREP = @EGREP@245EGREP = @EGREP@
246ETAGS = @ETAGS@
248EXEEXT = @EXEEXT@247EXEEXT = @EXEEXT@
249FGREP = @FGREP@248FGREP = @FGREP@
249FILECMD = @FILECMD@
250FSTRM_CAPTURE = @FSTRM_CAPTURE@250FSTRM_CAPTURE = @FSTRM_CAPTURE@
251FUZZ_LDFLAGS = @FUZZ_LDFLAGS@251FUZZ_LDFLAGS = @FUZZ_LDFLAGS@
252FUZZ_LOG_COMPILER = @FUZZ_LOG_COMPILER@252FUZZ_LOG_COMPILER = @FUZZ_LOG_COMPILER@
@@ -677,7 +677,6 @@ cscopelist-am: $(am__tagged_files)
677677
678distclean-tags:678distclean-tags:
679 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags679 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
680
681distdir: $(BUILT_SOURCES)680distdir: $(BUILT_SOURCES)
682 $(MAKE) $(AM_MAKEFLAGS) distdir-am681 $(MAKE) $(AM_MAKEFLAGS) distdir-am
683682
diff --git a/bin/delv/Makefile.in b/bin/delv/Makefile.in
index 18b7204..c46fc52 100644
--- a/bin/delv/Makefile.in
+++ b/bin/delv/Makefile.in
@@ -1,7 +1,7 @@
1# Makefile.in generated by automake 1.16.3 from Makefile.am.1# Makefile.in generated by automake 1.16.5 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994-2020 Free Software Foundation, Inc.4# Copyright (C) 1994-2021 Free Software Foundation, Inc.
55
6# This Makefile.in is free software; the Free Software Foundation6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it,7# gives unlimited permission to copy and/or distribute it,
@@ -104,11 +104,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
104 $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \104 $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \
105 $(top_srcdir)/m4/ax_jemalloc.m4 \105 $(top_srcdir)/m4/ax_jemalloc.m4 \
106 $(top_srcdir)/m4/ax_lib_lmdb.m4 \106 $(top_srcdir)/m4/ax_lib_lmdb.m4 \
107 $(top_srcdir)/m4/ax_perl_module.m4 \
108 $(top_srcdir)/m4/ax_posix_shell.m4 \107 $(top_srcdir)/m4/ax_posix_shell.m4 \
109 $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \108 $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \
110 $(top_srcdir)/m4/ax_pthread.m4 \109 $(top_srcdir)/m4/ax_pthread.m4 \
111 $(top_srcdir)/m4/ax_python_module.m4 \
112 $(top_srcdir)/m4/ax_restore_flags.m4 \110 $(top_srcdir)/m4/ax_restore_flags.m4 \
113 $(top_srcdir)/m4/ax_save_flags.m4 $(top_srcdir)/m4/ax_tls.m4 \111 $(top_srcdir)/m4/ax_save_flags.m4 $(top_srcdir)/m4/ax_tls.m4 \
114 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \112 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -192,8 +190,6 @@ am__define_uniq_tagged_files = \
192 unique=`for i in $$list; do \190 unique=`for i in $$list; do \
193 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \191 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
194 done | $(am__uniquify_input)`192 done | $(am__uniquify_input)`
195ETAGS = etags
196CTAGS = ctags
197am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.top \193am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.top \
198 $(top_srcdir)/depcomp194 $(top_srcdir)/depcomp
199DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)195DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -218,6 +214,8 @@ CPP = @CPP@
218CPPFLAGS = @CPPFLAGS@214CPPFLAGS = @CPPFLAGS@
219CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@215CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
220CPP_FOR_BUILD = @CPP_FOR_BUILD@216CPP_FOR_BUILD = @CPP_FOR_BUILD@
217CSCOPE = @CSCOPE@
218CTAGS = @CTAGS@
221CURL = @CURL@219CURL = @CURL@
222CYGPATH_W = @CYGPATH_W@220CYGPATH_W = @CYGPATH_W@
223DEFS = @DEFS@221DEFS = @DEFS@
@@ -233,8 +231,10 @@ ECHO_C = @ECHO_C@
233ECHO_N = @ECHO_N@231ECHO_N = @ECHO_N@
234ECHO_T = @ECHO_T@232ECHO_T = @ECHO_T@
235EGREP = @EGREP@233EGREP = @EGREP@
234ETAGS = @ETAGS@
236EXEEXT = @EXEEXT@235EXEEXT = @EXEEXT@
237FGREP = @FGREP@236FGREP = @FGREP@
237FILECMD = @FILECMD@
238FSTRM_CAPTURE = @FSTRM_CAPTURE@238FSTRM_CAPTURE = @FSTRM_CAPTURE@
239FUZZ_LDFLAGS = @FUZZ_LDFLAGS@239FUZZ_LDFLAGS = @FUZZ_LDFLAGS@
240FUZZ_LOG_COMPILER = @FUZZ_LOG_COMPILER@240FUZZ_LOG_COMPILER = @FUZZ_LOG_COMPILER@
@@ -644,7 +644,6 @@ cscopelist-am: $(am__tagged_files)
644644
645distclean-tags:645distclean-tags:
646 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags646 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
647
648distdir: $(BUILT_SOURCES)647distdir: $(BUILT_SOURCES)
649 $(MAKE) $(AM_MAKEFLAGS) distdir-am648 $(MAKE) $(AM_MAKEFLAGS) distdir-am
650649
diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in
index f0cc763..9c9fa5d 100644
--- a/bin/dig/Makefile.in
+++ b/bin/dig/Makefile.in
@@ -1,7 +1,7 @@
1# Makefile.in generated by automake 1.16.3 from Makefile.am.1# Makefile.in generated by automake 1.16.5 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994-2020 Free Software Foundation, Inc.4# Copyright (C) 1994-2021 Free Software Foundation, Inc.
55
6# This Makefile.in is free software; the Free Software Foundation6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it,7# gives unlimited permission to copy and/or distribute it,
@@ -111,11 +111,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
111 $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \111 $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \
112 $(top_srcdir)/m4/ax_jemalloc.m4 \112 $(top_srcdir)/m4/ax_jemalloc.m4 \
113 $(top_srcdir)/m4/ax_lib_lmdb.m4 \113 $(top_srcdir)/m4/ax_lib_lmdb.m4 \
114 $(top_srcdir)/m4/ax_perl_module.m4 \
115 $(top_srcdir)/m4/ax_posix_shell.m4 \114 $(top_srcdir)/m4/ax_posix_shell.m4 \
116 $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \115 $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \
117 $(top_srcdir)/m4/ax_pthread.m4 \116 $(top_srcdir)/m4/ax_pthread.m4 \
118 $(top_srcdir)/m4/ax_python_module.m4 \
119 $(top_srcdir)/m4/ax_restore_flags.m4 \117 $(top_srcdir)/m4/ax_restore_flags.m4 \
120 $(top_srcdir)/m4/ax_save_flags.m4 $(top_srcdir)/m4/ax_tls.m4 \118 $(top_srcdir)/m4/ax_save_flags.m4 $(top_srcdir)/m4/ax_tls.m4 \
121 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \119 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -220,8 +218,6 @@ am__define_uniq_tagged_files = \
220 unique=`for i in $$list; do \218 unique=`for i in $$list; do \
221 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \219 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
222 done | $(am__uniquify_input)`220 done | $(am__uniquify_input)`
223ETAGS = etags
224CTAGS = ctags
225am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.top \221am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.top \
226 $(top_srcdir)/depcomp222 $(top_srcdir)/depcomp
227DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)223DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -246,6 +242,8 @@ CPP = @CPP@
246CPPFLAGS = @CPPFLAGS@242CPPFLAGS = @CPPFLAGS@
247CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@243CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
248CPP_FOR_BUILD = @CPP_FOR_BUILD@244CPP_FOR_BUILD = @CPP_FOR_BUILD@
245CSCOPE = @CSCOPE@
246CTAGS = @CTAGS@
249CURL = @CURL@247CURL = @CURL@
250CYGPATH_W = @CYGPATH_W@248CYGPATH_W = @CYGPATH_W@
251DEFS = @DEFS@249DEFS = @DEFS@
@@ -261,8 +259,10 @@ ECHO_C = @ECHO_C@
261ECHO_N = @ECHO_N@259ECHO_N = @ECHO_N@
262ECHO_T = @ECHO_T@260ECHO_T = @ECHO_T@
263EGREP = @EGREP@261EGREP = @EGREP@
262ETAGS = @ETAGS@
264EXEEXT = @EXEEXT@263EXEEXT = @EXEEXT@
265FGREP = @FGREP@264FGREP = @FGREP@
265FILECMD = @FILECMD@
266FSTRM_CAPTURE = @FSTRM_CAPTURE@266FSTRM_CAPTURE = @FSTRM_CAPTURE@
267FUZZ_LDFLAGS = @FUZZ_LDFLAGS@267FUZZ_LDFLAGS = @FUZZ_LDFLAGS@
268FUZZ_LOG_COMPILER = @FUZZ_LOG_COMPILER@268FUZZ_LOG_COMPILER = @FUZZ_LOG_COMPILER@
@@ -710,7 +710,6 @@ cscopelist-am: $(am__tagged_files)
710710
711distclean-tags:711distclean-tags:
712 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags712 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
713
714distdir: $(BUILT_SOURCES)713distdir: $(BUILT_SOURCES)
715 $(MAKE) $(AM_MAKEFLAGS) distdir-am714 $(MAKE) $(AM_MAKEFLAGS) distdir-am
716715
diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 55f7bf2..a8ae79f 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -3249,6 +3249,7 @@ udp_ready(isc_nmhandle_t *handle, isc_result_t eresult, void *arg) {
3249 start_udp(next);3249 start_udp(next);
3250 check_if_done();3250 check_if_done();
3251 } else {3251 } else {
3252 dighost_error("no servers could be reached\n");
3252 clear_current_lookup();3253 clear_current_lookup();
3253 }3254 }
32543255
@@ -3654,6 +3655,7 @@ tcp_connected(isc_nmhandle_t *handle, isc_result_t eresult, void *arg) {
3654 start_tcp(next);3655 start_tcp(next);
3655 check_if_done();3656 check_if_done();
3656 } else {3657 } else {
3658 dighost_error("no servers could be reached\n");
3657 clear_current_lookup();3659 clear_current_lookup();
3658 }3660 }
36593661
diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in
index 376e259..879b86d 100644
--- a/bin/dnssec/Makefile.in
+++ b/bin/dnssec/Makefile.in
@@ -1,7 +1,7 @@
1# Makefile.in generated by automake 1.16.3 from Makefile.am.1# Makefile.in generated by automake 1.16.5 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994-2020 Free Software Foundation, Inc.4# Copyright (C) 1994-2021 Free Software Foundation, Inc.
55
6# This Makefile.in is free software; the Free Software Foundation6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it,7# gives unlimited permission to copy and/or distribute it,
@@ -109,11 +109,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
109 $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \109 $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \
110 $(top_srcdir)/m4/ax_jemalloc.m4 \110 $(top_srcdir)/m4/ax_jemalloc.m4 \
111 $(top_srcdir)/m4/ax_lib_lmdb.m4 \111 $(top_srcdir)/m4/ax_lib_lmdb.m4 \
112 $(top_srcdir)/m4/ax_perl_module.m4 \
113 $(top_srcdir)/m4/ax_posix_shell.m4 \112 $(top_srcdir)/m4/ax_posix_shell.m4 \
114 $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \113 $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \
115 $(top_srcdir)/m4/ax_pthread.m4 \114 $(top_srcdir)/m4/ax_pthread.m4 \
116 $(top_srcdir)/m4/ax_python_module.m4 \
117 $(top_srcdir)/m4/ax_restore_flags.m4 \115 $(top_srcdir)/m4/ax_restore_flags.m4 \
118 $(top_srcdir)/m4/ax_save_flags.m4 $(top_srcdir)/m4/ax_tls.m4 \116 $(top_srcdir)/m4/ax_save_flags.m4 $(top_srcdir)/m4/ax_tls.m4 \
119 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \117 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -253,8 +251,6 @@ am__define_uniq_tagged_files = \
253 unique=`for i in $$list; do \251 unique=`for i in $$list; do \
254 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \252 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
255 done | $(am__uniquify_input)`253 done | $(am__uniquify_input)`
256ETAGS = etags
257CTAGS = ctags
258am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.top \254am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.top \
259 $(top_srcdir)/depcomp255 $(top_srcdir)/depcomp
260DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)256DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -279,6 +275,8 @@ CPP = @CPP@
279CPPFLAGS = @CPPFLAGS@275CPPFLAGS = @CPPFLAGS@
280CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@276CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
281CPP_FOR_BUILD = @CPP_FOR_BUILD@277CPP_FOR_BUILD = @CPP_FOR_BUILD@
278CSCOPE = @CSCOPE@
279CTAGS = @CTAGS@
282CURL = @CURL@280CURL = @CURL@
283CYGPATH_W = @CYGPATH_W@281CYGPATH_W = @CYGPATH_W@
284DEFS = @DEFS@282DEFS = @DEFS@
@@ -294,8 +292,10 @@ ECHO_C = @ECHO_C@
294ECHO_N = @ECHO_N@292ECHO_N = @ECHO_N@
295ECHO_T = @ECHO_T@293ECHO_T = @ECHO_T@
296EGREP = @EGREP@294EGREP = @EGREP@
295ETAGS = @ETAGS@
297EXEEXT = @EXEEXT@296EXEEXT = @EXEEXT@
298FGREP = @FGREP@297FGREP = @FGREP@
298FILECMD = @FILECMD@
299FSTRM_CAPTURE = @FSTRM_CAPTURE@299FSTRM_CAPTURE = @FSTRM_CAPTURE@
300FUZZ_LDFLAGS = @FUZZ_LDFLAGS@300FUZZ_LDFLAGS = @FUZZ_LDFLAGS@
301FUZZ_LOG_COMPILER = @FUZZ_LOG_COMPILER@301FUZZ_LOG_COMPILER = @FUZZ_LOG_COMPILER@
@@ -777,7 +777,6 @@ cscopelist-am: $(am__tagged_files)
777777
778distclean-tags:778distclean-tags:
779 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags779 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
780
781distdir: $(BUILT_SOURCES)780distdir: $(BUILT_SOURCES)
782 $(MAKE) $(AM_MAKEFLAGS) distdir-am781 $(MAKE) $(AM_MAKEFLAGS) distdir-am
783782
diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index f52457c..d67ac3d 100644
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -99,7 +99,7 @@ static int nsec_datatype = dns_rdatatype_nsec;
99 "dns_dbiterator_current()")99 "dns_dbiterator_current()")
100100
101#define IS_NSEC3 (nsec_datatype == dns_rdatatype_nsec3)101#define IS_NSEC3 (nsec_datatype == dns_rdatatype_nsec3)
102#define OPTOUT(x) (((x)&DNS_NSEC3FLAG_OPTOUT) != 0)102#define OPTOUT(x) (((x) & DNS_NSEC3FLAG_OPTOUT) != 0)
103103
104#define REVOKE(x) ((dst_key_flags(x) & DNS_KEYFLAG_REVOKE) != 0)104#define REVOKE(x) ((dst_key_flags(x) & DNS_KEYFLAG_REVOKE) != 0)
105105
diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index fdd4b33..2b60a43 100644
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -1,7 +1,7 @@
1# Makefile.in generated by automake 1.16.3 from Makefile.am.1# Makefile.in generated by automake 1.16.5 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994-2020 Free Software Foundation, Inc.4# Copyright (C) 1994-2021 Free Software Foundation, Inc.
55
6# This Makefile.in is free software; the Free Software Foundation6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it,7# gives unlimited permission to copy and/or distribute it,
@@ -125,11 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
125 $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \125 $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \
126 $(top_srcdir)/m4/ax_jemalloc.m4 \126 $(top_srcdir)/m4/ax_jemalloc.m4 \
127 $(top_srcdir)/m4/ax_lib_lmdb.m4 \127 $(top_srcdir)/m4/ax_lib_lmdb.m4 \
128 $(top_srcdir)/m4/ax_perl_module.m4 \
129 $(top_srcdir)/m4/ax_posix_shell.m4 \128 $(top_srcdir)/m4/ax_posix_shell.m4 \
130 $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \129 $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \
131 $(top_srcdir)/m4/ax_pthread.m4 \130 $(top_srcdir)/m4/ax_pthread.m4 \
132 $(top_srcdir)/m4/ax_python_module.m4 \
133 $(top_srcdir)/m4/ax_restore_flags.m4 \131 $(top_srcdir)/m4/ax_restore_flags.m4 \
134 $(top_srcdir)/m4/ax_save_flags.m4 $(top_srcdir)/m4/ax_tls.m4 \132 $(top_srcdir)/m4/ax_save_flags.m4 $(top_srcdir)/m4/ax_tls.m4 \
135 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \133 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -249,8 +247,6 @@ am__define_uniq_tagged_files = \
249 unique=`for i in $$list; do \247 unique=`for i in $$list; do \
250 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \248 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
251 done | $(am__uniquify_input)`249 done | $(am__uniquify_input)`
252ETAGS = etags
253CTAGS = ctags
254am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.top \250am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.top \
255 $(top_srcdir)/depcomp251 $(top_srcdir)/depcomp
256DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)252DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -275,6 +271,8 @@ CPP = @CPP@
275CPPFLAGS = @CPPFLAGS@271CPPFLAGS = @CPPFLAGS@
276CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@272CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
277CPP_FOR_BUILD = @CPP_FOR_BUILD@273CPP_FOR_BUILD = @CPP_FOR_BUILD@
274CSCOPE = @CSCOPE@
275CTAGS = @CTAGS@
278CURL = @CURL@276CURL = @CURL@
279CYGPATH_W = @CYGPATH_W@277CYGPATH_W = @CYGPATH_W@
280DEFS = @DEFS@278DEFS = @DEFS@
@@ -290,8 +288,10 @@ ECHO_C = @ECHO_C@
290ECHO_N = @ECHO_N@288ECHO_N = @ECHO_N@
291ECHO_T = @ECHO_T@289ECHO_T = @ECHO_T@
292EGREP = @EGREP@290EGREP = @EGREP@
291ETAGS = @ETAGS@
293EXEEXT = @EXEEXT@292EXEEXT = @EXEEXT@
294FGREP = @FGREP@293FGREP = @FGREP@
294FILECMD = @FILECMD@
295FSTRM_CAPTURE = @FSTRM_CAPTURE@295FSTRM_CAPTURE = @FSTRM_CAPTURE@
296FUZZ_LDFLAGS = @FUZZ_LDFLAGS@296FUZZ_LDFLAGS = @FUZZ_LDFLAGS@
297FUZZ_LOG_COMPILER = @FUZZ_LOG_COMPILER@297FUZZ_LOG_COMPILER = @FUZZ_LOG_COMPILER@
@@ -737,7 +737,6 @@ cscopelist-am: $(am__tagged_files)
737737
738distclean-tags:738distclean-tags:
739 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags739 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
740
741distdir: $(BUILT_SOURCES)740distdir: $(BUILT_SOURCES)
742 $(MAKE) $(AM_MAKEFLAGS) distdir-am741 $(MAKE) $(AM_MAKEFLAGS) distdir-am
743742
diff --git a/bin/named/config.c b/bin/named/config.c
index 7f318a2..f95e433 100644
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -337,14 +337,14 @@ dnssec-policy \"insecure\" {\n\
337 "# END TRUST ANCHORS\n\337 "# END TRUST ANCHORS\n\
338\n\338\n\
339primaries " DEFAULT_IANA_ROOT_ZONE_PRIMARIES " {\n\339primaries " DEFAULT_IANA_ROOT_ZONE_PRIMARIES " {\n\
340 2001:500:200::b; # b.root-servers.net\n\340 2801:1b8:10::b; # b.root-servers.net\n\
341 2001:500:2::c; # c.root-servers.net\n\341 2001:500:2::c; # c.root-servers.net\n\
342 2001:500:2f::f; # f.root-servers.net\n\342 2001:500:2f::f; # f.root-servers.net\n\
343 2001:500:12::d0d; # g.root-servers.net\n\343 2001:500:12::d0d; # g.root-servers.net\n\
344 2001:7fd::1; # k.root-servers.net\n\344 2001:7fd::1; # k.root-servers.net\n\
345 2620:0:2830:202::132; # xfr.cjr.dns.icann.org\n\345 2620:0:2830:202::132; # xfr.cjr.dns.icann.org\n\
346 2620:0:2d0:202::132; # xfr.lax.dns.icann.org\n\346 2620:0:2d0:202::132; # xfr.lax.dns.icann.org\n\
347 199.9.14.201; # b.root-servers.net\n\347 170.247.170.2; # b.root-servers.net\n\
348 192.33.4.12; # c.root-servers.net\n\348 192.33.4.12; # c.root-servers.net\n\
349 192.5.5.241; # f.root-servers.net\n\349 192.5.5.241; # f.root-servers.net\n\
350 192.112.36.4; # g.root-servers.net\n\350 192.112.36.4; # g.root-servers.net\n\
diff --git a/bin/named/os.c b/bin/named/os.c
index 7af4729..0222abb 100644
--- a/bin/named/os.c
+++ b/bin/named/os.c
@@ -552,17 +552,19 @@ cleanup_pidfile(void) {
552}552}
553553
554static void554static void
555cleanup_lockfile(void) {555cleanup_lockfile(bool unlink_lockfile) {
556 if (singletonfd != -1) {556 if (singletonfd != -1) {
557 close(singletonfd);557 close(singletonfd);
558 singletonfd = -1;558 singletonfd = -1;
559 }559 }
560560
561 if (lockfile != NULL) {561 if (lockfile != NULL) {
562 int n = unlink(lockfile);562 if (unlink_lockfile) {
563 if (n == -1 && errno != ENOENT) {563 int n = unlink(lockfile);
564 named_main_earlywarning("unlink '%s': failed",564 if (n == -1 && errno != ENOENT) {
565 lockfile);565 named_main_earlywarning("unlink '%s': failed",
566 lockfile);
567 }
566 }568 }
567 free(lockfile);569 free(lockfile);
568 lockfile = NULL;570 lockfile = NULL;
@@ -830,7 +832,7 @@ named_os_issingleton(const char *filename) {
830 if (ret == -1) {832 if (ret == -1) {
831 named_main_earlywarning("couldn't create '%s'",833 named_main_earlywarning("couldn't create '%s'",
832 filename);834 filename);
833 cleanup_lockfile();835 cleanup_lockfile(false);
834 return (false);836 return (false);
835 }837 }
836 }838 }
@@ -842,7 +844,7 @@ named_os_issingleton(const char *filename) {
842 singletonfd = open(filename, O_WRONLY | O_CREAT,844 singletonfd = open(filename, O_WRONLY | O_CREAT,
843 S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);845 S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
844 if (singletonfd == -1) {846 if (singletonfd == -1) {
845 cleanup_lockfile();847 cleanup_lockfile(false);
846 return (false);848 return (false);
847 }849 }
848850
@@ -854,8 +856,7 @@ named_os_issingleton(const char *filename) {
854856
855 /* Non-blocking (does not wait for lock) */857 /* Non-blocking (does not wait for lock) */
856 if (fcntl(singletonfd, F_SETLK, &lock) == -1) {858 if (fcntl(singletonfd, F_SETLK, &lock) == -1) {
857 close(singletonfd);859 cleanup_lockfile(false);
858 singletonfd = -1;
859 return (false);860 return (false);
860 }861 }
861862
@@ -866,7 +867,7 @@ void
866named_os_shutdown(void) {867named_os_shutdown(void) {
867 closelog();868 closelog();
868 cleanup_pidfile();869 cleanup_pidfile();
869 cleanup_lockfile();870 cleanup_lockfile(true);
870}871}
871872
872void873void
diff --git a/bin/named/server.c b/bin/named/server.c
index 2f21fc5..bfe6df3 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -8407,8 +8407,8 @@ check_lockfile(named_server_t *server, const cfg_obj_t *config,
8407 (void)named_config_get(maps, "lock-file", &obj);8407 (void)named_config_get(maps, "lock-file", &obj);
84088408
8409 if (!first_time) {8409 if (!first_time) {
8410 if (obj != NULL && !cfg_obj_isstring(obj) &&8410 if (obj != NULL && cfg_obj_isstring(obj) &&
8411 server->lockfile != NULL &&8411 server->lockfile != NULL && !named_g_forcelock &&
8412 strcmp(cfg_obj_asstring(obj), server->lockfile) != 0)8412 strcmp(cfg_obj_asstring(obj), server->lockfile) != 0)
8413 {8413 {
8414 isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,8414 isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
@@ -8422,31 +8422,25 @@ check_lockfile(named_server_t *server, const cfg_obj_t *config,
8422 }8422 }
84238423
8424 if (obj != NULL) {8424 if (obj != NULL) {
8425 if (cfg_obj_isvoid(obj)) {8425 if (named_g_forcelock) {
8426 isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
8427 NAMED_LOGMODULE_SERVER, ISC_LOG_DEBUG(1),
8428 "skipping lock-file check ");
8429 return (ISC_R_SUCCESS);
8430 } else if (named_g_forcelock) {
8431 isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,8426 isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
8432 NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING,8427 NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING,
8433 "'lock-file' has no effect "8428 "'lock-file' has no effect "
8434 "because the server was run with -X");8429 "because the server was run with -X");
8435 server->lockfile = isc_mem_strdup(8430 if (named_g_defaultlockfile != NULL) {
8436 server->mctx, named_g_defaultlockfile);8431 server->lockfile = isc_mem_strdup(
8437 } else {8432 server->mctx, named_g_defaultlockfile);
8433 }
8434 } else if (cfg_obj_isvoid(obj)) {
8435 isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
8436 NAMED_LOGMODULE_SERVER, ISC_LOG_DEBUG(1),
8437 "skipping lock-file check");
8438 } else if (cfg_obj_isstring(obj)) {
8438 filename = cfg_obj_asstring(obj);8439 filename = cfg_obj_asstring(obj);
8439 server->lockfile = isc_mem_strdup(server->mctx,8440 server->lockfile = isc_mem_strdup(server->mctx,
8440 filename);8441 filename);
8441 }8442 }
84428443 } else if (named_g_forcelock && named_g_defaultlockfile != NULL) {
8443 if (server->lockfile == NULL) {
8444 return (ISC_R_NOMEMORY);
8445 }
8446 }
8447
8448 if (named_g_forcelock && named_g_defaultlockfile != NULL) {
8449 INSIST(server->lockfile == NULL);
8450 server->lockfile = isc_mem_strdup(server->mctx,8444 server->lockfile = isc_mem_strdup(server->mctx,
8451 named_g_defaultlockfile);8445 named_g_defaultlockfile);
8452 }8446 }
@@ -15850,6 +15844,8 @@ named_server_nta(named_server_t *server, isc_lex_t *lex, bool readonly,
15850 * If -dump was specified, list NTA's and return15844 * If -dump was specified, list NTA's and return
15851 */15845 */
15852 if (dump) {15846 if (dump) {
15847 size_t last = 0;
15848
15853 for (view = ISC_LIST_HEAD(server->viewlist); view != NULL;15849 for (view = ISC_LIST_HEAD(server->viewlist); view != NULL;
15854 view = ISC_LIST_NEXT(view, link))15850 view = ISC_LIST_NEXT(view, link))
15855 {15851 {
@@ -15861,6 +15857,12 @@ named_server_nta(named_server_t *server, isc_lex_t *lex, bool readonly,
15861 continue;15857 continue;
15862 }15858 }
1586315859
15860 if (last != isc_buffer_usedlength(*text)) {
15861 CHECK(putstr(text, "\n"));
15862 }
15863
15864 last = isc_buffer_usedlength(*text);
15865
15864 CHECK(dns_ntatable_totext(ntatable, view->name, text));15866 CHECK(dns_ntatable_totext(ntatable, view->name, text));
15865 }15867 }
15866 CHECK(putnull(text));15868 CHECK(putnull(text));
diff --git a/bin/nsupdate/Makefile.in b/bin/nsupdate/Makefile.in
index 4180e9d..2cda13d 100644
--- a/bin/nsupdate/Makefile.in
+++ b/bin/nsupdate/Makefile.in
@@ -1,7 +1,7 @@
1# Makefile.in generated by automake 1.16.3 from Makefile.am.1# Makefile.in generated by automake 1.16.5 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994-2020 Free Software Foundation, Inc.4# Copyright (C) 1994-2021 Free Software Foundation, Inc.
55
6# This Makefile.in is free software; the Free Software Foundation6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it,7# gives unlimited permission to copy and/or distribute it,
@@ -107,11 +107,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
107 $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \107 $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \
108 $(top_srcdir)/m4/ax_jemalloc.m4 \108 $(top_srcdir)/m4/ax_jemalloc.m4 \
109 $(top_srcdir)/m4/ax_lib_lmdb.m4 \109 $(top_srcdir)/m4/ax_lib_lmdb.m4 \
110 $(top_srcdir)/m4/ax_perl_module.m4 \
111 $(top_srcdir)/m4/ax_posix_shell.m4 \110 $(top_srcdir)/m4/ax_posix_shell.m4 \
112 $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \111 $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \
113 $(top_srcdir)/m4/ax_pthread.m4 \112 $(top_srcdir)/m4/ax_pthread.m4 \
114 $(top_srcdir)/m4/ax_python_module.m4 \
115 $(top_srcdir)/m4/ax_restore_flags.m4 \113 $(top_srcdir)/m4/ax_restore_flags.m4 \
116 $(top_srcdir)/m4/ax_save_flags.m4 $(top_srcdir)/m4/ax_tls.m4 \114 $(top_srcdir)/m4/ax_save_flags.m4 $(top_srcdir)/m4/ax_tls.m4 \
117 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \115 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -200,8 +198,6 @@ am__define_uniq_tagged_files = \
200 unique=`for i in $$list; do \198 unique=`for i in $$list; do \
201 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \199 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
202 done | $(am__uniquify_input)`200 done | $(am__uniquify_input)`
203ETAGS = etags
204CTAGS = ctags
205am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.top \201am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.top \
206 $(top_srcdir)/depcomp202 $(top_srcdir)/depcomp
207DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)203DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -226,6 +222,8 @@ CPP = @CPP@
226CPPFLAGS = @CPPFLAGS@222CPPFLAGS = @CPPFLAGS@
227CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@223CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
228CPP_FOR_BUILD = @CPP_FOR_BUILD@224CPP_FOR_BUILD = @CPP_FOR_BUILD@
225CSCOPE = @CSCOPE@
226CTAGS = @CTAGS@
229CURL = @CURL@227CURL = @CURL@
230CYGPATH_W = @CYGPATH_W@228CYGPATH_W = @CYGPATH_W@
231DEFS = @DEFS@229DEFS = @DEFS@
@@ -241,8 +239,10 @@ ECHO_C = @ECHO_C@
241ECHO_N = @ECHO_N@239ECHO_N = @ECHO_N@
242ECHO_T = @ECHO_T@240ECHO_T = @ECHO_T@
243EGREP = @EGREP@241EGREP = @EGREP@
242ETAGS = @ETAGS@
244EXEEXT = @EXEEXT@243EXEEXT = @EXEEXT@
245FGREP = @FGREP@244FGREP = @FGREP@
245FILECMD = @FILECMD@
246FSTRM_CAPTURE = @FSTRM_CAPTURE@246FSTRM_CAPTURE = @FSTRM_CAPTURE@
247FUZZ_LDFLAGS = @FUZZ_LDFLAGS@247FUZZ_LDFLAGS = @FUZZ_LDFLAGS@
248FUZZ_LOG_COMPILER = @FUZZ_LOG_COMPILER@248FUZZ_LOG_COMPILER = @FUZZ_LOG_COMPILER@
@@ -649,7 +649,6 @@ cscopelist-am: $(am__tagged_files)
649649
650distclean-tags:650distclean-tags:
651 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags651 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
652
653distdir: $(BUILT_SOURCES)652distdir: $(BUILT_SOURCES)
654 $(MAKE) $(AM_MAKEFLAGS) distdir-am653 $(MAKE) $(AM_MAKEFLAGS) distdir-am
655654
diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 1f06dab..980d543 100644
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -369,13 +369,13 @@ reset_system(void) {
369}369}
370370
371static bool371static bool
372parse_hmac(const dns_name_t **hmac, const char *hmacstr, size_t len,372parse_hmac(const dns_name_t **hmacp, const char *hmacstr, size_t len,
373 uint16_t *digestbitsp) {373 uint16_t *digestbitsp) {
374 uint16_t digestbits = 0;374 uint16_t digestbits = 0;
375 isc_result_t result;375 isc_result_t result;
376 char buf[20];376 char buf[20];
377377
378 REQUIRE(hmac != NULL && *hmac == NULL);378 REQUIRE(hmacp != NULL && *hmacp == NULL);
379 REQUIRE(hmacstr != NULL);379 REQUIRE(hmacstr != NULL);
380380
381 if (len >= sizeof(buf)) {381 if (len >= sizeof(buf)) {
@@ -387,9 +387,9 @@ parse_hmac(const dns_name_t **hmac, const char *hmacstr, size_t len,
387 strlcpy(buf, hmacstr, ISC_MIN(len + 1, sizeof(buf)));387 strlcpy(buf, hmacstr, ISC_MIN(len + 1, sizeof(buf)));
388388
389 if (strcasecmp(buf, "hmac-md5") == 0) {389 if (strcasecmp(buf, "hmac-md5") == 0) {
390 *hmac = DNS_TSIG_HMACMD5_NAME;390 *hmacp = DNS_TSIG_HMACMD5_NAME;
391 } else if (strncasecmp(buf, "hmac-md5-", 9) == 0) {391 } else if (strncasecmp(buf, "hmac-md5-", 9) == 0) {
392 *hmac = DNS_TSIG_HMACMD5_NAME;392 *hmacp = DNS_TSIG_HMACMD5_NAME;
393 result = isc_parse_uint16(&digestbits, &buf[9], 10);393 result = isc_parse_uint16(&digestbits, &buf[9], 10);
394 if (result != ISC_R_SUCCESS || digestbits > 128) {394 if (result != ISC_R_SUCCESS || digestbits > 128) {
395 error("digest-bits out of range [0..128]");395 error("digest-bits out of range [0..128]");
@@ -397,9 +397,9 @@ parse_hmac(const dns_name_t **hmac, const char *hmacstr, size_t len,
397 }397 }
398 *digestbitsp = (digestbits + 7) & ~0x7U;398 *digestbitsp = (digestbits + 7) & ~0x7U;
399 } else if (strcasecmp(buf, "hmac-sha1") == 0) {399 } else if (strcasecmp(buf, "hmac-sha1") == 0) {
400 *hmac = DNS_TSIG_HMACSHA1_NAME;400 *hmacp = DNS_TSIG_HMACSHA1_NAME;
401 } else if (strncasecmp(buf, "hmac-sha1-", 10) == 0) {401 } else if (strncasecmp(buf, "hmac-sha1-", 10) == 0) {
402 *hmac = DNS_TSIG_HMACSHA1_NAME;402 *hmacp = DNS_TSIG_HMACSHA1_NAME;
403 result = isc_parse_uint16(&digestbits, &buf[10], 10);403 result = isc_parse_uint16(&digestbits, &buf[10], 10);
404 if (result != ISC_R_SUCCESS || digestbits > 160) {404 if (result != ISC_R_SUCCESS || digestbits > 160) {
405 error("digest-bits out of range [0..160]");405 error("digest-bits out of range [0..160]");
@@ -407,9 +407,9 @@ parse_hmac(const dns_name_t **hmac, const char *hmacstr, size_t len,
407 }407 }
408 *digestbitsp = (digestbits + 7) & ~0x7U;408 *digestbitsp = (digestbits + 7) & ~0x7U;
409 } else if (strcasecmp(buf, "hmac-sha224") == 0) {409 } else if (strcasecmp(buf, "hmac-sha224") == 0) {
410 *hmac = DNS_TSIG_HMACSHA224_NAME;410 *hmacp = DNS_TSIG_HMACSHA224_NAME;
411 } else if (strncasecmp(buf, "hmac-sha224-", 12) == 0) {411 } else if (strncasecmp(buf, "hmac-sha224-", 12) == 0) {
412 *hmac = DNS_TSIG_HMACSHA224_NAME;412 *hmacp = DNS_TSIG_HMACSHA224_NAME;
413 result = isc_parse_uint16(&digestbits, &buf[12], 10);413 result = isc_parse_uint16(&digestbits, &buf[12], 10);
414 if (result != ISC_R_SUCCESS || digestbits > 224) {414 if (result != ISC_R_SUCCESS || digestbits > 224) {
415 error("digest-bits out of range [0..224]");415 error("digest-bits out of range [0..224]");
@@ -417,9 +417,9 @@ parse_hmac(const dns_name_t **hmac, const char *hmacstr, size_t len,
417 }417 }
418 *digestbitsp = (digestbits + 7) & ~0x7U;418 *digestbitsp = (digestbits + 7) & ~0x7U;
419 } else if (strcasecmp(buf, "hmac-sha256") == 0) {419 } else if (strcasecmp(buf, "hmac-sha256") == 0) {
420 *hmac = DNS_TSIG_HMACSHA256_NAME;420 *hmacp = DNS_TSIG_HMACSHA256_NAME;
421 } else if (strncasecmp(buf, "hmac-sha256-", 12) == 0) {421 } else if (strncasecmp(buf, "hmac-sha256-", 12) == 0) {
422 *hmac = DNS_TSIG_HMACSHA256_NAME;422 *hmacp = DNS_TSIG_HMACSHA256_NAME;
423 result = isc_parse_uint16(&digestbits, &buf[12], 10);423 result = isc_parse_uint16(&digestbits, &buf[12], 10);
424 if (result != ISC_R_SUCCESS || digestbits > 256) {424 if (result != ISC_R_SUCCESS || digestbits > 256) {
425 error("digest-bits out of range [0..256]");425 error("digest-bits out of range [0..256]");
@@ -427,9 +427,9 @@ parse_hmac(const dns_name_t **hmac, const char *hmacstr, size_t len,
427 }427 }
428 *digestbitsp = (digestbits + 7) & ~0x7U;428 *digestbitsp = (digestbits + 7) & ~0x7U;
429 } else if (strcasecmp(buf, "hmac-sha384") == 0) {429 } else if (strcasecmp(buf, "hmac-sha384") == 0) {
430 *hmac = DNS_TSIG_HMACSHA384_NAME;430 *hmacp = DNS_TSIG_HMACSHA384_NAME;
431 } else if (strncasecmp(buf, "hmac-sha384-", 12) == 0) {431 } else if (strncasecmp(buf, "hmac-sha384-", 12) == 0) {
432 *hmac = DNS_TSIG_HMACSHA384_NAME;432 *hmacp = DNS_TSIG_HMACSHA384_NAME;
433 result = isc_parse_uint16(&digestbits, &buf[12], 10);433 result = isc_parse_uint16(&digestbits, &buf[12], 10);
434 if (result != ISC_R_SUCCESS || digestbits > 384) {434 if (result != ISC_R_SUCCESS || digestbits > 384) {
435 error("digest-bits out of range [0..384]");435 error("digest-bits out of range [0..384]");
@@ -437,9 +437,9 @@ parse_hmac(const dns_name_t **hmac, const char *hmacstr, size_t len,
437 }437 }
438 *digestbitsp = (digestbits + 7) & ~0x7U;438 *digestbitsp = (digestbits + 7) & ~0x7U;
439 } else if (strcasecmp(buf, "hmac-sha512") == 0) {439 } else if (strcasecmp(buf, "hmac-sha512") == 0) {
440 *hmac = DNS_TSIG_HMACSHA512_NAME;440 *hmacp = DNS_TSIG_HMACSHA512_NAME;
441 } else if (strncasecmp(buf, "hmac-sha512-", 12) == 0) {441 } else if (strncasecmp(buf, "hmac-sha512-", 12) == 0) {
442 *hmac = DNS_TSIG_HMACSHA512_NAME;442 *hmacp = DNS_TSIG_HMACSHA512_NAME;
443 result = isc_parse_uint16(&digestbits, &buf[12], 10);443 result = isc_parse_uint16(&digestbits, &buf[12], 10);
444 if (result != ISC_R_SUCCESS || digestbits > 512) {444 if (result != ISC_R_SUCCESS || digestbits > 512) {
445 error("digest-bits out of range [0..512]");445 error("digest-bits out of range [0..512]");
@@ -2594,6 +2594,8 @@ recvsoa(isc_task_t *task, isc_event_t *event) {
2594 result = dns_request_getresponse(request, rcvmsg,2594 result = dns_request_getresponse(request, rcvmsg,
2595 DNS_MESSAGEPARSE_PRESERVEORDER);2595 DNS_MESSAGEPARSE_PRESERVEORDER);
2596 if (result == DNS_R_TSIGERRORSET && servers != NULL) {2596 if (result == DNS_R_TSIGERRORSET && servers != NULL) {
2597 unsigned int options = 0;
2598
2597 dns_message_detach(&rcvmsg);2599 dns_message_detach(&rcvmsg);
2598 ddebug("Destroying request [%p]", request);2600 ddebug("Destroying request [%p]", request);
2599 dns_request_destroy(&request);2601 dns_request_destroy(&request);
@@ -2603,6 +2605,10 @@ recvsoa(isc_task_t *task, isc_event_t *event) {
2603 dns_message_renderreset(soaquery);2605 dns_message_renderreset(soaquery);
2604 ddebug("retrying soa request without TSIG");2606 ddebug("retrying soa request without TSIG");
26052607
2608 if (!default_servers && usevc) {
2609 options |= DNS_REQUESTOPT_TCP;
2610 }
2611
2606 if (isc_sockaddr_pf(addr) == AF_INET6) {2612 if (isc_sockaddr_pf(addr) == AF_INET6) {
2607 srcaddr = localaddr6;2613 srcaddr = localaddr6;
2608 } else {2614 } else {
@@ -2610,7 +2616,7 @@ recvsoa(isc_task_t *task, isc_event_t *event) {
2610 }2616 }
26112617
2612 result = dns_request_create(requestmgr, soaquery, srcaddr, addr,2618 result = dns_request_create(requestmgr, soaquery, srcaddr, addr,
2613 0, NULL, timeout, udp_timeout,2619 options, NULL, timeout, udp_timeout,
2614 udp_retries, global_task, recvsoa,2620 udp_retries, global_task, recvsoa,
2615 reqinfo, &request);2621 reqinfo, &request);
2616 check_result(result, "dns_request_create");2622 check_result(result, "dns_request_create");
@@ -2825,6 +2831,11 @@ sendrequest(isc_sockaddr_t *destaddr, dns_message_t *msg,
2825 isc_result_t result;2831 isc_result_t result;
2826 nsu_requestinfo_t *reqinfo;2832 nsu_requestinfo_t *reqinfo;
2827 isc_sockaddr_t *srcaddr;2833 isc_sockaddr_t *srcaddr;
2834 unsigned int options = 0;
2835
2836 if (!default_servers && usevc) {
2837 options |= DNS_REQUESTOPT_TCP;
2838 }
28282839
2829 reqinfo = isc_mem_get(gmctx, sizeof(nsu_requestinfo_t));2840 reqinfo = isc_mem_get(gmctx, sizeof(nsu_requestinfo_t));
2830 reqinfo->msg = msg;2841 reqinfo->msg = msg;
@@ -2836,7 +2847,7 @@ sendrequest(isc_sockaddr_t *destaddr, dns_message_t *msg,
2836 srcaddr = localaddr4;2847 srcaddr = localaddr4;
2837 }2848 }
28382849
2839 result = dns_request_create(requestmgr, msg, srcaddr, destaddr, 0,2850 result = dns_request_create(requestmgr, msg, srcaddr, destaddr, options,
2840 default_servers ? NULL : tsigkey, timeout,2851 default_servers ? NULL : tsigkey, timeout,
2841 udp_timeout, udp_retries, global_task,2852 udp_timeout, udp_retries, global_task,
2842 recvsoa, reqinfo, request);2853 recvsoa, reqinfo, request);
diff --git a/bin/plugins/Makefile.in b/bin/plugins/Makefile.in
index 33a0766..535ef2e 100644
--- a/bin/plugins/Makefile.in
+++ b/bin/plugins/Makefile.in
@@ -1,7 +1,7 @@
1# Makefile.in generated by automake 1.16.3 from Makefile.am.1# Makefile.in generated by automake 1.16.5 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994-2020 Free Software Foundation, Inc.4# Copyright (C) 1994-2021 Free Software Foundation, Inc.
55
6# This Makefile.in is free software; the Free Software Foundation6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it,7# gives unlimited permission to copy and/or distribute it,
@@ -103,11 +103,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
103 $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \103 $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \
104 $(top_srcdir)/m4/ax_jemalloc.m4 \104 $(top_srcdir)/m4/ax_jemalloc.m4 \
105 $(top_srcdir)/m4/ax_lib_lmdb.m4 \105 $(top_srcdir)/m4/ax_lib_lmdb.m4 \
106 $(top_srcdir)/m4/ax_perl_module.m4 \
107 $(top_srcdir)/m4/ax_posix_shell.m4 \106 $(top_srcdir)/m4/ax_posix_shell.m4 \
108 $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \107 $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \
109 $(top_srcdir)/m4/ax_pthread.m4 \108 $(top_srcdir)/m4/ax_pthread.m4 \
110 $(top_srcdir)/m4/ax_python_module.m4 \
111 $(top_srcdir)/m4/ax_restore_flags.m4 \109 $(top_srcdir)/m4/ax_restore_flags.m4 \
112 $(top_srcdir)/m4/ax_save_flags.m4 $(top_srcdir)/m4/ax_tls.m4 \110 $(top_srcdir)/m4/ax_save_flags.m4 $(top_srcdir)/m4/ax_tls.m4 \
113 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \111 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -228,8 +226,6 @@ am__define_uniq_tagged_files = \
228 unique=`for i in $$list; do \226 unique=`for i in $$list; do \
229 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \227 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
230 done | $(am__uniquify_input)`228 done | $(am__uniquify_input)`
231ETAGS = etags
232CTAGS = ctags
233am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.top \229am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.top \
234 $(top_srcdir)/depcomp230 $(top_srcdir)/depcomp
235DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)231DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -254,6 +250,8 @@ CPP = @CPP@
254CPPFLAGS = @CPPFLAGS@250CPPFLAGS = @CPPFLAGS@
255CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@251CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
256CPP_FOR_BUILD = @CPP_FOR_BUILD@252CPP_FOR_BUILD = @CPP_FOR_BUILD@
253CSCOPE = @CSCOPE@
254CTAGS = @CTAGS@
257CURL = @CURL@255CURL = @CURL@
258CYGPATH_W = @CYGPATH_W@256CYGPATH_W = @CYGPATH_W@
259DEFS = @DEFS@257DEFS = @DEFS@
@@ -269,8 +267,10 @@ ECHO_C = @ECHO_C@
269ECHO_N = @ECHO_N@267ECHO_N = @ECHO_N@
270ECHO_T = @ECHO_T@268ECHO_T = @ECHO_T@
271EGREP = @EGREP@269EGREP = @EGREP@
270ETAGS = @ETAGS@
272EXEEXT = @EXEEXT@271EXEEXT = @EXEEXT@
273FGREP = @FGREP@272FGREP = @FGREP@
273FILECMD = @FILECMD@
274FSTRM_CAPTURE = @FSTRM_CAPTURE@274FSTRM_CAPTURE = @FSTRM_CAPTURE@
275FUZZ_LDFLAGS = @FUZZ_LDFLAGS@275FUZZ_LDFLAGS = @FUZZ_LDFLAGS@
276FUZZ_LOG_COMPILER = @FUZZ_LOG_COMPILER@276FUZZ_LOG_COMPILER = @FUZZ_LOG_COMPILER@
@@ -664,7 +664,6 @@ cscopelist-am: $(am__tagged_files)
664664
665distclean-tags:665distclean-tags:
666 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags666 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
667
668distdir: $(BUILT_SOURCES)667distdir: $(BUILT_SOURCES)
669 $(MAKE) $(AM_MAKEFLAGS) distdir-am668 $(MAKE) $(AM_MAKEFLAGS) distdir-am
670669
diff --git a/bin/rndc/Makefile.in b/bin/rndc/Makefile.in
index f1c7acd..2778f58 100644
--- a/bin/rndc/Makefile.in
+++ b/bin/rndc/Makefile.in
@@ -1,7 +1,7 @@
1# Makefile.in generated by automake 1.16.3 from Makefile.am.1# Makefile.in generated by automake 1.16.5 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994-2020 Free Software Foundation, Inc.4# Copyright (C) 1994-2021 Free Software Foundation, Inc.
55
6# This Makefile.in is free software; the Free Software Foundation6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it,7# gives unlimited permission to copy and/or distribute it,
@@ -104,11 +104,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
104 $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \104 $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \
105 $(top_srcdir)/m4/ax_jemalloc.m4 \105 $(top_srcdir)/m4/ax_jemalloc.m4 \
106 $(top_srcdir)/m4/ax_lib_lmdb.m4 \106 $(top_srcdir)/m4/ax_lib_lmdb.m4 \
107 $(top_srcdir)/m4/ax_perl_module.m4 \
108 $(top_srcdir)/m4/ax_posix_shell.m4 \107 $(top_srcdir)/m4/ax_posix_shell.m4 \
109 $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \108 $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \
110 $(top_srcdir)/m4/ax_pthread.m4 \109 $(top_srcdir)/m4/ax_pthread.m4 \
111 $(top_srcdir)/m4/ax_python_module.m4 \
112 $(top_srcdir)/m4/ax_restore_flags.m4 \110 $(top_srcdir)/m4/ax_restore_flags.m4 \
113 $(top_srcdir)/m4/ax_save_flags.m4 $(top_srcdir)/m4/ax_tls.m4 \111 $(top_srcdir)/m4/ax_save_flags.m4 $(top_srcdir)/m4/ax_tls.m4 \
114 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \112 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -192,8 +190,6 @@ am__define_uniq_tagged_files = \
192 unique=`for i in $$list; do \190 unique=`for i in $$list; do \
193 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \191 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
194 done | $(am__uniquify_input)`192 done | $(am__uniquify_input)`
195ETAGS = etags
196CTAGS = ctags
197am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.top \193am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.top \
198 $(top_srcdir)/depcomp194 $(top_srcdir)/depcomp
199DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)195DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -218,6 +214,8 @@ CPP = @CPP@
218CPPFLAGS = @CPPFLAGS@214CPPFLAGS = @CPPFLAGS@
219CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@215CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
220CPP_FOR_BUILD = @CPP_FOR_BUILD@216CPP_FOR_BUILD = @CPP_FOR_BUILD@
217CSCOPE = @CSCOPE@
218CTAGS = @CTAGS@
221CURL = @CURL@219CURL = @CURL@
222CYGPATH_W = @CYGPATH_W@220CYGPATH_W = @CYGPATH_W@
223DEFS = @DEFS@221DEFS = @DEFS@
@@ -233,8 +231,10 @@ ECHO_C = @ECHO_C@
233ECHO_N = @ECHO_N@231ECHO_N = @ECHO_N@
234ECHO_T = @ECHO_T@232ECHO_T = @ECHO_T@
235EGREP = @EGREP@233EGREP = @EGREP@
234ETAGS = @ETAGS@
236EXEEXT = @EXEEXT@235EXEEXT = @EXEEXT@
237FGREP = @FGREP@236FGREP = @FGREP@
237FILECMD = @FILECMD@
238FSTRM_CAPTURE = @FSTRM_CAPTURE@238FSTRM_CAPTURE = @FSTRM_CAPTURE@
239FUZZ_LDFLAGS = @FUZZ_LDFLAGS@239FUZZ_LDFLAGS = @FUZZ_LDFLAGS@
240FUZZ_LOG_COMPILER = @FUZZ_LOG_COMPILER@240FUZZ_LOG_COMPILER = @FUZZ_LOG_COMPILER@
@@ -649,7 +649,6 @@ cscopelist-am: $(am__tagged_files)
649649
650distclean-tags:650distclean-tags:
651 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags651 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
652
653distdir: $(BUILT_SOURCES)652distdir: $(BUILT_SOURCES)
654 $(MAKE) $(AM_MAKEFLAGS) distdir-am653 $(MAKE) $(AM_MAKEFLAGS) distdir-am
655654
diff --git a/bin/rndc/rndc.rst b/bin/rndc/rndc.rst
index 35a4f31..f34975b 100644
--- a/bin/rndc/rndc.rst
+++ b/bin/rndc/rndc.rst
@@ -428,6 +428,7 @@ Currently supported commands are:
428 .. option:: zone [class [view]]428 .. option:: zone [class [view]]
429429
430 If a zone is specified, this command reloads only the given zone.430 If a zone is specified, this command reloads only the given zone.
431 If no zone is specified, the reloading happens asynchronously.
431432
432.. program:: rndc433.. program:: rndc
433434
@@ -594,7 +595,8 @@ Currently supported commands are:
594 refused. If the zone has changed and the ``ixfr-from-differences``595 refused. If the zone has changed and the ``ixfr-from-differences``
595 option is in use, the journal file is updated to reflect596 option is in use, the journal file is updated to reflect
596 changes in the zone. Otherwise, if the zone has changed, any existing597 changes in the zone. Otherwise, if the zone has changed, any existing
597 journal file is removed.598 journal file is removed. If no zone is specified, the reloading happens
599 asynchronously.
598600
599 See also :option:`rndc freeze`.601 See also :option:`rndc freeze`.
600602
diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in
index dad6a21..bb0b392 100644
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -1,7 +1,7 @@
1# Makefile.in generated by automake 1.16.3 from Makefile.am.1# Makefile.in generated by automake 1.16.5 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994-2020 Free Software Foundation, Inc.4# Copyright (C) 1994-2021 Free Software Foundation, Inc.
55
6# This Makefile.in is free software; the Free Software Foundation6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it,7# gives unlimited permission to copy and/or distribute it,
@@ -105,11 +105,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
105 $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \105 $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \
106 $(top_srcdir)/m4/ax_jemalloc.m4 \106 $(top_srcdir)/m4/ax_jemalloc.m4 \
107 $(top_srcdir)/m4/ax_lib_lmdb.m4 \107 $(top_srcdir)/m4/ax_lib_lmdb.m4 \
108 $(top_srcdir)/m4/ax_perl_module.m4 \
109 $(top_srcdir)/m4/ax_posix_shell.m4 \108 $(top_srcdir)/m4/ax_posix_shell.m4 \
110 $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \109 $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \
111 $(top_srcdir)/m4/ax_pthread.m4 \110 $(top_srcdir)/m4/ax_pthread.m4 \
112 $(top_srcdir)/m4/ax_python_module.m4 \
113 $(top_srcdir)/m4/ax_restore_flags.m4 \111 $(top_srcdir)/m4/ax_restore_flags.m4 \
114 $(top_srcdir)/m4/ax_save_flags.m4 $(top_srcdir)/m4/ax_tls.m4 \112 $(top_srcdir)/m4/ax_save_flags.m4 $(top_srcdir)/m4/ax_tls.m4 \
115 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \113 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -215,8 +213,6 @@ am__define_uniq_tagged_files = \
215 unique=`for i in $$list; do \213 unique=`for i in $$list; do \
216 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \214 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
217 done | $(am__uniquify_input)`215 done | $(am__uniquify_input)`
218ETAGS = etags
219CTAGS = ctags
220DIST_SUBDIRS = $(SUBDIRS)216DIST_SUBDIRS = $(SUBDIRS)
221am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.top \217am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.top \
222 $(top_srcdir)/depcomp218 $(top_srcdir)/depcomp
@@ -267,6 +263,8 @@ CPP = @CPP@
267CPPFLAGS = @CPPFLAGS@263CPPFLAGS = @CPPFLAGS@
268CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@264CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
269CPP_FOR_BUILD = @CPP_FOR_BUILD@265CPP_FOR_BUILD = @CPP_FOR_BUILD@
266CSCOPE = @CSCOPE@
267CTAGS = @CTAGS@
270CURL = @CURL@268CURL = @CURL@
271CYGPATH_W = @CYGPATH_W@269CYGPATH_W = @CYGPATH_W@
272DEFS = @DEFS@270DEFS = @DEFS@
@@ -282,8 +280,10 @@ ECHO_C = @ECHO_C@
282ECHO_N = @ECHO_N@280ECHO_N = @ECHO_N@
283ECHO_T = @ECHO_T@281ECHO_T = @ECHO_T@
284EGREP = @EGREP@282EGREP = @EGREP@
283ETAGS = @ETAGS@
285EXEEXT = @EXEEXT@284EXEEXT = @EXEEXT@
286FGREP = @FGREP@285FGREP = @FGREP@
286FILECMD = @FILECMD@
287FSTRM_CAPTURE = @FSTRM_CAPTURE@287FSTRM_CAPTURE = @FSTRM_CAPTURE@
288FUZZ_LDFLAGS = @FUZZ_LDFLAGS@288FUZZ_LDFLAGS = @FUZZ_LDFLAGS@
289FUZZ_LOG_COMPILER = @FUZZ_LOG_COMPILER@289FUZZ_LOG_COMPILER = @FUZZ_LOG_COMPILER@
@@ -769,7 +769,6 @@ cscopelist-am: $(am__tagged_files)
769769
770distclean-tags:770distclean-tags:
771 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags771 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
772
773distdir: $(BUILT_SOURCES)772distdir: $(BUILT_SOURCES)
774 $(MAKE) $(AM_MAKEFLAGS) distdir-am773 $(MAKE) $(AM_MAKEFLAGS) distdir-am
775774
diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index f98be0b..befd512 100644
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -18,8 +18,10 @@ LDADD += \
18 $(LIBISC_LIBS)18 $(LIBISC_LIBS)
1919
20if HAVE_PERL20if HAVE_PERL
21if HAVE_PYTHON
22if HAVE_PYTEST
2123
22check_PROGRAMS = \24noinst_PROGRAMS = \
23 feature-test \25 feature-test \
24 makejournal \26 makejournal \
25 pipelined/pipequeries \27 pipelined/pipequeries \
@@ -81,23 +83,14 @@ tkey_keydelete_LDADD = \
81 $(LDADD) \83 $(LDADD) \
82 $(LIBDNS_LIBS)84 $(LIBDNS_LIBS)
8385
84TESTS =86# Longer running tests are listed (and executed) first to take the most
8587# advantage of parallel execution.
86if HAVE_PERLMOD_TIME_HIRES88TESTS = \
87TESTS += serve-stale89 rpz \
88endif HAVE_PERLMOD_TIME_HIRES90 rpzrecurse \
8991 serve-stale \
90if HAVE_PERLMOD_NET_DNS92 timeouts \
91TESTS += \93 upforwd \
92 rpzrecurse
93endif HAVE_PERLMOD_NET_DNS
94
95if HAVE_LIBNGHTTP2
96TESTS += \
97 doth
98endif
99
100TESTS += \
101 acl \94 acl \
102 additional \95 additional \
103 addzone \96 addzone \
@@ -109,13 +102,21 @@ TESTS += \
109 case \102 case \
110 catz \103 catz \
111 cds \104 cds \
105 chain \
112 checkconf \106 checkconf \
107 checkds \
113 checknames \108 checknames \
114 checkzone \109 checkzone \
110 cookie \
115 database \111 database \
116 dialup \112 dialup \
113 digdelv \
114 dispatch \
117 dlzexternal \115 dlzexternal \
118 dns64 \116 dns64 \
117 dnssec \
118 dnstap \
119 doth \
119 dsdigest \120 dsdigest \
120 dupsigs \121 dupsigs \
121 dyndb \122 dyndb \
@@ -125,18 +126,23 @@ TESTS += \
125 emptyzones \126 emptyzones \
126 enginepkcs11 \127 enginepkcs11 \
127 filter-aaaa \128 filter-aaaa \
129 fetchlimit \
128 formerr \130 formerr \
131 forward \
129 geoip2 \132 geoip2 \
130 glue \133 glue \
131 idna \134 idna \
132 include-multiplecfg \135 include-multiplecfg \
133 inline \136 inline \
134 integrity \137 integrity \
138 ixfr \
135 hooks \139 hooks \
136 host \140 host \
137 journal \141 journal \
142 kasp \
138 keepalive \143 keepalive \
139 keyfromlabel \144 keyfromlabel \
145 keymgr2kasp \
140 legacy \146 legacy \
141 limits \147 limits \
142 logfileconfig \148 logfileconfig \
@@ -149,24 +155,35 @@ TESTS += \
149 notify \155 notify \
150 nsec3 \156 nsec3 \
151 nslookup \157 nslookup \
158 nsupdate \
159 nzd2nzf \
152 padding \160 padding \
153 pending \161 pending \
162 pipelined \
163 qmin \
164 reclimit \
154 redirect \165 redirect \
166 resolver \
155 rndc \167 rndc \
156 rootkeysentinel \168 rootkeysentinel \
157 rpz \169 rpzextra \
158 rrchecker \170 rrchecker \
159 rrl \171 rrl \
160 rrsetorder \172 rrsetorder \
161 rsabigexponent \173 rsabigexponent \
162 runtime \174 runtime \
163 sfcache \175 sfcache \
176 shutdown \
164 smartsign \177 smartsign \
165 sortlist \178 sortlist \
166 spf \179 spf \
167 staticstub \180 staticstub \
181 statistics \
182 statschannel \
183 stress \
168 stub \184 stub \
169 synthfromdnssec \185 synthfromdnssec \
186 tcp \
170 tkey \187 tkey \
171 tools \188 tools \
172 transport-acl \189 transport-acl \
@@ -177,62 +194,21 @@ TESTS += \
177 verify \194 verify \
178 views \195 views \
179 wildcard \196 wildcard \
197 xfer \
180 xferquota \198 xferquota \
199 zero \
181 zonechecks200 zonechecks
182201
183if HAVE_LMDB202else !HAVE_PYTEST
184TESTS += nzd2nzf203check:
185endif # HAVE_LMDB204 echo pytest is not available, no tests were ran
186205 exit 1
187if HAVE_PERLMOD_NET_DNS206endif !HAVE_PYTEST
188207else !HAVE_PYTHON
189TESTS += \208check:
190 fetchlimit \209 echo Python is not available, no tests were ran
191 ixfr \210 exit 1
192 nsupdate \211endif !HAVE_PYTHON
193 resolver \
194 statistics \
195 stress \
196 upforwd \
197 zero
198
199if HAVE_DNSTAP
200TESTS += dnstap
201endif
202
203if HAVE_PERLMOD_FILE_FETCH
204TESTS += statschannel
205endif HAVE_PERLMOD_FILE_FETCH
206
207if HAVE_PERLMOD_DIGEST_HMAC
208TESTS += xfer
209endif HAVE_PERLMOD_DIGEST_HMAC
210
211if HAVE_PERLMOD_NET_DNS_NAMESERVER
212TESTS += reclimit
213endif HAVE_PERLMOD_NET_DNS_NAMESERVER
214
215endif HAVE_PERLMOD_NET_DNS
216
217if HAVE_PYTHON
218TESTS += kasp keymgr2kasp tcp pipelined
219
220if HAVE_PYTEST
221TESTS += checkds dispatch rpzextra shutdown timeouts
222endif
223
224if HAVE_PYMOD_DNS
225TESTS += qmin cookie
226if HAVE_PERLMOD_NET_DNS
227TESTS += digdelv dnssec forward
228if HAVE_PERLMOD_NET_DNS_NAMESERVER
229TESTS += chain
230endif HAVE_PERLMOD_NET_DNS_NAMESERVER
231endif HAVE_PERLMOD_NET_DNS
232endif HAVE_PYMOD_DNS
233
234endif HAVE_PYTHON
235
236else !HAVE_PERL212else !HAVE_PERL
237check:213check:
238 echo Perl is not available, no tests were ran214 echo Perl is not available, no tests were ran
@@ -247,9 +223,9 @@ LOG_DRIVER_V_1 = --verbose yes
247LOG_DRIVER = $(srcdir)/custom-test-driver223LOG_DRIVER = $(srcdir)/custom-test-driver
248AM_LOG_DRIVER_FLAGS = $(LOG_DRIVER_V)224AM_LOG_DRIVER_FLAGS = $(LOG_DRIVER_V)
249225
250LOG_COMPILER = $(builddir)/legacy.run.sh226LOG_COMPILER = $(srcdir)/run.sh
251AM_LOG_FLAGS = -r
252
253$(TESTS): legacy.run.sh
254227
255test-local: check228test-local: check
229
230clean-local::
231 -find -L . -mindepth 1 -maxdepth 1 -type d -name "*_*" -and -not -name "_common" -exec rm -rf {} \;
diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index ba4feab..b907194 100644
--- a/bin/tests/system/Makefile.in
+++ b/bin/tests/system/Makefile.in
@@ -1,7 +1,7 @@
1# Makefile.in generated by automake 1.16.3 from Makefile.am.1# Makefile.in generated by automake 1.16.5 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994-2020 Free Software Foundation, Inc.4# Copyright (C) 1994-2021 Free Software Foundation, Inc.
55
6# This Makefile.in is free software; the Free Software Foundation6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it,7# gives unlimited permission to copy and/or distribute it,
@@ -16,6 +16,7 @@
1616
17# Hey Emacs, this is -*- makefile-automake -*- file!17# Hey Emacs, this is -*- makefile-automake -*- file!
18# vim: filetype=automake18# vim: filetype=automake
19
19VPATH = @srcdir@20VPATH = @srcdir@
20am__is_gnu_make = { \21am__is_gnu_make = { \
21 if test -z '$(MAKELEVEL)'; then \22 if test -z '$(MAKELEVEL)'; then \
@@ -94,39 +95,14 @@ target_triplet = @target@
94@HOST_MACOS_TRUE@am__append_1 = \95@HOST_MACOS_TRUE@am__append_1 = \
95@HOST_MACOS_TRUE@ -Wl,-flat_namespace96@HOST_MACOS_TRUE@ -Wl,-flat_namespace
9697
97@HAVE_PERL_TRUE@check_PROGRAMS = feature-test$(EXEEXT) \98@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@noinst_PROGRAMS = feature-test$(EXEEXT) \
98@HAVE_PERL_TRUE@ makejournal$(EXEEXT) \99@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ makejournal$(EXEEXT) \
99@HAVE_PERL_TRUE@ pipelined/pipequeries$(EXEEXT) \100@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ pipelined/pipequeries$(EXEEXT) \
100@HAVE_PERL_TRUE@ resolve$(EXEEXT) rndc/gencheck$(EXEEXT) \101@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ resolve$(EXEEXT) \
101@HAVE_PERL_TRUE@ rpz/dnsrps$(EXEEXT) tkey/keycreate$(EXEEXT) \102@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ rndc/gencheck$(EXEEXT) \
102@HAVE_PERL_TRUE@ tkey/keydelete$(EXEEXT)103@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ rpz/dnsrps$(EXEEXT) \
103@HAVE_PERLMOD_TIME_HIRES_TRUE@@HAVE_PERL_TRUE@am__append_2 = serve-stale104@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ tkey/keycreate$(EXEEXT) \
104@HAVE_PERLMOD_NET_DNS_TRUE@@HAVE_PERL_TRUE@am__append_3 = \105@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ tkey/keydelete$(EXEEXT)
105@HAVE_PERLMOD_NET_DNS_TRUE@@HAVE_PERL_TRUE@ rpzrecurse
106
107@HAVE_LIBNGHTTP2_TRUE@@HAVE_PERL_TRUE@am__append_4 = \
108@HAVE_LIBNGHTTP2_TRUE@@HAVE_PERL_TRUE@ doth
109
110@HAVE_LMDB_TRUE@@HAVE_PERL_TRUE@am__append_5 = nzd2nzf
111@HAVE_PERLMOD_NET_DNS_TRUE@@HAVE_PERL_TRUE@am__append_6 = \
112@HAVE_PERLMOD_NET_DNS_TRUE@@HAVE_PERL_TRUE@ fetchlimit \
113@HAVE_PERLMOD_NET_DNS_TRUE@@HAVE_PERL_TRUE@ ixfr \
114@HAVE_PERLMOD_NET_DNS_TRUE@@HAVE_PERL_TRUE@ nsupdate \
115@HAVE_PERLMOD_NET_DNS_TRUE@@HAVE_PERL_TRUE@ resolver \
116@HAVE_PERLMOD_NET_DNS_TRUE@@HAVE_PERL_TRUE@ statistics \
117@HAVE_PERLMOD_NET_DNS_TRUE@@HAVE_PERL_TRUE@ stress \
118@HAVE_PERLMOD_NET_DNS_TRUE@@HAVE_PERL_TRUE@ upforwd \
119@HAVE_PERLMOD_NET_DNS_TRUE@@HAVE_PERL_TRUE@ zero
120
121@HAVE_DNSTAP_TRUE@@HAVE_PERLMOD_NET_DNS_TRUE@@HAVE_PERL_TRUE@am__append_7 = dnstap
122@HAVE_PERLMOD_FILE_FETCH_TRUE@@HAVE_PERLMOD_NET_DNS_TRUE@@HAVE_PERL_TRUE@am__append_8 = statschannel
123@HAVE_PERLMOD_DIGEST_HMAC_TRUE@@HAVE_PERLMOD_NET_DNS_TRUE@@HAVE_PERL_TRUE@am__append_9 = xfer
124@HAVE_PERLMOD_NET_DNS_NAMESERVER_TRUE@@HAVE_PERLMOD_NET_DNS_TRUE@@HAVE_PERL_TRUE@am__append_10 = reclimit
125@HAVE_PERL_TRUE@@HAVE_PYTHON_TRUE@am__append_11 = kasp keymgr2kasp tcp pipelined
126@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@am__append_12 = checkds dispatch rpzextra shutdown timeouts
127@HAVE_PERL_TRUE@@HAVE_PYMOD_DNS_TRUE@@HAVE_PYTHON_TRUE@am__append_13 = qmin cookie
128@HAVE_PERLMOD_NET_DNS_TRUE@@HAVE_PERL_TRUE@@HAVE_PYMOD_DNS_TRUE@@HAVE_PYTHON_TRUE@am__append_14 = digdelv dnssec forward
129@HAVE_PERLMOD_NET_DNS_NAMESERVER_TRUE@@HAVE_PERLMOD_NET_DNS_TRUE@@HAVE_PERL_TRUE@@HAVE_PYMOD_DNS_TRUE@@HAVE_PYTHON_TRUE@am__append_15 = chain
130subdir = bin/tests/system106subdir = bin/tests/system
131ACLOCAL_M4 = $(top_srcdir)/aclocal.m4107ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
132am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \108am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
@@ -135,11 +111,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
135 $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \111 $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \
136 $(top_srcdir)/m4/ax_jemalloc.m4 \112 $(top_srcdir)/m4/ax_jemalloc.m4 \
137 $(top_srcdir)/m4/ax_lib_lmdb.m4 \113 $(top_srcdir)/m4/ax_lib_lmdb.m4 \
138 $(top_srcdir)/m4/ax_perl_module.m4 \
139 $(top_srcdir)/m4/ax_posix_shell.m4 \114 $(top_srcdir)/m4/ax_posix_shell.m4 \
140 $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \115 $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \
141 $(top_srcdir)/m4/ax_pthread.m4 \116 $(top_srcdir)/m4/ax_pthread.m4 \
142 $(top_srcdir)/m4/ax_python_module.m4 \
143 $(top_srcdir)/m4/ax_restore_flags.m4 \117 $(top_srcdir)/m4/ax_restore_flags.m4 \
144 $(top_srcdir)/m4/ax_save_flags.m4 $(top_srcdir)/m4/ax_tls.m4 \118 $(top_srcdir)/m4/ax_save_flags.m4 $(top_srcdir)/m4/ax_tls.m4 \
145 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \119 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -153,6 +127,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
153CONFIG_CLEAN_FILES = conf.sh ifconfig.sh legacy.run.sh start.sh \127CONFIG_CLEAN_FILES = conf.sh ifconfig.sh legacy.run.sh start.sh \
154 stop.sh128 stop.sh
155CONFIG_CLEAN_VPATH_FILES =129CONFIG_CLEAN_VPATH_FILES =
130PROGRAMS = $(noinst_PROGRAMS)
156feature_test_SOURCES = feature-test.c131feature_test_SOURCES = feature-test.c
157feature_test_OBJECTS = feature_test-feature-test.$(OBJEXT)132feature_test_OBJECTS = feature_test-feature-test.$(OBJEXT)
158feature_test_LDADD = $(LDADD)133feature_test_LDADD = $(LDADD)
@@ -163,30 +138,40 @@ am__v_lt_0 = --silent
163am__v_lt_1 = 138am__v_lt_1 =
164makejournal_SOURCES = makejournal.c139makejournal_SOURCES = makejournal.c
165makejournal_OBJECTS = makejournal-makejournal.$(OBJEXT)140makejournal_OBJECTS = makejournal-makejournal.$(OBJEXT)
166@HAVE_PERL_TRUE@makejournal_DEPENDENCIES = $(LDADD) $(LIBDNS_LIBS)141@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@makejournal_DEPENDENCIES = \
142@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LDADD) \
143@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LIBDNS_LIBS)
167pipelined_pipequeries_SOURCES = pipelined/pipequeries.c144pipelined_pipequeries_SOURCES = pipelined/pipequeries.c
168am__dirstamp = $(am__leading_dot)dirstamp145am__dirstamp = $(am__leading_dot)dirstamp
169pipelined_pipequeries_OBJECTS = \146pipelined_pipequeries_OBJECTS = \
170 pipelined/pipequeries-pipequeries.$(OBJEXT)147 pipelined/pipequeries-pipequeries.$(OBJEXT)
171@HAVE_PERL_TRUE@pipelined_pipequeries_DEPENDENCIES = $(LDADD) \148@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@pipelined_pipequeries_DEPENDENCIES = \
172@HAVE_PERL_TRUE@ $(LIBDNS_LIBS)149@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LDADD) \
150@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LIBDNS_LIBS)
173resolve_SOURCES = resolve.c151resolve_SOURCES = resolve.c
174resolve_OBJECTS = resolve-resolve.$(OBJEXT)152resolve_OBJECTS = resolve-resolve.$(OBJEXT)
175@HAVE_PERL_TRUE@resolve_DEPENDENCIES = $(LIBISC_LIBS) $(LIBIRS_LIBS) \153@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@resolve_DEPENDENCIES = $(LIBISC_LIBS) \
176@HAVE_PERL_TRUE@ $(LIBDNS_LIBS)154@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LIBIRS_LIBS) \
155@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LIBDNS_LIBS)
177rndc_gencheck_SOURCES = rndc/gencheck.c156rndc_gencheck_SOURCES = rndc/gencheck.c
178rndc_gencheck_OBJECTS = rndc/gencheck.$(OBJEXT)157rndc_gencheck_OBJECTS = rndc/gencheck.$(OBJEXT)
179rndc_gencheck_LDADD = $(LDADD)158rndc_gencheck_LDADD = $(LDADD)
180rndc_gencheck_DEPENDENCIES = $(LIBISC_LIBS)159rndc_gencheck_DEPENDENCIES = $(LIBISC_LIBS)
181rpz_dnsrps_SOURCES = rpz/dnsrps.c160rpz_dnsrps_SOURCES = rpz/dnsrps.c
182rpz_dnsrps_OBJECTS = rpz/dnsrps-dnsrps.$(OBJEXT)161rpz_dnsrps_OBJECTS = rpz/dnsrps-dnsrps.$(OBJEXT)
183@HAVE_PERL_TRUE@rpz_dnsrps_DEPENDENCIES = $(LDADD) $(LIBDNS_LIBS)162@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@rpz_dnsrps_DEPENDENCIES = \
163@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LDADD) \
164@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LIBDNS_LIBS)
184tkey_keycreate_SOURCES = tkey/keycreate.c165tkey_keycreate_SOURCES = tkey/keycreate.c
185tkey_keycreate_OBJECTS = tkey/keycreate-keycreate.$(OBJEXT)166tkey_keycreate_OBJECTS = tkey/keycreate-keycreate.$(OBJEXT)
186@HAVE_PERL_TRUE@tkey_keycreate_DEPENDENCIES = $(LDADD) $(LIBDNS_LIBS)167@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@tkey_keycreate_DEPENDENCIES = \
168@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LDADD) \
169@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LIBDNS_LIBS)
187tkey_keydelete_SOURCES = tkey/keydelete.c170tkey_keydelete_SOURCES = tkey/keydelete.c
188tkey_keydelete_OBJECTS = tkey/keydelete-keydelete.$(OBJEXT)171tkey_keydelete_OBJECTS = tkey/keydelete-keydelete.$(OBJEXT)
189@HAVE_PERL_TRUE@tkey_keydelete_DEPENDENCIES = $(LDADD) $(LIBDNS_LIBS)172@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@tkey_keydelete_DEPENDENCIES = \
173@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LDADD) \
174@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LIBDNS_LIBS)
190AM_V_P = $(am__v_P_@AM_V@)175AM_V_P = $(am__v_P_@AM_V@)
191am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)176am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
192am__v_P_0 = false177am__v_P_0 = false
@@ -274,8 +259,6 @@ am__define_uniq_tagged_files = \
274 unique=`for i in $$list; do \259 unique=`for i in $$list; do \
275 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \260 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
276 done | $(am__uniquify_input)`261 done | $(am__uniquify_input)`
277ETAGS = etags
278CTAGS = ctags
279am__tty_colors_dummy = \262am__tty_colors_dummy = \
280 mgn= red= grn= lgn= blu= brg= std=; \263 mgn= red= grn= lgn= blu= brg= std=; \
281 am__color_tests=no264 am__color_tests=no
@@ -532,6 +515,8 @@ CPP = @CPP@
532CPPFLAGS = @CPPFLAGS@515CPPFLAGS = @CPPFLAGS@
533CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@516CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
534CPP_FOR_BUILD = @CPP_FOR_BUILD@517CPP_FOR_BUILD = @CPP_FOR_BUILD@
518CSCOPE = @CSCOPE@
519CTAGS = @CTAGS@
535CURL = @CURL@520CURL = @CURL@
536CYGPATH_W = @CYGPATH_W@521CYGPATH_W = @CYGPATH_W@
537DEFS = @DEFS@522DEFS = @DEFS@
@@ -547,8 +532,10 @@ ECHO_C = @ECHO_C@
547ECHO_N = @ECHO_N@532ECHO_N = @ECHO_N@
548ECHO_T = @ECHO_T@533ECHO_T = @ECHO_T@
549EGREP = @EGREP@534EGREP = @EGREP@
535ETAGS = @ETAGS@
550EXEEXT = @EXEEXT@536EXEEXT = @EXEEXT@
551FGREP = @FGREP@537FGREP = @FGREP@
538FILECMD = @FILECMD@
552FSTRM_CAPTURE = @FSTRM_CAPTURE@539FSTRM_CAPTURE = @FSTRM_CAPTURE@
553FUZZ_LDFLAGS = @FUZZ_LDFLAGS@540FUZZ_LDFLAGS = @FUZZ_LDFLAGS@
554FUZZ_LOG_COMPILER = @FUZZ_LOG_COMPILER@541FUZZ_LOG_COMPILER = @FUZZ_LOG_COMPILER@
@@ -763,88 +750,181 @@ LIBBIND9_LIBS = \
763750
764EXTRA_DIST = .751EXTRA_DIST = .
765SUBDIRS = dyndb/driver dlzexternal/driver hooks/driver752SUBDIRS = dyndb/driver dlzexternal/driver hooks/driver
766@HAVE_PERL_TRUE@feature_test_CPPFLAGS = \753@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@feature_test_CPPFLAGS = \
767@HAVE_PERL_TRUE@ $(AM_CPPFLAGS) \754@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(AM_CPPFLAGS) \
768@HAVE_PERL_TRUE@ $(LIBDNS_CFLAGS)755@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LIBDNS_CFLAGS)
769756
770@HAVE_PERL_TRUE@makejournal_CPPFLAGS = \757@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@makejournal_CPPFLAGS = \
771@HAVE_PERL_TRUE@ $(AM_CPPFLAGS) \758@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(AM_CPPFLAGS) \
772@HAVE_PERL_TRUE@ $(LIBDNS_CFLAGS)759@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LIBDNS_CFLAGS)
773760
774@HAVE_PERL_TRUE@makejournal_LDADD = \761@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@makejournal_LDADD = \
775@HAVE_PERL_TRUE@ $(LDADD) \762@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LDADD) \
776@HAVE_PERL_TRUE@ $(LIBDNS_LIBS)763@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LIBDNS_LIBS)
777764
778@HAVE_PERL_TRUE@pipelined_pipequeries_CPPFLAGS = \765@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@pipelined_pipequeries_CPPFLAGS = \
779@HAVE_PERL_TRUE@ $(AM_CPPFLAGS) \766@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(AM_CPPFLAGS) \
780@HAVE_PERL_TRUE@ $(LIBDNS_CFLAGS)767@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LIBDNS_CFLAGS)
781768
782@HAVE_PERL_TRUE@pipelined_pipequeries_LDADD = \769@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@pipelined_pipequeries_LDADD = \
783@HAVE_PERL_TRUE@ $(LDADD) \770@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LDADD) \
784@HAVE_PERL_TRUE@ $(LIBDNS_LIBS)771@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LIBDNS_LIBS)
785772
786@HAVE_PERL_TRUE@resolve_CPPFLAGS = \773@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@resolve_CPPFLAGS = \
787@HAVE_PERL_TRUE@ $(AM_CPPFLAGS) \774@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(AM_CPPFLAGS) \
788@HAVE_PERL_TRUE@ $(LIBISC_CFLAGS) \775@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LIBISC_CFLAGS) \
789@HAVE_PERL_TRUE@ $(LIBDNS_CFLAGS) \776@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LIBDNS_CFLAGS) \
790@HAVE_PERL_TRUE@ $(LIBIRS_CFLAGS)777@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LIBIRS_CFLAGS)
791778
792@HAVE_PERL_TRUE@resolve_LDADD = $(LIBISC_LIBS) $(LIBIRS_LIBS) $(LIBDNS_LIBS)779@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@resolve_LDADD = $(LIBISC_LIBS) $(LIBIRS_LIBS) $(LIBDNS_LIBS)
793@HAVE_PERL_TRUE@rpz_dnsrps_CPPFLAGS = \780@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@rpz_dnsrps_CPPFLAGS = \
794@HAVE_PERL_TRUE@ $(AM_CPPFLAGS) \781@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(AM_CPPFLAGS) \
795@HAVE_PERL_TRUE@ $(LIBDNS_CFLAGS)782@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LIBDNS_CFLAGS)
796783
797@HAVE_PERL_TRUE@rpz_dnsrps_LDADD = \784@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@rpz_dnsrps_LDADD = \
798@HAVE_PERL_TRUE@ $(LDADD) \785@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LDADD) \
799@HAVE_PERL_TRUE@ $(LIBDNS_LIBS)786@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LIBDNS_LIBS)
800787
801@HAVE_PERL_TRUE@tkey_keycreate_CPPFLAGS = \788@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@tkey_keycreate_CPPFLAGS = \
802@HAVE_PERL_TRUE@ $(AM_CPPFLAGS) \789@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(AM_CPPFLAGS) \
803@HAVE_PERL_TRUE@ $(LIBDNS_CFLAGS)790@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LIBDNS_CFLAGS)
804791
805@HAVE_PERL_TRUE@tkey_keycreate_LDADD = \792@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@tkey_keycreate_LDADD = \
806@HAVE_PERL_TRUE@ $(LDADD) \793@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LDADD) \
807@HAVE_PERL_TRUE@ $(LIBDNS_LIBS)794@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LIBDNS_LIBS)
808795
809@HAVE_PERL_TRUE@tkey_keydelete_CPPFLAGS = \796@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@tkey_keydelete_CPPFLAGS = \
810@HAVE_PERL_TRUE@ $(AM_CPPFLAGS) \797@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(AM_CPPFLAGS) \
811@HAVE_PERL_TRUE@ $(LIBDNS_CFLAGS)798@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LIBDNS_CFLAGS)
812799
813@HAVE_PERL_TRUE@tkey_keydelete_LDADD = \800@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@tkey_keydelete_LDADD = \
814@HAVE_PERL_TRUE@ $(LDADD) \801@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LDADD) \
815@HAVE_PERL_TRUE@ $(LIBDNS_LIBS)802@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ $(LIBDNS_LIBS)
816803
817@HAVE_PERL_TRUE@TESTS = $(am__append_2) $(am__append_3) \804
818@HAVE_PERL_TRUE@ $(am__append_4) acl additional addzone \805# Longer running tests are listed (and executed) first to take the most
819@HAVE_PERL_TRUE@ allow-query auth autosign builtin cacheclean \806# advantage of parallel execution.
820@HAVE_PERL_TRUE@ case catz cds checkconf checknames checkzone \807@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@TESTS = \
821@HAVE_PERL_TRUE@ database dialup dlzexternal dns64 dsdigest \808@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ rpz \
822@HAVE_PERL_TRUE@ dupsigs dyndb ecdsa eddsa ednscompliance \809@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ rpzrecurse \
823@HAVE_PERL_TRUE@ emptyzones enginepkcs11 filter-aaaa formerr \810@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ serve-stale \
824@HAVE_PERL_TRUE@ geoip2 glue idna include-multiplecfg inline \811@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ timeouts \
825@HAVE_PERL_TRUE@ integrity hooks host journal keepalive \812@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ upforwd \
826@HAVE_PERL_TRUE@ keyfromlabel legacy limits logfileconfig \813@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ acl \
827@HAVE_PERL_TRUE@ masterfile masterformat metadata mirror mkeys \814@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ additional \
828@HAVE_PERL_TRUE@ names notify nsec3 nslookup padding pending \815@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ addzone \
829@HAVE_PERL_TRUE@ redirect rndc rootkeysentinel rpz rrchecker \816@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ allow-query \
830@HAVE_PERL_TRUE@ rrl rrsetorder rsabigexponent runtime sfcache \817@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ auth \
831@HAVE_PERL_TRUE@ smartsign sortlist spf staticstub stub \818@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ autosign \
832@HAVE_PERL_TRUE@ synthfromdnssec tkey tools transport-acl tsig \819@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ builtin \
833@HAVE_PERL_TRUE@ tsiggss ttl unknown verify views wildcard \820@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ cacheclean \
834@HAVE_PERL_TRUE@ xferquota zonechecks $(am__append_5) \821@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ case \
835@HAVE_PERL_TRUE@ $(am__append_6) $(am__append_7) \822@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ catz \
836@HAVE_PERL_TRUE@ $(am__append_8) $(am__append_9) \823@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ cds \
837@HAVE_PERL_TRUE@ $(am__append_10) $(am__append_11) \824@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ chain \
838@HAVE_PERL_TRUE@ $(am__append_12) $(am__append_13) \825@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ checkconf \
839@HAVE_PERL_TRUE@ $(am__append_14) $(am__append_15)826@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ checkds \
827@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ checknames \
828@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ checkzone \
829@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ cookie \
830@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ database \
831@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ dialup \
832@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ digdelv \
833@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ dispatch \
834@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ dlzexternal \
835@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ dns64 \
836@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ dnssec \
837@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ dnstap \
838@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ doth \
839@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ dsdigest \
840@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ dupsigs \
841@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ dyndb \
842@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ ecdsa \
843@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ eddsa \
844@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ ednscompliance \
845@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ emptyzones \
846@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ enginepkcs11 \
847@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ filter-aaaa \
848@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ fetchlimit \
849@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ formerr \
850@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ forward \
851@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ geoip2 \
852@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ glue \
853@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ idna \
854@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ include-multiplecfg \
855@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ inline \
856@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ integrity \
857@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ ixfr \
858@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ hooks \
859@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ host \
860@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ journal \
861@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ kasp \
862@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ keepalive \
863@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ keyfromlabel \
864@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ keymgr2kasp \
865@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ legacy \
866@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ limits \
867@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ logfileconfig \
868@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ masterfile \
869@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ masterformat \
870@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ metadata \
871@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ mirror \
872@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ mkeys \
873@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ names \
874@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ notify \
875@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ nsec3 \
876@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ nslookup \
877@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ nsupdate \
878@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ nzd2nzf \
879@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ padding \
880@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ pending \
881@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ pipelined \
882@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ qmin \
883@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ reclimit \
884@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ redirect \
885@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ resolver \
886@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ rndc \
887@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ rootkeysentinel \
888@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ rpzextra \
889@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ rrchecker \
890@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ rrl \
891@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ rrsetorder \
892@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ rsabigexponent \
893@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ runtime \
894@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ sfcache \
895@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ shutdown \
896@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ smartsign \
897@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ sortlist \
898@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ spf \
899@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ staticstub \
900@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ statistics \
901@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ statschannel \
902@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ stress \
903@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ stub \
904@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ synthfromdnssec \
905@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ tcp \
906@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ tkey \
907@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ tools \
908@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ transport-acl \
909@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ tsig \
910@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ tsiggss \
911@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ ttl \
912@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ unknown \
913@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ verify \
914@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ views \
915@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ wildcard \
916@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ xfer \
917@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ xferquota \
918@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ zero \
919@HAVE_PERL_TRUE@@HAVE_PYTEST_TRUE@@HAVE_PYTHON_TRUE@ zonechecks
920
840LOG_DRIVER_V = $(LOG_DRIVER_V_@AM_V@)921LOG_DRIVER_V = $(LOG_DRIVER_V_@AM_V@)
841LOG_DRIVER_V_ = $(LOG_DRIVER_V_@AM_DEFAULT_V@)922LOG_DRIVER_V_ = $(LOG_DRIVER_V_@AM_DEFAULT_V@)
842LOG_DRIVER_V_0 = --verbose no923LOG_DRIVER_V_0 = --verbose no
843LOG_DRIVER_V_1 = --verbose yes924LOG_DRIVER_V_1 = --verbose yes
844LOG_DRIVER = $(srcdir)/custom-test-driver925LOG_DRIVER = $(srcdir)/custom-test-driver
845AM_LOG_DRIVER_FLAGS = $(LOG_DRIVER_V)926AM_LOG_DRIVER_FLAGS = $(LOG_DRIVER_V)
846LOG_COMPILER = $(builddir)/legacy.run.sh927LOG_COMPILER = $(srcdir)/run.sh
847AM_LOG_FLAGS = -r
848all: all-recursive928all: all-recursive
849929
850.SUFFIXES:930.SUFFIXES:
@@ -890,8 +970,8 @@ start.sh: $(top_builddir)/config.status $(srcdir)/start.sh.in
890stop.sh: $(top_builddir)/config.status $(srcdir)/stop.sh.in970stop.sh: $(top_builddir)/config.status $(srcdir)/stop.sh.in
891 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@971 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
892972
893clean-checkPROGRAMS:973clean-noinstPROGRAMS:
894 @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \974 @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
895 echo " rm -f" $$list; \975 echo " rm -f" $$list; \
896 rm -f $$list || exit $$?; \976 rm -f $$list || exit $$?; \
897 test -n "$(EXEEXT)" || exit 0; \977 test -n "$(EXEEXT)" || exit 0; \
@@ -1344,7 +1424,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
1344 fi; \1424 fi; \
1345 $$success || exit 11425 $$success || exit 1
13461426
1347check-TESTS: $(check_PROGRAMS)1427check-TESTS:
1348 @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list1428 @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
1349 @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list1429 @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
1350 @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)1430 @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -1354,7 +1434,7 @@ check-TESTS: $(check_PROGRAMS)
1354 log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \1434 log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
1355 $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \1435 $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
1356 exit $$?;1436 exit $$?;
1357recheck: all $(check_PROGRAMS)1437recheck: all
1358 @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)1438 @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
1359 @set +e; $(am__set_TESTS_bases); \1439 @set +e; $(am__set_TESTS_bases); \
1360 bases=`for i in $$bases; do echo $$i; done \1440 bases=`for i in $$bases; do echo $$i; done \
@@ -1365,9 +1445,9 @@ recheck: all $(check_PROGRAMS)
1365 am__force_recheck=am--force-recheck \1445 am__force_recheck=am--force-recheck \
1366 TEST_LOGS="$$log_list"; \1446 TEST_LOGS="$$log_list"; \
1367 exit $$?1447 exit $$?
1368serve-stale.log: serve-stale1448rpz.log: rpz
1369 @p='serve-stale'; \1449 @p='rpz'; \
1370 b='serve-stale'; \1450 b='rpz'; \
1371 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \1451 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1372 --log-file $$b.log --trs-file $$b.trs \1452 --log-file $$b.log --trs-file $$b.trs \
1373 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \1453 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
@@ -1379,9 +1459,23 @@ rpzrecurse.log: rpzrecurse
1379 --log-file $$b.log --trs-file $$b.trs \1459 --log-file $$b.log --trs-file $$b.trs \
1380 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \1460 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1381 "$$tst" $(AM_TESTS_FD_REDIRECT)1461 "$$tst" $(AM_TESTS_FD_REDIRECT)
1382doth.log: doth1462serve-stale.log: serve-stale
1383 @p='doth'; \1463 @p='serve-stale'; \
1384 b='doth'; \1464 b='serve-stale'; \
1465 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1466 --log-file $$b.log --trs-file $$b.trs \
1467 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1468 "$$tst" $(AM_TESTS_FD_REDIRECT)
1469timeouts.log: timeouts
1470 @p='timeouts'; \
1471 b='timeouts'; \
1472 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1473 --log-file $$b.log --trs-file $$b.trs \
1474 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1475 "$$tst" $(AM_TESTS_FD_REDIRECT)
1476upforwd.log: upforwd
1477 @p='upforwd'; \
1478 b='upforwd'; \
1385 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \1479 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1386 --log-file $$b.log --trs-file $$b.trs \1480 --log-file $$b.log --trs-file $$b.trs \
1387 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \1481 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
@@ -1463,6 +1557,13 @@ cds.log: cds
1463 --log-file $$b.log --trs-file $$b.trs \1557 --log-file $$b.log --trs-file $$b.trs \
1464 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \1558 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1465 "$$tst" $(AM_TESTS_FD_REDIRECT)1559 "$$tst" $(AM_TESTS_FD_REDIRECT)
1560chain.log: chain
1561 @p='chain'; \
1562 b='chain'; \
1563 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1564 --log-file $$b.log --trs-file $$b.trs \
1565 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1566 "$$tst" $(AM_TESTS_FD_REDIRECT)
1466checkconf.log: checkconf1567checkconf.log: checkconf
1467 @p='checkconf'; \1568 @p='checkconf'; \
1468 b='checkconf'; \1569 b='checkconf'; \
@@ -1470,6 +1571,13 @@ checkconf.log: checkconf
1470 --log-file $$b.log --trs-file $$b.trs \1571 --log-file $$b.log --trs-file $$b.trs \
1471 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \1572 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1472 "$$tst" $(AM_TESTS_FD_REDIRECT)1573 "$$tst" $(AM_TESTS_FD_REDIRECT)
1574checkds.log: checkds
1575 @p='checkds'; \
1576 b='checkds'; \
1577 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1578 --log-file $$b.log --trs-file $$b.trs \
1579 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1580 "$$tst" $(AM_TESTS_FD_REDIRECT)
1473checknames.log: checknames1581checknames.log: checknames
1474 @p='checknames'; \1582 @p='checknames'; \
1475 b='checknames'; \1583 b='checknames'; \
@@ -1484,6 +1592,13 @@ checkzone.log: checkzone
1484 --log-file $$b.log --trs-file $$b.trs \1592 --log-file $$b.log --trs-file $$b.trs \
1485 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \1593 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1486 "$$tst" $(AM_TESTS_FD_REDIRECT)1594 "$$tst" $(AM_TESTS_FD_REDIRECT)
1595cookie.log: cookie
1596 @p='cookie'; \
1597 b='cookie'; \
1598 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1599 --log-file $$b.log --trs-file $$b.trs \
1600 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1601 "$$tst" $(AM_TESTS_FD_REDIRECT)
1487database.log: database1602database.log: database
1488 @p='database'; \1603 @p='database'; \
1489 b='database'; \1604 b='database'; \
@@ -1498,6 +1613,20 @@ dialup.log: dialup
1498 --log-file $$b.log --trs-file $$b.trs \1613 --log-file $$b.log --trs-file $$b.trs \
1499 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \1614 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1500 "$$tst" $(AM_TESTS_FD_REDIRECT)1615 "$$tst" $(AM_TESTS_FD_REDIRECT)
1616digdelv.log: digdelv
1617 @p='digdelv'; \
1618 b='digdelv'; \
1619 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1620 --log-file $$b.log --trs-file $$b.trs \
1621 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1622 "$$tst" $(AM_TESTS_FD_REDIRECT)
1623dispatch.log: dispatch
1624 @p='dispatch'; \
1625 b='dispatch'; \
1626 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1627 --log-file $$b.log --trs-file $$b.trs \
1628 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1629 "$$tst" $(AM_TESTS_FD_REDIRECT)
1501dlzexternal.log: dlzexternal1630dlzexternal.log: dlzexternal
1502 @p='dlzexternal'; \1631 @p='dlzexternal'; \
1503 b='dlzexternal'; \1632 b='dlzexternal'; \
@@ -1512,6 +1641,27 @@ dns64.log: dns64
1512 --log-file $$b.log --trs-file $$b.trs \1641 --log-file $$b.log --trs-file $$b.trs \
1513 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \1642 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1514 "$$tst" $(AM_TESTS_FD_REDIRECT)1643 "$$tst" $(AM_TESTS_FD_REDIRECT)
1644dnssec.log: dnssec
1645 @p='dnssec'; \
1646 b='dnssec'; \
1647 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1648 --log-file $$b.log --trs-file $$b.trs \
1649 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1650 "$$tst" $(AM_TESTS_FD_REDIRECT)
1651dnstap.log: dnstap
1652 @p='dnstap'; \
1653 b='dnstap'; \
1654 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1655 --log-file $$b.log --trs-file $$b.trs \
1656 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1657 "$$tst" $(AM_TESTS_FD_REDIRECT)
1658doth.log: doth
1659 @p='doth'; \
1660 b='doth'; \
1661 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1662 --log-file $$b.log --trs-file $$b.trs \
1663 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1664 "$$tst" $(AM_TESTS_FD_REDIRECT)
1515dsdigest.log: dsdigest1665dsdigest.log: dsdigest
1516 @p='dsdigest'; \1666 @p='dsdigest'; \
1517 b='dsdigest'; \1667 b='dsdigest'; \
@@ -1575,6 +1725,13 @@ filter-aaaa.log: filter-aaaa
1575 --log-file $$b.log --trs-file $$b.trs \1725 --log-file $$b.log --trs-file $$b.trs \
1576 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \1726 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1577 "$$tst" $(AM_TESTS_FD_REDIRECT)1727 "$$tst" $(AM_TESTS_FD_REDIRECT)
1728fetchlimit.log: fetchlimit
1729 @p='fetchlimit'; \
1730 b='fetchlimit'; \
1731 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1732 --log-file $$b.log --trs-file $$b.trs \
1733 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1734 "$$tst" $(AM_TESTS_FD_REDIRECT)
1578formerr.log: formerr1735formerr.log: formerr
1579 @p='formerr'; \1736 @p='formerr'; \
1580 b='formerr'; \1737 b='formerr'; \
@@ -1582,6 +1739,13 @@ formerr.log: formerr
1582 --log-file $$b.log --trs-file $$b.trs \1739 --log-file $$b.log --trs-file $$b.trs \
1583 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \1740 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1584 "$$tst" $(AM_TESTS_FD_REDIRECT)1741 "$$tst" $(AM_TESTS_FD_REDIRECT)
1742forward.log: forward
1743 @p='forward'; \
1744 b='forward'; \
1745 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1746 --log-file $$b.log --trs-file $$b.trs \
1747 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1748 "$$tst" $(AM_TESTS_FD_REDIRECT)
1585geoip2.log: geoip21749geoip2.log: geoip2
1586 @p='geoip2'; \1750 @p='geoip2'; \
1587 b='geoip2'; \1751 b='geoip2'; \
@@ -1624,6 +1788,13 @@ integrity.log: integrity
1624 --log-file $$b.log --trs-file $$b.trs \1788 --log-file $$b.log --trs-file $$b.trs \
1625 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \1789 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1626 "$$tst" $(AM_TESTS_FD_REDIRECT)1790 "$$tst" $(AM_TESTS_FD_REDIRECT)
1791ixfr.log: ixfr
1792 @p='ixfr'; \
1793 b='ixfr'; \
1794 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1795 --log-file $$b.log --trs-file $$b.trs \
1796 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1797 "$$tst" $(AM_TESTS_FD_REDIRECT)
1627hooks.log: hooks1798hooks.log: hooks
1628 @p='hooks'; \1799 @p='hooks'; \
1629 b='hooks'; \1800 b='hooks'; \
@@ -1645,6 +1816,13 @@ journal.log: journal
1645 --log-file $$b.log --trs-file $$b.trs \1816 --log-file $$b.log --trs-file $$b.trs \
1646 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \1817 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1647 "$$tst" $(AM_TESTS_FD_REDIRECT)1818 "$$tst" $(AM_TESTS_FD_REDIRECT)
1819kasp.log: kasp
1820 @p='kasp'; \
1821 b='kasp'; \
1822 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1823 --log-file $$b.log --trs-file $$b.trs \
1824 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1825 "$$tst" $(AM_TESTS_FD_REDIRECT)
1648keepalive.log: keepalive1826keepalive.log: keepalive
1649 @p='keepalive'; \1827 @p='keepalive'; \
1650 b='keepalive'; \1828 b='keepalive'; \
@@ -1659,6 +1837,13 @@ keyfromlabel.log: keyfromlabel
1659 --log-file $$b.log --trs-file $$b.trs \1837 --log-file $$b.log --trs-file $$b.trs \
1660 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \1838 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1661 "$$tst" $(AM_TESTS_FD_REDIRECT)1839 "$$tst" $(AM_TESTS_FD_REDIRECT)
1840keymgr2kasp.log: keymgr2kasp
1841 @p='keymgr2kasp'; \
1842 b='keymgr2kasp'; \
1843 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1844 --log-file $$b.log --trs-file $$b.trs \
1845 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1846 "$$tst" $(AM_TESTS_FD_REDIRECT)
1662legacy.log: legacy1847legacy.log: legacy
1663 @p='legacy'; \1848 @p='legacy'; \
1664 b='legacy'; \1849 b='legacy'; \
@@ -1743,6 +1928,20 @@ nslookup.log: nslookup
1743 --log-file $$b.log --trs-file $$b.trs \1928 --log-file $$b.log --trs-file $$b.trs \
1744 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \1929 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1745 "$$tst" $(AM_TESTS_FD_REDIRECT)1930 "$$tst" $(AM_TESTS_FD_REDIRECT)
1931nsupdate.log: nsupdate
1932 @p='nsupdate'; \
1933 b='nsupdate'; \
1934 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1935 --log-file $$b.log --trs-file $$b.trs \
1936 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1937 "$$tst" $(AM_TESTS_FD_REDIRECT)
1938nzd2nzf.log: nzd2nzf
1939 @p='nzd2nzf'; \
1940 b='nzd2nzf'; \
1941 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1942 --log-file $$b.log --trs-file $$b.trs \
1943 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1944 "$$tst" $(AM_TESTS_FD_REDIRECT)
1746padding.log: padding1945padding.log: padding
1747 @p='padding'; \1946 @p='padding'; \
1748 b='padding'; \1947 b='padding'; \
@@ -1757,6 +1956,27 @@ pending.log: pending
1757 --log-file $$b.log --trs-file $$b.trs \1956 --log-file $$b.log --trs-file $$b.trs \
1758 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \1957 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1759 "$$tst" $(AM_TESTS_FD_REDIRECT)1958 "$$tst" $(AM_TESTS_FD_REDIRECT)
1959pipelined.log: pipelined
1960 @p='pipelined'; \
1961 b='pipelined'; \
1962 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1963 --log-file $$b.log --trs-file $$b.trs \
1964 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1965 "$$tst" $(AM_TESTS_FD_REDIRECT)
1966qmin.log: qmin
1967 @p='qmin'; \
1968 b='qmin'; \
1969 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1970 --log-file $$b.log --trs-file $$b.trs \
1971 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1972 "$$tst" $(AM_TESTS_FD_REDIRECT)
1973reclimit.log: reclimit
1974 @p='reclimit'; \
1975 b='reclimit'; \
1976 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1977 --log-file $$b.log --trs-file $$b.trs \
1978 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1979 "$$tst" $(AM_TESTS_FD_REDIRECT)
1760redirect.log: redirect1980redirect.log: redirect
1761 @p='redirect'; \1981 @p='redirect'; \
1762 b='redirect'; \1982 b='redirect'; \
@@ -1764,6 +1984,13 @@ redirect.log: redirect
1764 --log-file $$b.log --trs-file $$b.trs \1984 --log-file $$b.log --trs-file $$b.trs \
1765 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \1985 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1766 "$$tst" $(AM_TESTS_FD_REDIRECT)1986 "$$tst" $(AM_TESTS_FD_REDIRECT)
1987resolver.log: resolver
1988 @p='resolver'; \
1989 b='resolver'; \
1990 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1991 --log-file $$b.log --trs-file $$b.trs \
1992 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1993 "$$tst" $(AM_TESTS_FD_REDIRECT)
1767rndc.log: rndc1994rndc.log: rndc
1768 @p='rndc'; \1995 @p='rndc'; \
1769 b='rndc'; \1996 b='rndc'; \
@@ -1778,9 +2005,9 @@ rootkeysentinel.log: rootkeysentinel
1778 --log-file $$b.log --trs-file $$b.trs \2005 --log-file $$b.log --trs-file $$b.trs \
1779 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \2006 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1780 "$$tst" $(AM_TESTS_FD_REDIRECT)2007 "$$tst" $(AM_TESTS_FD_REDIRECT)
1781rpz.log: rpz2008rpzextra.log: rpzextra
1782 @p='rpz'; \2009 @p='rpzextra'; \
1783 b='rpz'; \2010 b='rpzextra'; \
1784 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \2011 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1785 --log-file $$b.log --trs-file $$b.trs \2012 --log-file $$b.log --trs-file $$b.trs \
1786 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \2013 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
@@ -1827,6 +2054,13 @@ sfcache.log: sfcache
1827 --log-file $$b.log --trs-file $$b.trs \2054 --log-file $$b.log --trs-file $$b.trs \
1828 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \2055 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1829 "$$tst" $(AM_TESTS_FD_REDIRECT)2056 "$$tst" $(AM_TESTS_FD_REDIRECT)
2057shutdown.log: shutdown
2058 @p='shutdown'; \
2059 b='shutdown'; \
2060 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2061 --log-file $$b.log --trs-file $$b.trs \
2062 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2063 "$$tst" $(AM_TESTS_FD_REDIRECT)
1830smartsign.log: smartsign2064smartsign.log: smartsign
1831 @p='smartsign'; \2065 @p='smartsign'; \
1832 b='smartsign'; \2066 b='smartsign'; \
@@ -1855,6 +2089,27 @@ staticstub.log: staticstub
1855 --log-file $$b.log --trs-file $$b.trs \2089 --log-file $$b.log --trs-file $$b.trs \
1856 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \2090 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1857 "$$tst" $(AM_TESTS_FD_REDIRECT)2091 "$$tst" $(AM_TESTS_FD_REDIRECT)
2092statistics.log: statistics
2093 @p='statistics'; \
2094 b='statistics'; \
2095 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2096 --log-file $$b.log --trs-file $$b.trs \
2097 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2098 "$$tst" $(AM_TESTS_FD_REDIRECT)
2099statschannel.log: statschannel
2100 @p='statschannel'; \
2101 b='statschannel'; \
2102 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2103 --log-file $$b.log --trs-file $$b.trs \
2104 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2105 "$$tst" $(AM_TESTS_FD_REDIRECT)
2106stress.log: stress
2107 @p='stress'; \
2108 b='stress'; \
2109 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2110 --log-file $$b.log --trs-file $$b.trs \
2111 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2112 "$$tst" $(AM_TESTS_FD_REDIRECT)
1858stub.log: stub2113stub.log: stub
1859 @p='stub'; \2114 @p='stub'; \
1860 b='stub'; \2115 b='stub'; \
@@ -1869,6 +2124,13 @@ synthfromdnssec.log: synthfromdnssec
1869 --log-file $$b.log --trs-file $$b.trs \2124 --log-file $$b.log --trs-file $$b.trs \
1870 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \2125 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1871 "$$tst" $(AM_TESTS_FD_REDIRECT)2126 "$$tst" $(AM_TESTS_FD_REDIRECT)
2127tcp.log: tcp
2128 @p='tcp'; \
2129 b='tcp'; \
2130 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2131 --log-file $$b.log --trs-file $$b.trs \
2132 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2133 "$$tst" $(AM_TESTS_FD_REDIRECT)
1872tkey.log: tkey2134tkey.log: tkey
1873 @p='tkey'; \2135 @p='tkey'; \
1874 b='tkey'; \2136 b='tkey'; \
@@ -1939,97 +2201,6 @@ wildcard.log: wildcard
1939 --log-file $$b.log --trs-file $$b.trs \2201 --log-file $$b.log --trs-file $$b.trs \
1940 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \2202 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1941 "$$tst" $(AM_TESTS_FD_REDIRECT)2203 "$$tst" $(AM_TESTS_FD_REDIRECT)
1942xferquota.log: xferquota
1943 @p='xferquota'; \
1944 b='xferquota'; \
1945 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1946 --log-file $$b.log --trs-file $$b.trs \
1947 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1948 "$$tst" $(AM_TESTS_FD_REDIRECT)
1949zonechecks.log: zonechecks
1950 @p='zonechecks'; \
1951 b='zonechecks'; \
1952 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1953 --log-file $$b.log --trs-file $$b.trs \
1954 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1955 "$$tst" $(AM_TESTS_FD_REDIRECT)
1956nzd2nzf.log: nzd2nzf
1957 @p='nzd2nzf'; \
1958 b='nzd2nzf'; \
1959 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1960 --log-file $$b.log --trs-file $$b.trs \
1961 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1962 "$$tst" $(AM_TESTS_FD_REDIRECT)
1963fetchlimit.log: fetchlimit
1964 @p='fetchlimit'; \
1965 b='fetchlimit'; \
1966 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1967 --log-file $$b.log --trs-file $$b.trs \
1968 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1969 "$$tst" $(AM_TESTS_FD_REDIRECT)
1970ixfr.log: ixfr
1971 @p='ixfr'; \
1972 b='ixfr'; \
1973 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1974 --log-file $$b.log --trs-file $$b.trs \
1975 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1976 "$$tst" $(AM_TESTS_FD_REDIRECT)
1977nsupdate.log: nsupdate
1978 @p='nsupdate'; \
1979 b='nsupdate'; \
1980 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1981 --log-file $$b.log --trs-file $$b.trs \
1982 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1983 "$$tst" $(AM_TESTS_FD_REDIRECT)
1984resolver.log: resolver
1985 @p='resolver'; \
1986 b='resolver'; \
1987 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1988 --log-file $$b.log --trs-file $$b.trs \
1989 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1990 "$$tst" $(AM_TESTS_FD_REDIRECT)
1991statistics.log: statistics
1992 @p='statistics'; \
1993 b='statistics'; \
1994 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1995 --log-file $$b.log --trs-file $$b.trs \
1996 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1997 "$$tst" $(AM_TESTS_FD_REDIRECT)
1998stress.log: stress
1999 @p='stress'; \
2000 b='stress'; \
2001 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2002 --log-file $$b.log --trs-file $$b.trs \
2003 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2004 "$$tst" $(AM_TESTS_FD_REDIRECT)
2005upforwd.log: upforwd
2006 @p='upforwd'; \
2007 b='upforwd'; \
2008 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2009 --log-file $$b.log --trs-file $$b.trs \
2010 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2011 "$$tst" $(AM_TESTS_FD_REDIRECT)
2012zero.log: zero
2013 @p='zero'; \
2014 b='zero'; \
2015 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2016 --log-file $$b.log --trs-file $$b.trs \
2017 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2018 "$$tst" $(AM_TESTS_FD_REDIRECT)
2019dnstap.log: dnstap
2020 @p='dnstap'; \
2021 b='dnstap'; \
2022 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2023 --log-file $$b.log --trs-file $$b.trs \
2024 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2025 "$$tst" $(AM_TESTS_FD_REDIRECT)
2026statschannel.log: statschannel
2027 @p='statschannel'; \
2028 b='statschannel'; \
2029 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2030 --log-file $$b.log --trs-file $$b.trs \
2031 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2032 "$$tst" $(AM_TESTS_FD_REDIRECT)
2033xfer.log: xfer2204xfer.log: xfer
2034 @p='xfer'; \2205 @p='xfer'; \
2035 b='xfer'; \2206 b='xfer'; \
@@ -2037,114 +2208,23 @@ xfer.log: xfer
2037 --log-file $$b.log --trs-file $$b.trs \2208 --log-file $$b.log --trs-file $$b.trs \
2038 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \2209 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2039 "$$tst" $(AM_TESTS_FD_REDIRECT)2210 "$$tst" $(AM_TESTS_FD_REDIRECT)
2040reclimit.log: reclimit2211xferquota.log: xferquota
2041 @p='reclimit'; \2212 @p='xferquota'; \
2042 b='reclimit'; \2213 b='xferquota'; \
2043 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2044 --log-file $$b.log --trs-file $$b.trs \
2045 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2046 "$$tst" $(AM_TESTS_FD_REDIRECT)
2047kasp.log: kasp
2048 @p='kasp'; \
2049 b='kasp'; \
2050 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2051 --log-file $$b.log --trs-file $$b.trs \
2052 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2053 "$$tst" $(AM_TESTS_FD_REDIRECT)
2054keymgr2kasp.log: keymgr2kasp
2055 @p='keymgr2kasp'; \
2056 b='keymgr2kasp'; \
2057 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2058 --log-file $$b.log --trs-file $$b.trs \
2059 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2060 "$$tst" $(AM_TESTS_FD_REDIRECT)
2061tcp.log: tcp
2062 @p='tcp'; \
2063 b='tcp'; \
2064 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2065 --log-file $$b.log --trs-file $$b.trs \
2066 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2067 "$$tst" $(AM_TESTS_FD_REDIRECT)
2068pipelined.log: pipelined
2069 @p='pipelined'; \
2070 b='pipelined'; \
2071 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2072 --log-file $$b.log --trs-file $$b.trs \
2073 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2074 "$$tst" $(AM_TESTS_FD_REDIRECT)
2075checkds.log: checkds
2076 @p='checkds'; \
2077 b='checkds'; \
2078 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2079 --log-file $$b.log --trs-file $$b.trs \
2080 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2081 "$$tst" $(AM_TESTS_FD_REDIRECT)
2082dispatch.log: dispatch
2083 @p='dispatch'; \
2084 b='dispatch'; \
2085 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2086 --log-file $$b.log --trs-file $$b.trs \
2087 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2088 "$$tst" $(AM_TESTS_FD_REDIRECT)
2089rpzextra.log: rpzextra
2090 @p='rpzextra'; \
2091 b='rpzextra'; \
2092 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2093 --log-file $$b.log --trs-file $$b.trs \
2094 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2095 "$$tst" $(AM_TESTS_FD_REDIRECT)
2096shutdown.log: shutdown
2097 @p='shutdown'; \
2098 b='shutdown'; \
2099 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2100 --log-file $$b.log --trs-file $$b.trs \
2101 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2102 "$$tst" $(AM_TESTS_FD_REDIRECT)
2103timeouts.log: timeouts
2104 @p='timeouts'; \
2105 b='timeouts'; \
2106 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2107 --log-file $$b.log --trs-file $$b.trs \
2108 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2109 "$$tst" $(AM_TESTS_FD_REDIRECT)
2110qmin.log: qmin
2111 @p='qmin'; \
2112 b='qmin'; \
2113 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2114 --log-file $$b.log --trs-file $$b.trs \
2115 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2116 "$$tst" $(AM_TESTS_FD_REDIRECT)
2117cookie.log: cookie
2118 @p='cookie'; \
2119 b='cookie'; \
2120 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2121 --log-file $$b.log --trs-file $$b.trs \
2122 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2123 "$$tst" $(AM_TESTS_FD_REDIRECT)
2124digdelv.log: digdelv
2125 @p='digdelv'; \
2126 b='digdelv'; \
2127 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2128 --log-file $$b.log --trs-file $$b.trs \
2129 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2130 "$$tst" $(AM_TESTS_FD_REDIRECT)
2131dnssec.log: dnssec
2132 @p='dnssec'; \
2133 b='dnssec'; \
2134 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \2214 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2135 --log-file $$b.log --trs-file $$b.trs \2215 --log-file $$b.log --trs-file $$b.trs \
2136 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \2216 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2137 "$$tst" $(AM_TESTS_FD_REDIRECT)2217 "$$tst" $(AM_TESTS_FD_REDIRECT)
2138forward.log: forward2218zero.log: zero
2139 @p='forward'; \2219 @p='zero'; \
2140 b='forward'; \2220 b='zero'; \
2141 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \2221 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2142 --log-file $$b.log --trs-file $$b.trs \2222 --log-file $$b.log --trs-file $$b.trs \
2143 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \2223 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
2144 "$$tst" $(AM_TESTS_FD_REDIRECT)2224 "$$tst" $(AM_TESTS_FD_REDIRECT)
2145chain.log: chain2225zonechecks.log: zonechecks
2146 @p='chain'; \2226 @p='zonechecks'; \
2147 b='chain'; \2227 b='zonechecks'; \
2148 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \2228 $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
2149 --log-file $$b.log --trs-file $$b.trs \2229 --log-file $$b.log --trs-file $$b.trs \
2150 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \2230 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
@@ -2163,7 +2243,6 @@ chain.log: chain
2163@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \2243@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \
2164@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \2244@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
2165@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)2245@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)
2166
2167distdir: $(BUILT_SOURCES)2246distdir: $(BUILT_SOURCES)
2168 $(MAKE) $(AM_MAKEFLAGS) distdir-am2247 $(MAKE) $(AM_MAKEFLAGS) distdir-am
21692248
@@ -2226,10 +2305,9 @@ distdir-am: $(DISTFILES)
2226 top_distdir="$(top_distdir)" distdir="$(distdir)" \2305 top_distdir="$(top_distdir)" distdir="$(distdir)" \
2227 dist-hook2306 dist-hook
2228check-am: all-am2307check-am: all-am
2229 $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
2230 $(MAKE) $(AM_MAKEFLAGS) check-TESTS2308 $(MAKE) $(AM_MAKEFLAGS) check-TESTS
2231check: check-recursive2309check: check-recursive
2232all-am: Makefile2310all-am: Makefile $(PROGRAMS)
2233installdirs: installdirs-recursive2311installdirs: installdirs-recursive
2234installdirs-am:2312installdirs-am:
2235install: install-recursive2313install: install-recursive
@@ -2275,7 +2353,7 @@ maintainer-clean-generic:
2275 @echo "it deletes files that may require special tools to rebuild."2353 @echo "it deletes files that may require special tools to rebuild."
2276clean: clean-recursive2354clean: clean-recursive