Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/nsd merge conflicts between our changes for nsd...
details: https://anonhg.NetBSD.org/src/rev/01eee2cfe0d0
branches: trunk
changeset: 960361:01eee2cfe0d0
user: christos <christos%NetBSD.org@localhost>
date: Mon Mar 15 19:48:51 2021 +0000
description:
merge conflicts between our changes for nsd between 4.2.4 and 4.3.5
diffstat:
external/bsd/nsd/Makefile.inc | 4 +-
external/bsd/nsd/dist/.buildkite/pipeline.yml | 7 -
external/bsd/nsd/dist/.travis.yml | 66 -
external/bsd/nsd/dist/configlexer.c | 2651 +++++++++++++-----------
external/bsd/nsd/dist/configparser.c | 1969 ++++++++++-------
external/bsd/nsd/dist/configparser.h | 347 +-
external/bsd/nsd/dist/configure.ac | 345 ++-
external/bsd/nsd/dist/contrib/nsd.service | 28 -
external/bsd/nsd/dist/options.c | 77 +-
external/bsd/nsd/dist/server.c | 369 ++-
external/bsd/nsd/dist/util.h | 23 +-
external/bsd/nsd/dist/zlexer.c | 298 +-
external/bsd/nsd/dist/zparser.c | 1866 ++++++++--------
external/bsd/nsd/dist/zparser.h | 69 +-
external/bsd/nsd/include/config.h | 87 +-
external/bsd/nsd/lib/libnsd/Makefile | 3 +-
16 files changed, 4601 insertions(+), 3608 deletions(-)
diffs (truncated from 12634 to 300 lines):
diff -r c826fc4ab237 -r 01eee2cfe0d0 external/bsd/nsd/Makefile.inc
--- a/external/bsd/nsd/Makefile.inc Mon Mar 15 19:15:04 2021 +0000
+++ b/external/bsd/nsd/Makefile.inc Mon Mar 15 19:48:51 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2019/02/14 14:40:07 prlw1 Exp $
+# $NetBSD: Makefile.inc,v 1.7 2021/03/15 19:48:51 christos Exp $
.include <bsd.own.mk>
@@ -6,7 +6,7 @@
NSD:=${.PARSEDIR}/dist
-CPPFLAGS+=-D_OPENBSD_SOURCE
+CPPFLAGS+=-D_OPENBSD_SOURCE -D_NETBSD_SOURCE
CPPFLAGS+=-I${NSD} -I${NSD}/../include
.PATH: ${NSD}
diff -r c826fc4ab237 -r 01eee2cfe0d0 external/bsd/nsd/dist/.buildkite/pipeline.yml
--- a/external/bsd/nsd/dist/.buildkite/pipeline.yml Mon Mar 15 19:15:04 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-steps:
- - label: Build
- commands:
- - autoconf && autoheader
- - ./configure --enable-checking --disable-flto
- - make
- - make cutest && ./cutest
diff -r c826fc4ab237 -r 01eee2cfe0d0 external/bsd/nsd/dist/.travis.yml
--- a/external/bsd/nsd/dist/.travis.yml Mon Mar 15 19:15:04 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-sudo: false
-language: c
-
-linux_gcc: &linux_gcc
- os: linux
- dist: xenial
- compiler: gcc
- addons:
- apt:
- update: true
- sources: [ ubuntu-toolchain-r-test ]
- packages: [ autoconf bison flex libssl-dev libevent-dev clang gcc-9 ]
- before_install:
- - eval "export CC=gcc-9"
- - eval "export COV_COMPTYPE=gcc COV_PLATFORM=linux64"
-
-install_coverity: &install_coverity
- if [ "${COVERITY_SCAN}" = "true" ]; then
- COV_DIR="/tmp/coverity-scan-analysis";
- COV_ARC="/tmp/cov-analysis-${COV_PLATFORM}.tgz";
- test ! -d "${COV_DIR}" &&
- mkdir -p "${COV_DIR}" &&
- curl -s -S -F project="${TRAVIS_REPO_SLUG}"
- -F token="${COVERITY_SCAN_TOKEN}"
- -o "${COV_ARC}"
- "https://scan.coverity.com/download/cxx/${COV_PLATFORM}"; &&
- tar -xzf "${COV_ARC}" -C "${COV_DIR}";
- COV_ANALYSIS=$(find "${COV_DIR}" -type d -name "cov-analysis*");
- eval "export PATH=\"${PATH}:${COV_ANALYSIS}/bin\"";
- eval "export SCAN_BUILD=\"cov-build --dir cov-int\"";
- cov-configure --comptype ${COV_COMPTYPE} --compiler ${CC} --template;
- fi
-
-submit_to_coverity_scan: &submit_to_coverity_scan
- if [ "${COVERITY_SCAN}" = "true" ]; then
- tar -czf analysis-results.tgz cov-int &&
- curl -s -S -F project="${TRAVIS_REPO_SLUG}"
- -F token="${COVERITY_SCAN_TOKEN}"
- -F file=@analysis-results.tgz
- -F version=$(git rev-parse --short HEAD)
- -F description="Travis CI build"
- -F email="${COVERITY_EMAIL:=spam%nlnetlabs.nl@localhost}"
- "https://scan.coverity.com/builds";;
- fi
-
-install:
- - *install_coverity
-
-script:
- - autoconf && autoheader
- - ./configure --enable-checking --disable-flto
- - ${SCAN_BUILD} make
- - make cutest && ./cutest
- - (cd tpkg; cd clang-analysis.tdir; bash clang-analysis.test)
-
-after_success:
- - *submit_to_coverity_scan
-
-jobs:
- include:
- - <<: *linux_gcc
- env: [ COVERITY_SCAN=true ]
- if: type = cron
- - <<: *linux_gcc
- env: [ COVERITY_SCAN=false ]
-
diff -r c826fc4ab237 -r 01eee2cfe0d0 external/bsd/nsd/dist/configlexer.c
--- a/external/bsd/nsd/dist/configlexer.c Mon Mar 15 19:15:04 2021 +0000
+++ b/external/bsd/nsd/dist/configlexer.c Mon Mar 15 19:48:51 2021 +0000
@@ -353,8 +353,8 @@
(yy_hold_char) = *yy_cp; \
*yy_cp = '\0'; \
(yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 118
-#define YY_END_OF_BUFFER 119
+#define YY_NUM_RULES 127
+#define YY_END_OF_BUFFER 128
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -362,120 +362,131 @@
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static const flex_int16_t yy_accept[1014] =
+static const flex_int16_t yy_accept[1117] =
{ 0,
- 1, 1, 106, 106, 110, 110, 114, 114, 119, 117,
- 1, 104, 105, 2, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 118, 106, 107, 118, 108, 118, 113, 110,
- 111, 112, 118, 114, 115, 116, 118, 117, 0, 1,
- 2, 2, 2, 2, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 106, 0, 113, 0, 110, 114, 0,
-
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 71, 117, 117, 117, 117,
- 117, 117, 70, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 57, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
-
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 4, 117, 22, 117, 117, 117,
- 34, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 46, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
-
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 37, 117, 117, 117,
- 117, 117, 117, 81, 17, 18, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 52, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 59, 117, 117, 3, 117, 117, 117,
-
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 43, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 109, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 23, 117, 117, 117, 117, 117,
- 117, 117, 117, 60, 33, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 29, 117, 117, 117, 117, 117,
- 117, 117, 117, 21, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 19,
-
- 117, 41, 117, 117, 117, 117, 117, 117, 117, 117,
- 20, 117, 117, 117, 117, 117, 15, 16, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 72,
- 74, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 103, 117, 117, 38, 117, 117, 42, 47,
- 117, 117, 39, 117, 58, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 6, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
-
- 117, 117, 117, 117, 35, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 25, 117, 117, 117,
- 117, 117, 45, 117, 117, 117, 48, 117, 117, 117,
- 117, 117, 117, 117, 117, 11, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 5, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 94, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 36, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
-
- 117, 117, 8, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 54, 117, 117, 51,
- 91, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 28, 117, 12, 117, 117, 117, 117, 117,
- 49, 117, 117, 117, 117, 117, 65, 117, 117, 117,
- 117, 117, 117, 117, 117, 13, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 53, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 24, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 40,
- 117, 117, 117, 117, 117, 117, 82, 117, 117, 117,
-
- 117, 117, 117, 14, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 73, 117, 78, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 63,
- 117, 117, 117, 117, 117, 117, 117, 87, 117, 7,
- 31, 32, 90, 117, 97, 117, 98, 117, 117, 117,
- 117, 117, 62, 117, 117, 117, 117, 117, 117, 50,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 93,
- 117, 117, 117, 86, 117, 117, 117, 117, 61, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
-
- 117, 66, 27, 117, 100, 117, 102, 117, 79, 80,
- 117, 117, 117, 68, 117, 117, 117, 117, 117, 95,
- 96, 117, 117, 117, 30, 117, 117, 117, 117, 9,
- 67, 117, 101, 117, 117, 69, 64, 117, 117, 117,
- 117, 117, 92, 117, 117, 117, 117, 117, 117, 117,
- 117, 117, 117, 117, 117, 117, 83, 99, 55, 117,
- 117, 117, 117, 117, 117, 56, 117, 117, 117, 85,
- 10, 117, 117, 117, 26, 44, 117, 117, 84, 117,
- 117, 117, 117, 117, 117, 117, 117, 117, 117, 75,
- 76, 117, 117, 117, 77, 117, 117, 117, 117, 117,
-
- 117, 117, 117, 117, 117, 117, 117, 88, 117, 117,
- 117, 89, 0
+ 1, 1, 115, 115, 119, 119, 123, 123, 128, 126,
+ 1, 107, 114, 2, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 127, 115, 116, 127, 117, 127, 122,
+ 119, 120, 121, 127, 123, 124, 125, 127, 126, 0,
+ 1, 2, 2, 2, 2, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 115, 0, 122,
+
+ 0, 119, 123, 0, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 73, 126, 126, 126, 126, 126, 126,
+ 72, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 59, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 4, 126, 23, 126, 126, 126, 36, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 48,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 39, 126, 126, 126, 126, 126, 126, 126,
+ 83, 18, 19, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+
+ 126, 126, 126, 126, 126, 126, 126, 54, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 61, 126, 126, 3, 126, 110, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 45, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 118, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 24, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 62, 35, 126, 126, 126, 126, 126, 126, 126,
+
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 108, 110, 0, 126, 126, 126, 31, 126, 126, 126,
+ 126, 126, 126, 126, 126, 22, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 20, 126, 43, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 21, 126, 126, 126,
+ 126, 126, 16, 17, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 74, 76, 126,
+ 126, 126, 126, 126, 126, 126, 108, 0, 126, 126,
+
+ 126, 126, 126, 126, 106, 126, 126, 40, 126, 126,
+ 126, 44, 49, 126, 126, 41, 126, 60, 126, 126,
Home |
Main Index |
Thread Index |
Old Index