Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@lakhanshiva
lakhanshiva committed Apr 24, 2018
2 parents 1b2c4f6 + 539b451 commit 5f544d0
Show file tree
Hide file tree
Showing 1,428 changed files with 54,003 additions and 29,488 deletions.
5 changes: 4 additions & 1 deletion Makefile.inc1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,10 @@ _cleanobj_fast_depend_hack: .PHONY
# Date SVN Rev Syscalls
# 20170624 r320278 fstat fstatat fstatfs getdirentries getfsstat statfs
# 20180404 r332048 sigreturn
.for f in fstat fstatat fstatfs getdirentries getfsstat sigreturn statfs
# 20180405 r332080 shmat
# 20180406 r332119 setlogin
# 20170411 r332443 exect
.for f in exect fstat fstatat fstatfs getdirentries getfsstat setlogin shmat sigreturn statfs
.if exists(${OBJTOP}/lib/libc/.depend.${f}.o)
@if egrep -qw '${f}\.[sS]' \
${OBJTOP}/lib/libc/.depend.${f}.o; then \
Expand Down
12 changes: 10 additions & 2 deletions ObsoleteFiles.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,15 @@
# xargs -n1 | sort | uniq -d;
# done

# 20180417: remove fuswintr and suswintr
OLD_FILES+=usr/share/man/man9/fuswintr.9.gz
OLD_FILES+=usr/share/man/man9/suswintr.9.gz
# 20180413: remove Arcnet support
OLD_FILES+=usr/include/net/if_arc.h
OLD_FILES+=usr/share/man/man4/cm.4.gz
# 20180409: remove FDDI support
OLD_FILES+=usr/include/net/fddi.h
OLD_FILES+=usr/share/man/man4/fpa.4.gz
# 20180319: remove /boot/overlays, replaced by /boot/dtb/overlays
OLD_DIRS+=boot/overlays
# 20180311: remove sys/sys/i386/include/pcaudioio.h
Expand Down Expand Up @@ -413,7 +422,7 @@ OLD_FILES+=usr/share/man/man9/mbp_sync.9.gz
OLD_FILES+=usr/lib/libstand.a
OLD_FILES+=usr/lib/libstand_p.a
OLD_FILES+=usr/include/stand.h
OLD_FILES+=usr/share/man/man3/libstand.3
OLD_FILES+=usr/share/man/man3/libstand.3.gz
# 20171003: remove RCMDS
OLD_FILES+=bin/rcp
OLD_FILES+=rescue/rcp
Expand Down Expand Up @@ -1067,7 +1076,6 @@ OLD_FILES+=usr/share/man/man7/mm.7.gz
OLD_FILES+=usr/share/man/man7/mmse.7.gz
OLD_FILES+=usr/share/man/man7/ms.7.gz
OLD_FILES+=usr/share/man/man7/orig_me.7.gz
OLD_FILES+=usr/share/man/man7/roff.7.gz
OLD_FILES+=usr/share/me/acm.me
OLD_FILES+=usr/share/me/chars.me
OLD_FILES+=usr/share/me/deltext.me
Expand Down
49 changes: 49 additions & 0 deletions UPDATING
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,55 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:

****************************** SPECIAL WARNING: ******************************

20180413:
Support for Arcnet networks has been removed. If you have device
arcnet or device cm in your kernel config file they must be
removed.

20180411:
Support for FDDI networks has been removed. If you have device
fddi or device fpa in your kernel config file they must be
removed.

20180406:
In addition to supporting RFC 3164 formatted messages, the
syslogd(8) service is now capable of parsing RFC 5424 formatted
log messages. The main benefit of using RFC 5424 is that clients
may now send log messages with timestamps containing year numbers,
microseconds and time zone offsets.

Similarly, the syslog(3) C library function has been altered to
send RFC 5424 formatted messages to the local system logging
daemon. On systems using syslogd(8), this change should have no
negative impact, as long as syslogd(8) and the C library are
updated at the same time. On systems using a different system
logging daemon, it may be necessary to make configuration
adjustments, depending on the software used.

