Module Name: src Committed By: christos Date: Sat Sep 24 17:38:18 UTC 2022
Modified Files: src/external/bsd/nsd/dist: configlexer.c configparser.c configparser.h configure configure.ac mkinstalldirs options.c server.c util.h zlexer.c zparser.c zparser.h src/external/bsd/nsd/dist/doc: README REQUIREMENTS TODO differences.tex src/external/bsd/nsd/include: config.h src/external/bsd/nsd/lib/libnsd: Makefile Removed Files: src/external/bsd/nsd/dist: .cirrus.yml configyyrename.h Log Message: merge conflicts between 4.3.5 and 4.6.0, and update build To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/nsd/dist/.cirrus.yml \ src/external/bsd/nsd/dist/configyyrename.h cvs rdiff -u -r1.7 -r1.8 src/external/bsd/nsd/dist/configlexer.c \ src/external/bsd/nsd/dist/configparser.c \ src/external/bsd/nsd/dist/configparser.h \ src/external/bsd/nsd/dist/zparser.c cvs rdiff -u -r1.1.1.8 -r1.2 src/external/bsd/nsd/dist/configure cvs rdiff -u -r1.4 -r1.5 src/external/bsd/nsd/dist/configure.ac cvs rdiff -u -r1.1.1.6 -r1.2 src/external/bsd/nsd/dist/mkinstalldirs cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nsd/dist/options.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/nsd/dist/server.c \ src/external/bsd/nsd/dist/util.h src/external/bsd/nsd/dist/zlexer.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/nsd/dist/zparser.h cvs rdiff -u -r1.1.1.8 -r1.2 src/external/bsd/nsd/dist/doc/README cvs rdiff -u -r1.1.1.7 -r1.2 src/external/bsd/nsd/dist/doc/REQUIREMENTS cvs rdiff -u -r1.1.1.6 -r1.2 src/external/bsd/nsd/dist/doc/TODO \ src/external/bsd/nsd/dist/doc/differences.tex cvs rdiff -u -r1.10 -r1.11 src/external/bsd/nsd/include/config.h cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nsd/lib/libnsd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.