HardenedBSD/src f2a6282sys/dev/mlx5/mlx5_accel mlx5_ipsec.c, sys/fs/nullfs null_vfsops.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+32-20sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c
+28-6sys/netipsec/ipsec_offload.c
+4-10sys/fs/nullfs/null_vfsops.c
+5-2sys/netinet/tcp_input.c
+4-1sys/netinet/tcp_stacks/rack.c
+4-1sys/netinet/tcp_timewait.c
+77-406 files not shown
+91-4512 files

HardenedBSD/src 492bc06sys/dev/mlx5/mlx5_accel mlx5_ipsec.c, sys/fs/nullfs null_vfsops.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+32-20sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c
+28-6sys/netipsec/ipsec_offload.c
+4-10sys/fs/nullfs/null_vfsops.c
+5-2sys/netinet/tcp_input.c
+4-1sys/netinet/tcp_stacks/rack.c
+4-1sys/netinet/tcp_timewait.c
+77-406 files not shown
+91-4512 files

HardenedBSD/src f90a1e4sys/netpfil/pf pf.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+3-1sys/netpfil/pf/pf.c
+3-11 files

HardenedBSD/ports 3b1389ddevel/libwasmtime distinfo Makefile.cargo, mail/mailpit/files patch-package-lock.json

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+501-325textproc/feluda/distinfo
+249-161textproc/feluda/Makefile.crates
+67-63devel/libwasmtime/distinfo
+52-64mail/mailpit/files/patch-package-lock.json
+30-28devel/libwasmtime/Makefile.cargo
+34-0security/vuxml/vuln/2026.xml
+933-64172 files not shown
+1,178-82578 files

HardenedBSD/ports 447112ftextproc/termshot Makefile distinfo

textproc/termshot: Update to 0.6.1

- Take maintainership

ChangeLog:      https://github.com/homeport/termshot/releases/tag/v0.6.1
MFH:            2026Q1
DeltaFile
+4-6textproc/termshot/Makefile
+5-5textproc/termshot/distinfo
+9-112 files

HardenedBSD/ports c2638aemath/R-cran-scatterplot3d distinfo Makefile

math/R-cran-scatterplot3d: Update to 0.3-45

ChangeLog: https://github.com/cran/scatterplot3d/compare/0.3-44...0.3-45
DeltaFile
+3-3math/R-cran-scatterplot3d/distinfo
+1-1math/R-cran-scatterplot3d/Makefile
+4-42 files

HardenedBSD/ports 6abb2bbx11/showmethekey distinfo Makefile

x11/showmethekey: Update to 1.20.0

ChangeLog: https://github.com/AlynxZhou/showmethekey/releases/tag/v1.20.0
DeltaFile
+3-3x11/showmethekey/distinfo
+3-2x11/showmethekey/Makefile
+6-52 files

HardenedBSD/ports 87221e7www/waterfox distinfo Makefile

www/waterfox: Update 6.6.8 => 6.6.9

Release Notes:
https://www.waterfox.com/releases/6.6.9/

PR:     293442
MFH:    2026Q1
DeltaFile
+5-5www/waterfox/distinfo
+2-3www/waterfox/Makefile
+7-82 files

HardenedBSD/ports 4972495security/modsecurity3 Makefile, security/modsecurity3-nginx distinfo Makefile

security/(modsecurity3|modsecurity-nginx) : switch to PCRE2 and fix NGINX version

Change PCRE to PCRE2.
Update NGINX version to 1.28.2.

PR:     293279
Sponsored by:   Netzkommune GmbH
DeltaFile
+5-5security/modsecurity3-nginx/distinfo
+6-3security/modsecurity3-nginx/Makefile
+3-3security/modsecurity3/Makefile
+14-113 files

HardenedBSD/ports 401502edevel/janet-lsp Makefile distinfo, devel/janet-lsp/files patch-src_main.janet janet-lsp.in

devel/janet-lsp: Update to 0.0.12

Differential Revision: https://reviews.freebsd.org/D54667
DeltaFile
+8-11devel/janet-lsp/Makefile
+5-5devel/janet-lsp/distinfo
+1-1devel/janet-lsp/files/patch-src_main.janet
+0-1devel/janet-lsp/files/janet-lsp.in
+14-184 files

HardenedBSD/ports 764699cmail/mailpit distinfo Makefile, mail/mailpit/files patch-package-lock.json patch-package.json

mail/mailpit: Update to 1.29.2

MFH:            2026Q1
Security:       fe6209a3-126c-11f1-8a62-0897988a1c07
DeltaFile
+52-64mail/mailpit/files/patch-package-lock.json
+7-7mail/mailpit/distinfo
+2-2mail/mailpit/files/patch-package.json
+1-1mail/mailpit/Makefile
+62-744 files

