HardenedBSD/src 83bf092bin/ed Makefile, bin/ed/tests ed_test.sh Makefile

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+1,782-0bin/ed/tests/ed_test.sh
+47-24sys/dev/acpica/acpi.c
+3-0bin/ed/Makefile
+3-0bin/ed/tests/Makefile
+2-0etc/mtree/BSD.tests.dist
+1-0sys/vm/vm_page.h
+1,838-246 files

HardenedBSD/src 46123a2contrib/ncurses configure aclocal.m4, contrib/ncurses/doc/html ncurses-intro.html

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
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,017428 files not shown
+41,440-36,516434 files

HardenedBSD/ports fadd0d6devel/catppuccin-whiskers distinfo Makefile.crates, www/chromium/files patch-chrome_browser_about__flags.cc patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+231-221devel/catppuccin-whiskers/distinfo
+115-110devel/catppuccin-whiskers/Makefile.crates
+54-54www/chromium/files/patch-chrome_browser_about__flags.cc
+49-0www/chromium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c
+49-0www/ungoogled-chromium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c
+49-0www/iridium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c
+547-38538 files not shown
+753-53844 files

HardenedBSD/src 0db846asys/conf files.amd64 files.x86, sys/modules Makefile

asmc(4): Stop building it on i386, as it supports only 64-bit chipsets

Reported by:    ngie
Fixes:          fde9fe18219f ("i386: Fix kernel compilation after introduction of ASMC_DEBUG option")
Sponsored by:   The FreeBSD Foundation

(cherry picked from commit 8342d9f7b5f13d0623861cb8b88caf10a15571f6)
DeltaFile
+1-1sys/modules/Makefile
+1-0sys/conf/files.amd64
+0-1sys/conf/files.x86
+2-23 files

HardenedBSD/src 13f0aa2sys/kern kern_sysctl.c

sysctl(9): Booleans: Accept integers to ease knob conversion

In sysctl_handle_bool(), if the output buffer (for the old value) has
room for exactly 4 bytes (sizeof(int)), then output the current boolean
value as an integer rather than a 'uint8_t'.  Conversely, if 4 bytes
exactly remain in the input buffer (for the new value), treat them as an
integer and derive the new boolean value from it.

Doing so allows to convert existing integer syscstl knobs that are
interpreted as a boolean into true boolean ones while staying
backwards-compatible.

That brings no drawback as no code currently uses sysctl_handle_bool()
as part of a series of calls to sysctl_handle_*() functions for
(de)serialization of some compound structure.  If that case ever
materializes, it can be easily solved, e.g., by creating
a sysctl_handle_bool_strict() variant.

In the future, we might want to go further and generally be more liberal

    [12 lines not shown]
DeltaFile
+33-5sys/kern/kern_sysctl.c
+33-51 files

HardenedBSD/src 27b7641sys/kern kern_sysctl.c

sysctl(9): Booleans: Fix old value length discovery

When calling sysctl(3) with a null 'oldp', i.e., length discovery mode,
'oldix' can be equal to 'oldlen', and we should not fail.

More generally, let SYSCTL_OUT() and SYSCTL_IN() handle corner cases,
simply removing the comparisons between 'oldidx' and 'oldlen' and
'newidx' and 'newlen' done by hand as the test just after is an equality
that does not require to know if 'idx' is smaller than 'len'.

PR:             292917
Reported by:    cy
Fixes:          406da392ef8d ("sysctl(9): Booleans: Accept integers to ease knob conversion")
Sponsored by:   The FreeBSD Foundation

(cherry picked from commit 895e1c6567d9561c86f8d20b47e924911bce989e)
DeltaFile
+0-4sys/kern/kern_sysctl.c
+0-41 files

HardenedBSD/src 6bc5a7csys/amd64/amd64 machdep.c

amd64: parse_memmap(): Move comment about size at proper place

While here, declare 'size' only in the relevant block.

No functional change (intended).

MFC after:      1 week
Sponsored by:   The FreeBSD Foundation

(cherry picked from commit 53bb02015fce72c79498842b898faefc2da3b0fb)
DeltaFile
+9-10sys/amd64/amd64/machdep.c
+9-101 files

HardenedBSD/src 9f48e72sys/x86/include x86_var.h, sys/x86/x86 cpu_machdep.c

x86: x86_msr_op(): MSR_OP_LOCAL: Disable interrupts on atomic ops

On MSR_OP_LOCAL and non-naturally-atomic operations (MSR_OP_ANDNOT and
MSR_OP_OR), there is no guarantee that we are not interrupted between
reading and writing the MSR, and that interruption could actually
perform some operation on that MSR, which would be lost.

Prevent that problem by temporarily disabling interrupts around MSR
manipulation.

Reviewed by:    kib
Discussed with: markj
MFC after:      2 weeks
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D54996

