HardenedBSD/src 9361fccshare/man/man5 src.conf.5

HBSD: Resolve merge conflict

Regen src.conf.5.

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+7-513share/man/man5/src.conf.5
+7-5131 files

HardenedBSD/src 4034971lib/libarchive config_freebsd.h, share/man/man5 src.conf.5

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

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
DeltaFile
+664-159sys/compat/linuxkpi/common/src/linux_80211.c
+524-7share/man/man5/src.conf.5
+130-14sys/compat/linuxkpi/common/include/linux/overflow.h
+89-37lib/libarchive/config_freebsd.h
+35-54sys/compat/linuxkpi/common/include/net/mac80211.h
+75-4sys/compat/linuxkpi/common/include/net/cfg80211.h
+1,517-27539 files not shown
+1,778-37845 files

HardenedBSD/src 05fe599share/man/man4 splash.4, stand/common gfx_fb.c bootstrap.h

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+16-4stand/common/gfx_fb.c
+19-1sys/dev/vt/vt_core.c
+11-3share/man/man4/splash.4
+13-0sys/kern/subr_module.c
+6-1stand/efi/loader/bootinfo.c
+3-1stand/common/bootstrap.h
+68-102 files not shown
+72-118 files

HardenedBSD/ports bcc235flang/typescript-go distinfo, security/rbw distinfo Makefile.crates

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+685-0security/rbw/distinfo
+341-0security/rbw/Makefile.crates
+18-0security/rbw/Makefile
+7-7lang/typescript-go/distinfo
+11-0security/rbw/pkg-message
+10-0security/rbw/pkg-descr
+1,072-712 files not shown
+1,096-3218 files

HardenedBSD/ports c25d597editors/imhex Makefile

editors/imhex: Fix configure error on 13-stable

Reported by:    pkg-fallout
DeltaFile
+1-0editors/imhex/Makefile
+1-01 files

HardenedBSD/ports 5beb942security/rbw pkg-message

security/rbw: Add note for self-hosting
DeltaFile
+11-0security/rbw/pkg-message
+11-01 files

HardenedBSD/ports 1f135eanet/k6 distinfo Makefile

net/k6: Update to 1.7.1

ChangeLog:
https://github.com/grafana/k6/releases/tag/v1.7.1
DeltaFile
+5-5net/k6/distinfo
+2-3net/k6/Makefile
+7-82 files

HardenedBSD/ports 4db0587security Makefile, security/rbw distinfo Makefile.crates

security/rbw: New port: Unofficial bitwarden cli

rbw is an unofficial command line client for Bitwarden. Although
Bitwarden does come with its own command line client, it is limited
by being stateless - to use it, you're required to manually lock
and unlock the client, and pass the temporary keys around in
environment variables, which makes it very difficult to use. rbw
avoids this problem by maintaining a background process which is
able to hold the keys in memory, similar to the way that ssh-agent
or gpg-agent work. This allows the client to be used in a much
simpler way, with the background agent taking care of maintaining
the necessary state.

WWW: https://github.com/doy/rbw/
DeltaFile
+685-0security/rbw/distinfo
+341-0security/rbw/Makefile.crates
+18-0security/rbw/Makefile
+10-0security/rbw/pkg-descr
+1-0security/Makefile
+1,055-05 files

HardenedBSD/ports 6a1f53eeditors/editorconfig-core-c distinfo Makefile

editors/editorconfig-core-c: Update to 0.12.11

ChangeLog:
https://github.com/editorconfig/editorconfig-core-c/releases/tag/v0.12.11
DeltaFile
+3-3editors/editorconfig-core-c/distinfo
+1-1editors/editorconfig-core-c/Makefile
+4-42 files

HardenedBSD/ports 541994fnet-im/ejabberd Makefile

net-im/ejabberd: Unbreak on FreeBSD 13.x

Reported by:    pkg-fallout
DeltaFile
+1-0net-im/ejabberd/Makefile
+1-01 files

HardenedBSD/ports b1cf41fwww/linux-widevine-cdm distinfo Makefile

www/linux-widevine-cdm: update chrome distro to 147.0.7727.101-1

Bump PORTREVISION.

PR:             294602
Approved by:    arrowd (maintainer)

Sponsored by:   tipi.work
DeltaFile
+3-3www/linux-widevine-cdm/distinfo
+2-1www/linux-widevine-cdm/Makefile
+5-42 files

HardenedBSD/src 9038318sys/modules/rtw88 Makefile

rtw88: update module Makefile for v7.0 driver version

