FreeBSD/src 45d84c2usr.bin/tr tr.c

tr: fix class handling in unicode world

toupper/tolower logic was only handled for CCLASS_TOUPPER and
CCLASS_TOLOWER, add support for CCLASS ([:alpha:])

PR:             219900
MFC After:      1 week

(cherry picked from commit 625dc44832cd760be3d7242d8e21a530c7e32bfc)
DeltaFile
+34-0usr.bin/tr/tr.c
+34-01 files

FreeBSD/src 2f866e0share/misc usb_vendors

usb_vendors: update to 2025.12.13

(cherry picked from commit 8d4c1043bb0630710cbea9f744cdaef499c0ed79)
DeltaFile
+3-2share/misc/usb_vendors
+3-21 files

FreeBSD/src b28b6c6share/misc pci_vendors

pci_vendors: update to 2026-02-10

(cherry picked from commit 1acfc913e6b936dec3effc7d1e902a50e5432406)
DeltaFile
+358-108share/misc/pci_vendors
+358-1081 files

FreeBSD/src a51ec1cusr.bin/tr tr.c

tr: fix class handling in unicode world

toupper/tolower logic was only handled for CCLASS_TOUPPER and
CCLASS_TOLOWER, add support for CCLASS ([:alpha:])

PR:             219900
MFC After:      1 week

(cherry picked from commit 625dc44832cd760be3d7242d8e21a530c7e32bfc)
DeltaFile
+34-0usr.bin/tr/tr.c
+34-01 files

FreeBSD/src 8cb78e4lib/libusb libusb10_hotplug.c

libusb: make libusb_hotplug_get_user_data actually return user_data

MFC After:      2 days
Reviewed by:    adrian
Differential Revision:  https://reviews.freebsd.org/D55291

(cherry picked from commit be522176951d8b542de9354f4ec9ac7603745b71)
DeltaFile
+3-1lib/libusb/libusb10_hotplug.c
+3-11 files

FreeBSD/src 2483216share/misc pci_vendors

pci_vendors: update to 2026-02-10

(cherry picked from commit 1acfc913e6b936dec3effc7d1e902a50e5432406)
DeltaFile
+358-108share/misc/pci_vendors
+358-1081 files

FreeBSD/src 9b2cba4share/misc usb_vendors

usb_vendors: update to 2025.12.13

(cherry picked from commit 8d4c1043bb0630710cbea9f744cdaef499c0ed79)
DeltaFile
+3-2share/misc/usb_vendors
+3-21 files

FreeBSD/src cab59e2lib/ncurses/tinfo ncurses_cfg.h

ncurses: fix cross build on MacOS

(cherry picked from commit ad553bd419a81274e9369e91753b74d3942ce938)
DeltaFile
+0-1lib/ncurses/tinfo/ncurses_cfg.h
+0-11 files

FreeBSD/src 297d5bfcontrib/ncurses configure aclocal.m4, contrib/ncurses/doc/html ncurses-intro.html

ncurses: merge update to ncurses 6.6

6.6 is ABI compatible with 6.5 (tested with abidiff)
Remove html documentation to ease updates

MFC After:      1 month

(cherry picked from commit 68ad2b0d7af2a3571c4abac9afa712f9b09b721c)
DeltaFile
+15,906-15,332contrib/ncurses/configure
+2,456-1,968contrib/ncurses/misc/terminfo.src
+0-3,390contrib/ncurses/doc/html/ncurses-intro.html
+0-2,282contrib/ncurses/ncurses/win32con/win_driver.c
+853-527contrib/ncurses/aclocal.m4
+639-518contrib/ncurses/announce.html.in
+19,854-24,017411 files not shown
+40,976-36,365417 files

FreeBSD/src 072c3a7share/misc committers-doc.dot

committers-ports: add andy

Following up ziaee's pattern, and add andy's line.
I'm not sure whether the original commit bit creation date should be used,
and use commit bit re-activation date for now.

MFC after:      1 week

(cherry picked from commit 0d9b5db9fc652e79e4eb08a2f583e9b825a50b92)
DeltaFile
+1-0share/misc/committers-doc.dot
+1-01 files

FreeBSD/src dae0d86share/misc committers-doc.dot

committers-ports: add andy

Following up ziaee's pattern, and add andy's line.
I'm not sure whether the original commit bit creation date should be used,
and use commit bit re-activation date for now.

