HardenedBSD/src 565a233sys/dev/e1000 if_em.c, usr.sbin/freebsd-update freebsd-update.sh

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+2-2sys/dev/e1000/if_em.c
+4-0usr.sbin/freebsd-update/freebsd-update.sh
+6-22 files

HardenedBSD/ports 5079765dns/blocky distinfo, misc/freebsd-release-manifests pkg-plist

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+22-0security/vuxml/vuln/2026.xml
+8-8misc/freebsd-release-manifests/pkg-plist
+5-5www/oauth2-proxy/distinfo
+5-5dns/blocky/distinfo
+9-0misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-14.4-RC1
+9-0misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-14.4-RC1
+58-1825 files not shown
+124-10131 files

HardenedBSD/ports df4f957misc/freebsd-release-manifests pkg-plist, misc/freebsd-release-manifests/files/MANIFESTS amd64-amd64-14.4-RC1 arm64-aarch64-14.4-RC1

misc/freebsd-release-manifests: Add 14.4-RC1 MANIFEST files

Approved by:    re (implicit)
Sponsored by:   OpenSats Initiative
DeltaFile
+8-8misc/freebsd-release-manifests/pkg-plist
+9-0misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-14.4-RC1
+9-0misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-14.4-RC1
+9-0misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-14.4-RC1
+0-9misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-14.4-BETA3
+0-9misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-14.4-BETA3
+35-2612 files not shown
+71-7118 files

HardenedBSD/src b24dc84sys/dev/e1000 if_em.c

e1000: Increase FC pause/refresh time on PCH2 and newer

This corresponds to Linux f74dc880098b4a29f76d756b888fb31d81ad9a0c

That commit does not provide any public background detail, but it's been
in use for over 5 years and corresponds to previous chip bugs w.r.t.
automatic generation of PAUSE frames.

Reviewed by:    kgalazka
Differential Revision:  https://reviews.freebsd.org/D54555

(cherry picked from commit 2bdec2ee73be7dbafce9982b0dc5c273918a5443)
DeltaFile
+2-2sys/dev/e1000/if_em.c
+2-21 files

HardenedBSD/ports d9903aasysutils/nut-devel distinfo Makefile

sysutils/nut-devel: Update to the latest networkupstools/nut github commit
DeltaFile
+3-3sysutils/nut-devel/distinfo
+2-2sysutils/nut-devel/Makefile
+3-1sysutils/nut-devel/pkg-plist
+8-63 files

HardenedBSD/ports 54361e1shells/ksh-devel Makefile

shells/ksh-devel: Fix poudriere build
DeltaFile
+2-0shells/ksh-devel/Makefile
+2-01 files

HardenedBSD/ports b363013multimedia/droidcam distinfo Makefile

multimedia/droidcam: Update 2.1.4 => 2.1.5

While here, make use of ${DESKTOPDIR} instead.

Changelog:
https://github.com/dev47apps/droidcam-linux-client/releases/tag/v2.1.5

Reviewed by:    osa, vvd (mentors)
Approved by:    vvd (mentor)
Differential Revision: https://reviews.freebsd.org/D55542
DeltaFile
+3-3multimedia/droidcam/distinfo
+2-3multimedia/droidcam/Makefile
+5-62 files

HardenedBSD/ports 71a2722net-mgmt/networkmgr distinfo Makefile

net-mgmt/networkmgr: update to 6.9
DeltaFile
+3-3net-mgmt/networkmgr/distinfo
+1-1net-mgmt/networkmgr/Makefile
+4-42 files

HardenedBSD/src 178d0b5lib/libpmc/pmu-events/arch/x86/amdzen6 floating-point.json load-store.json

libpmc: Import AMD Zen 6 PMU events.

Sponsored by: Netflix

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/2049
DeltaFile
+1,106-0lib/libpmc/pmu-events/arch/x86/amdzen6/floating-point.json
+523-0lib/libpmc/pmu-events/arch/x86/amdzen6/load-store.json
+339-0lib/libpmc/pmu-events/arch/x86/amdzen6/recommended.json
+326-0lib/libpmc/pmu-events/arch/x86/amdzen6/l2-cache.json
+192-0lib/libpmc/pmu-events/arch/x86/amdzen6/execution.json
+177-0lib/libpmc/pmu-events/arch/x86/amdzen6/l3-cache.json
+2,663-06 files not shown
+3,217-112 files

HardenedBSD/src 3ce3e89lib/libpmc/pmu-events/arch/x86/amdzen1 recommended.json, lib/libpmc/pmu-events/arch/x86/amdzen2 recommended.json

libpmc: Update event definitions for AMD Zen

The pmu event definitions for AMD Zen 5 was updated since it was
imported into the tree.  As a bonus I also updated the recommended json
counters for Zen 1-3 even though we do not use that file yet.

