HardenedBSD/ports 0e107fdports-mgmt/pkg distinfo

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-6ports-mgmt/pkg/distinfo
+0-61 files

HardenedBSD/ports df8ccddirc/halloy distinfo Makefile.crates, security/cargo-audit distinfo Makefile.crates

Merge remote-tracking branch 'internal/freebsd/main' into hardenedbsd/main

Conflicts:
        ports-mgmt/pkg/distinfo (unresolved)
DeltaFile
+713-697irc/halloy/distinfo
+695-615sysutils/topgrade/distinfo
+415-393security/cargo-audit/distinfo
+355-347irc/halloy/Makefile.crates
+346-306sysutils/topgrade/Makefile.crates
+206-195security/cargo-audit/Makefile.crates
+2,730-2,553177 files not shown
+4,940-4,214183 files

HardenedBSD/ports 58dce87ports-mgmt/pkg distinfo Makefile

HBSD: Resolve merge conflict

Bring our ports-mgmt/pkg to 2.6.1.

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+3-9ports-mgmt/pkg/distinfo
+2-7ports-mgmt/pkg/Makefile
+5-162 files

HardenedBSD/src 7f0dd0dshare/man/man5 src.conf.5, sys/cam/nvme nvme_da.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+182-39sys/dev/virtio/block/virtio_blk.c
+189-27sys/dev/virtio/virtqueue.c
+103-35sys/cam/nvme/nvme_da.c
+20-7sys/dev/virtio/virtio_ring.h
+8-6tools/test/hwpmc/pmctest.py
+8-5share/man/man5/src.conf.5
+510-1195 files not shown
+516-13311 files

HardenedBSD/src a6e7a0eshare/man/man5 src.conf.5, sys/cam/nvme nvme_da.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+182-39sys/dev/virtio/block/virtio_blk.c
+189-27sys/dev/virtio/virtqueue.c
+103-35sys/cam/nvme/nvme_da.c
+20-7sys/dev/virtio/virtio_ring.h
+8-6tools/test/hwpmc/pmctest.py
+8-5share/man/man5/src.conf.5
+510-1195 files not shown
+516-13311 files

HardenedBSD/ports d13a9efsecurity/netbird distinfo Makefile

security/netbird: Update 0.65.0 => 0.66.1

Changelogs:
https://github.com/netbirdio/netbird/releases/tag/v0.65.1
https://github.com/netbirdio/netbird/releases/tag/v0.65.2
https://github.com/netbirdio/netbird/releases/tag/v0.65.3
https://github.com/netbirdio/netbird/releases/tag/v0.66.0
https://github.com/netbirdio/netbird/releases/tag/v0.66.1

Commit log:
https://github.com/netbirdio/netbird/compare/v0.65.0...v0.66.1

PR:     293562
MFH:    2026Q1
DeltaFile
+5-5security/netbird/distinfo
+1-1security/netbird/Makefile
+6-62 files

HardenedBSD/ports 890ee03lang/python-doc-html distinfo

lang/python-doc-html: regen for 3.10.20, 3.11.15, 3.12.13
DeltaFile
+13-13lang/python-doc-html/distinfo
+13-131 files

HardenedBSD/ports f614f49lang/python311 distinfo Makefile

lang/python311: update to 3.11.15

Changelog: https://docs.python.org/release/3.11.15/whatsnew/changelog.html
DeltaFile
+3-17lang/python311/distinfo
+0-8lang/python311/Makefile
+1-1lang/python311/Makefile.version
+4-263 files

HardenedBSD/src 824530asys/cam/nvme nvme_da.c

nda: Assume all cases in ndaasync can sleep

The error recovery is nicer if we can wait for the tiny memory we need
to send the messages when the physpath changes. Since we've moved the
async handler into a sleepable context, we can wait for the allocation
to complete since async events are rare enough and it's not an
indefinite wait.

Also add a comment about the scope of AC_ADVINFO_CHANGED for nvme
drives. We could use it for broadcasting INDENTIFY changes in nvme
drives. However, the underlying mechanisms in NVMe don't really allow
for that (they are more fine-grained). So for namespace changes, for
example, we'll send AC_GETDEV_CHANGED instead of a AC_ADVINFO_CHANGED.

Sponsored by:           Netflix
Differential Revision:  https://reviews.freebsd.org/D55523
DeltaFile
+9-1sys/cam/nvme/nvme_da.c
+9-11 files

HardenedBSD/src 244ae85sys/dev/nvme nvme_sim.c

