HardenedBSD/src 9b2bc93sys/compat/freebsd32 freebsd32_misc.c, sys/sys ucred.h

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+8-4sys/compat/freebsd32/freebsd32_misc.c
+0-2sys/sys/ucred.h
+8-62 files

HardenedBSD/ports 2f5a3a5games/veloren-weekly distinfo Makefile.crates, games/veloren-weekly/files patch-gilrs

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+0-563math/rubygem-rb-gsl/files/patch-ruby3
+166-30games/veloren-weekly/files/patch-gilrs
+101-35games/veloren-weekly/distinfo
+49-16games/veloren-weekly/Makefile.crates
+28-0math/p5-Math-GSL-Alien/Makefile
+0-28math/p5-Alien-GSL/Makefile
+344-672125 files not shown
+565-882131 files

HardenedBSD/ports 8e2de3fsysutils/nut-devel distinfo pkg-plist

sysutils/nut-devel: Update to the latest networkupstools/nut github commit
DeltaFile
+3-3sysutils/nut-devel/distinfo
+5-0sysutils/nut-devel/pkg-plist
+2-2sysutils/nut-devel/Makefile
+10-53 files

HardenedBSD/src e0c83ceshare/mk src.opts.mk

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-9share/mk/src.opts.mk
+0-91 files

HardenedBSD/ports 8ff0a1ddatabases/geoserver-mysql-plugin distinfo Makefile, graphics/geoserver Makefile distinfo

*/geoserver*: Update to 2.28.2

Changelog:
https://geoserver.org/announcements/2026/01/21/geoserver-2-28-2-released.html
DeltaFile
+3-3databases/geoserver-mysql-plugin/distinfo
+3-3graphics/geoserver/Makefile
+3-3graphics/geoserver/distinfo
+2-2databases/geoserver-mysql-plugin/Makefile
+1-1graphics/geoserver/pkg-plist
+12-125 files

HardenedBSD/src 3c86fddcontrib/capsicum-test linux.cc capability-fd.cc, tests/sys/capsicum linux.cc capability-fd.cc

Merge remote-tracking branch 'internal/freebsd/current/main' into hardened/current/master

Conflicts:
        share/mk/src.opts.mk (unresolved)
DeltaFile
+0-1,500contrib/capsicum-test/linux.cc
+1,500-0tests/sys/capsicum/linux.cc
+1,359-0tests/sys/capsicum/capability-fd.cc
+0-1,359contrib/capsicum-test/capability-fd.cc
+1,097-0tests/sys/capsicum/procdesc.cc
+0-1,097contrib/capsicum-test/procdesc.cc
+3,956-3,956134 files not shown
+11,875-10,015140 files

HardenedBSD/ports 2409072audio/beets Makefile, devel/py-lap Makefile

Merge remote-tracking branch 'internal/freebsd/main' into hardenedbsd/main
DeltaFile
+61-57textproc/otree/distinfo
+45-41audio/beets/Makefile
+36-27textproc/otree/Makefile
+20-0devel/py-lap/Makefile
+9-9games/jfsw/distinfo
+5-5sysutils/hstr/Makefile
+176-13918 files not shown
+228-17924 files

HardenedBSD/ports 48fe711sysutils Makefile, sysutils/py-ansible-core220 Makefile pkg-descr

HBSD: Revert "HBSD: Revert "sysutils/py-ansible-core220: Add new port""

This reverts commit 1884bfa38ea2eb29e436df96264ef329a5411b08. FreeBSD
fixed the issue.

Signed-off-by: Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+95-0sysutils/py-ansible-core220/Makefile
+9-0sysutils/py-ansible-core220/files/patch-pyproject.toml
+5-0sysutils/py-ansible-core220/pkg-descr
+3-0sysutils/py-ansible-core220/distinfo
+1-0sysutils/Makefile
+113-05 files

HardenedBSD/ports 1a3999dgraphics/xd3d Makefile

graphics/xd3d: Fix building with Clang 21
DeltaFile
+1-0graphics/xd3d/Makefile
+1-01 files

HardenedBSD/ports 155fb8cscience/wannier90 Makefile

