Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/nsd/dist Import nsd-4.6.0; last import was nsd-...



details:   https://anonhg.NetBSD.org/src/rev/10d1511ce0df
branches:  trunk
changeset: 370688:10d1511ce0df
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Sep 24 17:35:00 2022 +0000

description:
Import nsd-4.6.0; last import was nsd-4.3.5

23 June 2022: Wouter
        - Tag for 4.6.0rc1. It became 4.6.0 on 30 June 2022, and it continues
          with version 4.6.1.

17 June 2022: Wouter
        - Fix compilation with libev, without event_base_loopbreak.

16 June 2022: Wouter
        - Fix that the unit test verify_repat cleans up nsd on exit.
        - Fix to remove ixfrcreate.c asserts about uint16 within limits
          because of warnings from analyzers.

14 June 2022: Wouter
        - Fix compilation without libevent and compilation of nsd-mem.
        - Fix verify handler add of sigchld event for compilation without
          libevent.

3 June 2022: Wouter
        - Fix static analyzer reports on ixfrcreate temp file.
        - Fixup wrong ixfrcreate fread return check.

13 May 2022: Wouter
        - The code repo continues with version 4.5.1.

6 May 2022: Wouter
        - Merge PR #209: IXFR out
          This adds IXFR out functionality to NSD. NSD can copy IXFRs from
          upstream to downstream clients, or create IXFRs from zonefiles.
          The options store-ixfr: yes and create-ixfr: yes can be used to
          turn this on. Default is turned off. The options ixfr-number and
          ixfr-size can be used to tune the number of IXFR transfers and
          total data size stored. This is configured per zone, the IXFRs
          are served to the hosts that are allowed to perform zone transfers.
          And if TSIG is configured, signed with the same key. The content
          is stored to file if a zonefile is configured for the zone, in
          the zonefile.ixfr and zonefile.ixfr.2, .. files. They contain
          readable text format. The number of IXFRs is num.rixfr in
          statistics output, also per zone if per zone statistics are enabled.
          If offline, nsd-checkzone -i can create ixfr files.
          NSD already supports requesting IXFRs, this addition allows NSD
          to serve IXFR transfers to clients.
          NSD stops responding with NOTIMPL to IXFR requests, also for zones
          that do not have IXFR enabled. The clients gets a full zone reply
          or a status reply if the serial is up to date.
        - set version to 4.5.0 for feature change.
        - Tag for 4.5.0rc1 release. It became the 4.5.0 release on 13 May 2022.

14 April 2022: Wouter
        - Update cirrus script FreeBSD version.

25 March 2022: Wouter
        - Fix spelling error in comment in svcbparam_lookup_key.

2 March 2022: Wouter
        - Fix code analyzer zero divide warning.
        - Fix code analyzer large value with assertion.
        - Fix another code analyzer zero divide warning.
        - Fix code analyzer warning about uninitialized temp storage in loop.

10 February 2022: Wouter
        - Tag for 4.4.0rc1 release. This became 4.4.0 release on 17 Feb 2022,
          the code repository continues with version 4.4.1.

9 February 2022: Wouter
        - Fix unit tests for nds-control-setup exit code and the
          xfrd-tcp-max default.

7 February 2022: Wouter
        - Merge #207 Sync nsd-control-setup with unbound-control-setup to
          generate certificates with SANs.

28 January 2022: Wouter
        - Fix #206: build with --without-ssl fails.

27 January 2022: Wouter
        - current code branch continues as version 4.4.0, because of added
          feature.

26 January 2022: Wouter
        - Merge #193: Lower memory usage of the XFRD process by default.
          Instead of preallocating all elements, they are allocated when used.
          There are options for managing the memory usage, defaults are the
          same as before. xfrd-tcp-max sets the number of sockets for tcp
          connections that xfrd can make to download zone contents. And
          xfrd-tcp-pipeline the number of simultaneous transfers over the
          same connection.

12 January 2022: Wouter
        - Fix to document nsd-checkzone -p in the man page for nsd-checkzone.

7 January 2022: Wouter
        - Fix to change file mode before changing file owner for the
          nsd-control unix socket file.

3 January 2022: Wouter
        - Merge #204 from jonathangray: correct some spelling mistakes.

15 December 2021: Wouter
        - Fix #200: nsd-checkzone succeeds even with incorrect serial in SOA
          record.

2 December 2021: Wouter
        - Fix socket_partitioning unit test for FreeBSD.
        - Fix SVCB test to work around older dig with drill.
        - Fix unit test to not syslog setlogin failures.

1 December 2021: Wouter
        - Set up for branch for 4.3.9 release.
          This became release 4.3.9 on 9 Dec 2021 and included the changes
          until the SVCB fix on 2 dec 2021, but not the setlogin fix.
          The main branch continues as 4.3.10.
        - Fix unit tests for new answer-cookie default.

30 November 2021: Wouter
        - Fix to remove git tracking and ci information from release tarballs.

3 November 2021: Wouter
        - Fix #198: nsd-control reconfig core dump.

12 October 2021: Wouter
        - Tag for 4.3.8 release, from 4.3.8rc2. The main branch continues
          with version 4.3.9 in development.

7 October 2021: Wouter
        - Set default for answer-cookie to no. Because in server deployments
          with mixed server software, a default of yes causes issues.
        - Tag for 4.3.8rc2, includes the new answer-cookie default.

4 October 2021: Wouter
        - Tag for 4.3.8rc1.

29 September 2021: Wouter
        - Fix unit tests for svcb and xot to not touch the default
          zonelistfile.
        - Fix unit test for xot tertiary config for zonelistfile default.
        - Fix unit test for dns-cookies for no unshare, and allow-query
          for no IPv6 loopback.
        - Fix unit test allow query to check for IPv6.