nvme_sim: Fix a cut and paste error

Fix the error message in nvme_sim_ns_removed that was cut and pasted
from nvme_sim_ns_changed to reflect its new home.  No functional change.

Sponsored by:           Netflix
Differential Revision:  https://reviews.freebsd.org/D55522
DeltaFile
+1-1sys/dev/nvme/nvme_sim.c
+1-11 files

HardenedBSD/src 628d7a3sys/cam/nvme nvme_da.c

nda: AC_GETDEV_CHANGED calls media chanaged for sectorsize change

When the sector size changes, we assume it's new media. When the
mediasize changes, we'll just resize the disk (we get called for both
events). When neither have changed, don't call either.

Some NVMe drives (but not all) post a async event on page 4 with the
sector size changes via a FORMAT command. We'll notice the new media
right away, rather than the next device open. As a practical effect,
this just means that certain geom operations will see it sooner. Since
most drive interaction goes through open, that will catch those drives
that do not post this event well enough.

Sponsored by:           Netflix
Differential Revision:  https://reviews.freebsd.org/D55521
DeltaFile
+14-8sys/cam/nvme/nvme_da.c
+14-81 files

HardenedBSD/src 5c2186bsys/cam/nvme nvme_da.c

nda: Rescan the drive on open

SCSI and ATA drives rescan the drive on opens to catch changes to the
disk. We do it here to so we catch if a drive has been FORMATed or
SANITIZEd with different parameters. We don't use xpt_rescan() since we
don't want to interfere with boot or keep all busses locked (this rescan
won't change the bus, so we don't need the CAM topo lock).

Sponsored by:           Netflix
Differential Revision:  https://reviews.freebsd.org/D55520
DeltaFile
+47-2sys/cam/nvme/nvme_da.c
+47-21 files

HardenedBSD/src b1bd7fesys/cam/nvme nvme_da.c

nda: Move ndasetgeom

Move ndasetgeom up in the file. We'll need it here for future
commits. Also, preserve the UNMAPPED_BIO flag since we can't observe
enough data from this routine to set it directly.

Sponsored by:           Netflix
Differential Revision:  https://reviews.freebsd.org/D55519
DeltaFile
+33-24sys/cam/nvme/nvme_da.c
+33-241 files

HardenedBSD/src 3212aa8sys/cam/nvme nvme_xpt.c

nvme xpt: convert restart to a bool.

restart is a boolean. While I'm here, convert to a bool.

Sponsored by:           Netflix
Differential Revision:  https://reviews.freebsd.org/D55518
DeltaFile
+4-4sys/cam/nvme/nvme_xpt.c
+4-41 files

HardenedBSD/ports 470e01dlang/python312 distinfo Makefile

lang/python312: update to 3.12.13

Changelog: https://docs.python.org/release/3.12.13/whatsnew/changelog.html#python-3-12-13
DeltaFile
+3-19lang/python312/distinfo
+0-9lang/python312/Makefile
+1-1lang/python312/Makefile.version
+4-293 files

HardenedBSD/ports 3dc225airc/halloy distinfo Makefile.crates

irc/halloy: update to 2026.3

PR: 293547
DeltaFile
+713-697irc/halloy/distinfo
+355-347irc/halloy/Makefile.crates
+1-1irc/halloy/Makefile
+1,069-1,0453 files

HardenedBSD/ports 51c9343lang/python310 distinfo Makefile

lang/python310: update to 3.10.20

Changelog: https://docs.python.org/release/3.10.20/whatsnew/changelog.html

Security: bfe9adc8-0224-11f1-8790-c5fb948922ad
DeltaFile
+3-7lang/python310/distinfo
+0-3lang/python310/Makefile
+1-1lang/python310/Makefile.version
+4-113 files

HardenedBSD/src bc92290tools/test/hwpmc pmctest.py

Allow programs run under this program to have arguments.
DeltaFile
+8-6tools/test/hwpmc/pmctest.py
+8-61 files

HardenedBSD/src e80c45dshare/man/man5 src.conf.5

src.conf.5: Regen after commit c47cefba8312
DeltaFile
+6-0share/man/man5/src.conf.5
+6-01 files

HardenedBSD/ports fccf0e4security/arti distinfo Makefile.crates

security/arti: Update to 2.1.0
DeltaFile
+149-117security/arti/distinfo
+73-57security/arti/Makefile.crates
+2-2security/arti/Makefile
+224-1763 files

