HardenedBSD/src 479e2b9share/man/man4 iwx.4 fdc.4, sys/contrib/edk2/Include/Guid Fdt.h

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+13-9share/man/man4/iwx.4
+22-0sys/contrib/edk2/Include/Guid/Fdt.h
+13-5share/man/man4/fdc.4
+6-1usr.sbin/fdwrite/fdwrite.1
+6-1usr.sbin/fdcontrol/fdcontrol.8
+6-1usr.sbin/fdread/fdread.1
+66-175 files not shown
+80-1811 files

HardenedBSD/src eb668a2share/man/man4 iwx.4 fdc.4, sys/contrib/edk2/Include/Guid Fdt.h

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+22-0sys/contrib/edk2/Include/Guid/Fdt.h
+13-9share/man/man4/iwx.4
+13-5share/man/man4/fdc.4
+6-1usr.sbin/fdcontrol/fdcontrol.8
+6-1usr.sbin/fdwrite/fdwrite.1
+6-1usr.sbin/fdread/fdread.1
+66-175 files not shown
+80-1811 files

HardenedBSD/ports 6174724graphics/drm-515-kmod/files extra-patch-linuxkpi-pci, net/wifi-firmware-kmod Makefile.inc

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+102-0graphics/drm-515-kmod/files/extra-patch-linuxkpi-pci
+67-0security/vuxml/vuln/2025.xml
+51-0x11/xfce4-screensaver/files/patch-src_gs-lock-plug.c
+9-9security/sudo-rs/distinfo
+10-2sysutils/di/Makefile
+5-4net/wifi-firmware-kmod/Makefile.inc
+244-1512 files not shown
+275-3718 files

HardenedBSD/ports 9acecc0security/sudo-rs distinfo Makefile.crates

security/sudo-rs: Update 0.2.8 => 0.2.10

PR:             290945
Approved by:    Marc Schoolderman (maintainer)
Security:       bf6c9252-c2ec-11f0-8372-98b78501ef2a
Security:       c1ceaaea-c2e7-11f0-8372-98b78501ef2a
DeltaFile
+9-9security/sudo-rs/distinfo
+3-3security/sudo-rs/Makefile.crates
+1-2security/sudo-rs/Makefile
+13-143 files

HardenedBSD/ports b043c72security/vuxml/vuln 2025.xml

security/vuxml: Document sudo-rs < 0.2.10 vulnerabilites

PR:             290945
DeltaFile
+67-0security/vuxml/vuln/2025.xml
+67-01 files

HardenedBSD/src de060b6sys/sys efi.h

efi.h: Bring in sys/types.h explicitly now

sys/types.h used to be brought in through namespace pollution, but no
more.

Fixes:          43b8edb32051
Sponsored by:   Netflix
DeltaFile
+1-0sys/sys/efi.h
+1-01 files

HardenedBSD/src 44fb9f2sys/sys efi_map.h

sys/efi_map.h: This is a kernel-only file

Slap a #ifdef _KERNEL around it all since it's useless to userland.

Fixes:          43b8edb32051
Sponsored by:   Netflix
DeltaFile
+4-0sys/sys/efi_map.h
+4-01 files

HardenedBSD/ports a7e181enet/wifi-firmware-kmod Makefile.inc

net/wifi-firmware-kmod: update additional MASTER_SITES entries

The fallback list of geolocated servers is outdated.
Update with current set discovered using the RIPE Atlas service.

PR:             290898
Reviewed by:    jrm
Differential Revision: https://reviews.freebsd.org/D53678
DeltaFile
+5-4net/wifi-firmware-kmod/Makefile.inc
+5-41 files

HardenedBSD/src 60f14d0stand/efi/fdt efi_fdt.c Makefile

edk2: Fix fdt build

x86 doesn't use FDT things by default, but aarch64 does. I thought I'd
built the loader on aarch64 to test the EDK2 all the things series, but
apparently not. This fixes the aarch64 build.

Fixes:          43b8edb32051
Sponsored by:   Netflix
DeltaFile
+2-0stand/efi/fdt/efi_fdt.c
+1-0stand/efi/fdt/Makefile
+3-02 files

HardenedBSD/src af6d77csys/contrib/edk2/Include/Guid Fdt.h

edk2: Bring in Guid/Fdt.h

This one is from EmbeddedPkg/Include/Guid/Fdt.h, which is our first
EmbeddedPkg addition. For the moment, I'm doing this as an ad-hoc basis,
but in the next import may need to reconsider the strategy.

Sponsored by:           Netflix
DeltaFile
+22-0sys/contrib/edk2/Include/Guid/Fdt.h
+22-01 files

HardenedBSD/ports 011b1adx11/xfce4-screensaver Makefile, x11/xfce4-screensaver/files patch-src_gs-lock-plug.c

x11/xfce4-screensaver: Use pgrep instead of pidof

Import patch accepted upstream to use pgrep, instead of pidof, which
is not a dependency of this port.

Use switching from the screen saver should be fixed by this change.

