HardenedBSD/ports e929152Mk bsd.port.mk

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-4Mk/bsd.port.mk
+0-41 files

HardenedBSD/ports fba34bcjava/openjdk26/files patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp patch-src_hotspot_os__cpu_bsd__ppc_orderAccess__bsd__ppc.hpp, security/vaultwarden distinfo Makefile.crates

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

Conflicts:
        Mk/bsd.port.mk (unresolved)
DeltaFile
+243-271security/vaultwarden/distinfo
+120-134security/vaultwarden/Makefile.crates
+120-81sysutils/cbsd/pkg-plist
+96-0sysutils/ansible-sshjail/files/patch-sshjail.py
+89-0java/openjdk26/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp
+80-0java/openjdk26/files/patch-src_hotspot_os__cpu_bsd__ppc_orderAccess__bsd__ppc.hpp
+748-48661 files not shown
+975-65967 files

HardenedBSD/src dfb92b3share/man/man5 src.conf.5, stand defs.mk

HBSD: Resolve merge conflicts

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-75usr.sbin/bsdinstall/scripts/mirrorselect
+2-6share/man/man5/src.conf.5
+0-3stand/defs.mk
+2-843 files

HardenedBSD/src 58a6f26sbin/tunefs tunefs.c, sys/fs/nfs nfsid.h

Merge remote-tracking branch 'origin/freebsd/15-stable/main' into hardened/15-stable/main

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
        stand/defs.mk (unresolved)
        usr.sbin/bsdinstall/scripts/mirrorselect (unresolved)
DeltaFile
+140-0tests/sys/kqueue/kqueue_fork.c
+76-43sys/kern/kern_event.c
+74-0usr.sbin/bsdinstall/scripts/mirrorselect
+67-0sys/fs/nfs/nfsid.h
+37-27sbin/tunefs/tunefs.c
+45-0tests/sys/posixshm/posixshm.h
+439-7018 files not shown
+643-14524 files

HardenedBSD/src fd59c66contrib/libarchive/libarchive/test test_read_format_iso_zisofs_overflow.iso.uu test_read_format_rar5_loop_bug.rar.uu, sbin/ifconfig ifgeneve.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+3,967-0sys/net/if_geneve.c
+1,096-0contrib/libarchive/libarchive/test/test_read_format_iso_zisofs_overflow.iso.uu
+1,000-0tests/sys/net/if_geneve.sh
+889-0sbin/ifconfig/ifgeneve.c
+384-0share/man/man4/geneve.4
+189-0contrib/libarchive/libarchive/test/test_read_format_rar5_loop_bug.rar.uu
+7,525-0132 files not shown
+10,055-936138 files

HardenedBSD/src 114583ccontrib/libarchive/libarchive/test test_read_format_iso_zisofs_overflow.iso.uu, sbin/ifconfig ifgeneve.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+3,967-0sys/net/if_geneve.c
+1,096-0contrib/libarchive/libarchive/test/test_read_format_iso_zisofs_overflow.iso.uu
+1,000-0tests/sys/net/if_geneve.sh
+889-0sbin/ifconfig/ifgeneve.c
+384-0share/man/man4/geneve.4
+168-21sys/arm64/include/armreg.h
+7,504-21132 files not shown
+10,055-936138 files

HardenedBSD/ports bd4762bsecurity/vaultwarden distinfo Makefile.crates

security/vaultwarden: Security update to 1.35.6

PR:             294465
Reported by:    Bernard Spil, Jordan Ostreff
DeltaFile
+243-271security/vaultwarden/distinfo
+120-134security/vaultwarden/Makefile.crates
+1-3security/vaultwarden/Makefile
+364-4083 files

HardenedBSD/ports b3bab81sysutils/cbsd pkg-plist distinfo

sysutils/cbsd: Update to 15.0.6
DeltaFile
+120-81sysutils/cbsd/pkg-plist
+3-3sysutils/cbsd/distinfo
+1-1sysutils/cbsd/Makefile
+124-853 files

HardenedBSD/src 8b8ae24stand defs.mk

stand: Force disable RETPOLINE for boot loaders

Boot loaders do not require speculative execution protection, and may be
too large if enabled.

