HardenedBSD/src 2004f6bshare/man/man5 linprocfs.5

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+81-8share/man/man5/linprocfs.5
+81-81 files

HardenedBSD/src 1839dd3share/man/man5 linprocfs.5

linprocfs.5: Synchronize style and format with 15-STABLE

This is a logical backport of 1d193b1808098328d3ad16b436a329b258935e0c
including the changes happended after that.

Reviewed by:    fernape
Differential Revision:  https://reviews.freebsd.org/D54408
DeltaFile
+81-8share/man/man5/linprocfs.5
+81-81 files

HardenedBSD/src 9aea622. COPYRIGHT, sys/sys copyright.h

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+1-1sys/sys/copyright.h
+1-1COPYRIGHT
+2-22 files

HardenedBSD/src 78b1001. COPYRIGHT, sys/sys copyright.h

HBSD: Welcome 2026!

"Maybe this year will be better than the last." -- Counting Crows

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+1-1COPYRIGHT
+1-1sys/sys/copyright.h
+2-22 files

HardenedBSD/src 38b81b2. COPYRIGHT, sys/sys copyright.h

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+2-2sys/sys/copyright.h
+1-1COPYRIGHT
+3-32 files

HardenedBSD/src 55848b7. COPYRIGHT, sys/sys copyright.h

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+2-2sys/sys/copyright.h
+1-1COPYRIGHT
+3-32 files

HardenedBSD/src 8f41677. COPYRIGHT, sys/sys copyright.h

copyright: Happy New Year 2026!

We are now one quarter into the 21st century.
DeltaFile
+2-2sys/sys/copyright.h
+1-1COPYRIGHT
+3-32 files

HardenedBSD/src 4a36801. Makefile.inc1, contrib/file/src apprentice.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+62-19tools/build/depend-cleanup.sh
+24-16Makefile.inc1
+14-0share/man/man5/src.conf.5
+5-0share/mk/src.opts.mk
+5-0tools/build/options/WITHOUT_DEPEND_CLEANUP
+2-3contrib/file/src/apprentice.c
+112-386 files

HardenedBSD/src 3dbed3d. Makefile.inc1, contrib/file/src apprentice.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+62-19tools/build/depend-cleanup.sh
+24-16Makefile.inc1
+14-0share/man/man5/src.conf.5
+2-3contrib/file/src/apprentice.c
+5-0share/mk/src.opts.mk
+5-0tools/build/options/WITHOUT_DEPEND_CLEANUP
+112-386 files

HardenedBSD/src aa611fatools/build depend-cleanup.sh

depend-cleanup.sh: Reduce repetition

MFC after:      1 week
Reviewed by:    imp
Differential Revision:  https://reviews.freebsd.org/D54329
DeltaFile
+11-9tools/build/depend-cleanup.sh
+11-91 files

HardenedBSD/src 1d52d5c. Makefile.inc1, share/man/man5 src.conf.5

depend-cleanup: Force a clean build when options change

Similar to the build epoch check, cache a list of source options in the
object tree, and force a clean build if the cached list does not match
the current list, after filtering out options which are known not to
affect the build (e.g. CLEAN, TESTS, WARNS).

This also adds a DEPEND_CLEANUP option (which defaults to yes unless
the CLEAN option is set) which can be used to skip depend-cleanup for
faster incremental builds.

MFC after:      1 week
Reviewed by:    imp
Differential Revision:  https://reviews.freebsd.org/D52011
DeltaFile
+51-10tools/build/depend-cleanup.sh
+14-0share/man/man5/src.conf.5
+4-2Makefile.inc1
+5-0tools/build/options/WITHOUT_DEPEND_CLEANUP
+5-0share/mk/src.opts.mk
+79-125 files

HardenedBSD/src 2c0e9a7. Makefile.inc1

Makefile.inc1: Make NO_INSTALLKERNEL less of a hack

Rather than adding a dummy entry which requires everyone to know to skip
it, introduce a new INSTALLEXTRAKERNELS which contains the set of
kernels to install as kernel.KERNCONF.

Reviewed by:    ivy
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54291
DeltaFile
+20-14Makefile.inc1
+20-141 files

HardenedBSD/src 3904753contrib/file/src apprentice.c

Merge commit faa5141b9be4 from file git (by Christos Zoulas):

  PR/656: harry.sintonen: Fix bug in byte swapping that was caused by the change to make flags uint16_t and cont_level uint8_t.

This fixes using a magic.mgc built with a different endianness than
file(1) itself, e.g. when building powerpc64 on amd64.

PR:             292079
Fixes:          ae316d1d1cff ("MFV: file 5.46.")
MFC after:      3 days
DeltaFile
+2-3contrib/file/src/apprentice.c
+2-31 files

HardenedBSD/src d5e0be0sys/fs/nfsclient nfs_clvnops.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+2-1sys/fs/nfsclient/nfs_clvnops.c
+2-11 files

HardenedBSD/src c010286sys/fs/nfsclient nfs_clvnops.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+2-1sys/fs/nfsclient/nfs_clvnops.c
+2-11 files

HardenedBSD/src 19db59fusr.sbin/nfsd nfsd.8

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+60-2usr.sbin/nfsd/nfsd.8
+60-21 files

HardenedBSD/src c2b8a5cusr.sbin/nfsd nfsd.8

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+60-2usr.sbin/nfsd/nfsd.8
+60-21 files

HardenedBSD/src e8567desys/fs/nfsclient nfs_clvnops.c

nfscl: Fix handling of POSIX draft default ACLs

A POSIX draft default ACL may not exist.  As such,
an ACL with zero ACEs needs to be allowed.

