HardenedBSD/src cb0c532contrib/less screen.c, sys/kern vfs_subr.c

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

Conflicts:
        bin/cat/cat.c
        lib/libc/gen/auxv.3
        libexec/rc/rc.d/archdep
        share/man/man5/src.conf.5
        sys/amd64/amd64/elf_machdep.c
        sys/amd64/cloudabi64/cloudabi64_sysvec.c
        sys/amd64/linux/linux_sysvec.c
        sys/amd64/linux32/linux32_sysvec.c
        sys/arm/arm/elf_machdep.c
        sys/arm64/linux/linux_sysvec.c
        sys/compat/ia32/ia32_sysvec.c
        sys/i386/cloudabi32/cloudabi32_sysvec.c
        sys/i386/linux/imgact_linux.c
        sys/i386/linux/linux_sysvec.c
        sys/kern/imgact_aout.c
        sys/kern/kern_module.c

    [22 lines not shown]
DeltaFile
+175-44sys/vm/vm_map.c
+97-38sys/kern/vfs_subr.c
+64-0tests/sys/vm/stack/stack_dlopen_exec_test.c
+57-0tests/sys/vm/stack/stack_mprotect_exec_test.c
+42-11contrib/less/screen.c
+51-0tests/sys/vm/mmap_map_32bit_helper.c
+486-9331,889 files not shown
+1,170-49,85331,895 files

HardenedBSD/src 023fc80tests/sys/cddl/zfs/tests/cli_root/zpool_import zpool_import_007_pos.ksh zpool_import_008_pos.ksh

Remove $FreeBSD$: one-line sh pattern

Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/

Similar commit in main:
(cherry picked from commit d0b2dbfa0ecf)
DeltaFile
+0-2tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_007_pos.ksh
+0-2tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_008_pos.ksh
+0-2tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_009_neg.ksh
+0-2tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_010_pos.ksh
+0-2tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_011_neg.ksh
+0-2tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_012_pos.ksh
+0-129,627 files not shown
+0-11,2189,633 files

HardenedBSD/src acf3d6esys/arm64/arm64 pl031_rtc.c, sys/compat/linux linux_socket.c

Merge remote-tracking branch 'internal/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        tools/build/options/WITH_OFED_EXTRA (deleted)
        usr.sbin/rpc.yppasswdd/Makefile (unresolved)
DeltaFile
+697-0sys/dev/virtio/gpu/virtio_gpu.c
+454-0sys/dev/virtio/gpu/virtio_gpu.h
+153-0sys/arm64/arm64/pl031_rtc.c
+80-52sys/compat/linux/linux_socket.c
+107-0tools/build/freebsd-yeet.pl
+87-11sys/dev/ixl/ixl_pf_main.c
+1,578-6331,042 files not shown
+2,188-48,40531,048 files

HardenedBSD/src 2226d61sys/arm64/arm64 pl031_rtc.c, sys/compat/linux linux_socket.c

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

Conflicts:
        bin/cat/cat.c (unresolved)
        lib/csu/aarch64/crt1_c.c (unresolved)
        lib/csu/amd64/crt1_c.c (unresolved)
        lib/csu/i386/crt1_c.c (unresolved)
        lib/csu/powerpc64/crt1_c.c (unresolved)
        lib/csu/powerpc64/reloc.c (unresolved)
        lib/csu/riscv/crt1_c.c (unresolved)
        lib/libc/gen/auxv.3 (unresolved)
        lib/libcasper/services/cap_net/cap_net.3 (unresolved)
        sys/amd64/amd64/elf_machdep.c (unresolved)
        sys/amd64/include/sgxreg.h (deleted)
        sys/amd64/linux/linux_sysvec.c (unresolved)
        sys/amd64/linux32/linux32_sysvec.c (unresolved)
        sys/amd64/sgx/sgx.c (deleted)
        sys/amd64/sgx/sgx_linux.c (deleted)
        sys/amd64/sgx/sgxvar.h (deleted)

    [29 lines not shown]