Reported by:    Shawn Webb
Reviewed by:    dim, imp
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D56068

(cherry picked from commit 61f78130c2f3a6abaa70bd66d6d6974060fb3d04)
DeltaFile
+1-0stand/defs.mk
+1-01 files

HardenedBSD/src b06d6b9sys/kern kern_event.c

kqueue_fork_copy_knote(): zero kn_knlist for the copy before calling knlist_add()

Reported by:    pho, dhw
Sponsored by:   The FreeBSD Foundation

(cherry picked from commit aab1ef4527f1b0935add3e8dba9e928e0623376f)
DeltaFile
+1-0sys/kern/kern_event.c
+1-01 files

HardenedBSD/src 84e7cd4sbin/tunefs tunefs.c

tunefs: Better fix for arm64 alignment issues

Rather than trust that the compiler will lay out the stack frame the
way we expect it to, use a union to force the correct alignment.

MFC after:      1 week
Fixes:          616f47f176c3 ("tunefs: Fix alignment warning on arm64")
Reviewed by:    kevans, mckusick
Differential Revision:  https://reviews.freebsd.org/D56245

(cherry picked from commit 8244dd326265867293b2286efc3d571f06ef0dab)

tunefs: Fix pointer arithmetic

While here, remove a bogus const which has been there for years.

MFC after:      1 week
Reported by:    ivy@
Fixes:          1b83e8a3f840 ("Constify string pointers.")

    [5 lines not shown]
DeltaFile
+37-27sbin/tunefs/tunefs.c
+37-271 files

HardenedBSD/src e272f4acontrib/bmake main.c

Fix default for .MAKE.SAVE_DOLLARS

NetBSD make defaults this to "yes",
bmake defauts it to "no" to retain the traditional behavior.

The default is dealt with in bmake's Makefile but that does not
address boot-strap.

For now, just change the ifdef in main.

PR: 294436
DeltaFile
+1-1contrib/bmake/main.c
+1-11 files

HardenedBSD/src 8555074lib/msun/man fmax.3

fmax.3: Add caveat for going beyond C std requirements

libm's fmax and fmin family of functions treat +0.0 as greater than
-0.0.  This is not required by the C standard, so the user may not see
this behaviour due to compiler optimization.

PR:             294214
Reviewed by:    fuz
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D56230

(cherry picked from commit 7764e9ca28a9702aed4ba7391e055ec2fcf35c41)
DeltaFile
+8-5lib/msun/man/fmax.3
+8-51 files

HardenedBSD/ports 8ef47d2net/zapret2 distinfo Makefile

net/zapret2: Update 0.9.4.7 => 0.9.5

Approved by:            yuri@ (maintainer, Mentor)
Approved by:            db@, yuri@ (Mentors, implicit)
Differential Revision:  https://reviews.freebsd.org/D56376
DeltaFile
+3-3net/zapret2/distinfo
+1-1net/zapret2/Makefile
+4-42 files

HardenedBSD/src bc793adsbin/ifconfig ifgeneve.c

ifconfig: Fix printf on geneve for 32-bit architectures

Replace uint64_t type with uintmax_t in printf to fix warnings
on 32-bit architectures.

Reported by:    Jenkins
Fixes:          688e289ee904 ("ifconfig: Add support for geneve")
Differential Revision: https://reviews.freebsd.org/D55184
DeltaFile
+4-4sbin/ifconfig/ifgeneve.c
+4-41 files

HardenedBSD/ports 7e547c2databases/mariadb-java-client distinfo pkg-descr

databases/mariadb-java-client: Update 3.5.6 => 3.5.8

Release notes:
https://mariadb.com/docs/release-notes/connectors/java/3.5/3.5.7
https://mariadb.com/docs/release-notes/connectors/java/3.5/3.5.8

PR:             294351
Sponsored by:   UNIS Labs
MFH:            2026Q2
DeltaFile
+3-3databases/mariadb-java-client/distinfo
+4-2databases/mariadb-java-client/pkg-descr
+2-3databases/mariadb-java-client/Makefile
+9-83 files

HardenedBSD/ports 48a7dd8deskutils/mytetra distinfo Makefile

