From efac4d30f5b57a21a98e22d047a944269b0720a9 Mon Sep 17 00:00:00 2001 From: florian Date: Wed, 22 Dec 2021 18:33:21 +0000 Subject: [PATCH] Trivial update to 4.3.9. --- usr.sbin/nsd/configparser.y | 4 ++-- usr.sbin/nsd/configure | 18 +++++++++--------- usr.sbin/nsd/configure.ac | 2 +- usr.sbin/nsd/doc/ChangeLog | 18 ++++++++++++++++++ usr.sbin/nsd/doc/RELNOTES | 9 +++++++++ usr.sbin/nsd/nsd-checkconf.8.in | 2 +- usr.sbin/nsd/nsd-checkzone.8.in | 2 +- usr.sbin/nsd/nsd-control.8.in | 2 +- usr.sbin/nsd/nsd.8.in | 4 ++-- usr.sbin/nsd/nsd.conf.5.in | 2 +- 10 files changed, 45 insertions(+), 18 deletions(-) diff --git a/usr.sbin/nsd/configparser.y b/usr.sbin/nsd/configparser.y index 6642a6f544c..70e54cf21f3 100644 --- a/usr.sbin/nsd/configparser.y +++ b/usr.sbin/nsd/configparser.y @@ -542,9 +542,9 @@ cpus: /* Users may specify "0 1", "0" "1", 0 1 or a combination thereof. */ for(str = $2; (tok = strtok_r(str, " \t", &ptr)); str = NULL) { struct cpu_option *opt = - region_alloc(cfg_parser->opt->region, sizeof(*opt)); + region_alloc_zero(cfg_parser->opt->region, sizeof(*opt)); cpu = 0; - if(!parse_number(tok, &cpu) || opt->cpu < 0) { + if(!parse_number(tok, &cpu) || cpu < 0) { yyerror("expected a positive number"); YYABORT; } diff --git a/usr.sbin/nsd/configure b/usr.sbin/nsd/configure index 4f8d1ccaddd..ca313c85794 100644 --- a/usr.sbin/nsd/configure +++ b/usr.sbin/nsd/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for NSD 4.3.8. +# Generated by GNU Autoconf 2.69 for NSD 4.3.9. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='NSD' PACKAGE_TARNAME='nsd' -PACKAGE_VERSION='4.3.8' -PACKAGE_STRING='NSD 4.3.8' +PACKAGE_VERSION='4.3.9' +PACKAGE_STRING='NSD 4.3.9' PACKAGE_BUGREPORT='nsd-bugs@nlnetlabs.nl' PACKAGE_URL='' @@ -1328,7 +1328,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures NSD 4.3.8 to adapt to many kinds of systems. +\`configure' configures NSD 4.3.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1390,7 +1390,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NSD 4.3.8:";; + short | recursive ) echo "Configuration of NSD 4.3.9:";; esac cat <<\_ACEOF @@ -1563,7 +1563,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NSD configure 4.3.8 +NSD configure 4.3.9 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2272,7 +2272,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by NSD $as_me 4.3.8, which was +It was created by NSD $as_me 4.3.9, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -11155,7 +11155,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by NSD $as_me 4.3.8, which was +This file was extended by NSD $as_me 4.3.9, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11217,7 +11217,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -NSD config.status 4.3.8 +NSD config.status 4.3.9 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/usr.sbin/nsd/configure.ac b/usr.sbin/nsd/configure.ac index 4c09bb363b9..94a2e1ee38d 100644 --- a/usr.sbin/nsd/configure.ac +++ b/usr.sbin/nsd/configure.ac @@ -5,7 +5,7 @@ dnl sinclude(acx_nlnetlabs.m4) sinclude(dnstap/dnstap.m4) -AC_INIT([NSD],[4.3.8],[nsd-bugs@nlnetlabs.nl]) +AC_INIT([NSD],[4.3.9],[nsd-bugs@nlnetlabs.nl]) AC_CONFIG_HEADERS([config.h]) # diff --git a/usr.sbin/nsd/doc/ChangeLog b/usr.sbin/nsd/doc/ChangeLog index 43c3b7bfd72..0075ef70e2a 100644 --- a/usr.sbin/nsd/doc/ChangeLog +++ b/usr.sbin/nsd/doc/ChangeLog @@ -1,3 +1,21 @@ +2 December 2021: Wouter + - Fix socket_partitioning unit test for FreeBSD. + - Fix SVCB test to work around older dig with drill. + +1 December 2021: Wouter + - Set up for branch for 4.3.9 release. + - 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. diff --git a/usr.sbin/nsd/doc/RELNOTES b/usr.sbin/nsd/doc/RELNOTES index b7157bbc0a6..176d762de21 100644 --- a/usr.sbin/nsd/doc/RELNOTES +++ b/usr.sbin/nsd/doc/RELNOTES @@ -1,5 +1,14 @@ NSD RELEASE NOTES +4.3.9 +================ +BUG FIXES: + - Fix #198: nsd-control reconfig core dump. + - Fix to remove git tracking and ci information from release tarballs. + - Fix unit tests for new answer-cookie default. + - Fix socket_partitioning unit test for FreeBSD. + - Fix SVCB test to work around older dig with drill. + 4.3.8 ================ FEATURES: diff --git a/usr.sbin/nsd/nsd-checkconf.8.in b/usr.sbin/nsd/nsd-checkconf.8.in index 62f0695577d..d97e0217ccf 100644 --- a/usr.sbin/nsd/nsd-checkconf.8.in +++ b/usr.sbin/nsd/nsd-checkconf.8.in @@ -1,4 +1,4 @@ -.TH "nsd\-checkconf" "8" "Oct 12, 2021" "NLnet Labs" "nsd 4.3.8" +.TH "nsd\-checkconf" "8" "Dec 9, 2021" "NLnet Labs" "nsd 4.3.9" .\" Copyright (c) 2001\-2008, NLnet Labs. All rights reserved. .\" See LICENSE for the license. .SH "NAME" diff --git a/usr.sbin/nsd/nsd-checkzone.8.in b/usr.sbin/nsd/nsd-checkzone.8.in index 76ac2fe2442..c43a34aadeb 100644 --- a/usr.sbin/nsd/nsd-checkzone.8.in +++ b/usr.sbin/nsd/nsd-checkzone.8.in @@ -1,4 +1,4 @@ -.TH "nsd\-checkzone" "8" "Oct 12, 2021" "NLnet Labs" "nsd 4.3.8" +.TH "nsd\-checkzone" "8" "Dec 9, 2021" "NLnet Labs" "nsd 4.3.9" .\" Copyright (c) 2014, NLnet Labs. All rights reserved. .\" See LICENSE for the license. .SH "NAME" diff --git a/usr.sbin/nsd/nsd-control.8.in b/usr.sbin/nsd/nsd-control.8.in index f7f338c70ae..6051468b4d1 100644 --- a/usr.sbin/nsd/nsd-control.8.in +++ b/usr.sbin/nsd/nsd-control.8.in @@ -1,4 +1,4 @@ -.TH "nsd\-control" "8" "Oct 12, 2021" "NLnet Labs" "nsd 4.3.8" +.TH "nsd\-control" "8" "Dec 9, 2021" "NLnet Labs" "nsd 4.3.9" .\" Copyright (c) 2011, NLnet Labs. All rights reserved. .\" See LICENSE for the license. .SH "NAME" diff --git a/usr.sbin/nsd/nsd.8.in b/usr.sbin/nsd/nsd.8.in index 5c7f52e3311..48682e90eb8 100644 --- a/usr.sbin/nsd/nsd.8.in +++ b/usr.sbin/nsd/nsd.8.in @@ -1,9 +1,9 @@ -.TH "NSD" "8" "Oct 12, 2021" "NLnet Labs" "NSD 4.3.8" +.TH "NSD" "8" "Dec 9, 2021" "NLnet Labs" "NSD 4.3.9" .\" Copyright (c) 2001\-2008, NLnet Labs. All rights reserved. .\" See LICENSE for the license. .SH "NAME" .B nsd -\- Name Server Daemon (NSD) version 4.3.8. +\- Name Server Daemon (NSD) version 4.3.9. .SH "SYNOPSIS" .B nsd .RB [ \-4 ] diff --git a/usr.sbin/nsd/nsd.conf.5.in b/usr.sbin/nsd/nsd.conf.5.in index 9ae376f288c..cf05f082c85 100644 --- a/usr.sbin/nsd/nsd.conf.5.in +++ b/usr.sbin/nsd/nsd.conf.5.in @@ -1,4 +1,4 @@ -.TH "nsd.conf" "5" "Oct 12, 2021" "NLnet Labs" "nsd 4.3.8" +.TH "nsd.conf" "5" "Dec 9, 2021" "NLnet Labs" "nsd 4.3.9" .\" Copyright (c) 2001\-2008, NLnet Labs. All rights reserved. .\" See LICENSE for the license. .SH "NAME" -- 2.20.1