Merge branch 'freebsd:main' into ipfw-directory

Author: thegushi

.git-blame-ignore-revs

@@ -8,6 +8,10 @@
 #
 # This file is sorted in git log order (newest commits first).
 
+# sys/cpu.h style(9) fixes
+0737e2a961cd712fff5b548bb6b823e48a8b527d
+# witness white space cleanup and style(9) tweeks
+f5377665253b2b107ee8a4690ad2e6682375b304
 # style fixes for device_if.m
 ab43dbe0187ecdf1697726170fd4e19c373effcc
 # iflib style tweaks

.gitignore

@@ -29,3 +29,4 @@ tags
 .clangd
 .ccls-cache
 sys/*/compile
+/src.conf

Makefile.inc1

@@ -2714,9 +2714,10 @@ _basic_bootstrap_tools+=usr.sbin/tzsetup
 
 # certctl is needed as an install tool.  libcrypto is rather heavy, so we'll
 # build that alongside it only for platforms that don't expose headers for
-# OpenSSL, like macOS.
+# OpenSSL, like macOS, or when building on releases with OpenSSL 1.x.
 .if ${MK_CAROOT} != "no" && ${MK_OPENSSL} != "no"
-.if ${.MAKE.OS} == "Darwin"
+.if ${.MAKE.OS} == "Darwin" || \
+    (${.MAKE.OS} == "FreeBSD" && ${BOOTSTRAPPING} < 1400000)
 _bootstrap_libcrypto=secure/lib/libcrypto
 ${_bt}-usr.sbin/certctl: ${_bt}-secure/lib/libcrypto
 .endif

ObsoleteFiles.inc

@@ -51,6 +51,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20250910: readdir_r(3) removed
+OLD_FILES+=usr/share/man/man3/readdir_r.3.gz
+
 # 20250826: Remove a misspelled manual
 OLD_FILES+=usr/share/man/man3/sysdecode_syscallnames.3.gz
 

UPDATING

@@ -12,8 +12,8 @@ Items affecting the ports and packages system can be found in
 /usr/ports/UPDATING.  Please read that file before updating system packages
 and/or ports.
 
-NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW:
-	FreeBSD 15.x has many debugging features turned on, in both the kernel
+NOTE TO PEOPLE WHO THINK THAT FreeBSD 16.x IS SLOW:
+	FreeBSD 16.x has many debugging features turned on, in both the kernel
 	and userland.  These features attempt to detect incorrect use of
 	system primitives, and encourage loud failure through extra sanity
 	checking and fail stop semantics.  They also substantially impact
@@ -27,6 +27,19 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW:
 	world, or to merely disable the most expensive debugging functionality
 	at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20250907:
+	The MANSPLITPKG knob has been turned off by default, so pkgbase builds
+	will no longer generate "-man" subpackages; instead the manpages will
+	be shipped in the packages they belong to.  If you want to continue
+	building split man packages, set WITH_MANSPLITPKG=1.
+
+20250905:
+	FreeBSD 16.0-CURRENT.
+
+20250903:
+	The BLOAT_KERNEL_WITH_EXTERR kernel config option has been renamed to
+	EXTERR_STRINGS.
+
 20250827:
 	The names of pkg repositories defined in /etc/pkg/FreeBSD.conf have
 	changed: "FreeBSD" is now "FreeBSD-ports", and "FreeBSD-kmods" is now

bin/date/date.1

@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd September 10, 2024
+.Dd September 1, 2025
 .Dt DATE 1
 .Os
 .Sh NAME
@@ -129,7 +129,7 @@ format.
 Parsing is done using
 .Xr strptime 3 .
 .It Fl I Ns Op Ar FMT
-Use
+Use extended
 .St -iso8601
 output format.
 .Ar FMT
@@ -154,9 +154,9 @@ is
 .Cm seconds ,
 or
 .Cm ns Pc ,
-the
+the extended
 .St -iso8601
-format includes the timezone.
+format includes the timezone offset.
 .It Fl j
 Do not try to set the date.
 This allows you to use the

bin/sh/Makefile

@@ -74,6 +74,6 @@ beforeinstallconfig:
 
 LINKMODE=${CONFMODE}
 afterinstallconfig:
-	${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.profile ${DESTDIR}/.profile
+	${INSTALL_LINK} ${TAG_ARGS:D${TAG_ARGS},config} ${DESTDIR}/root/.profile ${DESTDIR}/.profile
 
 .include <bsd.prog.mk>

bin/timeout/tests/timeout_test.sh

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright (c) 2014 Baptiste Daroussin <[email protected]>
 
 atf_test_case nominal
 nominal_head()

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

@@ -2242,11 +2242,10 @@ dt_format_bytes_get(dtrace_hdl_t *dtp, caddr_t addr, size_t nbytes)
 static int
 dt_format_memory(dtrace_hdl_t *dtp, caddr_t addr)
 {
-
-	size_t nbytes = *((uintptr_t *) addr);
+	size_t nbytes = *((size_t *) addr);
 	char *s;
 
-	s = dt_format_bytes_get(dtp, addr + sizeof(uintptr_t), nbytes);
+	s = dt_format_bytes_get(dtp, addr + sizeof(size_t), nbytes);
 	if (s == NULL)
 		return (-1);
 
@@ -2260,9 +2259,9 @@ static int
 dt_print_memory(dtrace_hdl_t *dtp, FILE *fp, caddr_t addr)
 {
 	int quiet = (dtp->dt_options[DTRACEOPT_QUIET] != DTRACEOPT_UNSET);
-	size_t nbytes = *((uintptr_t *) addr);
+	size_t nbytes = *((size_t *) addr);
 
-	return (dt_print_bytes(dtp, fp, addr + sizeof(uintptr_t),
+	return (dt_print_bytes(dtp, fp, addr + sizeof(size_t),
 	    nbytes, 50, quiet, 1));
 }