Sponsored by: Netflix

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/2048
DeltaFile
+3-3lib/libpmc/pmu-events/arch/x86/amdzen5/load-store.json
+2-1lib/libpmc/pmu-events/arch/x86/amdzen1/recommended.json
+2-1lib/libpmc/pmu-events/arch/x86/amdzen2/recommended.json
+2-1lib/libpmc/pmu-events/arch/x86/amdzen3/recommended.json
+9-64 files

HardenedBSD/src e51ef8alib/libpmc libpmc.c, sys/dev/hwpmc hwpmc_ibs.c hwpmc_ibs.h

hwpmc: Initial support for AMD IBS

This patch adds support for AMD IBS.  It adds a new class of performance
counter that cotains two events: ibs-fetch and ibs-op events. Unlike
most existing sampled events, IBS events provide a number of values
containing extra information regarding the sample.  To support this we
use the existing callchain event, and introduce a new flag for multipart
payloads.  The first 8 bytes of the pc_sample contains a header that
defines up to four payloads.

Sponsored by: Netflix

Reviewed by: imp,mhorne
Pull Request: https://github.com/freebsd/freebsd-src/pull/2022
DeltaFile
+614-0sys/dev/hwpmc/hwpmc_ibs.c
+176-0sys/dev/hwpmc/hwpmc_ibs.h
+98-1usr.sbin/pmcstat/pmcstat_log.c
+84-12sys/dev/hwpmc/hwpmc_mod.c
+57-7lib/libpmc/libpmc.c
+23-4sys/x86/x86/local_apic.c
+1,052-248 files not shown
+1,130-3214 files

HardenedBSD/src 00c0a1flib/libpmc libpmc_pmu_util.c, lib/libpmc/pmu-events jevents.c json.c

hwpmc: Fix PMC flags for AMD Zen cores

The PMC flags available for DF and L3 counters were not all implemented.
More importantly, the field encodings for the L3 counters changed in an
incompatible way between Family 17h and Family 19h.  Similarly, the
field encodings for the DF coutners changed between Family 19h and 1Ah.
I also added the precise retire flag for the 3rd core counter.

Lastly, I added a warning in the jevent parser because ignoring the
unknown fields results in counters incorrectly programmed.  We should
not just ignore that.

Sponsored by: Netflix

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/2040
DeltaFile
+67-26sys/dev/hwpmc/hwpmc_amd.h
+66-5lib/libpmc/libpmc_pmu_util.c
+39-1lib/libpmc/pmu-events/jevents.c
+17-2sys/dev/hwpmc/hwpmc_amd.c
+14-0lib/libpmc/pmu-events/json.c
+1-0lib/libpmc/pmu-events/json.h
+204-346 files

HardenedBSD/src 82069fasys/netlink netlink_snl_route_parsers.h

snl: Remove duplicate rta_expires member in route parser

There is no user for `rta_expires` member and it's
duplicate of `rta_expire`.

Reviewed By: melifaro
Differential Revision: https://reviews.freebsd.org/D55445
DeltaFile
+0-1sys/netlink/netlink_snl_route_parsers.h
+0-11 files

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

freebsd-update: Error for -b basedir without UNAME_r set

freebsd-update sets the currently running release from UNAME -r, which
can be overridden via the --currently-running commandline option (or by
setting UNAME_r in the environment).  This may be invalid if -b is used
to specify a basedir other than /, so error out if -b is specified
without setting the currently running version.

PR:             283229
Reviewed by:    cperciva
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D48016

(cherry picked from commit 097458ac665db732cc91a22279da4cc14f694da2)
DeltaFile
+4-0usr.sbin/freebsd-update/freebsd-update.sh
+4-01 files

HardenedBSD/src 1f2f5ebsys/x86/conf NOTES

asmc(4): pull 32-bit support for the driver

The asmc(4) driver should work for 32-bit Intel-based Macs, in theory, if
the model details were added to the detection list. That being said,
32-bit Intel Macs were only released and available to the general public
for 8 months [1], so the value in maintaining i386 support in the driver is
reduced due to limited hardware access.

Remove 32-bit support for the driver officially to make it clear its use is
not supported.

This should fix building `NOTES.i386` by proxy as well.

Relnotes:       yes
MFC after:      2 weeks
Fixes:          f224591746b ("Add ASMC_DEBUG make option")
Fixes:          8342d9f7b5f ("asmc(4): Stop building it on i386, as...")
Differential Revision:  https://reviews.freebsd.org/D55544
DeltaFile
+0-2sys/x86/conf/NOTES
+0-21 files

HardenedBSD/ports 7c93c58www/oauth2-proxy distinfo Makefile

www/oauth2-proxy: Update to 7.14.3

Security:       10319b08-f050-4beb-95e3-fe025cdafd25
MFH:            2026Q1
DeltaFile
+5-5www/oauth2-proxy/distinfo
+1-2www/oauth2-proxy/Makefile
+6-72 files

