HardenedBSD/src 1537babsys/compat/linuxkpi/common/src linux_80211.c linux_80211_macops.c, sys/contrib/dev/mediatek/mt76 usb.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+20-8sys/compat/linuxkpi/common/src/linux_80211.c
+13-5sys/modules/mt76/mt7921/Makefile
+13-0sys/contrib/dev/mediatek/mt76/usb.c
+9-3sys/modules/mt76/mt7925/Makefile
+8-2sys/compat/linuxkpi/common/src/linux_80211_macops.c
+9-0sys/modules/mt76/core/Makefile
+72-1815 files not shown
+115-3121 files

HardenedBSD/ports 6f2dfa6emulators/wine pkg-plist Makefile, emulators/wine/files patch-man patch-dlls_ntdll_unix_loader.c

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+115-5emulators/wine/pkg-plist
+0-94emulators/wine/files/patch-man
+8-18emulators/wine/Makefile
+14-5net/mosquitto/Makefile
+10-7emulators/wine/files/patch-dlls_ntdll_unix_loader.c
+7-7net-mgmt/check_mk_agent/distinfo
+154-13626 files not shown
+211-18932 files

HardenedBSD/src 94be5dbsys/compat/linuxkpi/common/src linux_80211.c

LinuxKPI: 802.11: catch possible NULL pointer deref with mt76

With mt76 we, for the first time, see that txstat->skb or
txstat->info may not be filled in linuxkpi_ieee80211_tx_status_ext().
Guard for these cases checking for skb and info to be not NULL and
assume a TX failure in case info is NULL.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+13-3sys/compat/linuxkpi/common/src/linux_80211.c
+13-31 files

HardenedBSD/src c529e1asys/compat/linuxkpi/common/src linux_80211.c

LinuxKPI: 802.11: set extra tx info flag for EAPOL for mt76

mt76 requires IEEE80211_TX_CTL_USE_MINRATE to be set for EAPOL, so
add it.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+3-1sys/compat/linuxkpi/common/src/linux_80211.c
+3-11 files

HardenedBSD/src 3afe9e1sys/contrib/dev/mediatek/mt76 eeprom.c

mt76: fix a check wrongly giving us random ether addresses all the time

Do not cover the is_valid_ether_addr() check under CONFIG_OF.
Unclear if this is an initial porting or a merging error before the
driver hit the FreeBSD src tree.
The end result was that we always got a random link-layer address,
while the individual drivers may have setup phy->macaddr and this
function would only overwride if given in device tree.
Only if both, driver and and the OF backup, fail then go and use
the random link-layer address.

While here adjust printing the random link-layer address using
a FreeBSD format specifier and not the unsupported Linux one.

Fixes:          6c92544d7c97
Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+6-3sys/contrib/dev/mediatek/mt76/eeprom.c
+6-31 files

HardenedBSD/src 7d60647sys/compat/linuxkpi/common/src linux_80211_macops.c linux_80211.c

LinuxKPI: 802.11: make sure we are scheduled before wake_tx_queue()

If we are not scheduled before calling wake_tx_queue() packets may
never go out, which at first will look like EAPOL fails (as
wpa_supplicant suggest possibly with a wrong key).  Using monitor
mode it will be clear what is going on.
Pass a flag down to wake_tx_queue() to call ieee80211_schedule_txq()
in case (*wake_tx_queue)() is supported or not, which solves the
problem for the lkpi_80211_txq_tx_one() which was failing.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+8-2sys/compat/linuxkpi/common/src/linux_80211_macops.c
+4-4sys/compat/linuxkpi/common/src/linux_80211.c
+3-2sys/compat/linuxkpi/common/src/linux_80211.h
+15-83 files

HardenedBSD/src bc820edsys/contrib/dev/mediatek/mt76/mt7925 regd.c

mt76: mt7925: add missing LINUXKPI_PARAM_PREFIX

There is a module_param_named() in the file so we need to set
LINUXKPI_PARAM_PREFIX to get it a uniq sysctl name.  mt7921
has the exact same option.  Without their individual prefixes
the names would clash on systems with both chipsets and not
work for both.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+4-0sys/contrib/dev/mediatek/mt76/mt7925/regd.c
+4-01 files

HardenedBSD/src b129f79sys/contrib/dev/mediatek/mt76 usb.c, sys/contrib/dev/mediatek/mt76/mt7615 pci.c

mt76: sort out MODULE_DEPEND for PCI and USB

It is not enough to depend on mt76_core which then depends on linuxkpi
and linuxkpi_wlan.  Given each mt76 driver is its own module, each
also needs to depend on these linuxkpi modules.
In addition the core module usb part also has to depend on linuxkpi_usb.

