HardenedBSD/src b6b10e5sys/dev/acpica acpi_spmc.c, sys/dev/sym sym_hipd.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+618-0sys/dev/acpica/acpi_spmc.c
+152-154sys/dev/sym/sym_hipd.c
+295-0tests/sys/kern/pdwait.c
+187-0tests/sys/kern/pdrfork.c
+98-0tests/sys/kern/procdesc.c
+83-15sys/riscv/riscv/pmap.c
+1,433-16912 files not shown
+1,472-20018 files

HardenedBSD/src 70e54a6sys/dev/acpica acpi_spmc.c, sys/dev/sym sym_hipd.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+618-0sys/dev/acpica/acpi_spmc.c
+152-154sys/dev/sym/sym_hipd.c
+295-0tests/sys/kern/pdwait.c
+187-0tests/sys/kern/pdrfork.c
+83-15sys/riscv/riscv/pmap.c
+98-0tests/sys/kern/procdesc.c
+1,433-16911 files not shown
+1,470-20017 files

HardenedBSD/src dec2471lib/libiconv_modules/mapper_std citrus_mapper_std.c, usr.bin/mkimg mkimg.1 mkimg.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+34-20usr.bin/mkimg/mkimg.1
+3-0usr.bin/mkimg/mkimg.c
+1-1lib/libiconv_modules/mapper_std/citrus_mapper_std.c
+38-213 files

HardenedBSD/ports 29dcdbddatabases/couchdb3 pkg-plist, lang/elixir-devel pkg-plist

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+167-166databases/couchdb3/pkg-plist
+57-57textproc/groff/pkg-plist
+58-0x11-toolkits/py-wxpython/Makefile
+0-40x11-toolkits/py-wxPython4/Makefile
+19-19lang/elixir-devel/pkg-plist
+0-26sysutils/opensbi/files/patch-platform_generic_sifive_fu540.c
+301-30865 files not shown
+501-48271 files

HardenedBSD/ports 9283012x11-themes/qt6gtk2 Makefile distinfo

x11-themes/qt6gtk2: update: 0.6 -> 0.7

While I'm here, make portlint(1) happy.

ChangeLog:      https://www.opencode.net/trialuser/qt6gtk2/-/compare/0.6...0.7?from_project_id=5460
PR:             292734

Sponsored by:   tipi.work
DeltaFile
+7-8x11-themes/qt6gtk2/Makefile
+3-3x11-themes/qt6gtk2/distinfo
+10-112 files

HardenedBSD/ports 4888556filesystems/s3fs Makefile distinfo, filesystems/s3fs/files patch-src_s3fs.cpp

filesystems/s3fs: Update 1.95 => 1.97, take maintainership

Changelogs:
https://github.com/s3fs-fuse/s3fs-fuse/releases/tag/v1.96
https://github.com/s3fs-fuse/s3fs-fuse/releases/tag/v1.97

PR:     292722
DeltaFile
+10-0filesystems/s3fs/files/patch-src_s3fs.cpp
+5-5filesystems/s3fs/Makefile
+3-3filesystems/s3fs/distinfo
+18-83 files

HardenedBSD/ports fd20120cad/kicad-devel Makefile, comms/chirp Makefile

x11-toolkits/py-wxpython: bump consumer PORTREVISIONs after rename

Event: Winter Field Day 2026
DeltaFile
+1-1cad/kicad-devel/Makefile
+1-1multimedia/photofilmstrip/Makefile
+1-1comms/chirp/Makefile
+1-1comms/quisk/Makefile
+1-1databases/grass8/Makefile
+1-1emulators/playonbsd/Makefile
+6-63 files not shown
+9-89 files

HardenedBSD/ports b5e003cx11-toolkits/py-wxPython4 Makefile, x11-toolkits/py-wxPython4/files patch-build.py

x11-toolkits/py-wxpython: rename and update to 4.2.4

Changelog: https://www.wxpython.org/news/2025-10-28-wxpython-424-release/index.html

- now builds under USE_PYTHON=pep517
- future-proof for setuptools update
- sync dependencies
- expose test suite

Event: Winter Field Day 2026
DeltaFile
+58-0x11-toolkits/py-wxpython/Makefile
+0-40x11-toolkits/py-wxPython4/Makefile
+20-0x11-toolkits/py-wxpython/files/patch-pyproject.toml
+16-0x11-toolkits/py-wxpython/files/patch-setup.py
+11-0x11-toolkits/py-wxpython/files/patch-build.py
+0-11x11-toolkits/py-wxPython4/files/patch-build.py
+105-518 files not shown
+118-7214 files

HardenedBSD/ports 49da6f7ports-mgmt/pkg_replace distinfo Makefile

ports-mgmt/pkg_replace: Update 20260121 => 20260126

Changelog:
- Fix behavior of `pkg_replace -V`
- Improved execution speed using cache files `make -V FLAVORS`
- Cleanup code
- Update man page pkg_replace.1
https://github.com/kdeguchi/pkg_replace/releases/tag/20260126