This patch fixes acquisition of POSIX draft default
ACLs when they do not exist on the directory.

Fixes:  a35bbd5d9f5f ("nfscommon: Add some support for POSIX draft ACLs")
DeltaFile
+2-1sys/fs/nfsclient/nfs_clvnops.c
+2-11 files

HardenedBSD/src ab5ec8cusr.sbin/nfsd nfsd.8

nfsd.8: Add a short paragraph w.r.t. NFSv3 vs NFSv4 setup

The nfsd can be configured to support NFSv3, NFSv4 or both
of them.

This patch adds a short paragraph to nfsd.8 to explain this.

This is a content change.

(cherry picked from commit 4f184fd35d81bbd85284d47d2a65aeece67e87d4)
DeltaFile
+60-2usr.sbin/nfsd/nfsd.8
+60-21 files

HardenedBSD/src 785d429usr.sbin/nfsd nfsd.8

nfsd.8: Add a short paragraph w.r.t. NFSv3 vs NFSv4 setup

The nfsd can be configured to support NFSv3, NFSv4 or both
of them.

This patch adds a short paragraph to nfsd.8 to explain this.

This is a content change.

(cherry picked from commit 4f184fd35d81bbd85284d47d2a65aeece67e87d4)
DeltaFile
+60-2usr.sbin/nfsd/nfsd.8
+60-21 files

HardenedBSD/src e951f78sbin/pfctl parse.y

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+0-1sbin/pfctl/parse.y
+0-11 files

HardenedBSD/src c962095sbin/pfctl parse.y

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+0-1sbin/pfctl/parse.y
+0-11 files

HardenedBSD/src 4fecc8esbin/pfctl parse.y

pfctl: remove duplicate "va" entry

It turns out we'd already added this a few years ago, so didn't need to
add it again.

Fixes:          190c1f3d9326
Reported by:    Seth Hoffert <seth.hoffert at gmail.com>
Sponsored by:   Rubicon Communications, LLC ("Netgate")
DeltaFile
+0-1sbin/pfctl/parse.y
+0-11 files

HardenedBSD/src 8ab44d0lib/libpfctl libpfctl.c libpfctl.h, sbin/pfctl pfctl_radix.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+68-1lib/libpfctl/libpfctl.c
+40-0sys/netpfil/pf/pf_nl.c
+6-16sbin/pfctl/pfctl_radix.c
+2-2tests/sys/netpfil/pf/nat.sh
+2-0lib/libpfctl/libpfctl.h
+2-0sys/netpfil/pf/pf_nl.h
+120-191 files not shown
+121-197 files

HardenedBSD/src ffe961flib/libpfctl libpfctl.c libpfctl.h, sbin/pfctl pfctl_radix.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+68-1lib/libpfctl/libpfctl.c
+40-0sys/netpfil/pf/pf_nl.c
+6-16sbin/pfctl/pfctl_radix.c
+2-2tests/sys/netpfil/pf/nat.sh
+2-0lib/libpfctl/libpfctl.h
+2-0sys/netpfil/pf/pf_nl.h
+120-191 files not shown
+121-197 files

HardenedBSD/src b2717ddsys/arm/allwinner aw_rtc.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+12-11sys/arm/allwinner/aw_rtc.c
+12-111 files

HardenedBSD/src 4a15a35sys/arm/allwinner aw_rtc.c

aw_rtc: bump settime() delays

There are delay loops, checking the BUSY status bit, before writing to
the date or time registers. Each iteration contains a 1usec delay, for a
maximum of 70 iterations.

This is frequently not enough on the D1 platform, where the message is
emitted:

  rtc0: could not set date, RTC busy

Bump the loop delay to 10usecs each, and the maximum number of
iterations to 150, for a maximum delay of 1.5msecs between each write of
the register.

In my testing this seems to be adequate.

The loop variable is renamed for clarity/simplicity.


    [6 lines not shown]
DeltaFile
+12-11sys/arm/allwinner/aw_rtc.c
+12-111 files

HardenedBSD/src 2eec2bctests/sys/netpfil/pf nat.sh

pf tests: avoid cleanup failures on skipped tests

If we skip the nat:binat_* tests (e.g. because pf.ko isn't loaded) the
inetd_tester.pid file isn't created. We still run the cleanup function,
which tries to use this file to clean up the test environment. This
results in 'broken: Test case cleanup did not terminate successfully'.
Avoid this by checking if the pid file exists before using it.

Sponsored by:   Rubicon Communications, LLC ("Netgate")
DeltaFile
+2-2tests/sys/netpfil/pf/nat.sh
+2-21 files

HardenedBSD/src 96c7e70lib/libpfctl libpfctl.c, sbin/pfctl pfctl_radix.c

pf: convert DIOCRCLRASTATS to netlink

Sponsored by:   Rubicon Communications, LLC ("Netgate")
DeltaFile
+60-18lib/libpfctl/libpfctl.c
+40-0sys/netpfil/pf/pf_nl.c
+7-1sbin/pfctl/pfctl_radix.c
+2-0sys/netpfil/pf/pf_nl.h
+109-194 files

HardenedBSD/src c2e7a52lib/libpfctl libpfctl.c libpfctl.h, sbin/pfctl pfctl_radix.c

pf: move DIOCRCLRASTATS into libpfctl

Sponsored by:   Rubicon Communications, LLC ("Netgate")
DeltaFile
+25-0lib/libpfctl/libpfctl.c
+1-17sbin/pfctl/pfctl_radix.c
+2-0lib/libpfctl/libpfctl.h
+28-173 files