FreeBSD/src c7edaafcontrib/tzdata theory.html Makefile

contrib/tzdata: import tzdata 2025c

Changes: https://github.com/eggert/tz/blob/2025c/NEWS

(cherry picked from commit a86dc94b84d177da8f00d1c9420ef0860576e4c4)
DeltaFile
+186-181contrib/tzdata/theory.html
+138-58contrib/tzdata/Makefile
+135-0contrib/tzdata/NEWS
+47-47contrib/tzdata/zonenow.tab
+36-16contrib/tzdata/europe
+41-10contrib/tzdata/northamerica
+583-31216 files not shown
+682-40822 files

FreeBSD/src 68e2f4ccontrib/tzdata theory.html Makefile

contrib/tzdata: import tzdata 2025c

Changes: https://github.com/eggert/tz/blob/2025c/NEWS

(cherry picked from commit a86dc94b84d177da8f00d1c9420ef0860576e4c4)
DeltaFile
+186-181contrib/tzdata/theory.html
+138-58contrib/tzdata/Makefile
+135-0contrib/tzdata/NEWS
+47-47contrib/tzdata/zonenow.tab
+36-16contrib/tzdata/europe
+41-10contrib/tzdata/northamerica
+583-31216 files not shown
+682-40822 files

FreeBSD/src b94c971contrib/tzdata theory.html Makefile

contrib/tzdata: import tzdata 2025c

Changes: https://github.com/eggert/tz/blob/2025c/NEWS

(cherry picked from commit a86dc94b84d177da8f00d1c9420ef0860576e4c4)
DeltaFile
+186-181contrib/tzdata/theory.html
+138-58contrib/tzdata/Makefile
+135-0contrib/tzdata/NEWS
+47-47contrib/tzdata/zonenow.tab
+36-16contrib/tzdata/europe
+41-10contrib/tzdata/northamerica
+583-31216 files not shown
+682-40822 files

FreeBSD/src 33510b1sbin/reboot nextboot.sh

nextboot: Reimplement missing -a option

PR:             260520
MFC after:      3 days
Fixes:          e307eb94ae52 ("loader: zfs should support bootonce an nextboot")
DeltaFile
+4-0sbin/reboot/nextboot.sh
+4-01 files

FreeBSD/src 5f8988blib/libsysdecode Makefile

libsysdecode: Use consistent include path

mkioctls should look at the same set of headers as mktables does.

MFC after:      1 week
Fixes:          139d114acc7b ("libsysdecode use MKTABLES_INCLUDEDIR")
Sponsored by:   Klara, Inc.
Sponsored by:   NetApp, Inc.
Reviewed by:    sjg
Differential Revision:  https://reviews.freebsd.org/D54106

(cherry picked from commit c51876a107310984ba3a31b088caebcfd86a9844)
DeltaFile
+1-1lib/libsysdecode/Makefile
+1-11 files

FreeBSD/src ca87690libexec/rc/rc.d FILESYSTEMS cleanvar

cleanvar: Fix startup order

Instead of having FILESYSTEMS require cleanvar, which doesn't really
make semantic sense, say that cleanvar needs to run before FILESYSTEMS.

MFC after:      3 days
Reviewed by:    imp
Differential Revision:  https://reviews.freebsd.org/D54118

(cherry picked from commit 6ce227d6274869a95150746d2f2d8c8c5ed9a266)
DeltaFile
+1-1libexec/rc/rc.d/FILESYSTEMS
+1-0libexec/rc/rc.d/cleanvar
+2-12 files

FreeBSD/src 8959edalibexec/rc/rc.d noshutdown

noshutdown: Fix startup order

This rc script exists solely to create a file, so have it explicitly
require FILESYSTEMS.  In its current form, it was as likely as not to
end up running before cleanvar, which would undo its work.

MFC after:      3 days
Fixes:          384d976725a5 ("rc.d: Add precious_machine rc.conf knob to create /var/run/noshutdown")
Reviewed by:    kib
Differential Revision:  https://reviews.freebsd.org/D54119

(cherry picked from commit e540e8b2c04f03b4210a3bf2f421c05b918d1b51)
DeltaFile
+1-1libexec/rc/rc.d/noshutdown
+1-11 files

FreeBSD/src 68ed90dsbin/reboot reboot.c nextboot.8

nextboot: Reimplement missing -a option

* Reimplement the -a option which was available in the original shell
  script and is still documented.

* Print the correct usage string when invoked as nextboot.

* Add the -D option to the manual page synopsis.

MFC after:      1 week
Fixes:          fd6d47375a78 ("rescue,nextboot: Install nextboot as a link to reboot, rm nextboot.sh")
Reviewed by:    imp
Differential Revision:  https://reviews.freebsd.org/D54120

(cherry picked from commit de670c611b17939712a81dc56f73a3ff84f6c178)
DeltaFile
+34-10sbin/reboot/reboot.c
+2-2sbin/reboot/nextboot.8
+36-122 files

