HardenedBSD/src d79e843sys/net route.c, sys/netinet tcp_syncache.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+1-8usr.sbin/sndctl/sndctl.c
+3-5sys/net/route.c
+2-0sys/netinet/tcp_syncache.c
+6-133 files

HardenedBSD/src 4ad51fcsys/net route.c, sys/netinet tcp_syncache.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+1-8usr.sbin/sndctl/sndctl.c
+3-5sys/net/route.c
+2-0sys/netinet/tcp_syncache.c
+6-133 files

HardenedBSD/src dcd0f81sys/dev/sound/pci es137x.c, sys/dev/sound/pcm mixer.c mixer.h

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+1-29sys/dev/sound/pcm/mixer.c
+0-4sys/dev/sound/pci/es137x.c
+0-2sys/dev/sound/pcm/mixer.h
+1-353 files

HardenedBSD/src 6f4debcsys/netinet tcp_syncache.c

tcp: fix build with RSS

PR:     291439
Fixes:  73fe85e486d297c9c976095854c1c84007e543f0
DeltaFile
+2-0sys/netinet/tcp_syncache.c
+2-01 files

HardenedBSD/src a83191csys/net route.c

net: fix LINT-NOIP build

Fixes:  fd131b47f20dbeb515f5e3e6ea87948f2638eda9
DeltaFile
+3-5sys/net/route.c
+3-51 files

HardenedBSD/src 643a606usr.sbin/sndctl sndctl.c

sndctl(8): Do not free and re-open device

There was a reason for this, but it does not apply anymore.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54031
DeltaFile
+1-8usr.sbin/sndctl/sndctl.c
+1-81 files

HardenedBSD/src 26365bfsys/dev/sound/pci es137x.c, sys/dev/sound/pcm mixer.c mixer.h

sound: Retire snd_mixer->busy

Does not really serve any real purpose. It gets set on mixer_open() and
unset on mixer_close(), so it essentially tells us whether the mixer is
open or not.

mixer_close() uses it to return EBADF in case the mixer is not busied,
as in, the mixer has not been open()'d yet. This is redundant. The other
place where this is used is to decide whether to serve an ioctl issued
by userland, in which case it won't if, again, the mixer has not been
busied (i.e., opened). Again, seems redundant.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D53859

(cherry picked from commit e5d50a679aa1a72a7cbcb0281b9420aad4a7dc7a)
DeltaFile
+1-29sys/dev/sound/pcm/mixer.c
+0-4sys/dev/sound/pci/es137x.c
+0-2sys/dev/sound/pcm/mixer.h
+1-353 files

HardenedBSD/src ca07018sys/contrib/dev/athk/ath11k mac.c core.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+1,407-541sys/contrib/dev/athk/ath11k/mac.c
+728-115sys/contrib/dev/athk/ath11k/core.c
+336-218sys/contrib/dev/athk/ath11k/wmi.c
+342-56sys/contrib/dev/athk/ath11k/reg.c
+195-140sys/contrib/dev/athk/ath11k/dp_rx.c
+268-43sys/contrib/dev/athk/ath11k/pci.c
+3,276-1,113244 files not shown
+8,403-2,760250 files

HardenedBSD/src c3552c8sys/contrib/dev/athk/ath11k mac.c core.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+1,407-541sys/contrib/dev/athk/ath11k/mac.c
+728-115sys/contrib/dev/athk/ath11k/core.c
+336-218sys/contrib/dev/athk/ath11k/wmi.c
+342-56sys/contrib/dev/athk/ath11k/reg.c
+195-140sys/contrib/dev/athk/ath11k/dp_rx.c
+268-43sys/contrib/dev/athk/ath11k/pci.c
+3,276-1,113244 files not shown
+8,403-2,760250 files

HardenedBSD/src d20da5ctools/tools/locale Makefile

locale: Update Unicode to CLDR 48

Reviewed by:    bapt
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D53983
DeltaFile
+1-1tools/tools/locale/Makefile
+1-11 files

HardenedBSD/src 934364dtools/tools/locale/tools finalize

locale: tools: Make finalize idempotent

The finalize script renames source files with 3 components in their name
into names with two components with an @modifier, in the process.

Running the script for a second time without cleaning will strip the
@modifier from the files, producing invalid Makefiles and unusable
locales.

Prevent this by adding a guard at the beginning of the script.

Also, use a sub-shell for directory changes to avoid working directory
issues.

Reviewed by:    bapt
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D53981
DeltaFile
+58-53tools/tools/locale/tools/finalize
+58-531 files

HardenedBSD/src 13ae490tools/tools/locale Makefile

