Merge FreeBSD 2024-05-10

CONTRIBUTING.md

@@ -106,19 +106,21 @@ command can help minimize churn by only formatting the areas nearby the changes.
 not perfect, using these tools will maximize your chances of not having style
 comments on your pull requests.
 
+For [Lua](https://www.lua.org), see
+[style.lua(9)](https://man.freebsd.org/cgi/man.cgi?query=style.lua&sektion=9)
+for details. Lua is used for the boot loader and a few scripts in the base system.
+
 For Makefiles changes, see
 [style.Makefile(5)](https://man.freebsd.org/cgi/man.cgi?query=style.Makefile&sektion=5)
 for details. FreeBSD's base system uses the in-tree make, not GNU Make, so
 [make(1)](https://man.freebsd.org/cgi/man.cgi?query=make&sektion=1) is another useful
 resource.
 
-The project uses mdoc for all its man pages. Changes should pass `mandoc -Tlint` and igor (install the latter with `pkg install igor`).
-Please be sure to observe the one-sentence-per-line rule so manual pages properly render. Any semantic changes to the manual pages should bump the date.
-[style.mdoc(5)](https://man.freebsd.org/cgi/man.cgi?query=style.mdoc&sektion=5) has the all details.
-
-For [Lua](https://www.lua.org), please see
-[style.lua(9)](https://man.freebsd.org/cgi/man.cgi?query=style.lua&sektion=9)
-for details. Lua is used for the boot loader and a few scripts in the base system.
+For manual page changes, see
+[style.mdoc(5)](https://man.freebsd.org/cgi/man.cgi?query=style.mdoc&sektion=5)
+for details. Changes should pass `mandoc -Tlint` and igor (install the latter with `pkg install igor`).
+Please be sure to observe the one-sentence-per-line rule so manual pages properly render.
+Proposed changes to manual pages should not bump the document date until merged.
 
 For shell scripts, avoid using bash. The system shell (/bin/sh) is preferred.
 Shell scripts in the base system cannot use bash or bash extensions

Makefile

@@ -99,7 +99,7 @@
 #
 # Once you have installed the necessary cross toolchain, simply pass
 # CROSS_TOOLCHAIN=${TARGET_ARCH}-gccN while building with the above steps,
-# e.g., `make buildworld CROSS_TOOLCHAIN=amd64-gcc6`.
+# e.g., `make buildworld CROSS_TOOLCHAIN=amd64-gcc13`.
 #
 # The ${TARGET_ARCH}-gccN packages are provided as flavors of the
 # devel/freebsd-gccN ports.

ObsoleteFiles.inc

@@ -51,6 +51,16 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20240508: Remove remnants of portsnap(8)
+OLD_DIRS+=var/db/portsnap
+
+# 20240507: remove gbde
+OLD_FILES+=boot/kernel/geom_bde.ko
+OLD_FILES+=etc/rc.d/gbde
+OLD_FILES+=sbin/gbde
+OLD_FILES+=usr/share/man/man4/gbde.4.gz
+OLD_FILES+=usr/share/man/man8/gbde.8.gz
+
 # 20240422: remove improperly installed libcxxrt.so.1
 MOVED_LIBS+=usr/lib/libcxxrt.so.1
 

README.md

@@ -46,6 +46,8 @@ See build(7), config(8), [FreeBSD handbook on building userland](https://docs.fr
 For information on the CPU architectures and platforms supported by FreeBSD, see the [FreeBSD
 website's Platforms page](https://www.freebsd.org/platforms/).
 
+For official FreeBSD bootable images, see the [release page](https://download.freebsd.org/ftp/releases/ISO-IMAGES/).
+
 Source Roadmap:
 ---------------
 | Directory | Description |

RELNOTES

@@ -10,6 +10,9 @@ newline.  Entries should be separated by a newline.
 
 Changes to this file should not be MFCed.
 
+7398d1ece5cf:
+	hw.snd.version is removed.
+
 a15f7c96a276,a8089ea5aee5:
 	NVMe over Fabrics controller.  The nvmft(4) kernel module adds
 	a new frontend to the CAM target layer which exports ctl(4)

bin/cat/cat.c

@@ -125,7 +125,7 @@ init_casper_net(cap_channel_t *casper)
 	familylimit = AF_LOCAL;
 	cap_net_limit_name2addr_family(limit, &familylimit, 1);
 
-	if (cap_net_limit(limit) < 0)
+	if (cap_net_limit(limit) != 0)
 		err(EXIT_FAILURE, "unable to apply limits");
 }
 #endif
@@ -198,15 +198,15 @@ main(int argc, char *argv[])
 		stdout_lock.l_start = 0;
 		stdout_lock.l_type = F_WRLCK;
 		stdout_lock.l_whence = SEEK_SET;
-		if (fcntl(STDOUT_FILENO, F_SETLKW, &stdout_lock) == -1)
+		if (fcntl(STDOUT_FILENO, F_SETLKW, &stdout_lock) != 0)
 			err(EXIT_FAILURE, "stdout");
 	}
 
 	init_casper(argc, argv);
 
 	caph_cache_catpages();
 
-	if (caph_enter_casper() < 0)
+	if (caph_enter_casper() != 0)
 		err(EXIT_FAILURE, "capsicum");
 
 	if (bflag || eflag || nflag || sflag || tflag || vflag)
@@ -266,7 +266,7 @@ scanfiles(char *argv[], int cooked __unused)
 #endif
 		} else {
 #ifndef BOOTSTRAP_CAT
-			if (in_kernel_copy(fd) == -1) {
+			if (in_kernel_copy(fd) != 0) {
 				if (errno == EINVAL || errno == EBADF ||
 				    errno == EISDIR)
 					raw_cat(fd);
@@ -473,7 +473,7 @@ udom_open(const char *path, int flags)
 			errno = serrno;
 			return (-1);
 		}
-		if (caph_rights_limit(fd, &rights) < 0) {
+		if (caph_rights_limit(fd, &rights) != 0) {
 			serrno = errno;
 			close(fd);
 			freeaddrinfo(res0);
@@ -502,20 +502,20 @@ udom_open(const char *path, int flags)
 	switch (flags & O_ACCMODE) {
 	case O_RDONLY:
 		cap_rights_clear(&rights, CAP_WRITE);
-		if (shutdown(fd, SHUT_WR) == -1)
+		if (shutdown(fd, SHUT_WR) != 0)
 			warn(NULL);
 		break;
 	case O_WRONLY:
 		cap_rights_clear(&rights, CAP_READ);
-		if (shutdown(fd, SHUT_RD) == -1)
+		if (shutdown(fd, SHUT_RD) != 0)
 			warn(NULL);
 		break;
 	default:
 		break;
 	}
 
 	cap_rights_clear(&rights, CAP_CONNECT, CAP_SHUTDOWN);
-	if (caph_rights_limit(fd, &rights) < 0) {
+	if (caph_rights_limit(fd, &rights) != 0) {
 		serrno = errno;
 		close(fd);
 		errno = serrno;

bin/ps/ps.c

@@ -263,6 +263,8 @@
 				else if (len <= 4 &&
 					strncasecmp(optarg, "both", len) == 0)
 					directions |= BOTH;
+				else
+					usage();
 				break;
 			}
 		case 'd':

cddl/lib/libzpool/Makefile

@@ -286,6 +286,8 @@ CSTD=	c99
 
 CFLAGS+=	-g -DDEBUG=1
 
+CFLAGS.gcc+=	-Wno-pointer-to-int-cast
+
 # Pointer values are used as debugging "tags" to mark reference count
 # ownerships and in some cases the tag reference is dropped after an
 # object is freed.

contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c

@@ -2138,7 +2138,7 @@ cpp_demangle_read_sname(struct cpp_demangle_data *ddata)
 	assert(ddata->cur_output->size > 0);
 	if (vector_read_cmd_find(&ddata->cmd, READ_TMPL) == NULL)
 		ddata->last_sname =
-		    ddata->cur_output->container[ddata->output.size - 1];
+		    ddata->cur_output->container[ddata->cur_output->size - 1];
 
 	ddata->cur += len;
 

contrib/libcxxrt/libelftc_dem_gnu3.c

@@ -2472,7 +2472,7 @@ cpp_demangle_read_sname(struct cpp_demangle_data *ddata)
 	assert(ddata->cur_output->size > 0);
 	if (vector_read_cmd_find(&ddata->cmd, READ_TMPL) == NULL)
 		ddata->last_sname =
-		    ddata->cur_output->container[ddata->output.size - 1];
+		    ddata->cur_output->container[ddata->cur_output->size - 1];
 
 	ddata->cur += len;
 

contrib/libfido2/.actions/build-bsd

@@ -0,0 +1,97 @@
+#!/bin/sh -eux
+
+# Copyright (c) 2022 Yubico AB. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+# SPDX-License-Identifier: BSD-2-Clause
+
+BASE_URL="https://builds.sr.ht"
+MANIFEST="$(mktemp)"
+LOGFILE="$(mktemp)"
+trap '[ -f "${LOGFILE}" ] && cat -- "${LOGFILE}"' EXIT
+
+# construct the sourcehut build manifest
+cat > "${MANIFEST}" <<- EOF
+image: ${IMAGE}
+packages:
+  - cmake
+  - llvm
+  - pcsc-lite
+EOF
+
+case "${IMAGE}" in
+	freebsd*)
+cat >> "${MANIFEST}" <<- EOF
+  - libcbor
+  - pkgconf
+EOF
+	;;
+esac
+
+cat >> "${MANIFEST}" <<- EOF
+sources:
+  - ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}#$(git rev-parse HEAD)
+tasks:
+  - build: |
+      if [ "\$(uname)" = "OpenBSD" ]; then
+        SUDO="doas -u root"
+      else
+        SUDO=sudo
+      fi
+      SCAN="/usr/local/bin/scan-build --use-cc=/usr/bin/cc --status-bugs"
+      cd libfido2
+      for T in Debug Release; do
+        mkdir build-\$T
+        (cd build-\$T && \${SCAN} cmake -DCMAKE_BUILD_TYPE=\$T ..)
+        \${SCAN} make -j"\$(sysctl -n hw.ncpu)" -C build-\$T
+        make -C build-\$T regress
+        \${SUDO} make -C build-\$T install
+      done
+EOF
+
+q() {
+	curl \
+		--silent \
+		--oauth2-bearer "${SOURCEHUT_TOKEN}" \
+		--header "Content-Type: application/json" \
+		--data @- -- \
+		"${BASE_URL}/query" \
+	| tee -a -- "${LOGFILE}"
+}
+
+submit_job() {
+	local manifest="$1"
+	jq \
+		--compact-output --null-input \
+		'{ query: $body, variables: { var: $var } }' \
+		--arg body 'mutation($var: String!) { submit(manifest: $var) { id } }' \
+		--rawfile var "${manifest}" \
+	| q \
+	| jq --exit-status --raw-output '.data.submit.id'
+}
+
+job_status() {
+	local id="$1"
+	jq \
+		--compact-output --null-input \
+		'{ query: $body, variables: { var: $var } }' \
+		--arg body 'query($var: Int!) { job(id: $var) { status } }' \
+		--argjson var "${id}" \
+	| q \
+	| jq --exit-status --raw-output '.data.job.status'
+}
+
+JOB_ID="$(submit_job "${MANIFEST}")" || exit 1
+[ -z "${JOB_ID}" ] && exit 1
+echo "Job '${JOB_ID}' running at ${BASE_URL}/~yubico-libfido2/job/${JOB_ID}"
+
+while true; do
+	JOB_STATUS="$(job_status "${JOB_ID}")" || exit 1
+	case "${JOB_STATUS}" in
+		SUCCESS) exit 0;;
+		FAILED) exit 1;;
+		PENDING|QUEUED|RUNNING) ;;
+		*) exit 1;;
+	esac
+	sleep 60
+done

contrib/libfido2/.actions/build-linux-clang

@@ -0,0 +1,21 @@
+#!/bin/sh -eux
+
+# Copyright (c) 2022 Yubico AB. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+# SPDX-License-Identifier: BSD-2-Clause
+
+${CC} --version
+SCAN=scan-build${CC#clang}
+
+# Check exports.
+(cd src && ./diff_exports.sh)
+
+# Build, analyze, and install libfido2.
+for T in Debug Release; do
+	mkdir build-$T
+	(cd build-$T && ${SCAN} --use-cc="${CC}" cmake -DCMAKE_BUILD_TYPE=$T ..)
+	${SCAN} --use-cc="${CC}" --status-bugs make -j"$(nproc)" -C build-$T
+	make -C build-$T regress
+	sudo make -C build-$T install
+done

contrib/libfido2/.actions/build-linux-gcc

@@ -0,0 +1,23 @@
+#!/bin/sh -eux
+
+# Copyright (c) 2022 Yubico AB. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+# SPDX-License-Identifier: BSD-2-Clause
+
+${CC} --version
+
+# Build and install libfido2.
+for T in Debug Release; do
+	mkdir build-$T
+	(cd build-$T && cmake -DCMAKE_BUILD_TYPE=$T ..)
+	make -j"$(nproc)" -C build-$T
+	make -C build-$T regress
+	sudo make -C build-$T install
+done
+
+# Check udev/fidodevs.
+[ -x "$(which update-alternatives)" ] && {
+	sudo update-alternatives --set awk "$(which original-awk)"
+}
+udev/check.sh udev/fidodevs

contrib/libfido2/.actions/build-linux-i686-w64-mingw32-gcc

@@ -0,0 +1,58 @@
+#!/bin/sh -eux
+
+# Copyright (c) 2022-2023 Yubico AB. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+# SPDX-License-Identifier: BSD-2-Clause
+
+# XXX defining CC and cross-compiling confuses OpenSSL's build.
+unset CC
+
+sudo mkdir /fakeroot
+sudo chmod 755 /fakeroot
+
+cat << EOF > /tmp/mingw.cmake
+SET(CMAKE_SYSTEM_NAME Windows)
+SET(CMAKE_C_COMPILER i686-w64-mingw32-gcc)
+SET(CMAKE_CXX_COMPILER i686-w64-mingw32-g++)
+SET(CMAKE_RC_COMPILER i686-w64-mingw32-windres)
+SET(CMAKE_FIND_ROOT_PATH /fakeroot)
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+EOF
+
+# Build and install libcbor.
+git clone --depth=1 https://github.com/pjk/libcbor -b v0.10.1
+cd libcbor
+mkdir build
+(cd build && cmake -DCMAKE_TOOLCHAIN_FILE=/tmp/mingw.cmake \
+	-DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/fakeroot ..)
+make -j"$(nproc)" -C build
+sudo make -C build install
+cd ..
+
+# Build and install OpenSSL 1.1.1w.
+git clone --depth=1 https://github.com/openssl/openssl -b OpenSSL_1_1_1w
+cd openssl
+./Configure mingw --prefix=/fakeroot --openssldir=/fakeroot/openssl \
+	--cross-compile-prefix=i686-w64-mingw32-
+make -j"$(nproc)"
+sudo make install_sw
+cd ..
+
+# Build and install zlib.
+git clone --depth=1 https://github.com/madler/zlib -b v1.3
+cd zlib
+make -fwin32/Makefile.gcc PREFIX=i686-w64-mingw32-
+sudo make -fwin32/Makefile.gcc PREFIX=i686-w64-mingw32- DESTDIR=/fakeroot \
+	INCLUDE_PATH=/include LIBRARY_PATH=/lib BINARY_PATH=/bin install
+cd ..
+
+# Build and install libfido2.
+export PKG_CONFIG_PATH=/fakeroot/lib/pkgconfig
+mkdir build
+(cd build && cmake -DCMAKE_TOOLCHAIN_FILE=/tmp/mingw.cmake \
+	-DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/fakeroot ..)
+make -j"$(nproc)" -C build
+sudo make -C build install