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 4.3.5 and 4.6.0, an...
details: https://anonhg.NetBSD.org/src/rev/60396316ce00
branches: trunk
changeset: 370689:60396316ce00
user: christos <christos%NetBSD.org@localhost>
date: Sat Sep 24 17:38:17 2022 +0000
description:
merge conflicts between 4.3.5 and 4.6.0, and update build
diffstat:
external/bsd/nsd/dist/.cirrus.yml | 139 -
external/bsd/nsd/dist/configlexer.c | 3184 ++++++++++++++++-----------
external/bsd/nsd/dist/configparser.c | 2747 ++++++++++++-----------
external/bsd/nsd/dist/configparser.h | 410 ++-
external/bsd/nsd/dist/configure | 8 +-
external/bsd/nsd/dist/configure.ac | 112 +-
external/bsd/nsd/dist/configyyrename.h | 121 -
external/bsd/nsd/dist/doc/README | 2 +-
external/bsd/nsd/dist/doc/REQUIREMENTS | 4 +-
external/bsd/nsd/dist/doc/TODO | 2 +-
external/bsd/nsd/dist/doc/differences.tex | 2 +-
external/bsd/nsd/dist/mkinstalldirs | 2 +-
external/bsd/nsd/dist/options.c | 475 ++++-
external/bsd/nsd/dist/server.c | 458 +++-
external/bsd/nsd/dist/util.h | 12 +-
external/bsd/nsd/dist/zlexer.c | 302 +-
external/bsd/nsd/dist/zparser.c | 3376 ++++++++++++++--------------
external/bsd/nsd/dist/zparser.h | 234 +-
external/bsd/nsd/include/config.h | 60 +-
external/bsd/nsd/lib/libnsd/Makefile | 9 +-
20 files changed, 6567 insertions(+), 5092 deletions(-)
diffs (truncated from 16393 to 300 lines):
diff -r 10d1511ce0df -r 60396316ce00 external/bsd/nsd/dist/.cirrus.yml
--- a/external/bsd/nsd/dist/.cirrus.yml Sat Sep 24 17:35:00 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-# Cirrus CI instructions for building NSD
-#
-# These build instructions are based on the existing instructions and
-# suggestions made by Jeffrey Walton (noloader) about using the Undefined
-# Behavior sanitizer (UBSan) and the Address sanitizer (ASan).
-#
-# For now builds are limited to Linux, FreeBSD and macOS builds on AMD64, more
-# may be added in the future.
-
-ubuntu_1804: &ubuntu_1804
- container:
- image: ubuntu:bionic
- env:
- UBUNTU_CODENAME: bionic
- COV_COMPTYPE: gcc
- COV_PLATFORM: linux64
-
-ubuntu_1804_gcc9: &ubuntu_1804_gcc9
- <<: *ubuntu_1804
- env:
- CC: gcc-9
- bootstrap_script:
- - apt-get update
- - apt-get install -y gnupg2 ca-certificates wget curl
- - |
- cat << EOF > /etc/apt/sources.list.d/ubuntu-toolchain-r.list
- deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu ${UBUNTU_CODENAME} main
- deb-src http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu ${UBUNTU_CODENAME} main
- EOF
- - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1E9377A2BA9EF27F
- - apt-get update
- install_script:
- - apt-get install -y autoconf automake make gcc-9 clang libc-dev libevent-dev libssl-dev flex bison
-
-ubuntu_1804_clang10: &ubuntu_1804_clang10
- <<: *ubuntu_1804
- env:
- CC: clang-10
- CLANG_VERSION: 10
- bootstrap_script:
- - apt-get update
- - apt-get install -y gnupg2 ca-certificates wget curl
- - |
- cat << EOF > /etc/apt/sources.list.d/llvm-toolchain.list
- deb http://apt.llvm.org/${UBUNTU_CODENAME} llvm-toolchain-${UBUNTU_CODENAME}-${CLANG_VERSION} main
- deb-src http://apt.llvm.org/${UBUNTU_CODENAME} llvm-toolchain-${UBUNTU_CODENAME}-${CLANG_VERSION} main
- EOF
- - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 15CF4D18AF4F7421
- - apt-get update
- install_script:
- - apt-get install -y autoconf automake make clang-${CLANG_VERSION} libc-dev libevent-dev libssl-dev flex bison
- - update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${CLANG_VERSION} 10
-
-freebsd_12_1: &freebsd_12_1
- freebsd_instance:
- image_family: freebsd-12-1
- env:
- CC: clang
- install_script:
- - pkg update -f
- - pkg install -y bash gmake autoconf automake libevent
-
-macos_1015_xcode11: &macos_1015_xcode11
- osx_instance:
- image: catalina-xcode-11.3.1
- env:
- CC: clang
- COV_COMPTYPE: clang
- COV_COMPTYPE: macOSX
- install_script:
- - brew install bash autoconf automake libtool libevent openssl flex bison
-
-install_coverity: &install_coverity
- env:
- COV_ARC: "$CIRRUS_WORKING_DIR/cov-analysis-$COV_PLATFORM.tgz"
- COV_DIR: "$CIRRUS_WORKING_DIR/coverity-scan-analysis"
- PATH: "$PATH:$CIRRUS_WORKING_DIR/cov-analysis/bin"
- install_coverity_script:
- - test ! -d "${COV_DIR}" &&
- mkdir -p "${COV_DIR}" &&
- curl -s -S -F project="${CIRRUS_REPO_OWNER}/${CIRRUS_REPO_NAME}"
- -F token="${COVERITY_SCAN_TOKEN}"
- -o "${COV_ARC}"
- "https://scan.coverity.com/download/cxx/${COV_PLATFORM}"; &&
- tar -xzf "${COV_ARC}" -C "${COV_DIR}"
- - ln -s $(find "${COV_DIR}" -type d -name "cov-analysis*") cov-analysis
-
-submit_to_coverity_scan: &submit_to_coverity_scan
- submit_to_coverity_scan_script:
- - tar -czf analysis-results.tgz cov-int
- - curl -s -S -F project="${CIRRUS_REPO_OWNER}/${CIRRUS_REPO_NAME}"
- -F token="${COVERITY_SCAN_TOKEN}"
- -F file=@analysis-results.tgz
- -F version="$(git rev-parse --short HEAD)"
- -F description="Cirrus CI build"
- -F email="${COVERITY_EMAIL:=spam%nlnetlabs.nl@localhost}"
- "https://scan.coverity.com/builds";
-
-env:
- COVERITY_EMAIL: ENCRYPTED[effa3340c97e8cf92c0dbb564187d35b6829580cc2577b176d6c6fc9b775745f7130c56f5bd9ab2472f4ae818b6f3791]
- COVERITY_SCAN_TOKEN: ENCRYPTED[8f67f850ca3d464ea87fa8dee17bbb0cfb2a991b6f401fd593fe0744eece838e325af438d62ee2d46c4e18a2bd5c873f]
-
-task:
- only_if: $CIRRUS_CRON != ''
- name: "Build on Ubuntu 18.04 LTS with GCC 9 (Coverity Scan)"
- <<: *ubuntu_1804_gcc9
- <<: *install_coverity
- build_script:
- - autoconf && autoheader
- - ./configure --enable-checking --disable-flto
- - cov-configure --comptype ${COV_COMPTYPE} --compiler ${CC} --template
- - cov-build --dir cov-int make
- <<: *submit_to_coverity_scan
-
-task:
- matrix:
- - name: "Build and test on Ubuntu 18.04 LTS with GCC 9"
- <<: *ubuntu_1804_gcc9
- - name: "Build and test on Ubuntu 18.04 LTS with Clang 10 (ASan+UBSan+LSan)"
- <<: *ubuntu_1804_clang10
- env:
- CFLAGS: "-g2 -O0 -fsanitize=address,undefined,leak -fno-sanitize-recover=all"
- - name: "Build and test on FreeBSD 12.1 (ASan+UBSan)"
- <<: *freebsd_12_1
- env:
- CFLAGS: "-g2 -O0 -fsanitize=address,undefined -fno-sanitize-recover=all"
- - name: "Build and test on macOS 10.15 with Xcode 11.3.1 (ASan+UBSan)"
- <<: *macos_1015_xcode11
- env:
- CFLAGS: "-g2 -O0 -fsanitize=address,undefined -fno-sanitize-recover=all"
-
- build_script:
- - autoconf && autoheader
- - ./configure --enable-checking --disable-flto --with-ssl=yes --with-libevent=yes
- - make -j 2
- - make cutest
- - ./cutest
- - (cd tpkg/clang-analysis.tdir && bash clang-analysis.test)
- - (cd tpkg && ./mini_tdir.sh -a ../.. exe checkconf.tdir)
diff -r 10d1511ce0df -r 60396316ce00 external/bsd/nsd/dist/configlexer.c
--- a/external/bsd/nsd/dist/configlexer.c Sat Sep 24 17:35:00 2022 +0000
+++ b/external/bsd/nsd/dist/configlexer.c Sat Sep 24 17:38:17 2022 +0000
@@ -1,4 +1,4 @@
-#include "configyyrename.h"
+#include "config.h"
#line 2 "<stdout>"
@@ -6,6 +6,31 @@
/* A lexical scanner generated by flex */
+#define yy_create_buffer c__create_buffer
+#define yy_delete_buffer c__delete_buffer
+#define yy_scan_buffer c__scan_buffer
+#define yy_scan_string c__scan_string
+#define yy_scan_bytes c__scan_bytes
+#define yy_init_buffer c__init_buffer
+#define yy_flush_buffer c__flush_buffer
+#define yy_load_buffer_state c__load_buffer_state
+#define yy_switch_to_buffer c__switch_to_buffer
+#define yypush_buffer_state c_push_buffer_state
+#define yypop_buffer_state c_pop_buffer_state
+#define yyensure_buffer_stack c_ensure_buffer_stack
+#define yy_flex_debug c__flex_debug
+#define yyin c_in
+#define yyleng c_leng
+#define yylex c_lex
+#define yylineno c_lineno
+#define yyout c_out
+#define yyrestart c_restart
+#define yytext c_text
+#define yywrap c_wrap
+#define yyalloc c_alloc
+#define yyrealloc c_realloc
+#define yyfree c_free
+
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 6
@@ -14,6 +39,240 @@
#define FLEX_BETA
#endif
+#ifdef yy_create_buffer
+#define c__create_buffer_ALREADY_DEFINED
+#else
+#define yy_create_buffer c__create_buffer
+#endif
+
+#ifdef yy_delete_buffer
+#define c__delete_buffer_ALREADY_DEFINED
+#else
+#define yy_delete_buffer c__delete_buffer
+#endif
+
+#ifdef yy_scan_buffer
+#define c__scan_buffer_ALREADY_DEFINED
+#else
+#define yy_scan_buffer c__scan_buffer
+#endif
+
+#ifdef yy_scan_string
+#define c__scan_string_ALREADY_DEFINED
+#else
+#define yy_scan_string c__scan_string
+#endif
+
+#ifdef yy_scan_bytes
+#define c__scan_bytes_ALREADY_DEFINED
+#else
+#define yy_scan_bytes c__scan_bytes
+#endif
+
+#ifdef yy_init_buffer
+#define c__init_buffer_ALREADY_DEFINED
+#else
+#define yy_init_buffer c__init_buffer
+#endif
+
+#ifdef yy_flush_buffer
+#define c__flush_buffer_ALREADY_DEFINED
+#else
+#define yy_flush_buffer c__flush_buffer
+#endif
+
+#ifdef yy_load_buffer_state
+#define c__load_buffer_state_ALREADY_DEFINED
+#else
+#define yy_load_buffer_state c__load_buffer_state
+#endif
+
+#ifdef yy_switch_to_buffer
+#define c__switch_to_buffer_ALREADY_DEFINED
+#else
+#define yy_switch_to_buffer c__switch_to_buffer
+#endif
+
+#ifdef yypush_buffer_state
+#define c_push_buffer_state_ALREADY_DEFINED
+#else
+#define yypush_buffer_state c_push_buffer_state
+#endif
+
+#ifdef yypop_buffer_state
+#define c_pop_buffer_state_ALREADY_DEFINED
+#else
+#define yypop_buffer_state c_pop_buffer_state
+#endif
+
+#ifdef yyensure_buffer_stack
+#define c_ensure_buffer_stack_ALREADY_DEFINED
+#else
+#define yyensure_buffer_stack c_ensure_buffer_stack
+#endif
+
+#ifdef yylex
+#define c_lex_ALREADY_DEFINED
+#else
+#define yylex c_lex
+#endif
+
+#ifdef yyrestart
+#define c_restart_ALREADY_DEFINED
+#else
+#define yyrestart c_restart
+#endif
+
+#ifdef yylex_init
+#define c_lex_init_ALREADY_DEFINED
+#else
+#define yylex_init c_lex_init
+#endif
+
+#ifdef yylex_init_extra
+#define c_lex_init_extra_ALREADY_DEFINED
+#else
+#define yylex_init_extra c_lex_init_extra
+#endif
+
+#ifdef yylex_destroy
+#define c_lex_destroy_ALREADY_DEFINED
+#else
+#define yylex_destroy c_lex_destroy
+#endif
+
+#ifdef yyget_debug
+#define c_get_debug_ALREADY_DEFINED
+#else
+#define yyget_debug c_get_debug
+#endif
+
+#ifdef yyset_debug
+#define c_set_debug_ALREADY_DEFINED
+#else
+#define yyset_debug c_set_debug
Home |
Main Index |
Thread Index |
Old Index