locale: Update to UCD 17.0.0

Starting with Unicode 17.0.0, the zipped versions of the data files are
only published in https://www.unicode.org/Public/<version>/ucd/

https://www.unicode.org/Public/zipped/ReadMe.txt

Reviewed by:    bapt
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D53982
DeltaFile
+2-2tools/tools/locale/Makefile
+2-21 files

HardenedBSD/src 95f37aatools/tools/locale/tools cldr2def.pl

cldr2def.pl: Fix make install

Follow up on 86c71e97d19f ("pkgbase: locales: Also tag the files dir"),
and adapt cldr2def.pl script in order to fix make install.

Reviewed by:    bapt
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D53961
DeltaFile
+2-0tools/tools/locale/tools/cldr2def.pl
+2-01 files

HardenedBSD/src 36cfa80share/colldef_unicode Makefile, share/monetdef_unicode Makefile

locale: make install

Reviewed by:    bapt
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D53962
DeltaFile
+2-0share/colldef_unicode/Makefile
+1-0share/numericdef_unicode/Makefile
+1-0share/msgdef_unicode/Makefile
+1-0share/monetdef_unicode/Makefile
+5-04 files

HardenedBSD/src 9df8243share/monetdef it_CH.ISO8859-15.src it_IT.ISO8859-15.src

locale: make posix

Run make posix to generate monetary definition files with the
international parameters missing from localeconv(3)'s lconv struct.

Manually convert the "frozen" non-unicode locales under share/monetdef.

Reviewed by:    bapt
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D53917
DeltaFile
+18-0share/monetdef/it_CH.ISO8859-15.src
+18-0share/monetdef/it_IT.ISO8859-15.src
+18-0share/monetdef/ja_JP.SJIS.src
+18-0share/monetdef/ja_JP.eucJP.src
+18-0share/monetdef/ko_KR.eucKR.src
+18-0share/monetdef/nb_NO.ISO8859-15.src
+108-0107 files not shown
+2,034-0113 files

HardenedBSD/src 30aa550tools/tools/locale/etc/final-maps widths.txt map.UTF-8

locale: make build to bump widths.txt

Reviewed by:    bapt
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D53916
DeltaFile
+189-1tools/tools/locale/etc/final-maps/widths.txt
+1-1tools/tools/locale/etc/final-maps/map.UTF-8
+190-22 files

HardenedBSD/src faf33e0tools/tools/locale/tools cldr2def.pl

cldr2def.pl: Add international currency parameters

Add the missing international monetary parameters present in the lconv
struct.

See also https://unicode-org.atlassian.net/browse/CLDR-237.

Reviewed by:    bapt
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D53915
DeltaFile
+27-15tools/tools/locale/tools/cldr2def.pl
+27-151 files

HardenedBSD/src 09701dctools/tools/locale/tools cldr2def.pl

cldr2def.pl: Cleanup white space

No functional change intended.

Reviewed by:    bapt
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D53914
DeltaFile
+5-5tools/tools/locale/tools/cldr2def.pl
+5-51 files

HardenedBSD/src c68126esys/modules/ath11k Makefile

ath11k: add new files to module Makefile

Add the new files to the module Makefile as well, so they do not get lost.
DeltaFile
+1-0sys/modules/ath11k/Makefile
+1-01 files

HardenedBSD/src 9c2f321sys/contrib/dev/athk/ath11k coredump.h core.h

ath11k: start making compile some more

There is more work to do to make this compile again but we will do that
when we get to the driver.  For now just take the most noise out of it.
DeltaFile
+4-0sys/contrib/dev/athk/ath11k/coredump.h
+2-0sys/contrib/dev/athk/ath11k/core.h
+6-02 files

HardenedBSD/src c95ea40sys/contrib/dev/athk/ath11k mac.c core.c

ath11k: update Atheros/QCA's ath11k driver

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
7d0a66e4bb9081d75c82ec4957c50034cb0ea449 ( tag: v6.18 ).

Merge commit '989a88787ef2c1a73f44b82031a6f4f4470e2676'

Sponsored by:   The FreeBSD Foundation
DeltaFile
+1,407-541sys/contrib/dev/athk/ath11k/mac.c
+728-115sys/contrib/dev/athk/ath11k/core.c
+336-218sys/contrib/dev/athk/ath11k/wmi.c
+342-56sys/contrib/dev/athk/ath11k/reg.c
+195-140sys/contrib/dev/athk/ath11k/dp_rx.c
+268-43sys/contrib/dev/athk/ath11k/pci.c
+3,276-1,11361 files not shown
+4,866-2,08267 files

