HardenedBSD/src c1225aacontrib/file configure ltmain.sh, contrib/file/magic/Magdir msdos

Merge remote-tracking branch 'origin/freebsd/14-stable/main' into hardened/14-stable/master

Conflicts:
        contrib/less/filename.c (unresolved)
DeltaFile
+10,754-8,602contrib/xz/ChangeLog
+1,844-1,249contrib/file/configure
+12-2,660contrib/xz/doxygen/Doxyfile
+1,042-273contrib/file/magic/Magdir/msdos
+574-293contrib/file/ltmain.sh
+811-30contrib/xz/src/liblzma/rangecoder/range_decoder.h
+15,037-13,107482 files not shown
+32,542-20,839488 files

HardenedBSD/src 71c92e6contrib/file configure ltmain.sh, contrib/file/magic/Magdir msdos images

MFC: MFV: file 5.46.

(cherry picked from commit ae316d1d1cffd71ab7751f94e10118777a88e027)
DeltaFile
+1,844-1,249contrib/file/configure
+1,042-273contrib/file/magic/Magdir/msdos
+574-293contrib/file/ltmain.sh
+497-132contrib/file/magic/Magdir/images
+287-135contrib/file/magic/Magdir/console
+379-36contrib/file/magic/Magdir/linux
+4,623-2,118158 files not shown
+9,000-3,942164 files

HardenedBSD/src b7d55fecontrib/file configure ltmain.sh, contrib/file/magic/Magdir msdos images

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+1,844-1,249contrib/file/configure
+1,042-273contrib/file/magic/Magdir/msdos
+574-293contrib/file/ltmain.sh
+497-132contrib/file/magic/Magdir/images
+287-135contrib/file/magic/Magdir/console
+379-36contrib/file/magic/Magdir/linux
+4,623-2,118176 files not shown
+9,075-3,997182 files

HardenedBSD/src 9fb0a1fcontrib/file configure ltmain.sh, contrib/file/magic/Magdir msdos images

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+1,844-1,249contrib/file/configure
+1,042-273contrib/file/magic/Magdir/msdos
+574-293contrib/file/ltmain.sh
+497-132contrib/file/magic/Magdir/images
+287-135contrib/file/magic/Magdir/console
+379-36contrib/file/magic/Magdir/linux
+4,623-2,118175 files not shown
+9,071-3,993181 files

HardenedBSD/src ae316d1contrib/file configure ltmain.sh, contrib/file/magic/Magdir msdos images

MFV: file 5.46.

MFC after:      2 weeks
DeltaFile
+1,844-1,249contrib/file/configure
+1,042-273contrib/file/magic/Magdir/msdos
+574-293contrib/file/ltmain.sh
+497-132contrib/file/magic/Magdir/images
+287-135contrib/file/magic/Magdir/console
+379-36contrib/file/magic/Magdir/linux
+4,623-2,118158 files not shown
+9,000-3,942164 files

HardenedBSD/src baf2a65contrib/file/magic/Magdir archive windows, contrib/file/src compress.c

Merge remote-tracking branch 'origin/freebsd/14-stable/main' into hardened/14-stable/master

Conflicts:
        sys/conf/newvers.sh (unresolved)
DeltaFile
+521-26contrib/file/magic/Magdir/archive
+491-41contrib/file/magic/Magdir/windows
+406-54contrib/file/magic/Magdir/msdos
+286-109contrib/file/src/compress.c
+353-4contrib/file/magic/Magdir/c64
+311-31contrib/file/magic/Magdir/images
+2,368-265248 files not shown
+6,801-1,820254 files

HardenedBSD/src acdad1fcontrib/file/magic/Magdir archive windows, contrib/file/src compress.c

MFC: MFV: file 5.45.

(cherry picked from commit 898496ee09ed2b7d25f6807edc4515628196ec0a)

Disable byteswap.h for now.

(cherry picked from commit 90474518912f5e5f49bc5325b7f88e94eba64d6a)
DeltaFile
+521-26contrib/file/magic/Magdir/archive
+491-41contrib/file/magic/Magdir/windows
+406-54contrib/file/magic/Magdir/msdos
+286-109contrib/file/src/compress.c
+353-4contrib/file/magic/Magdir/c64
+311-31contrib/file/magic/Magdir/images
+2,368-265229 files not shown
+6,494-1,569235 files

HardenedBSD/src 32551a0contrib/file/magic/Magdir archive windows, contrib/file/src compress.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+521-26contrib/file/magic/Magdir/archive
+491-41contrib/file/magic/Magdir/windows
+406-54contrib/file/magic/Magdir/msdos
+286-109contrib/file/src/compress.c
+353-4contrib/file/magic/Magdir/c64
+311-31contrib/file/magic/Magdir/images
+2,368-265231 files not shown
+6,505-1,588237 files

