svn commit: r333573 - in head: . contrib/unbound/daemon contrib/unbound/doc contrib/unbound/smallapp etc/rc.d tools/build/mk usr.sbin/unbound usr.sbin/unbound/anchor usr.sbin/unbound/checkconf usr....
Dag-Erling Smørgrav
des at FreeBSD.org
Sat May 12 17:10:40 UTC 2018
Author: des
Date: Sat May 12 17:10:36 2018
New Revision: 333573
URL: https://svnweb.freebsd.org/changeset/base/333573
Log:
Rename all Unbound binaries and man pages from unbound* to local-unbound*.
PR: 222902
Added:
head/usr.sbin/unbound/setup/
- copied from r333572, head/usr.sbin/unbound/local-setup/
Deleted:
head/usr.sbin/unbound/local-setup/
Modified:
head/ObsoleteFiles.inc
head/contrib/unbound/daemon/unbound.c
head/contrib/unbound/doc/unbound-checkconf.8.in
head/contrib/unbound/smallapp/unbound-anchor.c
head/contrib/unbound/smallapp/unbound-checkconf.c
head/contrib/unbound/smallapp/unbound-control.c
head/etc/rc.d/local_unbound
head/tools/build/mk/OptionalObsoleteFiles.inc
head/usr.sbin/unbound/Makefile
head/usr.sbin/unbound/Makefile.inc
head/usr.sbin/unbound/anchor/Makefile
head/usr.sbin/unbound/checkconf/Makefile
head/usr.sbin/unbound/control/Makefile
head/usr.sbin/unbound/daemon/Makefile
Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc Sat May 12 17:04:40 2018 (r333572)
+++ head/ObsoleteFiles.inc Sat May 12 17:10:36 2018 (r333573)
@@ -38,6 +38,16 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20180512: Rename Unbound tools
+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/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
+OLD_FILES+=usr/share/man/man8/unbound-control.8.gz
+OLD_FILES+=usr/share/man/man8/unbound.8.gz
# 20180508: retire nxge
OLD_FILES+=usr/share/man/man4/if_nxge.4.gz
OLD_FILES+=usr/share/man/man4/nxge.4.gz
Modified: head/contrib/unbound/daemon/unbound.c
==============================================================================
--- head/contrib/unbound/daemon/unbound.c Sat May 12 17:04:40 2018 (r333572)
+++ head/contrib/unbound/daemon/unbound.c Sat May 12 17:10:36 2018 (r333573)
@@ -95,7 +95,7 @@ static void usage(void)
time_t t;
struct timeval now;
struct ub_event_base* base;
- printf("usage: unbound [options]\n");
+ printf("usage: local-unbound [options]\n");
printf(" start unbound daemon DNS resolver.\n");
printf("-h this help\n");
printf("-c file config file to read instead of %s\n", CONFIGFILE);
Modified: head/contrib/unbound/doc/unbound-checkconf.8.in
==============================================================================
--- head/contrib/unbound/doc/unbound-checkconf.8.in Sat May 12 17:04:40 2018 (r333572)
+++ head/contrib/unbound/doc/unbound-checkconf.8.in Sat May 12 17:10:36 2018 (r333573)
@@ -8,7 +8,7 @@
.\"
.\"
.SH "NAME"
-unbound\-checkconf
+.B unbound\-checkconf
\- Check unbound configuration file for errors.
.SH "SYNOPSIS"
.B unbound\-checkconf
Modified: head/contrib/unbound/smallapp/unbound-anchor.c
==============================================================================
--- head/contrib/unbound/smallapp/unbound-anchor.c Sat May 12 17:04:40 2018 (r333572)
+++ head/contrib/unbound/smallapp/unbound-anchor.c Sat May 12 17:10:36 2018 (r333573)
@@ -174,7 +174,7 @@ struct ip_list {
static void
usage(void)
{
- printf("Usage: unbound-anchor [opts]\n");
+ printf("Usage: local-unbound-anchor [opts]\n");
printf(" Setup or update root anchor. "
"Most options have defaults.\n");
printf(" Run this program before you start the validator.\n");
Modified: head/contrib/unbound/smallapp/unbound-checkconf.c
==============================================================================
--- head/contrib/unbound/smallapp/unbound-checkconf.c Sat May 12 17:04:40 2018 (r333572)
+++ head/contrib/unbound/smallapp/unbound-checkconf.c Sat May 12 17:10:36 2018 (r333573)
@@ -80,7 +80,7 @@
static void
usage(void)
{
- printf("Usage: unbound-checkconf [file]\n");
+ printf("Usage: local-unbound-checkconf [file]\n");
printf(" Checks unbound configuration file for errors.\n");
printf("file if omitted %s is used.\n", CONFIGFILE);
printf("-o option print value of option to stdout.\n");
Modified: head/contrib/unbound/smallapp/unbound-control.c
==============================================================================
--- head/contrib/unbound/smallapp/unbound-control.c Sat May 12 17:04:40 2018 (r333572)
+++ head/contrib/unbound/smallapp/unbound-control.c Sat May 12 17:10:36 2018 (r333573)
@@ -77,7 +77,7 @@
static void
usage(void)
{
- printf("Usage: unbound-control [options] command\n");
+ printf("Usage: local-unbound-control [options] command\n");
printf(" Remote control utility for unbound server.\n");
printf("Options:\n");
printf(" -c file config file, default is %s\n", CONFIGFILE);
Modified: head/etc/rc.d/local_unbound
==============================================================================
--- head/etc/rc.d/local_unbound Sat May 12 17:04:40 2018 (r333572)
+++ head/etc/rc.d/local_unbound Sat May 12 17:10:36 2018 (r333573)
@@ -14,7 +14,7 @@ name="local_unbound"
desc="Local caching forwarding resolver"
rcvar="local_unbound_enable"
-command="/usr/sbin/unbound"
+command="/usr/sbin/local-unbound"
extra_commands="anchor configtest reload setup"
start_precmd="local_unbound_prestart"
start_postcmd="local_unbound_poststart"
@@ -44,7 +44,7 @@ do_as_unbound()
#
local_unbound_anchor()
{
- do_as_unbound /usr/sbin/unbound-anchor -a ${local_unbound_anchor}
+ do_as_unbound ${command}-anchor -a ${local_unbound_anchor}
# we can't trust the exit code - check if the file exists
[ -f ${local_unbound_anchor} ]
}
@@ -54,7 +54,7 @@ local_unbound_anchor()
#
local_unbound_configtest()
{
- do_as_unbound /usr/sbin/unbound-checkconf ${local_unbound_config}
+ do_as_unbound ${command}-checkconf ${local_unbound_config}
}
#
@@ -64,7 +64,7 @@ local_unbound_configtest()
local_unbound_setup()
{
echo "Performing initial setup."
- /usr/sbin/local-unbound-setup -n \
+ ${command}-setup -n \
-u unbound \
-w ${local_unbound_workdir} \
-c ${local_unbound_config} \
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc Sat May 12 17:04:40 2018 (r333572)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Sat May 12 17:10:36 2018 (r333573)
@@ -8726,17 +8726,17 @@ OLD_FILES+=usr/lib32/private/libunbound.a
OLD_FILES+=usr/lib32/private/libunbound.so
OLD_LIBS+=usr/lib32/private/libunbound.so.5
OLD_FILES+=usr/lib32/private/libunbound_p.a
+OLD_FILES+=usr/share/man/man5/local-unbound.conf.5.gz
+OLD_FILES+=usr/share/man/man8/local-unbound-anchor.8.gz
+OLD_FILES+=usr/share/man/man8/local-unbound-checkconf.8.gz
+OLD_FILES+=usr/share/man/man8/local-unbound-control.8.gz
+OLD_FILES+=usr/share/man/man8/local-unbound.8.gz
.endif
OLD_FILES+=usr/sbin/local-unbound-setup
-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/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
-OLD_FILES+=usr/share/man/man8/unbound-control.8.gz
-OLD_FILES+=usr/share/man/man8/unbound.8.gz
+OLD_FILES+=usr/sbin/local-unbound
+OLD_FILES+=usr/sbin/local-unbound-anchor
+OLD_FILES+=usr/sbin/local-unbound-checkconf
+OLD_FILES+=usr/sbin/local-unbound-control
.endif
.if ${MK_USB} == no
Modified: head/usr.sbin/unbound/Makefile
==============================================================================
--- head/usr.sbin/unbound/Makefile Sat May 12 17:04:40 2018 (r333572)
+++ head/usr.sbin/unbound/Makefile Sat May 12 17:10:36 2018 (r333573)
@@ -1,7 +1,7 @@
# $FreeBSD$
SUBDIR= daemon anchor checkconf control
-SUBDIR+= local-setup
+SUBDIR+= setup
SUBDIR_PARALLEL=
.include <bsd.subdir.mk>
Modified: head/usr.sbin/unbound/Makefile.inc
==============================================================================
--- head/usr.sbin/unbound/Makefile.inc Sat May 12 17:04:40 2018 (r333572)
+++ head/usr.sbin/unbound/Makefile.inc Sat May 12 17:10:36 2018 (r333573)
@@ -4,4 +4,14 @@ NO_WERROR= true
NO_WTHREAD_SAFETY= true
PACKAGE= unbound
+.for man in ${MAN}
+${man}: ${UNBOUNDDIR}/doc/${man:S/local-//}
+ sed -E \
+ -e 's/\<(fI)?unbound\>/\1local-unbound/g' \
+ -e 's/\<(fI)?Unbound\>/Local-unbound/g' \
+ -e 's/\/local-unbound/\/unbound/g' \
+ <${.ALLSRC} >${.TARGET}
+CLEANFILES += ${man}
+.endfor
+
.include "../Makefile.inc"
Modified: head/usr.sbin/unbound/anchor/Makefile
==============================================================================
--- head/usr.sbin/unbound/anchor/Makefile Sat May 12 17:04:40 2018 (r333572)
+++ head/usr.sbin/unbound/anchor/Makefile Sat May 12 17:10:36 2018 (r333573)
@@ -7,10 +7,10 @@ EXPATDIR= ${SRCTOP}/contrib/expat
.PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/doc
-PROG= unbound-anchor
+PROG= local-unbound-anchor
SRCS= unbound-anchor.c
CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -I${EXPATDIR}/lib
LIBADD= unbound bsdxml ssl crypto pthread
-MAN= unbound-anchor.8
+MAN= local-unbound-anchor.8
.include <bsd.prog.mk>
Modified: head/usr.sbin/unbound/checkconf/Makefile
==============================================================================
--- head/usr.sbin/unbound/checkconf/Makefile Sat May 12 17:04:40 2018 (r333572)
+++ head/usr.sbin/unbound/checkconf/Makefile Sat May 12 17:10:36 2018 (r333573)
@@ -6,10 +6,10 @@ UNBOUNDDIR= ${SRCTOP}/contrib/unbound
.PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/util ${UNBOUNDDIR}/doc
-PROG= unbound-checkconf
+PROG= local-unbound-checkconf
SRCS= ub_event.c unbound-checkconf.c worker_cb.c
CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR}
LIBADD= unbound pthread
-MAN= unbound-checkconf.8
+MAN= local-unbound-checkconf.8
.include <bsd.prog.mk>
Modified: head/usr.sbin/unbound/control/Makefile
==============================================================================
--- head/usr.sbin/unbound/control/Makefile Sat May 12 17:04:40 2018 (r333572)
+++ head/usr.sbin/unbound/control/Makefile Sat May 12 17:10:36 2018 (r333573)
@@ -6,10 +6,10 @@ UNBOUNDDIR= ${SRCTOP}/contrib/unbound
.PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/util ${UNBOUNDDIR}/doc
-PROG= unbound-control
+PROG= local-unbound-control
SRCS= ub_event.c unbound-control.c worker_cb.c
CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR}
LIBADD= unbound crypto ssl pthread
-MAN= unbound-control.8
+MAN= local-unbound-control.8
.include <bsd.prog.mk>
Modified: head/usr.sbin/unbound/daemon/Makefile
==============================================================================
--- head/usr.sbin/unbound/daemon/Makefile Sat May 12 17:04:40 2018 (r333572)
+++ head/usr.sbin/unbound/daemon/Makefile Sat May 12 17:10:36 2018 (r333573)
@@ -6,11 +6,11 @@ UNBOUNDDIR= ${SRCTOP}/contrib/unbound
.PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/daemon ${UNBOUNDDIR}/util ${UNBOUNDDIR}/util/shm_side ${UNBOUNDDIR}/doc
-PROG= unbound
+PROG= local-unbound
SRCS= acl_list.c cachedump.c daemon.c remote.c shm_main.c stats.c \
ub_event.c unbound.c worker.c
CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR}
LIBADD= unbound util ssl crypto pthread
-MAN= unbound.8 unbound.conf.5
+MAN= local-unbound.8 local-unbound.conf.5
.include <bsd.prog.mk>
More information about the svn-src-all
mailing list