Merge remote-tracking branch 'freebsd/main'

Author: ericbsd

.cirrus.yml

@@ -10,7 +10,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-4-release-amd64
+  image: freebsd-14-2-release-amd64-ufs
   cpu: 8
   memory: 8G
   disk: 40
@@ -20,23 +20,23 @@ env:
 
 task:
   matrix:
-  - name: amd64-llvm16 World and kernel build and boot smoke test
+  - name: amd64-llvm16 World and kernel build and boot smoke test (manual)
     only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src'
     trigger_type: manual
     env:
       TARGET: amd64
       TARGET_ARCH: amd64
       TOOLCHAIN: llvm16
       TOOLCHAIN_PKG: ${TOOLCHAIN}-lite
-  - name: amd64-llvm17 World and kernel build and boot smoke test
+  - name: amd64-llvm17 World and kernel build and boot smoke test (manual)
     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
+  - name: amd64-llvm18 World and kernel build and boot smoke test (manual)
     only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src'
     trigger_type: manual
     env:
@@ -51,31 +51,31 @@ task:
       TARGET_ARCH: amd64
       TOOLCHAIN: llvm19
       TOOLCHAIN_PKG: ${TOOLCHAIN}-lite
-  - name: arm64-llvm16 World and kernel build and boot smoke test
+  - name: arm64-llvm16 World and kernel build and boot smoke test (manual)
     only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src'
     trigger_type: manual
     env:
       TARGET: arm64
       TARGET_ARCH: aarch64
       TOOLCHAIN: llvm16
       TOOLCHAIN_PKG: ${TOOLCHAIN}
-  - name: arm64-llvm17 World and kernel build and boot smoke test
+  - name: arm64-llvm17 World and kernel build and boot smoke test (manual)
     only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src'
     trigger_type: manual
     env:
       TARGET: arm64
       TARGET_ARCH: aarch64
       TOOLCHAIN: llvm17
       TOOLCHAIN_PKG: ${TOOLCHAIN}
-  - name: arm64-llvm18 World and kernel build and boot smoke test
+  - name: arm64-llvm18 World and kernel build and boot smoke test (manual)
     only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src'
     trigger_type: manual
     env:
       TARGET: arm64
       TARGET_ARCH: aarch64
       TOOLCHAIN: llvm18
       TOOLCHAIN_PKG: ${TOOLCHAIN}
-  - name: arm64-llvm19 World and kernel build and boot smoke test
+  - name: arm64-llvm19 World and kernel build and boot smoke test (manual)
     only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src'
     trigger_type: manual
     env:

.git-blame-ignore-revs

@@ -8,11 +8,16 @@
 #
 # This file is sorted in git log order (newest commits first).
 
+# queue(3) single space after all #define
+a4df0830d74dba9d20c01d8c108bddeb1ecd62cd
+# bin/ps whitespace cleanup
+0d320eb5edc37f6c1bfa5eabc0309350b87c08ad
 # reformat libexec/rtld-elf
 7e2f38311e62b1a3ba4a023042f2dc36e27cdd06
 986c96b54b9ec1118d285b723f53c7451a4c0772
 3a85aa6a1d8916082155867ce0545a07185e8924
 78b5dadb58e201e51a3a2eda5cf8cab6d31e0b62
+1c8cdd807a9487aac532ef44f78bf53fe8ec4ce2
 # whitespace fixes for sys/sys/kernel.h
 5c623697d6011de63bc762560a648c09379e06d2
 # style fixes for iflib

.github/workflows/checklist.yml

@@ -4,7 +4,7 @@ name: Checklist
 # for the submission to align with CONTRIBUTING.md
 
 on:
-  pull_request:
+  pull_request_target:
     types: [ opened, reopened, edited, synchronize ]
 
 permissions:

Makefile.inc1

@@ -817,6 +817,7 @@ TMAKE=		\
 # TOOLS_PREFIX set in BMAKE
 XMAKE=		${BMAKE} \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+		MK_CLANG=${MK_CLANG_BOOTSTRAP} \
 		MK_LLDB=no \
 		MK_LLVM_BINUTILS=no \
 		MK_TESTS=no
@@ -1673,8 +1674,8 @@ buildetc: .MAKE .PHONY
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 _legacy
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 _bootstrap-tools \
 	    MK_CROSS_COMPILER=no MK_TOOLCHAIN=no