HardenedBSD/src 957a9aacontrib/file/magic/Magdir archive windows, contrib/file/src compress.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+521-26contrib/file/magic/Magdir/archive
+491-41contrib/file/magic/Magdir/windows
+406-54contrib/file/magic/Magdir/msdos
+286-109contrib/file/src/compress.c
+353-4contrib/file/magic/Magdir/c64
+311-31contrib/file/magic/Magdir/images
+2,368-265231 files not shown
+6,505-1,588237 files

HardenedBSD/src 898496econtrib/file/magic/Magdir archive windows, contrib/file/src compress.c

MFV: file 5.45.

MFC after:      3 days
DeltaFile
+521-26contrib/file/magic/Magdir/archive
+491-41contrib/file/magic/Magdir/windows
+406-54contrib/file/magic/Magdir/msdos
+286-109contrib/file/src/compress.c
+353-4contrib/file/magic/Magdir/c64
+311-31contrib/file/magic/Magdir/images
+2,368-265229 files not shown
+6,495-1,570235 files

HardenedBSD/src 5d76d4ccontrib/file configure, contrib/opie configure

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

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
DeltaFile
+51,045-0sys/contrib/dev/rtw89/rtw8852a_table.c
+36,704-0sys/contrib/dev/rtw89/rtw8852c_table.c
+3,904-3,077contrib/file/configure
+6,600-0sys/contrib/dev/rtw89/coex.c
+0-5,247contrib/opie/configure
+4,673-0sys/contrib/dev/rtw89/mac.c
+102,926-8,3244,222 files not shown
+225,249-57,5414,228 files

HardenedBSD/src 2a9736dcontrib/file configure config.guess, contrib/file/magic/Magdir msdos audio

Merge remote-tracking branch 'origin/freebsd/13-stable/main' into hardened/13-stable/master
DeltaFile
+3,904-3,077contrib/file/configure
+833-591contrib/file/config.guess
+379-290contrib/file/config.sub
+186-37contrib/file/magic/Magdir/msdos
+157-19contrib/file/magic/Magdir/audio
+166-10contrib/file/magic/Magdir/windows
+5,625-4,02484 files not shown
+7,410-4,39890 files

HardenedBSD/src dc9893dcontrib/file configure config.guess, contrib/file/magic/Magdir msdos audio

file: upgrade to 5.43.

(cherry picked from commit a2dfb7224ec9933ee804cae54d51848dce938b6b)
DeltaFile
+3,904-3,077contrib/file/configure
+833-591contrib/file/config.guess
+379-290contrib/file/config.sub
+186-37contrib/file/magic/Magdir/msdos
+157-19contrib/file/magic/Magdir/audio
+166-10contrib/file/magic/Magdir/windows
+5,625-4,02484 files not shown
+7,410-4,39890 files

HardenedBSD/src 4530f11contrib/file configure config.guess, contrib/file/magic/Magdir msdos audio

Merge remote-tracking branch 'origin/freebsd/current/main' into hardened/current/master
DeltaFile
+3,904-3,077contrib/file/configure
+833-591contrib/file/config.guess
+379-290contrib/file/config.sub
+186-37contrib/file/magic/Magdir/msdos
+157-19contrib/file/magic/Magdir/audio
+166-10contrib/file/magic/Magdir/windows
+5,625-4,02485 files not shown
+7,412-4,40091 files

HardenedBSD/src a2dfb72contrib/file configure config.guess, contrib/file/magic/Magdir msdos audio

file: upgrade to 5.43.

MFC after:      3 days
DeltaFile
+3,904-3,077contrib/file/configure
+833-591contrib/file/config.guess
+379-290contrib/file/config.sub
+186-37contrib/file/magic/Magdir/msdos
+157-19contrib/file/magic/Magdir/audio
+166-10contrib/file/magic/Magdir/windows
+5,625-4,02484 files not shown
+7,410-4,39890 files

HardenedBSD/src 5aeb963contrib/sqlite3 sqlite3.c, lib/libpmc/pmu-events/arch/x86/cascadelakex cache.json other.json

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

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
DeltaFile
+5,556-3,450contrib/sqlite3/sqlite3.c
+8,287-0sys/contrib/openzfs/cmd/ztest.c
+0-8,221sys/contrib/openzfs/cmd/ztest/ztest.c
+4,219-3,950sys/contrib/device-tree/src/arm/tegra30-ouya.dts
+6,576-1,135lib/libpmc/pmu-events/arch/x86/cascadelakex/cache.json
+113-6,855lib/libpmc/pmu-events/arch/x86/cascadelakex/other.json
+24,751-23,6119,387 files not shown
+738,363-247,4629,393 files

