Merge pull request #10 from trueos/trueos/master

Update ixlab-master

MAINTAINERS

@@ -38,14 +38,15 @@ subsystem	login	notes
 ath(4)		adrian	Pre-commit review requested, send to [email protected]
 contrib/atf		ngie,#test		Pre-commit review requested.
 contrib/capsicum-test	ngie,#capsicum,#test	Pre-commit review requested.
-contrib/compiler-rt	dim	Pre-commit review preferred.
 contrib/googletest	ngie,#test		Pre-commit review requested.
-contrib/ipfilter	cy	Pre-commit review requested.
-contrib/libc++		dim	Pre-commit review preferred.
-contrib/libcxxrt	dim	Pre-commit review preferred.
-contrib/libunwind	dim,emaste,jhb	Pre-commit review preferred.
-contrib/llvm		dim	Pre-commit review preferred.
-contrib/llvm/tools/lldb	dim,emaste	Pre-commit review preferred.
+contrib/ipfilter	cy			Pre-commit review requested.
+contrib/libcxxrt	dim,emaste		Pre-commit review preferred.
+contrib/llvm-project/compiler-rt	dim	Pre-commit review preferred.
+contrib/llvm-project/libcxx	dim		Pre-commit review preferred.
+contrib/llvm-project/libunwind	dim,emaste,jhb	Pre-commit review preferred.
+contrib/llvm-project/lldb	dim,emaste	Pre-commit review preferred.
+contrib/llvm-project/llvm	dim		Pre-commit review preferred.
+contrib/llvm-project/openmp	dim,emaste	Pre-commit review preferred.
 contrib/netbsd-tests	ngie,#test		Pre-commit review requested.
 contrib/pjdfstest	asomers,ngie,pjd,#test	Pre-commit review requested.
 *env(3)		secteam	Due to the problematic security history of this

Makefile.inc1

@@ -1510,6 +1510,7 @@ _sysent_dirs+=	sys/compat/cloudabi32	\
 		sys/compat/cloudabi64
 _sysent_dirs+=	sys/amd64/linux		\
 		sys/amd64/linux32	\
+		sys/arm/linux		\
 		sys/arm64/linux		\
 		sys/i386/linux
 sysent: .PHONY
@@ -2446,7 +2447,8 @@ _libmagic=lib/libmagic
 .endif
 
 .if ${MK_PMC} != "no" && \