DeltaFile
+697-0sys/dev/virtio/gpu/virtio_gpu.c
+454-0sys/dev/virtio/gpu/virtio_gpu.h
+153-0sys/arm64/arm64/pl031_rtc.c
+80-52sys/compat/linux/linux_socket.c
+107-0tools/build/freebsd-yeet.pl
+87-11sys/dev/ixl/ixl_pf_main.c
+1,578-6331,044 files not shown
+2,304-48,37531,050 files

HardenedBSD/src d0b2dbftools/kerneldoc/subsys Doxyfile-dev_ice Doxyfile-dev_ichiic

Remove $FreeBSD$: one-line sh pattern

Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/
DeltaFile
+0-2tools/kerneldoc/subsys/Doxyfile-dev_ice
+0-2tools/kerneldoc/subsys/Doxyfile-dev_ichiic
+0-2tools/kerneldoc/subsys/Doxyfile-dev_ichsmb
+0-2tools/kerneldoc/subsys/Doxyfile-dev_ichwd
+0-2tools/kerneldoc/subsys/Doxyfile-dev_ida
+0-2tools/kerneldoc/subsys/Doxyfile-dev_iicbus
+0-129,444 files not shown
+0-11,0209,450 files

HardenedBSD/src 00d5789contrib/ntp CommitLog, contrib/sqlite3 sqlite3.c

Create branch for bhyve graphics import.
DeltaFile
+0-250,654tools/tools/locale/etc/final-maps/map.UTF-8
+0-235,924share/dict/web2
+0-209,729contrib/ntp/CommitLog
+0-189,304contrib/sqlite3/sqlite3.c
+0-148,958sys/dev/qlxgbe/ql_fw.c
+0-131,072crypto/heimdal/lib/sqlite/sqlite3.c
+0-1,165,64169,516 files not shown
+19,947-30,627,90869,522 files

HardenedBSD/src ccde53bshare/colldef zh_Hans_CN.UTF-8.src, sys/dev/ispfw asm_2400.h

MFH r289384-r293170

Sponsored by:   The FreeBSD Foundation
DeltaFile
+250,654-0tools/tools/locale/etc/final-maps/map.UTF-8
+71,629-0share/colldef/zh_Hans_CN.UTF-8.src
+63,490-0tools/tools/locale/etc/charmaps/GB18030.TXT
+59,905-0tools/tools/locale/etc/final-maps/map.GB18030
+42,878-0tools/tools/locale/etc/final-maps/widths.txt
+14,251-28,449sys/dev/ispfw/asm_2400.h
+502,807-28,4497,052 files not shown
+1,398,688-268,0007,058 files

HardenedBSD/src b626f5a (r293172)share/colldef zh_Hans_CN.UTF-8.src, sys/dev/ispfw asm_2400.h

MFH r289384-r293170

Sponsored by:   The FreeBSD Foundation
DeltaFile
+250,654-0tools/tools/locale/etc/final-maps/map.UTF-8
+71,629-0share/colldef/zh_Hans_CN.UTF-8.src
+63,490-0tools/tools/locale/etc/charmaps/GB18030.TXT
+59,905-0tools/tools/locale/etc/final-maps/map.GB18030
+42,878-0tools/tools/locale/etc/final-maps/widths.txt
+14,251-28,449sys/dev/ispfw/asm_2400.h
+502,807-28,4497,052 files not shown
+1,398,688-268,0007,058 files

HardenedBSD/src a5d8944 (r291076)share/colldef zh_Hans_CN.UTF-8.src, sys/dev/ispfw asm_2400.h

Catch up with head (r291075).
DeltaFile
+250,654-0tools/tools/locale/etc/final-maps/map.UTF-8
+71,629-0share/colldef/zh_Hans_CN.UTF-8.src
+63,490-0tools/tools/locale/etc/charmaps/GB18030.TXT
+59,905-0tools/tools/locale/etc/final-maps/map.GB18030
+42,878-0tools/tools/locale/etc/final-maps/widths.txt
+14,251-28,449sys/dev/ispfw/asm_2400.h
+502,807-28,4494,424 files not shown
+1,272,906-194,0464,430 files

HardenedBSD/src fd9367fshare/colldef zh_Hans_CN.UTF-8.src, sys/dev/ispfw asm_2400.h

