Releng/14.2 patch

.cirrus.yml

@@ -4,7 +4,7 @@ compute_engine_instance:
   # gcloud compute images list --project freebsd-org-cloud-dev --no-standard-images
   platform: freebsd
   image_project: freebsd-org-cloud-dev
-  image: freebsd-13-2-release-amd64
+  image: freebsd-13-3-release-amd64
   cpu: 8
   memory: 8G
   disk: 40

Makefile.inc1

@@ -2280,14 +2280,13 @@ real-sign-packages:	_pkgbootstrap .PHONY
 .if ${PKG_BIN_VERSION} < 11700
 	printf "packing_format = \"${PKG_FORMAT}\";\n" >> ${WSTAGEDIR}/meta
 .endif
-	@[ -L "${REPODIR}/${PKG_ABI}/latest" ] && unlink ${REPODIR}/${PKG_ABI}/latest; \
-	${PKG_CMD} -o ABI=${PKG_ABI} repo -o OSVERSION="${SRCRELDATE}" \
+	@${PKG_CMD} -o ABI=${PKG_ABI} repo -o OSVERSION="${SRCRELDATE}" \
 		-m ${WSTAGEDIR}/meta \
 		-o ${REPODIR}/${PKG_ABI}/${PKG_VERSION} \
 		${REPODIR}/${PKG_ABI}/${PKG_VERSION} \
 		${PKG_REPO_SIGNING_KEY} ; \
 	cd ${REPODIR}/${PKG_ABI}; \
-	ln -s ${PKG_OUTPUT_DIR} latest
+	ln -hfs ${PKG_OUTPUT_DIR} latest
 
 #
 #

UPDATING

@@ -12,6 +12,26 @@ 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.
 
+20250129:
+	14.2-RELEASE-p1 SA-25:02.fs
+			SA-25:03.etcupdate
+			SA-25:04.ktrace
+			EN-25:02.audit
+			EN-25:03.tzdata
+
+	Buffer overflow in some filesystems via NFS [SA-25:02.fs]
+
+	Unprivileged access to system files [SA-25:03.etcupdate]
+
+	Uninitialized kernel memory disclosure via ktrace(2) [SA-25:04.ktrace]
+
+	System call auditing disabled by DTrace [EN-25:02.audit]
+
+	Timezone database information update [EN-25:03.tzdata]
+
+20241203:
+	14.2-RELEASE.
+
 20240419:
 	Clang, llvm, lld, lldb, compiler-rt, libc++, libunwind and openmp have
 	been upgraded to 18.1.6. It is important that you run `make delete-old`

bin/timeout/timeout.1

@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd June 26, 2023
+.Dd June 17, 2024
 .Dt TIMEOUT 1
 .Os
 .Sh NAME
@@ -195,6 +195,12 @@ $ timeout -k 5s 1m fetch \\
 .Xr nohup 1 ,
 .Xr signal 3 ,
 .Xr daemon 8
+.Sh STANDARDS
+The
+.Nm
+utility is compliant with the
+.St -p1003.1-2024
+specification.
 .Sh HISTORY
 The
 .Nm

cddl/lib/libicp/Makefile

@@ -21,7 +21,7 @@ ASM_SOURCES_AS = \
         asm-x86_64/blake3/blake3_sse41.S
 
 CFLAGS+= -D__amd64 -D_SYS_STACK_H -UHAVE_AES
-.elif ${MACHINE_ARCH} == "armv7"
+.elif ${MACHINE_CPUARCH} == "arm"
 ASM_SOURCES_C =
 ASM_SOURCES_AS = \
         asm-arm/sha2/sha256-armv7.S \

cddl/lib/libicp_rescue/Makefile

@@ -20,7 +20,7 @@ ASM_SOURCES_AS = \
         asm-x86_64/blake3/blake3_sse41.S
 
 CFLAGS+= -D__amd64 -D_SYS_STACK_H
-.elif ${MACHINE_ARCH} == "armv7"
+.elif ${MACHINE_CPUARCH} == "arm"
 ASM_SOURCES_C =
 ASM_SOURCES_AS = \
         asm-arm/sha2/sha256-armv7.S \

cddl/usr.bin/zstream/Makefile

@@ -17,7 +17,7 @@ SRCS= \
 	zstream_redup.c \
 	zstream_token.c
 
-SYMLINKS=	${BINDIR}/zstream ${BINDIR}/zstreamdump
+SYMLINKS=	zstream ${BINDIR}/zstreamdump
 
 WARNS?=	2
 CFLAGS+= \

cddl/usr.sbin/zfsd/case_file.cc

@@ -288,7 +288,7 @@ CaseFile::ReEvaluate(const string &devPath, const string &physPath, Vdev *vdev)
 		return (/*consumed*/false);
 	}
 
