HardenedBSD/src 70491d4sys/modules/zfs Makefile

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+2-4sys/modules/zfs/Makefile
+2-41 files

HardenedBSD/src b7582fesys/contrib/dev/athk/ath12k mac.c debugfs_htt_stats.c

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

Conflicts:
        sys/modules/zfs/Makefile (unresolved)
DeltaFile
+9,336-1,825sys/contrib/dev/athk/ath12k/mac.c
+6,178-0sys/contrib/dev/athk/ath12k/debugfs_htt_stats.c
+4,684-353sys/contrib/dev/athk/ath12k/wmi.c
+2,346-505sys/contrib/dev/athk/ath12k/dp_mon.c
+2,076-0sys/contrib/dev/athk/ath12k/debugfs_htt_stats.h
+1,814-206sys/contrib/dev/athk/ath12k/wmi.h
+26,434-2,889256 files not shown
+50,513-8,328262 files

HardenedBSD/src 879f7e1sys/amd64/amd64 mp_machdep.c, sys/amd64/include smp.h

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+3-3sys/net/if.c
+2-1sys/amd64/amd64/mp_machdep.c
+0-1sys/amd64/include/smp.h
+5-53 files

HardenedBSD/ports 07ae51bjava/eclipse distinfo, sysutils/beats9 Makefile

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+0-1,314sysutils/beats9/files/patch-go-sysinfo
+0-133sysutils/beats9/Makefile
+29-29java/eclipse/distinfo
+0-51sysutils/beats9/files/metricbeat.in
+0-51sysutils/beats9/files/auditbeat.in
+0-44sysutils/beats9/files/heartbeat.in
+29-1,62275 files not shown
+172-2,25381 files

HardenedBSD/ports 096895cnet/haproxy26 distinfo Makefile

net/haproxy26: update to version 2.6.25.
DeltaFile
+3-3net/haproxy26/distinfo
+1-1net/haproxy26/Makefile
+4-42 files

HardenedBSD/src a0170dbsbin/recoverdisk recoverdisk.c

"Pending" is more correct than "Missing"

Pointed out by: Alex "the PS/2 guy"
DeltaFile
+1-1sbin/recoverdisk/recoverdisk.c
+1-11 files

HardenedBSD/ports f49043dnet/haproxy28 distinfo Makefile

net/haproxy28: update to version 2.8.20.
DeltaFile
+3-3net/haproxy28/distinfo
+1-1net/haproxy28/Makefile
+4-42 files

HardenedBSD/ports bdf9ed7sysutils/beats9 Makefile, sysutils/beats9/files patch-go-sysinfo metricbeat.in

sysutils/beats9: Remove in favour of beats9N ports

This port was accidentally commited in parallel with the work done by
Saro and vvd@ for the entire elastic eco system keeping separate ports
for all three active elastic branches, beats8, beats92 and beats93.
DeltaFile
+0-1,314sysutils/beats9/files/patch-go-sysinfo
+0-133sysutils/beats9/Makefile
+0-51sysutils/beats9/files/metricbeat.in
+0-51sysutils/beats9/files/auditbeat.in
+0-44sysutils/beats9/files/heartbeat.in
+0-43sysutils/beats9/files/filebeat.in
+0-1,63629 files not shown
+1-2,12935 files

HardenedBSD/src 1b7687fsys/net if.c

ifnet: Fix decreasing the vnet interface count

It should be decreased only when the interface has been successfully
removed from the "active" list.

This prevents vnet_if_return() from potential OOB writes to the
allocated memory "pending".

Reviewed by:    kp, pouria
Fixes:          a779388f8bb3 if: Protect V_ifnet in vnet_if_return()
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D55873

(cherry picked from commit 8065ff63c0e5c3bb4abb02f55b20cb47bb51d1a7)
DeltaFile
+3-3sys/net/if.c
+3-31 files

HardenedBSD/src f521487sys/amd64/amd64 mp_machdep.c, sys/amd64/include smp.h

amd64: Make start_all_aps() static

It is not used elsewhere since the change [1].

[1] ac3ede5371af x86/xen: remove PVHv1 code

MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D55668

