FreeBSD/src d889f6crelease/tools oci-image-static.conf

release/tools: use same pkg settings in containers as in /etc/pkg/FreeBSD.conf

Instructions in /etc/pkg/FreeBSD.conf and elsewhere recommend putting
changes in /usr/local/etc/pkg/repos/FreeBSD.conf so bring OCI containers
into line as well.

Reviewed by:    dfr, ivy
Differential Revision:  https://reviews.freebsd.org/D54090

MFC after:      5 days
Sponsored by:   SkunkWerks, GmbH

(cherry picked from commit c73ae67348998a0056145e88debbea9ff6860c4f)
DeltaFile
+1-5release/tools/oci-image-static.conf
+1-51 files

FreeBSD/ports 89589f2devel/hs-hadolint distinfo Makefile

devel/hs-hadolint: Update to 2.14.0

ChangeLog:
  * https://github.com/hadolint/hadolint/releases/tag/v2.14.0
  * https://github.com/hadolint/hadolint/releases/tag/v2.13.1

MFH:            2026Q2
(cherry picked from commit a272ce3ffdf97176c999ea4ebf8ca6548cbf2242)
DeltaFile
+191-199devel/hs-hadolint/distinfo
+81-76devel/hs-hadolint/Makefile
+272-2752 files

FreeBSD/ports a272ce3devel/hs-hadolint distinfo Makefile

devel/hs-hadolint: Update to 2.14.0

ChangeLog:
  * https://github.com/hadolint/hadolint/releases/tag/v2.14.0
  * https://github.com/hadolint/hadolint/releases/tag/v2.13.1

MFH:            2026Q2
DeltaFile
+191-199devel/hs-hadolint/distinfo
+81-76devel/hs-hadolint/Makefile
+272-2752 files

FreeBSD/doc 148e26ddocumentation/content/en/books/handbook/mirrors _index.adoc, website/content/en where.adoc

Mirrors: Remove CD and DVD distributors

The last few years, there is only one distributor of FreeBSD discs,
and they only update their website if I send them an email, so I think
they are not actually selling any and nobody wants this.

Discussed with: cperciva
DeltaFile
+2-18documentation/content/en/books/handbook/mirrors/_index.adoc
+0-5website/content/en/where.adoc
+2-232 files

FreeBSD/src e68aa5acrypto/openssh ChangeLog ssh-pkcs11.c, crypto/openssh/openbsd-compat bsd-misc.c

OpenSSH: Update to 10.2p1

Full release notes are available at
https://www.openssh.com/txt/release-10.2

Selected highlights from the release notes:

Bugfixes
--------

 * ssh(1): fix mishandling of terminal connections when
   ControlPersist was active that rendered the session unusable.
   bz3872

Sponsored by:   The FreeBSD Foundation
DeltaFile
+146-37crypto/openssh/ChangeLog
+26-5crypto/openssh/ssh-pkcs11.c
+24-0crypto/openssh/openbsd-compat/bsd-misc.c
+0-16crypto/openssh/ssh-pkcs11-helper.c
+8-4crypto/openssh/regress/test-exec.sh
+5-4crypto/openssh/channels.c
+209-6616 files not shown
+248-8022 files

FreeBSD/ports 3d89aa1security/arti distinfo Makefile.crates

security/arti: Update to 2.3.0
DeltaFile
+205-165security/arti/distinfo
+101-81security/arti/Makefile.crates
+2-3security/arti/Makefile
+308-2493 files

FreeBSD/ports 594b370security/crowdsec distinfo Makefile

security/crowdsec: Security update 1.7.7 => 1.7.8

This release contains fixes for two vulnerabilities
that are scheduled for public disclosure shortly.

Changelog:
* Use Go 1.26 explicitly.
https://github.com/crowdsecurity/crowdsec/releases/tag/v1.7.8

PR:             295238
Reported by:    Manuel Sabban <manuel at crowdsec.net> (maintainer)
Approved by:    osa, vvd (Mentors, implicit)
MFH:            2026Q2

(cherry picked from commit 75aaf55344f17a9aa78807152a07020e23aa9dc5)
DeltaFile
+5-5security/crowdsec/distinfo
+3-3security/crowdsec/Makefile
+8-82 files

FreeBSD/ports a2a3466security/crowdsec distinfo Makefile

security/crowdsec: Update 1.7.6 => 1.7.7

Changelog:
https://github.com/crowdsecurity/crowdsec/releases/tag/v1.7.7

PR:             294198
Approved by:    Manuel Sabban <manuel at crowdsec.net> (maintainer)
Sponsored by:   UNIS Labs
Co-authored-by: Vladimir Druzenko <vvd at FreeBSD.org>

(cherry picked from commit dab0375c5cd37952ec0a51d2f79ca00f364719b0)
DeltaFile
+5-5security/crowdsec/distinfo
+3-4security/crowdsec/Makefile
+8-92 files

FreeBSD/ports 75aaf55security/crowdsec distinfo Makefile

security/crowdsec: Security update 1.7.7 => 1.7.8

This release contains fixes for two vulnerabilities
that are scheduled for public disclosure shortly.

