HardenedBSD/src 0a7a549sbin/ipfw ipfw.8, share/man/man5 src.conf.5

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+40-49sys/cam/scsi/scsi_da.c
+21-3sbin/ipfw/ipfw.8
+7-7share/man/man9/locking.9
+8-1share/man/man5/src.conf.5
+6-0tools/build/options/WITH_REPRODUCIBLE_PATHS
+4-1usr.sbin/bsdinstall/scripts/pkgbase.in
+86-618 files not shown
+93-6714 files

HardenedBSD/src 307d36dsbin/ipfw ipfw.8, share/man/man9 locking.9

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+40-49sys/cam/scsi/scsi_da.c
+21-3sbin/ipfw/ipfw.8
+7-7share/man/man9/locking.9
+1-1share/vt/fonts/Makefile
+69-604 files

HardenedBSD/src fb18070share/man/man5 src.conf.5

HBSD: Regen src.conf.5.

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-4share/man/man5/src.conf.5
+0-41 files

HardenedBSD/src e561e15share/mk src.opts.mk

HBSD: Resolve merge conflict for share/mk/src.opts.mk

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-3share/mk/src.opts.mk
+0-31 files

HardenedBSD/src 2d1e879share/man/man5 src.conf.5, share/mk src.opts.mk bsd.debug.mk

Merge remote-tracking branch 'internal/freebsd/current/main' into hardened/current/master

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
        share/mk/src.opts.mk (unresolved)
DeltaFile
+11-0share/man/man5/src.conf.5
+6-0tools/build/options/WITH_REPRODUCIBLE_PATHS
+4-0share/mk/src.opts.mk
+1-1sys/conf/kern.post.mk
+1-1share/mk/bsd.debug.mk
+1-1sys/conf/kmod.mk
+24-31 files not shown
+25-37 files

HardenedBSD/src 3cd0bccrelease Makefile, usr.sbin/bsdinstall Makefile

HBSD: Some pkgbase related changes

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+4-1usr.sbin/bsdinstall/scripts/pkgbase.in
+1-1usr.sbin/bsdinstall/Makefile
+0-1release/Makefile
+5-33 files

HardenedBSD/src e510471sbin/ipfw ipfw.8

ipfw.8: document how to delete nat configuration instance

MFC after:      3 days
DeltaFile
+15-1sbin/ipfw/ipfw.8
+15-11 files

HardenedBSD/src b67a7c0sys/cam/scsi scsi_da.c

scsi: Make all da error messages greppable

Don't split the error messages across lines. We used to do that ages
ago, but have relaxed style(9) to encourage the opposite so all error
messages can be grepped. This constantly slows me down when I'm helping
others find issues, so start here by splitting according to normal
style(9) rules with a relaxed line length of 90.

Sponsored by:           Netflix
DeltaFile
+40-49sys/cam/scsi/scsi_da.c
+40-491 files

HardenedBSD/src 9fdf49esbin/ipfw ipfw.8

ipfw.8: fix misprint after previous change

rulese -> ruleset

MFC after:      3 days
X-MFC-with:     a7b8a5d37bcb0009297962137bfb6c6570e5af12
DeltaFile
+1-1sbin/ipfw/ipfw.8
+1-11 files

HardenedBSD/src a7b8a5dsbin/ipfw ipfw.8

ipfw.8: fix documentation bug for setmark

A mark set with "setmark" keyword is intended to be "sticky"
and documented as such but in fact it is not yet,
as current implementation lacks "sticky" feature
and its implementation will be not MFC'd, most probably.

Correct the manual page until the implementation improved.

MFC after:      3 days
Discussed with: Boris Lytochkin <lytboris at gmail.com> (author)
DeltaFile
+6-2sbin/ipfw/ipfw.8
+6-21 files

HardenedBSD/src 176075eshare/man/man9 locking.9

locking.9: Tweak the table column width to fit 80 characters

While here, add some white spaces to improve the readability of source
code.

Reviewed by:    ziaee, #manpages
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54121
DeltaFile
+7-7share/man/man9/locking.9
+7-71 files

HardenedBSD/src c910c7ashare/vt/fonts Makefile

vt: Remove .fnt.uu from Makefile SUFFIXES

The uudecode make rule was removed years ago.

Fixes: 68510f3bac15 ("Remove uudecode make rule for vt fonts")
DeltaFile
+1-1share/vt/fonts/Makefile
+1-11 files

HardenedBSD/src faeaa25share/man/man5 src.conf.5, share/mk bsd.debug.mk src.opts.mk

kernel: MK_REPRODUCIBLE_PATHS for full paths vs /usr/src