FreeBSD/src 2872555usr.bin/fsync fsync.c

fsync: Open files in non-blocking mode

This avoids blocking forever when invoked on a fifo.

MFC after:      1 week
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D54084

(cherry picked from commit 69e041521a80a0b8950f6ec25269a9c3949d6590)
DeltaFile
+1-1usr.bin/fsync/fsync.c
+1-11 files

FreeBSD/src ed66f6esys/sys bus.h

bus: Return 0 if reading an ivar fails

In the non-INVARIANTS case, return 0 rather than stack garbage if
reading an ivar fails (in the INVARIANTS case, we still panic).

MFC after:      1 week
Sponsored by:   Klara, Inc.
Sponsored by:   NetApp, Inc.
Reviewed by:    jhb
Differential Revision:  https://reviews.freebsd.org/D54078

(cherry picked from commit 4c2295c15860e70c8bd3f05f9229d2fc40dfd50d)
DeltaFile
+1-1sys/sys/bus.h
+1-11 files

FreeBSD/src 1dee233sbin/pfctl pf_print_state.c

pfctl: report ICMP states consistently for IPv4/IPv6

Remove the '#ifndef INET6', which never actually mattered because this
define is never set. This makes us report ICMP states for IPv4 and IPv6
the same way (and also aligns us with OpenBSD).

This means we will now always report state 0:0 rather than
NO_TRAFFIC:NO_TRAFFIC for icmp6 (like we already did for icmp).

Reported by:    Lev Prokofev <lev at netgate.com>
Sponsored by:   Rubicon Communications, LLC ("Netgate")
DeltaFile
+0-5sbin/pfctl/pf_print_state.c
+0-51 files

FreeBSD/src 2f29d0fcontrib/netbsd-tests/usr.sbin/mtree t_mtree.sh

mtree: tests: Import NetBSD's mtree test suite

Manually import latest mtree test suite from NetBSD.

MFC after:      1 week
DeltaFile
+39-1contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh
+39-11 files

FreeBSD/src dab5dafcontrib/mtree spec.c compare.c

mtree: Fix typos

Manually apply a typo fix.  This change has already been submitted
upstream as bin/59824.

MFC after:      1 week
DeltaFile
+1-1contrib/mtree/spec.c
+1-1contrib/mtree/compare.c
+2-22 files

FreeBSD/src 49b6ddacontrib/mtree create.c mtree.8

Import latest mtree from NetBSD

Merge commit 'f600477feb4ae61a75f61949eb600caff4aeea8c'

MFC after:      1 week
Discussed with: brooks
DeltaFile
+60-84contrib/mtree/create.c
+108-31contrib/mtree/mtree.8
+36-8contrib/mtree/spec.c
+24-15contrib/mtree/compare.c
+10-10contrib/mtree/crc.c
+12-5contrib/mtree/verify.c
+250-1534 files not shown
+271-16710 files

FreeBSD/src f600477. create.c mtree.8

Vendor import of NetBSD's mtree at 2025-12-13
DeltaFile
+65-86create.c
+109-31mtree.8
+38-9spec.c
+24-15compare.c
+10-10crc.c
+14-5verify.c
+260-1565 files not shown
+291-17911 files

FreeBSD/src 9d99744usr.sbin/bhyvectl bhyvectl.c

bhyvectl: fix build without BHYVE_SNAPSHOT

Build fails without BHYVE_SNAPSHOT due to undeclared identifier
'checkpoint_file'. Wrap that with a proper #ifdef.

Reported by:    dhw
DeltaFile
+2-0usr.sbin/bhyvectl/bhyvectl.c
+2-01 files

FreeBSD/src 756712dsys/netgraph/bluetooth/include ng_hci.h

ng_hci(4): Fix a typo in a source code comment

- s/depricated/deprecated/

MFC after:      3 days
DeltaFile
+1-1sys/netgraph/bluetooth/include/ng_hci.h
+1-11 files

FreeBSD/src 1df4d82sys/net/altq altq.h

altq(4): Fix a typo in a source code comment

- s/backet/bucket/

MFC after:      3 days
DeltaFile
+1-1sys/net/altq/altq.h
+1-11 files

FreeBSD/src a3950d7sys/dev/oce oce_mbox.c

oce(4): Fix a typo in a device debug message

- s/depricated/deprecated/

MFC after:      3 days
DeltaFile
+1-1sys/dev/oce/oce_mbox.c
+1-11 files

FreeBSD/src 3b6f948sys/cam/mmc mmc_xpt.c

mmc(4): Fix a typo in a device debug message

- s/reseting/resetting/

MFC after:      5 days
DeltaFile
+1-1sys/cam/mmc/mmc_xpt.c
+1-11 files

FreeBSD/src bcc735csys/dev/mps mps.c

mps(4): Fix a typo in a device message

- s/reseting/resetting/