HardenedBSD/src 9e90835contrib/file/magic/Magdir images archive, contrib/file/src apprentice.c softmagic.c

Merge remote-tracking branch 'freebsd/stable/13' into hardened/13-stable/master
DeltaFile
+1,843-1,090contrib/file/magic/Magdir/images
+294-157contrib/file/src/apprentice.c
+273-42contrib/file/magic/Magdir/archive
+133-106contrib/file/src/softmagic.c
+194-10contrib/file/magic/Magdir/intel
+202-0contrib/file/magic/Magdir/nifty
+2,939-1,40584 files not shown
+5,475-1,99290 files

HardenedBSD/src 92ee2a1contrib/file/magic/Magdir images archive, contrib/file/src apprentice.c softmagic.c

file: upgrade to 5.42.

MFC after:      2 weeks

(cherry picked from commit a4d6d3b8910f3805eebcd8703e11e066aad2e2a1)
DeltaFile
+1,843-1,090contrib/file/magic/Magdir/images
+294-157contrib/file/src/apprentice.c
+273-42contrib/file/magic/Magdir/archive
+133-106contrib/file/src/softmagic.c
+194-10contrib/file/magic/Magdir/intel
+202-0contrib/file/magic/Magdir/nifty
+2,939-1,40583 files not shown
+5,452-1,97489 files

HardenedBSD/src 67c01d8contrib/file/magic/Magdir images archive, contrib/file/src apprentice.c softmagic.c

file: upgrade to 5.42.

(cherry picked from commit a4d6d3b8910f3805eebcd8703e11e066aad2e2a1)
DeltaFile
+1,843-1,090contrib/file/magic/Magdir/images
+294-157contrib/file/src/apprentice.c
+273-42contrib/file/magic/Magdir/archive
+133-106contrib/file/src/softmagic.c
+194-10contrib/file/magic/Magdir/intel
+202-0contrib/file/magic/Magdir/nifty
+2,939-1,40583 files not shown
+5,452-1,97489 files

HardenedBSD/src c2e56e0contrib/file/magic/Magdir images archive, contrib/file/src apprentice.c softmagic.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+1,843-1,090contrib/file/magic/Magdir/images
+294-157contrib/file/src/apprentice.c
+273-42contrib/file/magic/Magdir/archive
+133-106contrib/file/src/softmagic.c
+194-10contrib/file/magic/Magdir/intel
+202-0contrib/file/magic/Magdir/nifty
+2,939-1,40587 files not shown
+5,542-2,09393 files

HardenedBSD/src a4d6d3bcontrib/file/magic/Magdir images archive, contrib/file/src apprentice.c softmagic.c

file: upgrade to 5.42.

MFC after:      2 weeks
DeltaFile
+1,843-1,090contrib/file/magic/Magdir/images
+294-157contrib/file/src/apprentice.c
+273-42contrib/file/magic/Magdir/archive
+133-106contrib/file/src/softmagic.c
+194-10contrib/file/magic/Magdir/intel
+202-0contrib/file/magic/Magdir/nifty
+2,939-1,40583 files not shown
+5,452-1,97489 files

HardenedBSD/src 60b9c6ccontrib/file configure, contrib/file/magic/Magdir images pgp-binary-keys

Merge remote-tracking branch 'freebsd/stable/13' into hardened/13-stable/master
DeltaFile
+615-121contrib/file/magic/Magdir/images
+103-505contrib/file/configure
+514-0tests/sys/fs/fusefs/last_local_modify.cc
+388-0contrib/file/magic/Magdir/pgp-binary-keys
+341-23contrib/file/magic/Magdir/riff
+250-63contrib/file/magic/Magdir/msdos
+2,211-712212 files not shown
+8,179-2,743218 files

HardenedBSD/src cfce351contrib/file configure, contrib/file/magic/Magdir images pgp-binary-keys

Merge remote-tracking branch 'freebsd/stable/12' into hardened/12-stable/master
DeltaFile
+615-121contrib/file/magic/Magdir/images
+103-505contrib/file/configure
+423-0tests/sys/fs/fusefs/last_local_modify.cc
+388-0contrib/file/magic/Magdir/pgp-binary-keys
+341-23contrib/file/magic/Magdir/riff
+250-63contrib/file/magic/Magdir/msdos
+2,120-712206 files not shown
+7,416-2,738212 files