MFC after:      1 week

(cherry picked from commit 0d9b5db9fc652e79e4eb08a2f583e9b825a50b92)
DeltaFile
+1-0share/misc/committers-doc.dot
+1-01 files

FreeBSD/src 03631ffshare/misc committers-doc.dot

committers-ports: add andy

Following up ziaee's pattern, and add andy's line.
I'm not sure whether the original commit bit creation date should be used,
and use commit bit re-activation date for now.

MFC after:      1 week

(cherry picked from commit 0d9b5db9fc652e79e4eb08a2f583e9b825a50b92)
DeltaFile
+1-0share/misc/committers-doc.dot
+1-01 files

FreeBSD/src 00e0b7busr.bin/fortune/datfiles freebsd-tips

Revert "fortune: fix netstat tip"

This reverts commit 8e593a1f143203cace2e14bd6629a8ebdf9b47dc. I was
totally wrong, so just revert and get on with it.

Sponsored by:           Netflix
DeltaFile
+1-1usr.bin/fortune/datfiles/freebsd-tips
+1-11 files

FreeBSD/src 59eafd8sys/netinet6 nd6_rtr.c

netinet6: spell Identifiers in the comment
DeltaFile
+1-1sys/netinet6/nd6_rtr.c
+1-11 files

FreeBSD/src 38edf96tests/sys/netpfil/ipfw log.sh

tests/ipfw: fix log:bpf test flakyness

There were several problems:

o Using 'netstat -B' is not a reliable way to make sure that all tcpdumps
  have attached to bpf(4).  The problem is that tcpdump (via libpcap) does
  several ioctl(2)s after the attach including two BIOCSETF.  Each of them
  flushes the input buffer.  So we can see tcpdump attached in 'netstat -B'
  and start sending packets and the packet will be captured by bpf(4)
  before BIOCSETF and freed and tcpdump won't read anything.  Instead of
  using netstat(1), use ps(1) and make sure each tcpdump is blocked on the
  "bpf" wait channel, which guarantees it is done with ioctl(2)s and is now
  blocked in read(2).
o Using 'nc -w 0' sets timeout not only on the connect(2) (as documented)
  but also on poll(2), which is not documented.  There is a race in shell
  that will make stdin not yet filled by 'echo foo' when nc(1) does
  poll(2).  With zero timeout, this poll(2) will immediately return and nc
  will exit.
o The waiting loop had two errors: using wrong variable name as well as

    [7 lines not shown]
DeltaFile
+11-8tests/sys/netpfil/ipfw/log.sh
+11-81 files

FreeBSD/src d60082fsys/netpfil/pf pf.c

pf: avoid NULL deref on purged states

States can be invalidated and still be present in the state table for a
while (until the pf_purge thread cleans them up). These states might not
have keys set, so we must make sure a state is not purged before we try
to access those keys.

MFC after:      1 week
Sponsored by:   Rubicon Communications, LLC ("Netgate")
DeltaFile
+3-1sys/netpfil/pf/pf.c
+3-11 files

FreeBSD/src e1e18ccsys/net if_gre.c if_gre.h, sys/netlink/route interface.h

if_gre: Add netlink support with tests

Migrate to new if_clone KPI and implement netlink support
for gre(4). Also refactor some of the gre specific ioctls.

Reviewed by: glebius, zlei
Differential Revision: https://reviews.freebsd.org/D54443
DeltaFile
+407-66sys/net/if_gre.c
+173-0tests/sys/netlink/test_rtnl_gre.c
+23-0sys/netlink/route/interface.h
+1-0sys/net/if_gre.h
+1-0tests/sys/netlink/Makefile
+605-665 files

FreeBSD/src 07d29f9sbin/conscontrol conscontrol.8, share/man/man4 ahd.4 smb.4

Correct Identifer typo in SPDX tags
DeltaFile
+1-1sbin/conscontrol/conscontrol.8
+1-1share/man/man4/ahd.4
+1-1share/man/man4/smb.4
+1-1usr.bin/man/manpath.1
+1-1usr.sbin/devinfo/devinfo.8
+1-1usr.sbin/kbdcontrol/kbdcontrol.1
+6-66 files

FreeBSD/src 7e31358usr.bin/beep beep.c

beep: Add SPDX-License-Identifier tag