Changelog:
* Use Go 1.26 explicitly.
https://github.com/crowdsecurity/crowdsec/releases/tag/v1.7.8

PR:             295238
Reported by:    Manuel Sabban <manuel at crowdsec.net> (maintainer)
Approved by:    osa, vvd (Mentors, implicit)
MFH:            2026Q2
DeltaFile
+5-5security/crowdsec/distinfo
+3-4security/crowdsec/Makefile
+8-92 files

FreeBSD/ports 9ed3030net/ooni-probe-cli distinfo Makefile

net/ooni-probe-cli: update to 3.29.1
DeltaFile
+5-5net/ooni-probe-cli/distinfo
+1-2net/ooni-probe-cli/Makefile
+6-72 files

FreeBSD/ports 69f58f7devel/gradle distinfo Makefile

devel/gradle: Update to 9.5.1

ChangeLog: https://github.com/gradle/gradle/compare/v9.5.0...v9.5.1
(cherry picked from commit 4221be2091c1ec623893848c70189b5b315a5cce)
DeltaFile
+3-3devel/gradle/distinfo
+1-2devel/gradle/Makefile
+4-52 files

FreeBSD/ports 4221be2devel/gradle distinfo Makefile

devel/gradle: Update to 9.5.1

ChangeLog: https://github.com/gradle/gradle/compare/v9.5.0...v9.5.1
DeltaFile
+3-3devel/gradle/distinfo
+1-2devel/gradle/Makefile
+4-52 files

FreeBSD/ports 8ba4934www/firefox distinfo Makefile

www/firefox: update to 150.0.3

Release Notes:
  https://www.firefox.com/en-US/firefox/150.0.3/releasenotes/

(cherry picked from commit dc25efccc41e18fd9ec019666c2a970ab4d2b7a9)
DeltaFile
+3-3www/firefox/distinfo
+2-3www/firefox/Makefile
+5-62 files

FreeBSD/ports dc25efcwww/firefox distinfo Makefile

www/firefox: update to 150.0.3

Release Notes:
  https://www.firefox.com/en-US/firefox/150.0.3/releasenotes/
DeltaFile
+3-3www/firefox/distinfo
+2-3www/firefox/Makefile
+5-62 files

FreeBSD/src 644b464crypto/openssh ChangeLog pkcs11.h

OpenSSH: Update to 10.1p1

Full release notes are available at
https://www.openssh.com/txt/release-10.1

Selected highlights from the release notes:

Potentially-incompatible changes

 * ssh(1): add a warning when the connection negotiates a non-post
   quantum key agreement algorithm.

 * ssh(1), sshd(8): major changes to handling of DSCP marking/IPQoS

 * ssh(1), sshd(8): deprecate support for IPv4 type-of-service (ToS)
   keywords in the IPQoS configuration directive.

 * ssh-add(1): when adding certificates to an agent, set the expiry
   to the certificate expiry time plus a short (5 min) grace period.

    [17 lines not shown]
DeltaFile
+3,255-1,388crypto/openssh/ChangeLog
+1,018-474crypto/openssh/pkcs11.h
+0-1,113crypto/openssh/sshkey-xmss.c
+0-1,106crypto/openssh/xmss_fast.c
+637-243crypto/openssh/ssh-pkcs11.c
+426-433crypto/openssh/moduli
+5,336-4,757308 files not shown
+10,988-10,646314 files

FreeBSD/ports 1f2e02fgames/chessx Makefile distinfo

games/chessx: Update 1.6.8 => 1.6.10

Changelog:
https://github.com/Isarhamster/chessx/blob/master/ChangeLog.md

Port changes:
* Mark devel/qt5-concurrent as build dependency explicitly in USE_QT.
* Strip installed binary as it's advised by ports QA.

PR:             295235
Reported by:    Alexey Vyskubov <alexey at pentode.fi> (maintainer)
Approved by:    osa, vvd (Mentors, implicit)
MFH:            2026Q2

(cherry picked from commit 1314603f671782f01640b3a0599813f08ef75ff9)
DeltaFile
+6-3games/chessx/Makefile
+3-3games/chessx/distinfo
+9-62 files

FreeBSD/ports 1314603games/chessx Makefile distinfo

games/chessx: Update 1.6.8 => 1.6.10

Changelog:
https://github.com/Isarhamster/chessx/blob/master/ChangeLog.md

Port changes:
* Mark devel/qt5-concurrent as build dependency explicitly in USE_QT.
* Strip installed binary as it's advised by ports QA.

PR:             295235
Reported by:    Alexey Vyskubov <alexey at pentode.fi> (maintainer)
Approved by:    osa, vvd (Mentors, implicit)
MFH:            2026Q2
DeltaFile
+6-3games/chessx/Makefile
+3-3games/chessx/distinfo
+9-62 files

FreeBSD/src 237900flib/libutil quotafile.c

libutil: Include param.h in quotafile.c

Required for MAXPATHLEN.

MFC after:      1 week
DeltaFile
+1-1lib/libutil/quotafile.c
+1-11 files