HardenedBSD/src 17886a8contrib/file configure, contrib/file/magic/Magdir images pgp-binary-keys

file: upgrade to 5.41.

(cherry picked from commit 43a5ec4eb41567cc92586503212743d89686d78f)
DeltaFile
+615-121contrib/file/magic/Magdir/images
+103-505contrib/file/configure
+388-0contrib/file/magic/Magdir/pgp-binary-keys
+341-23contrib/file/magic/Magdir/riff
+250-63contrib/file/magic/Magdir/msdos
+184-113contrib/file/magic/Magdir/filesystems
+1,881-825194 files not shown
+6,714-2,711200 files

HardenedBSD/src 46aa53econtrib/file configure, contrib/file/magic/Magdir images pgp-binary-keys

file: upgrade to 5.41.

(cherry picked from commit 43a5ec4eb41567cc92586503212743d89686d78f)
DeltaFile
+615-121contrib/file/magic/Magdir/images
+103-505contrib/file/configure
+388-0contrib/file/magic/Magdir/pgp-binary-keys
+341-23contrib/file/magic/Magdir/riff
+250-63contrib/file/magic/Magdir/msdos
+184-113contrib/file/magic/Magdir/filesystems
+1,881-825194 files not shown
+6,714-2,711200 files

HardenedBSD/src 6a32f4fcontrib/llvm-project/llvm/lib/Analysis/models/inliner saved_model.pbtxt, contrib/sqlite3 sqlite3.c

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

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
        usr.sbin/hbsd-update/hbsd-update.conf (unresolved)
DeltaFile
+0-32,634contrib/llvm-project/llvm/lib/Analysis/models/inliner/saved_model.pbtxt
+9,480-9,480lib/libpmc/pmu-events/arch/x86/cascadelakex/cache.json
+10,895-7,688contrib/sqlite3/sqlite3.c
+8,062-8,054lib/libpmc/pmu-events/arch/x86/cascadelakex/memory.json
+7,713-7,713lib/libpmc/pmu-events/arch/x86/cascadelakex/other.json
+0-13,083sys/contrib/octeon-sdk/cvmx-ciu-defs.h
+36,150-78,65213,448 files not shown
+1,006,794-1,015,87713,454 files

HardenedBSD/src 6dc8281contrib/file configure, contrib/file/magic/Magdir images pgp-binary-keys

Merge branch 'hardened/current/master' into hardened/current/sensitive
DeltaFile
+615-121contrib/file/magic/Magdir/images
+103-505contrib/file/configure
+388-0contrib/file/magic/Magdir/pgp-binary-keys
+341-23contrib/file/magic/Magdir/riff
+250-63contrib/file/magic/Magdir/msdos
+184-113contrib/file/magic/Magdir/filesystems
+1,881-825196 files not shown
+6,715-2,712202 files

HardenedBSD/src ae951e6contrib/file configure, contrib/file/magic/Magdir images pgp-binary-keys

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+615-121contrib/file/magic/Magdir/images
+103-505contrib/file/configure
+388-0contrib/file/magic/Magdir/pgp-binary-keys
+341-23contrib/file/magic/Magdir/riff
+250-63contrib/file/magic/Magdir/msdos
+184-113contrib/file/magic/Magdir/filesystems
+1,881-825196 files not shown
+6,715-2,712202 files

HardenedBSD/src 43a5ec4contrib/file configure, contrib/file/magic/Magdir images pgp-binary-keys

file: upgrade to 5.41.

MFC after:      2 weeks
DeltaFile
+615-121contrib/file/magic/Magdir/images
+103-505contrib/file/configure
+388-0contrib/file/magic/Magdir/pgp-binary-keys
+341-23contrib/file/magic/Magdir/riff
+250-63contrib/file/magic/Magdir/msdos
+184-113contrib/file/magic/Magdir/filesystems
+1,881-825194 files not shown
+6,714-2,711200 files

HardenedBSD/src c7ce6b0contrib/libstdc++ configure, lib/clang/liblldb LLDBWrapLua.cpp

Merge branch 'hardened/current/master' into hardened/current/uninit-autoinit
DeltaFile
+0-111,817contrib/libstdc++/configure
+72,183-0lib/clang/liblldb/LLDBWrapLua.cpp
+71,590-432tools/tools/locale/etc/final-maps/widths.txt
+31,726-39,305share/ctypedef/ja_JP.eucJP.src
+59,521-0sys/contrib/dev/iwm/iwm-9000-34.fw.uu
+59,517-0sys/contrib/dev/iwm/iwm-9260-34.fw.uu
+294,537-151,55460,534 files not shown
+10,288,584-10,879,88160,540 files