HardenedBSD/src 87ca74dsys/dev/mlx5/mlx5_accel mlx5_ipsec.c

mlx5: convert GET_TRUNK_IF() to function

Reviewed by:    slavash
Tested by:      Wafa Hamzah <wafah at nvidia.com>
Sponsored by:   Nvidia networking
MFC after:      1 week
DeltaFile
+18-15sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c
+18-151 files

HardenedBSD/src de29fd0sys/dev/mlx5/mlx5_accel mlx5_ipsec.c ipsec.h, sys/dev/mlx5/mlx5_en mlx5_en_main.c

mlx5: report IPSEC offload capabilities whenever IPSEC_OFFLOAD is configured

Do it always for bootverbose if offload was enabled in the kernel
config, not only if the device actually supports all required
capabilities to do the offload. Otherwise, having the code to print the
caps is pointless.

Reviewed by:    slavash
Tested by:      Wafa Hamzah <wafah at nvidia.com>
Sponsored by:   NVidia networking
MFC after:      1 week
DeltaFile
+14-5sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c
+3-0sys/dev/mlx5/mlx5_en/mlx5_en_main.c
+1-0sys/dev/mlx5/mlx5_accel/ipsec.h
+18-53 files

HardenedBSD/src 0e5caacsys/netipsec ipsec_offload.c

ipsec_offload: add comment stating why ipsec_accel_sa_newkey_cb() returns 0

Reviewed by:    slavash
Tested by:      Wafa Hamzah <wafah at nvidia.com>
Sponsored by:   NVidia networking
MFC after:      1 week
DeltaFile
+7-0sys/netipsec/ipsec_offload.c
+7-01 files

HardenedBSD/src 477f020sys/netipsec ipsec_offload.c

netipsec/ipsec_offload.c: handle failures to install SA nicely

If driver refused to install SA, record rejected handle for SA on the
interface always, not only for EOPNOTSUPP case.  The
ipsec_accel_output() function did the right thing if there is no
rejection handle, but not having the handle allows further attempts to
install the SA on the interface.

If driver installed the SA, but ipsec_accel_handle_sav() returned error,
uninstall the SA from the interface.  Hardware must not be set up to
process packets for which kernel expects no processing is done.

In both cases, free the drv_spi if a handle was not installed.  But keep
drv_spi allocated if the deinstall returned an error from the driver.

Reviewed by:    slavash
Tested by:      Wafa Hamzah <wafah at nvidia.com>
Sponsored by:   NVidia networking
MFC after:      1 week
DeltaFile
+21-6sys/netipsec/ipsec_offload.c
+21-61 files

HardenedBSD/ports 7c47861security/vuxml/vuln 2026.xml

security/vuxml: Document new mail/mailpit vulnerability
DeltaFile
+34-0security/vuxml/vuln/2026.xml
+34-01 files

HardenedBSD/ports 2440eb3devel/libwasmtime distinfo Makefile.cargo

devel/libwasmtime: update 41.0.3 -> 42.0.0

ChangeLog:      https://github.com/bytecodealliance/wasmtime/compare/v41.0.3...v42.0.0

Sponsored by:   tipi.work
DeltaFile
+67-63devel/libwasmtime/distinfo
+30-28devel/libwasmtime/Makefile.cargo
+3-3devel/libwasmtime/Makefile
+1-1devel/libwasmtime/pkg-plist
+101-954 files

HardenedBSD/ports 01565f5www/fmd-server Makefile

www/fmd-server: fix CATEGORIES
DeltaFile
+1-1www/fmd-server/Makefile
+1-11 files

HardenedBSD/ports e2899bblang/luajit Makefile distinfo

lang/luajit: update to the recent snapshot

Sponsored by:   tipi.work
DeltaFile
+3-3lang/luajit/Makefile
+3-3lang/luajit/distinfo
+6-62 files

HardenedBSD/ports e0214d4textproc/feluda distinfo Makefile.crates, textproc/feluda/files patch-Cargo.toml patch-Cargo.lock

textproc/feluda: Update 1.11.0 => 1.11.1

Changelog:
https://github.com/anistark/feluda/releases/tag/v1.11.1

Reviewed by:    osa, vvd (mentors)
Approved by:    osa (mentor)
Differential Revision: https://reviews.freebsd.org/D55510
DeltaFile
+501-325textproc/feluda/distinfo
+249-161textproc/feluda/Makefile.crates
+10-10textproc/feluda/files/patch-Cargo.toml
+7-7textproc/feluda/files/patch-Cargo.lock
+2-3textproc/feluda/Makefile
+769-5065 files

HardenedBSD/ports abd8416lang/jpm Makefile distinfo

lang/jpm: Update to 1.2.0 and enable testing

