CVS commit: src/external/mpl/bind

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Fri Jun 19 20:10:03 UTC 2026

Modified Files:
        src/external/mpl/bind/dist: configure
        src/external/mpl/bind/dist/bin/dnssec: dnssec-keygen.c
            dnssec-signzone.c
        src/external/mpl/bind/dist/bin/named: server.c statschannel.c
        src/external/mpl/bind/dist/bin/tests/system: feature-test.c
        src/external/mpl/bind/dist/bin/tools: nsec3hash.c
        src/external/mpl/bind/dist/doc/arm: isc-logo.pdf
        src/external/mpl/bind/dist/doc/dnssec-guide/img: remove-ds-2.png
        src/external/mpl/bind/dist/lib/dns: catz.c diff.c dispatch.c dns64.c
            dnssec.c master.c masterdump.c message.c name.c qp.c qp_p.h
            qpcache.c qpzone.c resolver.c rpz.c rrl.c tkey.c tsig.c validator.c
            xfrin.c zone.c
        src/external/mpl/bind/dist/lib/dns/include/dns: adb.h compress.h db.h
            diff.h dispatch.h nametree.h qp.h sdlz.h ssu.h stats.h tsig.h
            zone.h
        src/external/mpl/bind/dist/lib/dns/rdata/in_1: a_1.c
        src/external/mpl/bind/dist/lib/isc: histo.c ht.c picohttpparser.c
            result.c
        src/external/mpl/bind/dist/lib/isc/include/isc: hmac.h result.h stdio.h
            tls.h
        src/external/mpl/bind/dist/lib/isc/netmgr: http.c tcp.c
        src/external/mpl/bind/dist/lib/isccfg: check.c
        src/external/mpl/bind/dist/lib/isccfg/include/isccfg: aclconf.h
        src/external/mpl/bind/dist/lib/ns: query.c
        src/external/mpl/bind/dist/tests/dns: dispatch_test.c dnstap_test.c
            tsig_test.c update_test.c
        src/external/mpl/bind/dist/tests/isc: time_test.c
        src/external/mpl/bind/include: config.h
        src/external/mpl/bind/lib/libdns: dns.common.expsym shlib_version

Log Message:
merge conflicts between bind-9.20.23 and 9.20.24


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/external/mpl/bind/dist/configure
cvs rdiff -u -r1.16 -r1.17 \
    src/external/mpl/bind/dist/bin/dnssec/dnssec-keygen.c
cvs rdiff -u -r1.17 -r1.18 \
    src/external/mpl/bind/dist/bin/dnssec/dnssec-signzone.c
cvs rdiff -u -r1.28 -r1.29 src/external/mpl/bind/dist/bin/named/server.c
cvs rdiff -u -r1.19 -r1.20 \
    src/external/mpl/bind/dist/bin/named/statschannel.c
cvs rdiff -u -r1.14 -r1.15 \
    src/external/mpl/bind/dist/bin/tests/system/feature-test.c
cvs rdiff -u -r1.9 -r1.10 src/external/mpl/bind/dist/bin/tools/nsec3hash.c
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/doc/arm/isc-logo.pdf
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/external/mpl/bind/dist/doc/dnssec-guide/img/remove-ds-2.png
cvs rdiff -u -r1.17 -r1.18 src/external/mpl/bind/dist/lib/dns/catz.c
cvs rdiff -u -r1.13 -r1.14 src/external/mpl/bind/dist/lib/dns/diff.c \
    src/external/mpl/bind/dist/lib/dns/rrl.c
cvs rdiff -u -r1.15 -r1.16 src/external/mpl/bind/dist/lib/dns/dispatch.c \
    src/external/mpl/bind/dist/lib/dns/master.c \
    src/external/mpl/bind/dist/lib/dns/tsig.c
cvs rdiff -u -r1.8 -r1.9 src/external/mpl/bind/dist/lib/dns/dns64.c
cvs rdiff -u -r1.19 -r1.20 src/external/mpl/bind/dist/lib/dns/dnssec.c \
    src/external/mpl/bind/dist/lib/dns/masterdump.c