Update LINUXKPI_VERSION to reflect that the driver is based on
Linux v7.0.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+1-1sys/modules/rtw88/Makefile
+1-11 files

HardenedBSD/src 41b641csys/contrib/dev/rtw88 main.c phy.c

rtw88: update Realtek's rtw88 driver

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
028ef9c96e96197026887c0f092424679298aae8 ( tag: v7.0 ).

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+37-17sys/contrib/dev/rtw88/main.c
+20-0sys/contrib/dev/rtw88/phy.c
+2-4sys/contrib/dev/rtw88/sdio.c
+3-2sys/contrib/dev/rtw88/usb.c
+2-2sys/contrib/dev/rtw88/util.c
+2-1sys/contrib/dev/rtw88/rtw8822b.c
+66-2610 files not shown
+78-3416 files

HardenedBSD/src 480ba21. README.md

README: Update and harmonize

MFC after:      1 week
Reviewed by:    imp, markj, jhb
Differential Revision:  https://reviews.freebsd.org/D56499
DeltaFile
+12-11README.md
+12-111 files

HardenedBSD/ports 5c4ff9flang/typescript-go distinfo Makefile

lang/typescript-go: Update to 7.0.0.g20260408

Changelog: https://github.com/microsoft/typescript-go/compare/3830860814ab640263f40265c367b3938ff2d284...9c19dee6ab88ae11444837f16efa16a6b3dc9f59
DeltaFile
+7-7lang/typescript-go/distinfo
+3-4lang/typescript-go/Makefile
+10-112 files

HardenedBSD/src d618ba3usr.bin/du/tests du_test.sh

du: Set BLOCKSIZE before running tests

Several testcases assume BLOCKSIZE=K, so set it at the top of the
script.  This fixes an issue where the tests would sometimes fail
when run under sudo.

MFC after:      1 week
Sponsored by:   Klara, Inc.
Reviewed by:    kevans
Differential Revision:  https://reviews.freebsd.org/D56476
DeltaFile
+4-0usr.bin/du/tests/du_test.sh
+4-01 files

HardenedBSD/src 9899c8dsys/tools kernel-gdb.py

gdb: Print a stack trace if a python command raises an error

MFC after:      1 week
DeltaFile
+2-0sys/tools/kernel-gdb.py
+2-01 files

HardenedBSD/src 8de0fc1sys/net/route route_tables.c

routing: Use a better error number in sysctl_fibs()

ENOTCAPABLE is for capsicum and its use here is inappropriate.  In
particular, note that syscallret() treats this value specially.

Reviewed by:    glebius, pouria, zlei
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D56481
DeltaFile
+1-1sys/net/route/route_tables.c
+1-11 files

HardenedBSD/src 2b264cbsys/net/route route_tables.c

routing: Initialize V_rt_numfibs earlier during boot

V_rt_numfibs can be set at compile time (with the ROUTETABLES kernel
config option) or boot time (with the net.fibs tunable).
vnet_rtables_init(), running during SI_PROTO_DOMAIN, was checking the
tunable and updating V_rt_numfibs accordingly, but that means that
earlier SYSINITs, such as vnet_mroute_init(), see the compile-time value
for V_rt_numfibs before it gets corrected in vnet_rtables_init().

Fix this by initializing V_rt_numfibs earlier, so that SYSINITs are less
likely to use the wrong value.

Add a comment describing the weird, preexisting semantic of resetting
rt_numfibs to 1 in VNET jails.

PR:             294510
Reviewed by:    glebius, zlei, pouria
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D56473
DeltaFile
+16-8sys/net/route/route_tables.c
+16-81 files

HardenedBSD/src ba94d75stand/common load_elf.c

stand/common/load_elf: Do kernel module relocations for PPC

reloc_ptr() skips relocations for the kernel module, because on most
platforms the kernel is ET_EXEC and this is not required.  On PPC,
the kernel is ET_DYN and we need to relocate here, otherwise the
module metadata will not be loaded properly and the kernel module
will have an incorrect version, preventing module dependencies from
resolving.

This fixes loading kernel modules from loader.conf on powerpc.

Diagnosed by:   jrtc27
Reviewed by:    jrtc27, adrian
Sponsored by:   https://www.patreon.com/bsdivy
Differential Revision:  https://reviews.freebsd.org/D56457
DeltaFile
+4-3stand/common/load_elf.c
+4-31 files

HardenedBSD/ports 3c11120irc/inspircd Makefile pkg-plist

