summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2013-09-30 17:23:45 +0000
committerdes <des@FreeBSD.org>2013-09-30 17:23:45 +0000
commitaa2e4b623cdc1d9d2b44a103d24ecb7e0c984de9 (patch)
tree1a2886b0de387ddff665d0e370f40ffc32778840 /etc
parent9e2a5c1c0e7dbd2e8116aa8f1ce21759dec75295 (diff)
downloadFreeBSD-src-aa2e4b623cdc1d9d2b44a103d24ecb7e0c984de9.zip
FreeBSD-src-aa2e4b623cdc1d9d2b44a103d24ecb7e0c984de9.tar.gz
Remove BIND.
Approved by: re (gjb)
Diffstat (limited to 'etc')
-rw-r--r--etc/Makefile20
-rw-r--r--etc/mtree/BIND.chroot.dist35
-rw-r--r--etc/mtree/BIND.include.dist22
-rw-r--r--etc/mtree/BSD.var.dist4
4 files changed, 0 insertions, 81 deletions
diff --git a/etc/Makefile b/etc/Makefile
index ddd1abb..ff8efc5 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -142,12 +142,6 @@ MTREE= BSD.include.dist BSD.root.dist BSD.usr.dist BSD.var.dist
.if ${MK_SENDMAIL} != "no"
MTREE+= BSD.sendmail.dist
.endif
-.if ${MK_BIND} != "no"
-MTREE+= BIND.chroot.dist
-.if ${MK_BIND_LIBS} != "no"
-MTREE+= BIND.include.dist
-.endif
-.endif
.if ${MK_DEBUG_FILES} != "no"
MTREE+= BSD.debug.dist
.endif
@@ -242,14 +236,6 @@ distribution:
${BSM_ETC_RESTRICTED_FILES} ${BSM_ETC_DIR}
cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0500 \
${BSM_ETC_EXEC_FILES} ${BSM_ETC_DIR}
-.if ${MK_BIND_MTREE} != "no"
- if [ ! -e ${DESTDIR}/etc/namedb ]; then \
- ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \
- fi
-.endif
-.if ${MK_BIND_ETC} != "no"
- ${_+_}cd ${.CURDIR}/namedb; ${MAKE} install
-.endif
.if ${MK_UNBOUND} != "no"
if [ ! -e ${DESTDIR}/etc/unbound ]; then \
${INSTALL_SYMLINK} ../var/unbound ${DESTDIR}/etc/unbound; \
@@ -328,12 +314,6 @@ MTREES= mtree/BSD.root.dist / \
.if ${MK_DEBUG_FILES} != "no"
MTREES+= mtree/BSD.debug.dist /usr/lib
.endif
-.if ${MK_BIND_LIBS} != "no"
-MTREES+= mtree/BIND.include.dist /usr/include
-.endif
-.if ${MK_BIND_MTREE} != "no"
-MTREES+= mtree/BIND.chroot.dist /var/named
-.endif
.if ${MK_GROFF} != "no"
MTREES+= mtree/BSD.groff.dist /usr
.endif
diff --git a/etc/mtree/BIND.chroot.dist b/etc/mtree/BIND.chroot.dist
deleted file mode 100644
index 95423db..0000000
--- a/etc/mtree/BIND.chroot.dist
+++ /dev/null
@@ -1,35 +0,0 @@
-# $FreeBSD$
-#
-# Please see the file src/etc/mtree/README before making changes to this file.
-#
-
-/set type=dir uname=root gname=wheel mode=0755
-.
- dev mode=0555
- ..
- etc
- namedb
- dynamic uname=bind
- ..
- master
- ..
- slave uname=bind
- ..
- working uname=bind
- ..
- ..
- ..
-/set type=dir uname=bind gname=wheel mode=0755
- var uname=root
- dump
- ..
- log
- ..
- run
- named
- ..
- ..
- stats
- ..
- ..
-..
diff --git a/etc/mtree/BIND.include.dist b/etc/mtree/BIND.include.dist
deleted file mode 100644
index 534794a..0000000
--- a/etc/mtree/BIND.include.dist
+++ /dev/null
@@ -1,22 +0,0 @@
-# $FreeBSD$
-#
-# Please see the file src/etc/mtree/README before making changes to this file.
-#
-
-/set type=dir uname=root gname=wheel mode=0755
-.
- bind
- ..
- bind9
- ..
- dns
- ..
- dst
- ..
- isc
- ..
- isccc
- ..
- isccfg
- ..
-..
diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist
index 63ab015..f4faeed 100644
--- a/etc/mtree/BSD.var.dist
+++ b/etc/mtree/BSD.var.dist
@@ -63,13 +63,9 @@
..
msgs uname=daemon
..
- named
- ..
preserve
..
run
- named uname=bind gname=bind
- ..
ppp gname=network mode=0770
..
wpa_supplicant
OpenPOWER on IntegriCloud