MFhead @ r290899
DeltaFile
+250,654-0tools/tools/locale/etc/final-maps/map.UTF-8
+71,629-0share/colldef/zh_Hans_CN.UTF-8.src
+63,490-0tools/tools/locale/etc/charmaps/GB18030.TXT
+59,905-0tools/tools/locale/etc/final-maps/map.GB18030
+42,878-0tools/tools/locale/etc/final-maps/widths.txt
+14,251-28,449sys/dev/ispfw/asm_2400.h
+502,807-28,4494,013 files not shown
+1,248,068-183,9414,019 files

HardenedBSD/src c5b4fc9share/colldef zh_Hans_CN.UTF-8.src, share/ctypedef ko_KR.eucKR.src

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/unstable
DeltaFile
+250,654-0tools/tools/locale/etc/final-maps/map.UTF-8
+71,629-0share/colldef/zh_Hans_CN.UTF-8.src
+63,490-0tools/tools/locale/etc/charmaps/GB18030.TXT
+59,905-0tools/tools/locale/etc/final-maps/map.GB18030
+42,878-0tools/tools/locale/etc/final-maps/widths.txt
+35,565-0share/ctypedef/ko_KR.eucKR.src
+524,121-0769 files not shown
+945,167-34,689775 files

HardenedBSD/src e318f5cshare/colldef zh_Hans_CN.UTF-8.src, share/ctypedef ko_KR.eucKR.src

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/log
DeltaFile
+250,654-0tools/tools/locale/etc/final-maps/map.UTF-8
+71,629-0share/colldef/zh_Hans_CN.UTF-8.src
+63,490-0tools/tools/locale/etc/charmaps/GB18030.TXT
+59,905-0tools/tools/locale/etc/final-maps/map.GB18030
+42,878-0tools/tools/locale/etc/final-maps/widths.txt
+35,565-0share/ctypedef/ko_KR.eucKR.src
+524,121-0769 files not shown
+945,167-34,689775 files

HardenedBSD/src 81b9be8share/colldef zh_Hans_CN.UTF-8.src, share/ctypedef ko_KR.eucKR.src

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/segvguard
DeltaFile
+250,654-0tools/tools/locale/etc/final-maps/map.UTF-8
+71,629-0share/colldef/zh_Hans_CN.UTF-8.src
+63,490-0tools/tools/locale/etc/charmaps/GB18030.TXT
+59,905-0tools/tools/locale/etc/final-maps/map.GB18030
+42,878-0tools/tools/locale/etc/final-maps/widths.txt
+35,565-0share/ctypedef/ko_KR.eucKR.src
+524,121-0769 files not shown
+945,167-34,689775 files

HardenedBSD/src d362687share/colldef zh_Hans_CN.UTF-8.src, share/ctypedef ko_KR.eucKR.src

Merge remote-tracking branch 'freebsd/master' into hardened/current/master
DeltaFile
+250,654-0tools/tools/locale/etc/final-maps/map.UTF-8
+71,629-0share/colldef/zh_Hans_CN.UTF-8.src
+63,490-0tools/tools/locale/etc/charmaps/GB18030.TXT
+59,905-0tools/tools/locale/etc/final-maps/map.GB18030
+42,878-0tools/tools/locale/etc/final-maps/widths.txt
+35,565-0share/ctypedef/ko_KR.eucKR.src
+524,121-0769 files not shown
+945,167-34,689775 files

HardenedBSD/src e252068 (r290494)share/colldef zh_Hans_CN.UTF-8.src, share/ctypedef ko_KR.eucKR.src

Improve collation string and locales support

Merge collation support from Illumos and DragonflyBSD.

Locales are now generated with the new localedef(1) tool from CLDR POSIX files.
The generated files are now identified as "BSD 1.0" format.

The libc now only read "BSD 1.0" locales definitions, all other version will be
set to "C"
The localedef(1) tool has been imported from Illumos and modified to use tree(3)
instead of the CDDL avl(3)
A set of tool created by edwin@ and extended by marino@ for dragonfly has been
added to be able to generate locales and the Makefiles from the vanilla CLDR
unicode databases + a universal UTF-8 charmap (by marino@)
Update the locales to unicode v27
Given our regex(3) does not support multibyte (yet) it has been forced to always
use locale C
Remove now unused colldef(1) and mklocale(1)
Finish implementing the numeric BSD extension for ctypes

    [12 lines not shown]
