HardenedBSD/src 16799f5contrib/bmake bmake.1 make.1, contrib/bmake/unit-tests moderrs.exp

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+46-59contrib/bmake/bmake.1
+46-59contrib/bmake/make.1
+82-0contrib/bmake/ChangeLog
+40-40contrib/bmake/unit-tests/moderrs.exp
+22-55contrib/bmake/meta.c
+40-30contrib/bmake/var.c
+276-24387 files not shown
+1,284-62093 files

HardenedBSD/src be5d869contrib/bmake bmake.1 make.1, contrib/bmake/unit-tests moderrs.exp

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+46-59contrib/bmake/bmake.1
+46-59contrib/bmake/make.1
+82-0contrib/bmake/ChangeLog
+40-40contrib/bmake/unit-tests/moderrs.exp
+22-55contrib/bmake/meta.c
+40-30contrib/bmake/var.c
+276-24387 files not shown
+1,284-62093 files

HardenedBSD/src 9c572bfcontrib/libpcap configure pcap-linux.c, contrib/tcpdump tcpdump.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+361-360contrib/libpcap/configure
+566-102contrib/libpcap/pcap-linux.c
+0-508contrib/tcpdump/missing/snprintf.c
+404-50contrib/libpcap/nametoaddr.c
+311-47contrib/tcpdump/tcpdump.c
+225-123contrib/libpcap/pcap-dlpi.c
+1,867-1,190137 files not shown
+5,157-3,166143 files

HardenedBSD/ports faa6819japanese/navi2ch pkg-plist, security/strongswan pkg-plist

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+595-54sysutils/fwupd/pkg-plist
+235-389sysutils/zellij/distinfo
+115-193sysutils/zellij/Makefile.crates
+73-73japanese/navi2ch/pkg-plist
+56-37sysutils/fwupd/files/patch-libfwupdplugin_fu-freebsd-efivars.c
+48-4security/strongswan/pkg-plist
+1,122-75062 files not shown
+1,600-96268 files

HardenedBSD/ports 2d6221asecurity/strongswan pkg-plist Makefile, security/strongswan/files patch-conf_Makefile.in patch-src_libcharon_plugins_smp_smp.c

security/strongswan: Update 6.0.4 => 6.0.5 (CVE-2026-25075)

Changelog:
https://github.com/strongswan/strongswan/releases/tag/6.0.5

While here:
- Switch from post-install + "if PORT_OPTIONS:MVICI" to
  post-install-VICI-on.
- Add option FIPS_PRF - software implementation plugin.
- Improve plist.
- Refresh patches.

Reported by:    Mike Bressem <mike at bressem.com> (via email)
Approved by:    blanket (fix CVE)
Security:       CVE-2026-25075
Sponsored by:   UNIS Labs
MFH:            2026Q2
DeltaFile
+48-4security/strongswan/pkg-plist
+18-6security/strongswan/files/patch-conf_Makefile.in
+5-5security/strongswan/Makefile
+4-4security/strongswan/files/patch-src_libcharon_plugins_smp_smp.c
+3-3security/strongswan/distinfo
+2-2security/strongswan/files/patch-src_libstrongswan_plugins_openssl_openssl__plugin.c
+80-241 files not shown
+82-267 files

HardenedBSD/ports 75ee539japanese/navi2ch pkg-plist Makefile

japanese/navi2ch: Refactor

Lint with portclippy.
Switch LISPDIR variable to NLISPDIR and add NICONDIR.
Switch from INSTALL_DATA to COPYTREE_SHARE.

PR:             291381
Approved by:    osa (mentor)
DeltaFile
+73-73japanese/navi2ch/pkg-plist
+10-10japanese/navi2ch/Makefile
+83-832 files

HardenedBSD/ports f8cebdfjapanese/navi2ch Makefile

japanese/navi2ch: Take maintainership

Remove the mona font from the default option as ASCII art is becoming
obsolete.

PR:             291381
Approved by:    hrs (maintainer timeout)
Approved by:    osa (mentor)
DeltaFile
+2-3japanese/navi2ch/Makefile
+2-31 files

HardenedBSD/ports 4225bc1japanese/navi2ch pkg-message distinfo, japanese/navi2ch/files patch-navi2ch-list.el patch-navi2ch-multibbs.el

japanese/navi2ch: Switch RUN_DEPENDS from p5-2chproxy to proxy2ch

Update GH_TAGNAME from faebfd1 to 7811dba.
Add NO_ARCH=yes.
Add a patch to accommodate the url change.
Update pkg-descr.

Changelog:
https://github.com/naota/navi2ch/compare/faebfd1...7811dba