22 September 2021: Wouter
        - Fix #194: Incorrect NSEC3 response for SOA query below delegation
          point.

13 September 2021: Wouter
        - Fix compile failure with openssl 1.0.2.

3 September 2021: Wouter
        - Fix not reachable annotation in radix_find_prefix_node.

31 August 2021: Willem
        - Fix #191: dname_parse_wire() returns fqdn wireformat length.

26 August 2021: Wouter
        - Fix #190: NSD returns 3 NSEC3 records for NODATA response.

23 August 2021: Wouter
        - Fix #189: nsd 4.3.7 crash answer_delegation: Assertion
          `query->delegation_rrset' failed.

17 August 2021: Wouter
        - Fix #188: NSD fails to build against openssl 1.1 on CentOS 7.
        - Fix sed script in ssldir split handling.

13 August 2021: Wouter
        - Merge #187: Support using system-wide crypto policies.

10 August 2021: Wouter
        - Merge #185 by cesarkuroiwa: Mutual TLS.
        - Fixes for #185: Document client-cert, client-key and client-key-pw
          in the man page. Fix yacc semicolon. Fix unused variable warning.
          Use strlcpy instead of strncpy. Fix spelling error in error
          printout.

2 August 2021: Wouter
        - Quieter tpkg/do-tests shell script with -q flag.
        - For #184: Note that all zones can be targeted by some nsd-control
          commands in the man page.

30 July 2021: Wouter
        - Move acx_nlnetlabs.m4 to version 41, with lib64 openssl dir check.
        - Fix to compile with OpenSSL 3.0.0beta2.
        - Fix configure detection of SSL_CTX_set_security_level.
        - Fix deprecated functions use from openssl 3.0.0beta2.

23 July 2021: Wouter
        - Fix free on shutdown of XoT SSL context.

22 July 2021: Wouter
        - tag 4.3.7 release, with the fixes between rc1 and this release.
        - main branch continues for 4.3.8.

20 July 2021: Wouter
        - Fix typo in xfrd-tcp.c.

15 July 2021: Wouter
        - tag for 4.3.7rc1.
        - Fix compile of cookies on FreeBSD without IPv6.
        - Fix for loop initial declaration for nonc99 compiler.

14 July 2021: Wouter
        - Fix truncate test for EDNS COOKIE making one less RR is added.
        - Attempt to fix gcc11 warning.

13 July 2021: Willem
        - Fixes for child server processes getting out of sync with the
          dnstap-collector process

13 July 2021: Willem
        - Interoperable DNS Cookies support as per RFC7873 and RFC9018

9 July 2021: Willem
        - Client side DNS Zone Transfer-over-TLS (XoT) support as per
          draft-ietf-dprive-xfr-over-tls

29 June 2021: Willem
        - Fix #168: Buffer overflow in the dname_to_string() function

14 June 2021: Wouter
        - Update configure nonblocking test to use host.

25 May 2021: Wouter
        - Fix #179: log notice and server-count.

21 May 2021: Wouter
        - Test code has -q option for quiet output.

17 May 2021: Wouter
        - Update the ACX_CHECK_NONBLOCKING_BROKEN test for the configure
          script.

7 May 2021: Wouter
        - Fix #176: please review Loglevel on missing zonefile.

6 May 2021: Wouter
        - Fix #174: NS Records below delegation are not ignored (nsd-checkzone
          also does not raise any issue).

4 May 2021: Wouter
        - Fix SVCB sort call sizeof to be the size of the elements sorted.

29 April 2021: Tom
        - Implement Syntax of SVCB and HTTPS RR type as per draft-ietf-dnsop-svcb-https

13 April 2021: Wouter
        - Fix for #128: Skip over sendmmsg invalid argument when port is zero.
        - Fix #171: Invalid negative response (NSEC3) after IXFR.
        - Fix to make nsec3_chain_find_prev return NULL if one nsec3 left.
        - remove debug settings from unit test.

9 April 2021: Wouter
        - Fix for #170: Fix build warnings when IPv6 is disabled.
        - Fix #170: Disabled IPv6 and DNSTAP enabled triggers a build error.

30 March 2021: Wouter
        - Fix configure failure for enable systemd because of autoconf.
        - This became release 4.3.6, the repository continues for 4.3.7
          in development.

29 March 2021: Wouter
        - Note unlisted changes in RELNOTES and prepare for 4.3.6rc1 tag.

29 March 2021: Willem
        - Per zone Access Control List for queries
          with an allow-query: option.

24 March 2021: Wouter
        - Update acx_nlnetlabs.m4 to version 38, fix deprecation test.
        - Fix configure to use header checks with compile.
        - Fix warning about unused function log_addr.

18 March 2021: Tom
        - Add Extended DNS Errors RFC8914

15 March 2021: Wouter
        - Fix double config.h include in configlexer.c
        - Fix to remove configyyrename from makedist.sh and also
          update the flex and bison rules there to add the "c_" prefix.

13 March 2021: Willem
        - Fix #154: TXT with parentheses fails in 4.3.5.
        - Align parsing of TXT elements with how bind does it.
        - A -p option to nsd-checkzone to print a successfully read zone.

12 March 2021: Wouter
        - Fix that wildcard is printed as a star instead of escaped, in
          logs and in written zone files.
        - Fix unit test for wildcard printout change.

11 March 2021: Wouter
        - Fix #163: A TSIG noncompliance with RFC 2845.

9 March 2021: Willem
        - Enable configuring a control-interface by interface name.

19 February 2021: Wouter
        - Fix segfault on high verbosity for TLS channels with dnstap log
          local address.

18 February 2021: Wouter
        - Fix #146 with #147: DNSTAP log the local address of the server
          with the dnstap logs.

16 February 2021: Wouter
        - Man page documentation for dnstap options.

8 February 2021: Wouter
        - Fix AF_LOCAL compile error for Solaris.
        - Fix ifaddrs compile error for Solaris.
        - Fix ifaddrs.h compile error for Solaris.

4 February 2021: Wouter
        - Merge PR #153 from fobser: Repair -fno-common linker errors
          automatically.
        - Fix uninitialized access of log_buf in error printout on apply ixfr.

26 January 2021: Wouter
        - Prevent a few more yacc clashes.

diffstat:

 external/bsd/nsd/dist/Makefile.in               |    60 +-
 external/bsd/nsd/dist/README.md                 |    19 +-
 external/bsd/nsd/dist/aclocal.m4                |   358 +++
 external/bsd/nsd/dist/acx_nlnetlabs.m4          |    69 +-
 external/bsd/nsd/dist/axfr.c                    |   104 +-
 external/bsd/nsd/dist/axfr.h                    |     2 +-
 external/bsd/nsd/dist/compat/explicit_bzero.c   |    23 +
 external/bsd/nsd/dist/config.h.in               |    43 +
 external/bsd/nsd/dist/configlexer.lex           |    56 +-
 external/bsd/nsd/dist/configparser.y            |   246 ++-
 external/bsd/nsd/dist/configure                 |   576 ++++-
 external/bsd/nsd/dist/contrib/nsd_munin_        |     3 +-
 external/bsd/nsd/dist/dbaccess.c                |    89 +-
 external/bsd/nsd/dist/dbcreate.c                |     7 +-
 external/bsd/nsd/dist/difffile.c                |   238 +-
 external/bsd/nsd/dist/difffile.h                |    34 +-
 external/bsd/nsd/dist/dname.c                   |     5 +-
 external/bsd/nsd/dist/dns.c                     |   102 +-
 external/bsd/nsd/dist/dns.h                     |    15 +-
 external/bsd/nsd/dist/dnstap/dnstap.c           |    92 +-
 external/bsd/nsd/dist/dnstap/dnstap.h           |     6 +
 external/bsd/nsd/dist/dnstap/dnstap_collector.c |   268 +-
 external/bsd/nsd/dist/dnstap/dnstap_collector.h |     4 +
 external/bsd/nsd/dist/doc/ChangeLog             |   321 ++-
 external/bsd/nsd/dist/doc/README                |   107 +-
 external/bsd/nsd/dist/doc/RELNOTES              |   158 +
 external/bsd/nsd/dist/doc/REQUIREMENTS          |     8 +-
 external/bsd/nsd/dist/edns.c                    |   191 +-
 external/bsd/nsd/dist/edns.h                    |    54 +-
 external/bsd/nsd/dist/ipc.c                     |    22 +-
 external/bsd/nsd/dist/iterated_hash.c           |    35 +
 external/bsd/nsd/dist/ixfr.c                    |  2662 +++++++++++++++++++++++
 external/bsd/nsd/dist/ixfr.h                    |   268 ++
 external/bsd/nsd/dist/ixfrcreate.c              |  1146 +++++++++
 external/bsd/nsd/dist/ixfrcreate.h              |    86 +
 external/bsd/nsd/dist/lookup3.c                 |     2 +-
 external/bsd/nsd/dist/mini_event.c              |     5 +
 external/bsd/nsd/dist/mini_event.h              |     2 +
 external/bsd/nsd/dist/namedb.c                  |    14 +-
 external/bsd/nsd/dist/namedb.h                  |    15 +-
 external/bsd/nsd/dist/nsd-checkconf.8.in        |     8 +-
 external/bsd/nsd/dist/nsd-checkconf.c           |   169 +-
 external/bsd/nsd/dist/nsd-checkzone.8.in        |    35 +-
 external/bsd/nsd/dist/nsd-checkzone.c           |    65 +-
 external/bsd/nsd/dist/nsd-control-setup.sh.in   |    22 +-
 external/bsd/nsd/dist/nsd-control.8.in          |    62 +-
 external/bsd/nsd/dist/nsd-control.c             |    31 +-
 external/bsd/nsd/dist/nsd.8.in                  |     4 +-
 external/bsd/nsd/dist/nsd.c                     |   324 +-
 external/bsd/nsd/dist/nsd.conf.5.in             |   186 +-
 external/bsd/nsd/dist/nsd.conf.sample.in        |   103 +-
 external/bsd/nsd/dist/nsd.h                     |    47 +-
 external/bsd/nsd/dist/nsec3.c                   |    31 +-
 external/bsd/nsd/dist/options.h                 |    78 +
 external/bsd/nsd/dist/popen3.c                  |    52 +-
 external/bsd/nsd/dist/popen3.h                  |     6 +-
 external/bsd/nsd/dist/query.c                   |   166 +-
 external/bsd/nsd/dist/query.h                   |    26 +-
 external/bsd/nsd/dist/radtree.c                 |     2 +-
 external/bsd/nsd/dist/rdata.c                   |   232 +-
 external/bsd/nsd/dist/rdata.h                   |     1 +
 external/bsd/nsd/dist/remote.c                  |   177 +-
 external/bsd/nsd/dist/rrl.h                     |     2 +-
 external/bsd/nsd/dist/siphash.c                 |   170 +
 external/bsd/nsd/dist/tsig-openssl.c            |     4 +-
 external/bsd/nsd/dist/udb.c                     |     7 +-
 external/bsd/nsd/dist/udb.h                     |     2 +-
 external/bsd/nsd/dist/util.c                    |    59 +-
 external/bsd/nsd/dist/verify.c                  |   610 +++++
 external/bsd/nsd/dist/verify.h                  |    80 +
 external/bsd/nsd/dist/xfrd-tcp.c                |   794 +++++-
 external/bsd/nsd/dist/xfrd-tcp.h                |    93 +-
 external/bsd/nsd/dist/xfrd.c                    |   553 +++-
 external/bsd/nsd/dist/xfrd.h                    |    44 +-
 external/bsd/nsd/dist/zlexer.lex                |    36 +-
 external/bsd/nsd/dist/zonec.c                   |   631 +++++
 external/bsd/nsd/dist/zonec.h                   |     5 +
 external/bsd/nsd/dist/zparser.y                 |   184 +-
 78 files changed, 11547 insertions(+), 1069 deletions(-)

diffs (truncated from 17383 to 300 lines):

diff -r f68c375fe4fc -r 10d1511ce0df external/bsd/nsd/dist/Makefile.in
--- a/external/bsd/nsd/dist/Makefile.in Sat Sep 24 16:29:27 2022 +0000
+++ b/external/bsd/nsd/dist/Makefile.in Sat Sep 24 17:35:00 2022 +0000
@@ -73,20 +73,21 @@
                        -e 's,@nsdconfigfile\@,$(nsdconfigfile),g' \
                        -e 's,@shell\@,$(SHELL),g' \
                        -e 's,@ratelimit_default\@,@ratelimit_default@,g' \
+                       -e 's,@dnstap_socket_path\@,@opt_dnstap_socket_path@,g' \
                        -e 's,@user\@,$(user),g'
 
 TARGETS=nsd nsd-checkconf nsd-checkzone nsd-control nsd.conf.sample nsd-control-setup.sh
 MANUALS=nsd.8 nsd-checkconf.8 nsd-checkzone.8 nsd-control.8 nsd.conf.5
 
-COMMON_OBJ=answer.o axfr.o buffer.o configlexer.o configparser.o dname.o dns.o edns.o iterated_hash.o lookup3.o namedb.o nsec3.o options.o packet.o query.o rbtree.o radtree.o rdata.o 
region-allocator.o rrl.o tsig.o tsig-openssl.o udb.o udbradtree.o udbzone.o util.o bitset.o popen3.o
+COMMON_OBJ=answer.o axfr.o ixfr.o ixfrcreate.o buffer.o configlexer.o configparser.o dname.o dns.o edns.o iterated_hash.o lookup3.o namedb.o nsec3.o options.o packet.o query.o rbtree.o radtree.o 
rdata.o region-allocator.o rrl.o siphash.o tsig.o tsig-openssl.o udb.o udbradtree.o udbzone.o util.o bitset.o popen3.o
 XFRD_OBJ=xfrd-disk.o xfrd-notify.o xfrd-tcp.o xfrd.o remote.o $(DNSTAP_OBJ)
-NSD_OBJ=$(COMMON_OBJ) $(XFRD_OBJ) difffile.o ipc.o mini_event.o netio.o nsd.o server.o dbaccess.o dbcreate.o zlexer.o zonec.o zparser.o
+NSD_OBJ=$(COMMON_OBJ) $(XFRD_OBJ) difffile.o ipc.o mini_event.o netio.o nsd.o server.o dbaccess.o dbcreate.o zlexer.o zonec.o zparser.o verify.o
 ALL_OBJ=$(NSD_OBJ) nsd-checkconf.o nsd-checkzone.o nsd-control.o nsd-mem.o xfr-inspect.o
 NSD_CHECKCONF_OBJ=$(COMMON_OBJ) nsd-checkconf.o
-NSD_CHECKZONE_OBJ=$(COMMON_OBJ) $(XFRD_OBJ) dbaccess.o dbcreate.o difffile.o ipc.o mini_event.o netio.o server.o zonec.o zparser.o zlexer.o nsd-checkzone.o
+NSD_CHECKZONE_OBJ=$(COMMON_OBJ) $(XFRD_OBJ) dbaccess.o dbcreate.o difffile.o ipc.o mini_event.o netio.o server.o zonec.o zparser.o zlexer.o nsd-checkzone.o verify.o
 NSD_CONTROL_OBJ=$(COMMON_OBJ) nsd-control.o
-CUTEST_OBJ=$(COMMON_OBJ) $(XFRD_OBJ) dbaccess.o dbcreate.o difffile.o ipc.o mini_event.o netio.o server.o zonec.o zparser.o zlexer.o cutest_dname.o cutest_dns.o cutest_iterated_hash.o cutest_run.o 
cutest_radtree.o cutest_rbtree.o cutest_namedb.o cutest_options.o cutest_region.o cutest_rrl.o cutest_udb.o cutest_udbrad.o cutest_util.o cutest_bitset.o cutest_popen3.o cutest_iter.o cutest_event.o 
cutest.o qtest.o
-NSD_MEM_OBJ=$(COMMON_OBJ) $(XFRD_OBJ) dbaccess.o dbcreate.o difffile.o ipc.o mini_event.o netio.o server.o zonec.o zparser.o zlexer.o nsd-mem.o
+CUTEST_OBJ=$(COMMON_OBJ) $(XFRD_OBJ) dbaccess.o dbcreate.o difffile.o ipc.o mini_event.o netio.o server.o verify.o zonec.o zparser.o zlexer.o cutest_dname.o cutest_dns.o cutest_iterated_hash.o 
cutest_run.o cutest_radtree.o cutest_rbtree.o cutest_namedb.o cutest_options.o cutest_region.o cutest_rrl.o cutest_udb.o cutest_udbrad.o cutest_util.o cutest_bitset.o cutest_popen3.o cutest_iter.o 
cutest_event.o cutest.o qtest.o
+NSD_MEM_OBJ=$(COMMON_OBJ) $(XFRD_OBJ) dbaccess.o dbcreate.o difffile.o ipc.o mini_event.o netio.o verify.o server.o zonec.o zparser.o zlexer.o nsd-mem.o
 all:   $(TARGETS) $(MANUALS)
 
 $(ALL_OBJ):
@@ -171,11 +172,11 @@
 cutest:        $(CUTEST_OBJ) $(LIBOBJS) popen3_echo
        $(LINK) -o $@ $(CUTEST_OBJ) $(LIBOBJS) $(SSL_LIBS) $(LIBS)
 
-udb-inspect:   udb-inspect.o $(COMMON_OBJ) $(LIBOBJS)
-       $(LINK) -o $@ udb-inspect.o $(COMMON_OBJ) $(LIBOBJS) $(LIBS)
+udb-inspect:   udb-inspect.o $(COMMON_OBJ) zonec.o zparser.o zlexer.o $(LIBOBJS)
+       $(LINK) -o $@ udb-inspect.o $(COMMON_OBJ) zonec.o zparser.o zlexer.o $(LIBOBJS) $(LIBS)
 
-xfr-inspect:   xfr-inspect.o $(COMMON_OBJ) $(LIBOBJS)
-       $(LINK) -o $@ xfr-inspect.o $(COMMON_OBJ) $(LIBOBJS) $(LIBS)
+xfr-inspect:   xfr-inspect.o $(COMMON_OBJ) zonec.o zparser.o zlexer.o $(LIBOBJS)
+       $(LINK) -o $@ xfr-inspect.o $(COMMON_OBJ) zonec.o zparser.o zlexer.o $(LIBOBJS) $(LIBS)
 
 popen3_echo: popen3.o popen3_echo.o
        $(LINK) -o $@ popen3.o popen3_echo.o
@@ -267,6 +268,9 @@
 cpuset.o:      $(srcdir)/compat/cpuset.c
        $(COMPILE) -c $(srcdir)/compat/cpuset.c
 
+explicit_bzero.o:      $(srcdir)/compat/explicit_bzero.c
+       $(COMPILE) -c $(srcdir)/compat/explicit_bzero.c
+
 cutest_dname.o:        $(srcdir)/tpkg/cutest/cutest_dname.c
        $(COMPILE) -c $(srcdir)/tpkg/cutest/cutest_dname.c
 
@@ -342,13 +346,13 @@
 
 configlexer.c: $(srcdir)/configlexer.lex
        if test "$(LEX)" != ":"; then rm -f $@ ;\
-               echo '#include "configyyrename.h"' > $@ ;\
-               $(LEX) -i -t $(srcdir)/configlexer.lex >> $@ ;\
+               echo '#include "config.h"' > $@ ;\
+               $(LEX) -P c_ -i -t $(srcdir)/configlexer.lex >> $@ ;\
        fi
        @if test ! -f $@; then echo "No $@ : need flex and bison to compile from source repository"; exit 1; fi
 
 configparser.c configparser.h: $(srcdir)/configparser.y
-       $(YACC) -d -o configparser.c $(srcdir)/configparser.y
+       $(YACC) -d -p c_ -o configparser.c $(srcdir)/configparser.y
 
 # dnstap
 dnstap.o:      $(srcdir)/dnstap/dnstap.c config.h dnstap/dnstap_config.h \
@@ -411,25 +415,27 @@
 answer.o: $(srcdir)/answer.c config.h $(srcdir)/answer.h $(srcdir)/dns.h $(srcdir)/namedb.h $(srcdir)/dname.h $(srcdir)/buffer.h \
  $(srcdir)/region-allocator.h $(srcdir)/util.h $(srcdir)/radtree.h $(srcdir)/rbtree.h $(srcdir)/packet.h $(srcdir)/query.h $(srcdir)/nsd.h \
  $(srcdir)/edns.h $(srcdir)/tsig.h
+ixfr.o: $(srcdir)/ixfr.c config.h $(srcdir)/ixfr.h $(srcdir)/query.h $(srcdir)/packet.h $(srcdir)/rdata.h $(srcdir)/axfr.h $(srcdir)/options.h $(srcdir)/rbtree.h $(srcdir)/zonec.h $(srcdir)/namedb.h 
$(srcdir)/nsd.h $(srcdir)/tsig.h $(srcdir)/dns.h $(srcdir)/region-allocator.h $(srcdir)/dname.h $(srcdir)/radtree.h $(srcdir)/edns.h $(srcdir)/bitset.h $(srcdir)/buffer.h $(srcdir)/util.h
+ixfrcreate.o: $(srcdir)/ixfrcreate.c config.h $(srcdir)/ixfrcreate.h $(srcdir)/namedb.h $(srcdir)/ixfr.h $(srcdir)/options.h $(srcdir)/dname.h $(srcdir)/dns.h $(srcdir)/radtree.h $(srcdir)/rbtree.h 
$(srcdir)/region-allocator.h $(srcdir)/buffer.h $(srcdir)/util.h
 axfr.o: $(srcdir)/axfr.c config.h $(srcdir)/axfr.h $(srcdir)/nsd.h $(srcdir)/dns.h $(srcdir)/edns.h $(srcdir)/buffer.h \
  $(srcdir)/region-allocator.h $(srcdir)/util.h $(srcdir)/query.h $(srcdir)/namedb.h $(srcdir)/dname.h $(srcdir)/radtree.h $(srcdir)/rbtree.h \
- $(srcdir)/packet.h $(srcdir)/tsig.h $(srcdir)/options.h
+ $(srcdir)/packet.h $(srcdir)/tsig.h $(srcdir)/options.h $(srcdir)/ixfr.h
 buffer.o: $(srcdir)/buffer.c config.h $(srcdir)/buffer.h $(srcdir)/region-allocator.h $(srcdir)/util.h
-configlexer.o: configlexer.c $(srcdir)/configyyrename.h config.h $(srcdir)/options.h \
+configlexer.o: configlexer.c config.h $(srcdir)/options.h \
  $(srcdir)/region-allocator.h $(srcdir)/rbtree.h configparser.h
 configparser.o: configparser.c config.h $(srcdir)/options.h $(srcdir)/region-allocator.h \
  $(srcdir)/rbtree.h $(srcdir)/util.h $(srcdir)/dname.h $(srcdir)/buffer.h $(srcdir)/tsig.h $(srcdir)/rrl.h $(srcdir)/query.h $(srcdir)/namedb.h $(srcdir)/dns.h \
- $(srcdir)/radtree.h $(srcdir)/nsd.h $(srcdir)/edns.h $(srcdir)/packet.h $(srcdir)/configyyrename.h
+ $(srcdir)/radtree.h $(srcdir)/nsd.h $(srcdir)/edns.h $(srcdir)/packet.h
 dbaccess.o: $(srcdir)/dbaccess.c config.h $(srcdir)/dns.h $(srcdir)/namedb.h $(srcdir)/dname.h $(srcdir)/buffer.h \
  $(srcdir)/region-allocator.h $(srcdir)/util.h $(srcdir)/radtree.h $(srcdir)/rbtree.h $(srcdir)/options.h $(srcdir)/rdata.h $(srcdir)/udb.h \
- $(srcdir)/udbradtree.h $(srcdir)/udbzone.h $(srcdir)/zonec.h $(srcdir)/nsec3.h $(srcdir)/difffile.h $(srcdir)/nsd.h $(srcdir)/edns.h
+ $(srcdir)/udbradtree.h $(srcdir)/udbzone.h $(srcdir)/zonec.h $(srcdir)/nsec3.h $(srcdir)/difffile.h $(srcdir)/nsd.h $(srcdir)/edns.h $(srcdir)/ixfr.h $(srcdir)/ixfrcreate.h
 dbcreate.o: $(srcdir)/dbcreate.c config.h $(srcdir)/namedb.h $(srcdir)/dname.h $(srcdir)/buffer.h \
  $(srcdir)/region-allocator.h $(srcdir)/util.h $(srcdir)/dns.h $(srcdir)/radtree.h $(srcdir)/rbtree.h $(srcdir)/udb.h $(srcdir)/udbradtree.h \
- $(srcdir)/udbzone.h $(srcdir)/options.h $(srcdir)/nsd.h $(srcdir)/edns.h
+ $(srcdir)/udbzone.h $(srcdir)/options.h $(srcdir)/nsd.h $(srcdir)/edns.h $(srcdir)/ixfr.h
 difffile.o: $(srcdir)/difffile.c config.h $(srcdir)/difffile.h $(srcdir)/rbtree.h $(srcdir)/region-allocator.h \
  $(srcdir)/namedb.h $(srcdir)/dname.h $(srcdir)/buffer.h $(srcdir)/util.h $(srcdir)/dns.h $(srcdir)/radtree.h $(srcdir)/options.h $(srcdir)/udb.h \
  $(srcdir)/xfrd-disk.h $(srcdir)/packet.h $(srcdir)/rdata.h $(srcdir)/udbzone.h $(srcdir)/udbradtree.h $(srcdir)/nsec3.h $(srcdir)/nsd.h $(srcdir)/edns.h \
- $(srcdir)/rrl.h $(srcdir)/query.h $(srcdir)/tsig.h
+ $(srcdir)/rrl.h $(srcdir)/query.h $(srcdir)/tsig.h $(srcdir)/ixfr.h $(srcdir)/zonec.h
 dname.o: $(srcdir)/dname.c config.h $(srcdir)/dns.h $(srcdir)/dname.h $(srcdir)/buffer.h $(srcdir)/region-allocator.h \
  $(srcdir)/util.h $(srcdir)/query.h $(srcdir)/namedb.h $(srcdir)/radtree.h $(srcdir)/rbtree.h $(srcdir)/nsd.h $(srcdir)/edns.h $(srcdir)/packet.h $(srcdir)/tsig.h
 dns.o: $(srcdir)/dns.c config.h $(srcdir)/dns.h $(srcdir)/zonec.h $(srcdir)/namedb.h $(srcdir)/dname.h $(srcdir)/buffer.h \
@@ -453,10 +459,10 @@
  $(srcdir)/region-allocator.h $(srcdir)/util.h $(srcdir)/dname.h $(srcdir)/options.h $(srcdir)/rbtree.h $(srcdir)/rrl.h $(srcdir)/query.h \
  $(srcdir)/namedb.h $(srcdir)/dns.h $(srcdir)/radtree.h $(srcdir)/nsd.h $(srcdir)/edns.h $(srcdir)/packet.h
 nsd-checkzone.o: $(srcdir)/nsd-checkzone.c config.h $(srcdir)/nsd.h $(srcdir)/dns.h $(srcdir)/edns.h $(srcdir)/buffer.h \
- $(srcdir)/region-allocator.h $(srcdir)/util.h $(srcdir)/options.h $(srcdir)/rbtree.h $(srcdir)/zonec.h $(srcdir)/namedb.h $(srcdir)/dname.h \
- $(srcdir)/radtree.h
+ $(srcdir)/region-allocator.h $(srcdir)/util.h $(srcdir)/bitset.h $(srcdir)/options.h $(srcdir)/rbtree.h $(srcdir)/zonec.h $(srcdir)/namedb.h $(srcdir)/dname.h \
+ $(srcdir)/radtree.h $(srcdir)/ixfr.h $(srcdir)/query.h $(srcdir)/packet.h $(srcdir)/ixfrcreate.h $(srcdir)/difffile.h $(srcdir)/udb.h
 nsd-control.o: $(srcdir)/nsd-control.c config.h $(srcdir)/util.h $(srcdir)/tsig.h $(srcdir)/buffer.h \
- $(srcdir)/region-allocator.h $(srcdir)/dname.h $(srcdir)/options.h $(srcdir)/rbtree.h
+ $(srcdir)/region-allocator.h $(srcdir)/dname.h $(srcdir)/options.h $(srcdir)/rbtree.h $(srcdir)/zonec.h
 nsd-mem.o: $(srcdir)/nsd-mem.c config.h $(srcdir)/nsd.h $(srcdir)/dns.h $(srcdir)/edns.h $(srcdir)/buffer.h \
  $(srcdir)/region-allocator.h $(srcdir)/util.h $(srcdir)/tsig.h $(srcdir)/dname.h $(srcdir)/options.h $(srcdir)/rbtree.h $(srcdir)/namedb.h \
  $(srcdir)/radtree.h $(srcdir)/udb.h $(srcdir)/udbzone.h $(srcdir)/udbradtree.h
@@ -465,7 +471,7 @@
  $(srcdir)/answer.h $(srcdir)/packet.h $(srcdir)/query.h $(srcdir)/tsig.h $(srcdir)/udbzone.h $(srcdir)/udb.h $(srcdir)/udbradtree.h $(srcdir)/options.h
 options.o: $(srcdir)/options.c config.h $(srcdir)/options.h $(srcdir)/region-allocator.h $(srcdir)/rbtree.h \
  $(srcdir)/query.h $(srcdir)/namedb.h $(srcdir)/dname.h $(srcdir)/buffer.h $(srcdir)/util.h $(srcdir)/dns.h $(srcdir)/radtree.h $(srcdir)/nsd.h $(srcdir)/edns.h \
- $(srcdir)/packet.h $(srcdir)/tsig.h $(srcdir)/difffile.h $(srcdir)/udb.h $(srcdir)/rrl.h $(srcdir)/configyyrename.h configparser.h
+ $(srcdir)/packet.h $(srcdir)/tsig.h $(srcdir)/difffile.h $(srcdir)/udb.h $(srcdir)/rrl.h configparser.h
 packet.o: $(srcdir)/packet.c config.h $(srcdir)/packet.h $(srcdir)/dns.h $(srcdir)/namedb.h $(srcdir)/dname.h $(srcdir)/buffer.h \
  $(srcdir)/region-allocator.h $(srcdir)/util.h $(srcdir)/radtree.h $(srcdir)/rbtree.h $(srcdir)/query.h $(srcdir)/nsd.h $(srcdir)/edns.h $(srcdir)/tsig.h \
  $(srcdir)/rdata.h
@@ -488,8 +494,8 @@
 server.o: $(srcdir)/server.c config.h $(srcdir)/axfr.h $(srcdir)/nsd.h $(srcdir)/dns.h $(srcdir)/edns.h $(srcdir)/buffer.h \
  $(srcdir)/region-allocator.h $(srcdir)/util.h $(srcdir)/query.h $(srcdir)/namedb.h $(srcdir)/dname.h $(srcdir)/radtree.h $(srcdir)/rbtree.h \
  $(srcdir)/packet.h $(srcdir)/tsig.h $(srcdir)/netio.h $(srcdir)/xfrd.h $(srcdir)/options.h $(srcdir)/xfrd-tcp.h $(srcdir)/xfrd-disk.h \
- $(srcdir)/difffile.h $(srcdir)/udb.h $(srcdir)/nsec3.h $(srcdir)/ipc.h $(srcdir)/remote.h $(srcdir)/lookup3.h $(srcdir)/rrl.h \
- $(srcdir)/dnstap/dnstap_collector.h
+ $(srcdir)/difffile.h $(srcdir)/udb.h $(srcdir)/nsec3.h $(srcdir)/ipc.h $(srcdir)/remote.h $(srcdir)/lookup3.h $(srcdir)/dnstap/dnstap_collector.h $(srcdir)/rrl.h $(srcdir)/ixfr.h $(srcdir)/verify.h
+siphash.o: $(srcdir)/siphash.c
 tsig.o: $(srcdir)/tsig.c config.h $(srcdir)/tsig.h $(srcdir)/buffer.h $(srcdir)/region-allocator.h $(srcdir)/util.h $(srcdir)/dname.h \
  $(srcdir)/tsig-openssl.h $(srcdir)/dns.h $(srcdir)/packet.h $(srcdir)/namedb.h $(srcdir)/radtree.h $(srcdir)/rbtree.h $(srcdir)/query.h $(srcdir)/nsd.h \
  $(srcdir)/edns.h
@@ -503,6 +509,9 @@
 util.o: $(srcdir)/util.c config.h $(srcdir)/util.h $(srcdir)/region-allocator.h $(srcdir)/dname.h $(srcdir)/buffer.h \
  $(srcdir)/namedb.h $(srcdir)/dns.h $(srcdir)/radtree.h $(srcdir)/rbtree.h $(srcdir)/rdata.h $(srcdir)/zonec.h
 bitset.o: $(srcdir)/bitset.c $(srcdir)/bitset.h
+verify.o: $(srcdir)/verify.c config.h $(srcdir)/region-allocator.h $(srcdir)/namedb.h $(srcdir)/dname.h $(srcdir)/buffer.h \
+ $(srcdir)/util.h config.h $(srcdir)/dns.h $(srcdir)/rbtree.h $(srcdir)/nsd.h $(srcdir)/edns.h $(srcdir)/options.h $(srcdir)/difffile.h \
+ $(srcdir)/netio.h $(srcdir)/verify.h
 xfrd.o: $(srcdir)/xfrd.c config.h $(srcdir)/xfrd.h $(srcdir)/rbtree.h $(srcdir)/region-allocator.h $(srcdir)/namedb.h \
  $(srcdir)/dname.h $(srcdir)/buffer.h $(srcdir)/util.h $(srcdir)/dns.h $(srcdir)/radtree.h $(srcdir)/options.h $(srcdir)/tsig.h $(srcdir)/xfrd-tcp.h \
  $(srcdir)/xfrd-disk.h $(srcdir)/xfrd-notify.h $(srcdir)/netio.h $(srcdir)/nsd.h $(srcdir)/edns.h $(srcdir)/packet.h $(srcdir)/rdata.h \
@@ -544,6 +553,7 @@
 strlcpy.o: $(srcdir)/compat/strlcpy.c config.h
 strptime.o: $(srcdir)/compat/strptime.c
 setproctitle.o: $(srcdir)/compat/setproctitle.c config.h
+explicit_bzero.o: $(srcdir)/compat/explicit_bzero.c config.h
 cutest.o: $(srcdir)/tpkg/cutest/cutest.c config.h $(srcdir)/tpkg/cutest/cutest.h
 cutest_dname.o: $(srcdir)/tpkg/cutest/cutest_dname.c config.h $(srcdir)/tpkg/cutest/cutest.h \
  $(srcdir)/region-allocator.h $(srcdir)/dname.h $(srcdir)/buffer.h $(srcdir)/region-allocator.h $(srcdir)/util.h
@@ -579,7 +589,7 @@
 cutest_udbrad.o: $(srcdir)/tpkg/cutest/cutest_udbrad.c config.h \
  $(srcdir)/tpkg/cutest/cutest.h $(srcdir)/udbradtree.h $(srcdir)/udb.h
 cutest_util.o: $(srcdir)/tpkg/cutest/cutest_util.c config.h $(srcdir)/tpkg/cutest/cutest.h \
- $(srcdir)/region-allocator.h $(srcdir)/util.h
+ $(srcdir)/region-allocator.h $(srcdir)/util.h $(srcdir)/xfrd-tcp.h
 qtest.o: $(srcdir)/tpkg/cutest/qtest.c config.h $(srcdir)/tpkg/cutest/qtest.h $(srcdir)/buffer.h \
  $(srcdir)/region-allocator.h $(srcdir)/util.h $(srcdir)/query.h $(srcdir)/namedb.h $(srcdir)/dname.h $(srcdir)/buffer.h $(srcdir)/dns.h \
  $(srcdir)/radtree.h $(srcdir)/rbtree.h $(srcdir)/nsd.h $(srcdir)/edns.h $(srcdir)/packet.h $(srcdir)/tsig.h $(srcdir)/namedb.h $(srcdir)/util.h $(srcdir)/nsec3.h \
diff -r f68c375fe4fc -r 10d1511ce0df external/bsd/nsd/dist/README.md
--- a/external/bsd/nsd/dist/README.md   Sat Sep 24 16:29:27 2022 +0000
+++ b/external/bsd/nsd/dist/README.md   Sat Sep 24 17:35:00 2022 +0000
@@ -1,6 +1,7 @@
 # NSD
 
 [![Travis Build Status](https://travis-ci.org/NLnetLabs/nsd.svg?branch=master)](https://travis-ci.org/NLnetLabs/nsd)
+[![Cirrus Build Status](https://api.cirrus-ci.com/github/NLnetLabs/nsd.svg)](https://cirrus-ci.com/github/NLnetLabs/nsd)
 [![Packaging status](https://repology.org/badge/tiny-repos/nsd.svg)](https://repology.org/project/nsd/versions)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/1462/badge)](https://bestpractices.coreinfrastructure.org/projects/1462)
 
@@ -12,15 +13,19 @@
 or post a message on the
 [NSD mailing list](https://lists.nlnetlabs.nl/mailman/listinfo/nsd-users).
 You can learn more about NSD by reading our
-[documentation](https://nlnetlabs.nl/documentation/nsd/).
+[documentation](https://nsd.docs.nlnetlabs.nl/).
 
 ## Compiling
 
-Make sure you have the C toolchain, OpenSSL and its include files, and
-libevent with its include files and flex and bison installed.
-The repository does not contain ./configure and you can generate it like
-this (./configure is included in release tarballs, and then you do not
-have to generate it first):
+Make sure you have the following installed:
+  * C toolchain (the set of tools to compile C such as a compiler, linker, and assembler)
+  * OpenSSL, with its include files (usually these are included in the "dev" version of the library)
+  * libevent, with its include files (usually these are included in the "dev" version of the library)
+  * flex
+  * bison
+
+The repository does not contain `./configure`, but you can generate it like
+this (note that the `./configure` is included in release tarballs so they do not have to be generated):
 
 ```
 aclocal && autoconf && autoheader
@@ -36,7 +41,7 @@
 
 The configuration options for NSD are described in the man pages, which are
 installed (use `man nsd.conf`) and are available on the NSD
-[documentation page](https://nlnetlabs.nl/documentation/nsd/).
+[documentation page](https://nsd.docs.nlnetlabs.nl/).
 
 An example configuration file is located in
 [nsd.conf.sample](https://github.com/NLnetLabs/nsd/blob/master/nsd.conf.sample.in).
diff -r f68c375fe4fc -r 10d1511ce0df external/bsd/nsd/dist/aclocal.m4
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/nsd/dist/aclocal.m4  Sat Sep 24 17:35:00 2022 +0000
@@ -0,0 +1,358 @@
+# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
+
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
+# pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+# serial 11 (pkg-config-0.29.1)
+
+dnl Copyright © 2004 Scott James Remnant <scott%netsplit.com@localhost>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists%gmail.com@localhost>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29.1])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+       AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi



Home | Main Index | Thread Index | Old Index