(cherry picked from commit e5f8cbb86d58f25b5ff168506b78d09dca266fb6)
DeltaFile
+3-0sys/x86/x86/cpu_machdep.c
+2-0sys/x86/include/x86_var.h
+5-02 files

HardenedBSD/src 314aeeasys/x86/x86 cpu_machdep.c

x86: x86_msr_op(): Simplify assertions

Simplify them by moving them into more natural places, i.e., default
cases of 'switch' statements.

No functional change (intended).

Reviewed by:    kib
MFC after:      2 weeks
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D54996

(cherry picked from commit a1a8bcdfde2e616cffeb4bf4e1968ba55cf409e9)
DeltaFile
+4-6sys/x86/x86/cpu_machdep.c
+4-61 files

HardenedBSD/src 30f803fsys/x86/x86 cpu_machdep.c

x86: x86_msr_op(): Move setting mode up, delineate logical blocks

No functional changes (intended).

Reviewed by:    kib
MFC after:      2 weeks
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D54996

(cherry picked from commit 7acd7ac6385c783699a64216198d7f2e244cc3b4)
DeltaFile
+5-3sys/x86/x86/cpu_machdep.c
+5-31 files

HardenedBSD/src 6d6eca7sys/dev/acpica acpi.c

acpi: Use only AcpiGetSleepTypeData() to determine Sx support

Previously, we would first call AcpiEvaluateObject() to execute \_Sx
before calling AcpiGetSleepTypeData().  This was unnecessary, as
AcpiGetSleepTypeData() performs the same call itself.  While doing so,
the latter function logs any other error than AE_NOT_FOUND (which
indicates that a particular sleep state is not supported), which most
probably is an added benefit of this change.

Reviewed by:    obiwac
MFC after:      2 weeks
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D54624

(cherry picked from commit 526c09a489295c96662d6c3d428f69672968ab80)
DeltaFile
+5-5sys/dev/acpica/acpi.c
+5-51 files

HardenedBSD/src 1d9cd70sys/dev/acpica acpi.c

acpi: Use AcpiGbl_FACS even on ACPI_REDUCED_HARDWARE