deskutils/mytetra: update the port to version 1.44.232

While here, rephrase the COMMENT (inspired by provided
RPM spec file).

Reported by:    portscout
DeltaFile
+3-3deskutils/mytetra/distinfo
+2-2deskutils/mytetra/Makefile
+5-52 files

HardenedBSD/ports b36cd4dsysutils/ansible-sshjail Makefile, sysutils/ansible-sshjail/files patch-sshjail.py

sysutils/ansible-sshjail: Fix at runtime with latest ansible

Import patch from upstream Pull request to allow it to work properly
with new ansible release.

Obtained from:  https://github.com/austinhyde/ansible-sshjail/pull/46
DeltaFile
+96-0sysutils/ansible-sshjail/files/patch-sshjail.py
+1-0sysutils/ansible-sshjail/Makefile
+97-02 files

HardenedBSD/ports 03627c8comms/klog pkg-plist Makefile

comms/klog: Fix build take two

Delete %%PORTDOCS%% prefix
Bump PORTREVISION
DeltaFile
+11-11comms/klog/pkg-plist
+1-1comms/klog/Makefile
+12-122 files

HardenedBSD/ports a580cddtextproc/gtk-doc distinfo Makefile

textproc/gtk-doc: update to 1.36.1

PR:             294439
DeltaFile
+3-3textproc/gtk-doc/distinfo
+1-1textproc/gtk-doc/Makefile
+4-42 files

HardenedBSD/ports fa55701sysutils/lnav distinfo Makefile

sysutils/lnav: Update 0.13.2 => 0.14.0

Changelog:
https://github.com/tstack/lnav/releases/tag/v0.14.0

Port changes:
* Mark broken for i386.

PR:             294448
Reported by:    Marcel Bischoff <marcel at herrbischoff.com> (maintainer)
Approved by:    osa, vvd (mentors)
MFH:            2026Q2
DeltaFile
+3-3sysutils/lnav/distinfo
+4-1sysutils/lnav/Makefile
+7-42 files

HardenedBSD/ports df9cfd6ports-mgmt/pkg_rmleaves distinfo Makefile

ports-mgmt/pkg_rmleaves: Update 20231217 => 20260412

Changelog:
* Show at most 250 leaf packages at a time (over multiple dialogs if needed)
  to stay within ARG_MAX kernel limit for command line arguments to bsddialog.
* Support for the very old FreeBSD pkg_delete package manager is now deprecated
  and will be removed completely in next release.

Port changes:
* Pet portfmt: add newline PLIST_FILES.
* Switch to PORTVERSION.

PR:             294435
See also:       294368
Reported by:    Alexander Wittig <alexander at wittig.name> (maintainer)
Reported by:    Cy Schubert <cy at FreeBSD.org>
Approved by:    osa, vvd (mentors)
MFH:            2026Q2
DeltaFile
+3-3ports-mgmt/pkg_rmleaves/distinfo
+3-2ports-mgmt/pkg_rmleaves/Makefile
+6-52 files

HardenedBSD/ports 45798a0science/ncrystal pkg-plist distinfo, science/ncrystal/files patch-tests_CMakeLists.txt

science/{,py-}ncrystal: update 4.2.8 → 4.3.2
DeltaFile
+7-5science/ncrystal/pkg-plist
+12-0science/ncrystal/files/patch-tests_CMakeLists.txt
+3-3science/ncrystal/distinfo
+3-3science/ncrystal/Makefile
+3-3science/py-ncrystal/distinfo
+1-2science/py-ncrystal/Makefile
+29-166 files

HardenedBSD/ports c8b442csysutils/tarbsd-builder distinfo Makefile

sysutils/tarbsd-builder: Update 26.03.01 => 26.04.11

Release Notes:
https://github.com/pavetheway91/tarbsd/releases/tag/26.04.11

Commit log:
https://github.com/pavetheway91/tarbsd/compare/26.03.01...26.04.11

PR:             294420
Reported by:    Paavo-Einari Kaipila <pkaipila at gmail.com> (maintainer)
Approved by:    osa, vvd (mentors)
DeltaFile
+3-3sysutils/tarbsd-builder/distinfo
+2-2sysutils/tarbsd-builder/Makefile
+5-52 files