PR:             291381
Approved by:    hrs (maintainer timeout)
Approved by:    osa (mentor)
DeltaFile
+28-0japanese/navi2ch/files/patch-navi2ch-list.el
+20-0japanese/navi2ch/files/patch-navi2ch-multibbs.el
+12-3japanese/navi2ch/files/patch-navi2ch-vars.el
+15-0japanese/navi2ch/files/patch-navi2ch-article.el
+4-4japanese/navi2ch/pkg-message
+3-3japanese/navi2ch/distinfo
+82-102 files not shown
+89-138 files

HardenedBSD/ports e9587b9sysutils/zellij distinfo Makefile.crates, sysutils/zellij/files patch-zellij-client_src_lib.rs patch-cargo-crates_nix-0.23.1_src_sys_event.rs

sysutils/zellij: Update to 0.44.0

- Add dependency on SQLite
- Remove non-applicable patches
- Add a patch to fix panic on terminal close [0]

PR:             294250 [0]

Co-authored-by: Michael Johnson <ahze at ahze.net>
DeltaFile
+235-389sysutils/zellij/distinfo
+115-193sysutils/zellij/Makefile.crates
+52-0sysutils/zellij/files/patch-zellij-client_src_lib.rs
+27-0sysutils/zellij/files/patch-cargo-crates_nix-0.23.1_src_sys_event.rs
+26-0sysutils/zellij/files/patch-cargo-crates_polling-2.2.0_src_kqueue.rs
+6-14sysutils/zellij/files/patch-Cargo.lock
+461-5963 files not shown
+468-6149 files

HardenedBSD/ports d403e15games/freeciv21 distinfo Makefile

games/freeciv21: Update 3.1.0 => 3.1.1

This is a security release:
https://github.com/longturn/freeciv21/security/advisories/GHSA-f76g-6w3f-f6r3

Changelog:
https://github.com/longturn/freeciv21/releases/tag/v3.1.1

PR:             293964
Approved by:    makc (mentor)
DeltaFile
+3-3games/freeciv21/distinfo
+1-1games/freeciv21/Makefile
+4-42 files

HardenedBSD/ports 9644211deskutils/py-vit Makefile distinfo

deskutils/py-vit: Update 2.3.3 => 2.3.4

Changelog:
https://github.com/vit-project/vit/releases/tag/v2.3.4

Port changes:
* Remove unneeded GH_PROJECT.
* Remove extra arguments from USES=python.

PR:             294252
Reported by:    Thierry Dussuet <thierry.dussuet at protonmail.com> (maintainer)
Approved by:    maintainer, vvd (co-mentor)
DeltaFile
+3-3deskutils/py-vit/Makefile
+3-3deskutils/py-vit/distinfo
+6-62 files

HardenedBSD/ports 68b3e1adevel/samurai Makefile distinfo, devel/samurai/files patch-Makefile

devel/samurai: Update to 1.3

* Use INSTALL_* helpers for binary and manpages instead cp which
  project Makefile uses
* Define additional CFLAGS in port makefile rather than in a patch

Changelog: https://github.com/michaelforney/samurai/releases/tag/1.3

Approved by:    maintainer (by mail)
DeltaFile
+13-6devel/samurai/Makefile
+4-8devel/samurai/files/patch-Makefile
+3-3devel/samurai/distinfo
+20-173 files

HardenedBSD/ports 9a16505audio/libopenmpt distinfo Makefile

audio/libopenmpt: Update to 0.8.5

Fixes possible out-of-bounds sample data read in a specific
combination of reverse sample playback + offset past sample loop

* Remove gmake dependency
* Add USES= pathfix to fix install location of pkgconfig file
  and make build log consistent

Changelog:
https://lib.openmpt.org/libopenmpt/2026/03/22/security-updates-0.8.5-0.7.18-0.6.27-0.5.41-0.4.53/

PR:             294006
Approved by:    maintainer timeout, 2+ weeks
DeltaFile
+3-3audio/libopenmpt/distinfo
+2-2audio/libopenmpt/Makefile
+5-52 files

HardenedBSD/ports 9b7f3c1sysutils/fwupd pkg-plist, sysutils/fwupd/files patch-libfwupdplugin_fu-freebsd-efivars.c patch-plugins_uefi-capsule_fu-uefi-capsule-backend-freebsd.c

sysutils/fwupd: Update to 2.1.1

- make uefi-capsules plugin work
- use base libefivar instead of devel/efivar
- use USES=inotify

Many thanks to Sergii Dmytruk for fixing UEFI support!