(cherry picked from commit 5f0ab9d9e965225c4af0c6ed481e01eee0ffab8f)
DeltaFile
+2-1sys/amd64/amd64/mp_machdep.c
+0-1sys/amd64/include/smp.h
+2-22 files

HardenedBSD/ports 83ce88asecurity/py-gssapi distinfo Makefile, security/py-gssapi/files patch-pyproject.toml

security/py-gssapi: Update to 1.11.1

PR:             293784
Approved by:    john at saltant.com (maintainer)
Release Notes:  https://github.com/pythongssapi/python-gssapi/releases/tag/v1.11.1
DeltaFile
+3-3security/py-gssapi/distinfo
+2-2security/py-gssapi/Makefile
+2-2security/py-gssapi/files/patch-pyproject.toml
+7-73 files

HardenedBSD/ports 776a5b1math/py-networkx distinfo Makefile, math/py-networkx/files patch-pyproject.toml

math/py-networkx: Update to 3.6
DeltaFile
+21-0math/py-networkx/files/patch-pyproject.toml
+3-3math/py-networkx/distinfo
+1-2math/py-networkx/Makefile
+25-53 files

HardenedBSD/ports bdd04bcmath/py-roman distinfo Makefile

math/py-roman: Update to 5.2
DeltaFile
+3-3math/py-roman/distinfo
+1-1math/py-roman/Makefile
+4-42 files

HardenedBSD/ports 646905amath/py-mpmath distinfo Makefile

math/py-mpmath: Update to 1.4.1
DeltaFile
+3-3math/py-mpmath/distinfo
+1-1math/py-mpmath/Makefile
+4-42 files

HardenedBSD/ports 1152829graphics/R-cran-png distinfo Makefile

graphics/R-cran-png: Update to 0.1-9

Reported by:    portscout
DeltaFile
+3-3graphics/R-cran-png/distinfo
+1-1graphics/R-cran-png/Makefile
+4-42 files

HardenedBSD/ports 9d7aefcmath/R-cran-mvtnorm distinfo Makefile

math/R-cran-mvtnorm: Update to 1.3.6
DeltaFile
+3-3math/R-cran-mvtnorm/distinfo
+1-1math/R-cran-mvtnorm/Makefile
+4-42 files

HardenedBSD/ports b28ab5emath/R-cran-miscTools distinfo Makefile

math/R-cran-miscTools: Update to 0.6.30
DeltaFile
+3-3math/R-cran-miscTools/distinfo
+1-1math/R-cran-miscTools/Makefile
+4-42 files

HardenedBSD/ports 86ad5d5math/R-cran-survey distinfo Makefile

math/R-cran-survey: Update to 4.5
DeltaFile
+3-3math/R-cran-survey/distinfo
+1-1math/R-cran-survey/Makefile
+4-42 files

HardenedBSD/ports e2fca0amath/R-cran-sf distinfo Makefile

math/R-cran-sf: Update to 1.1.0
DeltaFile
+3-3math/R-cran-sf/distinfo
+1-1math/R-cran-sf/Makefile
+4-42 files

HardenedBSD/ports 6232747math/R-cran-sp distinfo Makefile

math/R-cran-sp: Update to 2.2.1
DeltaFile
+3-3math/R-cran-sp/distinfo
+1-1math/R-cran-sp/Makefile
+4-42 files

HardenedBSD/ports d734ff3net/krakend-ce distinfo Makefile

net/krakend-ce: Update 2.13.2 => 2.13.3

Approved by:            db@, yuri@ (Mentors, implicit)
DeltaFile
+5-5net/krakend-ce/distinfo
+1-1net/krakend-ce/Makefile
+6-62 files

HardenedBSD/ports de07261net-im/nextcloud-talk distinfo Makefile

net-im/nextcloud-talk: Update to 23.0.2
DeltaFile
+3-3net-im/nextcloud-talk/distinfo
+1-1net-im/nextcloud-talk/Makefile
+4-42 files

HardenedBSD/ports 8d3187dmail/nextcloud-mail distinfo Makefile

mail/nextcloud-mail: Update to 5.7.4
DeltaFile
+3-3mail/nextcloud-mail/distinfo
+1-1mail/nextcloud-mail/Makefile
+4-42 files

HardenedBSD/src 33345b8sys/kern sys_timerfd.c