HardenedBSD/src fe7b6fcsys/compat/linuxkpi/common/include/linux leds.h, sys/modules/ath10k Makefile

LinuxKPI: ath10k: adjust for led changes to keep ath10k compiling

Add the conditional compile time option defaulting to off as we do
not support leds in LinuxKPI to ath10k for the new file.

Add empty struct gpio_led to LinuxKPI.

MFC after:      3 days
DeltaFile
+6-0sys/modules/ath10k/Makefile
+4-1sys/compat/linuxkpi/common/include/linux/leds.h
+10-12 files

HardenedBSD/src 9954217sys/contrib/dev/athk/ath10k mac.c core.c

ath10k: update Atheros/QCA's ath10k driver

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
7d0a66e4bb9081d75c82ec4957c50034cb0ea449 ( tag: v6.18 ).

Merge commit 'f4669ef6cf7860919442e67106e83f616ed36f51'.

Sponsored by:   The FreeBSD Foundation
DeltaFile
+160-103sys/contrib/dev/athk/ath10k/mac.c
+130-44sys/contrib/dev/athk/ath10k/core.c
+102-20sys/contrib/dev/athk/ath10k/wmi.c
+57-47sys/contrib/dev/athk/ath10k/wmi.h
+89-0sys/contrib/dev/athk/ath10k/leds.c
+45-41sys/contrib/dev/athk/ath10k/pci.c
+583-25541 files not shown
+1,008-57347 files

HardenedBSD/src 28125d2sys/contrib/dev/athk Kconfig testmode_i.h

ath-common: update common Atheros/QCA code

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ).

Merge commit '99ad6f4f54c86845d6e3f03541913c07fcdeef59'
DeltaFile
+68-0sys/contrib/dev/athk/Kconfig
+66-0sys/contrib/dev/athk/testmode_i.h
+25-0sys/contrib/dev/athk/Makefile
+8-13sys/contrib/dev/athk/dfs_pattern_detector.c
+4-2sys/contrib/dev/athk/ath.h
+2-2sys/contrib/dev/athk/key.c
+173-173 files not shown
+177-209 files

HardenedBSD/src 8b4477fsys/contrib/dev/rtw88 led.c sdio.c

rtw88: update Realtek's rtw88 driver

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
7d0a66e4bb9081d75c82ec4957c50034cb0ea449 ( tag: v6.18 ).

Merge commit 'e543442afe3ad5b27616575be2d2402b988656eb' into rtw88

Sponsored by:   The FreeBSD Foundation
DeltaFile
+7-6sys/contrib/dev/rtw88/led.c
+4-0sys/contrib/dev/rtw88/sdio.c
+11-62 files

HardenedBSD/src a287884sys/dev/ice ice_lib.c, sys/dev/nvme nvme_ns.c nvme.h

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+7-9sys/dev/nvme/nvme_ns.c
+11-0tests/sys/net/if_bridge_test.sh
+4-3sys/dev/ice/ice_lib.c
+2-2sys/dev/nvme/nvme.h
+2-2sys/dev/nvme/nvme_ctrlr.c
+2-2usr.sbin/freebsd-update/freebsd-update.sh
+28-185 files not shown
+31-1911 files

HardenedBSD/src 1a480d1release/scripts pkg-stage.sh

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-3release/scripts/pkg-stage.sh
+0-31 files

HardenedBSD/src b4496c2release/scripts pkg-stage.sh, sys/dev/ice ice_lib.c

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

Conflicts:
        release/scripts/pkg-stage.sh (unresolved)
DeltaFile
+7-9sys/dev/nvme/nvme_ns.c
+11-0tests/sys/net/if_bridge_test.sh
+4-3sys/dev/ice/ice_lib.c
+4-0release/scripts/pkg-stage.sh
+2-2sys/dev/nvme/nvme.h
+2-2sys/dev/nvme/nvme_ctrlr.c
+30-165 files not shown
+34-1911 files

HardenedBSD/src ced7461usr.sbin/freebsd-update freebsd-update.sh

freebsd-update: Mention upgrading packages, not just ports

These days most end users are likely using pre-built packages, not
locally-built ports. Thus be sure to mention this as an important case,
and put it ahead of ports.

Reviewed by:    emaste
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D42968
DeltaFile
+2-2usr.sbin/freebsd-update/freebsd-update.sh
+2-21 files

HardenedBSD/src 90eda62release/scripts pkg-stage.sh

release: Include comms/usbmuxd to DVD to ensure ipheth(4) works

PR:             291370
Reviewed by:    emaste, aokblast, dch
MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D54074
DeltaFile
+1-0release/scripts/pkg-stage.sh
+1-01 files