PR:     292720
DeltaFile
+3-3ports-mgmt/pkg_replace/distinfo
+1-1ports-mgmt/pkg_replace/Makefile
+4-42 files

HardenedBSD/ports 9ee436csysutils/appjail distinfo Makefile

sysutils/appjail: Update to 4.8.0

ChangeLog: https://github.com/DtxdF/AppJail/releases/tag/v4.8.0
DeltaFile
+3-3sysutils/appjail/distinfo
+1-1sysutils/appjail/Makefile
+4-42 files

HardenedBSD/ports f6f7500sysutils/py-overlord distinfo Makefile

sysutils/py-overlord: Update to 0.22.1

ChangeLog: https://github.com/DtxdF/overlord/releases/tag/v0.22.1
DeltaFile
+3-3sysutils/py-overlord/distinfo
+1-1sysutils/py-overlord/Makefile
+4-42 files

HardenedBSD/ports 1080675sysutils/appjail-devel distinfo Makefile

sysutils/appjail-devel: Update to 4.8.0.20260126

ChangeLog:
https://github.com/DtxdF/AppJail/commits/2bc63026a1dfd9b71aadceb65cdeaef990611c1d/
DeltaFile
+3-3sysutils/appjail-devel/distinfo
+2-2sysutils/appjail-devel/Makefile
+5-52 files

HardenedBSD/ports 6b011cfdevel/py-ttkbootstrap distinfo Makefile

devel/py-ttkbootstrap: Update to 1.20.1

ChangeLog:      https://github.com/israel-dryer/ttkbootstrap/releases/tag/v1.20.1
Reported by:    Israel Dryer <notifications at github.com>
DeltaFile
+3-3devel/py-ttkbootstrap/distinfo
+1-1devel/py-ttkbootstrap/Makefile
+4-42 files

HardenedBSD/ports 066663bjava/openjfx14 Makefile

java/openjfx14: Fix build with ruby 3.4

/usr/local/lib/ruby/3.4/did_you_mean/core_ext/name_error.rb:11: warning: getoptlong is not part of the default gems starting from Ruby 3.4.0. Install getoptlong from RubyGems.
<internal:/usr/local/lib/ruby/3.4/rubygems/core_ext/kernel_require.rb>:136:in 'Kernel#require': cannot load such file -- getoptlong (LoadError)

PR:     292489
DeltaFile
+2-1java/openjfx14/Makefile
+2-11 files

HardenedBSD/ports 851eeb0textproc/py-urlscan distinfo Makefile

textproc/py-urlscan: Update to 1.0.8

ChangeLog:      https://github.com/firecat53/urlscan/releases/tag/1.0.8
Reported by:    "github-actions[bot]" <notifications at github.com>
DeltaFile
+3-3textproc/py-urlscan/distinfo
+1-1textproc/py-urlscan/Makefile
+4-42 files

HardenedBSD/src 97ee3aeusr.bin/mkimg mkimg.1 mkimg.c

mkimg(1): Sync mkimg(1) and usage() with the implementation

Reviewed by:    imp
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D54419

(cherry picked from commit 3aa8d5395c4223f1613f28d6f39904c2df4f92d4)
DeltaFile
+34-20usr.bin/mkimg/mkimg.1
+3-0usr.bin/mkimg/mkimg.c
+37-202 files

HardenedBSD/src 8934c3dtests/sys/netpfil/pf divert-to.sh

pf tests: Set require.kmods in divert-to tests

Tests should declare their dependencies rather than testing for them at
runtime.

Reviewed by:    igoro, kp, glebius
MFC after:      2 weeks
Sponsored by:   OPNsense
Sponsored by:   Klara, Inc.
Differential Revision:  https://reviews.freebsd.org/D54846
DeltaFile
+8-23tests/sys/netpfil/pf/divert-to.sh
+8-231 files

HardenedBSD/src 39878d2sys/netpfil/pf pf.c

pf: Rationalize the ip_divert_ptr test

If a rule has a divert port set, then we can reasonably predict that
ipdivert.ko is loaded, and in particular that ip_divert_ptr is set.

Moreover, in this case, if ipdivert.ko is not loaded we should just drop
the packet instead of ignoring the divert rule.

Reviewed by:    igoro, kp, glebius
MFC after:      2 weeks
Sponsored by:   OPNsense
Sponsored by:   Klara, Inc.
Differential Revision:  https://reviews.freebsd.org/D54845
DeltaFile
+10-5sys/netpfil/pf/pf.c
+10-51 files

HardenedBSD/ports 5510db9deskutils/py-vorta distinfo Makefile

deskutils/py-vorta: Update to 0.11.3

ChangeLog:      https://github.com/borgbase/vorta/releases/tag/v0.11.3
Reported by:    Manu <notifications at github.com>
DeltaFile
+3-3deskutils/py-vorta/distinfo
+1-1deskutils/py-vorta/Makefile
+4-42 files

