svn commit: r364251 - in projects/clang1100-import: . cddl/contrib/opensolaris/lib/libdtrace/common etc/mtree lib/libbsnmp lib/libbsnmp/tests lib/libc/gen lib/liblua lib/libpmc libexec/flua libexec...

Dimitry Andric dim at FreeBSD.org
Sat Aug 15 11:49:42 UTC 2020 

Author: dim
Date: Sat Aug 15 11:49:31 2020
New Revision: 364251
URL: https://svnweb.freebsd.org/changeset/base/364251

Log:
  Merge ^/head r364082 through r364250.

Added:
  projects/clang1100-import/lib/libbsnmp/tests/
     - copied from r364250, head/lib/libbsnmp/tests/
  projects/clang1100-import/share/man/man4/cp2112.4
     - copied unchanged from r364250, head/share/man/man4/cp2112.4
  projects/clang1100-import/share/man/man9/prng.9
     - copied unchanged from r364250, head/share/man/man9/prng.9
  projects/clang1100-import/sys/compat/linuxkpi/common/include/linux/wait_bit.h
     - copied unchanged from r364250, head/sys/compat/linuxkpi/common/include/linux/wait_bit.h
  projects/clang1100-import/sys/kern/subr_prng.c
     - copied unchanged from r364250, head/sys/kern/subr_prng.c
  projects/clang1100-import/sys/sys/prng.h
     - copied unchanged from r364250, head/sys/sys/prng.h
  projects/clang1100-import/tools/tools/locale/patch/
     - copied from r364250, head/tools/tools/locale/patch/
Deleted:
  projects/clang1100-import/sys/compat/netbsd/
  projects/clang1100-import/tools/debugscripts/kgdb