MFC after:      5 days
DeltaFile
+1-1sys/dev/mps/mps.c
+1-11 files

FreeBSD/src 148111dusr.sbin/bhyvectl bhyvectl.c

bhyvectl: improve options error handling

Currently, it is possible to execute bhyvectl(8) with mutually exclusive
options, such as "--destroy" and "--suspend", and it will print out
obscure errors, e.g.:

 bhyvectl --suspend=/var/run/vms/my_vm --destroy --vm my_vm
 connect() failed: Connection refused

Address that by failing early if mutually exclusive options were
specified.

Additionally, move the BHYVE_SNAPSHOT block before the errors are
printed, so its errors are also displayed.

Approved by:            markj
Sponsored by:           The FreeBSD Foundation
MFC after:              2 weeks
Differential Revision:  https://reviews.freebsd.org/D54092
DeltaFile
+15-6usr.sbin/bhyvectl/bhyvectl.c
+15-61 files

FreeBSD/src 611bbb1usr.sbin/bhyve bhyve.8 snapshot.c

bhyve: change suspend exit code

Currently, after suspending, bhyve(8) exits with 0. This code is
also used to indicate that a VM was rebooted. To differentiate
reboot and suspend, use the next available exit code, 5, for suspend.

Approved by:            markj
Sponsored by:           The FreeBSD Foundation
MFC after:              2 weeks
Differential Revision:  https://reviews.freebsd.org/D54087
DeltaFile
+3-1usr.sbin/bhyve/bhyve.8
+1-1usr.sbin/bhyve/snapshot.c
+4-22 files

FreeBSD/src 476a063share/colldef_unicode zh_CN.UTF-8.src ko_KR.UTF-8.src, share/ctypedef C.UTF-8.src

locale: make install Unicode 17.0.0/CLDR 48

Unicode 17.0 adds 4803 characters, for a total of 159,801 characters.
The new additions include 4 new scripts:

- Sidetic
- Tolong Siki
- Beria Erfe
- Tai Yo

https://www.unicode.org/versions/Unicode17.0.0/
(cherry picked from commit 2cfd9fe87b90eddb9d0b3df3459d923092c491fb)
DeltaFile
+42,569-43,804share/colldef_unicode/zh_CN.UTF-8.src
+20,031-20,027share/colldef_unicode/ko_KR.UTF-8.src
+8,521-8,521share/colldef_unicode/ja_JP.UTF-8.src
+9,988-0tools/tools/locale/etc/final-maps/map.UTF-8
+5,765-6share/ctypedef/C.UTF-8.src
+2,842-2,827share/colldef_unicode/hu_HU.UTF-8.src
+89,716-75,18545 files not shown
+152,537-137,46151 files

FreeBSD/src e148f05tools/tools/locale Makefile

locale: Update Unicode to CLDR 48

Reviewed by:    bapt
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D53983

(cherry picked from commit d20da5c9736c3d93fc96e5e1c4dc40bed47bc419)
DeltaFile
+1-1tools/tools/locale/Makefile
+1-11 files

FreeBSD/src 6e2164btools/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

(cherry picked from commit 13ae4904ad7d4677a8d894c91362f2d2479965b6)
DeltaFile
+2-2tools/tools/locale/Makefile
+2-21 files

FreeBSD/src 438c324tools/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

(cherry picked from commit 934364da7fc8cd3ba4d030d0478163b41dda1b37)
DeltaFile
+58-53tools/tools/locale/tools/finalize
+58-531 files

FreeBSD/src bd37a9bshare/colldef_unicode Makefile, share/monetdef_unicode Makefile

locale: make install

Reviewed by:    bapt
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D53962

(cherry picked from commit 36cfa8093d25f8a5b598bd8ae74d7cbaafdc1879)
DeltaFile
+2-0share/colldef_unicode/Makefile
+1-0share/monetdef_unicode/Makefile
+1-0share/numericdef_unicode/Makefile
+1-0share/msgdef_unicode/Makefile
+5-04 files

FreeBSD/src e1ab892tools/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

(cherry picked from commit 95f37aa3e51ce46821059b2c9dbb02fef5c4bec5)
DeltaFile
+2-0tools/tools/locale/tools/cldr2def.pl
+2-01 files

FreeBSD/src 5c8f96bshare/monetdef_unicode ar_AE.UTF-8.src ar_EG.UTF-8.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

(cherry picked from commit 9df8243a2e0ab1ef027cbfbcb4105f5f0ce108e1)
DeltaFile
+18-0share/monetdef_unicode/ar_AE.UTF-8.src
+18-0share/monetdef_unicode/ar_EG.UTF-8.src
+18-0share/monetdef_unicode/ar_JO.UTF-8.src
+18-0share/monetdef_unicode/ar_MA.UTF-8.src
+18-0share/monetdef_unicode/ar_QA.UTF-8.src
+18-0share/monetdef_unicode/ar_SA.UTF-8.src
+108-0107 files not shown
+2,034-0113 files