CVS commit: src/external/bsd/nsd
Module Name:src Committed By: christos Date: Sat Feb 17 17:43:21 UTC 2024 Modified Files: src/external/bsd/nsd/dist: configlexer.c configparser.c configparser.h configure configure.ac options.c server.c util.h zlexer.c src/external/bsd/nsd/dist/doc: README src/external/bsd/nsd/include: config.h src/external/bsd/nsd/lib/libnsd: Makefile Removed Files: src/external/bsd/nsd/dist: udbradtree.c udbradtree.h udbzone.c udbzone.h src/external/bsd/nsd/dist/.github: FUNDING.yml src/external/bsd/nsd/dist/contrib: nsd.socket Log Message: merge differences between nsd-4.6.0 and nsd-4.8.0 To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/bsd/nsd/dist/configlexer.c \ src/external/bsd/nsd/dist/configparser.c \ src/external/bsd/nsd/dist/configparser.h cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nsd/dist/configure cvs rdiff -u -r1.5 -r1.6 src/external/bsd/nsd/dist/configure.ac cvs rdiff -u -r1.4 -r1.5 src/external/bsd/nsd/dist/options.c cvs rdiff -u -r1.7 -r1.8 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.1.1.3 -r0 src/external/bsd/nsd/dist/udbradtree.c cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/nsd/dist/udbradtree.h \ src/external/bsd/nsd/dist/udbzone.h cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/nsd/dist/udbzone.c cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/nsd/dist/.github/FUNDING.yml cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/nsd/dist/contrib/nsd.socket cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nsd/dist/doc/README cvs rdiff -u -r1.11 -r1.12 src/external/bsd/nsd/include/config.h cvs rdiff -u -r1.5 -r1.6 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.
CVS commit: src/external/bsd/nsd/lib/libnsd
Module Name:src Committed By: christos Date: Fri May 12 02:26:48 UTC 2023 Modified Files: src/external/bsd/nsd/lib/libnsd: Makefile Log Message: Handle OpenSSL-3.x To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 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.
CVS commit: src/external/bsd/nsd/lib/libnsd
Module Name:src
Committed By: christos
Date: Fri May 12 02:26:48 UTC 2023
Modified Files:
src/external/bsd/nsd/lib/libnsd: Makefile
Log Message:
Handle OpenSSL-3.x
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 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.
Modified files:
Index: src/external/bsd/nsd/lib/libnsd/Makefile
diff -u src/external/bsd/nsd/lib/libnsd/Makefile:1.4 src/external/bsd/nsd/lib/libnsd/Makefile:1.5
--- src/external/bsd/nsd/lib/libnsd/Makefile:1.4 Thu May 11 12:18:31 2023
+++ src/external/bsd/nsd/lib/libnsd/Makefile Thu May 11 22:26:48 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/05/11 16:18:31 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/05/12 02:26:48 christos Exp $
LIBISPRIVATE=yes
.include
@@ -52,6 +52,8 @@ LIBDPLIBS+= ${DPLIBS}
.include
COPTS.tsig-openssl.c+= -Wno-error=deprecated-declarations
+COPTS.iterated_hash.c+= -Wno-error=deprecated-declarations
+
# Use the generated files
.y.c:
CVS commit: src/external/bsd/nsd
Module Name:src
Committed By: christos
Date: Thu May 11 16:18:31 UTC 2023
Modified Files:
src/external/bsd/nsd/lib/libnsd: Makefile
src/external/bsd/nsd/sbin/nsd: Makefile
src/external/bsd/nsd/sbin/nsd-checkzone: Makefile
src/external/bsd/nsd/sbin/nsd-control: Makefile
Log Message:
Handle OpenSSL-3.x
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nsd/lib/libnsd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nsd/sbin/nsd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nsd/sbin/nsd-checkzone/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nsd/sbin/nsd-control/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nsd/lib/libnsd/Makefile
diff -u src/external/bsd/nsd/lib/libnsd/Makefile:1.3 src/external/bsd/nsd/lib/libnsd/Makefile:1.4
--- src/external/bsd/nsd/lib/libnsd/Makefile:1.3 Sat Sep 24 13:38:18 2022
+++ src/external/bsd/nsd/lib/libnsd/Makefile Thu May 11 12:18:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/09/24 17:38:18 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/05/11 16:18:31 christos Exp $
LIBISPRIVATE=yes
.include
@@ -51,5 +51,7 @@ LIBDPLIBS+= ${DPLIBS}
.include
+COPTS.tsig-openssl.c+= -Wno-error=deprecated-declarations
+
# Use the generated files
.y.c:
Index: src/external/bsd/nsd/sbin/nsd/Makefile
diff -u src/external/bsd/nsd/sbin/nsd/Makefile:1.1 src/external/bsd/nsd/sbin/nsd/Makefile:1.2
--- src/external/bsd/nsd/sbin/nsd/Makefile:1.1 Sat Jan 7 14:51:22 2017
+++ src/external/bsd/nsd/sbin/nsd/Makefile Thu May 11 12:18:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/01/07 19:51:22 christos Exp $
+# $NetBSD: Makefile,v 1.2 2023/05/11 16:18:31 christos Exp $
PROG=nsd
@@ -18,4 +18,6 @@ zparser.c
MAN+=${PROG}.conf.5
${PROG}.conf.5: ${PROG}.conf.5.in __subst
+COPTS.server.c+= -Wno-error=deprecated-declarations
+
.include
Index: src/external/bsd/nsd/sbin/nsd-checkzone/Makefile
diff -u src/external/bsd/nsd/sbin/nsd-checkzone/Makefile:1.1 src/external/bsd/nsd/sbin/nsd-checkzone/Makefile:1.2
--- src/external/bsd/nsd/sbin/nsd-checkzone/Makefile:1.1 Sat Jan 7 14:51:22 2017
+++ src/external/bsd/nsd/sbin/nsd-checkzone/Makefile Thu May 11 12:18:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/01/07 19:51:22 christos Exp $
+# $NetBSD: Makefile,v 1.2 2023/05/11 16:18:31 christos Exp $
PROG=nsd-checkzone
@@ -15,4 +15,6 @@ zlexer.c \
zonec.c \
zparser.c
+COPTS.server.c+= -Wno-error=deprecated-declarations
+
.include
Index: src/external/bsd/nsd/sbin/nsd-control/Makefile
diff -u src/external/bsd/nsd/sbin/nsd-control/Makefile:1.1 src/external/bsd/nsd/sbin/nsd-control/Makefile:1.2
--- src/external/bsd/nsd/sbin/nsd-control/Makefile:1.1 Sat Jan 7 14:51:22 2017
+++ src/external/bsd/nsd/sbin/nsd-control/Makefile Thu May 11 12:18:31 2023
@@ -1,5 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2017/01/07 19:51:22 christos Exp $
+# $NetBSD: Makefile,v 1.2 2023/05/11 16:18:31 christos Exp $
PROG=nsd-control
+COPTS.nsd-control.c+= -Wno-error=deprecated-declarations
+
.include
CVS commit: src/external/bsd/nsd
Module Name:src Committed By: christos Date: Thu May 11 16:18:31 UTC 2023 Modified Files: src/external/bsd/nsd/lib/libnsd: Makefile src/external/bsd/nsd/sbin/nsd: Makefile src/external/bsd/nsd/sbin/nsd-checkzone: Makefile src/external/bsd/nsd/sbin/nsd-control: Makefile Log Message: Handle OpenSSL-3.x To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nsd/lib/libnsd/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nsd/sbin/nsd/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nsd/sbin/nsd-checkzone/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nsd/sbin/nsd-control/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/nsd
Module Name:src
Committed By: wiz
Date: Wed Dec 21 17:20:07 UTC 2022
Modified Files:
src/external/bsd/nsd: Makefile.inc
Log Message:
Remove unneeded -D_OPENBSD_SOURCE
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/nsd/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nsd/Makefile.inc
diff -u src/external/bsd/nsd/Makefile.inc:1.7 src/external/bsd/nsd/Makefile.inc:1.8
--- src/external/bsd/nsd/Makefile.inc:1.7 Mon Mar 15 19:48:51 2021
+++ src/external/bsd/nsd/Makefile.inc Wed Dec 21 17:20:07 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2021/03/15 19:48:51 christos Exp $
+# $NetBSD: Makefile.inc,v 1.8 2022/12/21 17:20:07 wiz Exp $
.include
@@ -6,7 +6,7 @@ USE_FORT?= yes # network client/server
NSD:=${.PARSEDIR}/dist
-CPPFLAGS+=-D_OPENBSD_SOURCE -D_NETBSD_SOURCE
+CPPFLAGS+=-D_NETBSD_SOURCE
CPPFLAGS+=-I${NSD} -I${NSD}/../include
.PATH: ${NSD}
CVS commit: src/external/bsd/nsd
Module Name:src Committed By: wiz Date: Wed Dec 21 17:20:07 UTC 2022 Modified Files: src/external/bsd/nsd: Makefile.inc Log Message: Remove unneeded -D_OPENBSD_SOURCE To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/bsd/nsd/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/nsd
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.
CVS commit: src/external/bsd/nsd
Module Name:src Committed By: christos Date: Mon Mar 15 19:48:52 UTC 2021 Modified Files: src/external/bsd/nsd: Makefile.inc src/external/bsd/nsd/dist: configlexer.c configparser.c configparser.h configure.ac options.c server.c util.h zlexer.c zparser.c zparser.h src/external/bsd/nsd/include: config.h src/external/bsd/nsd/lib/libnsd: Makefile Removed Files: src/external/bsd/nsd/dist: .travis.yml src/external/bsd/nsd/dist/.buildkite: pipeline.yml src/external/bsd/nsd/dist/contrib: nsd.service Log Message: merge conflicts between our changes for nsd between 4.2.4 and 4.3.5 To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/bsd/nsd/Makefile.inc cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/nsd/dist/.travis.yml cvs rdiff -u -r1.6 -r1.7 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.3 -r1.4 src/external/bsd/nsd/dist/configure.ac cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nsd/dist/options.c cvs rdiff -u -r1.5 -r1.6 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.4 -r1.5 src/external/bsd/nsd/dist/zparser.h cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/nsd/dist/.buildkite/pipeline.yml cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/nsd/dist/contrib/nsd.service cvs rdiff -u -r1.9 -r1.10 src/external/bsd/nsd/include/config.h cvs rdiff -u -r1.1 -r1.2 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.
CVS commit: src/external/bsd/nsd/dist
Module Name:src
Committed By: christos
Date: Mon Sep 7 19:37:21 UTC 2020
Modified Files:
src/external/bsd/nsd/dist: options.c
Log Message:
Simplify to avoid packed struct alignment issue.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 src/external/bsd/nsd/dist/options.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nsd/dist/options.c
diff -u src/external/bsd/nsd/dist/options.c:1.1.1.5 src/external/bsd/nsd/dist/options.c:1.2
--- src/external/bsd/nsd/dist/options.c:1.1.1.5 Sun Dec 15 11:00:54 2019
+++ src/external/bsd/nsd/dist/options.c Mon Sep 7 15:37:21 2020
@@ -1432,17 +1432,18 @@ acl_addr_matches_ipv6host(struct acl_opt
int
acl_addr_matches_ipv4host(struct acl_options* acl, struct sockaddr_in* addr, unsigned int port)
{
+ uint32_t saddr = addr->sin_addr.s_addr;
if(acl->port != 0 && acl->port != port)
return 0;
switch(acl->rangetype) {
case acl_range_mask:
case acl_range_subnet:
- if(!acl_addr_match_mask((uint32_t*)>addr.addr, (uint32_t*)>sin_addr,
+ if(!acl_addr_match_mask((uint32_t*)>addr.addr, ,
(uint32_t*)>range_mask.addr, sizeof(struct in_addr)))
return 0;
break;
case acl_range_minmax:
- if(!acl_addr_match_range((uint32_t*)>addr.addr, (uint32_t*)>sin_addr,
+ if(!acl_addr_match_range((uint32_t*)>addr.addr, ,
(uint32_t*)>range_mask.addr, sizeof(struct in_addr)))
return 0;
break;
CVS commit: src/external/bsd/nsd/dist
Module Name:src Committed By: christos Date: Mon Sep 7 19:37:21 UTC 2020 Modified Files: src/external/bsd/nsd/dist: options.c Log Message: Simplify to avoid packed struct alignment issue. To generate a diff of this commit: cvs rdiff -u -r1.1.1.5 -r1.2 src/external/bsd/nsd/dist/options.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/nsd/include
Module Name:src Committed By: kamil Date: Fri Jul 17 15:44:04 UTC 2020 Modified Files: src/external/bsd/nsd/include: config.h Log Message: Enable support for ppoll() To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/bsd/nsd/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/nsd/include
Module Name:src Committed By: kamil Date: Fri Jul 17 15:44:04 UTC 2020 Modified Files: src/external/bsd/nsd/include: config.h Log Message: Enable support for ppoll() To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/bsd/nsd/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/nsd/include/config.h diff -u src/external/bsd/nsd/include/config.h:1.8 src/external/bsd/nsd/include/config.h:1.9 --- src/external/bsd/nsd/include/config.h:1.8 Sun Dec 15 16:26:04 2019 +++ src/external/bsd/nsd/include/config.h Fri Jul 17 15:44:04 2020 @@ -249,7 +249,7 @@ #define HAVE_OPENSSL_SSL_H 1 /* Define to 1 if you have the `ppoll' function. */ -/* #undef HAVE_PPOLL */ +#define HAVE_PPOLL 1 /* Define to 1 if you have the `pselect' function. */ #define HAVE_PSELECT 1
CVS commit: src/external/bsd/nsd
Module Name:src Committed By: christos Date: Sun Dec 15 16:26:04 UTC 2019 Modified Files: src/external/bsd/nsd/dist: configlexer.c configparser.c configparser.h configure.ac server.c util.h zlexer.c zparser.c src/external/bsd/nsd/include: config.h Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 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.2 -r1.3 src/external/bsd/nsd/dist/configure.ac cvs rdiff -u -r1.4 -r1.5 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.7 -r1.8 src/external/bsd/nsd/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/nsd
Module Name:src Committed By: christos Date: Sat May 25 20:10:22 UTC 2019 Modified Files: src/external/bsd/nsd/dist: configlexer.c configparser.c configparser.h configure.ac server.c zlexer.c zparser.c zparser.h src/external/bsd/nsd/include: config.h Added Files: src/external/bsd/nsd/dist: config.guess config.sub Log Message: - resolve conflicts - Fix autoconf issues 1. Check for login_cap.h 2. Link with -Wl,-R 3. On NetBSD define -D_OPENBSD_SOURCE To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/bsd/nsd/dist/config.guess \ src/external/bsd/nsd/dist/config.sub cvs rdiff -u -r1.4 -r1.5 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.5 -r1.2 src/external/bsd/nsd/dist/configure.ac cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nsd/dist/server.c \ src/external/bsd/nsd/dist/zlexer.c src/external/bsd/nsd/dist/zparser.h cvs rdiff -u -r1.6 -r1.7 src/external/bsd/nsd/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/nsd/sbin
Module Name:src
Committed By: christos
Date: Fri Mar 29 14:38:31 UTC 2019
Modified Files:
src/external/bsd/nsd/sbin: Makefile.inc
Log Message:
Append DPLIBS to PROGDPLIBS so that we can resolve dependencies for static
linking where order is important.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nsd/sbin/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nsd/sbin/Makefile.inc
diff -u src/external/bsd/nsd/sbin/Makefile.inc:1.1 src/external/bsd/nsd/sbin/Makefile.inc:1.2
--- src/external/bsd/nsd/sbin/Makefile.inc:1.1 Sat Jan 7 14:51:21 2017
+++ src/external/bsd/nsd/sbin/Makefile.inc Fri Mar 29 10:38:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2017/01/07 19:51:21 christos Exp $
+# $NetBSD: Makefile.inc,v 1.2 2019/03/29 14:38:30 christos Exp $
.include "../Makefile.inc"
@@ -11,6 +11,7 @@ PROGDPLIBS+= ${DPLIBS}
.if ${PROG} == "nsd" || ${PROG} == "nsd-checkzone"
PROGDPLIBS+= xfrd ${NSD}/../lib/libxfrd
+PROGDPLIBS+= ${DPLIBS}
.endif
CLEANFILES+=${PROG}.8
@@ -19,6 +20,7 @@ ${PROG}.8: ${PROG}.8.in __subst
.endif
+
.if defined(SCRIPTS)
CLEANFILES+=${SCRIPTS}.sh
${SCRIPTS}.sh: ${SCRIPTS}.sh.in __subst
CVS commit: src/external/bsd/nsd/sbin
Module Name:src Committed By: christos Date: Fri Mar 29 14:38:31 UTC 2019 Modified Files: src/external/bsd/nsd/sbin: Makefile.inc Log Message: Append DPLIBS to PROGDPLIBS so that we can resolve dependencies for static linking where order is important. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nsd/sbin/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/nsd
Module Name:src
Committed By: prlw1
Date: Thu Feb 14 14:40:08 UTC 2019
Modified Files:
src/external/bsd/nsd: Makefile.inc
Log Message:
libpthread isn't used
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/nsd/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nsd/Makefile.inc
diff -u src/external/bsd/nsd/Makefile.inc:1.5 src/external/bsd/nsd/Makefile.inc:1.6
--- src/external/bsd/nsd/Makefile.inc:1.5 Fri Oct 12 09:43:59 2018
+++ src/external/bsd/nsd/Makefile.inc Thu Feb 14 14:40:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2018/10/12 09:43:59 hannken Exp $
+# $NetBSD: Makefile.inc,v 1.6 2019/02/14 14:40:07 prlw1 Exp $
.include
@@ -23,7 +23,6 @@ DPLIBS+= ssl ${NETBSDSRCDIR}/crypto/exte
DPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto
DPLIBS+= crypt ${NETBSDSRCDIR}/lib/libcrypt
DPLIBS+= util ${NETBSDSRCDIR}/lib/libutil
-DPLIBS+= pthread ${NETBSDSRCDIR}/lib/libpthread
__subst: .USE
${TOOL_SED} \
CVS commit: src/external/bsd/nsd
Module Name:src Committed By: prlw1 Date: Thu Feb 14 14:40:08 UTC 2019 Modified Files: src/external/bsd/nsd: Makefile.inc Log Message: libpthread isn't used To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/nsd/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/nsd
Module Name:src Committed By: prlw1 Date: Tue Feb 12 16:11:11 UTC 2019 Modified Files: src/external/bsd/nsd/dist: configlexer.c configparser.c configparser.h server.c util.h zparser.c src/external/bsd/nsd/include: config.h Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 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/util.h \ src/external/bsd/nsd/dist/zparser.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nsd/dist/server.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/nsd/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/nsd/dist
Module Name:src Committed By: hannken Date: Tue Nov 20 10:03:39 UTC 2018 Modified Files: src/external/bsd/nsd/dist: server.c Log Message: Fix NSD when built with --enable-recvmmsg: When resetting a query with query_reset(queries[i], ...) always restore the corresponding msgs[i].msg_hdr.msg_namelen from queries[i]->addrlen. After receiving a message set queries[i]->addrlen to the received msg_namelen. Reported upstream, will be fixed for 4.1.26 To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/nsd/dist/server.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/nsd/dist
Module Name:src
Committed By: hannken
Date: Tue Nov 20 10:03:39 UTC 2018
Modified Files:
src/external/bsd/nsd/dist: server.c
Log Message:
Fix NSD when built with --enable-recvmmsg:
When resetting a query with query_reset(queries[i], ...) always restore the
corresponding msgs[i].msg_hdr.msg_namelen from queries[i]->addrlen.
After receiving a message set queries[i]->addrlen to the received msg_namelen.
Reported upstream, will be fixed for 4.1.26
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/nsd/dist/server.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nsd/dist/server.c
diff -u src/external/bsd/nsd/dist/server.c:1.1.1.3 src/external/bsd/nsd/dist/server.c:1.2
--- src/external/bsd/nsd/dist/server.c:1.1.1.3 Mon Sep 3 11:29:15 2018
+++ src/external/bsd/nsd/dist/server.c Tue Nov 20 10:03:39 2018
@@ -2209,6 +2209,7 @@ handle_udp(int fd, short event, void* ar
for (i = 0; i < recvcount; i++) {
loopstart:
received = msgs[i].msg_len;
+ queries[i]->addrlen = msgs[i].msg_hdr.msg_namelen;
q = queries[i];
if (received == -1) {
log_msg(LOG_ERR, "recvmmsg %d failed %s", i, strerror(
@@ -2217,6 +2218,7 @@ handle_udp(int fd, short event, void* ar
/* No zone statup */
query_reset(queries[i], UDP_MAX_MESSAGE_LEN, 0);
iovecs[i].iov_len = buffer_remaining(q->packet);
+ msgs[i].msg_hdr.msg_namelen = queries[i]->addrlen;
goto swap_drop;
}
@@ -2264,6 +2266,7 @@ handle_udp(int fd, short event, void* ar
} else {
query_reset(queries[i], UDP_MAX_MESSAGE_LEN, 0);
iovecs[i].iov_len = buffer_remaining(q->packet);
+ msgs[i].msg_hdr.msg_namelen = queries[i]->addrlen;
swap_drop:
STATUP(data->nsd, dropped);
ZTATUP(data->nsd, q->zone, dropped);
@@ -2304,6 +2307,7 @@ handle_udp(int fd, short event, void* ar
for(i=0; ipacket);
+ msgs[i].msg_hdr.msg_namelen = queries[i]->addrlen;
}
}
@@ -2344,13 +2348,15 @@ handle_udp(int fd, short event, void* ar
}
for (i = 0; i < recvcount; i++) {
received = msgs[i].msg_len;
- msgs[i].msg_hdr.msg_namelen = queries[i]->addrlen;
+ queries[i]->addrlen = msgs[i].msg_hdr.msg_namelen;
if (received == -1) {
log_msg(LOG_ERR, "recvmmsg failed");
STATUP(data->nsd, rxerr);
/* No zone statup */
/* the error can be found in msgs[i].msg_hdr.msg_flags */
query_reset(queries[i], UDP_MAX_MESSAGE_LEN, 0);
+ iovecs[i].iov_len = buffer_remaining(queries[i]->packet);
+ msgs[i].msg_hdr.msg_namelen = queries[i]->addrlen;
continue;
}
q = queries[i];
@@ -2442,6 +2448,8 @@ handle_udp(int fd, short event, void* ar
#ifndef NONBLOCKING_IS_BROKEN
#ifdef HAVE_RECVMMSG
query_reset(queries[i], UDP_MAX_MESSAGE_LEN, 0);
+ iovecs[i].iov_len = buffer_remaining(queries[i]->packet);
+ msgs[i].msg_hdr.msg_namelen = queries[i]->addrlen;
#endif
}
#endif
CVS commit: src/external/bsd/nsd/include
Module Name:src
Committed By: hannken
Date: Mon Nov 12 09:21:45 UTC 2018
Modified Files:
src/external/bsd/nsd/include: config.h
Log Message:
Re-enable {send,recv}mmsg now they are working.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/nsd/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/external/bsd/nsd/include
Module Name:src
Committed By: hannken
Date: Mon Nov 12 09:21:45 UTC 2018
Modified Files:
src/external/bsd/nsd/include: config.h
Log Message:
Re-enable {send,recv}mmsg now they are working.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/nsd/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nsd/include/config.h
diff -u src/external/bsd/nsd/include/config.h:1.4 src/external/bsd/nsd/include/config.h:1.5
--- src/external/bsd/nsd/include/config.h:1.4 Thu Nov 1 19:11:31 2018
+++ src/external/bsd/nsd/include/config.h Mon Nov 12 09:21:45 2018
@@ -233,13 +233,11 @@
/* Define to 1 if you have the `reallocarray' function. */
#define HAVE_REALLOCARRAY 1
-#ifdef notyet
/* Define if recvmmsg is implemented */
#define HAVE_RECVMMSG 1
/* Define if sendmmsg is implemented */
#define HAVE_SENDMMSG 1
-#endif
/* Define to 1 if you have the `setregid' function. */
#define HAVE_SETREGID 1
CVS commit: src/external/bsd/nsd/include
Module Name:src
Committed By: christos
Date: Thu Nov 1 19:11:31 UTC 2018
Modified Files:
src/external/bsd/nsd/include: config.h
Log Message:
Disable {send,recv}mmsg until we make our syscalls not have "sticky" errors.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nsd/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nsd/include/config.h
diff -u src/external/bsd/nsd/include/config.h:1.3 src/external/bsd/nsd/include/config.h:1.4
--- src/external/bsd/nsd/include/config.h:1.3 Mon Sep 3 07:40:09 2018
+++ src/external/bsd/nsd/include/config.h Thu Nov 1 15:11:31 2018
@@ -233,11 +233,13 @@
/* Define to 1 if you have the `reallocarray' function. */
#define HAVE_REALLOCARRAY 1
+#ifdef notyet
/* Define if recvmmsg is implemented */
#define HAVE_RECVMMSG 1
/* Define if sendmmsg is implemented */
#define HAVE_SENDMMSG 1
+#endif
/* Define to 1 if you have the `setregid' function. */
#define HAVE_SETREGID 1
CVS commit: src/external/bsd/nsd/include
Module Name:src
Committed By: christos
Date: Thu Nov 1 19:11:31 UTC 2018
Modified Files:
src/external/bsd/nsd/include: config.h
Log Message:
Disable {send,recv}mmsg until we make our syscalls not have "sticky" errors.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nsd/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/external/bsd/nsd/dist
Module Name:src Committed By: christos Date: Fri Oct 12 18:02:59 UTC 2018 Removed Files: src/external/bsd/nsd/dist: o Log Message: remove accidental commit debris. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/nsd/dist/o Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/nsd/dist
Module Name:src Committed By: christos Date: Fri Oct 12 18:02:59 UTC 2018 Removed Files: src/external/bsd/nsd/dist: o Log Message: remove accidental commit debris. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/nsd/dist/o Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/nsd
Module Name:src Committed By: hannken Date: Fri Oct 12 09:43:59 UTC 2018 Modified Files: src/external/bsd/nsd: Makefile.inc Log Message: Fix obvious typo: add missing equal sign. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/nsd/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/nsd
Module Name:src
Committed By: hannken
Date: Fri Oct 12 09:43:59 UTC 2018
Modified Files:
src/external/bsd/nsd: Makefile.inc
Log Message:
Fix obvious typo: add missing equal sign.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/nsd/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nsd/Makefile.inc
diff -u src/external/bsd/nsd/Makefile.inc:1.4 src/external/bsd/nsd/Makefile.inc:1.5
--- src/external/bsd/nsd/Makefile.inc:1.4 Fri Feb 9 17:13:27 2018
+++ src/external/bsd/nsd/Makefile.inc Fri Oct 12 09:43:59 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2018/02/09 17:13:27 christos Exp $
+# $NetBSD: Makefile.inc,v 1.5 2018/10/12 09:43:59 hannken Exp $
.include
@@ -15,7 +15,7 @@ CPPFLAGS+= -DINET6
.endif
.if ${HAVE_OPENSSL} < 11
-CPPFLAGS+= -DOPENSSL_API_COMPAT 0x1010L
+CPPFLAGS+= -DOPENSSL_API_COMPAT=0x1010L
.endif
DPLIBS+= event ${NETBSDSRCDIR}/external/bsd/libevent/lib/libevent
CVS commit: src/external/bsd/nsd/etc/rc.d
Module Name:src
Committed By: christos
Date: Fri Sep 7 16:51:13 UTC 2018
Modified Files:
src/external/bsd/nsd/etc/rc.d: nsd
Log Message:
make a link to the pid file so the rc scripts can find it.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nsd/etc/rc.d/nsd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nsd/etc/rc.d/nsd
diff -u src/external/bsd/nsd/etc/rc.d/nsd:1.1 src/external/bsd/nsd/etc/rc.d/nsd:1.2
--- src/external/bsd/nsd/etc/rc.d/nsd:1.1 Sat Jan 7 14:51:21 2017
+++ src/external/bsd/nsd/etc/rc.d/nsd Fri Sep 7 12:51:12 2018
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: nsd,v 1.1 2017/01/07 19:51:21 christos Exp $
+# $NetBSD: nsd,v 1.2 2018/09/07 16:51:12 christos Exp $
#
# PROVIDE: named
@@ -62,13 +62,14 @@ nsd_migrate()
nsd_precmd()
{
- if [ -z "$nsd_chrootdir" ]; then
+ if [ -z "${nsd_chrootdir}" ]; then
return
fi
if [ ! -h /etc/nsd ]; then
nsd_migrate /etc/nsd ${nsd_chrootdir}
fi
+ ln -sf "${nsd_chrootdir}${pidfile}" "${pidfile}"
}
load_rc_config $name
CVS commit: src/external/bsd/nsd/etc/rc.d
Module Name:src Committed By: christos Date: Fri Sep 7 16:51:13 UTC 2018 Modified Files: src/external/bsd/nsd/etc/rc.d: nsd Log Message: make a link to the pid file so the rc scripts can find it. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nsd/etc/rc.d/nsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/nsd/dist
Module Name:src Committed By: christos Date: Tue Sep 4 22:38:55 UTC 2018 Added Files: src/external/bsd/nsd/dist: configlexer.c configparser.c configparser.h zlexer.c zparser.c zparser.h Log Message: add back the yacc and lex generated files To generate a diff of this commit: cvs rdiff -u -r0 -r1.3 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/zlexer.c src/external/bsd/nsd/dist/zparser.c \ src/external/bsd/nsd/dist/zparser.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/nsd
Module Name:src Committed By: christos Date: Mon Sep 3 11:40:09 UTC 2018 Modified Files: src/external/bsd/nsd/include: config.h Removed Files: src/external/bsd/nsd/dist: configlexer.c configparser.c configparser.h zlexer.c zparser.c zparser.h Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r0 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/zlexer.c src/external/bsd/nsd/dist/zparser.c \ src/external/bsd/nsd/dist/zparser.h cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nsd/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/nsd/include/config.h diff -u src/external/bsd/nsd/include/config.h:1.2 src/external/bsd/nsd/include/config.h:1.3 --- src/external/bsd/nsd/include/config.h:1.2 Fri Feb 9 12:13:27 2018 +++ src/external/bsd/nsd/include/config.h Mon Sep 3 07:40:09 2018 @@ -26,6 +26,9 @@ /* Define to the default facility for syslog. */ #define FACILITY LOG_DAEMON +/* Define to 1 if you have the `accept4' function. */ +#define HAVE_ACCEPT4 1 + /* Define to 1 if you have the `alarm' function. */ #define HAVE_ALARM 1 @@ -69,7 +72,7 @@ #define HAVE_DUP2 1 /* Define to 1 if you have the header file. */ -/* #undef HAVE_ENDIAN_H */ +#define HAVE_ENDIAN_H 1 /* Define to 1 if you have the `endpwent' function. */ #define HAVE_ENDPWENT 1 @@ -317,6 +320,9 @@ /* Define to 1 if you have the `strtol' function. */ #define HAVE_STRTOL 1 +/* Define to 1 if `sun_len' is a member of `struct sockaddr_un'. */ +#define HAVE_STRUCT_SOCKADDR_UN_SUN_LEN 1 + /* Define to 1 if `st_mtimensec' is a member of `struct stat'. */ #define HAVE_STRUCT_STAT_ST_MTIMENSEC 1 @@ -350,6 +356,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_SYS_TYPES_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_UN_H 1 + /* Define to 1 if you have that is POSIX.1 compatible. */ #define HAVE_SYS_WAIT_H 1 @@ -397,6 +406,9 @@ /* Define to the maximum message length to pass to syslog. */ #define MAXSYSLOGMSGLEN 512 +/* Define this to cleanup memory at exit (eg. for valgrind, etc.) */ +/* #undef MEMCLEAN */ + /* Define if memcmp() does not compare unsigned bytes */ /* #undef MEMCMP_IS_BROKEN */ @@ -432,7 +444,7 @@ #define PACKAGE_NAME "NSD" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "NSD 4.1.19" +#define PACKAGE_STRING "NSD 4.1.24" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "nsd" @@ -441,7 +453,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "4.1.19" +#define PACKAGE_VERSION "4.1.24" /* Define this to use packed structure alignment. */ /* #undef PACKED_STRUCTS */
CVS commit: src/external/bsd/nsd
Module Name:src Committed By: christos Date: Mon Sep 3 11:40:09 UTC 2018 Modified Files: src/external/bsd/nsd/include: config.h Removed Files: src/external/bsd/nsd/dist: configlexer.c configparser.c configparser.h zlexer.c zparser.c zparser.h Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r0 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/zlexer.c src/external/bsd/nsd/dist/zparser.c \ src/external/bsd/nsd/dist/zparser.h cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nsd/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/nsd
Module Name:src
Committed By: christos
Date: Fri Feb 9 17:13:27 UTC 2018
Modified Files:
src/external/bsd/nsd: Makefile.inc
src/external/bsd/nsd/dist: util.h
src/external/bsd/nsd/include: config.h
Log Message:
fix for OpenSSL 1.0 and 1.1 co-existance, merge conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nsd/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nsd/dist/util.h
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nsd/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nsd/Makefile.inc
diff -u src/external/bsd/nsd/Makefile.inc:1.3 src/external/bsd/nsd/Makefile.inc:1.4
--- src/external/bsd/nsd/Makefile.inc:1.3 Sat Feb 3 22:19:52 2018
+++ src/external/bsd/nsd/Makefile.inc Fri Feb 9 12:13:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2018/02/04 03:19:52 christos Exp $
+# $NetBSD: Makefile.inc,v 1.4 2018/02/09 17:13:27 christos Exp $
.include
@@ -14,6 +14,10 @@ CPPFLAGS+=-I${NSD} -I${NSD}/../include
CPPFLAGS+= -DINET6
.endif
+.if ${HAVE_OPENSSL} < 11
+CPPFLAGS+= -DOPENSSL_API_COMPAT 0x1010L
+.endif
+
DPLIBS+= event ${NETBSDSRCDIR}/external/bsd/libevent/lib/libevent
DPLIBS+= ssl ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libssl
DPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto
Index: src/external/bsd/nsd/dist/util.h
diff -u src/external/bsd/nsd/dist/util.h:1.2 src/external/bsd/nsd/dist/util.h:1.3
--- src/external/bsd/nsd/dist/util.h:1.2 Sat Jan 7 14:53:21 2017
+++ src/external/bsd/nsd/dist/util.h Fri Feb 9 12:13:27 2018
@@ -25,6 +25,10 @@ struct region;
# define LOG_WARNING 4
# define LOG_NOTICE 5
# define LOG_INFO 6
+
+/* Unused, but passed to log_open. */
+# define LOG_PID 0x01
+# define LOG_DAEMON (3<<3)
#endif
#define ALIGN_UP(n, alignment) \
Index: src/external/bsd/nsd/include/config.h
diff -u src/external/bsd/nsd/include/config.h:1.1 src/external/bsd/nsd/include/config.h:1.2
--- src/external/bsd/nsd/include/config.h:1.1 Sat Jan 7 14:51:21 2017
+++ src/external/bsd/nsd/include/config.h Fri Feb 9 12:13:27 2018
@@ -138,10 +138,10 @@
#define HAVE_GRP_H 1
/* Define to 1 if you have the `HMAC_CTX_new' function. */
-/* #undef HAVE_HMAC_CTX_NEW */
+#define HAVE_HMAC_CTX_NEW 1
/* Define to 1 if you have the `HMAC_CTX_reset' function. */
-/* #undef HAVE_HMAC_CTX_RESET */
+#define HAVE_HMAC_CTX_RESET 1
/* Define to 1 if you have the `inet_aton' function. */
#define HAVE_INET_ATON 1
@@ -432,7 +432,7 @@
#define PACKAGE_NAME "NSD"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "NSD 4.1.14"
+#define PACKAGE_STRING "NSD 4.1.19"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "nsd"
@@ -441,7 +441,10 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "4.1.14"
+#define PACKAGE_VERSION "4.1.19"
+
+/* Define this to use packed structure alignment. */
+/* #undef PACKED_STRUCTS */
/* Pathname to the NSD pidfile */
#define PIDFILE CHROOTDIR "/var/run/nsd.pid"
@@ -837,3 +840,8 @@ int memcmp(const void *x, const void *y,
#endif /* !HAVE_STRUCT_TIMESPEC */
#endif /* !CONFIG_DEFINES */
+#ifdef PACKED_STRUCTS
+#define ATTR_PACKED __attribute__((__packed__))
+#else
+#define ATTR_PACKED
+#endif
CVS commit: src/external/bsd/nsd
Module Name:src Committed By: christos Date: Fri Feb 9 17:13:27 UTC 2018 Modified Files: src/external/bsd/nsd: Makefile.inc src/external/bsd/nsd/dist: util.h src/external/bsd/nsd/include: config.h Log Message: fix for OpenSSL 1.0 and 1.1 co-existance, merge conflicts. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nsd/Makefile.inc cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nsd/dist/util.h cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nsd/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/nsd
Module Name:src Committed By: christos Date: Wed Jul 12 12:55:41 UTC 2017 Modified Files: src/external/bsd/nsd: Makefile.inc Log Message: Oops, support IPv6 if not disabled. XXX: pullup-8 To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nsd/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/nsd
Module Name:src
Committed By: christos
Date: Wed Jul 12 12:55:41 UTC 2017
Modified Files:
src/external/bsd/nsd: Makefile.inc
Log Message:
Oops, support IPv6 if not disabled.
XXX: pullup-8
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nsd/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nsd/Makefile.inc
diff -u src/external/bsd/nsd/Makefile.inc:1.1 src/external/bsd/nsd/Makefile.inc:1.2
--- src/external/bsd/nsd/Makefile.inc:1.1 Sat Jan 7 14:51:21 2017
+++ src/external/bsd/nsd/Makefile.inc Wed Jul 12 08:55:41 2017
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.1 2017/01/07 19:51:21 christos Exp $
+# $NetBSD: Makefile.inc,v 1.2 2017/07/12 12:55:41 christos Exp $
+
+.include
USE_FORT?= yes # network client/server
@@ -8,6 +10,10 @@ CPPFLAGS+=-D_OPENBSD_SOURCE
CPPFLAGS+=-I${NSD} -I${NSD}/../include
.PATH: ${NSD}
+.if (${USE_INET6} != "no")
+CPPFLAGS+= -DINET6
+.endif
+
DPLIBS+= event ${NETBSDSRCDIR}/external/bsd/libevent/lib/libevent
DPLIBS+= ssl ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libssl
DPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
CVS commit: src/external/bsd/nsd/etc
Module Name:src Committed By: christos Date: Wed Feb 8 16:21:24 UTC 2017 Modified Files: src/external/bsd/nsd/etc: Makefile Log Message: need FILESBUILD_ To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nsd/etc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/nsd/etc/Makefile diff -u src/external/bsd/nsd/etc/Makefile:1.2 src/external/bsd/nsd/etc/Makefile:1.3 --- src/external/bsd/nsd/etc/Makefile:1.2 Tue Feb 7 17:34:37 2017 +++ src/external/bsd/nsd/etc/Makefile Wed Feb 8 11:21:24 2017 @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.2 2017/02/07 22:34:37 christos Exp $ +# $NetBSD: Makefile,v 1.3 2017/02/08 16:21:24 christos Exp $ SUBDIR=rc.d FILESDIR= /usr/share/examples/nsd FILESMODE=644 FILES= nsd.conf +FILESBUILD_nsd.conf=yes nsd.conf: nsd.conf.sample.in __subst CLEANFILES+= nsd.conf
CVS commit: src/external/bsd/nsd/etc
Module Name:src Committed By: christos Date: Wed Feb 8 16:21:24 UTC 2017 Modified Files: src/external/bsd/nsd/etc: Makefile Log Message: need FILESBUILD_ To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nsd/etc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/nsd/dist
Module Name:src Committed By: christos Date: Sat Jan 7 19:53:21 UTC 2017 Modified Files: src/external/bsd/nsd/dist: util.h Log Message: undef debug To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/nsd/dist/util.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/nsd/dist/util.h diff -u src/external/bsd/nsd/dist/util.h:1.1.1.1 src/external/bsd/nsd/dist/util.h:1.2 --- src/external/bsd/nsd/dist/util.h:1.1.1.1 Sat Jan 7 14:42:00 2017 +++ src/external/bsd/nsd/dist/util.h Sat Jan 7 14:53:21 2017 @@ -268,6 +268,7 @@ read_uint64(const void *src) extern unsigned nsd_debug_facilities; extern int nsd_debug_level; +#undef DEBUG /* XXX */ #ifdef NDEBUG #define DEBUG(facility, level, args) /* empty */ #else
CVS commit: src/external/bsd/nsd/dist
Module Name:src Committed By: christos Date: Sat Jan 7 19:53:21 UTC 2017 Modified Files: src/external/bsd/nsd/dist: util.h Log Message: undef debug To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/nsd/dist/util.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/nsd
Module Name:src
Committed By: christos
Date: Sat Jan 7 19:51:22 UTC 2017
Added Files:
src/external/bsd/nsd: Makefile Makefile.inc
src/external/bsd/nsd/etc: Makefile
src/external/bsd/nsd/etc/rc.d: Makefile nsd
src/external/bsd/nsd/include: config.h
src/external/bsd/nsd/lib: Makefile Makefile.inc
src/external/bsd/nsd/lib/libnsd: Makefile
src/external/bsd/nsd/lib/libxfrd: Makefile
src/external/bsd/nsd/sbin: Makefile Makefile.inc
src/external/bsd/nsd/sbin/nsd: Makefile
src/external/bsd/nsd/sbin/nsd-checkconf: Makefile
src/external/bsd/nsd/sbin/nsd-checkzone: Makefile
src/external/bsd/nsd/sbin/nsd-control: Makefile
src/external/bsd/nsd/sbin/nsd-control-setup: Makefile
Log Message:
Add nsd build glue
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/nsd/Makefile \
src/external/bsd/nsd/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/nsd/etc/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/nsd/etc/rc.d/Makefile \
src/external/bsd/nsd/etc/rc.d/nsd
cvs rdiff -u -r0 -r1.1 src/external/bsd/nsd/include/config.h
cvs rdiff -u -r0 -r1.1 src/external/bsd/nsd/lib/Makefile \
src/external/bsd/nsd/lib/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/nsd/lib/libnsd/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/nsd/lib/libxfrd/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/nsd/sbin/Makefile \
src/external/bsd/nsd/sbin/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/nsd/sbin/nsd/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/nsd/sbin/nsd-checkconf/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/nsd/sbin/nsd-checkzone/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/nsd/sbin/nsd-control/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/nsd/sbin/nsd-control-setup/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/bsd/nsd/Makefile
diff -u /dev/null src/external/bsd/nsd/Makefile:1.1
--- /dev/null Sat Jan 7 14:51:22 2017
+++ src/external/bsd/nsd/Makefile Sat Jan 7 14:51:21 2017
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2017/01/07 19:51:21 christos Exp $
+
+SUBDIR+= lib .WAIT sbin etc
+
+.include
Index: src/external/bsd/nsd/Makefile.inc
diff -u /dev/null src/external/bsd/nsd/Makefile.inc:1.1
--- /dev/null Sat Jan 7 14:51:22 2017
+++ src/external/bsd/nsd/Makefile.inc Sat Jan 7 14:51:21 2017
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile.inc,v 1.1 2017/01/07 19:51:21 christos Exp $
+
+USE_FORT?= yes # network client/server
+
+NSD:=${.PARSEDIR}/dist
+
+CPPFLAGS+=-D_OPENBSD_SOURCE
+CPPFLAGS+=-I${NSD} -I${NSD}/../include
+.PATH: ${NSD}
+
+DPLIBS+= event ${NETBSDSRCDIR}/external/bsd/libevent/lib/libevent
+DPLIBS+= ssl ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libssl
+DPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
+DPLIBS+= crypt ${NETBSDSRCDIR}/lib/libcrypt
+DPLIBS+= util ${NETBSDSRCDIR}/lib/libutil
+DPLIBS+= pthread ${NETBSDSRCDIR}/lib/libpthread
+
+__subst: .USE
+ ${TOOL_SED} \
+ -e s,@nsdconfigfile@,/etc/nsd/nsd.conf, \
+ -e s,@configdir@,/etc/nsd, \
+ -e s,@dbfile@,/var/db/nsd/nsd.db, \
+ -e s,@pidfile@,/var/run/nsd.pid, \
+ -e s,@zonelistfile@,/var/db/nsd/zone.list, \
+ -e s,@zonesdir@,/etc/namedb, \
+ -e s,@user@,_nsd, \
+ -e s,@logfile@,/var/log/nsd.log, \
+ -e s,@xfrdfile@,/var/db/nsd/xfdr.state, \
+ -e s,@xfrddir@,/var/tmp, \
+ -e s,@chrootdir@,/var/chroot/nsd, \
+ -e s,@ratelimit_default@,0, < ${.ALLSRC} > ${.TARGET}
Index: src/external/bsd/nsd/etc/Makefile
diff -u /dev/null src/external/bsd/nsd/etc/Makefile:1.1
--- /dev/null Sat Jan 7 14:51:22 2017
+++ src/external/bsd/nsd/etc/Makefile Sat Jan 7 14:51:21 2017
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2017/01/07 19:51:21 christos Exp $
+
+SUBDIR=rc.d
+
+FILESDIR= /etc/nsd
+FILESMODE=644
+FILES= nsd.conf
+
+nsd.conf: nsd.conf.sample.in __subst
+CLEANFILES+= nsd.conf
+
+.include
+.include
Index: src/external/bsd/nsd/etc/rc.d/Makefile
diff -u /dev/null src/external/bsd/nsd/etc/rc.d/Makefile:1.1
--- /dev/null Sat Jan 7 14:51:22 2017
+++ src/external/bsd/nsd/etc/rc.d/Makefile Sat Jan 7 14:51:21 2017
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.1 2017/01/07 19:51:21 christos Exp $
+
+SCRIPTS=nsd
+SCRIPTSDIR=/etc/rc.d
+
+.include
Index: src/external/bsd/nsd/etc/rc.d/nsd
diff -u /dev/null src/external/bsd/nsd/etc/rc.d/nsd:1.1
--- /dev/null Sat Jan 7 14:51:22 2017
+++ src/external/bsd/nsd/etc/rc.d/nsd Sat Jan 7 14:51:21 2017
@@ -0,0 +1,75 @@
+#!/bin/sh
+#
+# $NetBSD: nsd,v 1.1 2017/01/07 19:51:21 christos Exp $
+#
+
+# PROVIDE: named
+# REQUIRE: NETWORKING mountcritremote syslogd
+# BEFORE: DAEMON
+# KEYWORD: chrootdir
+
+$_rc_subr_loaded . /etc/rc.subr
+
+name="nsd"
+rcvar=$name
+command="/usr/sbin/${name}"
+pidfile="/var/run/${name}.pid"
+required_files="/etc/${name}/${name}.conf"
CVS commit: src/external/bsd/nsd
Module Name:src Committed By: christos Date: Sat Jan 7 19:51:22 UTC 2017 Added Files: src/external/bsd/nsd: Makefile Makefile.inc src/external/bsd/nsd/etc: Makefile src/external/bsd/nsd/etc/rc.d: Makefile nsd src/external/bsd/nsd/include: config.h src/external/bsd/nsd/lib: Makefile Makefile.inc src/external/bsd/nsd/lib/libnsd: Makefile src/external/bsd/nsd/lib/libxfrd: Makefile src/external/bsd/nsd/sbin: Makefile Makefile.inc src/external/bsd/nsd/sbin/nsd: Makefile src/external/bsd/nsd/sbin/nsd-checkconf: Makefile src/external/bsd/nsd/sbin/nsd-checkzone: Makefile src/external/bsd/nsd/sbin/nsd-control: Makefile src/external/bsd/nsd/sbin/nsd-control-setup: Makefile Log Message: Add nsd build glue To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/bsd/nsd/Makefile \ src/external/bsd/nsd/Makefile.inc cvs rdiff -u -r0 -r1.1 src/external/bsd/nsd/etc/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/nsd/etc/rc.d/Makefile \ src/external/bsd/nsd/etc/rc.d/nsd cvs rdiff -u -r0 -r1.1 src/external/bsd/nsd/include/config.h cvs rdiff -u -r0 -r1.1 src/external/bsd/nsd/lib/Makefile \ src/external/bsd/nsd/lib/Makefile.inc cvs rdiff -u -r0 -r1.1 src/external/bsd/nsd/lib/libnsd/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/nsd/lib/libxfrd/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/nsd/sbin/Makefile \ src/external/bsd/nsd/sbin/Makefile.inc cvs rdiff -u -r0 -r1.1 src/external/bsd/nsd/sbin/nsd/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/nsd/sbin/nsd-checkconf/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/nsd/sbin/nsd-checkzone/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/nsd/sbin/nsd-control/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/nsd/sbin/nsd-control-setup/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