Modified:
  projects/clang1100-import/Makefile.inc1
  projects/clang1100-import/UPDATING
  projects/clang1100-import/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrno.sh
  projects/clang1100-import/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh
  projects/clang1100-import/cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh
  projects/clang1100-import/cddl/contrib/opensolaris/lib/libdtrace/common/mksignal.sh
  projects/clang1100-import/etc/mtree/BSD.usr.dist
  projects/clang1100-import/lib/libbsnmp/Makefile
  projects/clang1100-import/lib/libc/gen/Makefile.inc
  projects/clang1100-import/lib/libc/gen/Symbol.map
  projects/clang1100-import/lib/libc/gen/scandir-compat11.c
  projects/clang1100-import/lib/libc/gen/scandir.c
  projects/clang1100-import/lib/libc/gen/syslog.c
  projects/clang1100-import/lib/liblua/Makefile
  projects/clang1100-import/lib/liblua/luaconf.h
  projects/clang1100-import/lib/libpmc/libpmc.c
  projects/clang1100-import/libexec/flua/Makefile
  projects/clang1100-import/libexec/rc/rc.d/ipfilter
  projects/clang1100-import/libexec/rc/rc.d/ipmon
  projects/clang1100-import/libexec/rc/rc.d/ipnat
  projects/clang1100-import/libexec/rc/rc.d/netif
  projects/clang1100-import/libexec/rc/rc.d/netwait
  projects/clang1100-import/libexec/rc/rc.d/securelevel
  projects/clang1100-import/release/packages/binutils.ucl
  projects/clang1100-import/release/packages/caroot.ucl
  projects/clang1100-import/release/packages/clang.ucl
  projects/clang1100-import/release/packages/gdb.ucl
  projects/clang1100-import/release/packages/generate-ucl.sh
  projects/clang1100-import/release/packages/groff.ucl
  projects/clang1100-import/release/packages/jail.ucl
  projects/clang1100-import/release/packages/kernel.ucl
  projects/clang1100-import/release/packages/lld.ucl
  projects/clang1100-import/release/packages/lldb.ucl
  projects/clang1100-import/release/packages/runtime.ucl
  projects/clang1100-import/release/packages/ssh.ucl
  projects/clang1100-import/release/packages/svn.ucl
  projects/clang1100-import/release/packages/template.ucl
  projects/clang1100-import/release/packages/unbound.ucl
  projects/clang1100-import/release/packages/utilities.ucl
  projects/clang1100-import/sbin/ifconfig/ifconfig.c
  projects/clang1100-import/sbin/ipfw/ipfw.8
  projects/clang1100-import/sbin/ipfw/ipfw2.c
  projects/clang1100-import/secure/lib/libssl/Makefile
  projects/clang1100-import/share/man/man4/Makefile
  projects/clang1100-import/share/man/man9/Makefile
  projects/clang1100-import/share/mk/bsd.linker.mk
  projects/clang1100-import/share/mk/src.opts.mk
  projects/clang1100-import/share/mk/sys.mk
  projects/clang1100-import/stand/common/newvers.sh
  projects/clang1100-import/stand/i386/loader/Makefile
  projects/clang1100-import/sys/arm/allwinner/aw_cir.c
  projects/clang1100-import/sys/arm64/include/armreg.h
  projects/clang1100-import/sys/arm64/rockchip/if_dwc_rk.c
  projects/clang1100-import/sys/cam/nvme/nvme_da.c
  projects/clang1100-import/sys/cam/nvme/nvme_xpt.c
  projects/clang1100-import/sys/compat/linprocfs/linprocfs.c
  projects/clang1100-import/sys/compat/linuxkpi/common/include/linux/bitops.h
  projects/clang1100-import/sys/compat/linuxkpi/common/include/linux/sched.h
  projects/clang1100-import/sys/compat/linuxkpi/common/include/linux/wait.h
  projects/clang1100-import/sys/compat/linuxkpi/common/src/linux_compat.c
  projects/clang1100-import/sys/compat/linuxkpi/common/src/linux_rcu.c
  projects/clang1100-import/sys/conf/files
  projects/clang1100-import/sys/conf/kern.pre.mk
  projects/clang1100-import/sys/contrib/pcg-c/include/pcg_variants.h
  projects/clang1100-import/sys/dev/dwc/if_dwc.c
  projects/clang1100-import/sys/dev/dwc/if_dwc.h
  projects/clang1100-import/sys/dev/dwc/if_dwc_if.m
  projects/clang1100-import/sys/dev/dwc/if_dwcvar.h
  projects/clang1100-import/sys/dev/gpio/gpiokeys.c
  projects/clang1100-import/sys/dev/hwpmc/hwpmc_arm64.c
  projects/clang1100-import/sys/dev/hwpmc/pmc_events.h
  projects/clang1100-import/sys/dev/ice/ice_common.h
  projects/clang1100-import/sys/dev/ixl/i40e_prototype.h
  projects/clang1100-import/sys/dev/nvd/nvd.c
  projects/clang1100-import/sys/dev/nvme/nvme_sim.c
  projects/clang1100-import/sys/dev/usb/misc/cp2112.c
  projects/clang1100-import/sys/fs/devfs/devfs.h
  projects/clang1100-import/sys/fs/devfs/devfs_devs.c
  projects/clang1100-import/sys/fs/devfs/devfs_int.h
  projects/clang1100-import/sys/fs/devfs/devfs_vnops.c
  projects/clang1100-import/sys/fs/nfs/nfs.h
  projects/clang1100-import/sys/fs/nfs/nfs_commonkrpc.c
  projects/clang1100-import/sys/fs/nfs/nfs_commonsubs.c
  projects/clang1100-import/sys/fs/nfs/nfs_var.h
  projects/clang1100-import/sys/fs/nfsclient/nfs_clcomsubs.c
  projects/clang1100-import/sys/fs/nfsclient/nfs_clrpcops.c
  projects/clang1100-import/sys/fs/nfsclient/nfs_clvfsops.c
  projects/clang1100-import/sys/fs/nfsserver/nfs_nfsdstate.c
  projects/clang1100-import/sys/kern/kern_conf.c
  projects/clang1100-import/sys/kern/kern_environment.c
  projects/clang1100-import/sys/kern/kern_proc.c
  projects/clang1100-import/sys/kern/sys_pipe.c
  projects/clang1100-import/sys/kern/tty.c
  projects/clang1100-import/sys/kern/vfs_lookup.c
  projects/clang1100-import/sys/kern/vfs_subr.c
  projects/clang1100-import/sys/kern/vfs_syscalls.c
  projects/clang1100-import/sys/libkern/random.c
  projects/clang1100-import/sys/modules/linux/Makefile
  projects/clang1100-import/sys/modules/linux64/Makefile
  projects/clang1100-import/sys/net/if_lagg.c
  projects/clang1100-import/sys/net/iflib.c
  projects/clang1100-import/sys/net/iflib.h
  projects/clang1100-import/sys/net/route.c
  projects/clang1100-import/sys/net/route.h
  projects/clang1100-import/sys/net/route/route_ctl.c
  projects/clang1100-import/sys/net/route/route_ctl.h
  projects/clang1100-import/sys/net/route/route_var.h
  projects/clang1100-import/sys/net/route/shared.h
  projects/clang1100-import/sys/net/rtsock.c
  projects/clang1100-import/sys/netinet/cc/cc_cubic.c
  projects/clang1100-import/sys/netinet/in_mcast.c
  projects/clang1100-import/sys/netinet/in_proto.c
  projects/clang1100-import/sys/netinet/in_rmx.c
  projects/clang1100-import/sys/netinet/in_var.h
  projects/clang1100-import/sys/netinet/sctputil.c
  projects/clang1100-import/sys/netinet/tcp_input.c
  projects/clang1100-import/sys/netinet/tcp_sack.c
  projects/clang1100-import/sys/netinet/tcp_syncache.c
  projects/clang1100-import/sys/netinet/tcp_syncache.h
  projects/clang1100-import/sys/netinet/tcp_var.h
  projects/clang1100-import/sys/netinet6/in6.c
  projects/clang1100-import/sys/netinet6/in6_mcast.c
  projects/clang1100-import/sys/netinet6/in6_proto.c
  projects/clang1100-import/sys/netinet6/in6_rmx.c
  projects/clang1100-import/sys/netinet6/in6_var.h
  projects/clang1100-import/sys/netinet6/scope6.c
  projects/clang1100-import/sys/netinet6/scope6_var.h
  projects/clang1100-import/sys/netpfil/ipfw/ip_fw2.c
  projects/clang1100-import/sys/riscv/include/pcpu.h
  projects/clang1100-import/sys/riscv/include/pcpu_aux.h
  projects/clang1100-import/sys/riscv/include/stack.h
  projects/clang1100-import/sys/riscv/riscv/db_trace.c
  projects/clang1100-import/sys/riscv/riscv/locore.S
  projects/clang1100-import/sys/riscv/riscv/stack_machdep.c
  projects/clang1100-import/sys/riscv/riscv/trap.c
  projects/clang1100-import/sys/riscv/riscv/unwind.c
  projects/clang1100-import/sys/rpc/clnt.h
  projects/clang1100-import/sys/sys/domain.h
  projects/clang1100-import/sys/sys/namei.h
  projects/clang1100-import/sys/sys/param.h
  projects/clang1100-import/sys/sys/pipe.h
  projects/clang1100-import/sys/sys/pmc.h
  projects/clang1100-import/sys/sys/smp.h
  projects/clang1100-import/sys/sys/vnode.h
  projects/clang1100-import/sys/vm/uma_core.c
  projects/clang1100-import/sys/vm/vm_meter.c
  projects/clang1100-import/sys/vm/vm_page.c
  projects/clang1100-import/sys/vm/vm_page.h
  projects/clang1100-import/sys/vm/vm_pageout.c
  projects/clang1100-import/sys/vm/vm_pagequeue.h
  projects/clang1100-import/tests/sys/fs/fusefs/forget.cc
  projects/clang1100-import/tools/build/Makefile
  projects/clang1100-import/tools/tools/locale/Makefile
  projects/clang1100-import/tools/tools/locale/README
  projects/clang1100-import/tools/tools/locale/etc/final-maps/map.UTF-8
  projects/clang1100-import/tools/tools/locale/tools/cldr2def.pl
  projects/clang1100-import/tools/tools/locale/tools/convert_map.pl
  projects/clang1100-import/tools/tools/locale/tools/finalize
  projects/clang1100-import/tools/tools/locale/tools/utf8-rollup.pl
  projects/clang1100-import/usr.bin/fortune/fortune/fortune.c
  projects/clang1100-import/usr.bin/fortune/strfile/strfile.c
  projects/clang1100-import/usr.bin/script/script.c
  projects/clang1100-import/usr.bin/tput/tput.1
  projects/clang1100-import/usr.sbin/crunch/crunchgen/crunchgen.c
  projects/clang1100-import/usr.sbin/pwd_mkdb/bootstrap/pwd.h