HardenedBSD/src 49ec19fsys/dev/acpica acpivar.h

acpi: Add ACPI_SPMC debug layer define

Reported by:    des
Fixes:  c5daa5a4c32c ("acpi_spmc: Add system power management controller driver")
Sponsored by:   The FreeBSD Foundation
DeltaFile
+1-0sys/dev/acpica/acpivar.h
+1-01 files

HardenedBSD/ports 809adcbtextproc/groff pkg-plist Makefile, textproc/groff/files patch-Makefile.in patch-lib_math.in.h

textproc/groff: Improve port (non-functional changes)

- Replace PORTVERSION with DISTVERSION.
- Replace spaces with tab in PORTREVISION line.
- Replace RUN_DEPENDS:= with RUN_DEPENDS= - unnecessary ":".
- Remove GNU_CONFIGURE_MANPREFIX - this is default value.
- Refresh local patches.
- Sort plist.

PR:     292630
DeltaFile
+57-57textproc/groff/pkg-plist
+5-6textproc/groff/Makefile
+4-4textproc/groff/files/patch-Makefile.in
+2-2textproc/groff/files/patch-lib_math.in.h
+68-694 files

HardenedBSD/ports dfb777anet/tayga Makefile

net/tayga: Exclude from builds on i386

Reason: 64-bit time_t is required

Approved by:   db@, yuri@ (Mentors, implicit)
DeltaFile
+3-0net/tayga/Makefile
+3-01 files

HardenedBSD/src 0eb2c9dsys/compat/freebsd32 freebsd32.h

freebsd32: Fix includes

The previous commit added <sys/cdefs.h>, which isn't actually needed.
Conversely, <sys/event.h> is needed (and has been for a long time) but
was not included.

MFC after:      1 week
Fixes:          a11d132f6c62 ("devstat: Provide 32-bit compatibility")
Reported by:    gallatin@
DeltaFile
+1-1sys/compat/freebsd32/freebsd32.h
+1-11 files

HardenedBSD/src 972c488sys/riscv/include cpufunc.h, sys/riscv/vmm vmm_riscv.c

riscv: Add macro for hfence.gvma instruction

Add an inline function hfence_gvma() for hfence.gvma instruction.

Signed-off-by:  Doongar Singh <doonbsd at gmail.com>
Reviewed by:    mhorne, markj
Differential Revision:  https://reviews.freebsd.org/D54857
DeltaFile
+7-0sys/riscv/include/cpufunc.h
+1-1sys/riscv/vmm/vmm_riscv.c
+8-12 files

HardenedBSD/src 518c01bsys/dev/sym sym_hipd.c

sym(4): Provide a DEVICE_DETACH(9) method

This also fixes sym_cam_free() to tear things down correctly, i. e. in
opposite order of setup, as well as sym_cam_attach() to not free devq
and SIM twice in the failure case.
DeltaFile
+19-15sys/dev/sym/sym_hipd.c
+19-151 files

HardenedBSD/src e769bc7sys/dev/sym sym_hipd.c

sym(4): Employ memory barriers also on x86

In an MP world, it doesn't hold that x86 requires no memory barriers.

This change should also fix panics due to out-of-sync data seen with
FreeBSD VMs on top of OpenStack and HBAs of type lsiLogic. [1]

While at it:
- Improve the granularity somewhat by distinguishing between read and
  write memory barriers as well as refer to existing *mb(9) functions
  instead of duplicating these [2], unless IO barriers are also used.
- Nuke the unused SYM_DRIVER_NAME macro.

PR:             270816 [1]
Obtained from:  BSD-licensed Linux sym53c8xx driver [2]
MFC after:      1 week
DeltaFile
+14-26sys/dev/sym/sym_hipd.c
+14-261 files

HardenedBSD/src c8e9479sys/dev/sym sym_hipd.c

sym(4): Use memcpy(9) instead of bcopy(9)

The overlap handling of bcopy(9) is not required in these cases.

Obtained from:  BSD-licensed Linux sym53c8xx driver
DeltaFile
+5-5sys/dev/sym/sym_hipd.c
+5-51 files

HardenedBSD/src 48eee74sys/dev/sym sym_hipd.c

sym(4): Consistently use device_printf(9) where applicable
DeltaFile
+114-108sys/dev/sym/sym_hipd.c
+114-1081 files

HardenedBSD/src 14dc55clib/libiconv_modules/mapper_std citrus_mapper_std.c

libiconv: Fix typo in comment

(cherry picked from commit dec3ea45b65442b4f3cafcd8a672f1e13b69a066)
DeltaFile
+1-1lib/libiconv_modules/mapper_std/citrus_mapper_std.c
+1-11 files

HardenedBSD/ports 51e7a8amath/octave-forge Makefile

math/octave-forge: Default math/octave-forge-llms to ON.

- bump portrevision.
DeltaFile
+2-1math/octave-forge/Makefile
+2-11 files