HardenedBSD/src aeac50frelease/tools vmimage.subr, sbin/newfs newfs.8

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+14-13share/man/man4/acpi.4
+13-4sbin/tunefs/tunefs.c
+10-4sbin/newfs/newfs.8
+3-7sys/dev/acpica/acpi_spmc.c
+6-2sbin/tunefs/tunefs.8
+0-7release/tools/vmimage.subr
+46-3716 files not shown
+96-6322 files

HardenedBSD/ports fe78dd3finance/hs-hledger distinfo Makefile.cabal, textproc/hs-pandoc-crossref distinfo Makefile.cabal

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+175-173textproc/hs-pandoc-crossref/distinfo
+141-129finance/hs-hledger/distinfo
+178-0textproc/hs-pandoc-crossref/Makefile.cabal
+1-176textproc/hs-pandoc-crossref/Makefile
+169-0finance/hs-hledger/Makefile.cabal
+1-164finance/hs-hledger/Makefile
+665-64233 files not shown
+992-79239 files

HardenedBSD/ports 4a7c793security/lego distinfo Makefile

security/lego: Update 4.32.0 => 4.33.0

Changelog:
https://github.com/go-acme/lego/blob/v4.33.0/CHANGELOG.md

PR:     293965
DeltaFile
+5-5security/lego/distinfo
+1-2security/lego/Makefile
+6-72 files

HardenedBSD/ports eda998fsecurity/lime Makefile

security/lime: Bump after databases/soci update
DeltaFile
+1-0security/lime/Makefile
+1-01 files

HardenedBSD/ports 651ad34devel/RStudio Makefile

devel/RStudio: Bump after databases/soci update
DeltaFile
+1-1devel/RStudio/Makefile
+1-11 files

HardenedBSD/ports 566fcf2databases/soci pkg-plist Makefile, databases/soci/files patch-cmake_modules_FindMySQL.cmake patch-tests_catch.hpp

databases/soci: Update to 4.1.2

Changelog: https://github.com/SOCI/soci/blob/master/RELEASING.md
DeltaFile
+41-28databases/soci/pkg-plist
+6-9databases/soci/Makefile
+0-14databases/soci/files/patch-cmake_modules_FindMySQL.cmake
+0-11databases/soci/files/patch-tests_catch.hpp
+10-0databases/soci/files/patch-tests_common_CMakeLists.txt
+0-8databases/soci/files/pkg-message.in
+57-701 files not shown
+60-737 files

HardenedBSD/ports c731008net/liblinphone Makefile, net/liblinphone/files patch-src_db_main-db.cpp

net/liblinphone: Bump after databases/soci update
DeltaFile
+55-0net/liblinphone/files/patch-src_db_main-db.cpp
+1-0net/liblinphone/Makefile
+56-02 files

HardenedBSD/ports e40f7aemath/R-cran-forecast distinfo Makefile

math/R-cran-forecast: Update to 9.0.2

Reported by:    portscout
DeltaFile
+3-3math/R-cran-forecast/distinfo
+1-1math/R-cran-forecast/Makefile
+4-42 files

HardenedBSD/src 1ba2961sys/x86/include frame.h

amd64: revert back struct trapframe to the pre-FRED definition

Trying to use the grown struct trapframe for IDT case broke in cases
where code supposed that hardware consumed sizeof(struct trapframe) of
the stack space when delivering interrupt or exception.  In particular,
this was broken for #NM/#DB/#MC.  Naive attempt of using IDT-trapframe
size for stack consumption caused later problems with larger C type.

Instead of pretending that IDT event delivery pushed two never-accessed
doubleword to the stack, keep it honest and provide separate type for
the FRED interrupt frame, i.e. struct trapframe_fred.

Convert between trapframe_fred and trapframe can be done by trivial pointer
arithmetic.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
DeltaFile
+4-0sys/x86/include/frame.h
+4-01 files

HardenedBSD/ports 9070f78emulators/wine-devel/files wine-wow64.sh

emulators/wine-devel: Improve messages around WoW

Sync with emulators/wine where commit 942473af4d improved a number of
messages (and comments) around WoW, i.e. 32-bit support on amd64.

PR:             293073, 291328
Approved by:    Thibault Payet <monwarez at mailoo.org> (maintainer)
DeltaFile
+6-6emulators/wine-devel/files/wine-wow64.sh
+6-61 files

HardenedBSD/ports e89149enet/traefik distinfo Makefile