Directory Properties:
  projects/clang1100-import/   (props changed)
  projects/clang1100-import/cddl/   (props changed)
  projects/clang1100-import/cddl/contrib/opensolaris/   (props changed)

Modified: projects/clang1100-import/Makefile.inc1
==============================================================================
--- projects/clang1100-import/Makefile.inc1	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/Makefile.inc1	Sat Aug 15 11:49:31 2020	(r364251)
@@ -180,7 +180,7 @@ MK_SYSTEM_LINKER=	no
 .if defined(CROSS_TOOLCHAIN_PREFIX)
 CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
 .endif
-XBINUTILS=	AS AR LD NM OBJCOPY RANLIB SIZE STRINGS
+XBINUTILS=	AS AR LD NM OBJCOPY RANLIB SIZE STRINGS STRIPBIN
 .for BINUTIL in ${XBINUTILS}
 .if defined(CROSS_BINUTILS_PREFIX) && \
     exists(${CROSS_BINUTILS_PREFIX}/${${BINUTIL}})
@@ -552,6 +552,13 @@ SOURCE_DATE_EPOCH=	${TIMEEPOCHNOW:gmtime}
 SOURCE_DATE_EPOCH=	${PKG_TIMESTAMP}
 .endif
 
+PKG_NAME_PREFIX?=	FreeBSD
+PKG_MAINTAINER?=	re at FreeBSD.org
+PKG_WWW?=		https://www.FreeBSD.org
+.export PKG_NAME_PREFIX
+.export PKG_MAINTAINER
+.export PKG_WWW
+
 .if !defined(_MKSHOWCONFIG)
 _CPUTYPE!=	MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} -f /dev/null \
 		-m ${.CURDIR}/share/mk MK_AUTO_OBJ=no -V CPUTYPE
@@ -748,7 +755,7 @@ CROSSENV+=	CC="${XCC} ${XCFLAGS}" CXX="${XCXX} ${XCXXF
 		AS="${XAS}" AR="${XAR}" LD="${XLD}" LLVM_LINK="${XLLVM_LINK}" \
 		NM=${XNM} OBJCOPY="${XOBJCOPY}" \
 		RANLIB=${XRANLIB} STRINGS=${XSTRINGS} \
-		SIZE="${XSIZE}"
+		SIZE="${XSIZE}" STRIPBIN="${XSTRIPBIN}"
 
 .if defined(CROSS_BINUTILS_PREFIX) && exists(${CROSS_BINUTILS_PREFIX})
 # In the case of xdev-build tools, CROSS_BINUTILS_PREFIX won't be a