Approved By: Christopher Hall <bsd.hsw at gmail.com> (maintainer)
Differential Revision: https://reviews.freebsd.org/D55396
DeltaFile
+7-3lang/jpm/Makefile
+3-3lang/jpm/distinfo
+1-0lang/jpm/pkg-plist
+11-63 files

HardenedBSD/ports 77dd550security Makefile

security/gnupg25: Connect to build

PR:             291995
Approved by:    portmgr (blanket - fix port)
Fixes:          d58f02417501 (new port 2.5.17, latest upstream)
DeltaFile
+1-0security/Makefile
+1-01 files

HardenedBSD/ports f6c9dbdtextproc/py-pymdown-extensions distinfo Makefile

textproc/py-pymdown-extensions: Update to 10.21

Changelog:

https://github.com/facelessuser/pymdown-extensions/releases/tag/10.21
DeltaFile
+3-3textproc/py-pymdown-extensions/distinfo
+1-1textproc/py-pymdown-extensions/Makefile
+4-42 files

HardenedBSD/ports 8482a85www/py-drf-yasg distinfo Makefile

www/py-drf-yasg: Update to 1.21.15

Changelog:

https://github.com/axnsan12/drf-yasg/releases/tag/1.21.15
DeltaFile
+3-3www/py-drf-yasg/distinfo
+1-1www/py-drf-yasg/Makefile
+4-42 files

HardenedBSD/ports 4cc6370www/py-django-tree-queries distinfo Makefile

www/py-django-tree-queries: Update to 0.23.1

Changelog:

https://github.com/feincms/django-tree-queries/blob/0.23.1/CHANGELOG.rst
DeltaFile
+3-3www/py-django-tree-queries/distinfo
+1-1www/py-django-tree-queries/Makefile
+4-42 files

HardenedBSD/ports 350d216textproc/py-mkdocs-material distinfo Makefile

textproc/py-mkdocs-material: Update to 9.7.3

Changelog:

https://github.com/squidfunk/mkdocs-material/releases/tag/9.7.3
DeltaFile
+3-3textproc/py-mkdocs-material/distinfo
+1-1textproc/py-mkdocs-material/Makefile
+4-42 files

HardenedBSD/ports f59ddaadevel/py-inline-snapshot Makefile distinfo

devel/py-inline-snapshot: Update to 0.32.3

* Update testsuite while I'm here.

Changelog since 0.31.0:

https://github.com/15r10nk/inline-snapshot/blob/0.32.3/CHANGELOG.md
DeltaFile
+5-5devel/py-inline-snapshot/Makefile
+3-3devel/py-inline-snapshot/distinfo
+8-82 files

HardenedBSD/ports 3ac123cnet/asterisk20 Makefile distinfo, net/asterisk20/files extra-patch-addons_mp3_interface.c

net/asterisk20: Add MP3 Decoder Code for Format_MP3 support

Format_MP3, used to play MP3 encoded voicemail and music on hold, relies
on decoder library files that are not included in the main Asterisk
distribution.

PR:             292715
Tested by:      Marek Zarychta <zarychtam at plan-b.pwste.edu.pl>
Approved by:    Oleksandr Kryvulia <o.kryvulia at flex-it.com.ua>
Co-authored-by: Justin T. Gibbs <gibbs at FreeBSD.org>
DeltaFile
+13-1net/asterisk20/Makefile
+8-0net/asterisk20/files/extra-patch-addons_mp3_interface.c
+3-1net/asterisk20/distinfo
+24-23 files

HardenedBSD/ports b2ad1b8lang/janet distinfo Makefile

lang/janet: update to 1.41.2

Differential Revision: https://reviews.freebsd.org/D55500
DeltaFile
+3-3lang/janet/distinfo
+1-1lang/janet/Makefile
+4-42 files

HardenedBSD/src 8b64d46sys/fs/nullfs null_vfsops.c

nullfs: Fix handling of doomed vnodes in nullfs_unlink_lowervp()

nullfs_unlink_lowervp() is called with the lower vnode locked, so the
nullfs vnode is locked too.  The following can occur:
1. the vunref() call decrements the usecount 2->1,
2. a different thread calls vrele() on the vnode, decrements the
   usecount 0->1, then blocks on the vnode lock,
3. the first thread tests vp->v_usecount == 0 and observes that it is
   true,
4. the first thread incorrectly unlocks the lower vnode.

Fix this by testing VN_IS_DOOMED directly.  Since
nullfs_unlink_lowervp() holds the vnode lock, the value of the
VIRF_DOOMED flag is stable.

Thanks to leres@ for patiently helping to track this down.

PR:             288345
MFC after:      1 week

    [2 lines not shown]
DeltaFile
+4-10sys/fs/nullfs/null_vfsops.c
+4-101 files