-    (${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386")
+    (${TARGET_ARCH} == "aarch64" || ${TARGET_ARCH} == "amd64" || \
+    ${TARGET_ARCH} == "i386")
 _jevents=lib/libpmc/pmu-events
 .endif
 

RELNOTES

@@ -10,6 +10,28 @@ newline.  Entries should be separated by a newline.
 
 Changes to this file should not be MFCed.
 
+r355677:
+	Adds support for NFSv4.2 (RFC-7862) and Extended Attributes
+	(RFC-8276) to the NFS client and server.
+	NFSv4.2 is comprised of several optional features that can be supported
+	in addition to NFSv4.1. This patch adds the following optional features:
+	- posix_fadvise(POSIX_FADV_WILLNEED/POSIX_FADV_DONTNEED)
+	- posix_fallocate()
+	- intra server file range copying via the copy_file_range(2) syscall
+	--> Avoiding data tranfer over the wire to/from the NFS client.
+	- lseek(SEEK_DATA/SEEK_HOLE)
+	- Extended attribute syscalls for "user" namespace attributes as defined
+	  by RFC-8276.
+
+	For the client, NFSv4.2 is only used if the mount command line option
+	minorversion=2 is specified.
+	For the server, two new sysctls called vfs.nfsd.server_min_minorversion4
+ 	and vfs.nfsd.server_max_minorversion4 have been added that allow
+	sysadmins to limit the minor versions of NFSv4 supported by the nfsd
+	server.
+	Setting vfs.nfsd.server_max_minorversion4 to 0 or 1 will disable NFSv4.2
+	on the server.
+
 r354517:
 	iwm(4) now supports most Intel 9260, 9460 and 9560 Wi-Fi devices.
 

UPDATING

@@ -26,6 +26,17 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW:
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20191222:
+	Clang, llvm, lld, lldb, compiler-rt, libc++, libunwind and openmp have
+	been upgraded to 9.0.1.  Please see the 20141231 entry below for
+	information about prerequisites and upgrading, if you are not already
+	using clang 3.5.0 or higher.
+
+20191212:
+	r355677 has modified the internal interface used between the
+	NFS modules in the kernel. As such, they must all be upgraded
+	simultaneously. I will do a version bump for this.
+
 20191205:
 	The root certificates of the Mozilla CA Certificate Store have been
 	imported into the base system and can be managed with the certctl(8)
@@ -1929,19 +1940,14 @@ COMMON ITEMS:
 
 	General Notes
 	-------------
-	Avoid using make -j when upgrading.  While generally safe, there are
-	sometimes problems using -j to upgrade.  If your upgrade fails with
-	-j, please try again without -j.  From time to time in the past there
-	have been problems using -j with buildworld and/or installworld.  This
-	is especially true when upgrading between "distant" versions (eg one
-	that cross a major release boundary or several minor releases, or when
-	several months have passed on the -current branch).
-
 	Sometimes, obscure build problems are the result of environment
 	poisoning.  This can happen because the make utility reads its
 	environment when searching for values for global variables.  To run
 	your build attempts in an "environmental clean room", prefix all make
 	commands with 'env -i '.  See the env(1) manual page for more details.
+	Occasionally a build failure will occur with "make -j" due to a race
+	condition.  If this happens try building again without -j, and please
+	report a bug if it happens consistently.
 
 	When upgrading from one major version to another it is generally best to
 	upgrade to the latest code in the currently installed branch first, then

bin/ls/Makefile.depend

@@ -2,14 +2,12 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/libutil \
-	lib/ncurses/ncursesw \
 
 
 .include <dirdeps.mk>

bin/ls/Makefile.depend.options

@@ -0,0 +1,8 @@
+# $FreeBSD$
+# This file is not autogenerated - take care!
+
+DIRDEPS_OPTIONS= LS_COLORS
+
+DIRDEPS.LS_COLORS.yes= lib/ncurses/ncursesw
+
+.include <dirdeps-options.mk>

cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c

@@ -38,9 +38,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <limits.h>
-#ifdef illumos
-#include <alloca.h>
-#endif
 #include <errno.h>
 #include <fcntl.h>
 
@@ -162,26 +159,40 @@ dt_opt_cpp_path(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
 static int
 dt_opt_cpp_opts(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
 {
-	char *buf;
+	char *buf = NULL;
 	size_t len;
 	const char *opt = (const char *)option;
+	int ret;
 
-	if (opt == NULL || arg == NULL)
-		return (dt_set_errno(dtp, EDT_BADOPTVAL));
+	if (opt == NULL || arg == NULL) {
+		ret = dt_set_errno(dtp, EDT_BADOPTVAL);
+		goto out;
+	}
 
-	if (dtp->dt_pcb != NULL)
-		return (dt_set_errno(dtp, EDT_BADOPTCTX));
+	if (dtp->dt_pcb != NULL) {
+		ret = dt_set_errno(dtp, EDT_BADOPTCTX);
+		goto out;
+	}
 
 	len = strlen(opt) + strlen(arg) + 1;
-	buf = alloca(len);
+	if ((buf = dt_alloc(dtp, len)) == NULL) {
+		ret = dt_set_errno(dtp, EDT_NOMEM);
+		goto out;
+	}
 
 	(void) strcpy(buf, opt);
 	(void) strcat(buf, arg);
 
-	if (dt_cpp_add_arg(dtp, buf) == NULL)
-		return (dt_set_errno(dtp, EDT_NOMEM));
+	if (dt_cpp_add_arg(dtp, buf) == NULL) {
+		ret = dt_set_errno(dtp, EDT_NOMEM);
+		goto out;
+	}
 
-	return (0);
+	ret = 0;
+out:
+	if (buf != NULL)
+		dt_free(dtp, buf);
+	return (ret);
 }
 
 /*ARGSUSED*/
@@ -885,27 +896,35 @@ dt_options_load(dtrace_hdl_t *dtp)
 	dof_hdr_t hdr, *dof;
 	dof_sec_t *sec;
 	size_t offs;
-	int i;
+	int i, ret;
 
 	/*
 	 * To load the option values, we need to ask the kernel to provide its
 	 * DOF, which we'll sift through to look for OPTDESC sections.
 	 */
+	dof = &hdr;
 	bzero(&hdr, sizeof (dof_hdr_t));
 	hdr.dofh_loadsz = sizeof (dof_hdr_t);
 
 #ifdef illumos
-	if (dt_ioctl(dtp, DTRACEIOC_DOFGET, &hdr) == -1)
+	if (dt_ioctl(dtp, DTRACEIOC_DOFGET, dof) == -1)
 #else
-	dof = &hdr;
 	if (dt_ioctl(dtp, DTRACEIOC_DOFGET, &dof) == -1)
 #endif
-		return (dt_set_errno(dtp, errno));
+	{
+		ret = dt_set_errno(dtp, errno);
+		goto out;
+	}
 
-	if (hdr.dofh_loadsz < sizeof (dof_hdr_t))
-		return (dt_set_errno(dtp, EINVAL));
+	if (hdr.dofh_loadsz < sizeof (dof_hdr_t)) {
+		ret = dt_set_errno(dtp, EINVAL);
+		goto out;
+	}
 
-	dof = alloca(hdr.dofh_loadsz);
+	if ((dof = dt_alloc(dtp, hdr.dofh_loadsz)) == NULL) {
+		ret = dt_set_errno(dtp, EDT_NOMEM);
+		goto out;
+	}
 	bzero(dof, sizeof (dof_hdr_t));
 	dof->dofh_loadsz = hdr.dofh_loadsz;
 
@@ -917,7 +936,10 @@ dt_options_load(dtrace_hdl_t *dtp)
 #else
 	if (dt_ioctl(dtp, DTRACEIOC_DOFGET, &dof) == -1)
 #endif
-		return (dt_set_errno(dtp, errno));
+	{
+		ret = dt_set_errno(dtp, errno);
+		goto out;
+	}
 
 	for (i = 0; i < dof->dofh_secnum; i++) {
 		sec = (dof_sec_t *)(uintptr_t)((uintptr_t)dof +
@@ -942,7 +964,11 @@ dt_options_load(dtrace_hdl_t *dtp)
 		dtp->dt_options[opt->dofo_option] = opt->dofo_value;
 	}
 
-	return (0);
+	ret = 0;
+out:
+	if (dof != NULL && dof != &hdr)
+		dt_free(dtp, dof);
+	return (ret);
 }
 
 typedef struct dt_option {

cddl/lib/libavl/Makefile.depend

@@ -2,7 +2,6 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	include \
 	lib/${CSU_DIR} \
 	lib/libc \

cddl/lib/libctf/Makefile.depend

@@ -2,7 +2,6 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \

cddl/lib/libnvpair/Makefile.depend

@@ -2,7 +2,6 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \

cddl/lib/libumem/Makefile.depend

@@ -2,7 +2,6 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	include \
 	lib/${CSU_DIR} \
 	lib/libc \

cddl/lib/libuutil/Makefile.depend

@@ -2,7 +2,6 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \

cddl/lib/libzfs/Makefile.depend

@@ -7,7 +7,6 @@ DIRDEPS = \
 	cddl/lib/libumem \
 	cddl/lib/libuutil \
 	cddl/lib/libzfs_core \
-	gnu/lib/csu \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \

cddl/lib/libzfs_core/Makefile.depend

@@ -3,7 +3,6 @@
 
 DIRDEPS = \
 	cddl/lib/libnvpair \
-	gnu/lib/csu \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \

contrib/bsnmp/snmpd/main.c

@@ -1615,9 +1615,7 @@ main(int argc, char *argv[])
 	progargs = argv;
 	nprogargs = argc;
 
-	srandomdev();
-
-	snmp_serial_no = random();
+	snmp_serial_no = arc4random();
 
 #ifdef USE_TCPWRAPPERS
 	/*