From nobody Fri May 22 17:53:36 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gMXvP555Dz6fLd0 for ; Fri, 22 May 2026 17:53:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gMXvN5Vpgz4Gxf for ; Fri, 22 May 2026 17:53:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779472416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kJJvnL84xyH6/9zc88nOlbU5IUWcQl1FFpWk+nLkdxo=; b=magEUvKsCQ2yPcNs7DzkB6NduA/KwzFVnJE9p2VRCDmsutxk3wT1lXmSBM07RwbIrth0Gv nNlX2daCWaSOFFZQeEeWK74qC1Ju6+DGegHV0VnGQaThSM1Xr4auZnUgp+k1RFnlvwg+wR NpOWTtPetkGDogQZpXa9RMFfx+d5ISV/cNHZVeeKipa2xrywGuNEvjdJdSRT5d4ZKwqqWy Zy3KaJoRkgcFMyZuTXwP93rDT+/Sd9KyXi2wD6jRFBAz788U+JmOGtNJTB9VBCq91WLNQT ZMEL8/UwdRs25WA0Jk8T6QjVTiuNsltunpt56aFhwNGBsLq68cRlCp6BK+oQ5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779472416; a=rsa-sha256; cv=none; b=thv5niHUT0ihHAjMweGdIXNxiXPmhUiC/y2uDp3cuA6FHpIv+2Jg9CthiZqtyKb2GVmU0F VGBxJN277qyRF0Aufc8UKHvcGkTQLmM3oxFF0zPqN4aKBM6XBtdZVqV5Kr644vW1RchBoz +k6h6PhYLUvakrtedXGvl8XtuXfxFKQx0S/0KDSvZPRXs7cnDGsJQlh8SVPk6ttmg6p5eQ TRyR+qORgoo/0JB2gI5CciE81T26NZUlO8+mdQmsiXy7lCDbOZqgdqYNDF18TX3mq2HCfz KVmTf18+OfBAeo78Ao9s7gMrMZ3/lPbfexdrwD5mDDELYHzmfdoY9uw79SAXcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779472416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kJJvnL84xyH6/9zc88nOlbU5IUWcQl1FFpWk+nLkdxo=; b=BSJCLh5biKvTceBibvrSWjohgdlLJYuJGyCBsdEbGmsS4bPcDPiOzcSdM694c9KYzgJ5ne xpHbKpuJ0KRikjBCU3LA4vsMQR32AUWDndvgs2yJse3qpY5GnOxDZP4gkGqi2Z8LtDYN5b vmL7TMUmHdc3B7HXFgCxZeRJ/wGtVCEYh6gWdqG2TuDdPypjWT20tKSF9CZR3piahonwnT bBUFZsC+9F54dUM4hxWMxP/CplbngZbEx3St82edSj5/8ur6EDQzKVJfe8BUm+W3/4PVM2 JWIy7ApMQwimsaF2mlI00z5JdLoKGjN3NqbTPYjwLQ3nc+G3P37JuUPoISmD7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gMXvN4r49zWq4 for ; Fri, 22 May 2026 17:53:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3997d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 22 May 2026 17:53:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 399f9ca49b6e - main - Revert "import ldns 1.9.0" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 399f9ca49b6ecc7fc9bd8b2a0fd487fea4570a65 Auto-Submitted: auto-generated Date: Fri, 22 May 2026 17:53:36 +0000 Message-Id: <6a109820.3997d.3ee58a68@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=399f9ca49b6ecc7fc9bd8b2a0fd487fea4570a65 commit 399f9ca49b6ecc7fc9bd8b2a0fd487fea4570a65 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-22 17:52:00 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-22 17:53:26 +0000 Revert "import ldns 1.9.0" Pre-push rebase bungled the metadata This reverts commit 597a090ff2ab868242e4ec1cdec7469edbe41c50. --- contrib/ldns/Changelog | 46 --- contrib/ldns/Makefile.in | 58 +-- contrib/ldns/README | 19 +- contrib/ldns/config.guess | 26 +- contrib/ldns/config.sub | 749 ++++++++++----------------------------- contrib/ldns/configure | 94 +---- contrib/ldns/configure.ac | 41 +-- contrib/ldns/dnssec.c | 4 +- contrib/ldns/dnssec_zone.c | 50 +-- contrib/ldns/drill/drill.c | 2 +- contrib/ldns/drill/securetrace.c | 7 +- contrib/ldns/error.c | 2 - contrib/ldns/host2str.c | 60 ---- contrib/ldns/host2wire.c | 2 +- contrib/ldns/keys.c | 2 - contrib/ldns/ldns/config.h.in | 11 +- contrib/ldns/ldns/dnssec_zone.h | 14 +- contrib/ldns/ldns/edns.h | 6 +- contrib/ldns/ldns/error.h | 3 +- contrib/ldns/ldns/host2str.h | 18 - contrib/ldns/ldns/packet.h | 13 - contrib/ldns/ldns/rdata.h | 10 +- contrib/ldns/ldns/rr.h | 20 +- contrib/ldns/ldns/str2host.h | 10 - contrib/ldns/ldns/util.h.in | 22 -- contrib/ldns/net.c | 2 - contrib/ldns/packet.c | 23 +- contrib/ldns/rdata.c | 6 - contrib/ldns/resolver.c | 18 +- contrib/ldns/rr.c | 129 +------ contrib/ldns/sha1.c | 2 +- contrib/ldns/sha2.c | 18 +- contrib/ldns/str2host.c | 68 +--- contrib/ldns/util.c | 5 - contrib/ldns/wire2host.c | 3 - contrib/ldns/zone.c | 2 +- 36 files changed, 300 insertions(+), 1265 deletions(-) diff --git a/contrib/ldns/Changelog b/contrib/ldns/Changelog index 74e2631af72d..c7f36767b360 100644 --- a/contrib/ldns/Changelog +++ b/contrib/ldns/Changelog @@ -1,49 +1,3 @@ -1.9.0 2025-12-04 - * PR #246: Make ldns_calc_keytag() available for CDNSKEY RR - Thanks tgreenx and pnax - * PR #247: Make ldns_key_rr2ds() available for CDNSKEY RR - Thanks tgreenx - * PR #248: Make ldns_rr_compare_{ds,ds_dnskey}() available for - CDS and CDNSKEY RRs. Thanks tgreenx - * PR #245: Make drill trace use IPv6 when used with -6 - Thanks Paul Radford - * Fix #254: Unquoted "value" rdata for CAA records fail to validate. - Follows the long string unquoted syntax from RFC8659, section 4.1.1. - * Fix #266: ldns-read-zone -u fails if a type is the only type in a - window and the type modulo 256 is equal to zero. - * Fix #271: Intermittent build failure with multi-job - builds (make -j). - * Add ldns-verify-zone -s option. It checks all signature results, - instead of passing by when one RRSIG validates. That prints output - for spurious RRSIGs, the failures for them. - * Fix RR types NSAP-PTR, GPOS and RESINFO to print unquoted strings. - * Fix memory leak when trying to read zones that have equal RRs. - the ldns_dnssec_*_add_rr() functions now return LDNS_STATUS_EQUAL_RR - when an already existing RR is tried to be added. This is a API - change, hence this also bumps the version to 1.9.0 - * PR #282: ensure returning pkt with LDNS_STATUS_OK. Thanks grobian. - * PR #286: Fix RR Type AMTRELAY type nogateway, to print relay '.', - and memory leaks in parsing it. - * DSYNC is no longer a draft RR type and compiled by default - * RFC 9824 support: Compact Denial of Existence in DNSSEC - * The HHIT and BRID draft RR types - * PR #249: If RNG is already seeded, return early. - Thanks crrodriguez - * PR #221: Improve error messages. Thanks jschauma - * PR #256: Use SWIG_AppendOutput to support swig 4.3 - Thanks pemensik - * PR #188: Homogenize paths for source files during compilation - Thanks duthils - * Fix #283: ldns-walk fails after update from 1.8.3 to 1.8.4 - Thanks jschauma - * PR #200: Allow compiled tests to link to ldns statically via - environment variable. Thanks FGasper and pemensik - * PR #220: Optionally exclude ZONEMD RRs in ldns-compare-zone - Thanks gjherbiet - * Fix #285: A WALLET RR breaks TXT signing. Thanks bortzmeyer - * Fix #287: ldns-verify-zone hangs with missing NSEC3 RRs. - Thanks Roy Arends - 1.8.4 2024-07-19 * Fix building documentation in build directory. Thanks Michael Tokarev diff --git a/contrib/ldns/Makefile.in b/contrib/ldns/Makefile.in index b5ca1d3c3adf..32b91576d0d9 100644 --- a/contrib/ldns/Makefile.in +++ b/contrib/ldns/Makefile.in @@ -132,11 +132,11 @@ all: setup-builddir lib linktest manpages @P5_DNS_LDNS@ @PYLDNS@ @DRILL@ @EXAMPL .SUFFIXES: .c .o .a .lo .h .i .c.lo: - $(COMP_LIB) $(LIBSSL_CPPFLAGS) -c $(srcdir)/$< -o $@ + $(COMP_LIB) $(LIBSSL_CPPFLAGS) -c $< -o $@ # Need libtool compile .c.o: - $(COMP_LIB) $(LIBSSL_CPPFLAGS) -c $(srcdir)/$< -o $@ + $(COMP_LIB) $(LIBSSL_CPPFLAGS) -c $< -o $@ $(LDNS_LOBJS) $(LIBLOBJS) $(DRILL_LOBJS) $(EXAMPLE_LOBJS): $(COMP_LIB) $(LIBSSL_CPPFLAGS) -c $(srcdir)/$(@:.lo=.c) -o $@ @@ -571,9 +571,9 @@ depend: done; \ done for p in $(EXAMPLE_PROGS) $(LDNS_DPA) $(LDNS_DANE) $(EX_SSL_PROGS); do \ - echo "$$p: $$p.lo \$$(LIB)" >> $(DEPEND_TMP) ; done + echo "$$p: $$p.lo $$p.o \$$(LIB)" >> $(DEPEND_TMP) ; done echo "$(TESTNS): `for o in $(TESTNS_LOBJS) ; do \ - echo -n "$$o " ; done`\$$(LIB)" \ + echo -n "$$o $${o%lo}o " ; done` \$$(LIB)" \ >> $(DEPEND_TMP) cp $(DEPEND_TARGET) $(DEPEND_TMP2) head -`egrep -n "# Dependencies" $(DEPEND_TARGET) | tail -1 | sed -e 's/:.*$$//'` $(DEPEND_TMP2) > $(DEPEND_TARGET) @@ -1114,28 +1114,28 @@ drill/work.lo drill/work.o: $(srcdir)/drill/work.c $(srcdir)/drill/drill.h ldns/ $(srcdir)/ldns/host2wire.h ldns/net.h $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h \ $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h \ $(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h -examples/ldns-chaos: examples/ldns-chaos.lo $(LIB) -examples/ldns-compare-zones: examples/ldns-compare-zones.lo $(LIB) -examples/ldnsd: examples/ldnsd.lo $(LIB) -examples/ldns-gen-zone: examples/ldns-gen-zone.lo $(LIB) -examples/ldns-key2ds: examples/ldns-key2ds.lo $(LIB) -examples/ldns-keyfetcher: examples/ldns-keyfetcher.lo $(LIB) -examples/ldns-keygen: examples/ldns-keygen.lo $(LIB) -examples/ldns-mx: examples/ldns-mx.lo $(LIB) -examples/ldns-notify: examples/ldns-notify.lo $(LIB) -examples/ldns-read-zone: examples/ldns-read-zone.lo $(LIB) -examples/ldns-resolver: examples/ldns-resolver.lo $(LIB) -examples/ldns-rrsig: examples/ldns-rrsig.lo $(LIB) -examples/ldns-test-edns: examples/ldns-test-edns.lo $(LIB) -examples/ldns-update: examples/ldns-update.lo $(LIB) -examples/ldns-version: examples/ldns-version.lo $(LIB) -examples/ldns-walk: examples/ldns-walk.lo $(LIB) -examples/ldns-zcat: examples/ldns-zcat.lo $(LIB) -examples/ldns-zsplit: examples/ldns-zsplit.lo $(LIB) -examples/ldns-dpa: examples/ldns-dpa.lo $(LIB) -examples/ldns-dane: examples/ldns-dane.lo $(LIB) -examples/ldns-nsec3-hash: examples/ldns-nsec3-hash.lo $(LIB) -examples/ldns-revoke: examples/ldns-revoke.lo $(LIB) -examples/ldns-signzone: examples/ldns-signzone.lo $(LIB) -examples/ldns-verify-zone: examples/ldns-verify-zone.lo $(LIB) -examples/ldns-testns: examples/ldns-testns.lo examples/ldns-testpkts.lo $(LIB) +examples/ldns-chaos: examples/ldns-chaos.lo examples/ldns-chaos.o $(LIB) +examples/ldns-compare-zones: examples/ldns-compare-zones.lo examples/ldns-compare-zones.o $(LIB) +examples/ldnsd: examples/ldnsd.lo examples/ldnsd.o $(LIB) +examples/ldns-gen-zone: examples/ldns-gen-zone.lo examples/ldns-gen-zone.o $(LIB) +examples/ldns-key2ds: examples/ldns-key2ds.lo examples/ldns-key2ds.o $(LIB) +examples/ldns-keyfetcher: examples/ldns-keyfetcher.lo examples/ldns-keyfetcher.o $(LIB) +examples/ldns-keygen: examples/ldns-keygen.lo examples/ldns-keygen.o $(LIB) +examples/ldns-mx: examples/ldns-mx.lo examples/ldns-mx.o $(LIB) +examples/ldns-notify: examples/ldns-notify.lo examples/ldns-notify.o $(LIB) +examples/ldns-read-zone: examples/ldns-read-zone.lo examples/ldns-read-zone.o $(LIB) +examples/ldns-resolver: examples/ldns-resolver.lo examples/ldns-resolver.o $(LIB) +examples/ldns-rrsig: examples/ldns-rrsig.lo examples/ldns-rrsig.o $(LIB) +examples/ldns-test-edns: examples/ldns-test-edns.lo examples/ldns-test-edns.o $(LIB) +examples/ldns-update: examples/ldns-update.lo examples/ldns-update.o $(LIB) +examples/ldns-version: examples/ldns-version.lo examples/ldns-version.o $(LIB) +examples/ldns-walk: examples/ldns-walk.lo examples/ldns-walk.o $(LIB) +examples/ldns-zcat: examples/ldns-zcat.lo examples/ldns-zcat.o $(LIB) +examples/ldns-zsplit: examples/ldns-zsplit.lo examples/ldns-zsplit.o $(LIB) +examples/ldns-dpa: examples/ldns-dpa.lo examples/ldns-dpa.o $(LIB) +examples/ldns-dane: examples/ldns-dane.lo examples/ldns-dane.o $(LIB) +examples/ldns-nsec3-hash: examples/ldns-nsec3-hash.lo examples/ldns-nsec3-hash.o $(LIB) +examples/ldns-revoke: examples/ldns-revoke.lo examples/ldns-revoke.o $(LIB) +examples/ldns-signzone: examples/ldns-signzone.lo examples/ldns-signzone.o $(LIB) +examples/ldns-verify-zone: examples/ldns-verify-zone.lo examples/ldns-verify-zone.o $(LIB) +examples/ldns-testns: examples/ldns-testns.lo examples/ldns-testns.o examples/ldns-testpkts.lo examples/ldns-testpkts.o $(LIB) diff --git a/contrib/ldns/README b/contrib/ldns/README index fb588f4da586..e07fdc078aa2 100644 --- a/contrib/ldns/README +++ b/contrib/ldns/README @@ -1,21 +1,3 @@ -DEVELOPMENT VISION - -Note: ldns has been in maintenance mode since 2020, with no plans for major -features. We welcome PRs from contributors who want to add new functionality. -We also actively fix bugs, so users can continue to rely on ldns if its -current features meet their needs. - -We will continue to make occasional use of ldns in an experimental -setting, such as during an IETF Hackathon to build a proof of concept for an -Internet Draft. - -The natural successor to the ldns library is the domain library for Rust: -https://github.com/NLnetLabs/domain - -We offer drop-in replacements for commonly used ldns example tools in dnst: -https://github.com/NLnetLabs/dnst - ---- Contents: REQUIREMENTS @@ -28,6 +10,7 @@ Contents: Solaris KNOWN ISSUES pyldns + Your Support Project page: http://www.nlnetlabs.nl/ldns/ diff --git a/contrib/ldns/config.guess b/contrib/ldns/config.guess index a9d01fde4617..f6d217a49f8f 100755 --- a/contrib/ldns/config.guess +++ b/contrib/ldns/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2025 Free Software Foundation, Inc. +# Copyright 1992-2024 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2025-07-10' +timestamp='2024-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -60,7 +60,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2025 Free Software Foundation, Inc. +Copyright 1992-2024 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,7 +123,7 @@ set_cc_for_build() { dummy=$tmp/dummy case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in ,,) echo "int x;" > "$dummy.c" - for driver in cc gcc c17 c99 c89 ; do + for driver in cc gcc c89 c99 ; do if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then CC_FOR_BUILD=$driver break @@ -634,8 +634,7 @@ EOF sed 's/^ //' << EOF > "$dummy.c" #include - int - main () + main() { if (!__power_pc()) exit(1); @@ -719,8 +718,7 @@ EOF #include #include - int - main () + int main () { #if defined(_SC_KERNEL_BITS) long bits = sysconf(_SC_KERNEL_BITS); @@ -1597,11 +1595,8 @@ EOF *:Unleashed:*:*) GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE ;; - x86_64:[Ii]ronclad:*:*|i?86:[Ii]ronclad:*:*) - GUESS=$UNAME_MACHINE-pc-ironclad-mlibc - ;; - *:[Ii]ronclad:*:*) - GUESS=$UNAME_MACHINE-unknown-ironclad-mlibc + *:Ironclad:*:*) + GUESS=$UNAME_MACHINE-unknown-ironclad ;; esac @@ -1626,7 +1621,6 @@ cat > "$dummy.c" <." version="\ GNU config.sub ($timestamp) -Copyright 1992-2025 Free Software Foundation, Inc. +Copyright 1992-2024 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -120,6 +120,7 @@ case $# in esac # Split fields of configuration type +# shellcheck disable=SC2162 saved_IFS=$IFS IFS="-" read field1 field2 field3 field4 <