@@ -1906,6 +1913,9 @@ create-kernel-packages-flavor${flavor:C,^""$,${_defaul
 		-e "s/%COMMENT%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \
 		-e "s/%DESC%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \
 		-e "s/ %VCS_REVISION%/${VCS_REVISION}/" \
+		-e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \
+		-e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \
+		-e "s|%PKG_WWW%|${PKG_WWW}|" \
 		${SRCDIR}/release/packages/kernel.ucl \
 		> ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \
 	awk -F\" ' \
@@ -1939,6 +1949,9 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_
 		-e "s/%COMMENT%/FreeBSD ${_kernel} kernel ${flavor}/" \
 		-e "s/%DESC%/FreeBSD ${_kernel} kernel ${flavor}/" \
 		-e "s/ %VCS_REVISION%/${VCS_REVISION}/" \
+		-e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \
+		-e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \
+		-e "s|%PKG_WWW%|${PKG_WWW}|" \
 		${SRCDIR}/release/packages/kernel.ucl \
 		> ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \
 	awk -F\" ' \
@@ -2227,9 +2240,13 @@ ${_bt}-usr.bin/mandoc: ${_bt}-lib/libopenbsd
 _basic_bootstrap_tools_multilink=usr.bin/grep grep,egrep,fgrep
 _basic_bootstrap_tools_multilink+=bin/test test,[
 # bootstrap tools needed by buildworld:
-_basic_bootstrap_tools=usr.bin/awk usr.bin/cut bin/expr usr.bin/gencat \
+_basic_bootstrap_tools=usr.bin/cut bin/expr usr.bin/gencat \
     usr.bin/join usr.bin/mktemp bin/rmdir usr.bin/sed usr.bin/sort \
     usr.bin/truncate usr.bin/tsort
+# Some build scripts use nawk instead of awk (this happens at least in
+# cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh) so we need both awk
+# and nawk in ${WORLDTMP}/legacy/bin.
+_basic_bootstrap_tools_multilink+=usr.bin/awk awk,nawk
 # file2c is required for building usr.sbin/config:
 _basic_bootstrap_tools+=usr.bin/file2c
 # uuencode/uudecode required for share/tabset

Modified: projects/clang1100-import/UPDATING
==============================================================================
--- projects/clang1100-import/UPDATING	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/UPDATING	Sat Aug 15 11:49:31 2020	(r364251)
@@ -32,6 +32,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW:
 	information about prerequisites and upgrading, if you are not already
 	using clang 3.5.0 or higher.
 
+20200810:
+	r364092 modified the internal ABI used between the kernel NFS
+	modules.  As such, all of these modules need to be rebuilt
+	from sources, so a version bump was done.
+
 20200807:
 	Makefile.inc has been updated to work around the issue documented in
 	20200729. It was a case where the optimization of using symbolic links

Modified: projects/clang1100-import/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrno.sh
==============================================================================
--- projects/clang1100-import/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrno.sh	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrno.sh	Sat Aug 15 11:49:31 2020	(r364251)
@@ -24,15 +24,15 @@
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+set -e
 
-echo "\
-/*\n\
- * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.\n\
- * Use is subject to license terms.\n\
- */\n\
-\n\
-#pragma ident\t\"%Z%%M%\t%I%\t%E% SMI\"\n"
+printf "%s" "
+/*
+ * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+"
 
 pattern='^#define[	 ]\(E[A-Z0-9]*\)[	 ]*\([A-Z0-9]*\).*$'
 replace='inline int \1 = \2;@#pragma D binding "1.0" \1'

Modified: projects/clang1100-import/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh
==============================================================================
--- projects/clang1100-import/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh	Sat Aug 15 11:49:31 2020	(r364251)
@@ -24,36 +24,34 @@
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+set -e
 
-BSDECHO=-e
+printf "%s" "
+/*
+ * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
 
-echo ${BSDECHO} "\
-/*\n\
- * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.\n\
- * Use is subject to license terms.\n\
- */\n\
-\n\
-#pragma ident\t\"%Z%%M%\t%I%\t%E% SMI\"\n\
-\n\
 #include <dt_errtags.h>
-\n\
-static const char *const _dt_errtags[] = {"
 
+static const char *const _dt_errtags[] = {
+"
+
 pattern='^	\(D_[A-Z0-9_]*\),*'
 replace='	"\1",'
 
 sed -n "s/$pattern/$replace/p" || exit 1
 
-echo ${BSDECHO} "\
-};\n\
-\n\
-static const int _dt_ntag = sizeof (_dt_errtags) / sizeof (_dt_errtags[0]);\n\
-\n\
+printf "%s" "
+};
+
+static const int _dt_ntag = sizeof (_dt_errtags) / sizeof (_dt_errtags[0]);
+
 const char *
 dt_errtag(dt_errtag_t tag)
 {
 	return (_dt_errtags[(tag > 0 && tag < _dt_ntag) ? tag : 0]);
-}"
+}
+"
 
 exit 0

Modified: projects/clang1100-import/cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh
==============================================================================
--- projects/clang1100-import/cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh	Sat Aug 15 11:49:31 2020	(r364251)
@@ -24,32 +24,30 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+set -e
 
-BSDECHO=-e
+printf "%s" "
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
 
-echo ${BSDECHO} "\
-/*\n\
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.\n\
- * Use is subject to license terms.\n\
- */\n\
-\n\
-#pragma ident\t\"%Z%%M%\t%I%\t%E% SMI\"\n\
-\n\
-#include <dtrace.h>\n\
-\n\
+#include <dtrace.h>
+
 /*ARGSUSED*/
-const char *\n\
-dtrace_subrstr(dtrace_hdl_t *dtp, int subr)\n\
-{\n\
-	switch (subr) {"
+const char *
+dtrace_subrstr(dtrace_hdl_t *dtp, int subr)
+{
+	switch (subr) {
+"
 
 nawk '
 /^#define[ 	]*DIF_SUBR_/ && $2 != "DIF_SUBR_MAX" {
 	printf("\tcase %s: return (\"%s\");\n", $2, tolower(substr($2, 10)));
 }'
 
-echo ${BSDECHO} "\
-	default: return (\"unknown\");\n\
-	}\n\
-}"
+printf "%s" "
+	default: return (\"unknown\");
+	}
+}
+"

Modified: projects/clang1100-import/cddl/contrib/opensolaris/lib/libdtrace/common/mksignal.sh
==============================================================================
--- projects/clang1100-import/cddl/contrib/opensolaris/lib/libdtrace/common/mksignal.sh	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/cddl/contrib/opensolaris/lib/libdtrace/common/mksignal.sh	Sat Aug 15 11:49:31 2020	(r364251)
@@ -24,15 +24,15 @@
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+set -e
 
-echo "\
-/*\n\
- * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.\n\
- * Use is subject to license terms.\n\
- */\n\
-\n\
-#pragma ident\t\"%Z%%M%\t%I%\t%E% SMI\"\n"
+printf "%s" "
+/*
+ * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+"
 
 pattern='^#define[	 ]*_*\(SIG[A-Z0-9]*\)[	 ]\{1,\}\([A-Z0-9]*\).*$'
 replace='inline int \1 = \2;@#pragma D binding "1.0" \1'

Modified: projects/clang1100-import/etc/mtree/BSD.usr.dist
==============================================================================
--- projects/clang1100-import/etc/mtree/BSD.usr.dist	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/etc/mtree/BSD.usr.dist	Sat Aug 15 11:49:31 2020	(r364251)
@@ -68,6 +68,8 @@
         ..
         engines
         ..
+        flua
+        ..
         i18n
         ..
         libxo
@@ -369,6 +371,8 @@
             ..
         ..
         firmware
+        ..
+        flua
         ..
         games
             fortune

Modified: projects/clang1100-import/lib/libbsnmp/Makefile
==============================================================================
--- projects/clang1100-import/lib/libbsnmp/Makefile	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/lib/libbsnmp/Makefile	Sat Aug 15 11:49:31 2020	(r364251)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
 SUBDIR=	libbsnmp
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.subdir.mk>

Modified: projects/clang1100-import/lib/libc/gen/Makefile.inc
==============================================================================
--- projects/clang1100-import/lib/libc/gen/Makefile.inc	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/lib/libc/gen/Makefile.inc	Sat Aug 15 11:49:31 2020	(r364251)
@@ -120,6 +120,7 @@ SRCS+=	__getosreldate.c \
 	recvmmsg.c \
 	rewinddir.c \
 	scandir.c \
+	scandir_b.c \
 	scandir-compat11.c \
 	seed48.c \
 	seekdir.c \

Modified: projects/clang1100-import/lib/libc/gen/Symbol.map
==============================================================================
--- projects/clang1100-import/lib/libc/gen/Symbol.map	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/lib/libc/gen/Symbol.map	Sat Aug 15 11:49:31 2020	(r364251)
@@ -416,7 +416,6 @@ FBSD_1.5 {
 	readdir;
 	readdir_r;
 	scandir;
-	scandir_b;
 	sem_clockwait_np;
 	setproctitle_fast;
 	timespec_get;
@@ -424,6 +423,7 @@ FBSD_1.5 {
 
 FBSD_1.6 {
 	memalign;
+	scandir_b;
 	sigandset;
 	sigisemptyset;
 	sigorset;

Modified: projects/clang1100-import/lib/libc/gen/scandir-compat11.c
==============================================================================
--- projects/clang1100-import/lib/libc/gen/scandir-compat11.c	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/lib/libc/gen/scandir-compat11.c	Sat Aug 15 11:49:31 2020	(r364251)
@@ -49,32 +49,25 @@ __FBSDID("$FreeBSD$");
 
 #include "gen-compat.h"
 
-#ifdef	I_AM_SCANDIR_B
-#include "block_abi.h"
-#define	SELECT(x)	CALL_BLOCK(select, x)
-#ifndef __BLOCKS__
-void
-qsort_b(void *, size_t, size_t, void*);
-#endif
-#else
+/*
+ * scandir_b at FBSD_1.4 was never exported from libc.so.7 due to a
+ * mistake, so there is no use of exporting it now with some earlier
+ * symbol version.  As result, we do not need to implement compat
+ * function freebsd11_scandir_b().
+ */
+
 #define	SELECT(x)	select(x)
-#endif
 
+void qsort_b(void *, size_t, size_t, void *);
+
 static int freebsd11_alphasort_thunk(void *thunk, const void *p1,
     const void *p2);
 
 int
-#ifdef I_AM_SCANDIR_B
-freebsd11_scandir_b(const char *dirname, struct freebsd11_dirent ***namelist,
-    DECLARE_BLOCK(int, select, const struct freebsd11_dirent *),
-    DECLARE_BLOCK(int, dcomp, const struct freebsd11_dirent **,
-    const struct freebsd11_dirent **))
-#else
 freebsd11_scandir(const char *dirname, struct freebsd11_dirent ***namelist,
     int (*select)(const struct freebsd11_dirent *),
     int (*dcomp)(const struct freebsd11_dirent **,
 	const struct freebsd11_dirent **))
-#endif
 {
 	struct freebsd11_dirent *d, *p, **names = NULL;
 	size_t arraysz, numitems;
@@ -124,13 +117,8 @@ freebsd11_scandir(const char *dirname, struct freebsd1
 	}
 	closedir(dirp);
 	if (numitems && dcomp != NULL)
-#ifdef I_AM_SCANDIR_B
-		qsort_b(names, numitems, sizeof(struct freebsd11_dirent *),
-		    (void*)dcomp);
-#else
 		qsort_r(names, numitems, sizeof(struct freebsd11_dirent *),
 		    &dcomp, freebsd11_alphasort_thunk);
-#endif
 	*namelist = names;
 	return (numitems);
 
@@ -168,4 +156,3 @@ freebsd11_alphasort_thunk(void *thunk, const void *p1,
 
 __sym_compat(alphasort, freebsd11_alphasort, FBSD_1.0);
 __sym_compat(scandir, freebsd11_scandir, FBSD_1.0);
-__sym_compat(scandir_b, freebsd11_scandir_b, FBSD_1.4);

Modified: projects/clang1100-import/lib/libc/gen/scandir.c
==============================================================================
--- projects/clang1100-import/lib/libc/gen/scandir.c	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/lib/libc/gen/scandir.c	Sat Aug 15 11:49:31 2020	(r364251)
@@ -50,8 +50,7 @@ __FBSDID("$FreeBSD$");
 #include "block_abi.h"
 #define	SELECT(x)	CALL_BLOCK(select, x)
 #ifndef __BLOCKS__
-void
-qsort_b(void *, size_t, size_t, void*);
+void qsort_b(void *, size_t, size_t, void *);
 #endif
 #else
 #define	SELECT(x)	select(x)
@@ -134,6 +133,7 @@ fail:
 	return (-1);
 }
 
+#ifndef I_AM_SCANDIR_B
 /*
  * Alphabetic order comparison routine for those who want it.
  * POSIX 2008 requires that alphasort() uses strcoll().
@@ -153,3 +153,4 @@ alphasort_thunk(void *thunk, const void *p1, const voi
 	dc = *(int (**)(const struct dirent **, const struct dirent **))thunk;
 	return (dc((const struct dirent **)p1, (const struct dirent **)p2));
 }
+#endif

Modified: projects/clang1100-import/lib/libc/gen/syslog.c
==============================================================================
--- projects/clang1100-import/lib/libc/gen/syslog.c	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/lib/libc/gen/syslog.c	Sat Aug 15 11:49:31 2020	(r364251)
@@ -75,6 +75,9 @@ static pthread_mutex_t	syslog_mutex = PTHREAD_MUTEX_IN
 		if (__isthreaded) _pthread_mutex_unlock(&syslog_mutex);	\
 	} while(0)
 
+/* RFC5424 defined value. */
+#define NILVALUE "-"
+
 static void	disconnectlog(void); /* disconnect from syslogd */
 static void	connectlog(void);	/* (re)connect to syslogd */
 static void	openlog_unlocked(const char *, int, int);
@@ -190,25 +193,30 @@ vsyslog1(int pri, const char *fmt, va_list ap)
 		    tm.tm_hour, tm.tm_min, tm.tm_sec, now.tv_usec,
 		    tz_sign, tz_offset / 3600, (tz_offset % 3600) / 60);
 	} else
-		(void)fprintf(fp, "- ");
+		(void)fputs(NILVALUE " ", fp);
 	/* Hostname. */
 	(void)gethostname(hostname, sizeof(hostname));
-	(void)fprintf(fp, "%s ", hostname);
+	(void)fprintf(fp, "%s ",
+	    hostname[0] == '\0' ? NILVALUE : hostname);
 	if (LogStat & LOG_PERROR) {
 		/* Transfer to string buffer */
 		(void)fflush(fp);
 		stdp = tbuf + (sizeof(tbuf) - tbuf_cookie.left);
 	}
+	/* Application name. */
+	if (LogTag == NULL)
+		LogTag = _getprogname();
+	(void)fprintf(fp, "%s ", LogTag == NULL ? NILVALUE : LogTag);
 	/*
-	 * Application name, process ID, message ID and structured data.
 	 * Provide the process ID regardless of whether LOG_PID has been
 	 * specified, as it provides valuable information. Many
 	 * applications tend not to use this, even though they should.
 	 */
-	if (LogTag == NULL)
-		LogTag = _getprogname();
-	(void)fprintf(fp, "%s %d - - ",
-	    LogTag == NULL ? "-" : LogTag, getpid());
+	(void)fprintf(fp, "%d ", getpid());
+	/* Message ID. */
+	(void)fputs(NILVALUE " ", fp);
+	/* Structured data. */
+	(void)fputs(NILVALUE " ", fp);
 
 	/* Check to see if we can skip expanding the %m */
 	if (strstr(fmt, "%m")) {
@@ -251,6 +259,7 @@ vsyslog1(int pri, const char *fmt, va_list ap)
 		fmt = fmt_cpy;
 	}
 
+	/* Message. */
 	(void)vfprintf(fp, fmt, ap);
 	(void)fclose(fp);
 

Modified: projects/clang1100-import/lib/liblua/Makefile
==============================================================================
--- projects/clang1100-import/lib/liblua/Makefile	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/lib/liblua/Makefile	Sat Aug 15 11:49:31 2020	(r364251)
@@ -29,6 +29,8 @@ CFLAGS+=	-DLUA_PROGNAME="\"${PROG}\""
 .if defined(BOOTSTRAPPING)
 CFLAGS+=	-DLUA_PATH_DEFAULT="\"/nonexistent/?.lua\""
 CFLAGS+=	-DLUA_CPATH_DEFAULT="\"/nonexistent/?.so\""
+# We don't support dynamic libs on bootstrap builds.
+CFLAGS+=	-DBOOTSTRAPPING
 .endif
 
 .include <bsd.lib.mk>

Modified: projects/clang1100-import/lib/liblua/luaconf.h
==============================================================================
--- projects/clang1100-import/lib/liblua/luaconf.h	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/lib/liblua/luaconf.h	Sat Aug 15 11:49:31 2020	(r364251)
@@ -75,7 +75,10 @@
 /* Local modifications: need io.popen */
 #ifdef __FreeBSD__
 #define LUA_USE_POSIX
+#ifndef BOOTSTRAPPING
+#define LUA_USE_DLOPEN
 #endif
+#endif
 
 /*
 @@ LUA_C89_NUMBERS ensures that Lua uses the largest types available for
@@ -205,9 +208,9 @@
 
 #else			/* }{ */
 
-#define LUA_ROOT	"/usr/local/"
-#define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR "/"
-#define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR "/"
+#define LUA_ROOT	"/usr/"
+#define LUA_LDIR	LUA_ROOT "share/flua/"
+#define LUA_CDIR	LUA_ROOT "lib/flua/"
 #if !defined(LUA_PATH_DEFAULT)
 #define LUA_PATH_DEFAULT  \
 		LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \

Modified: projects/clang1100-import/lib/libpmc/libpmc.c
==============================================================================
--- projects/clang1100-import/lib/libpmc/libpmc.c	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/lib/libpmc/libpmc.c	Sat Aug 15 11:49:31 2020	(r364251)
@@ -176,6 +176,11 @@ static const struct pmc_event_descr cortex_a57_event_t
 	__PMC_EV_ALIAS_ARMV8_CORTEX_A57()
 };
 
+static const struct pmc_event_descr cortex_a76_event_table[] =
+{
+	__PMC_EV_ALIAS_ARMV8_CORTEX_A76()
+};
+
 /*
  * PMC_MDEP_TABLE(NAME, PRIMARYCLASS, ADDITIONAL_CLASSES...)
  *
@@ -193,6 +198,7 @@ PMC_MDEP_TABLE(cortex_a8, ARMV7, PMC_CLASS_SOFT, PMC_C
 PMC_MDEP_TABLE(cortex_a9, ARMV7, PMC_CLASS_SOFT, PMC_CLASS_ARMV7);
 PMC_MDEP_TABLE(cortex_a53, ARMV8, PMC_CLASS_SOFT, PMC_CLASS_ARMV8);
 PMC_MDEP_TABLE(cortex_a57, ARMV8, PMC_CLASS_SOFT, PMC_CLASS_ARMV8);
+PMC_MDEP_TABLE(cortex_a76, ARMV8, PMC_CLASS_SOFT, PMC_CLASS_ARMV8);
 PMC_MDEP_TABLE(mips24k, MIPS24K, PMC_CLASS_SOFT, PMC_CLASS_MIPS24K);
 PMC_MDEP_TABLE(mips74k, MIPS74K, PMC_CLASS_SOFT, PMC_CLASS_MIPS74K);
 PMC_MDEP_TABLE(octeon, OCTEON, PMC_CLASS_SOFT, PMC_CLASS_OCTEON);
@@ -235,6 +241,7 @@ PMC_CLASS_TABLE_DESC(cortex_a9, ARMV7, cortex_a9, armv
 #if	defined(__aarch64__)
 PMC_CLASS_TABLE_DESC(cortex_a53, ARMV8, cortex_a53, arm64);
 PMC_CLASS_TABLE_DESC(cortex_a57, ARMV8, cortex_a57, arm64);
+PMC_CLASS_TABLE_DESC(cortex_a76, ARMV8, cortex_a76, arm64);
 #endif
 #if defined(__mips__)
 PMC_CLASS_TABLE_DESC(beri, BERI, beri, mips);
@@ -817,6 +824,9 @@ static struct pmc_event_alias cortex_a53_aliases[] = {
 static struct pmc_event_alias cortex_a57_aliases[] = {
 	EV_ALIAS(NULL, NULL)
 };
+static struct pmc_event_alias cortex_a76_aliases[] = {
+	EV_ALIAS(NULL, NULL)
+};
 static int
 arm64_allocate_pmc(enum pmc_event pe, char *ctrspec __unused,
     struct pmc_op_pmcallocate *pmc_config __unused)
@@ -1273,6 +1283,10 @@ pmc_event_names_of_class(enum pmc_class cl, const char
 			ev = cortex_a57_event_table;
 			count = PMC_EVENT_TABLE_SIZE(cortex_a57);
 			break;
+		case PMC_CPU_ARMV8_CORTEX_A76:
+			ev = cortex_a76_event_table;
+			count = PMC_EVENT_TABLE_SIZE(cortex_a76);
+			break;
 		}
 		break;
 	case PMC_CLASS_BERI:
@@ -1518,6 +1532,10 @@ pmc_init(void)
 		PMC_MDEP_INIT(cortex_a57);
 		pmc_class_table[n] = &cortex_a57_class_table_descr;
 		break;
+	case PMC_CPU_ARMV8_CORTEX_A76:
+		PMC_MDEP_INIT(cortex_a76);
+		pmc_class_table[n] = &cortex_a76_class_table_descr;
+		break;
 #endif
 #if defined(__mips__)
 	case PMC_CPU_MIPS_BERI:
@@ -1657,6 +1675,10 @@ _pmc_name_of_event(enum pmc_event pe, enum pmc_cputype
 		case PMC_CPU_ARMV8_CORTEX_A57:
 			ev = cortex_a57_event_table;
 			evfence = cortex_a57_event_table + PMC_EVENT_TABLE_SIZE(cortex_a57);
+			break;
+		case PMC_CPU_ARMV8_CORTEX_A76:
+			ev = cortex_a76_event_table;
+			evfence = cortex_a76_event_table + PMC_EVENT_TABLE_SIZE(cortex_a76);
 			break;
 		default:	/* Unknown CPU type. */
 			break;

Modified: projects/clang1100-import/libexec/flua/Makefile
==============================================================================
--- projects/clang1100-import/libexec/flua/Makefile	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/libexec/flua/Makefile	Sat Aug 15 11:49:31 2020	(r364251)
@@ -30,6 +30,7 @@ CFLAGS+=	-DLUA_PROGNAME="\"${PROG}\""
 CFLAGS+=	-DLUA_USE_READLINE
 CFLAGS+=	-I${SRCTOP}/lib/libedit -I${SRCTOP}/contrib/libedit
 LIBADD+=	edit
+LDFLAGS+=	-Wl,-E
 .endif
 
 UCLSRC?=	${SRCTOP}/contrib/libucl

Modified: projects/clang1100-import/libexec/rc/rc.d/ipfilter
==============================================================================
--- projects/clang1100-import/libexec/rc/rc.d/ipfilter	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/libexec/rc/rc.d/ipfilter	Sat Aug 15 11:49:31 2020	(r364251)
@@ -5,6 +5,7 @@
 
 # PROVIDE: ipfilter
 # REQUIRE: FILESYSTEMS
+# BEFORE: ipmon ipnat netif netwait securelevel
 # KEYWORD: nojailvnet
 
 . /etc/rc.subr

Modified: projects/clang1100-import/libexec/rc/rc.d/ipmon
==============================================================================
--- projects/clang1100-import/libexec/rc/rc.d/ipmon	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/libexec/rc/rc.d/ipmon	Sat Aug 15 11:49:31 2020	(r364251)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: ipmon
-# REQUIRE: FILESYSTEMS hostname sysctl ipfilter
+# REQUIRE: FILESYSTEMS hostname sysctl
 # BEFORE:  SERVERS
 # KEYWORD: nojailvnet
 

Modified: projects/clang1100-import/libexec/rc/rc.d/ipnat
==============================================================================
--- projects/clang1100-import/libexec/rc/rc.d/ipnat	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/libexec/rc/rc.d/ipnat	Sat Aug 15 11:49:31 2020	(r364251)
@@ -4,7 +4,6 @@
 #
 
 # PROVIDE: ipnat
-# REQUIRE: ipfilter
 # KEYWORD: nojailvnet
 
 . /etc/rc.subr

Modified: projects/clang1100-import/libexec/rc/rc.d/netif
==============================================================================
--- projects/clang1100-import/libexec/rc/rc.d/netif	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/libexec/rc/rc.d/netif	Sat Aug 15 11:49:31 2020	(r364251)
@@ -27,7 +27,7 @@
 
 # PROVIDE: netif
 # REQUIRE: FILESYSTEMS iovctl serial sppp sysctl
-# REQUIRE: hostid ipfilter ipfs
+# REQUIRE: hostid ipfs
 # KEYWORD: nojailvnet
 
 . /etc/rc.subr

Modified: projects/clang1100-import/libexec/rc/rc.d/netwait
==============================================================================
--- projects/clang1100-import/libexec/rc/rc.d/netwait	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/libexec/rc/rc.d/netwait	Sat Aug 15 11:49:31 2020	(r364251)
@@ -3,7 +3,7 @@
 # $FreeBSD$
 #
 # PROVIDE: netwait
-# REQUIRE: devd ipfilter ipfw pf routing
+# REQUIRE: devd ipfw pf routing
 # KEYWORD: nojail
 #
 # The netwait script helps handle two situations:

Modified: projects/clang1100-import/libexec/rc/rc.d/securelevel
==============================================================================
--- projects/clang1100-import/libexec/rc/rc.d/securelevel	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/libexec/rc/rc.d/securelevel	Sat Aug 15 11:49:31 2020	(r364251)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: securelevel
-# REQUIRE: adjkerntz ipfw ipfilter pf
+# REQUIRE: adjkerntz ipfw pf
 
 . /etc/rc.subr
 

Modified: projects/clang1100-import/release/packages/binutils.ucl
==============================================================================
--- projects/clang1100-import/release/packages/binutils.ucl	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/release/packages/binutils.ucl	Sat Aug 15 11:49:31 2020	(r364251)
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
-maintainer = "re at FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
 prefix = "/"
 licenselogic = "single"
 licenses = [ GPLv2 ]

Modified: projects/clang1100-import/release/packages/caroot.ucl
==============================================================================
--- projects/clang1100-import/release/packages/caroot.ucl	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/release/packages/caroot.ucl	Sat Aug 15 11:49:31 2020	(r364251)
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
-maintainer = "re at FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = %PKG_MAINTAINER%
+www = "%PKG_WWW%"
 prefix = "/"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]

Modified: projects/clang1100-import/release/packages/clang.ucl
==============================================================================
--- projects/clang1100-import/release/packages/clang.ucl	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/release/packages/clang.ucl	Sat Aug 15 11:49:31 2020	(r364251)
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
-maintainer = "re at FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
 prefix = "/"
 licenselogic = "single"
 licenses = [ NCSA ]

Modified: projects/clang1100-import/release/packages/gdb.ucl
==============================================================================
--- projects/clang1100-import/release/packages/gdb.ucl	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/release/packages/gdb.ucl	Sat Aug 15 11:49:31 2020	(r364251)
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
-maintainer = "re at FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
 prefix = "/"
 licenselogic = "single"
 licenses = [ GPLv2 ]

Modified: projects/clang1100-import/release/packages/generate-ucl.sh
==============================================================================
--- projects/clang1100-import/release/packages/generate-ucl.sh	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/release/packages/generate-ucl.sh	Sat Aug 15 11:49:31 2020	(r364251)
@@ -146,6 +146,9 @@ EOF
 		-e "s/%COMMENT%/${comment}/" \
 		-e "s/%DESC%/${desc}/" \
 		-e "s/%CAP_MKDB_ENDIAN%/${cap_arg}/g" \
+		-e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \
+		-e "s|%PKG_WWW%|${PKG_WWW}|" \
+		-e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \
 		${uclfile}
 	return 0
 }

Modified: projects/clang1100-import/release/packages/groff.ucl
==============================================================================
--- projects/clang1100-import/release/packages/groff.ucl	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/release/packages/groff.ucl	Sat Aug 15 11:49:31 2020	(r364251)
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
-maintainer = "re at FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
 prefix = "/"
 licenselogic = "single"
 licenses = [ GPLv2 ]

Modified: projects/clang1100-import/release/packages/jail.ucl
==============================================================================
--- projects/clang1100-import/release/packages/jail.ucl	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/release/packages/jail.ucl	Sat Aug 15 11:49:31 2020	(r364251)
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
-maintainer = "re at FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
 prefix = "/"
 vital = true
 licenselogic = "single"

Modified: projects/clang1100-import/release/packages/kernel.ucl
==============================================================================
--- projects/clang1100-import/release/packages/kernel.ucl	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/release/packages/kernel.ucl	Sat Aug 15 11:49:31 2020	(r364251)
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
-maintainer = "re at FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
 prefix = "/"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]

