svn commit: r255810 - in projects/camlock: contrib/llvm/lib/CodeGen/SelectionDAG contrib/llvm/lib/Target/AArch64 contrib/llvm/lib/Target/ARM contrib/llvm/lib/Target/Hexagon contrib/llvm/lib/Target/...
Alexander Motin
mav at FreeBSD.org
Mon Sep 23 07:20:18 UTC 2013
Author: mav
Date: Mon Sep 23 07:20:13 2013
New Revision: 255810
URL: http://svnweb.freebsd.org/changeset/base/255810
Log:
MFC @ r255809
Added:
projects/camlock/etc/rc.d/local_unbound
- copied unchanged from r255809, head/etc/rc.d/local_unbound
projects/camlock/usr.sbin/unbound/local-setup/
- copied from r255809, head/usr.sbin/unbound/local-setup/
Modified:
projects/camlock/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
projects/camlock/contrib/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp
projects/camlock/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp
projects/camlock/contrib/llvm/lib/Target/Hexagon/HexagonISelDAGToDAG.cpp
projects/camlock/contrib/llvm/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp
projects/camlock/contrib/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp
projects/camlock/contrib/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp
projects/camlock/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
projects/camlock/contrib/llvm/lib/Target/R600/AMDILISelDAGToDAG.cpp
projects/camlock/contrib/llvm/lib/Target/Sparc/SparcISelDAGToDAG.cpp
projects/camlock/contrib/llvm/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp
projects/camlock/contrib/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
projects/camlock/etc/defaults/rc.conf
projects/camlock/etc/rc.d/Makefile
projects/camlock/etc/rc.subr
projects/camlock/include/Makefile
projects/camlock/share/man/man5/rc.conf.5
projects/camlock/share/man/man8/rc.8
projects/camlock/share/man/man8/rc.subr.8
projects/camlock/sys/dev/mfi/mfireg.h
projects/camlock/sys/kern/subr_sbuf.c
projects/camlock/tools/build/mk/OptionalObsoleteFiles.inc
projects/camlock/usr.sbin/unbound/Makefile
Directory Properties:
projects/camlock/ (props changed)
projects/camlock/contrib/llvm/ (props changed)
projects/camlock/sys/ (props changed)
Modified: projects/camlock/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
==============================================================================
--- projects/camlock/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Mon Sep 23 04:36:51 2013 (r255809)
+++ projects/camlock/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Mon Sep 23 07:20:13 2013 (r255810)
@@ -1736,15 +1736,15 @@ WalkChainUsers(const SDNode *ChainedNode
SDNode *User = *UI;
+ if (User->getOpcode() == ISD::HANDLENODE) // Root of the graph.
+ continue;
+
// If we see an already-selected machine node, then we've gone beyond the
// pattern that we're selecting down into the already selected chunk of the
// DAG.
- if (User->isMachineOpcode() ||
- User->getOpcode() == ISD::HANDLENODE) // Root of the graph.
- continue;
-
unsigned UserOpcode = User->getOpcode();
- if (UserOpcode == ISD::CopyToReg ||
+ if (User->isMachineOpcode() ||
+ UserOpcode == ISD::CopyToReg ||
UserOpcode == ISD::CopyFromReg ||
UserOpcode == ISD::INLINEASM ||
UserOpcode == ISD::EH_LABEL ||
Modified: projects/camlock/contrib/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp
==============================================================================
--- projects/camlock/contrib/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp Mon Sep 23 04:36:51 2013 (r255809)
+++ projects/camlock/contrib/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp Mon Sep 23 07:20:13 2013 (r255810)
@@ -395,6 +395,7 @@ SDNode *AArch64DAGToDAGISel::Select(SDNo
if (Node->isMachineOpcode()) {
DEBUG(dbgs() << "== "; Node->dump(CurDAG); dbgs() << "\n");
+ Node->setNodeId(-1);
return NULL;
}
Modified: projects/camlock/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp
==============================================================================
--- projects/camlock/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp Mon Sep 23 04:36:51 2013 (r255809)
+++ projects/camlock/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp Mon Sep 23 07:20:13 2013 (r255810)
@@ -2546,8 +2546,10 @@ SDNode *ARMDAGToDAGISel::SelectAtomic64(
SDNode *ARMDAGToDAGISel::Select(SDNode *N) {
DebugLoc dl = N->getDebugLoc();
- if (N->isMachineOpcode())
+ if (N->isMachineOpcode()) {
+ N->setNodeId(-1);
return NULL; // Already selected.
+ }
switch (N->getOpcode()) {
default: break;
Modified: projects/camlock/contrib/llvm/lib/Target/Hexagon/HexagonISelDAGToDAG.cpp
==============================================================================
--- projects/camlock/contrib/llvm/lib/Target/Hexagon/HexagonISelDAGToDAG.cpp Mon Sep 23 04:36:51 2013 (r255809)
+++ projects/camlock/contrib/llvm/lib/Target/Hexagon/HexagonISelDAGToDAG.cpp Mon Sep 23 07:20:13 2013 (r255810)
@@ -1334,8 +1334,10 @@ SDNode *HexagonDAGToDAGISel::SelectAdd(S
SDNode *HexagonDAGToDAGISel::Select(SDNode *N) {
- if (N->isMachineOpcode())
+ if (N->isMachineOpcode()) {
+ N->setNodeId(-1);
return NULL; // Already selected.
+ }
switch (N->getOpcode()) {
Modified: projects/camlock/contrib/llvm/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp
==============================================================================
--- projects/camlock/contrib/llvm/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp Mon Sep 23 04:36:51 2013 (r255809)
+++ projects/camlock/contrib/llvm/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp Mon Sep 23 07:20:13 2013 (r255810)
@@ -394,6 +394,7 @@ SDNode *MSP430DAGToDAGISel::Select(SDNod
DEBUG(errs() << "== ";
Node->dump(CurDAG);
errs() << "\n");
+ Node->setNodeId(-1);
return NULL;
}
Modified: projects/camlock/contrib/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp
==============================================================================
--- projects/camlock/contrib/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp Mon Sep 23 04:36:51 2013 (r255809)
+++ projects/camlock/contrib/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp Mon Sep 23 07:20:13 2013 (r255810)
@@ -97,6 +97,7 @@ SDNode* MipsDAGToDAGISel::Select(SDNode
// If we have a custom node, we already have selected!
if (Node->isMachineOpcode()) {
DEBUG(errs() << "== "; Node->dump(CurDAG); errs() << "\n");
+ Node->setNodeId(-1);
return NULL;
}
Modified: projects/camlock/contrib/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp
==============================================================================
--- projects/camlock/contrib/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp Mon Sep 23 04:36:51 2013 (r255809)
+++ projects/camlock/contrib/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp Mon Sep 23 07:20:13 2013 (r255810)
@@ -91,8 +91,10 @@ NVPTXDAGToDAGISel::NVPTXDAGToDAGISel(NVP
/// expanded, promoted and normal instructions.
SDNode *NVPTXDAGToDAGISel::Select(SDNode *N) {
- if (N->isMachineOpcode())
+ if (N->isMachineOpcode()) {
+ N->setNodeId(-1);
return NULL; // Already selected.
+ }
SDNode *ResNode = NULL;
switch (N->getOpcode()) {
Modified: projects/camlock/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
==============================================================================
--- projects/camlock/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp Mon Sep 23 04:36:51 2013 (r255809)
+++ projects/camlock/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp Mon Sep 23 07:20:13 2013 (r255810)
@@ -895,8 +895,10 @@ SDNode *PPCDAGToDAGISel::SelectSETCC(SDN
// target-specific node if it hasn't already been changed.
SDNode *PPCDAGToDAGISel::Select(SDNode *N) {
DebugLoc dl = N->getDebugLoc();
- if (N->isMachineOpcode())
+ if (N->isMachineOpcode()) {
+ N->setNodeId(-1);
return NULL; // Already selected.
+ }
switch (N->getOpcode()) {
default: break;
Modified: projects/camlock/contrib/llvm/lib/Target/R600/AMDILISelDAGToDAG.cpp
==============================================================================
--- projects/camlock/contrib/llvm/lib/Target/R600/AMDILISelDAGToDAG.cpp Mon Sep 23 04:36:51 2013 (r255809)
+++ projects/camlock/contrib/llvm/lib/Target/R600/AMDILISelDAGToDAG.cpp Mon Sep 23 07:20:13 2013 (r255810)
@@ -158,6 +158,7 @@ bool AMDGPUDAGToDAGISel::SelectADDR64(SD
SDNode *AMDGPUDAGToDAGISel::Select(SDNode *N) {
unsigned int Opc = N->getOpcode();
if (N->isMachineOpcode()) {
+ N->setNodeId(-1);
return NULL; // Already selected.
}
switch (Opc) {
Modified: projects/camlock/contrib/llvm/lib/Target/Sparc/SparcISelDAGToDAG.cpp
==============================================================================
--- projects/camlock/contrib/llvm/lib/Target/Sparc/SparcISelDAGToDAG.cpp Mon Sep 23 04:36:51 2013 (r255809)
+++ projects/camlock/contrib/llvm/lib/Target/Sparc/SparcISelDAGToDAG.cpp Mon Sep 23 07:20:13 2013 (r255810)
@@ -137,8 +137,10 @@ bool SparcDAGToDAGISel::SelectADDRrr(SDV
SDNode *SparcDAGToDAGISel::Select(SDNode *N) {
DebugLoc dl = N->getDebugLoc();
- if (N->isMachineOpcode())
+ if (N->isMachineOpcode()) {
+ N->setNodeId(-1);
return NULL; // Already selected.
+ }
switch (N->getOpcode()) {
default: break;
Modified: projects/camlock/contrib/llvm/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp
==============================================================================
--- projects/camlock/contrib/llvm/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp Mon Sep 23 04:36:51 2013 (r255809)
+++ projects/camlock/contrib/llvm/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp Mon Sep 23 07:20:13 2013 (r255810)
@@ -540,6 +540,7 @@ SDNode *SystemZDAGToDAGISel::Select(SDNo
// If we have a custom node, we already have selected!
if (Node->isMachineOpcode()) {
DEBUG(errs() << "== "; Node->dump(CurDAG); errs() << "\n");
+ Node->setNodeId(-1);
return 0;
}
Modified: projects/camlock/contrib/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
==============================================================================
--- projects/camlock/contrib/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp Mon Sep 23 04:36:51 2013 (r255809)
+++ projects/camlock/contrib/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp Mon Sep 23 07:20:13 2013 (r255810)
@@ -1988,6 +1988,7 @@ SDNode *X86DAGToDAGISel::Select(SDNode *
if (Node->isMachineOpcode()) {
DEBUG(dbgs() << "== "; Node->dump(CurDAG); dbgs() << '\n');
+ Node->setNodeId(-1);
return NULL; // Already selected.
}
Modified: projects/camlock/etc/defaults/rc.conf
==============================================================================
--- projects/camlock/etc/defaults/rc.conf Mon Sep 23 04:36:51 2013 (r255809)
+++ projects/camlock/etc/defaults/rc.conf Mon Sep 23 07:20:13 2013 (r255810)
@@ -270,6 +270,7 @@ hastd_enable="NO" # Run the HAST daemon
hastd_program="/sbin/hastd" # path to hastd, if you want a different one.
hastd_flags="" # Optional flags to hastd.
ctld_enable="NO" # CAM Target Layer / iSCSI target daemon.
+local_unbound_enable="NO" # local caching resolver
#
# named. It may be possible to run named in a sandbox, man security for
# details.
Modified: projects/camlock/etc/rc.d/Makefile
==============================================================================
--- projects/camlock/etc/rc.d/Makefile Mon Sep 23 04:36:51 2013 (r255809)
+++ projects/camlock/etc/rc.d/Makefile Mon Sep 23 07:20:13 2013 (r255810)
@@ -150,6 +150,7 @@ FILES= DAEMON \
tmp \
${_ubthidhci} \
ugidfw \
+ ${_unbound} \
${_utx} \
var \
virecover \
@@ -184,6 +185,10 @@ _nscd= nscd
_ubthidhci= ubthidhci
.endif
+.if ${MK_UNBOUND} != "no"
+_unbound= local_unbound
+.endif
+
.if ${MK_UTMPX} != "no"
_utx= utx
.endif
Copied: projects/camlock/etc/rc.d/local_unbound (from r255809, head/etc/rc.d/local_unbound)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/camlock/etc/rc.d/local_unbound Mon Sep 23 07:20:13 2013 (r255810, copy of r255809, head/etc/rc.d/local_unbound)
@@ -0,0 +1,91 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: local_unbound
+# REQUIRE: SERVERS cleanvar
+# KEYWORD: shutdown
+
+. /etc/rc.subr
+
+name="local_unbound"
+desc="local caching forwarding resolver"
+rcvar="local_unbound_enable"
+
+command="/usr/sbin/unbound"
+extra_commands="anchor configtest reload setup"
+start_precmd="local_unbound_prestart"
+reload_precmd="local_unbound_configtest"
+anchor_cmd="local_unbound_anchor"
+configtest_cmd="local_unbound_configtest"
+setup_cmd="local_unbound_setup"
+pidfile="/var/run/${name}.pid"
+
+: ${local_unbound_workdir:=/var/unbound}
+: ${local_unbound_config:=${local_unbound_workdir}/unbound.conf}
+: ${local_unbound_flags:=-c${local_unbound_config}}
+: ${local_unbound_forwardconf:=${local_unbound_workdir}/forward.conf}
+: ${local_unbound_anchor:=${local_unbound_workdir}/root.key}
+: ${local_unbound_forwarders:=}
+
+load_rc_config $name
+
+do_as_unbound()
+{
+ echo "$@" | su -m unbound
+}
+
+#
+# Retrieve or update the DNSSEC root anchor
+#
+local_unbound_anchor()
+{
+ do_as_unbound /usr/sbin/unbound-anchor -a ${local_unbound_anchor}
+ # we can't trust the exit code - check if the file exists
+ [ -f ${local_unbound_anchor} ]
+}
+
+#
+# Check the unbound configuration file
+#
+local_unbound_configtest()
+{
+ do_as_unbound /usr/sbin/unbound-checkconf ${local_unbound_config}
+}
+
+#
+# Create the unbound configuration file and update resolv.conf to
+# point to unbound.
+#
+local_unbound_setup()
+{
+ echo "Performing initial setup."
+ /usr/sbin/local-unbound-setup -n \
+ -u unbound \
+ -w ${local_unbound_workdir} \
+ -c ${local_unbound_config} \
+ -f ${local_unbound_forwardconf} \
+ -a ${local_unbound_anchor} \
+ ${local_unbound_forwarders}
+}
+
+#
+# Before starting, check that the configuration file and root anchor
+# exist. If not, attempt to generate them.
+#
+local_unbound_prestart()
+{
+ # Create configuration file
+ if [ ! -f ${local_unbound_config} ] ; then
+ run_rc_command setup
+ fi
+
+ # Retrieve DNSSEC root key
+ if [ ! -f ${local_unbound_anchor} ] ; then
+ run_rc_command anchor
+ fi
+}
+
+load_rc_config $name
+run_rc_command "$1"
Modified: projects/camlock/etc/rc.subr
==============================================================================
--- projects/camlock/etc/rc.subr Mon Sep 23 04:36:51 2013 (r255809)
+++ projects/camlock/etc/rc.subr Mon Sep 23 07:20:13 2013 (r255810)
@@ -546,6 +546,8 @@ check_startmsgs()
#
# rcvar Display what rc.conf variable is used (if any).
#
+# enabled Return true if the service is enabled.
+#
# Variables available to methods, and after run_rc_command() has
# completed:
#
@@ -614,7 +616,7 @@ run_rc_command()
eval _override_command=\$${name}_program
command=${_override_command:-$command}
- _keywords="start stop restart rcvar $extra_commands"
+ _keywords="start stop restart rcvar enabled $extra_commands"
rc_pid=
_pidcmd=
_procname=${procname:-${command}}
@@ -635,6 +637,11 @@ run_rc_command()
rc_usage $_keywords
fi
+ if [ "$rc_arg" = "enabled" ] ; then
+ checkyesno ${rcvar}
+ return $?
+ fi
+
if [ -n "$flags" ]; then # allow override from environment
rc_flags=$flags
else
Modified: projects/camlock/include/Makefile
==============================================================================
--- projects/camlock/include/Makefile Mon Sep 23 04:36:51 2013 (r255809)
+++ projects/camlock/include/Makefile Mon Sep 23 07:20:13 2013 (r255810)
@@ -113,7 +113,7 @@ osreldate.h vers.c: ${NEWVERS_SH} ${PARA
MAKE="${MAKE}" \
NEWVERS_SH=${NEWVERS_SH} \
PARAM_H=${PARAM_H} \
- ${SHELL} ${MK_OSRELDATE_SH}
+ sh ${MK_OSRELDATE_SH}
.for i in ${LHDRS}
INCSLINKS+= sys/$i ${INCLUDEDIR}/$i
Modified: projects/camlock/share/man/man5/rc.conf.5
==============================================================================
--- projects/camlock/share/man/man5/rc.conf.5 Mon Sep 23 04:36:51 2013 (r255809)
+++ projects/camlock/share/man/man5/rc.conf.5 Mon Sep 23 07:20:13 2013 (r255810)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd September 10, 2013
+.Dd September 23, 2013
.Dt RC.CONF 5
.Os
.Sh NAME
@@ -2041,6 +2041,13 @@ is set to
.Dq Li YES ,
these are the flags to pass to
.Xr hastd 8 .
+.It Va local_unbound_enable
+.Pq Vt bool
+If set to
+.Dq Li YES ,
+run the
+.Xr unbound 8
+daemon as a local caching resolver.
.It Va named_enable
.Pq Vt bool
If set to
@@ -4786,6 +4793,7 @@ The default is 30.
.Xr sysctl 8 ,
.Xr syslogd 8 ,
.Xr timed 8 ,
+.Xr unbound 8 ,
.Xr usbconfig 8 ,
.Xr wlandebug 8 ,
.Xr yp 8 ,
Modified: projects/camlock/share/man/man8/rc.8
==============================================================================
--- projects/camlock/share/man/man8/rc.8 Mon Sep 23 04:36:51 2013 (r255809)
+++ projects/camlock/share/man/man8/rc.8 Mon Sep 23 07:20:13 2013 (r255810)
@@ -35,7 +35,7 @@
.\" @(#)rc.8 8.2 (Berkeley) 12/11/93
.\" $FreeBSD$
.\"
-.Dd January 14, 2012
+.Dd September 23, 2013
.Dt RC 8
.Os
.Sh NAME
@@ -312,6 +312,9 @@ Defaults to displaying the process ID of
If the script starts a process (rather than performing a one-off
operation), wait for the command to exit.
Otherwise it is not necessary to support this argument.
+.It Cm enabled
+Return 0 if the service is enabled and 1 if it is not.
+This command does not print anything.
.It Cm rcvar
Display which
.Xr rc.conf 5
Modified: projects/camlock/share/man/man8/rc.subr.8
==============================================================================
--- projects/camlock/share/man/man8/rc.subr.8 Mon Sep 23 04:36:51 2013 (r255809)
+++ projects/camlock/share/man/man8/rc.subr.8 Mon Sep 23 07:20:13 2013 (r255810)
@@ -29,7 +29,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd January 14, 2012
+.Dd September 23, 2012
.Dt RC.SUBR 8
.Os
.Sh NAME
@@ -379,6 +379,9 @@ Perform a
then a
.Cm start .
Defaults to displaying the process ID of the program (if running).
+.It Cm enabled
+Return 0 if the service is enabled and 1 if it is not.
+This command does not print anything.
.It Cm rcvar
Display which
.Xr rc.conf 5
Modified: projects/camlock/sys/dev/mfi/mfireg.h
==============================================================================
--- projects/camlock/sys/dev/mfi/mfireg.h Mon Sep 23 04:36:51 2013 (r255809)
+++ projects/camlock/sys/dev/mfi/mfireg.h Mon Sep 23 07:20:13 2013 (r255810)
@@ -192,6 +192,8 @@ typedef enum {
MFI_DCMD_CTRL_MFC_DEFAULTS_GET =0x010e0201,
MFI_DCMD_CTRL_MFC_DEFAULTS_SET =0x010e0202,
MFI_DCMD_CTRL_FLUSHCACHE = 0x01101000,
+ MFI_DCMD_CTRL_GET_PROPS = 0x01020100,
+ MFI_DCMD_CTRL_SET_PROPS = 0x01020200,
MFI_DCMD_CTRL_SHUTDOWN = 0x01050000,
MFI_DCMD_CTRL_EVENT_GETINFO = 0x01040100,
MFI_DCMD_CTRL_EVENT_GET = 0x01040300,
Modified: projects/camlock/sys/kern/subr_sbuf.c
==============================================================================
--- projects/camlock/sys/kern/subr_sbuf.c Mon Sep 23 04:36:51 2013 (r255809)
+++ projects/camlock/sys/kern/subr_sbuf.c Mon Sep 23 07:20:13 2013 (r255810)
@@ -52,11 +52,11 @@ __FBSDID("$FreeBSD$");
#ifdef _KERNEL
static MALLOC_DEFINE(M_SBUF, "sbuf", "string buffers");
-#define SBMALLOC(size) malloc(size, M_SBUF, M_WAITOK)
+#define SBMALLOC(size) malloc(size, M_SBUF, M_WAITOK|M_ZERO)
#define SBFREE(buf) free(buf, M_SBUF)
#else /* _KERNEL */
#define KASSERT(e, m)
-#define SBMALLOC(size) malloc(size)
+#define SBMALLOC(size) calloc(1, size)
#define SBFREE(buf) free(buf)
#endif /* _KERNEL */
Modified: projects/camlock/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- projects/camlock/tools/build/mk/OptionalObsoleteFiles.inc Mon Sep 23 04:36:51 2013 (r255809)
+++ projects/camlock/tools/build/mk/OptionalObsoleteFiles.inc Mon Sep 23 07:20:13 2013 (r255810)
@@ -4375,6 +4375,7 @@ OLD_FILES+=usr/share/man/man8/telnetd.8.
#.endif
.if ${MK_UNBOUND} == no
+OLD_FILES+=etc/rc.d/local_unbound
OLD_FILES+=usr/lib/private/libunbound.a
OLD_FILES+=usr/lib/private/libunbound.so
OLD_LIBS+=usr/lib/private/libunbound.so.5
@@ -4385,6 +4386,7 @@ OLD_FILES+=usr/lib32/private/libunbound.
OLD_LIBS+=usr/lib32/private/libunbound.so.5
OLD_FILES+=usr/lib32/private/libunbound_p.a
.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
Modified: projects/camlock/usr.sbin/unbound/Makefile
==============================================================================
--- projects/camlock/usr.sbin/unbound/Makefile Mon Sep 23 04:36:51 2013 (r255809)
+++ projects/camlock/usr.sbin/unbound/Makefile Mon Sep 23 07:20:13 2013 (r255810)
@@ -1,5 +1,6 @@
# $FreeBSD$
SUBDIR= daemon anchor checkconf control
+SUBDIR+= local-setup
.include <bsd.subdir.mk>
More information about the svn-src-projects
mailing list