-	if (VdevState() > VDEV_STATE_CANT_OPEN) {
+	if (VdevState() > VDEV_STATE_FAULTED) {
 		/*
 		 * For now, newly discovered devices only help for
 		 * devices that are missing.  In the future, we might

contrib/capsicum-test/capsicum-freebsd.h

@@ -59,14 +59,12 @@ typedef unsigned long cap_ioctl_t;
 // Too many links
 #define E_TOO_MANY_LINKS EMLINK
 
-// TODO(FreeBSD): uncomment if/when FreeBSD propagates rights on accept.
-// FreeBSD does not generate a capability from accept(cap_fd,...).
-// https://bugs.freebsd.org/201052
-// #define CAP_FROM_ACCEPT
-// TODO(FreeBSD): uncomment if/when FreeBSD propagates rights on sctp_peeloff.
-// FreeBSD does not generate a capability from sctp_peeloff(cap_fd,...).
-// https://bugs.freebsd.org/201052
-// #define CAP_FROM_PEELOFF
+// As of commit 85b0f9de11c3 ("capsicum: propagate rights on accept(2)")
+// FreeBSD generates a capability from accept(cap_fd,...).
+#define CAP_FROM_ACCEPT
+// As of commit 91a9e4e01dab ("capsicum: propagate rights on sctp_peeloff")
+// FreeBSD generates a capability from sctp_peeloff(cap_fd,...).
+#define CAP_FROM_PEELOFF
 
 #endif  /* __FreeBSD__ */
 

contrib/capsicum-test/sctp.cc

@@ -1,6 +1,5 @@
 // Tests of SCTP functionality
 // Requires: libsctp-dev package on Debian Linux, CONFIG_IP_SCTP in kernel config
-#ifdef HAVE_SCTP
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -12,6 +11,7 @@
 #include "capsicum.h"
 #include "capsicum-test.h"
 
+#ifdef HAVE_SCTP
 static cap_rights_t r_ro;
 static cap_rights_t r_wo;
 static cap_rights_t r_rw;
@@ -61,6 +61,9 @@ static int SctpClient(int port, unsigned char byte) {
 
 TEST(Sctp, Socket) {
   int sock = socket(AF_INET, SOCK_SEQPACKET, IPPROTO_SCTP);
+  if (sock == -1 && errno == EPROTONOSUPPORT) {
+    GTEST_SKIP() << "socket(..., IPPROTO_SCTP) -> EPROTONOSUPPORT";
+  }
   EXPECT_OK(sock);
   if (sock < 0) return;
 

contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h

@@ -39,7 +39,11 @@
 #  define JEMALLOC_TLS_MODEL	__attribute__((tls_model("initial-exec")))
 #endif
 #ifdef __amd64__
+#ifdef _USE_LG_VADDR_WIDE
+#  define LG_VADDR		64
+#else
 #  define LG_VADDR		48
+#endif
 #  define LG_SIZEOF_PTR		3
 #  define JEMALLOC_TLS_MODEL	__attribute__((tls_model("initial-exec")))
 #endif

contrib/kyua/AUTHORS

@@ -9,3 +9,4 @@
 #     * Organization <optional email address>
 
 * Google Inc.
+* Igor Ostapenko <[email protected]>

contrib/kyua/cli/cmd_config_test.cpp

@@ -61,6 +61,7 @@ fake_config(void)
 {
     config::tree user_config = engine::default_config();
     user_config.set_string("architecture", "the-architecture");
+    user_config.set_string("execenvs", "the-env");
     user_config.set_string("parallelism", "128");
     user_config.set_string("platform", "the-platform");
     //user_config.set_string("unprivileged_user", "");
@@ -83,12 +84,13 @@ ATF_TEST_CASE_BODY(all)
     cmdline::ui_mock ui;
     ATF_REQUIRE_EQ(EXIT_SUCCESS, cmd.main(&ui, args, fake_config()));
 
-    ATF_REQUIRE_EQ(5, ui.out_log().size());
+    ATF_REQUIRE_EQ(6, ui.out_log().size());
     ATF_REQUIRE_EQ("architecture = the-architecture", ui.out_log()[0]);
-    ATF_REQUIRE_EQ("parallelism = 128", ui.out_log()[1]);
-    ATF_REQUIRE_EQ("platform = the-platform", ui.out_log()[2]);
-    ATF_REQUIRE_EQ("test_suites.foo.bar = first", ui.out_log()[3]);
-    ATF_REQUIRE_EQ("test_suites.foo.baz = second", ui.out_log()[4]);
+    ATF_REQUIRE_EQ("execenvs = the-env", ui.out_log()[1]);
+    ATF_REQUIRE_EQ("parallelism = 128", ui.out_log()[2]);
+    ATF_REQUIRE_EQ("platform = the-platform", ui.out_log()[3]);
+    ATF_REQUIRE_EQ("test_suites.foo.bar = first", ui.out_log()[4]);
+    ATF_REQUIRE_EQ("test_suites.foo.baz = second", ui.out_log()[5]);
     ATF_REQUIRE(ui.err_log().empty());
 }
 

contrib/kyua/cli/cmd_test.cpp

@@ -64,22 +64,19 @@ class print_hooks : public drivers::run_tests::base_hooks {
     bool _parallel;
 
 public:
-    /// The amount of positive test results found so far.
-    unsigned long good_count;
-
-    /// The amount of negative test results found so far.
-    unsigned long bad_count;
+    /// The amount of test results per type.
+    std::map<enum model::test_result_type, unsigned long> type_count;
 
     /// Constructor for the hooks.
     ///
     /// \param ui_ Object to interact with the I/O of the program.
     /// \param parallel_ True if we are executing more than one test at once.
     print_hooks(cmdline::ui* ui_, const bool parallel_) :
         _ui(ui_),
-        _parallel(parallel_),
-        good_count(0),
-        bad_count(0)
+        _parallel(parallel_)
     {
+        for (const auto& pair : model::test_result_types)
+            type_count[pair.first] = 0;
     }
 
     /// Called when the processing of a test case begins.
@@ -116,10 +113,8 @@ class print_hooks : public drivers::run_tests::base_hooks {
         }
         _ui->out(F("%s  [%s]") % cli::format_result(result) %
             cli::format_delta(duration));
-        if (result.good())
-            good_count++;
-        else
-            bad_count++;
+
+        type_count[result.type()]++;
     }
 };
 
@@ -159,19 +154,42 @@ cmd_test::run(cmdline::ui* ui, const cmdline::parsed_cmdline& cmdline,
         kyuafile_path(cmdline), build_root_path(cmdline), results.second,
         parse_filters(cmdline.arguments()), user_config, hooks);
 
+    unsigned long total = 0;
+    unsigned long good = 0;
+    unsigned long bad = 0;
+    for (const auto& pair : model::test_result_types) {
+        const auto& type = pair.second;
+        const auto count = hooks.type_count[type.id];
+        total += count;
+        if (type.is_run && type.is_good)
+            good += count;
+        if (!type.is_good)
+            bad += count;
+    }
+
     int exit_code;
-    if (hooks.good_count > 0 || hooks.bad_count > 0) {
+    if (total > 0) {
         ui->out("");
         if (!results.first.empty()) {
             ui->out(F("Results file id is %s") % results.first);
         }
         ui->out(F("Results saved to %s") % results.second);
         ui->out("");
 
-        ui->out(F("%s/%s passed (%s failed)") % hooks.good_count %
-                (hooks.good_count + hooks.bad_count) % hooks.bad_count);
+        ui->out(F("%s/%s passed (") % good % total, false);
+        const auto& types = model::test_result_types;
+        for (auto it = types.begin(); it != types.end(); it++) {
+            const auto& type = it->second;
+            if (!type.is_run || !type.is_good) {
+                if (it != types.begin())
+                    ui->out(", ", false);
+                ui->out(F("%s %s") % hooks.type_count[type.id] % type.name,
+                    false);
+            }
+        }
+        ui->out(")");
 
-        exit_code = (hooks.bad_count == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
+        exit_code = (bad == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
     } else {
         // TODO(jmmv): Delete created empty file; it's useless!
         if (!results.first.empty()) {

contrib/kyua/doc/kyua.conf.5.in

@@ -1,4 +1,4 @@
-.\" Copyright 2012 The Kyua Authors.
+.\" Copyright 2012-2024 The Kyua Authors.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
 .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 .\" OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.Dd February 20, 2015
+.Dd March 22, 2024
 .Dt KYUA.CONF 5
 .Os
 .Sh NAME
@@ -36,6 +36,7 @@
 .Pp
 Variables:
 .Va architecture ,
+.Va execenvs ,
 .Va platform ,
 .Va test_suites ,
 .Va unprivileged_user .
@@ -72,6 +73,14 @@ The following variables are internally recognized by
 .Bl -tag -width XX -offset indent
 .It Va architecture
 Name of the system architecture (aka processor type).
+.It Va execenvs
+Whitespace-separated list of execution environment names.
+.Pp
+Only tests which require one of the given execution environments will be run.
+.Pp
+See
+.Xr kyuafile 5
+for the list of possible execution environments.
 .It Va parallelism
 Maximum number of test cases to execute concurrently.
 .It Va platform