Modified: projects/clang1100-import/release/packages/lld.ucl
==============================================================================
--- projects/clang1100-import/release/packages/lld.ucl	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/release/packages/lld.ucl	Sat Aug 15 11:49:31 2020	(r364251)
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
-maintainer = "re at FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
 prefix = "/"
 licenselogic = "single"
 licenses = [ NCSA ]

Modified: projects/clang1100-import/release/packages/lldb.ucl
==============================================================================
--- projects/clang1100-import/release/packages/lldb.ucl	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/release/packages/lldb.ucl	Sat Aug 15 11:49:31 2020	(r364251)
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
-maintainer = "re at FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
 prefix = "/"
 licenselogic = "single"
 licenses = [ NCSA ]

Modified: projects/clang1100-import/release/packages/runtime.ucl
==============================================================================
--- projects/clang1100-import/release/packages/runtime.ucl	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/release/packages/runtime.ucl	Sat Aug 15 11:49:31 2020	(r364251)
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
-maintainer = "re at FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
 prefix = "/"
 vital = true
 licenselogic = "single"

Modified: projects/clang1100-import/release/packages/ssh.ucl
==============================================================================
--- projects/clang1100-import/release/packages/ssh.ucl	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/release/packages/ssh.ucl	Sat Aug 15 11:49:31 2020	(r364251)
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
-maintainer = "re at FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
 prefix = "/"
 licenselogic = "single"
 licenses = [ ISCL ]

