Merge FreeBSD 2024-04-12

.cirrus.yml

@@ -23,15 +23,15 @@ task:
       TOOLCHAIN: llvm16
       TOOLCHAIN_PKG: ${TOOLCHAIN}-lite
   - name: amd64-llvm17 World and kernel build and boot smoke test
-    only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' || $CIRRUS_BRANCH =~ 'pull/.*'
+    only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src'
+    trigger_type: manual
     env:
       TARGET: amd64
       TARGET_ARCH: amd64
       TOOLCHAIN: llvm17
       TOOLCHAIN_PKG: ${TOOLCHAIN}-lite
   - name: amd64-llvm18 World and kernel build and boot smoke test
-    only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src'
-    trigger_type: manual
+    only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' || $CIRRUS_BRANCH =~ 'pull/.*'
     env:
       TARGET: amd64
       TARGET_ARCH: amd64

Makefile.inc1

@@ -1119,7 +1119,7 @@ _cleanworldtmp: .PHONY
 # Note: for delete-old we need to set $PATH to also include the host $PATH
 # since otherwise a partial build with missing symlinks in ${WORLDTMP}/legacy/
 # will fail to run due to missing binaries. $WMAKE sets PATH to only ${TMPPATH}
-# so we remove that assingnment from $WMAKE and prepend the new $PATH
+# so we remove that assignment from $WMAKE and prepend the new $PATH
 	${_+_}@if [ -e "${WORLDTMP}" ]; then \
 		echo ">>> Deleting stale files in build tree..."; \
 		cd ${.CURDIR}; env PATH=${TMPPATH:Q}:${PATH:Q} ${WMAKE:NPATH=*} \

RELNOTES

@@ -10,6 +10,10 @@ newline.  Entries should be separated by a newline.
 
 Changes to this file should not be MFCed.
 
+aea973501b19:
+	ktrace(2) will now record detailed information about capability mode
+	violations. The kdump(1) utility has been updated to display such
+	information.
 f32a6403d346:
 	One True Awk updated to 2nd Edition. See https://awk.dev for details
 	on the additions. Unicode and CSVs (Comma Separated Values) are now

bin/cp/cp.c

@@ -260,22 +260,6 @@ main(int argc, char *argv[])
 	    &to_stat)));
 }
 
-/* Does the right thing based on -R + -H/-L/-P */
-static int
-copy_stat(const char *path, struct stat *sb)
-{
-
-	/*
-	 * For -R -H/-P, we need to lstat() instead; copy() cares about the link
-	 * itself rather than the target if we're not following links during the
-	 * traversal.
-	 */
-	if (!Rflag || Lflag)
-		return (stat(path, sb));
-	return (lstat(path, sb));
-}
-
-
 static int
 copy(char *argv[], enum op type, int fts_options, struct stat *root_stat)
 {
@@ -403,7 +387,6 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat)
 					continue;
 				}
 
-
 				if (asprintf(&recurse_path, "%s/%s", to.p_path,
 				    rootname) == -1)
 					err(1, "asprintf");
@@ -452,30 +435,21 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat)
 			continue;
 		}
 