Differential Revision:  https://reviews.freebsd.org/D55590
DeltaFile
+595-54sysutils/fwupd/pkg-plist
+56-37sysutils/fwupd/files/patch-libfwupdplugin_fu-freebsd-efivars.c
+35-0sysutils/fwupd/files/patch-plugins_uefi-capsule_fu-uefi-capsule-backend-freebsd.c
+15-0sysutils/fwupd/files/patch-plugins_uefi-capsule_fu-uefi-common.c
+14-0sysutils/fwupd/files/patch-libfwupdplugin_fu-efi-hard-drive-device-path.c
+9-5sysutils/fwupd/files/patch-libfwupdplugin_fu-common-freebsd.c
+724-9612 files not shown
+771-13518 files

HardenedBSD/ports af51c26devel/jjui pkg-message distinfo

devel/jjui: Update 0.9.10 => 0.10.2

Changelogs:
* https://github.com/idursun/jjui/releases/tag/v0.9.11
* https://github.com/idursun/jjui/releases/tag/v0.9.12
* https://github.com/idursun/jjui/releases/tag/v0.10.0
* https://github.com/idursun/jjui/releases/tag/v0.10.1
* https://github.com/idursun/jjui/releases/tag/v0.10.2

Port changes:
* Add note about breaking change from v0.10 to pkg-message.

PR:             294275
Reported by:    Al Hoang <hoanga at gmail.com> (maintainer)
Approved by:    maintainer, vvd (co-mentor)
MFH:            2026Q2
DeltaFile
+23-0devel/jjui/pkg-message
+5-5devel/jjui/distinfo
+1-2devel/jjui/Makefile
+29-73 files

HardenedBSD/ports 825d764math/octave-forge-dicom distinfo Makefile

math/octave-forge-dicom: Update to 0.7.2.
DeltaFile
+3-3math/octave-forge-dicom/distinfo
+1-2math/octave-forge-dicom/Makefile
+4-52 files

HardenedBSD/src 6af32a9contrib/tcpdump tcpdump.c print-icmp6.c, contrib/tcpdump/missing snprintf.c

tcpdump: Update to 4.99.6

Changes:        https://github.com/the-tcpdump-group/tcpdump/blob/tcpdump-4.99/CHANGES
Obtained from:  https://www.tcpdump.org/release/tcpdump-4.99.6.tar.xz
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D55578
Differential Revision:  https://reviews.freebsd.org/D55871

(cherry picked from commit e6083790f217ba7f89cd2957922bd45e35466359)
DeltaFile
+0-508contrib/tcpdump/missing/snprintf.c
+311-47contrib/tcpdump/tcpdump.c
+84-103contrib/tcpdump/print-icmp6.c
+79-105contrib/tcpdump/print-egp.c
+110-56contrib/tcpdump/CMakeLists.txt
+54-84contrib/tcpdump/print-mobility.c
+638-90363 files not shown
+1,581-1,65869 files

HardenedBSD/src cd87e82usr.sbin/ipfwpcap ipfwpcap.c

ipfwpcap: Fix build after libpcap 1.10.6 update

pcap-int.h now references SIZEOF_TIME_T from libpcap's config.h, which
is not available to consumers of the internal header outside of the
libpcap build.  Switch to the public <pcap.h> header and replace the
direct FILE* casts and ferror()/fflush() calls with pcap_dump_flush(3),
which is the correct public API for flushing a pcap dump file.

Sponsored by:   The FreeBSD Foundation

(cherry picked from commit a0b3ef1952603ebf0307ca723b03e5a71598dd5a)
DeltaFile
+2-7usr.sbin/ipfwpcap/ipfwpcap.c
+2-71 files

HardenedBSD/src e0ae00fcontrib/libpcap configure pcap-linux.c, lib/libpcap config.h

libpcap: Update to 1.10.6

Changes:        https://raw.githubusercontent.com/the-tcpdump-group/libpcap/89e982c37c36ad0bf9f10b7ded421cb42422effa/CHANGES
Reviewed by:    bms, emaste
Obtained from:  https://www.tcpdump.org/release/libpcap-1.10.6.tar.gz
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D55545
Differential Revision:  https://reviews.freebsd.org/D55858

(cherry picked from commit 16cef5f7a65588def71db4fdfa961f959847e3b6)
DeltaFile
+361-360contrib/libpcap/configure
+566-102contrib/libpcap/pcap-linux.c
+404-50contrib/libpcap/nametoaddr.c
+225-123contrib/libpcap/pcap-dlpi.c
+245-101contrib/libpcap/gencode.c
+209-54lib/libpcap/config.h
+2,010-79067 files not shown
+3,574-1,50173 files

HardenedBSD/ports 1697a84mail/smtprelay distinfo Makefile

mail/smtprelay: Update to 1.13.2
DeltaFile
+5-5mail/smtprelay/distinfo
+1-2mail/smtprelay/Makefile
+6-72 files

HardenedBSD/ports 409003anet/rclone distinfo Makefile

