Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src unbound additions
details: https://anonhg.NetBSD.org/src/rev/489b6a55b3df
branches: trunk
changeset: 347297:489b6a55b3df
user: christos <christos%NetBSD.org@localhost>
date: Sat Aug 20 11:21:50 2016 +0000
description:
unbound additions
diffstat:
doc/3RDPARTY | 16 +++++++++++++++-
doc/CHANGES | 3 ++-
etc/defaults/rc.conf | 6 +++++-
etc/group | 1 +
etc/master.passwd | 1 +
etc/mtree/NetBSD.dist.base | 6 +++++-
external/bsd/Makefile | 5 ++++-
lib/Makefile | 5 ++++-
share/mk/bsd.README | 13 ++++++++-----
share/mk/bsd.own.mk | 3 ++-
share/mk/bsd.prog.mk | 3 ++-
usr.sbin/postinstall/postinstall | 38 ++++++++++++++++++++++++++------------
12 files changed, 75 insertions(+), 25 deletions(-)
diffs (truncated from 304 to 300 lines):
diff -r 9d396a9e1c71 -r 489b6a55b3df doc/3RDPARTY
--- a/doc/3RDPARTY Sat Aug 20 11:20:31 2016 +0000
+++ b/doc/3RDPARTY Sat Aug 20 11:21:50 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.1351 2016/08/15 11:06:46 roy Exp $
+# $NetBSD: 3RDPARTY,v 1.1352 2016/08/20 11:25:45 christos Exp $
#
# This file contains a list of the software that has been integrated into
# NetBSD where we are not the primary maintainer.
@@ -131,6 +131,20 @@
Then binclude4netbsd script to import into src/external/bsd/bind/include.
The libc and include parts of the resolver are now part of libbind.
+Package: unbound
+Version: 1.5.9
+Current Vers: 1.5.9
+Maintainer: Christos Zoulas
+Archive Site: https://www.unbound.net/downloads/unbound-latest.tar.gz
+Home Page: https://www.unbound.net/
+Mailing List: https://unbound.nlnetlabs.nl/mailman/listinfo/unbound-users
+Responsible: christos
+License: BSD-like
+Location: external/bsd/unbound/dist
+Notes:
+Use cleantags to import
+run configure and update config files in include
+
Package: libbind [libc resolver and includes]
Version: libbind-6.0-rc1
Current Vers: libbind-6.0
diff -r 9d396a9e1c71 -r 489b6a55b3df doc/CHANGES
--- a/doc/CHANGES Sat Aug 20 11:20:31 2016 +0000
+++ b/doc/CHANGES Sat Aug 20 11:21:50 2016 +0000
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2180 $>
+# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2181 $>
#
#
# [Note: This file does not mention every change made to the NetBSD source tree.
@@ -339,3 +339,4 @@
OpenSSH: Imported 7.3. [christos 20160802]
zoneinfo: Import tzdata2016f. [kre 20160807]
dhcpcd(8): Import dhcpcd-6.11.3. [roy 20160815]
+ unbound: Import 1.5.9. [christos 20160820]
diff -r 9d396a9e1c71 -r 489b6a55b3df etc/defaults/rc.conf
--- a/etc/defaults/rc.conf Sat Aug 20 11:20:31 2016 +0000
+++ b/etc/defaults/rc.conf Sat Aug 20 11:21:50 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rc.conf,v 1.136 2016/01/07 11:51:07 roy Exp $
+# $NetBSD: rc.conf,v 1.137 2016/08/20 11:21:50 christos Exp $
#
# /etc/defaults/rc.conf --
# default configuration of /etc/rc.conf
@@ -387,3 +387,7 @@
# ipv6_prefer, ipv4_prefer, auto
ip6addrctl_policy=auto
ip6addrctl_verbose=NO
+
+# Unbound
+unbound=NO
+unbound_chrootdir=/var/chroot/unbound
diff -r 9d396a9e1c71 -r 489b6a55b3df etc/group
--- a/etc/group Sat Aug 20 11:20:31 2016 +0000
+++ b/etc/group Sat Aug 20 11:21:50 2016 +0000
@@ -27,6 +27,7 @@
_gpio:*:29:
_rtadvd:*:30:
guest:*:31:root
+_unbound:*:32:
nobody:*:39:
utmp:*:45:
authpf:*:72:
diff -r 9d396a9e1c71 -r 489b6a55b3df etc/master.passwd
--- a/etc/master.passwd Sat Aug 20 11:20:31 2016 +0000
+++ b/etc/master.passwd Sat Aug 20 11:21:50 2016 +0000
@@ -19,5 +19,6 @@
_tcpdump:*:27:27::0:0:& pseudo-user:/var/chroot/tcpdump:/sbin/nologin
_tss:*:28:28::0:0:& pseudo-user:/var/tpm:/sbin/nologin
_rtadvd:*:30:30::0:0:& pseudo-user:/var/chroot/rtadvd:/sbin/nologin
+_unbound:*:32:32::0:0:& pseudo-user:/var/chroot/unbound:/sbin/nologin
uucp:*:66:1::0:0:UNIX-to-UNIX Copy:/nonexistent:/sbin/nologin
nobody:*:32767:39::0:0:Unprivileged user:/nonexistent:/sbin/nologin
diff -r 9d396a9e1c71 -r 489b6a55b3df etc/mtree/NetBSD.dist.base
--- a/etc/mtree/NetBSD.dist.base Sat Aug 20 11:20:31 2016 +0000
+++ b/etc/mtree/NetBSD.dist.base Sat Aug 20 11:21:50 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.153 2016/03/12 23:07:05 mrg Exp $
+# $NetBSD: NetBSD.dist.base,v 1.154 2016/08/20 11:21:50 christos Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -61,6 +61,7 @@
./etc/skel
./etc/sliphome
./etc/ssh
+./etc/unbound
./etc/zfs
./lib
./lib/npf
@@ -1283,6 +1284,9 @@
./var/chroot/sshd mode=0755
./var/chroot/tcpdump mode=0755
./var/chroot/tftp-proxy mode=0755
+./var/chroot/unbound mode=0755 uname=_unbound gname=_unbound
+./var/chroot/unbound/etc mode=0755 uname=_unbound gname=_unbound
+./var/chroot/unbound/etc/unbound mode=0755 uname=_unbound gname=_unbound
./var/crash mode=0770
./var/cron
./var/cron/tabs mode=0700
diff -r 9d396a9e1c71 -r 489b6a55b3df external/bsd/Makefile
--- a/external/bsd/Makefile Sat Aug 20 11:20:31 2016 +0000
+++ b/external/bsd/Makefile Sat Aug 20 11:21:50 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2015/09/28 17:12:46 christos Exp $
+# $NetBSD: Makefile,v 1.55 2016/08/20 11:24:48 christos Exp $
.include <bsd.own.mk>
@@ -39,6 +39,9 @@
SUBDIR+= libproc
SUBDIR+= librtld_db
.endif
+.if (${MKCRYPTO} != "no" && ${MKUNBOUND} != "no")
+SUBDIR+= unbound
+.endif
SUBDIR+= blacklist pdisk dhcp nvi ppp smbfs
diff -r 9d396a9e1c71 -r 489b6a55b3df lib/Makefile
--- a/lib/Makefile Sat Aug 20 11:20:31 2016 +0000
+++ b/lib/Makefile Sat Aug 20 11:21:50 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.245 2016/06/05 01:23:58 christos Exp $
+# $NetBSD: Makefile,v 1.246 2016/08/20 11:22:26 christos Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
@@ -224,6 +224,9 @@
SUBDIR+= .WAIT
SUBDIR+= ../external/bsd/bind/lib # depends on heimdal, libcrypto
+.if ${MKCRYPTO} != "no" && ${MKUNBOUND} != "no"
+SUBDIR+= ../external/bsd/unbound/lib # depends on libcrypto
+.endif
.if ${MKDTRACE} != "no"
SUBDIR+= ../external/cddl/osnet/lib/libdtrace # depends on libproc
diff -r 9d396a9e1c71 -r 489b6a55b3df share/mk/bsd.README
--- a/share/mk/bsd.README Sat Aug 20 11:20:31 2016 +0000
+++ b/share/mk/bsd.README Sat Aug 20 11:21:50 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.354 2016/06/14 13:26:45 christos Exp $
+# $NetBSD: bsd.README,v 1.355 2016/08/20 11:23:33 christos Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -369,6 +369,10 @@
MKPROFILE If "no", don't build or install the profiling (*_p.a) libraries.
Default: yes
+MKRADEONFIRMWARE If "no", install the /libdata/firmware/radeon directory,
+ which is necessary for the radeon DRM driver.
+ Default: yes on i386 and amd64, no elsewhere.
+
MKRELRO If "partial", set the non-PLT GOT to read-only. If "full"
also force immediate symbol binding.
Default: no
@@ -408,6 +412,8 @@
infrastructure.
Default: no
+MKUNBOUND If not "no", build and install the "unbound" DNS resolver.
+
MKUNPRIVED If not "no", don't set the owner/group/mode when installing
files or directories, and keep a metadata log of what
the owner/group/mode should be. This allows a
@@ -433,10 +439,6 @@
location can be specified using the X11MOTIFPATH variable.
Default: no
-MKRADEONFIRMWARE If "no", install the /libdata/firmware/radeon directory,
- which is necessary for the radeon DRM driver.
- Default: yes on i386 and amd64, no elsewhere.
-
MKYP If "no", disables building of YP (NIS)
infrastructure (libraries and support programs).
Default: yes
@@ -1640,6 +1642,7 @@
LIBSUPCXX?= ${DESTDIR}/usr/lib/libsupc++.a
LIBTERMINFO?= ${DESTDIR}/usr/lib/libterminfo.a
LIBTRE?= ${DESTDIR}/usr/lib/libtre.a
+ LIBUNBOUND?= ${DESTDIR}/usr/lib/libunbound.a
LIBUSBHID?= ${DESTDIR}/usr/lib/libusbhid.a
LIBUTIL?= ${DESTDIR}/usr/lib/libutil.a
LIBWIND?= ${DESTDIR}/usr/lib/libwind.a
diff -r 9d396a9e1c71 -r 489b6a55b3df share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk Sat Aug 20 11:20:31 2016 +0000
+++ b/share/mk/bsd.own.mk Sat Aug 20 11:21:50 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.944 2016/08/20 00:36:03 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.945 2016/08/20 11:23:33 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1112,6 +1112,7 @@
MKPF MKPIC MKPICINSTALL MKPICLIB MKPOSTFIX MKPROFILE \
MKRUMP \
MKSHARE MKSKEY MKSTATICLIB \
+ MKUNBOUND \
MKX11FONTS \
MKYP
.for var in ${_MKVARS.yes}
diff -r 9d396a9e1c71 -r 489b6a55b3df share/mk/bsd.prog.mk
--- a/share/mk/bsd.prog.mk Sat Aug 20 11:20:31 2016 +0000
+++ b/share/mk/bsd.prog.mk Sat Aug 20 11:21:50 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.299 2016/04/04 15:06:16 joerg Exp $
+# $NetBSD: bsd.prog.mk,v 1.300 2016/08/20 11:23:33 christos Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -199,6 +199,7 @@
supcxx \
terminfo \
tre \
+ unbound \
usbhid \
util \
wind \
diff -r 9d396a9e1c71 -r 489b6a55b3df usr.sbin/postinstall/postinstall
--- a/usr.sbin/postinstall/postinstall Sat Aug 20 11:20:31 2016 +0000
+++ b/usr.sbin/postinstall/postinstall Sat Aug 20 11:21:50 2016 +0000
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.202 2016/01/30 23:45:37 christos Exp $
+# $NetBSD: postinstall,v 1.203 2016/08/20 11:24:13 christos Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1045,7 +1045,8 @@
check_ids "$1" groups "${DEST_DIR}/etc/group" \
"${SRC_DIR}/etc/group" 14 \
named ntpd sshd SKIP _pflogd _rwhod staff _proxy _timedc \
- _sdpd _httpd _mdnsd _tests _tcpdump _tss _gpio _rtadvd
+ _sdpd _httpd _mdnsd _tests _tcpdump _tss _gpio _rtadvd SKIP \
+ _unbound
}
#
@@ -1481,6 +1482,20 @@
sysctl defcorename
"
+populate_rc()
+{
+ local op=$1
+ local dir=$2
+ local name=$3
+ local rcdir=$4
+ if ! find_file_in_dirlist "${name}" "${name}" \
+ "${rcdir}" "${SRC_DIR}/etc/rc.d"; then
+ return 1
+ fi
+ populate_dir "${op}" true "${dir}" "${DEST_DIR}/etc/rc.d" 555 "${name}"
+ return $?
+}
+
additem rc "/etc/rc* and /etc/rc.d/ being up to date"
do_rc()
{
@@ -1507,15 +1522,13 @@
${extra_scripts}
failed=$(( ${failed} + $? ))
- if ! find_file_in_dirlist blacklistd "blacklistd" \
- "${SRC_DIR}/external/bsd/blacklist/etc/rc.d" \
- "${SRC_DIR}/etc/rc.d"; then
- failed=1
- else
- populate_dir "$op" true "${dir}" "${DEST_DIR}/etc/rc.d" 555 \
- blacklistd
- failed=$(( ${failed} + $? ))
- fi
+ populate_rc "${op}" "${dir}" blacklistd \
+ "${SRC_DIR}/external/bsd/blacklist/etc/rc.d"
+ failed=$(( ${failed} + $? ))
+
+ populate_rc "${op}" "${dir}" unbound \
+ "${SRC_DIR}/external/bsd/unbound/etc/rc.d"
+ failed=$(( ${failed} + $? ))
if $SOURCEMODE && [ -n "${generated_scripts}" ]; then
# generate scripts
@@ -1864,7 +1877,8 @@
check_ids "$1" users "${DEST_DIR}/etc/master.passwd" \
"${SRC_DIR}/etc/master.passwd" 12 \
postfix SKIP named ntpd sshd SKIP _pflogd _rwhod SKIP _proxy \
- _timedc _sdpd _httpd _mdnsd _tests _tcpdump _tss SKIP _rtadvd
+ _timedc _sdpd _httpd _mdnsd _tests _tcpdump _tss SKIP _rtadvd \
Home |
Main Index |
Thread Index |
Old Index