HardenedBSD/src c499ad6sys/dev/virtio virtqueue.c virtio_ring.h

virtio: Use bus_dma for ring and indirect buffer allocations

While the majority of virtio platforms will be fully coherent, some may
require cache maintenance or other specific device memory handling (eg for
secure partitioning). Using bus_dma allows for these usecases.

The virtio buffers are marked as coherent; this should ensure that sync
calls are no-ops in the common cases.

Reviewed by:    andrew
Sponsored by:   Arm Ltd
Differential Revision:  https://reviews.freebsd.org/D54959
DeltaFile
+189-27sys/dev/virtio/virtqueue.c
+20-7sys/dev/virtio/virtio_ring.h
+209-342 files

HardenedBSD/src c8c3714sys/dev/virtio/block virtio_blk.c

virtio_blk: Use bus_dma for command/ack buffer allocations

While the majority of virtio platforms will be fully coherent, some may
require cache maintenance or other specific device memory handling (eg for
secure partitioning). Using bus_dma allows for these usecases.

The virtio buffers are marked as coherent; this should ensure that sync
calls are no-ops in the common cases.

Reviewed by:    andrew, br
Sponsored by:   Arm Ltd
Differential Revision:  https://reviews.freebsd.org/D54960
DeltaFile
+182-39sys/dev/virtio/block/virtio_blk.c
+182-391 files

HardenedBSD/ports ef828ffsecurity/vuxml/vuln 2026.xml

security/vuxml: update lang/python310 entry

gh-143935 has been committed upstream
DeltaFile
+2-2security/vuxml/vuln/2026.xml
+2-21 files

HardenedBSD/ports 19e4ad2ports-mgmt/poudriere distinfo Makefile

ports-mgmt/poudriere: Update to 3.4.6

Changes:
 - bulk -t / testport: Fix fs_violation with pkg 2.6.x
 - bulk: Don't try refetching on checksum failure
 - jail -d -C wrkdirs: Delete proper wrkdirs directory.
 - pkgclean: fix dry-run still generating repo
 - bulk fetching + pkgbase jail fixes (#1312)
DeltaFile
+3-3ports-mgmt/poudriere/distinfo
+1-1ports-mgmt/poudriere/Makefile
+4-42 files

HardenedBSD/ports 1d0d7dcports-mgmt/poudriere-devel distinfo Makefile

ports-mgmt/poudriere-devel: Update to 3.3.0-2543-g20dc590c2

Changes:
 - bulk -t / testport: Fix fs_violation with pkg 2.6.x
 - bulk: Don't try refetching on checksum failure
DeltaFile
+3-3ports-mgmt/poudriere-devel/distinfo
+2-2ports-mgmt/poudriere-devel/Makefile
+5-52 files

HardenedBSD/ports 1cc6ee1devel/libvirt distinfo Makefile, devel/libvirt/files patch-src_secret_meson.build

devel/libvirt: update to 12.1.0

Sponsored by:   The FreeBSD Foundation
DeltaFile
+25-0devel/libvirt/files/patch-src_secret_meson.build
+3-7devel/libvirt/distinfo
+3-6devel/libvirt/Makefile
+7-1devel/libvirt/pkg-plist
+38-144 files

HardenedBSD/ports 1ff8c3ddevel/py-libvirt distinfo Makefile

devel/py-libvirt: update to 12.1.0

Sponsored by:   The FreeBSD Foundation
DeltaFile
+3-3devel/py-libvirt/distinfo
+1-1devel/py-libvirt/Makefile
+4-42 files

HardenedBSD/ports 4be51b3devel/glab distinfo pkg-plist

devel/glab: update to 1.87.0

Changes:        https://gitlab.com/gitlab-org/cli/-/releases/v1.87.0
DeltaFile
+5-5devel/glab/distinfo
+7-0devel/glab/pkg-plist
+2-2devel/glab/Makefile
+14-73 files

HardenedBSD/ports 89dade0Mk/Uses php.mk

Mk/Uses: Refactor php.mk

opcache module is valid only for versions upto 8.4. From php 8.5
onwards opcache is in the base php and a mandatory module.
DeltaFile
+2-0Mk/Uses/php.mk
+2-01 files

HardenedBSD/ports c27990ctextproc/groonga distinfo Makefile

textproc/groonga: Update version 15.1.9=>15.2.0

Changelog: https://groonga.org/docs/news/15.html#release-15-2-0
DeltaFile
+3-3textproc/groonga/distinfo
+1-1textproc/groonga/Makefile
+4-42 files