d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge ^/head r337619 through r337645.

Browse Source
This commit is contained in:
Dimitry Andric 2018-08-11 16:41:08 +00:00
commit e35e6a3d71
21 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cddl/usr.sbin/dwatch/libexec/Makefile
View File

@ -12,6 +12,7 @@ FILES= chmod \
rw \
sched \
sendrecv \
systop \
tcp \
udp \
udplite \
@ -62,7 +63,6 @@ LINKS+= ${LIBEXECDIR}/dwatch/sendrecv ${LIBEXECDIR}/dwatch/recvmsg
LINKS+= ${LIBEXECDIR}/dwatch/sendrecv ${LIBEXECDIR}/dwatch/send
LINKS+= ${LIBEXECDIR}/dwatch/sendrecv ${LIBEXECDIR}/dwatch/sendmsg
LINKS+= ${LIBEXECDIR}/dwatch/sendrecv ${LIBEXECDIR}/dwatch/sendto
LINKS+= ${LIBEXECDIR}/dwatch/systop ${LIBEXECDIR}/dwatch/systop
LINKS+= ${LIBEXECDIR}/dwatch/tcp ${LIBEXECDIR}/dwatch/tcp-accept
LINKS+= ${LIBEXECDIR}/dwatch/tcp ${LIBEXECDIR}/dwatch/tcp-accept-established
LINKS+= ${LIBEXECDIR}/dwatch/tcp ${LIBEXECDIR}/dwatch/tcp-accept-refused

26
etc/Makefile
View File