science/wannier90: Fix building with Flang
DeltaFile
+2-2science/wannier90/Makefile
+2-21 files

HardenedBSD/ports 729da38math/taucs Makefile, math/taucs/files patch-configurator_taucs__config.c

math/taucs: Fix building with Flang and Clang 21
DeltaFile
+13-0math/taucs/files/patch-configurator_taucs__config.c
+1-1math/taucs/Makefile
+14-12 files

HardenedBSD/ports b54027fbiology/viennarna Makefile

biology/viennarna: Fix building with Flang and Clang 21
DeltaFile
+1-2biology/viennarna/Makefile
+1-21 files

HardenedBSD/src ff870b7sys/kern sched_4bsd.c sched_shim.c

sched_shim: restore kern.ccpu sysctl

It is apparently should be considered part of the ABI, and is used by
the base top(1).  But do not declare the ccpu variable in headers, it is
needed only by 4bsd. So put the variable definition into sched_shim.c to
make the kernel buildable without SCHED_4BSD.

Reviewed by:    olce
Tested by:      pho
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D54831
DeltaFile
+6-4sys/kern/sched_4bsd.c
+4-0sys/kern/sched_shim.c
+10-42 files

HardenedBSD/src 377c053sys/amd64/amd64 cpu_switch.S, sys/arm/arm swtch-v6.S

cpu_switch(): unconditionally wait on the blocked mutex transient

It is nop for 4BSD.

Reviewed by:    olce
Tested by:      pho
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D54831
DeltaFile
+13-18sys/i386/i386/swtch.S
+1-6sys/arm/arm/swtch-v6.S
+0-5sys/amd64/amd64/cpu_switch.S
+1-2sys/arm64/arm64/swtch.S
+1-2sys/powerpc/powerpc/swtch32.S
+1-2sys/powerpc/powerpc/swtch64.S
+17-351 files not shown
+18-377 files

HardenedBSD/src b602ba1sys/kern sched_ule.c sched_4bsd.c, sys/net iflib.c

net/iflib.c: move out scheduler-depended code into the hook

Add sched_find_l2_neighbor().  This really should be not
scheduler-depended, in does not have anything to do with scheduler at
all.  But for now keep the same code structure.

Reviewed by:    olce
Tested by:      pho
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D54831
DeltaFile
+3-79sys/net/iflib.c
+68-0sys/kern/sched_ule.c
+8-0sys/sys/sched.h
+7-0sys/kern/sched_4bsd.c
+1-0sys/kern/sched_shim.c
+87-795 files

HardenedBSD/src c384b35sys/kern sched_4bsd.c sched_ule.c, sys/sys sched.h

x86/local_apic.c: remove direct SCHED_ULE use

Move the code to decide on the timer accounting into the scheduler hook.
Since there were no inclusion of opt_sched.h, it is probably done
unconditionally anyway.

Reviewed by:    olce
Tested by:      pho
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D54831
DeltaFile
+22-0sys/kern/sched_4bsd.c
+1-14sys/x86/x86/local_apic.c
+7-0sys/kern/sched_ule.c
+3-0sys/sys/sched.h
+1-0sys/kern/sched_shim.c
+34-145 files

HardenedBSD/src 783b8a0sys/kern sched_4bsd.c sched_shim.c, sys/sys sched.h

kern/sched: deduplicate dtrace hook vars

Tested by:      pho
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D54831
DeltaFile
+0-6sys/kern/sched_4bsd.c
+6-0sys/kern/sched_shim.c
+0-6sys/kern/sched_ule.c
+6-0sys/sys/sched.h
+12-124 files

HardenedBSD/src 9409e86sys/kern sched_4bsd.c sched_shim.c, sys/sys sched.h

kern/sched: deduplicate sdt probes

Tested by:      pho
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D54831
DeltaFile
+0-18sys/kern/sched_4bsd.c
+18-0sys/kern/sched_shim.c
+0-18sys/kern/sched_ule.c
+11-0sys/sys/sched.h
+29-364 files

HardenedBSD/src 1322760sys/amd64/conf GENERIC, sys/conf NOTES