PR:             290766
Obtained from:  https://gitlab.xfce.org/apps/xfce4-screensaver/-/merge_requests/58
DeltaFile
+51-0x11/xfce4-screensaver/files/patch-src_gs-lock-plug.c
+1-0x11/xfce4-screensaver/Makefile
+52-02 files

HardenedBSD/ports 26b4840graphics/drm-515-kmod Makefile, graphics/drm-515-kmod/files extra-patch-linuxkpi-pci

graphics/drm-515-kmod: add extra patch to unbreak on 15 and newer

Conditionally apply a patch to avoid conflicts with an updated LinuxKPI.
This should make this port both build and work again.
The patch is conditional for the moment as 14.3-R and stable/14 do not
have the LinuxKPI changes yet. stable/14 will likely get it before
14.4-R.  At that point it might be easier to (a) have it conditional
in the drm-kmod branch based on __FreeBSD_version or (b) have a
backout patch here for 14.2-R and stable/14 before the LinuxKPI update.

PR:             290432
Reported by:    kargl
DeltaFile
+102-0graphics/drm-515-kmod/files/extra-patch-linuxkpi-pci
+6-1graphics/drm-515-kmod/Makefile
+108-12 files

HardenedBSD/src 4c736cfshare/man/man4 fdc.4, usr.sbin/fdcontrol fdcontrol.8

Deprecate fdc(4) and floppy utilities

Floppies have been obsolete for over a decade.  Add a deprecation note
now and plan to remove fdc(4) support in 16.

Reviewed by:    ziaee
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D41549
DeltaFile
+7-1share/man/man4/fdc.4
+6-1usr.sbin/fdcontrol/fdcontrol.8
+6-1usr.sbin/fdformat/fdformat.8
+6-1usr.sbin/fdread/fdread.1
+6-1usr.sbin/fdwrite/fdwrite.1
+31-55 files

HardenedBSD/src e1b027bshare/man/man4 fdc.4

fdc.4: Correct igor-reported warnings

Sponsored by:   The FreeBSD Foundation
DeltaFile
+6-4share/man/man4/fdc.4
+6-41 files

HardenedBSD/ports f6339afsecurity/rkhunter Makefile

security/rkhunter: deprecate,

Project was abandoned in 2009.  Maintainer wishes to release
maintainership.

PR:             291001
Reported by:    pirzyk at FreeBSD.org
DeltaFile
+4-1security/rkhunter/Makefile
+4-11 files

HardenedBSD/ports 3a271ddwww/py-webargs distinfo Makefile

www/py-webargs: Update 8.7.0 => 8.7.1

Changelog:
https://github.com/marshmallow-code/webargs/blob/8.7.1/CHANGELOG.rst

PR:     291044
DeltaFile
+3-3www/py-webargs/distinfo
+2-1www/py-webargs/Makefile
+5-42 files

HardenedBSD/ports 7b8de50sysutils/fastfetch distinfo Makefile

sysutils/fastfetch: update to 2.55.1

Changelog:      https://github.com/fastfetch-cli/fastfetch/releases/tag/2.55.1
DeltaFile
+3-3sysutils/fastfetch/distinfo
+1-1sysutils/fastfetch/Makefile
+4-42 files

HardenedBSD/src 99f945ashare/keys Makefile

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-4share/keys/Makefile
+0-41 files

HardenedBSD/src 874b126release Makefile.gce, release/tools vmimage.subr

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

Conflicts:
        share/keys/Makefile (unresolved)
DeltaFile
+18-4release/tools/vmimage.subr
+7-11usr.sbin/bsdinstall/scripts/pkgbase.in
+13-3usr.sbin/bsdinstall/Makefile
+11-2release/Makefile.gce
+9-0usr.sbin/pkg/FreeBSD.conf.quarterly-release
+9-0usr.sbin/pkg/FreeBSD.conf.quarterly
+67-208 files not shown
+103-2414 files

HardenedBSD/ports 72e682edevel/pcre2 Makefile

HBSD: Resolve merge conflict

It seems the pcre2 project might not support disabling JIT support
anymore. At least, I cannot seem to coerce the build to disable JIT
support.

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-4devel/pcre2/Makefile
+0-41 files

HardenedBSD/ports 44c7764databases/clickhouse distinfo, devel/bacon distinfo

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

Conflicts:
        devel/pcre2/Makefile (unresolved)
DeltaFile
+0-6,312misc/gemini-cli/files/package-lock.json
+1,253-1,089editors/zed/distinfo
+626-544editors/zed/Makefile.crates
+347-361devel/bacon/distinfo
+259-249databases/clickhouse/distinfo
+176-198x11/oscar/pkg-plist
+2,661-8,753214 files not shown
+5,011-10,025220 files

HardenedBSD/ports 5b432e5sysutils/di Makefile distinfo

sysutils/di: Update 6.0.0 => 6.2.0

Changelog:
https://sourceforge.net/p/diskinfo-di/wiki/ChangeLog/

PR:             291041
Approved by:    Naram Qashat <cyberbotx at cyberbotx.com>
DeltaFile
+10-2sysutils/di/Makefile
+3-3sysutils/di/distinfo
+1-1sysutils/di/pkg-plist
+14-63 files