Reviewed by: emaste
Sponsored by: The FreeBSD Foundation
DeltaFile
+2-0usr.bin/beep/beep.c
+2-01 files

FreeBSD/src 1e36ee7share/man/man7 mitigations.7

mitigations.7: spell
DeltaFile
+2-2share/man/man7/mitigations.7
+2-21 files

FreeBSD/src ddefff3sys/contrib/openzfs/include/os/freebsd/spl/sys time.h

Merge commit bfb276e55c76 from upstream OpenZFS (by Jessica Clarke)

  Once upon a time, 32-bit PowerPC did indeed have a 32-bit time_t, but
  FreeBSD 12.0 switched to a 64-bit time_t for PowerPC as an ABI break,
  which predates the addition of FreeBSD support to OpenZFS. Moreover,
  64-bit PowerPC has existed since FreeBSD 9.0, where __powerpc__ is also
  defined (alongside __powerpc64__ to disambiguate), which has always had
  a 64-bit time_t. This code has therefore always been wrong for all
  PowerPC variants. Fix this by limiting the 32-bit case to just i386,
  which is the only architecture in FreeBSD to have a 32-bit time_t and
  not have broken ABI, due to its special legacy compatibility status.

  Reviewed-by: Brian Behlendorf <behlendorf1 at llnl.gov>
  Reviewed-by: Alexander Motin <alexander.motin at TrueNAS.com>
  Signed-off-by: Jessica Clarke <jrtc27 at jrtc27.com>
  Closes #18217
  Closes #18218

Reported by:    fuz

    [3 lines not shown]
DeltaFile
+1-1sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h
+1-11 files

FreeBSD/src 354cc5esys/contrib/openzfs/include/os/freebsd/spl/sys time.h

Merge commit bfb276e55c76 from upstream OpenZFS (by Jessica Clarke)

  Once upon a time, 32-bit PowerPC did indeed have a 32-bit time_t, but
  FreeBSD 12.0 switched to a 64-bit time_t for PowerPC as an ABI break,
  which predates the addition of FreeBSD support to OpenZFS. Moreover,
  64-bit PowerPC has existed since FreeBSD 9.0, where __powerpc__ is also
  defined (alongside __powerpc64__ to disambiguate), which has always had
  a 64-bit time_t. This code has therefore always been wrong for all
  PowerPC variants. Fix this by limiting the 32-bit case to just i386,
  which is the only architecture in FreeBSD to have a 32-bit time_t and
  not have broken ABI, due to its special legacy compatibility status.

  Reviewed-by: Brian Behlendorf <behlendorf1 at llnl.gov>
  Reviewed-by: Alexander Motin <alexander.motin at TrueNAS.com>
  Signed-off-by: Jessica Clarke <jrtc27 at jrtc27.com>
  Closes #18217
  Closes #18218

Reported by:    fuz

    [3 lines not shown]
DeltaFile
+1-1sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h
+1-11 files

FreeBSD/src a82128dsys/contrib/openzfs/include/os/freebsd/spl/sys time.h

Merge commit bfb276e55c76 from upstream OpenZFS (by Jessica Clarke)

  Once upon a time, 32-bit PowerPC did indeed have a 32-bit time_t, but
  FreeBSD 12.0 switched to a 64-bit time_t for PowerPC as an ABI break,
  which predates the addition of FreeBSD support to OpenZFS. Moreover,
  64-bit PowerPC has existed since FreeBSD 9.0, where __powerpc__ is also
  defined (alongside __powerpc64__ to disambiguate), which has always had
  a 64-bit time_t. This code has therefore always been wrong for all
  PowerPC variants. Fix this by limiting the 32-bit case to just i386,
  which is the only architecture in FreeBSD to have a 32-bit time_t and
  not have broken ABI, due to its special legacy compatibility status.

  Reviewed-by: Brian Behlendorf <behlendorf1 at llnl.gov>
  Reviewed-by: Alexander Motin <alexander.motin at TrueNAS.com>
  Signed-off-by: Jessica Clarke <jrtc27 at jrtc27.com>
  Closes #18217
  Closes #18218

Reported by:    fuz

    [3 lines not shown]
DeltaFile
+1-1sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h
+1-11 files

FreeBSD/src 45c1e44sys/contrib/openzfs/include/os/freebsd/spl/sys time.h