-		/* Not an error but need to remember it happened. */
-		if (copy_stat(to.p_path, &to_stat) == -1)
-			dne = 1;
-		else {
-			if (to_stat.st_dev == curr->fts_statp->st_dev &&
-			    to_stat.st_ino == curr->fts_statp->st_ino) {
-				warnx("%s and %s are identical (not copied).",
-				    to.p_path, curr->fts_path);
-				badcp = rval = 1;
-				if (S_ISDIR(curr->fts_statp->st_mode))
-					(void)fts_set(ftsp, curr, FTS_SKIP);
-				continue;
-			}
-			if (!S_ISDIR(curr->fts_statp->st_mode) &&
-			    S_ISDIR(to_stat.st_mode)) {
-				warnx("cannot overwrite directory %s with "
-				    "non-directory %s",
-				    to.p_path, curr->fts_path);
-				badcp = rval = 1;
-				continue;
-			}
-			dne = 0;
+		/* Check if source and destination are identical. */
+		if (stat(to.p_path, &to_stat) == 0 &&
+		    to_stat.st_dev == curr->fts_statp->st_dev &&
+		    to_stat.st_ino == curr->fts_statp->st_ino) {
+			warnx("%s and %s are identical (not copied).",
+			    to.p_path, curr->fts_path);
+			badcp = rval = 1;
+			if (S_ISDIR(curr->fts_statp->st_mode))
+				(void)fts_set(ftsp, curr, FTS_SKIP);
+			continue;
 		}
 
+		/* Not an error but need to remember it happened. */
+		dne = lstat(to.p_path, &to_stat) != 0;
+
 		switch (curr->fts_statp->st_mode & S_IFMT) {
 		case S_IFLNK:
 			/* Catch special case of a non-dangling symlink. */

bin/cp/tests/cp_test.sh

@@ -363,6 +363,35 @@ symlink_exists_force_body()
 	atf_check -o inline:"foo\n" readlink bar
 }
 
+atf_test_case directory_to_symlink
+directory_to_symlink_body()
+{
+	mkdir -p foo
+	ln -s .. foo/bar
+	mkdir bar
+	touch bar/baz
+	atf_check -s not-exit:0 -e match:"Not a directory" \
+	    cp -R bar foo
+	atf_check -s not-exit:0 -e match:"Not a directory" \
+	    cp -r bar foo
+}
+
+atf_test_case overwrite_directory
+overwrite_directory_body()
+{
+	mkdir -p foo/bar/baz
+	touch bar
+	atf_check -s not-exit:0 -e match:"Is a directory" \
+	    cp bar foo
+	rm bar
+	mkdir bar
+	touch bar/baz
+	atf_check -s not-exit:0 -e match:"Is a directory" \
+	    cp -R bar foo
+	atf_check -s not-exit:0 -e match:"Is a directory" \
+	    cp -r bar foo
+}
+
 atf_init_test_cases()
 {
 	atf_add_test_case basic
@@ -388,4 +417,6 @@ atf_init_test_cases()
 	atf_add_test_case symlink
 	atf_add_test_case symlink_exists
 	atf_add_test_case symlink_exists_force
+	atf_add_test_case directory_to_symlink
+	atf_add_test_case overwrite_directory
 }

bin/echo/echo.1

@@ -89,6 +89,24 @@ Consult the
 manual page.
 .Sh EXIT STATUS
 .Ex -std
+.Sh EXAMPLES
+Special treatment of options and backslashes:
+.Bd -literal -offset indent
+$ /bin/echo "-hello\\tworld"
+-hello\tworld
+.Ed
+.Pp
+Avoid new line character:
+.Bd -literal -offset indent
+$ /bin/echo -n hello;/bin/echo world
+helloworld
+.Ed
+.Pp
+Or to achieve the same result:
+.Bd -literal -offset indent
+$ /bin/echo "hello\\c";/bin/echo world
+helloworld
+.Ed
 .Sh SEE ALSO
 .Xr builtin 1 ,
 .Xr csh 1 ,
@@ -105,3 +123,14 @@ The
 .Nm
 command appeared in
 .At v2 .
+.Sh CAVEATS
+The
+.Nm
+command behaves differently with regards to the built-in
+.Nm
+shell command in a number of ways including escaped characters handling.
+It also differs in behavior between different systems hence complicating writing
+portable scripts.
+It is advised to use the
+.Xr printf 1
+command to avoid these shortcomings.

bin/nproc/nproc.c

@@ -94,7 +94,7 @@ main(int argc, char *argv[])
 			break;
 		case OPT_VERSION:
 			version();
-			__builtin_unreachable();
+			__unreachable();
 		case OPT_HELP:
 			help();
 			exit(EXIT_SUCCESS);

cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc

@@ -134,6 +134,7 @@ class MockVdev : public Vdev
 	MOCK_CONST_METHOD0(PoolGUID, Guid());
 	MOCK_CONST_METHOD0(State, vdev_state());
 	MOCK_CONST_METHOD0(PhysicalPath, string());
+	MOCK_CONST_METHOD2(Name, string(zpool_handle_t * zhp, bool verbose));
 };
 
 MockVdev::MockVdev(nvlist_t *vdevConfig)