FreeBSD/src 9461071sbin/reboot reboot.c

reboot: Include limits.h for PATH_MAX

MFC after:      1 week
DeltaFile
+1-0sbin/reboot/reboot.c
+1-01 files

FreeBSD/src ee2d1a1usr.sbin/edquota edquota.c

edquota: Include param.h

Required for MAXPATHLEN and MAXLOGNAME.

MFC after:      1 week
DeltaFile
+1-0usr.sbin/edquota/edquota.c
+1-01 files

FreeBSD/src beab4a2sys/netinet igmp.c, sys/sys mbuf.h

igmp: Avoid leaving dangling pointers in the state-change queue

When igmp_v3_merge_state_changes() is iterating over state-change
packets, there is a case where it'll free a queued packet but will fail
to remove it from the queue.  Fix that.

Reported by:    Yuxiang Yang, Yizhou Zhao, Xuewei Feng, Qi Li, and Ke Xu from Tsinghua University using GLM5.1 from Z.ai
Reviewed by:    pouria, glebius
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D56947
DeltaFile
+8-0sys/sys/mbuf.h
+5-3sys/netinet/igmp.c
+13-32 files

FreeBSD/src 3cd3900sbin/fsck_ffs fsck.h gjournal.c

fsck_ffs: Avoid relying on param.h pollution from libufs.h

- gjournal.c needs param.h to get a definition of isclr().
- fsck.h needs signal.h for sig_atomic_t.

Sort includes while here.

Reviewed by:    kib
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D56858
DeltaFile
+6-5sbin/fsck_ffs/fsck.h
+2-2sbin/fsck_ffs/gjournal.c
+8-72 files

FreeBSD/src a6c4fe2sys/net if_vxlan.c

if_vxlan: Update *m0 after a pullup

vxlan_input()'s caller is supposed to free *m0 if it is non-NULL after
the function returns.  vxlan_input() failed to update *m0 after the
pullup however, so if it hits an error case after the pullup, we'll free
the mbuf twice.  Currently this can happen only if the interface is
brought down or due to a packet loop.

Reported by:    Yuxiang Yang, Yizhou Zhao, Xuewei Feng, Qi Li, and Ke Xu from Tsinghua University using GLM5.1 from Z.ai
Reviewed by:    pouria, zlei
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D56944
DeltaFile
+1-2sys/net/if_vxlan.c
+1-21 files

FreeBSD/src 8b4b995sys/sys cpuset.h _cpuset.h

cpuset: Move userspace declarations out of _cpuset.h

The _*.h headers are for structure definitions and should avoid
dependencies on other headers.  This convention is violated by using
__BEGIN_DECLS/__END_DECLS.

Move the declarations to cpuset.h, I see no reason they can't be there.

Reviewed by:    olce, brooks, kib
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D56856
DeltaFile
+6-1sys/sys/cpuset.h
+0-7sys/sys/_cpuset.h
+6-82 files

FreeBSD/src 271d25alib/libufs libufs.h inode.c

libufs: Avoid using param.h constants in libufs.h

MAXBSIZE is defined in param.h, which defines many other things.  To
avoid forcing all consumers of libufs.h to include param.h, let's
instead redefine it and verify the definition in inode.c.

Reviewed by:    kib
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D56859
DeltaFile
+5-2lib/libufs/libufs.h
+3-0lib/libufs/inode.c
+8-22 files

FreeBSD/src fae5815sbin/hastd hooks.c

hastd: Include param.h instead of relying on pollution in hooks.c

This is needed at least for MAX() and PATH_MAX.

MFC after:      1 week
DeltaFile
+1-1sbin/hastd/hooks.c
+1-11 files

FreeBSD/src fab4acbsys/kern subr_vmem.c

vmem: Include param.h in the userspace port as well

It is required at least for NBBY.

MFC after:      1 week
DeltaFile
+1-1sys/kern/subr_vmem.c
+1-11 files

FreeBSD/src 35a36d4usr.bin/mdo mdo.c

mdo: Avoid relying on header pollution

The uses of PAGE_SIZE and roundup2() require param.h.

MFC after:      1 week
DeltaFile
+1-1usr.bin/mdo/mdo.c
+1-11 files

FreeBSD/src 3b16e96tests/sys/netinet ip_mroute.py

tests/ip_mroute: Remove test timeouts

The configured timeout of 30s is a bit too low for a couple of tests
which create 4+ VNET jails when running tests in parallel and with
kernel sanitizers enabled.  There's no reason to have custom timeouts,
just use the default.

MFC after:      1 week
DeltaFile
+0-6tests/sys/netinet/ip_mroute.py
+0-61 files

FreeBSD/src 26bffe5sys/netinet tcp_hpts_test.c

tests/tcp_hpts_test: Fix more resource leaks

Address leaks that I missed in commit f7bf9fd6199c
("tests/tcp_hpts_test: Fix resource leaks").

Reviewed by:    Nick Banks <nickbanks at netflix.com>, tuexen
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D56943
DeltaFile
+10-3sys/netinet/tcp_hpts_test.c
+10-31 files