Modified: projects/clang1100-import/release/packages/svn.ucl
==============================================================================
--- projects/clang1100-import/release/packages/svn.ucl	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/release/packages/svn.ucl	Sat Aug 15 11:49:31 2020	(r364251)
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
-maintainer = "re at FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
 prefix = "/"
 licenselogic = "single"
 licenses = [ APACHE20 ]

Modified: projects/clang1100-import/release/packages/template.ucl
==============================================================================
--- projects/clang1100-import/release/packages/template.ucl	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/release/packages/template.ucl	Sat Aug 15 11:49:31 2020	(r364251)
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
-maintainer = "re at FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
 prefix = "/"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]

Modified: projects/clang1100-import/release/packages/unbound.ucl
==============================================================================
--- projects/clang1100-import/release/packages/unbound.ucl	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/release/packages/unbound.ucl	Sat Aug 15 11:49:31 2020	(r364251)
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
-maintainer = "re at FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
 prefix = "/"
 licenselogic = "single"
 licenses = [ BSD4CLAUSE ]

Modified: projects/clang1100-import/release/packages/utilities.ucl
==============================================================================
--- projects/clang1100-import/release/packages/utilities.ucl	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/release/packages/utilities.ucl	Sat Aug 15 11:49:31 2020	(r364251)
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT% %VCS_REVISION%"
 categories = [ base ]