DeltaFile
+250,654-0tools/tools/locale/etc/final-maps/map.UTF-8
+71,629-0share/colldef/zh_Hans_CN.UTF-8.src
+63,490-0tools/tools/locale/etc/charmaps/GB18030.TXT
+59,905-0tools/tools/locale/etc/final-maps/map.GB18030
+42,878-0tools/tools/locale/etc/final-maps/widths.txt
+35,565-0share/ctypedef/ko_KR.eucKR.src
+524,121-0752 files not shown
+945,087-34,644758 files

HardenedBSD/src 9494ce3share/colldef zh_Hans_CN.UTF-8.src, share/ctypedef ko_KR.eucKR.src

Improve collation string and locales support

Merge collation support from Illumos and DragonflyBSD.

Locales are now generated with the new localedef(1) tool from CLDR POSIX files.
The generated files are now identified as "BSD 1.0" format.

The libc now only read "BSD 1.0" locales definitions, all other version will be
set to "C"
The localedef(1) tool has been imported from Illumos and modified to use tree(3)
instead of the CDDL avl(3)
A set of tool created by edwin@ and extended by marino@ for dragonfly has been
added to be able to generate locales and the Makefiles from the vanilla CLDR
unicode databases + a universal UTF-8 charmap (by marino@)
Update the locales to unicode v27
Given our regex(3) does not support multibyte (yet) it has been forced to always
use locale C
Remove now unused colldef(1) and mklocale(1)
Finish implementing the numeric BSD extension for ctypes

    [12 lines not shown]
DeltaFile
+250,654-0tools/tools/locale/etc/final-maps/map.UTF-8
+71,629-0share/colldef/zh_Hans_CN.UTF-8.src
+63,490-0tools/tools/locale/etc/charmaps/GB18030.TXT
+59,905-0tools/tools/locale/etc/final-maps/map.GB18030
+42,878-0tools/tools/locale/etc/final-maps/widths.txt
+35,565-0share/ctypedef/ko_KR.eucKR.src
+524,121-0752 files not shown
+945,087-34,644758 files

HardenedBSD/src b7a5ae0tools/tools/locale/etc/charmaps GB18030.TXT GBK.TXT, tools/tools/locale/etc/final-maps map.UTF-8 map.GB18030

Add set of tools created by edwin@ long time ago to generate locales
Those tools were modified and extended by John Marino <draco at marino.st>
Add the generated charmaps and maps for LC_CTYPE generation

Obtained from:  Dragonfly
DeltaFile
+250,654-0tools/tools/locale/etc/final-maps/map.UTF-8
+63,490-0tools/tools/locale/etc/charmaps/GB18030.TXT
+59,905-0tools/tools/locale/etc/final-maps/map.GB18030
+42,878-0tools/tools/locale/etc/final-maps/widths.txt
+22,020-0tools/tools/locale/etc/final-maps/map.GBK
+21,924-0tools/tools/locale/etc/charmaps/GBK.TXT
+460,871-060 files not shown
+656,682-066 files

HardenedBSD/src c58c425 (r286434)tools/tools/locale/etc/charmaps GB18030.TXT GBK.TXT, tools/tools/locale/etc/final-maps map.UTF-8 map.GB18030

Add set of tools created by edwin@ long time ago to generate locales
Those tools were modified and extended by John Marino <draco at marino.st>
Add the generated charmaps and maps for LC_CTYPE generation

Obtained from:  Dragonfly
DeltaFile
+250,654-0tools/tools/locale/etc/final-maps/map.UTF-8
+63,490-0tools/tools/locale/etc/charmaps/GB18030.TXT
+59,905-0tools/tools/locale/etc/final-maps/map.GB18030
+42,878-0tools/tools/locale/etc/final-maps/widths.txt
+22,020-0tools/tools/locale/etc/final-maps/map.GBK
+21,924-0tools/tools/locale/etc/charmaps/GBK.TXT
+460,871-060 files not shown
+656,682-066 files