@ -15,7 +15,6 @@ SUBDIR+=sendmail
BIN1= crontab \
devd.conf \
devfs.conf \
ddb.conf \
dhclient.conf \
disktab \
fbtab \
@ -42,7 +41,6 @@ BIN1= crontab \
remote \
rpc \
services \
sysctl.conf \
syslog.conf \
termcap.small
@ -56,14 +54,6 @@ BIN1+= etc.${MACHINE_CPUARCH}/ttys
.error etc.MACHINE/ttys missing
.endif
OPENBSMDIR= ${SRCTOP}/contrib/openbsm
BSM_ETC_OPEN_FILES= ${OPENBSMDIR}/etc/audit_class \
${OPENBSMDIR}/etc/audit_event
BSM_ETC_RESTRICTED_FILES= ${OPENBSMDIR}/etc/audit_control \
${OPENBSMDIR}/etc/audit_user
BSM_ETC_EXEC_FILES= ${OPENBSMDIR}/etc/audit_warn
BSM_ETC_DIR= ${DESTDIR}/etc/security
# NB: keep these sorted by MK_* knobs
.if ${MK_AMD} != "no"
@ -103,10 +93,6 @@ SSH= ${SRCTOP}/crypto/openssh/ssh_config \
SSL= ${SRCTOP}/crypto/openssl/apps/openssl.cnf
.endif
.if ${MK_PF} != "no"
BIN1+= pf.os
.endif
.if ${MK_SENDMAIL} != "no"
BIN1+= rc.sendmail
.endif
@ -168,11 +154,6 @@ distribution:
${DESTDIR}/etc/services;
.endif
.if ${MK_BSNMP} != "no"
cd ${.CURDIR}; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
snmpd.config ${DESTDIR}/etc;
.endif
.if ${MK_TCSH} == "no"
sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
.endif
@ -189,7 +170,6 @@ distribution:
.if ${MK_BLUETOOTH} != "no"
${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
.endif
${_+_}cd ${.CURDIR}/cron.d; ${MAKE} install
${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
${_+_}cd ${.CURDIR}/devd; ${MAKE} install
${_+_}cd ${.CURDIR}/gss; ${MAKE} install
@ -203,12 +183,6 @@ distribution:
${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install
${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install
cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0444 \
${BSM_ETC_OPEN_FILES} ${BSM_ETC_DIR}
cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0600 \
${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_UNBOUND} != "no"
if [ ! -e ${DESTDIR}/etc/unbound ]; then \
${INSTALL_SYMLINK} ../var/unbound ${DESTDIR}/etc/unbound; \

11
etc/cron.d/Makefile
View File

@ -1,11 +0,0 @@
# $FreeBSD$
.include <src.opts.mk>
.if ${MK_AT} != "no"
FILES+= at
.endif
BINDIR= /etc/cron.d
.include <bsd.prog.mk>

1
sbin/ddb/Makefile
View File

@ -1,5 +1,6 @@
# $FreeBSD$
CONFS= ddb.conf
PACKAGE=runtime
PROG= ddb
SRCS= ddb.c ddb_capture.c ddb_script.c

0
etc/ddb.conf → sbin/ddb/ddb.conf
View File

1
sbin/pfctl/Makefile
View File

@ -6,6 +6,7 @@
.PATH: ${SRCTOP}/sys/netpfil/pf
PACKAGE=pf
CONFS= pf.os
PROG= pfctl
MAN= pfctl.8

0
etc/pf.os → sbin/pfctl/pf.os
View File

4
sbin/restore/tape.c
View File

@ -1314,8 +1314,8 @@ gethead(struct s_spcl *buf)
return (FAIL);
}
if (swabl(buf->c_magic) != FS_UFS2_MAGIC &&
buf->c_magic != NFS_MAGIC) {
if (buf->c_magic == OFS_MAGIC) {
swabl(buf->c_magic) != NFS_MAGIC) {
if (swabl(buf->c_magic) == OFS_MAGIC) {
fprintf(stderr,
"Format of dump tape is too old. Must use\n");
fprintf(stderr,

1
sbin/sysctl/Makefile
View File

@ -2,6 +2,7 @@
# $FreeBSD$
PACKAGE=runtime
CONFS= sysctl.conf
PROG= sysctl
WARNS?= 3
MAN= sysctl.8

0
etc/sysctl.conf → sbin/sysctl/sysctl.conf
View File

4
share/man/man4/snd_envy24ht.4
View File

@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
.Dd June 1, 2014
.Dd August 11, 2018
.Dt SND_ENVY24HT 4
.Os
.Sh NAME
@ -69,6 +69,8 @@ Audiotrak Prodigy HD2
.It
ESI Juli@
.It
ESI Juli@ XTe
.It
M-Audio Audiophile 192
.It
M-Audio Revolution 5.1

7
share/man/man5/make.conf.5
View File

@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
.Dd July 20, 2018
.Dd August 11, 2018
.Dt MAKE.CONF 5
.Os
.Sh NAME
@ -234,12 +234,13 @@ Set this to not update the ports tree during
.Pq Vt bool
Set this to use
.Xr svn 1
or
.Xr svnlite 1
to update your
.Pa src
tree with
.Dq Li "make update" .
Note that since a subversion client is not included in the base system,
you will need to set
Note that you can set
.Va SVN
to the full path of a
.Xr svn 1

5
share/man/man7/build.7
View File

@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
.Dd December 24, 2017
.Dd August 11, 2018
.Dt BUILD 7
.Os
.Sh NAME
@ -42,6 +42,8 @@ and
These directories may be initially empty or non-existent until updated with
.Xr svn 1
or
.Xr svnlite 1
or
.Xr portsnap 8 .
Directory
.Pa /usr/src
@ -789,6 +791,7 @@ make TARGET_ARCH=armv6 DESTDIR=/clients/arm64 installworld installkernel
.Xr install 1 ,
.Xr make 1 ,
.Xr svn 1 ,
.Xr svnlite 1 ,
.Xr make.conf 5 ,
.Xr src.conf 5 ,
.Xr arch 7 ,

29
sys/netpfil/pf/pf_if.c
View File

@ -297,11 +297,16 @@ pfi_kif_match(struct pfi_kif *rule_kif, struct pfi_kif *packet_kif)
if (rule_kif == NULL || rule_kif == packet_kif)
return (1);
if (rule_kif->pfik_group != NULL)
/* XXXGL: locking? */
if (rule_kif->pfik_group != NULL) {
IF_ADDR_RLOCK(packet_kif->pfik_ifp);
CK_STAILQ_FOREACH(p, &packet_kif->pfik_ifp->if_groups, ifgl_next)
if (p->ifgl_group == rule_kif->pfik_group)
if (p->ifgl_group == rule_kif->pfik_group) {
IF_ADDR_RUNLOCK(packet_kif->pfik_ifp);
return (1);
}
IF_ADDR_RUNLOCK(packet_kif->pfik_ifp);
}
return (0);
}
@ -735,6 +740,7 @@ pfi_get_ifaces(const char *name, struct pfi_kif *buf, int *size)
static int
pfi_skip_if(const char *filter, struct pfi_kif *p)
{
struct ifg_list *i;
int n;
if (filter == NULL || !*filter)
@ -745,10 +751,19 @@ pfi_skip_if(const char *filter, struct pfi_kif *p)
if (n < 1 || n >= IFNAMSIZ)
return (1); /* sanity check */
if (filter[n-1] >= '0' && filter[n-1] <= '9')
return (1); /* only do exact match in that case */
if (strncmp(p->pfik_name, filter, n))
return (1); /* prefix doesn't match */
return (p->pfik_name[n] < '0' || p->pfik_name[n] > '9');
return (1); /* group names may not end in a digit */
if (p->pfik_ifp != NULL) {
IF_ADDR_RLOCK(p->pfik_ifp);
CK_STAILQ_FOREACH(i, &p->pfik_ifp->if_groups, ifgl_next) {
if (!strncmp(i->ifgl_group->ifg_group, filter,
IFNAMSIZ)) {
IF_ADDR_RUNLOCK(p->pfik_ifp);
return (0); /* iface is in group "filter" */
}
}
IF_ADDR_RUNLOCK(p->pfik_ifp);
}
return (1);
}
int

3
usr.bin/at/Makefile
View File

@ -2,6 +2,9 @@
.include "${.CURDIR}/Makefile.inc"
CONFS= atrun
CONFSDIR= /etc/cron.d
CONFSNAME= at
PROG= at
SRCS= at.c panic.c parsetime.c perm.c
LINKS= ${BINDIR}/at ${BINDIR}/atq \

7
usr.bin/at/at.man
View File

@ -1,5 +1,5 @@
.\" $FreeBSD$
.Dd June 1, 2018
.Dd August 11, 2018
.Dt "AT" 1
.Os
.Sh NAME
@ -64,8 +64,9 @@ case, everybody's jobs are listed;
.It Nm atrm
deletes jobs;
.It Nm batch
executes commands when system load levels permit; in other words, when the load average
drops below _LOADAVG_MX, or the value specified in the invocation of
executes commands when system load levels permit; in other words, when
the load average drops below _LOADAVG_MX times number of active CPUs,
or the value specified in the invocation of
.Nm atrun .
.El
.Pp

0
etc/cron.d/at → usr.bin/at/atrun
View File

12
usr.sbin/auditd/Makefile
View File

@ -7,6 +7,18 @@ OPENBSMDIR=${SRCTOP}/contrib/openbsm
CFLAGS+= -I${OPENBSMDIR}
OPENBSMETCDIR= ${OPENBSMDIR}/etc
CONFS= ${OPENBSMETCDIR}/audit_class
CONFSMODE_${OPENBSMETCDIR}/audit_class= 444
CONFS+= ${OPENBSMETCDIR}/audit_control
CONFSMODE_${OPENBSMETCDIR}/audit_control= 600
CONFS+= ${OPENBSMETCDIR}/audit_event
CONFSMODE_${OPENBSMETCDIR}/audit_event= 444
CONFS+= ${OPENBSMETCDIR}/audit_user
CONFSMODE_${OPENBSMETCDIR}/audit_user= 600
CONFS+= ${OPENBSMETCDIR}/audit_warn
CONFSMODE_${OPENBSMETCDIR}/audit_warn= 500
CONFSDIR= /etc/security
PROG= auditd
SRCS= auditd.c audit_warn.c auditd_fbsd.c
MAN= auditd.8

5
usr.sbin/bsdinstall/scripts/keymap
View File

@ -43,11 +43,6 @@ f_include $BSDCFG_SHARE/sysrc.subr
#
: ${KEYMAPFILE:=$BSDINSTALL_TMPETC/rc.conf.keymap}
#
# Default path to keymap INDEX containing descriptions
#
: ${MAPDESCFILE:=/usr/share/syscons/keymaps/INDEX.keymaps}
############################################################ GLOBALS
#

2
usr.sbin/bsnmpd/bsnmpd/Makefile
View File

@ -7,6 +7,8 @@
CONTRIB=${SRCTOP}/contrib/bsnmp
.PATH: ${CONTRIB}/snmpd
CONFS= snmpd.config
CONFSMODE= 600
PROG= bsnmpd
SRCS= main.c action.c config.c export.c trap.c trans_udp.c trans_lsock.c
SRCS+= oid.h tree.c tree.h

0
etc/snmpd.config → usr.sbin/bsnmpd/bsnmpd/snmpd.config
View File