This in addition to the previously sorted PCI drivers, allows (or will
allow) the individual chipsets (drivers) to load on systems with USB,
if compiled in, as well.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+7-0sys/contrib/dev/mediatek/mt76/mt7921/usb.c
+7-0sys/contrib/dev/mediatek/mt76/mt7925/usb.c
+3-0sys/contrib/dev/mediatek/mt76/usb.c
+1-1sys/contrib/dev/mediatek/mt76/mt7615/pci.c
+1-1sys/contrib/dev/mediatek/mt76/mt7925/pci.c
+1-1sys/contrib/dev/mediatek/mt76/mt7996/pci.c
+20-32 files not shown
+22-58 files

HardenedBSD/src 03f6b1fsys/modules/mt76 Makefile.inc, sys/modules/mt76/core Makefile

mt76: module Makefiles fix .PATH

The common Makefile.inc had the .PATH set for the common code.
That .PATH is only needed for the mt76_core module, which shares
code for all other drivers.  We leave the COMMONDIR variable defined
in Makefile.inc as we need it for CFLAGS+= -I for each driver but
migrate the .PATH to avoid drivers picking up the wrong files.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+0-2sys/modules/mt76/Makefile.inc
+2-0sys/modules/mt76/core/Makefile
+2-22 files

HardenedBSD/src 642c838sys/contrib/dev/mediatek/mt76 usb.c mt792x_usb.c

mt76: make USB compile

This is the mt76-specific changes to make the USB driver targets for
7921 and 7925 compile.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+10-0sys/contrib/dev/mediatek/mt76/usb.c
+3-0sys/contrib/dev/mediatek/mt76/mt792x_usb.c
+13-02 files

HardenedBSD/src 201fc8asys/modules/mt76 Makefile.inc, sys/modules/mt76/core Makefile

mt76: sort bus attachments in module Makefiles for pci and usb

With PCI enabled and USB still disabled add knobs to (i) enabled
them manually in the common Makefile.inc and (ii) add bus
attachment depend knobs where needed to enable them in individual
drivers.  For now the focus is in 7921 and 7925.

Sponsored by:   The FreeBSD Foundation
MFC atfer:      3 days
DeltaFile
+13-5sys/modules/mt76/mt7921/Makefile
+9-3sys/modules/mt76/mt7925/Makefile
+7-0sys/modules/mt76/core/Makefile
+6-0sys/modules/mt76/Makefile.inc
+35-84 files

HardenedBSD/ports 4a093acemulators/wine pkg-plist Makefile, emulators/wine/files patch-man patch-dlls_ntdll_unix_loader.c

emulators/wine: Update to Wine 11.0

Move from the Wine 10.0 release series to Wine 11.0 after another year
of upstream development with over 6300 individual changes and 600 fixes.