Merge commit bfb276e55c76 from upstream OpenZFS (by Jessica Clarke)

  Once upon a time, 32-bit PowerPC did indeed have a 32-bit time_t, but
  FreeBSD 12.0 switched to a 64-bit time_t for PowerPC as an ABI break,
  which predates the addition of FreeBSD support to OpenZFS. Moreover,
  64-bit PowerPC has existed since FreeBSD 9.0, where __powerpc__ is also
  defined (alongside __powerpc64__ to disambiguate), which has always had
  a 64-bit time_t. This code has therefore always been wrong for all
  PowerPC variants. Fix this by limiting the 32-bit case to just i386,
  which is the only architecture in FreeBSD to have a 32-bit time_t and
  not have broken ABI, due to its special legacy compatibility status.

  Reviewed-by: Brian Behlendorf <behlendorf1 at llnl.gov>
  Reviewed-by: Alexander Motin <alexander.motin at TrueNAS.com>
  Signed-off-by: Jessica Clarke <jrtc27 at jrtc27.com>
  Closes #18217
  Closes #18218

Reported by:    fuz
MFC after:      1 day
DeltaFile
+1-1sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h
+1-11 files

FreeBSD/src 589cef5lib/libfetch common.c

libfetch: Restore timeout functionality

PR:             293124
MFC after:      1 week
Fixes:          792ef1ae7b94 ("Refactor fetch_connect() and fetch_bind() to improve readability and avoid repeating the same DNS lookups.")
Reverts:        8f8a7f6fffd7 ("libfetch: apply timeout to SSL_read()")
Reviewed by:    eugen, imp
Differential Revision:  https://reviews.freebsd.org/D55293

(cherry picked from commit 73b82d1b0a2f09224e6d0f7a13dd73c66d740207)
(insta-mfc requested by re@)
DeltaFile
+8-11lib/libfetch/common.c
+8-111 files

FreeBSD/src d97c824lib/libfetch common.c

libfetch: Restore timeout functionality

PR:             293124
MFC after:      1 week
Fixes:          792ef1ae7b94 ("Refactor fetch_connect() and fetch_bind() to improve readability and avoid repeating the same DNS lookups.")
Reverts:        8f8a7f6fffd7 ("libfetch: apply timeout to SSL_read()")
Reviewed by:    eugen, imp
Differential Revision:  https://reviews.freebsd.org/D55293

(cherry picked from commit 73b82d1b0a2f09224e6d0f7a13dd73c66d740207)
(insta-mfc requested by re@)
DeltaFile
+3-8lib/libfetch/common.c
+3-81 files

FreeBSD/src ae12f0flib/libfetch common.c

libfetch: Restore timeout functionality

PR:             293124
MFC after:      1 week
Fixes:          792ef1ae7b94 ("Refactor fetch_connect() and fetch_bind() to improve readability and avoid repeating the same DNS lookups.")
Reverts:        8f8a7f6fffd7 ("libfetch: apply timeout to SSL_read()")
Reviewed by:    eugen, imp
Differential Revision:  https://reviews.freebsd.org/D55293

(cherry picked from commit 73b82d1b0a2f09224e6d0f7a13dd73c66d740207)
(insta-mfc requested by re@)
DeltaFile
+3-8lib/libfetch/common.c
+3-81 files

FreeBSD/src d379432sys/kern kern_event.c, sys/sys event.h

kqueue: Make kn_sfflags unsigned

This is used to hold a copy of the original fflags, which is unsigned.

MFC after:      3 days
Reviewed by:    kib, markj
Differential Revision:  https://reviews.freebsd.org/D55348
DeltaFile
+1-1sys/kern/kern_event.c
+1-1sys/sys/event.h
+2-22 files

FreeBSD/src d540446usr.bin/diff diffreg_new.c

diff: Drop unnecessary casts, fix none algo

MFC after:      1 week
Sponsored by:   Klara, Inc.
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D55349
DeltaFile
+7-6usr.bin/diff/diffreg_new.c
+7-61 files

FreeBSD/src 009be09bin/sh sh.1

sh.1: Reference editline(7)

Key bindings for command line editing are documented in editline(7).

MFC after:              3 days
Reviewed by:            jilles, ziaee
Differential Revision:  https://reviews.freebsd.org/D54767
DeltaFile
+14-3bin/sh/sh.1
+14-31 files