irc/inspircd: remove mbedtls module logic it was removed in v4

https://docs.inspircd.org/4/moved-modules/#ssl_mbedtls

PR:     294610
DeltaFile
+2-4irc/inspircd/Makefile
+0-1irc/inspircd/pkg-plist
+2-52 files

HardenedBSD/src 3441c31sys/modules/ath10k Makefile, sys/modules/ath11k Makefile

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+46-40sys/modules/brcm80211/brcmfmac/Makefile
+51-20sys/modules/ath11k/Makefile
+29-31sys/modules/rtw88/Makefile
+29-28sys/modules/rtw89/Makefile
+26-18sys/modules/mt76/Makefile.inc
+20-18sys/modules/ath10k/Makefile
+201-15511 files not shown
+345-25517 files

HardenedBSD/ports d90fc68cad/kicad-library-packages3d-devel pkg-plist, devel/cargo-edit distinfo

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+57-6,863cad/kicad-library-packages3d-devel/pkg-plist
+1,487-1,487x11/waveterm/distinfo
+1,721-0multimedia/lebiniou-data/pkg-plist
+375-355devel/cargo-edit/distinfo
+597-0devel/forgejo-cli/distinfo
+156-253x11/waveterm/files/packagejsons/package-lock.json
+4,393-8,95889 files not shown
+5,729-9,63395 files

HardenedBSD/src 25e776asys/compat/linuxkpi/common/include/net cfg80211.h mac80211.h

LinuxKPI: 802.11: add struct/fields and functions for v7.0

Add 802.11 struct fields and functions support for Linux v7.0 based
wireless drivers (at least iwlwifi, rtw88, rtw89).

While here cleanup some other bits.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+9-4sys/compat/linuxkpi/common/include/net/cfg80211.h
+11-1sys/compat/linuxkpi/common/include/net/mac80211.h
+20-52 files

HardenedBSD/src a0112b0sys/compat/linuxkpi/common/include/net cfg80211.h mac80211.h

LinuxKPI: 802.11: Add structures and functions for NAN support

In Linux v7.0 iwlwifi(4) started to add support for Wi-Fi Aware(tm)
also known as Neighbor Awareness Networking (NAN).

Add structures and fields for this as needed so far to keep the driver
compiling.  net80211 has no support for it as a new mode.

We may consider a dedicated header file for these parts in the future
depending on how much more is to come.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+66-0sys/compat/linuxkpi/common/include/net/cfg80211.h
+11-0sys/compat/linuxkpi/common/include/net/mac80211.h
+77-02 files

HardenedBSD/src f252ce0sys/compat/linuxkpi/common/include/linux ieee80211.h

LinuxKPI: 802.11: set IEEE80211_MIN_ACTION_SIZE according to struct

IEEE80211_MIN_ACTION_SIZE came up in the mt76 vendor subtree merge
as one of the non-mechanical changes which made me look.
Rather than (incorrectly) hand counting the offset from the beginning
of a frame, use the offset from the beginning of struct ieee80211_mgmt.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+2-2sys/compat/linuxkpi/common/include/linux/ieee80211.h
+2-21 files

HardenedBSD/src c39237alib/libmixer mixer.c

mixer(3): Rename _mixer_readvol() to mixer_readvol()

No functional change intended.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
DeltaFile
+3-5lib/libmixer/mixer.c
+3-51 files

HardenedBSD/ports 7d638e4security/uacme Makefile

security/uacme: Remove expired MBEDTLS option

security/mbedtls2 expired in 2025-06-02

Reported by:    diizzy
MFH:            2026Q2
DeltaFile
+2-4security/uacme/Makefile
+2-41 files

HardenedBSD/src ec07723sys/dev/sound/pcm sound.h, sys/dev/sound/usb uaudio.h

Revert "sound: Remove some forward declarations from sound.h and uaudio.h"

This reverts commit 602249f033d146d9c731d8b1cb4b2e0899c61ad9.
DeltaFile
+4-1sys/dev/sound/pcm/sound.h
+2-0sys/dev/sound/usb/uaudio.h
+6-12 files

HardenedBSD/src 89d68eesys/kern subr_module.c

subr_module: account for MODINFOMD_EFI_ARCH

Fixes:          b538d4911004ca541507166b8ec9689d2e87d1aa
MFC after:      2 weeks

(cherry picked from commit b3d6829f4998ad8ac8c65d39ac9513ba85a9974b)
DeltaFile
+8-0sys/kern/subr_module.c
+8-01 files