-maintainer = "re at FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
 prefix = "/"
 vital = true
 licenselogic = "single"

Modified: projects/clang1100-import/sbin/ifconfig/ifconfig.c
==============================================================================
--- projects/clang1100-import/sbin/ifconfig/ifconfig.c	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/sbin/ifconfig/ifconfig.c	Sat Aug 15 11:49:31 2020	(r364251)
@@ -748,6 +748,7 @@ group_member(const char *ifname, const char *match, co
 		if (nomatch)
 			nomatched &= fnmatch(nomatch, ifg->ifgrq_group, 0);
 	}
+	free(ifgr.ifgr_groups);
 
 	if (match && !nomatch)
 		return (matched);

Modified: projects/clang1100-import/sbin/ipfw/ipfw.8
==============================================================================
--- projects/clang1100-import/sbin/ipfw/ipfw.8	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/sbin/ipfw/ipfw.8	Sat Aug 15 11:49:31 2020	(r364251)
@@ -1,7 +1,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 21, 2019
+.Dd August 10, 2020
 .Dt IPFW 8
 .Os
 .Sh NAME
@@ -600,7 +600,7 @@ See Section
 By name or address
 .It Misc. IP header fields
 Version, type of service, datagram length, identification,
-fragment flag (non-zero IP offset),
+fragmentation flags,
 Time To Live
 .It IP options
 .It IPv6 Extension headers