HardenedBSD/ports 6ab856asecurity/vuxml/vuln 2026.xml

security/vuxml: Add www/oauth2-proxy < 7.14.2
DeltaFile
+22-0security/vuxml/vuln/2026.xml
+22-01 files

HardenedBSD/src 960409drelease/tools vmimage.subr

vmimage.subr: skip -dbg sets for WITHOUT_DEBUG_FILES/WITHOUT_KERNEL_SYMBOLS

This matches non-pkgbase behavior as installworld/installkernel skip the
debug bits if these knobs are set.

MFC after:      1 week
Sponsored by:   Chelsio Communications
Reviewed by:    cperciva
Differential Revision:  https://reviews.freebsd.org/D55572
DeltaFile
+5-5release/tools/vmimage.subr
+5-51 files

HardenedBSD/src 9d769e9sys/net if_gre.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+12-4sys/net/if_gre.c
+12-41 files

HardenedBSD/src c3e0ed8sys/net if_gre.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+12-4sys/net/if_gre.c
+12-41 files

HardenedBSD/ports f9df619. UPDATING, deskutils/xdpi Makefile

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+82-0security/vuxml/vuln/2026.xml
+30-0deskutils/xdpi/Makefile
+12-9sysutils/cbsd/files/cbsdd.in
+19-0UPDATING
+5-8x11-wm/mangowc/Makefile
+13-0ports-mgmt/packagekit/files/patch-backends_freebsd_PackageDatabase.hpp
+161-1762 files not shown
+305-12768 files

HardenedBSD/ports b06ccc7dns/blocky distinfo Makefile

dns/blocky: Update to 0.29.0

ChangeLog:      https://github.com/0xERR0R/blocky/releases/tag/v0.29.0
MFH:            2026Q1
DeltaFile
+5-5dns/blocky/distinfo
+1-2dns/blocky/Makefile
+6-72 files

HardenedBSD/ports 6408024shells/ksh-devel Makefile

shells/ksh-devel: Fixup conflict with ksh93

ksh-devel only conflicts with ksh93 when it installs the same binary.
DeltaFile
+1-1shells/ksh-devel/Makefile
+1-11 files

HardenedBSD/src afbfc2asys/net if_gre.c

gre: unbreak LINT-NOINET

- Move some of the braces under their respective conditionals to make the
statements more self-encapsulated and only define the `aliasreq` union
in the event either INET or INET6 is defined.

- Fix a copy-paste error: `in_gre_ioctl` should be `in6_gre_ioctl` in the
  INET6 case.

Reported by:    tinderbox
Fixes:          e1e18cc12e68 ("if_gre: Add netlink support with tests")
Differential Revision: https://reviews.freebsd.org/D55546
DeltaFile
+12-4sys/net/if_gre.c
+12-41 files

HardenedBSD/ports 583f1afx11/cde-devel/files patch-programs_dtterm_Makefile.am

x11/cde-devel: Update missing patch

Fixes:  bfc3172764d638ef6f323cbaa2de439bd81dda62
DeltaFile
+5-5x11/cde-devel/files/patch-programs_dtterm_Makefile.am
+5-51 files

HardenedBSD/ports e181701net/hostapd-devel distinfo Makefile

net/hostapd-devel: Update to the latest GH commit

Update to the latest w1.fi commit, proxied through my GH account
DeltaFile
+3-3net/hostapd-devel/distinfo
+2-2net/hostapd-devel/Makefile
+5-52 files

HardenedBSD/ports bfc3172x11/cde-devel distinfo Makefile

x11/cde-devel: Update to the latest cdesktopenv-code commit

Update to the latest cdedesktop-code commit proxied through my GH account
DeltaFile
+3-3x11/cde-devel/distinfo
+2-2x11/cde-devel/Makefile
+5-52 files

HardenedBSD/ports 5b8f1fesecurity/wpa_supplicant-devel Makefile distinfo

security/wpa_supplicant-devel: Update to latest GH commit

Update to the latest w1.fi commit, proxied through my GH account.
DeltaFile
+6-2security/wpa_supplicant-devel/Makefile
+3-3security/wpa_supplicant-devel/distinfo
+9-52 files

HardenedBSD/ports 0fd9c04x11-toolkits/thentenaar-motif-devel distinfo pkg-plist

x11-toolkits/thentenaar-motif-devel: Update to the latest github commit
DeltaFile
+3-3x11-toolkits/thentenaar-motif-devel/distinfo
+3-3x11-toolkits/thentenaar-motif-devel/pkg-plist
+2-2x11-toolkits/thentenaar-motif-devel/Makefile
+8-83 files

HardenedBSD/ports 4dddba3shells/ksh-devel distinfo Makefile

shells/ksh-devel: update to the latest ksh93/ksh github commit
DeltaFile
+3-3shells/ksh-devel/distinfo
+2-2shells/ksh-devel/Makefile
+5-52 files