The new WoW64 architecture is complete (we don't leverage it yet, though).

Other changes include:

 - The OSMesa dependency is removed, and OpenGL bitmap rendering is
   implemented with the hardware accelerated OpenGL runtime.

 - Many more conversions between various pixel formats are supported
   in WindowsCodecs.

 - Exclusive fullscreen mode is supported, and D3D fullscreen mode is
   improved, especially improving older DDraw games.

 - Clipboard support and input methods are implemented in the Wayland

    [21 lines not shown]
DeltaFile
+115-5emulators/wine/pkg-plist
+0-94emulators/wine/files/patch-man
+8-18emulators/wine/Makefile
+10-7emulators/wine/files/patch-dlls_ntdll_unix_loader.c
+0-12emulators/wine/files/patch-configure
+3-3emulators/wine/distinfo
+136-1396 files

HardenedBSD/ports e32dc53filesystems/moosefs3-cgiserv Makefile, filesystems/moosefs3-chunkserver Makefile

filesystems/moosefs3-*: Update 3.0.117 => 3.0.118, deprecate

Changelog:
https://github.com/moosefs/moosefs/releases/tag/v3.0.118

3.0.118 is last release in 3.x.
3.x reached EoL 2025-03-31, use filesystems/moosefs-* 4.x instead.

While here remove unnecessary GNU_CONFIGURE_MANPREFIX.

PR:             289966
Approved by:    Piotr R. Konopelko (MooseFS) <piotr.konopelko at moosefs.com> (maintainer)
MFH:            2026Q1
DeltaFile
+6-4filesystems/moosefs3-master/Makefile
+3-3filesystems/moosefs3-master/distinfo
+1-1filesystems/moosefs3-cli/Makefile
+1-1filesystems/moosefs3-client/Makefile
+1-1filesystems/moosefs3-cgiserv/Makefile
+1-1filesystems/moosefs3-chunkserver/Makefile
+13-113 files not shown
+16-139 files

HardenedBSD/ports 98188fenet/mosquitto Makefile

net/mosquitto: Fix websockets options

Rename WEBSOCKET to WEBSOCKETS to match the cmake options. Add
WEBSOCKETS_BUILTIN option. I'd like to have WEBSOCKETS control if
websockets is supported at all and WEBSOCKETS_BUILTIN switch between
the bundled and ports versions but the latter doesn't build so mark
BROKEN and open an upstream issue:

    https://github.com/eclipse-mosquitto/mosquitto/issues/3478

One effect of these changes is that libwebsockets is no longer a
LIB_DEPENDS for the port; this will become a possibility once
WEBSOCKETS_BUILTIN OFF works again.

PR:             293005
Reported by:    alexander at wittig.name
DeltaFile
+14-5net/mosquitto/Makefile
+14-51 files

HardenedBSD/ports 90502fcfilesystems/moosefs2-cgiserv Makefile, filesystems/moosefs2-chunkserver Makefile

filesystems/moosefs2-*: Deprecate

2.x reached EoL 2017-12-31, use filesystems/moosefs-* 4.x instead.

PR:             289966
Approved by:    Piotr R. Konopelko (MooseFS) <piotr.konopelko at moosefs.com> (maintainer)
MFH:            2026Q1
DeltaFile
+4-2filesystems/moosefs2-master/Makefile
+1-1filesystems/moosefs2-cgiserv/Makefile
+1-1filesystems/moosefs2-chunkserver/Makefile
+1-1filesystems/moosefs2-cli/Makefile
+1-1filesystems/moosefs2-client/Makefile
+1-1filesystems/moosefs2-metalogger/Makefile
+9-72 files not shown
+11-88 files

HardenedBSD/ports 32af2f2math/R-cran-robustbase distinfo Makefile

math/R-cran-robustbase: Update to 0.99-7

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

HardenedBSD/ports 8500546net-mgmt/nagios4 Makefile

net-mgmt/nagios4: Fix build with OpenSSL from ports

Approved by:    hard.egg0918 at fastmail.com (maintainer, via email)
DeltaFile
+3-0net-mgmt/nagios4/Makefile
+3-01 files

HardenedBSD/src 0ec952ashare/man/man5 src.conf.5

src.conf.5: Regen
DeltaFile
+1-7share/man/man5/src.conf.5
+1-71 files

HardenedBSD/ports 4d63ecfsecurity/nmap Makefile, security/nmap-devel Makefile

security/nmap{,-devel}: Improve PCAP option

- Replace global LDFLAGS with PCAP_LDFLAGS and
  PCAP_USES=localbase:ldflags.
- While here remove unnecessary GNU_CONFIGURE_MANPREFIX.

Approved by:    cy (maintainer)
DeltaFile
+2-3security/nmap-devel/Makefile
+2-3security/nmap/Makefile
+4-62 files

HardenedBSD/src 18721berelease/scripts pkg-stage.sh

release: Turn off debugging in pkg(8)

Running `pkg -d` in pkg-stage.sh results in multiple GB of network
traffic being written into the log files, which is less than helpful
when it comes to tracking down build failures.  Remove the -d flag.

MFC after:      5 days
X-MFC-note:     The code in 15 has diverged from 14, but the flag is
                there, just in a different place.
DeltaFile
+1-1release/scripts/pkg-stage.sh
+1-11 files

HardenedBSD/src bfd50a3sys/sys sysctl.h

sys/sysctl.h: Add missing <sys/kassert.h> include

Hopefully, 'sys/sysctl.h' is really self-contained now.

This fixes the GENERIC-NODEBUG compilation error in 'hwpstate_common.c'
after commit 804329587508 (see below).

Fixes:          1a446f765d9c ("sys/sysctl.h: Make it self-contained when included from the kernel")
Fixes:          804329587508 ("hwpstate{_amd,intel}(4): Move common knobs to a separate file")
Sponsored by:   The FreeBSD Foundation
DeltaFile
+1-0sys/sys/sysctl.h
+1-01 files

HardenedBSD/src 21dd554sys/dev/e1000 igb_txrx.c

igb: remove M_HASHTYPE when RSS is not enabled

manually cherry-pick efcc0423d80e

Reviewed by: kbowling
Differential Revision: https://reviews.freebsd.org/D55143
DeltaFile
+1-1sys/dev/e1000/igb_txrx.c
+1-11 files

HardenedBSD/ports d805350net/mosquitto/files patch-lib_connect.c

net/mosquitto: Unbreak without CARES

PR:             292985
Reported by:    Ivan Rozhuk, alexander at wittig.name
DeltaFile
+10-0net/mosquitto/files/patch-lib_connect.c
+10-01 files

HardenedBSD/ports 4c67574net-mgmt/check_mk_agent distinfo Makefile

net-mgmt/check_mk_agent: Update 2.3.0p16 => 2.4.0p20

Commit log:
https://github.com/Checkmk/checkmk/commits/7e6a4f8/agents/check_mk_agent.freebsd

Upstream hasn't created tags for new versions since 2.4.0p12, so we use
the hash.

PR:             292480
Approved by:    Ian Valentine <ivalentine at arizona.edu> (maintainer, timeout 3 weeks)
Co-authored-by: Lukas Engelhardt <lukas.engelhardt at gmx.de>
DeltaFile
+7-7net-mgmt/check_mk_agent/distinfo
+6-7net-mgmt/check_mk_agent/Makefile
+13-142 files

HardenedBSD/src 59f7ac5sys/amd64/vmm/io ppt.c, sys/dev/acpica acpi.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+97-254sys/dev/qlnx/qlnxe/qlnx_os.c
+108-81sys/x86/cpufreq/hwpstate_amd.c
+111-51sys/amd64/vmm/io/ppt.c
+26-54usr.sbin/bhyve/pci_passthru.c
+21-20sys/dev/qlnx/qlnxe/ecore_l2.c
+31-4sys/dev/acpica/acpi.c
+394-46435 files not shown
+495-52341 files

HardenedBSD/src 3b7e046lib/libpmc/pmu-events/arch/x86/graniterapids uncore-cache.json uncore-interconnect.json

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+3,745-0lib/libpmc/pmu-events/arch/x86/graniterapids/uncore-cache.json
+1,979-0lib/libpmc/pmu-events/arch/x86/graniterapids/uncore-interconnect.json
+1,925-0lib/libpmc/pmu-events/arch/x86/graniterapids/uncore-io.json
+1,230-0lib/libpmc/pmu-events/arch/x86/graniterapids/cache.json
+1,145-0lib/libpmc/pmu-events/arch/x86/graniterapids/pipeline.json
+890-0lib/libpmc/pmu-events/arch/x86/graniterapids/uncore-memory.json
+10,914-010 files not shown
+12,550-016 files

HardenedBSD/ports 24b556cdevel/transient Makefile, graphics/satty distinfo Makefile.crates

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+215-277graphics/satty/distinfo
+107-138graphics/satty/Makefile.crates
+73-156x11-fonts/uw-ttyp0/pkg-plist
+45-2net/mosquitto/pkg-plist
+28-16devel/transient/Makefile
+21-6lang/gcc16-devel/files/patch-gcc_configure
+489-59548 files not shown
+675-69154 files

HardenedBSD/src f592357sys/kern uipc_socket.c

sockets: repair sctp_peeloff(2)

The shim function soattach() may be passed a non-listening socket by SCTP.

NB: the change makes soattach() more hairy, but long term plan is that
this function goes away.

PR:     293010
Fixes:  64f7e3c9c178ab35cb1f8fdf791aec74ede6f6b2
DeltaFile
+9-3sys/kern/uipc_socket.c
+9-31 files

HardenedBSD/ports 9eb294ex11/nvidia-kmod Makefile

x11/nvidia-kmod: Fix build with clang 21

PR:             292869
Reported by:    dim
Reviewed by:    ashafer
DeltaFile
+7-0x11/nvidia-kmod/Makefile
+7-01 files

HardenedBSD/ports ed93a8fnet-p2p/go-ethereum distinfo Makefile, net-p2p/go-ethereum/files patch-vendor_github.com_karalabe_hid_hid__enabled.go

net-p2p/go-ethereum: Update 1.12.2 => 1.16.8

The karalabe/hid vendored package was trying to include hidapi source
files that don't exist in the vendor directory. This patch modifies
the build to use FreeBSD's installed hidapi library instead.

Changes:
- Link against system libhidapi library.
- Use hidapi headers instead of including source.
- Add necessary C standard library headers for FreeBSD.

Changelogs:
https://github.com/ethereum/go-ethereum/releases/tag/v1.13.0
https://github.com/ethereum/go-ethereum/releases/tag/v1.13.1
https://github.com/ethereum/go-ethereum/releases/tag/v1.13.2
https://github.com/ethereum/go-ethereum/releases/tag/v1.13.3
https://github.com/ethereum/go-ethereum/releases/tag/v1.13.4
https://github.com/ethereum/go-ethereum/releases/tag/v1.13.5
https://github.com/ethereum/go-ethereum/releases/tag/v1.13.6

    [47 lines not shown]
DeltaFile
+23-0net-p2p/go-ethereum/files/patch-vendor_github.com_karalabe_hid_hid__enabled.go
+5-5net-p2p/go-ethereum/distinfo
+4-4net-p2p/go-ethereum/Makefile
+0-1net-p2p/go-ethereum/pkg-plist
+32-104 files