net/traefik: Update to upstream release 3.6.11

Details:
- Bugfix release, see
  https://github.com/traefik/traefik/releases/tag/v3.6.11
- Includes security fixes for several vulnerabilities.
  CVE-2026-32595 (BasicAuth Middleware Timing Attack)
  CVE-2026-32305 (Potential mTLS Bypass via Fragmented TLS ClientHello)
  CVE-2026-32695 (Details not yet available)

MFH:            2026Q1
Security:       CVE-2026-32595
                CVE-2026-32305
                CVE-2026-32695
DeltaFile
+3-3net/traefik/distinfo
+1-1net/traefik/Makefile
+4-42 files

HardenedBSD/ports ce82e4cemulators/wine-devel pkg-plist distinfo

emulators/wine-devel: Update 11.4 => 11.5

Changelog:
- C++ support in the build system.
- Bundled ICU libraries.
- A number of VBScript compatibility fixes.
- Various bug fixes.
https://gitlab.winehq.org/wine/wine/-/releases/wine-11.5

PR:     293958
DeltaFile
+137-0emulators/wine-devel/pkg-plist
+3-3emulators/wine-devel/distinfo
+1-1emulators/wine-devel/Makefile
+141-43 files

HardenedBSD/src 1d18872sys/compat/linuxkpi/common/include/linux hardirq.h highmem.h

LinuxKPI: add supporting #includes

Compiling drm-kmod on !X86 does not include asm/smp.h which includes
preempt.h on FreeBSD.  In order to compile drm-kmod on other
architectures add the secondary #includes for preempt.h to
spinlock.h and hardirq.h (which now also gets included from highmem.h)
to connect the #include chain.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
PR:             279864
Reviewed by:    jhibbits, emaste
Differential Revision: https://reviews.freebsd.org/D55974
DeltaFile
+1-0sys/compat/linuxkpi/common/include/linux/hardirq.h
+1-0sys/compat/linuxkpi/common/include/linux/highmem.h
+1-0sys/compat/linuxkpi/common/include/linux/spinlock.h
+3-03 files

HardenedBSD/src 2ce06d2sys/kern subr_sbuf.c

sbuf: make assertion message a lot more useable

Saying that we are called with an (un)finished or corrupted sbuf
is like saying "error" (though [un]finished is an extra hint).

Add the pointer to the sbuf so one could easily check it,
add the flags we are checking so one could see quickly about
a possible state mismatch.

Given we already dereference the pointer in the KASSERT there is no
extra harm adding it to the message.

Found while:    testing lindebugfs changes
Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
Reviewed by:    jhb
Differential Revision: https://reviews.freebsd.org/D55919
DeltaFile
+2-2sys/kern/subr_sbuf.c
+2-21 files

HardenedBSD/ports 43bbbd6finance/hs-hledger distinfo Makefile.cabal

finance/hs-hledger: Update 1.51.1 => 1.52

Approved by:            yuri@ (maintainer, Mentor)
Approved by:            db@, yuri@ (Mentors, implicit)
Differential Revision:  https://reviews.freebsd.org/D56020
DeltaFile
+141-129finance/hs-hledger/distinfo
+169-0finance/hs-hledger/Makefile.cabal
+1-164finance/hs-hledger/Makefile
+311-2933 files

HardenedBSD/ports 41364f2textproc/hs-pandoc-crossref distinfo Makefile.cabal

textproc/hs-pandoc-crossref: 0.3.22 => 0.3.23

Approved by:            haskell@ (alven@)
Approved by:            db@, yuri@ (Mentors, implicit)
DeltaFile
+175-173textproc/hs-pandoc-crossref/distinfo
+178-0textproc/hs-pandoc-crossref/Makefile.cabal
+1-176textproc/hs-pandoc-crossref/Makefile
+354-3493 files

HardenedBSD/ports f98bdb0math/ess Makefile distinfo

math/ess: Update to 26.01.0

ESS[BUGS] is still relevant due to NIMBLE keeping the language alive.
However, only syntax highlighting and key-presses will be supported
moving forward. For example, the < key now generates <- rather than
the former = since equals is a valid character in NIMBLE BUGS.

Reported by:    Repology
DeltaFile
+5-6math/ess/Makefile
+3-3math/ess/distinfo
+8-92 files

HardenedBSD/ports 21ed0admisc/py-diffusers Makefile distinfo

misc/py-diffusers: update 0.35.1 → 0.37.0
DeltaFile
+3-3misc/py-diffusers/Makefile
+3-3misc/py-diffusers/distinfo
+6-62 files