When using syslog-ng, add the 'syslog-protocol' flag to local
input sources to enable parsing of RFC 5424 formatted messages:

source src {
unix-dgram("/var/run/log" flags(syslog-protocol));
}

When using rsyslog, disable the 'SysSock.UseSpecialParser' option
of the 'imuxsock' module to let messages be processed by the
regular RFC 3164/5424 parsing pipeline:

module(load="imuxsock" SysSock.UseSpecialParser="off")

Do note that these changes only affect communication between local
applications and syslogd(8). The format that syslogd(8) uses to
store messages on disk or forward messages to other systems
remains unchanged. syslogd(8) still uses RFC 3164 for these
purposes. Options to customize this behaviour will be added in the
future. Utilities that process log files stored in /var/log are
thus expected to continue to function as before.

__FreeBSD_version has been incremented to 1200061 to denote this
change.

20180328:
Support for token ring networks has been removed. If you
have "device token" in your kernel config you should remove
Expand Down
6 changes: 2 additions & 4 deletions bin/expr/expr.y
View file
Original file line number Diff line number Diff line change
Expand Up @@ -422,11 +422,9 @@ op_plus(struct val *a, struct val *b)
void
assert_minus(intmax_t a, intmax_t b, intmax_t r)
{
/* special case subtraction of INTMAX_MIN */
if (b == INTMAX_MIN && a < 0)
if ((a >= 0 && b < 0 && r <= 0) ||
(a < 0 && b > 0 && r >= 0))
errx(ERR_EXIT, "overflow");
/* check addition of negative subtrahend */
assert_plus(a, -b, r);
}

struct val *
Expand Down
28 changes: 24 additions & 4 deletions bin/setfacl/setfacl.1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,15 @@
.\"
.\" $FreeBSD$
.\"
.Dd January 23, 2016
.Dd April 10, 2018
.Dt SETFACL 1
.Os
.Sh NAME
.Nm setfacl
.Nd set ACL information
.Sh SYNOPSIS
.Nm
.Op Fl R Op Fl H | L | P
.Op Fl bdhkn
.Op Fl a Ar position entries
.Op Fl m Ar entries
Expand Down Expand Up @@ -79,18 +80,30 @@ entries of the current ACL.
The operations apply to the default ACL entries instead of
access ACL entries.
Currently only directories may have
default ACL's. This option is not applicable to NFSv4 ACLs.
default ACL's.
This option is not applicable to NFSv4 ACLs.
.It Fl h
If the target of the operation is a symbolic link, perform the operation
on the symbolic link itself, rather than following the link.
.It Fl H
If the
.Fl R
option is specified, symbolic links on the command line are followed
and hence unaffected by the command.
(Symbolic links encountered during tree traversal are not followed.)
.It Fl k
Delete any default ACL entries on the specified files.
It
is not considered an error if the specified files do not have
any default ACL entries.
An error will be reported if any of
the specified files cannot have a default entry (i.e.\&
non-directories). This option is not applicable to NFSv4 ACLs.
the specified files cannot have a default entry (i.e.,
non-directories).
This option is not applicable to NFSv4 ACLs.
.It Fl L
If the
.Fl R
option is specified, all symbolic links are followed.
.It Fl m Ar entries
Modify the ACL on the specified file.
New entries will be added, and existing entries will be modified
Expand All @@ -116,6 +129,13 @@ the input is taken from stdin.
Do not recalculate the permissions associated with the ACL
mask entry.
This option is not applicable to NFSv4 ACLs.
.It Fl P
If the
.Fl R
option is specified, no symbolic links are followed.
This is the default.
.It Fl R
Perform the action recursively on any specified directories.
.It Fl x Ar entries | position
If
.Ar entries
Expand Down
Loading

0 comments on commit 5f544d0

Please sign in to comment.