This has been possible since ACPICA 20240827, and is actually
a requirement to get out of S3 on ACPI_REDUCED_HARDWARE (that said, we
don't implement S3 on arm64 yet).

Relevant ACPICA commit:
https://github.com/acpica/acpica/commit/79cd933e7b370e8d3fb490bf36ca5d111a12f96a.

Reviewed by:    obiwac
MFC after:      2 weeks
MFC to:         stable/15
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D54625

(cherry picked from commit 0cca6277499febef57149e8999ecd1a42ef1dfd3)
DeltaFile
+0-2sys/dev/acpica/acpi.c
+0-21 files

HardenedBSD/src 97490a7sys/dev/aic7xxx ahc_pci.c

ahc(4): Fix a warning on i386 compilation

Fixes:          cd036e891a35 ("ahc_pci.c: If bus_dma...")
MFC after:      3 days
Sponsored by:   The FreeBSD Foundation

(cherry picked from commit a9f7074e858fd7c8e07c164fc365afc0d0077735)
DeltaFile
+1-1sys/dev/aic7xxx/ahc_pci.c
+1-11 files

HardenedBSD/src 4ba8eafbin/ps ps.c keyword.c

ps(1): Sort headers

Found these changes by chance in an old patch file.  Should have been
committed along with the ps(1) modifications done in March 2025.

No functional change (intended).

MFC after:      3 days
Sponsored by:   The FreeBSD Foundation

(cherry picked from commit 730b3e20069b7115d16f02525103c6c05fa04759)
DeltaFile
+5-5bin/ps/ps.c
+2-2bin/ps/keyword.c
+7-72 files

HardenedBSD/src bdf595fsys/sys exterrvar.h

exterrvar.h: style(9): Fix two small nits

- Use tabs before '\'.
- Comment for '#else' must be the negation of the initial '#if''s test.

No functional change.

Sponsored by:   The FreeBSD Foundation

(cherry picked from commit d9e734d650844f4465a2e064fc9ee0897ed9aa95)
DeltaFile
+2-2sys/sys/exterrvar.h
+2-21 files

HardenedBSD/ports 8ff8298devel/catppuccin-whiskers distinfo Makefile.crates

devel/catppuccin-whiskers: Update to 2.6.0

Changelog: https://github.com/catppuccin/whiskers/blob/v2.6.0/CHANGELOG.md

Reported by:    GitHub (watch releases)
DeltaFile
+231-221devel/catppuccin-whiskers/distinfo
+115-110devel/catppuccin-whiskers/Makefile.crates
+1-2devel/catppuccin-whiskers/Makefile
+347-3333 files

HardenedBSD/ports 5c5415csysutils/rubygem-fluentd Makefile distinfo

sysutils/rubygem-fluentd: Update to 1.19.2

Release notes:  https://github.com/fluent/fluentd/releases/tag/v1.19.2
DeltaFile
+13-13sysutils/rubygem-fluentd/Makefile
+3-3sysutils/rubygem-fluentd/distinfo
+16-162 files

HardenedBSD/src 9a6e77eetc/mtree BSD.tests.dist

ed: add missing test entry in mtree

Reported by:    olce
DeltaFile
+2-0etc/mtree/BSD.tests.dist
+2-01 files

HardenedBSD/ports 97ffa52math/R-cran-forecast distinfo Makefile

math/R-cran-forecast: Update to 9.0.1

Reported by:    portscout
DeltaFile
+3-3math/R-cran-forecast/distinfo
+2-3math/R-cran-forecast/Makefile
+5-62 files

HardenedBSD/ports fcc7e3bwww/chromium distinfo, www/chromium/files patch-chrome_browser_about__flags.cc patch-chrome_browser_chrome__content__browser__client.cc

www/chromium: update to 145.0.7632.109

Security:       https://vuxml.freebsd.org/freebsd/a977cb1c-0d7d-11f1-85c5-a8a1599412c6.html
DeltaFile
+54-54www/chromium/files/patch-chrome_browser_about__flags.cc
+11-11www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
+7-7www/chromium/files/patch-components_feature__engagement_public_feature__list.h
+7-7www/chromium/distinfo
+6-6www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders__webui__parts__desktop.cc
+5-5www/chromium/files/patch-chrome_browser_background_glic_glic__status__icon.cc
+90-9016 files not shown
+133-13322 files

HardenedBSD/ports 24f3bb7devel/R-cran-mlbench distinfo Makefile

devel/R-cran-mlbench: Update to 2.1-7

- Switch WWW url to canonical form

ChangeLog: https://cran.r-project.org/web/packages/mlbench/NEWS
DeltaFile
+3-3devel/R-cran-mlbench/distinfo
+2-2devel/R-cran-mlbench/Makefile
+5-52 files

HardenedBSD/ports 239f695security/vuxml/vuln 2026.xml

security/vuxml: add www/*chromium < 145.0.7632.109

Obtained from:  https://chromereleases.googleblog.com/2026/02/stable-channel-update-for-desktop_18.html
DeltaFile
+37-0security/vuxml/vuln/2026.xml
+37-01 files

HardenedBSD/src ffdfca5sys/dev/acpica acpi.c

acpi: Factor out the power off code into acpi_poweroff()

While here, make it print that we are trying to power off upfront, not
really treating differently power off preparation via
acpi_EnterSleepStatePrep() and actual power off via
AcpiEnterSleepState(), which the user does not care about.

While here, capitalize the messages.

Reviewed by:    obiwac
MFC after:      2 weeks
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D55226
DeltaFile
+28-19sys/dev/acpica/acpi.c
+28-191 files

HardenedBSD/src 781c9b0sys/dev/acpica acpi.c

acpi: Factor out message printing on failure of AcpiEnterSleepStatePrep()

To this end, create a small wrapper, acpi_EnterSleepStatePrep(), which
itself prints the failure message.

While here, when trying to power down (acpi_shutdown_final()), and
AcpiEnterSleepStatePrep() failed, print an additional message more
explicit about the power down request having failed.

Reviewed by:    obiwac
MFC after:      2 weeks
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D55225
DeltaFile
+21-7sys/dev/acpica/acpi.c
+21-71 files

HardenedBSD/src d18aaefsys/vm vm_page.h

vm_page.h: Materialize a spare bit

No functional change (intended).

MFC after:      2 weeks
Sponsored by:   The FreeBSD Foundation
DeltaFile
+1-0sys/vm/vm_page.h
+1-01 files

HardenedBSD/ports c81fbf8www/chromium/files patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c, www/iridium/files patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c

www/{*chromium,iridium}: unbreak build on arm64 by reinstating lost patches
DeltaFile
+49-0www/chromium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c
+49-0www/iridium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c
+49-0www/ungoogled-chromium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c
+147-03 files

HardenedBSD/src f015e48bin/ed Makefile, bin/ed/tests ed_test.sh Makefile

ed: convert test suite to ATF/kyua

MFC After:      1 week
DeltaFile
+1,782-0bin/ed/tests/ed_test.sh
+3-0bin/ed/Makefile
+3-0bin/ed/tests/Makefile
+1,788-03 files

HardenedBSD/ports 2583170databases/py-sqlmodel Makefile distinfo

databases/py-sqlmodel: Update to 0.0.34

Changelog: https://github.com/fastapi/sqlmodel/blob/0.0.34/docs/release-notes.md

Reported by:    Repology
DeltaFile
+5-5databases/py-sqlmodel/Makefile
+3-3databases/py-sqlmodel/distinfo
+8-82 files

HardenedBSD/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

HardenedBSD/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