cvs rdiff -u -r1.23 -r1.24 src/external/mpl/bind/dist/lib/dns/message.c
cvs rdiff -u -r1.16 -r1.17 src/external/mpl/bind/dist/lib/dns/name.c
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/lib/dns/qp.c
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/lib/dns/qp_p.h
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/lib/dns/qpcache.c \
    src/external/mpl/bind/dist/lib/dns/qpzone.c
cvs rdiff -u -r1.26 -r1.27 src/external/mpl/bind/dist/lib/dns/resolver.c
cvs rdiff -u -r1.18 -r1.19 src/external/mpl/bind/dist/lib/dns/rpz.c \
    src/external/mpl/bind/dist/lib/dns/tkey.c
cvs rdiff -u -r1.21 -r1.22 src/external/mpl/bind/dist/lib/dns/validator.c
cvs rdiff -u -r1.22 -r1.23 src/external/mpl/bind/dist/lib/dns/xfrin.c
cvs rdiff -u -r1.27 -r1.28 src/external/mpl/bind/dist/lib/dns/zone.c
cvs rdiff -u -r1.11 -r1.12 \
    src/external/mpl/bind/dist/lib/dns/include/dns/adb.h
cvs rdiff -u -r1.8 -r1.9 \
    src/external/mpl/bind/dist/lib/dns/include/dns/compress.h \
    src/external/mpl/bind/dist/lib/dns/include/dns/ssu.h
cvs rdiff -u -r1.15 -r1.16 \
    src/external/mpl/bind/dist/lib/dns/include/dns/db.h
cvs rdiff -u -r1.9 -r1.10 \
    src/external/mpl/bind/dist/lib/dns/include/dns/diff.h \
    src/external/mpl/bind/dist/lib/dns/include/dns/dispatch.h \
    src/external/mpl/bind/dist/lib/dns/include/dns/sdlz.h \
    src/external/mpl/bind/dist/lib/dns/include/dns/stats.h
cvs rdiff -u -r1.2 -r1.3 \
    src/external/mpl/bind/dist/lib/dns/include/dns/nametree.h
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/dns/include/dns/qp.h
cvs rdiff -u -r1.10 -r1.11 \
    src/external/mpl/bind/dist/lib/dns/include/dns/tsig.h
cvs rdiff -u -r1.16 -r1.17 \
    src/external/mpl/bind/dist/lib/dns/include/dns/zone.h
cvs rdiff -u -r1.12 -r1.13 \
    src/external/mpl/bind/dist/lib/dns/rdata/in_1/a_1.c
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/lib/isc/histo.c
cvs rdiff -u -r1.11 -r1.12 src/external/mpl/bind/dist/lib/isc/ht.c
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/lib/isc/picohttpparser.c
cvs rdiff -u -r1.15 -r1.16 src/external/mpl/bind/dist/lib/isc/result.c
cvs rdiff -u -r1.7 -r1.8 \
    src/external/mpl/bind/dist/lib/isc/include/isc/hmac.h \
    src/external/mpl/bind/dist/lib/isc/include/isc/stdio.h
cvs rdiff -u -r1.14 -r1.15 \
    src/external/mpl/bind/dist/lib/isc/include/isc/result.h
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/lib/isc/include/isc/tls.h
cvs rdiff -u -r1.8 -r1.9 src/external/mpl/bind/dist/lib/isc/netmgr/http.c
cvs rdiff -u -r1.14 -r1.15 src/external/mpl/bind/dist/lib/isc/netmgr/tcp.c
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/lib/isccfg/check.c
cvs rdiff -u -r1.9 -r1.10 \
    src/external/mpl/bind/dist/lib/isccfg/include/isccfg/aclconf.h
cvs rdiff -u -r1.28 -r1.29 src/external/mpl/bind/dist/lib/ns/query.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/tests/dns/dispatch_test.c \
    src/external/mpl/bind/dist/tests/dns/dnstap_test.c \
    src/external/mpl/bind/dist/tests/dns/update_test.c
cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/dist/tests/dns/tsig_test.c
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/tests/isc/time_test.c
cvs rdiff -u -r1.27 -r1.28 src/external/mpl/bind/include/config.h
cvs rdiff -u -r1.8 -r1.9 src/external/mpl/bind/lib/libdns/dns.common.expsym
cvs rdiff -u -r1.20 -r1.21 src/external/mpl/bind/lib/libdns/shlib_version

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.