-	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 _obj \
-	    SUBDIR_OVERRIDE=etc
+	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 _obj
+	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 buildconfig
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 everything \
 	    SUBDIR_OVERRIDE=etc
 
@@ -2909,33 +2910,28 @@ _dtrace_tools= cddl/lib/libctf cddl/lib/libspl cddl/usr.bin/ctfconvert \
     cddl/usr.bin/ctfmerge
 .endif
 
-# If we're given an XAS, don't build binutils.
-.if ${XAS:M/*} == ""
 .if ${MK_ELFTOOLCHAIN_BOOTSTRAP} != "no"
+# Some bespoke tools from or based on ELF Tool Chain.  elfcopy is included
+# because llvm-objcopy is currently not capable of translating ELF to PE32+,
+# which is required for EFI boot programs.
 _elftctools=	lib/libelftc \
 		lib/libpe \
+		usr.bin/elfcopy \
 		usr.bin/elfctl \
-		usr.bin/elfdump \
-		usr.bin/objcopy \
-		usr.bin/nm \
+		usr.bin/elfdump
+# If we're given an XNM we don't need to build standard binary utilities.
+.if ${XNM:M/*} == ""
+_elftctools+=	usr.bin/nm \
 		usr.bin/size \
 		usr.bin/strings
 # These are not required by the build, but can be useful for developers who
 # cross-build on a FreeBSD 10 host:
 _elftctools+=	usr.bin/addr2line
 .endif
-.elif ${TARGET_ARCH} != ${MACHINE_ARCH} && ${MK_ELFTOOLCHAIN_BOOTSTRAP} != "no"
-# If cross-building with an external binutils we still need to build strip for
-# the target (for at least crunchide).
-_elftctools=	lib/libelftc \
-		lib/libpe \
-		usr.bin/elfctl \
-		usr.bin/elfdump \
-		usr.bin/objcopy
 .endif
 
 .if ${MK_CLANG_BOOTSTRAP} != "no"
-_clang=		usr.bin/clang
+_clang=		usr.bin/clang/clang
 .endif
 .if ${MK_LLD_BOOTSTRAP} != "no"
 _lld=		usr.bin/clang/lld
@@ -3016,7 +3012,7 @@ NXBDIRS+= \
     usr.bin/cmp \
     usr.bin/diff \
     usr.bin/dirname \
-    usr.bin/objcopy \
+    usr.bin/elfcopy \
     usr.bin/env \
     usr.bin/fetch \
     usr.bin/find \

ObsoleteFiles.inc

@@ -51,6 +51,32 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20250409: removal of iwlwifi firmware files
+OLD_FILES+=usr/share/doc/legal/intel_iwlwifi_firmware.LICENCE
+
+# 20250331: removal of TCPPCAP
+OLD_FILES+=usr/include/netinet/tcp_pcap.h
+
+# 20250310: caroot bundle updated
+OLD_FILES+=usr/share/certs/trusted/Entrust_Root_Certification_Authority_-_G4.pem
+OLD_FILES+=usr/share/certs/trusted/SecureSign_RootCA11.pem
+OLD_FILES+=usr/share/certs/trusted/Security_Communication_RootCA3.pem
+OLD_FILES+=usr/share/certs/trusted/SwissSign_Silver_CA_-_G2.pem
+OLD_FILES+=usr/share/certs/untrusted/AddTrust_External_Root.pem
+OLD_FILES+=usr/share/certs/untrusted/AddTrust_Low-Value_Services_Root.pem
+OLD_FILES+=usr/share/certs/untrusted/Staat_der_Nederlanden_Root_CA_-_G2.pem
+OLD_FILES+=usr/share/certs/untrusted/Cybertrust_Global_Root.pem
+OLD_FILES+=usr/share/certs/untrusted/DST_Root_CA_X3.pem
+OLD_FILES+=usr/share/certs/untrusted/GlobalSign_Root_CA_-_R2.pem
+OLD_FILES+=usr/share/certs/untrusted/QuoVadis_Root_CA.pem
+OLD_FILES+=usr/share/certs/untrusted/Sonera_Class_2_Root_CA.pem
+OLD_FILES+=usr/share/certs/untrusted/GeoTrust_Global_CA.pem
+OLD_FILES+=usr/share/certs/untrusted/Staat_der_Nederlanden_EV_Root_CA.pem
+OLD_FILES+=usr/share/certs/untrusted/E-Tugra_Certification_Authority.pem
+OLD_FILES+=usr/share/certs/untrusted/Hongkong_Post_Root_CA_1.pem
+OLD_FILES+=usr/share/certs/untrusted/Security_Communication_Root_CA.pem
+OLD_FILES+=usr/share/certs/untrusted/Trustis_FPS_Root_CA.pem
+
 # 20250205: bus_generic_attach.9 removed after the function was deprecated
 OLD_FILES+=usr/share/man/man9/bus_generic_attach.9.gz
 
@@ -59,7 +85,7 @@ OLD_FILES+=usr/tests/sys/vm/stack/.debug/libsoxstack.so.debug
 OLD_DIRS+=usr/tests/sys/vm/stack/.debug
 
 # 20250129: libdevinfo bumped to version 7
-OLD_LIBS+=lib/libdevinfo.so.6
+OLD_LIBS+=usr/lib/libdevinfo.so.6
 
 # 20250123: Remove gvinum(8)
 OLD_FILES+=sbin/gvinum
@@ -12453,8 +12479,6 @@ OLD_FILES+=usr/bin/llvm-pdbdump
 OLD_FILES+=usr/share/man/man2/pdwait4.2.gz
 # 20170610: chown-f_test replaced by chown_test
 OLD_FILES+=usr/tests/usr.sbin/chown/chown-f_test
-# 20170609: drop obsolete manpage link (if_rtwn.ko -> rtwn.ko)
-OLD_FILES+=usr/share/man/man4/if_rtwn.4.gz
 # 20170531: removal of groff
 OLD_FILES+=usr/bin/addftinfo
 OLD_FILES+=usr/bin/afmtodit
@@ -13569,9 +13593,6 @@ OLD_FILES+=usr/share/man/man1/rlog.1.gz
 OLD_FILES+=usr/share/man/man5/rcsfile.5.gz
 # 20161010: remove link to removed m_getclr(9) macro
 OLD_FILES+=usr/share/man/man9/m_getclr.9.gz
-# 20161003: MK_ELFCOPY_AS_OBJCOPY option retired
-OLD_FILES+=usr/bin/elfcopy
-OLD_FILES+=usr/share/man/man1/elfcopy.1.gz
 # 20160906: libkqueue tests moved to /usr/tests/sys/kqueue/libkqueue
 OLD_FILES+=usr/tests/sys/kqueue/kqtest
 OLD_FILES+=usr/tests/sys/kqueue/kqueue_test
@@ -15388,8 +15409,6 @@ OLD_FILES+=usr/share/man/man4/lindev.4.gz
 # 20140425
 OLD_FILES+=usr/lib/libssp_p.a
 OLD_FILES+=usr/lib/libstand_p.a
-# 20140413: Removed NO_MANCOMPRESS from mount_fusefs
-OLD_FILES+=usr/share/man/man8/mount_fusefs.8
 # 20140314: AppleTalk
 OLD_DIRS+=usr/include/netatalk
 OLD_FILES+=usr/include/netatalk/aarp.h

RELNOTES

@@ -10,6 +10,33 @@ newline.  Entries should be separated by a newline.
 
 Changes to this file should not be MFCed.
 
+995b690d1398:
+	ps(1)'s '-U' option has been changed to select processes by their real
+	user IDs instead of their effective one, in accordance with POSIX and
+	the use case of wanting to list processes launched by some user, which
+	is expected to be more frequent than listing processes having the rights
+	of some user.  This only affects the selection of processes whose real
+	and effective user IDs differ.	After this change, ps(1)'s '-U' flag
+	behaves differently then in other BSDs but identically to that of
+	Linux's procps and illumos.
+
+1aabbb25c9f9:
+	ps(1)'s default list of processes now comes from matching its effective
+	user ID instead of its real user ID with the effective user ID of all
+	processes, in accordance with POSIX.  As ps(1) itself is not installed
+	setuid, this only affects processes having different real and effective
+	user IDs that launch ps(1) processes.
+
+f0600c41e754-de701f9bdbe0, bc201841d139:
+	mac_do(4) is now considered production-ready and its functionality has
+	been considerably extended at the price of breaking credentials
+	transition rules' backwards compatibility.  All that could be specified
+	with old rules can also be with new rules.  Migrating old rules is just
+	a matter of adding "uid=" in front of the target part, substituting
+	commas (",") with semi-colons (";") and colons (":") with greater-than
+	signs (">").  Please consult the mac_do(4) manual page for the new rules
+	grammar.
+
 02d4eeabfd73:
 	hw.snd.maxautovchans has been retired. The commit introduced a
 	hw.snd.vchans_enable sysctl, which along with

UPDATING

@@ -27,6 +27,23 @@ 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".)
 
+20250412:
+	LinuxKPI alloc routines were changed to return physically contiguous
+	memory where expected. These changes may require out-of-tree drivers
+	to be recompiled.
+	Bump __FreeBSD_version to 1500037 to be able to detect this change.
+
+20250409:
+	Intel iwlwifi firmware has been removed from the src repository.
+	Before updating their system, users of iwlwifi(4) or iwx(4) must
+	install the appropriate firmware for their chipset using fwget(8) or
+	building it from ports.
+
+20250314:
+	We now use LLVM's binary utilities (nm, objcopy, etc.) by default.
+	The WITHOUT_LLVM_BINUTILS src.conf(5) knob can be used to revert to
+	ELF Tool Chain tools if desired.
+
 20250303:
 	Commit 4a77657cbc01 changed the ABI between ipfw(8) and ipfw(4).
 	Please note that the old ipfw(8) binary will not work with the new
@@ -79,6 +96,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW:
 	option that allowed building them instead of the advanced version
 	imported more than 4 years ago have been removed.
 
+20241107:
+	The ng_ubt(4) driver now requires firmwares to be loaded on Realtek
+	adaptors with rtlbtfw(8) utility. It no longer attaches to devices
+	standing in bootloader mode. Firmware files are available in the
+	comms/rtlbt-firmware port.
+
 20241025:
 	The support for the rc_fast_and_loose variable has been removed from
 	rc.subr(8). Users setting rc_fast_and_loose on their systems are
@@ -2183,7 +2206,7 @@ FOOTNOTES:
 	happens automatically. If all your modules come from ports, then adding
 	the port origin directories to PORTS_MODULES instead is also automatic
 	and effective, eg:
-	     PORTS_MODULES+=x11/nvidia-driver
+	     PORTS_MODULES+=graphics/drm-kmod graphics/nvidia-drm-kmod
 
 	[3] From the bootblocks, boot -s, and then do
 		fsck -p

bin/cp/cp.1

@@ -320,7 +320,6 @@ and
 options are non-standard and their use in scripts is not recommended.
 .Sh SEE ALSO
 .Xr mv 1 ,
-.Xr rcp 1 ,
 .Xr umask 2 ,
 .Xr fts 3 ,
 .Xr symlink 7

bin/cp/cp.c

@@ -214,7 +214,7 @@ main(int argc, char *argv[])
 		 * Case (1).  Target is not a directory.
 		 */
 		if (argc > 1)
-			errx(1, "%s is not a directory", to.p_path);
+			errc(1, ENOTDIR, "%s", to.p_path);
 
 		/*
 		 * Need to detect the case:
@@ -237,17 +237,17 @@ main(int argc, char *argv[])
 			type = FILE_TO_FILE;
 
 		if (have_trailing_slash && type == FILE_TO_FILE) {
-			if (r == -1) {
-				errx(1, "directory %s does not exist",
-				    to.p_path);
-			} else
-				errx(1, "%s is not a directory", to.p_path);
+			if (r == -1)
+				errc(1, ENOENT, "%s", to.p_path);
+			else
+				errc(1, ENOTDIR, "%s", to.p_path);
 		}
-	} else
+	} else {
 		/*
 		 * Case (2).  Target is a directory.
 		 */
 		type = FILE_TO_DIR;
+	}
 
 	/*
 	 * For DIR_TO_DNE, we could provide copy() with the to_stat we've
@@ -339,8 +339,8 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat)
 					base = (p == NULL) ? 0 :
 					    (int)(p - curr->fts_path + 1);
 
-					if (!strcmp(&curr->fts_path[base],
-					    ".."))
+					if (strcmp(curr->fts_path + base, "..")
+					    == 0)
 						base += 1;
 				} else
 					base = curr->fts_pathlen;