There are many environments that you do not want the paths to be
canonicalized. For example, if I always build a product from a specific
path in a jail that's dependent on the product version, I don't want
that to be sanitized to /usr/src because when I have profiling tools run
against multiple kernels, I can't do A/B testing and results processing
if everything points to /usr/src (sadly, the profiling tools cannot
remap back to the original like gdb can). Since we need both active at
the same time, symbloic link fallbacks don't work.

We do want the rest of the build to be reproducible, however. We'll get
the same binaries if we rebuild later since we always rebuild with the
same path.

Turn them both on for maximum reproduction for environments where that
cannot be guaranteed.

Sponsored by:           Netflix

    [2 lines not shown]
DeltaFile
+8-1share/man/man5/src.conf.5
+6-0tools/build/options/WITH_REPRODUCIBLE_PATHS
+1-1sys/conf/kern.post.mk
+1-1sys/conf/kmod.mk
+1-1share/mk/bsd.debug.mk
+1-0share/mk/src.opts.mk
+18-41 files not shown
+19-47 files

HardenedBSD/src c078350stand/efi/loader/arch/amd64 multiboot2.c, stand/i386/libi386 multiboot.c elf64_freebsd.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+8-3stand/i386/libi386/multiboot.c
+8-2stand/i386/libi386/elf64_freebsd.c
+8-2stand/userboot/userboot/elf32_freebsd.c
+8-2stand/efi/loader/arch/amd64/multiboot2.c
+8-2stand/userboot/userboot/elf64_freebsd.c
+8-2stand/i386/libi386/elf32_freebsd.c
+48-1311 files not shown
+71-4117 files

HardenedBSD/src 39fd0destand/efi/loader/arch/amd64 multiboot2.c, stand/i386/libi386 multiboot.c elf32_freebsd.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+8-3stand/i386/libi386/multiboot.c
+8-2stand/i386/libi386/elf32_freebsd.c
+8-2stand/userboot/userboot/elf64_freebsd.c
+8-2stand/efi/loader/arch/amd64/multiboot2.c
+8-2stand/userboot/userboot/elf32_freebsd.c
+8-2stand/i386/libi386/elf64_freebsd.c
+48-1311 files not shown
+71-4117 files

HardenedBSD/src 8e8d7d4stand/efi/loader/arch/amd64 multiboot2.c, stand/i386/libi386 multiboot.c elf64_freebsd.c

loader: Use C99 initializations for file_format

For greppability, use C99 initializers for the struct file_format.

Sponsored by:           Netflix
DeltaFile
+8-3stand/i386/libi386/multiboot.c
+8-2stand/i386/libi386/elf64_freebsd.c
+8-2stand/efi/loader/arch/amd64/multiboot2.c
+8-2stand/i386/libi386/elf32_freebsd.c
+8-2stand/userboot/userboot/elf64_freebsd.c
+8-2stand/userboot/userboot/elf32_freebsd.c
+48-139 files not shown
+70-3915 files

HardenedBSD/src 424089astand/powerpc/ofw ppc-common.ldscript

loader: Fix powerpc64le by working around slof bug in qemu/slof

Fix powerpc 64 little endian booting by adding some padding. Due to

https://gitlab.com/slof/slof/-/blob/master/lib/libelf/elf32.c?ref_type=heads#L114
https://gitlab.com/slof/slof/-/blob/master/lib/libelf/elf32.c?ref_type=heads#L150

using <= instead of <, slof used to loop over the phdrs. It overruns by
1 and so on little endian it swizzles the first 32 bytes of .text. Work
around this by adding 32 bytes of padding after the headers. We should
fix this in slof, but it's in the just released QEMU 10.2, so we have to
pad things here for now.

Now powerpc64le + qemu works.

MFC After: 3 days (maybe EN too)
Reviewed by: adrian, jhibbits
Sponsored by: Netflix
DeltaFile
+1-1stand/powerpc/ofw/ppc-common.ldscript
+1-11 files

HardenedBSD/src f22cffeshare/man/man4 vt.4

vt.4: Remove Xr to nonexistent vidcontrol(8)

PR: 291985
Fixes: a8740ba860bf ("vt.4: Document increasing scrollback size")
DeltaFile
+0-1share/man/man4/vt.4
+0-11 files

HardenedBSD/src 8d2af24bin/sh options.h, bin/test test.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+1-1bin/sh/options.h
+1-1bin/test/test.c
+2-22 files

HardenedBSD/src 1033ea9bin/sh options.h, bin/test test.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+1-1bin/sh/options.h
+1-1bin/test/test.c
+2-22 files

HardenedBSD/src e654680bin/sh options.h, bin/test test.c

sh: avoid warnings about too-long initializer strings