@@ -431,6 +432,8 @@ class CaseFileTest : public ::testing::Test
 		m_vdev = new MockVdev(m_vdevConfig);
 		ON_CALL(*m_vdev, GUID())
 		    .WillByDefault(::testing::Return(Guid(123)));
+		ON_CALL(*m_vdev, Name(::testing::_, ::testing::_))
+		    .WillByDefault(::testing::Return(string("/dev/da999")));
 		ON_CALL(*m_vdev, PoolGUID())
 		    .WillByDefault(::testing::Return(Guid(456)));
 		ON_CALL(*m_vdev, State())

cddl/usr.sbin/zfsd/vdev.h

@@ -130,7 +130,7 @@ class Vdev
 	nvlist_t		*Config()	const;
 	Vdev			 Parent();
 	Vdev			 RootVdev();
-	std::string		 Name(zpool_handle_t *, bool verbose)	const;
+	virtual std::string	 Name(zpool_handle_t *, bool verbose)	const;
 	bool			 IsSpare();
 	bool			 IsAvailableSpare()	const;
 	bool			 IsActiveSpare()	const;

contrib/libcxxrt/cxxabi.h

@@ -204,12 +204,12 @@
 std::type_info * __cxa_current_exception_type();
 
 
-void *__cxa_allocate_exception(size_t thrown_size);
+void *__cxa_allocate_exception(size_t thrown_size) throw();
 
-void __cxa_free_exception(void* thrown_exception);
+void __cxa_free_exception(void* thrown_exception) throw();
 
 __cxa_exception *__cxa_init_primary_exception(
-		void *object, std::type_info* tinfo, void (*dest)(void *));
+		void *object, std::type_info* tinfo, void (*dest)(void *)) throw();
 
 /**
  * Throws an exception returned by __cxa_current_primary_exception().  This

contrib/libcxxrt/exception.cc

@@ -121,7 +121,7 @@ static inline _Unwind_Reason_Code continueUnwinding(struct _Unwind_Exception *ex
 }
 
 
-extern "C" void __cxa_free_exception(void *thrown_exception);
+extern "C" void __cxa_free_exception(void *thrown_exception) throw();
 extern "C" void __cxa_free_dependent_exception(void *thrown_exception);
 extern "C" void* __dynamic_cast(const void *sub,
                                 const __class_type_info *src,
@@ -611,7 +611,7 @@ static void free_exception(char *e)
  * emergency buffer if malloc() fails, and may block if there are no such
  * buffers available.
  */
-extern "C" void *__cxa_allocate_exception(size_t thrown_size)
+extern "C" void *__cxa_allocate_exception(size_t thrown_size) throw()
 {
 	size_t size = thrown_size + sizeof(__cxa_exception);
 	char *buffer = alloc_or_die(size);
@@ -633,7 +633,7 @@ extern "C" void *__cxa_allocate_dependent_exception(void)
  * In this implementation, it is also called by __cxa_end_catch() and during
  * thread cleanup.
  */
-extern "C" void __cxa_free_exception(void *thrown_exception)
+extern "C" void __cxa_free_exception(void *thrown_exception) throw()
 {
 	__cxa_exception *ex = reinterpret_cast<__cxa_exception*>(thrown_exception) - 1;
 	// Free the object that was thrown, calling its destructor
@@ -794,7 +794,7 @@ static void throw_exception(__cxa_exception *ex)
 }
 
 extern "C" __cxa_exception *__cxa_init_primary_exception(
-		void *object, std::type_info* tinfo, void (*dest)(void *)) {
+		void *object, std::type_info* tinfo, void (*dest)(void *)) throw() {
 	__cxa_exception *ex = reinterpret_cast<__cxa_exception*>(object) - 1;
 
 	ex->referenceCount = 0;