HardenedBSD/ports c9ca81fnet/rustconn distinfo Makefile.crates

net/rustconn: Update to 0.10.18

ChangeLog:

  - https://github.com/totoshko88/RustConn/releases/tag/v0.10.17
  - https://github.com/totoshko88/RustConn/releases/tag/v0.10.18

Reported by:    "github-actions[bot]" <notifications at github.com>
DeltaFile
+25-25net/rustconn/distinfo
+11-11net/rustconn/Makefile.crates
+1-1net/rustconn/Makefile
+37-373 files

HardenedBSD/src 3b10806release Makefile.oracle, release/scripts/oracle image_capability_data.json generate_metadata.lua

release: remove Oracle Cloud Infrastructure build targets

Oracle's previous support is no longer available to the project.
Repeated attempts to find a sponsor within Oracle's cloud business
have not been successful.

The last published official images are from 15.0-RELEASE.

https://marketplace.oracle.com/app/freebsd-release

Relnotes:       yes
Sponsored by:   SkunkWerks, GmbH
Differential Revision:  https://reviews.freebsd.org/D56360
MFC after:      3 days
DeltaFile
+0-108release/Makefile.oracle
+0-105release/tools/oracle.conf
+0-96release/scripts/oracle/image_capability_data.json
+0-74release/scripts/oracle/generate_metadata.lua
+0-24release/scripts/oracle/arm64_shape_compatibilities.json
+0-21release/scripts/oracle/image_metadata.json
+0-4283 files not shown
+1-4359 files

HardenedBSD/src aa555b6sys/arm64/include armreg.h hypervisor.h

arm64: mte: add system register definitions

Add system register and bit field definitions for Memory Tagging
Extension (MTE) in ARMv8.5.

Reviewed by:    andrew
Sponsored by:   Arm Ltd
Signed-off-by:  Harry Moulton <harry.moulton at arm.com>
Co-authored-by: Andrew Turner <andrew at FreeBSD.org>
Differential Revision:  https://reviews.freebsd.org/D55945
DeltaFile
+94-2sys/arm64/include/armreg.h
+24-0sys/arm64/include/hypervisor.h
+118-22 files

HardenedBSD/src 5809584sys/arm64/arm64 pmap.c

arm64: Handle changing self-referential DMAP pages

Support changing the property of a DMAP page that holds it's own page
table entry.

Because we need to perform a break-before-make sequence to change the
properties of pages a page that also holds it's own page table entry
will fault in the make part of the sequence.

Handle this by mapping the page with a temporary mapping as we already
do when demoting a superpage.

Reviewed by:    kib
Sponsored by:   Arm Ltd
Differential Revision:  https://reviews.freebsd.org/D55943
DeltaFile
+26-0sys/arm64/arm64/pmap.c
+26-01 files

HardenedBSD/src c208439sys/arm64/arm64 pmap.c

arm64: Add a cmap page to pmap

When modifying mappings in pmap we may need to perform a
break-before-make sequence. This creates an invalid mapping, then
recreates it with the changes.

When modifying DMAP mappings we may be changing the mapping that
contains its own page table then after breaking the old entry we are
unable to create the new entry.

To fix this create a map that can be used & won't be affected by the
break-before-make sequence.

Reviewed by:    kib
Sponsored by:   Arm Ltd
Differential Revision:  https://reviews.freebsd.org/D56306
DeltaFile
+18-1sys/arm64/arm64/pmap.c
+18-11 files

HardenedBSD/src 58de791sys/arm64/arm64 locore.S

arm64: mte: configure initial state for system registers

The fields in SCTLR_EL1 and HCR_EL2 for enabling MTE are set, and if the
ID_AA64PFR1_EL1 register shows MTE is present, the GCR_EL1 register is
also configured, and the two TFSR registers which hold pending tag check
faults are cleared.

Reviewed by:    andrew
Sponsored by:   Arm Ltd
Signed-off-by:  Harry Moulton <harry.moulton at arm.com>
Differential Revision:  https://reviews.freebsd.org/D55946
DeltaFile
+16-1sys/arm64/arm64/locore.S
+16-11 files