net/rclone: Update 1.73.2 => 1.73.3

Changelog:
https://rclone.org/changelog/#v1-73-3-2026-03-23

PR:             294227
Security:       CVE-2026-33186
Security:       GHSA-6g7g-w4f8-9c9x
Sponsored by:   UNIS Labs
DeltaFile
+5-5net/rclone/distinfo
+1-1net/rclone/Makefile
+6-62 files

HardenedBSD/ports 2395191devel/gnu-efi Makefile

devel/gnu-efi: Remove stripping of object files

Stripping removes all symbols from CRTs and breaks applications linked
against gnu-efi (everything builds, but resulting file is not a valid
PE executable due to the way objcopy operates.

Approved by:    maintainer timeout (6 weeks)
Differential Revision:          https://reviews.freebsd.org/D55590
DeltaFile
+1-3devel/gnu-efi/Makefile
+1-31 files

HardenedBSD/src 36fe65csys/sys param.h

Bump __FreeBSD_version to 1600015 after linuxkpi changes for DRM 6.11

As of this commit, all changes to linuxkpi required by the DRM drivers
from Linux 6.11 were committed.

Sponsored by:   The FreeBSD Foundation
DeltaFile
+1-1sys/sys/param.h
+1-11 files

HardenedBSD/src 0eaa576sys/compat/linuxkpi/common/include/linux ascii85.h

linuxkpi: Add <linux/ascii85.h>

This is used by the i915 DRM driver for some time to log more details
about a GPU error, but the code was commented out.

Reviewed by:    emaste
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D56282
DeltaFile
+46-0sys/compat/linuxkpi/common/include/linux/ascii85.h
+46-01 files

HardenedBSD/src ece26dbsys/compat/linuxkpi/common/include/linux minmax.h

linuxkpi: Define `MIN_T()` and `MAX_T()`

There are the same as `MIN()` and `MAX()` except that they take a type
to cast both arguments to compare.

The DRM generic code started to use it in Linux 6.11.

Reviewed by:    bz, emaste
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55739
DeltaFile
+3-0sys/compat/linuxkpi/common/include/linux/minmax.h
+3-01 files

HardenedBSD/src 5ee604bsys/compat/linuxkpi/common/include/linux sizes.h

linuxkpi: Define missing `SZ_*` below 1 kib

The amdgpu DRM driver started to use it in Linux 6.11.

Reviewed by:    bz, emaste
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55740
DeltaFile
+11-0sys/compat/linuxkpi/common/include/linux/sizes.h
+11-01 files

HardenedBSD/src 91e5483sys/compat/linuxkpi/common/include/linux pci.h

linuxkpi: Document why <linux/pci.h> can't include <linux/ioport.h>

Reviewed by:    bz, emaste
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55738
DeltaFile
+11-0sys/compat/linuxkpi/common/include/linux/pci.h
+11-01 files

HardenedBSD/src ddf89d8sys/compat/linuxkpi/common/include/linux ioport.h

linuxkpi: Add field `flags` to `struct resource`

This in the Linux version of `struct resource`, not the FreeBSD native
structure.

The amdgpu DRM driver started to use it in Linux 6.11.

Reviewed by:    bz
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55737
DeltaFile
+1-0sys/compat/linuxkpi/common/include/linux/ioport.h
+1-01 files

HardenedBSD/src 356d6f4sys/compat/linuxkpi/common/include/linux/mfd core.h, sys/compat/linuxkpi/dummy/include/linux/mfd core.h

linuxkpi: Add <linux/mfd/core.h>

To be exact, there was a dummy file with no content before. This commit
defines `struct mfd_cell` and adds two function stubs.

The function stubs are not implemented but still return success. They
log a message to indicate they need to be implemented.

Also, unlike Linux, <linux/mfd/core.h> includes <linux/ioport.h>. This
works around the fact that we can't include <linux/ioport.h> from
<linux/pci.h>, due to a conflict with the FreeBSD-native `struct
resource`.

The amdgpu DRM driver started to use it in Linux 6.11.

Reviewed by:    bz, emaste
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55736
DeltaFile
+49-0sys/compat/linuxkpi/common/include/linux/mfd/core.h
+0-0sys/compat/linuxkpi/dummy/include/linux/mfd/core.h
+49-02 files

HardenedBSD/src 7bf9368sys/compat/linuxkpi/common/include/linux kconfig.h

linuxkpi: Define `CONFIG_PGTABLE_LEVELS`

This is a kernel configuration constant that is expected to be defined.

The DRM generic code started to use it in Linux 6.11.

Reviewed by:    bz
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55733
DeltaFile
+35-0sys/compat/linuxkpi/common/include/linux/kconfig.h
+35-01 files