HardenedBSD/ports 37bcacfmath/eigen5 distinfo Makefile

math/eigen5: Remove GL_TAGNAME

This didn't work iin GitLab a long time ago, GL_TAGNAME
was mandatory, amd the latent memory of this caused me
to add GL_TAGNAME.

Reported by:    Gleb Popov <arrowd at freebsd.org>
DeltaFile
+3-3math/eigen5/distinfo
+0-1math/eigen5/Makefile
+3-42 files

HardenedBSD/ports 96ae17dtextproc/py-sentencepiece distinfo Makefile

textproc/py-sentencepiece: update 0.2.0 → 0.2.1
DeltaFile
+3-3textproc/py-sentencepiece/distinfo
+1-2textproc/py-sentencepiece/Makefile
+4-52 files

HardenedBSD/ports cb58befdeskutils/nextcloudclient distinfo Makefile

deskutils/nextcloudclient: Update to 4.0.8
DeltaFile
+3-3deskutils/nextcloudclient/distinfo
+1-1deskutils/nextcloudclient/Makefile
+4-42 files

HardenedBSD/src 26c8032release/tools ec2-small.conf ec2-builder.conf

HBSD: Resolve merge conflicts

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+1-5release/tools/ec2-small.conf
+1-5release/tools/ec2-builder.conf
+2-102 files

HardenedBSD/src 8d2f794release/tools vmimage.subr, sbin/newfs newfs.8

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

Conflicts:
        release/tools/ec2-builder.conf (unresolved)
        release/tools/ec2-small.conf (unresolved)
DeltaFile
+14-13share/man/man4/acpi.4
+13-4sbin/tunefs/tunefs.c
+10-4sbin/newfs/newfs.8
+3-7sys/dev/acpica/acpi_spmc.c
+6-2sbin/tunefs/tunefs.8
+0-7release/tools/vmimage.subr
+46-3716 files not shown
+104-6322 files

HardenedBSD/ports 2d44f14ports-mgmt/hs-panopticum distinfo Makefile

ports-mgmt/hs-panopticum: Update to 2.0.2.0

PR:             293947
DeltaFile
+15-15ports-mgmt/hs-panopticum/distinfo
+8-8ports-mgmt/hs-panopticum/Makefile
+23-232 files

HardenedBSD/ports 5f22e45databases/dlmdb/files patch-Makefile, lang/prql distinfo Makefile

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+608-0math/eigen5/pkg-plist
+335-255lang/prql/distinfo
+205-135security/pdfrip/distinfo
+168-128lang/prql/Makefile
+101-66security/pdfrip/Makefile.crates
+98-0databases/dlmdb/files/patch-Makefile
+1,515-58487 files not shown
+1,901-86193 files

HardenedBSD/ports fef24c8misc/quantum++ Makefile distinfo

misc/quantum++: update 7.0.0 → 7.0.1

Reported by:    portscout
DeltaFile
+5-4misc/quantum++/Makefile
+3-3misc/quantum++/distinfo
+8-72 files

HardenedBSD/ports 5fcbceamisc/py-comfyui-workflow-templates-media-video distinfo Makefile

misc/py-comfyui-workflow-templates-media-video: update 0.3.62 → 0.3.63
DeltaFile
+3-3misc/py-comfyui-workflow-templates-media-video/distinfo
+1-1misc/py-comfyui-workflow-templates-media-video/Makefile
+4-42 files

HardenedBSD/ports b15d428misc/comfyui Makefile pkg-plist

misc/comfyui: update 0.17.2 → 0.18.0
DeltaFile
+4-4misc/comfyui/Makefile
+8-0misc/comfyui/pkg-plist
+3-3misc/comfyui/distinfo
+15-73 files

HardenedBSD/ports 6480a07graphics/py-kornia distinfo Makefile

graphics/py-kornia: update 0.7.4 → 0.8.2

Reported by:    portscout
DeltaFile
+3-3graphics/py-kornia/distinfo
+2-2graphics/py-kornia/Makefile
+5-52 files

HardenedBSD/ports a1935cbmisc/py-comfyui-workflow-templates-core distinfo Makefile

misc/py-comfyui-workflow-templates-core: update 0.3.173 → 0.3.175
DeltaFile
+3-3misc/py-comfyui-workflow-templates-core/distinfo
+1-1misc/py-comfyui-workflow-templates-core/Makefile
+4-42 files