Mark `optletter` and `t_op::op_text` as `__non_string`, to avoid
warnings from clang 21 similar to:

    bin/sh/options.h:77:36: error: initializer-string for character array is too long, array size is 19 but initializer has size 20 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization]
       77 | const char optletter[NSHORTOPTS] = "efIimnsxvVECabupTPh";
          |                                    ^~~~~~~~~~~~~~~~~~~~~
    bin/test/test.c:153:3: error: initializer-string for character array is too long, array size is 2 but initializer has size 3 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization]
      153 |         {"==",  STREQ},
          |          ^~~~

MFC after:      3 days
Reviewed by:    jilles
Differential Revision: https://reviews.freebsd.org/D54362
DeltaFile
+1-1bin/sh/options.h
+1-1bin/test/test.c
+2-22 files

HardenedBSD/src 7480b5econtrib/mtree mtree.c spec.c

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+22-14contrib/mtree/mtree.c
+11-14contrib/mtree/spec.c
+6-10contrib/mtree/compare.c
+4-3contrib/mtree/create.c
+43-414 files

HardenedBSD/src 1199578contrib/mtree mtree.c spec.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+22-14contrib/mtree/mtree.c
+11-14contrib/mtree/spec.c
+6-10contrib/mtree/compare.c
+4-3contrib/mtree/create.c
+43-414 files

HardenedBSD/src f9d671fcontrib/mtree mtree.c spec.c

Import latest mtree from NetBSD

Merge commit 'eb2ccba0c11b405ac613c3046997765317cc8b5c'

PR:             192839
PR:             219467
MFC after:      1 week

(cherry picked from commit f8cee1f2c2dfba6223385fd711cce9faeca76451)
DeltaFile
+22-14contrib/mtree/mtree.c
+11-14contrib/mtree/spec.c
+6-10contrib/mtree/compare.c
+4-3contrib/mtree/create.c
+43-414 files

HardenedBSD/src 791fb09contrib/mtree mtree.c spec.c

Import latest mtree from NetBSD

Merge commit 'eb2ccba0c11b405ac613c3046997765317cc8b5c'

PR:             192839
PR:             219467
MFC after:      1 week

(cherry picked from commit f8cee1f2c2dfba6223385fd711cce9faeca76451)
DeltaFile
+22-14contrib/mtree/mtree.c
+11-14contrib/mtree/spec.c
+6-10contrib/mtree/compare.c
+4-3contrib/mtree/create.c
+43-414 files

HardenedBSD/src 042c220contrib/kyua/cli cmd_debug.cpp, contrib/kyua/engine scheduler.cpp scheduler.hpp

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+37-39sys/vm/vnode_pager.c
+15-5contrib/kyua/engine/scheduler.cpp
+5-1contrib/kyua/cli/cmd_debug.cpp
+5-1contrib/kyua/engine/scheduler.hpp
+1-0tools/build/Makefile
+63-465 files

HardenedBSD/src 1b6ff6econtrib/kyua/cli cmd_debug.cpp, contrib/kyua/engine scheduler.cpp scheduler.hpp

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+37-39sys/vm/vnode_pager.c
+15-5contrib/kyua/engine/scheduler.cpp
+5-1contrib/kyua/engine/scheduler.hpp
+5-1contrib/kyua/cli/cmd_debug.cpp
+1-0tools/build/Makefile
+63-465 files

HardenedBSD/src 086bedbtools/build Makefile

tools.build: also add sys/_visible.h to SYSINCS

This is needed since sys/cdefs.h includes sys/_visible.h.

Reported by:    kib
Fixes:          1c9ff80f0635
MFC after:      3 days
DeltaFile
+1-0tools/build/Makefile
+1-01 files

HardenedBSD/src 939ac0csys/vm vnode_pager.c

vnode_pager: clean up undirty_pages()

The first (second) loop of vnode_pager_undirty_pages() includes an
if-test to test whether an iteration is the last (first). Move those
if-tests out of their loops.  That allows the compiler to unroll the
loops.

Reviewed by:    alc, kib
Differential Revision:  https://reviews.freebsd.org/D54353
DeltaFile
+37-39sys/vm/vnode_pager.c
+37-391 files

HardenedBSD/src 350f319contrib/kyua/cli cmd_debug.cpp, contrib/kyua/engine scheduler.cpp scheduler.hpp

kyua: Make "debug -p" skip writing stdout/stderr to tmp files

Reviewed by:    kp, ngie
Differential Revision:  https://reviews.freebsd.org/D54363
DeltaFile
+15-5contrib/kyua/engine/scheduler.cpp
+5-1contrib/kyua/cli/cmd_debug.cpp
+5-1contrib/kyua/engine/scheduler.hpp
+25-73 files