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/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/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

HardenedBSD/src ca6ea6dsys/compat/linuxkpi/common/include/linux linux_logo.h

linuxkpi: Add <linux/linux_logo.h>

It only defines the `struct linux_logo` structure for now. It does not
define any actual logo.

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

HardenedBSD/src be92ad6sys/compat/linuxkpi/common/include/asm pgtable.h

linuxkpi: Define `PMD_SHIFT`

For now, only define it for x86 architectures.

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/D55734
DeltaFile
+34-0sys/compat/linuxkpi/common/include/asm/pgtable.h
+34-01 files

HardenedBSD/src f2ad06asys/compat/linuxkpi/common/include/linux kmsg_dump.h

linuxkpi: Add mising functions in <linux/kmsg_dump.h>

The DRM generic code started to use `kmsg_dump_get_buffer()` and
`kmsg_dump_rewind()` in Linux 6.11.

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

HardenedBSD/src 5625130sys/compat/linuxkpi/common/include/linux instruction_pointer.h

linuxkpi: Define `_THIS_IP_`

For now, the macro is not implemented and it returns 0.

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/D55731
DeltaFile
+2-0sys/compat/linuxkpi/common/include/linux/instruction_pointer.h
+2-01 files

HardenedBSD/src 362136esys/compat/linuxkpi/common/include/linux string.h

linuxkpi: Add `strtomem()` and `strtomem_pad()`

The DRM generic code started to use `strtomem_pad()` in Linux 6.11.

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

HardenedBSD/src 8af854esys/compat/linuxkpi/common/include/linux instruction_pointer.h kernel.h

linuxkpi: Move `_RET_IP_` to <linux/instruction_pointer.h>

This matches the declaration on Linux.

Reviewed by:    bz, emaste
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55730
DeltaFile
+13-0sys/compat/linuxkpi/common/include/linux/instruction_pointer.h
+1-2sys/compat/linuxkpi/common/include/linux/kernel.h
+14-22 files

HardenedBSD/src b2751d9share/mk local.sys.env.mk

We also get _HOST_OSREL from host-target.mk
DeltaFile
+1-1share/mk/local.sys.env.mk
+1-11 files

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

Merge bmake-20260313

Merge commit 'fe271bdb43cf88ee129d94c0e286fe618fd28e89'
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-24371 files not shown
+999-61677 files

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

Import bmake-20260313

Intersting/relevant changes since bmake-20251111

ChangeLog since bmake-20251111

2026-03-12  Simon J Gerraty  <sjg at beast.crufty.net>

        * VERSION (_MAKE_VERSION): 20260313
        Merge with NetBSD make, pick up
        o make: ensure .MAKE.SAVE_DOLLARS is initialized so makefiles like
        sys.vars.mk can test its value to know how to deal with macros
        that need to save '$' during ':='.

        * Makefile: default MAKE_SAVE_DOLLARS_DEFAULT to "no"
        for traditional behavior.

2026-03-10  Simon J Gerraty  <sjg at beast.crufty.net>


    [108 lines not shown]
DeltaFile
+46-59make.1
+46-59bmake.1
+82-0ChangeLog
+40-40unit-tests/moderrs.exp
+22-55meta.c
+40-30var.c
+276-24368 files not shown
+958-60374 files

HardenedBSD/src aa20f56lib/msun/man fmax.3, release/packages generate-set-ucl.lua generate-ucl.lua

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+67-0sys/fs/nfs/nfsid.h
+0-23sys/fs/nfs/nfs.h
+8-5lib/msun/man/fmax.3
+1-1release/packages/generate-set-ucl.lua
+1-1release/packages/generate-ucl.lua
+2-0usr.bin/yes/tests/yes_test.sh
+79-304 files not shown
+82-3110 files

HardenedBSD/src f0f0293lib/msun/man fmax.3, release/packages generate-ucl.lua generate-set-ucl.lua

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+67-0sys/fs/nfs/nfsid.h
+0-23sys/fs/nfs/nfs.h
+8-5lib/msun/man/fmax.3
+1-1release/packages/generate-ucl.lua
+2-0usr.bin/yes/tests/yes_test.sh
+1-1release/packages/generate-set-ucl.lua
+79-304 files not shown
+82-3110 files

HardenedBSD/src 8f2646ausr.bin/diff pr.c diffreg.c, usr.bin/diff3 diff3.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+37-24usr.bin/diff/pr.c
+28-20usr.bin/diff3/diff3.c
+5-0usr.bin/diff/diffreg.c
+70-443 files

HardenedBSD/src c5961b6usr.bin/yes/tests yes_test.sh

yes: fix argv test race between fork and exec

The argv test checks ps(1) output immediately after backgrounding yes(1), but
the forked child briefly shows the parent shell's argv before exec(2) replaces it.
This caused intermittent failures where ps(1) captured the atf shell wrapper
command line instead of "yes y".

Approved by:    des
Sponsored by:   Netflix
Differential Revision:  https://reviews.freebsd.org/D56231
DeltaFile
+2-0usr.bin/yes/tests/yes_test.sh
+2-01 files

HardenedBSD/src 63d0e3erelease/packages generate-set-ucl.lua generate-ucl.lua

packages: Fix build with libucl 0.9.3

In libucl 0.9.3, macros and includes are disabled by default when
creating a new UCL parser.  This breaks the package build, which
relies on includes.  Fix this by explicitly passing zero flags
to ucl.parser().

MFC after:      3 days
Fixes:          abda442d92fd ("contrib/libucl:  Import libucl 0.9.3")
Reviewed by:    kevans, bapt
Reported by:    freebsd at walstatt-de.de
Sponsored by:   https://www.patreon.com/bsdivy
Differential Revision:  https://reviews.freebsd.org/D56266
DeltaFile
+1-1release/packages/generate-set-ucl.lua
+1-1release/packages/generate-ucl.lua
+2-22 files

HardenedBSD/src 7764e9clib/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
DeltaFile
+8-5lib/msun/man/fmax.3
+8-51 files

HardenedBSD/src f5d3d35usr.bin/diff pr.c

diff: use O_CLOEXEC on pipes

This only simplifies the code, no functional changes expected

MFC After:      1 week

(cherry picked from commit c8d40bf8ecc60cc15e3904410db62065ea681fdc)
DeltaFile
+2-5usr.bin/diff/pr.c
+2-51 files