HardenedBSD/ports 415e6bemisc/radio_datetime_analyzer Makefile

misc/radio_datetime_analyzer: install all example files
DeltaFile
+3-3misc/radio_datetime_analyzer/Makefile
+3-31 files

HardenedBSD/src ebb0b48share/man/man4 iwx.4

iwx.4: Follow the established style

Fixes:          b0c1ead2b9be ("iwx.4: Fix SYNOPSIS")
Reviewed by:    ziaee
Differential Revision:  https://reviews.freebsd.org/D53760
DeltaFile
+13-9share/man/man4/iwx.4
+13-91 files

HardenedBSD/src 0fb689cstand/efi/include efiapi.h, sys/contrib/edk2/Include/IndustryStandard Tpm12.h Tpm20.h

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+2,165-0sys/contrib/edk2/Include/IndustryStandard/Tpm12.h
+1,813-0sys/contrib/edk2/Include/IndustryStandard/Tpm20.h
+1,220-0sys/contrib/edk2/Include/Pi/PiStatusCode.h
+0-1,195stand/efi/include/efiapi.h
+966-0sys/contrib/edk2/Include/Protocol/DebugSupport.h
+946-0sys/contrib/edk2/Include/Protocol/Ip6.h
+7,110-1,195197 files not shown
+37,760-8,440203 files

HardenedBSD/src 4024023stand/efi/include efiapi.h, sys/contrib/edk2/Include/IndustryStandard Tpm12.h Tpm20.h

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+2,165-0sys/contrib/edk2/Include/IndustryStandard/Tpm12.h
+1,813-0sys/contrib/edk2/Include/IndustryStandard/Tpm20.h
+1,220-0sys/contrib/edk2/Include/Pi/PiStatusCode.h
+0-1,195stand/efi/include/efiapi.h
+966-0sys/contrib/edk2/Include/Protocol/DebugSupport.h
+946-0sys/contrib/edk2/Include/Protocol/Ip6.h
+7,110-1,195197 files not shown
+37,760-8,440203 files

HardenedBSD/ports fe13e0etextproc/television distinfo Makefile

textproc/television: Update to 0.13.9

Changelog:
https://github.com/alexpasmantier/television/releases/tag/0.13.9
DeltaFile
+3-3textproc/television/distinfo
+1-2textproc/television/Makefile
+4-52 files

HardenedBSD/src 1aa241bsys/contrib/edk2/Include/IndustryStandard Tpm12.h Tpm20.h, sys/contrib/edk2/Include/Protocol Tcg2Protocol.h

tpm20: Bring in the edk2 includes for TPM 2.0 support

Bring these in from edk2-stable202502. They will be used in a
forthcoming TPM 2.0 support code.

Sponsored by:           Netflix
DeltaFile
+2,165-0sys/contrib/edk2/Include/IndustryStandard/Tpm12.h
+1,813-0sys/contrib/edk2/Include/IndustryStandard/Tpm20.h
+722-0sys/contrib/edk2/Include/IndustryStandard/UefiTcgPlatform.h
+335-0sys/contrib/edk2/Include/Protocol/Tcg2Protocol.h
+5,035-04 files

HardenedBSD/src f439973sys/contrib/edk2/Include/IndustryStandard Atapi.h, sys/contrib/edk2/Include/Pi PiStatusCode.h

edk2: Pull in more headers from edk2

Pull in more headers from edk2-stable202502 that will be needed as we
transition the building to using only EDK2 headers in the boot loader,
finally ditching our home-grown ones from a super-obsolete SDK from the
early days of EFI.

Note to future importers: My apologies if this not being a mege commit
causes problems. Except for ProcessorBind.h, all files should be exactly
as we got them from EDK2, and if that breaks the build on future
imports, we should adjust our code.

Sponsored by:           Netflix
Differential Revision:  https://reviews.freebsd.org/D53654
DeltaFile
+1,220-0sys/contrib/edk2/Include/Pi/PiStatusCode.h
+966-0sys/contrib/edk2/Include/Protocol/DebugSupport.h
+946-0sys/contrib/edk2/Include/Protocol/Ip6.h
+933-0sys/contrib/edk2/Include/Protocol/PxeBaseCode.h
+856-0sys/contrib/edk2/Include/Protocol/Tcp6.h
+849-0sys/contrib/edk2/Include/IndustryStandard/Atapi.h
+5,770-0101 files not shown
+32,156-0107 files

HardenedBSD/src 84dc74bstand/efi/include efi.h, stand/efi/include/amd64 efibind.h

stand: switch the loader over to using efi-edk2.h

Sponsored by:           Netflix
Differential Revision:  https://reviews.freebsd.org/D53652
DeltaFile
+0-187stand/efi/include/amd64/efibind.h
+0-183stand/efi/include/i386/efibind.h
+0-140stand/efi/include/riscv/efibind.h
+0-140stand/efi/include/arm64/efibind.h
+0-129stand/efi/include/arm/efibind.h
+8-24stand/efi/include/efi.h
+8-8036 files