summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2016-02-11 17:33:55 +0000
committerdes <des@FreeBSD.org>2016-02-11 17:33:55 +0000
commit3e7322496a7989753d217de23f1abd17d4ea5a40 (patch)
tree39dd96550e6c776605133af33c8108e2bda86c45
parent4deaf20e8bec867d08b7d8888468b2f9e83632be (diff)
downloadFreeBSD-src-3e7322496a7989753d217de23f1abd17d4ea5a40.zip
FreeBSD-src-3e7322496a7989753d217de23f1abd17d4ea5a40.tar.gz
Remove unbound-contrl-setup since we use a local control socket which
does not require keys. MFC after: 3 days Relnotes: yes
-rw-r--r--ObsoleteFiles.inc2
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc1
-rw-r--r--usr.sbin/unbound/control/Makefile1
3 files changed, 2 insertions, 2 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 2f2505a..a5a7e3c 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,8 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20160211: Remove obsolete unbound-control-setup
+OLD_FILES+=usr/sbin/unbound-control-setup
# 20160116: Update mandoc to cvs snapshot 20160116
OLD_FILES+=usr/share/mdocml/example.style.css
OLD_FILES+=usr/share/mdocml/style.css
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 37f624e..87a40ba 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -7970,7 +7970,6 @@ OLD_FILES+=usr/sbin/unbound
OLD_FILES+=usr/sbin/unbound-anchor
OLD_FILES+=usr/sbin/unbound-checkconf
OLD_FILES+=usr/sbin/unbound-control
-OLD_FILES+=usr/sbin/unbound-control-setup
OLD_FILES+=usr/share/man/man5/unbound.conf.5.gz
OLD_FILES+=usr/share/man/man8/unbound-anchor.8.gz
OLD_FILES+=usr/share/man/man8/unbound-checkconf.8.gz
diff --git a/usr.sbin/unbound/control/Makefile b/usr.sbin/unbound/control/Makefile
index 1614127..824e441 100644
--- a/usr.sbin/unbound/control/Makefile
+++ b/usr.sbin/unbound/control/Makefile
@@ -7,7 +7,6 @@ UNBOUNDDIR= ${.CURDIR}/../../../contrib/unbound
.PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/doc
PROG= unbound-control
-SCRIPTS= unbound-control-setup.sh
SRCS= unbound-control.c worker_cb.c
CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR}
LIBADD= unbound crypto ssl pthread
OpenPOWER on IntegriCloud