@@ -1602,12 +1602,29 @@ Matches IPv6 packets containing any of the flow labels
 .Ar labels .
 .Ar labels
 is a comma separated list of numeric flow labels.
-.It Cm frag
-Matches packets that are fragments and not the first
-fragment of an IP datagram.
-Note that these packets will not have
-the next protocol header (e.g.\& TCP, UDP) so options that look into
-these headers cannot match.
+.It Cm frag Ar spec
+Matches IPv4 packets whose
+.Cm ip_off 
+field contains the comma separated list of IPv4 fragmentation
+options specified in
+.Ar spec .
+The recognized options are:
+.Cm df
+.Pq Dv don't fragment ,
+.Cm mf
+.Pq Dv more fragments ,
+.Cm rf
+.Pq Dv reserved fragment bit
+.Cm offset
+.Pq Dv non-zero fragment offset .
+The absence of a particular options may be denoted
+with a
+.Ql \&! .
+.Pp
+Empty list of options defaults to matching on non-zero fragment offset.
+Such rule would match all not the first fragment datagrams,
+both IPv4 and IPv6.
+This is a backward compatibility with older rulesets.
 .It Cm gid Ar group
 Matches all TCP or UDP packets sent by or received for a
 .Ar group .

Modified: projects/clang1100-import/sbin/ipfw/ipfw2.c
==============================================================================
--- projects/clang1100-import/sbin/ipfw/ipfw2.c	Sat Aug 15 11:37:44 2020	(r364250)
+++ projects/clang1100-import/sbin/ipfw/ipfw2.c	Sat Aug 15 11:49:31 2020	(r364251)
@@ -168,6 +168,14 @@ static struct _s_x f_iptos[] = {
 	{ NULL,	0 }
 };
 
+static struct _s_x f_ipoff[] = {

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-projects mailing list