From cc6c887d94d046fd021990a4be1ee104167d91a5 Mon Sep 17 00:00:00 2001
From: sthen <>
Date: Sat, 15 Mar 2014 22:13:36 +0000
Subject: [PATCH] Enable Unbound in base, ok deraadt@

---
 src/etc/Makefile          |  5 +++--
 src/etc/group             |  1 +
 src/etc/master.passwd     |  1 +
 src/etc/mtree/4.4BSD.dist | 13 ++++++++++++-
 src/etc/rc                |  6 +++---
 src/etc/rc.conf           |  3 ++-
 6 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/etc/Makefile b/src/etc/Makefile
index dd1b8740..21c1d02d 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.346 2014/03/13 10:11:01 florian Exp $
+#	$OpenBSD: Makefile,v 1.347 2014/03/15 22:13:36 sthen Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -56,7 +56,7 @@ RCDAEMONS=	amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd \
 		sensorsd slowcgi smtpd snmpd spamd sshd syslogd watchdogd \
 		wsmoused xdm ypbind ypldap yppasswdd ypserv kdc kadmind \
 		kpasswdd nfsd mountd lockd statd spamlogd sndiod \
-		tftpd tftpproxy ldomd ipropd_master ipropd_slave
+		tftpd tftpproxy ldomd ipropd_master ipropd_slave unbound
 
 MISETS=	base${OSrev}.tgz comp${OSrev}.tgz \
 	man${OSrev}.tgz game${OSrev}.tgz etc${OSrev}.tgz
@@ -131,6 +131,7 @@ distribution-etc-root-var: distrib-dirs
 	${INSTALL} -c -o root -g wheel -m 600 ldapd.conf ${DESTDIR}/etc
 	${INSTALL} -c -o root -g wheel -m 600 ypldap.conf ${DESTDIR}/etc
 	${INSTALL} -c -o root -g _nsd -m 640 nsd.conf ${DESTDIR}/var/nsd/etc
+	${INSTALL} -c -o root -g wheel -m 644 unbound.conf ${DESTDIR}/var/unbound/etc
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \
 	    etc.${MACHINE}/MAKEDEV ${DESTDIR}/dev
 	cd root; \
diff --git a/src/etc/group b/src/etc/group
index 277be633..c4ceae23 100644
--- a/src/etc/group
+++ b/src/etc/group
@@ -22,6 +22,7 @@ _fingerd:*:33:
 _sshagnt:*:34:
 _x11:*:35:
 utmp:*:45:
+_unbound:*:53:
 _lkm:*:61:
 _spamd:*:62:
 _radius:*:63:
diff --git a/src/etc/master.passwd b/src/etc/master.passwd
index 40485a14..ef7479ef 100644
--- a/src/etc/master.passwd
+++ b/src/etc/master.passwd
@@ -10,6 +10,7 @@ _rstatd:*:30:30::0:0:rpc.rstatd:/var/empty:/sbin/nologin
 _rusersd:*:32:32::0:0:rpc.rusersd:/var/empty:/sbin/nologin
 _fingerd:*:33:33::0:0:fingerd:/var/empty:/sbin/nologin
 _x11:*:35:35::0:0:X Server:/var/empty:/sbin/nologin
+_unbound:*:53:53::0:0:Unbound Daemon:/var/unbound:/sbin/nologin
 _spamd:*:62:62::0:0:Spam Daemon:/var/empty:/sbin/nologin
 uucp:*:66:1::0:0:UNIX-to-UNIX Copy:/var/spool/uucppublic:/sbin/nologin
 www:*:67:67::0:0:HTTP Server:/var/www:/sbin/nologin
diff --git a/src/etc/mtree/4.4BSD.dist b/src/etc/mtree/4.4BSD.dist
index b9651702..5379cf0c 100644
--- a/src/etc/mtree/4.4BSD.dist
+++ b/src/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.242 2014/03/13 10:11:01 florian Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.243 2014/03/15 22:13:36 sthen Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -1366,6 +1366,17 @@ vi.recover	 mode=01777
 # ./var/tmp
 ..
 
+# ./var/unbound
+unbound
+
+# ./var/unbound/etc
+etc		uname=root gname=wheel mode=0755
+# ./var/unbound/etc
+..
+
+# ./var/unbound
+..
+
 # ./www
 www type=dir uname=root gname=daemon mode=755
 
diff --git a/src/etc/rc b/src/etc/rc
index d4edac43..eb7d7c74 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.422 2014/03/13 10:11:01 florian Exp $
+#	$OpenBSD: rc,v 1.423 2014/03/15 22:13:36 sthen Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -391,8 +391,8 @@ dmesg >/var/run/dmesg.boot
 make_keys
 
 echo -n 'starting early daemons:'
-start_daemon syslogd ldattach pflogd named nsd ntpd isakmpd iked sasyncd
-start_daemon ldapd npppd
+start_daemon syslogd ldattach pflogd named nsd unbound ntpd
+start_daemon isakmpd iked sasyncd ldapd npppd
 echo '.'
 
 if [ X"${ipsec}" != X"NO" ]; then
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index b52cec71..cbea6d72 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.186 2014/03/13 10:11:01 florian Exp $
+#	$OpenBSD: rc.conf,v 1.187 2014/03/15 22:13:36 sthen Exp $
 
 # DO NOT EDIT THIS FILE!!
 #
@@ -27,6 +27,7 @@ rbootd_flags=NO		# for normal use: ""
 sshd_flags=""		# for normal use: ""
 named_flags=NO		# for normal use: ""
 nsd_flags=NO		# for normal use: "-c /var/nsd/etc/nsd.conf"
+unbound_flags=NO	# for normal use: "-c /var/unbound/etc/unbound.conf"
 ldattach_flags=NO	# for normal use: "[options] linedisc cua-device"
 ntpd_flags=NO		# for normal use: ""
 isakmpd_flags=NO	# for normal use: ""