sys: enable both SCHED_ULE and SCHED_4BSD for some configs

Globally enable both schedulers for LINT.
Enable both schedulers for GENERIC on amd64.

Reviewed by:    olce
Tested by:      pho
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D54831
DeltaFile
+1-1sys/conf/NOTES
+1-0sys/amd64/conf/GENERIC
+2-12 files

HardenedBSD/src 5a6e0e3sys/kern sched_ule.c

sysctl kern.sched.ule.topology_spec: allow to run if ULE is not initialized

Reviewed by:    olce
Tested by:      pho
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D54831
DeltaFile
+2-1sys/kern/sched_ule.c
+2-11 files

HardenedBSD/src 1c4e16fsys/x86/x86 cpu_machdep.c

x86/cpu_machdep.c: unconditionally fence

For !SCHED_ULE, even if the fence is not needed, it is harmless.

Reviewed by:    olce
Tested by:      pho
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D54831
DeltaFile
+0-3sys/x86/x86/cpu_machdep.c
+0-31 files

HardenedBSD/src a84a39dsys/kern sched_shim.c sched_4bsd.c, sys/sys sched.h

kern/sched: move duplicate preemption stat vars into sched_shim.c

Tested by:      pho
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D54831
DeltaFile
+5-0sys/kern/sched_shim.c
+0-4sys/kern/sched_4bsd.c
+0-4sys/kern/sched_ule.c
+3-0sys/sys/sched.h
+8-84 files

HardenedBSD/src eb45493sys/kern sched_ule.c

sys: Move ULE sysctls under kern.sched.ule

Reviewed by:    olce
Tested by:      pho
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D54831
DeltaFile
+32-28sys/kern/sched_ule.c
+32-281 files

HardenedBSD/src ba8f429sys/kern sched_shim.c

kern/sched_shim.c: Add sysctl kern.sched.available

Reports all compiled-in schedulers.

Reviewed by:    olce
Tested by:      pho
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D54831
DeltaFile
+31-0sys/kern/sched_shim.c
+31-01 files

HardenedBSD/src 7efbfd6sys/kern sched_shim.c, sys/sys sched.h

kern/sched_shim.c: provide required SYSINIT hooks

Reviewed by:    olce
Tested by:      pho
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D54831
DeltaFile
+25-0sys/kern/sched_shim.c
+3-0sys/sys/sched.h
+28-02 files

HardenedBSD/src bab24f2sys/amd64/amd64 machdep.c, sys/arm/arm machdep.c

kern/sched_shim.c: Provide a scheduler selection machinery

Reviewed by:    olce
Tested by:      pho
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D54831
DeltaFile
+49-0sys/kern/sched_shim.c
+14-0sys/sys/sched.h
+3-0sys/arm/arm/machdep.c
+2-0sys/amd64/amd64/machdep.c
+2-0sys/powerpc/powerpc/machdep.c
+2-0sys/riscv/riscv/machdep.c
+72-02 files not shown
+74-08 files

HardenedBSD/src a556ec4sys/kern sched_ule.c sched_4bsd.c

kern/sched_{ule,4bsd}.c: cleanup headers

Reviewed by:    olce
Tested by:      pho
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D54831
DeltaFile
+0-2sys/kern/sched_ule.c
+0-2sys/kern/sched_4bsd.c
+0-42 files

HardenedBSD/src 8aa8289sys/kern sched_4bsd.c

sys: Move 4BSD sysctls under kern.sched.4bsd

Reviewed by:    olce
Tested by:      pho
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D54831
DeltaFile
+17-13sys/kern/sched_4bsd.c
+17-131 files

HardenedBSD/src b125c4dsys/kern sched_4bsd.c

sys: Make sched_4bsd a sched instance

Reviewed by:    olce
Tested by:      pho
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D54831
DeltaFile
+144-101sys/kern/sched_4bsd.c
+144-1011 files

HardenedBSD/src 0b474a4sys/sys sched.h

sys/sched.h: add SCHED_STAT_DECLARE()

Tested by:      pho
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D54831
DeltaFile
+5-0sys/sys/sched.h
+5-01 files