timerfd: Suppress kqueue readability after jump read

Do not report EVFILT_READ after reading a discontinuous clock jump.
This makes the kqueue filter consistent with Linux epoll behavior
and timerfd_poll(), which already checks tfd_jumped != TFD_READ before
reporting POLLIN.

MFC after: 2 weeks
DeltaFile
+1-1sys/kern/sys_timerfd.c
+1-11 files

HardenedBSD/src 0e8f351sys/kern sys_timerfd.c

timerfd: Use saturating sbintime conversions

Some timerfd consumers set expirations with timespec tv_sec components
larger than 2^31 - 1. In such cases, converting that timespec to
sbintime results in data loss or sign flip, yielding a shorter
expiration than desired.

To avoid this problem, use saturating timespec-to-sbintime conversion
functions. These will clamp the converted sbintime to SBT_MAX under
circumstances where the normal conversion functions would overflow.

Saturating conversions still result in data loss, but the consequences
are less severe, causing problems only after SBT_MAX (~68 years) of
system uptime elapses.

Reviewed by:            imp
Differential Revision:  https://reviews.freebsd.org/D55792
MFC after:              2 weeks
DeltaFile
+5-5sys/kern/sys_timerfd.c
+5-51 files

HardenedBSD/src 85c0f1asys/kern sys_timerfd.c, tests/sys/kern timerfd.c

timerfd: Fix interval callout scheduling

When a timerfd interval callout misses its scheduled activation time, a
differential is calculated based on the actual activation time and the
scheduled activation time. This differential is divided by the timerfd's
interval time and the quotient is added to the timerfd's counter.

Before this change, the next callout was scheduled to activate at:
scheduled activation time + timerfd interval.

This change fixes the scheduling of the next callout to activate at:
actual activation time + timerfd interval - remainder.

Reviewed by:            markj
Differential Revision:  https://reviews.freebsd.org/D55790
MFC after:              2 weeks
DeltaFile
+29-0tests/sys/kern/timerfd.c
+13-11sys/kern/sys_timerfd.c
+42-112 files

HardenedBSD/src b11fba4sys/kern sys_timerfd.c

timerfd: Wake up on discontinuous jump

If a discontinous realtime clock change occurs and sets any TFD_JUMPED
bits on the timerfd, then wake up waiting readers. This fixes failures
from the timerfd_root__clock_change_notification test case.

MFC after: 2 weeks
DeltaFile
+11-3sys/kern/sys_timerfd.c
+11-31 files

HardenedBSD/src 834c1batests/sys/kern timerfd.c Makefile

timerfd: Add tests

Take Jan Kokemuller's timerfd tests from the epoll-shim project,
stripping out code that isn't directly related to FreeBSD.

Reviewed by:            markj
Differential Revision:  https://reviews.freebsd.org/D55789
MFC after:              2 weeks
DeltaFile
+1,318-0tests/sys/kern/timerfd.c
+3-0tests/sys/kern/Makefile
+1,321-02 files

HardenedBSD/src e379953sys/sys time.h

sys/time: Add saturating sbt conversions

When converting from timespec to sbintime, the timespec's 64-bit tv_sec
component is shifted to the left 32 bits, causing any information in the
upper 32 bits to be lost.

This data loss during conversion can turn timespecs with very large
tv_sec counters into sbintimes that represent much smaller time
durations.

Add tstosbt_sat() and tvtosbt_sat(), which are saturating versions of
tstosbt and tvtosbt. With these routines, any overflow resulting from
the conversion is clamped to [-SBT_MAX - 1, SBT_MAX].

Reviewed by:            imp, markj
Differential Revision:  https://reviews.freebsd.org/D55791
MFC after:              2 weeks
DeltaFile
+21-0sys/sys/time.h
+21-01 files

HardenedBSD/ports 178525dmisc/codex Makefile distinfo

misc/codex: Update to 0.116.0

Changelog:
- https://github.com/openai/codex/releases/tag/rust-v0.115.0
- https://github.com/openai/codex/releases/tag/rust-v0.116.0

Reported by:    GitHub (watch releases)
DeltaFile
+15-5misc/codex/Makefile
+3-3misc/codex/distinfo
+18-82 files