FreeBSD/src 4dd2b86krb5/include autoconf.h

krb5: Fix -Wint-conversion when bootstrapping on GNU/Linux

This shows up in GitHub Actions as a warning, and some compilers can
default to it being an error.
DeltaFile
+5-0krb5/include/autoconf.h
+5-01 files

FreeBSD/src 536b075sys/netpfil/pf pf.c pf_lb.c, tests/sys/netpfil/pf rdr.sh

pf: fix 'no rdr'

Ensure we always have a non-NULL rule pointer (ctx.rm).
It might have gotten set to NULL by pf_get_translation().

While here also restore the previous rdr behaviour be re-adding the incorrectly
removed 'break' in pf_match_translation_rule.

PR:             290177
MFC after:      3 days
Sponsored by:   Rubicon Communications, LLC ("Netgate")
Differential Revision:  https://reviews.freebsd.org/D53191

(cherry picked from commit cb36bfee25b71d1223b8fb1237fcf823d514b50e)
DeltaFile
+51-0tests/sys/netpfil/pf/rdr.sh
+1-0sys/netpfil/pf/pf.c
+1-0sys/netpfil/pf/pf_lb.c
+53-03 files

FreeBSD/src c108844share/man/man5 src.conf.5

src.conf.5: Regen

after recent MFCs:
9d0b660e6949 ("jemalloc: Fix activating debug on WITHOUT_MALLOC_PRODUCTION")
ac5378d93ce0 ("Add build option for the ia32 loader")

Sponsored by:   The FreeBSD Foundation
DeltaFile
+14-4share/man/man5/src.conf.5
+14-41 files

FreeBSD/src 2836993sys/dev/random random_harvestq.c, sys/dev/random/fenestrasX fx_pool.c

random: garbage collect the RANDOM_PURE_OCTEON entropy source

It was used for Octeon MIPS and all producers have been removed
from the source tree.

Reviewed by: emaste
Differential Revision:  https://reviews.freebsd.org/D53146
DeltaFile
+0-3sys/dev/random/fenestrasX/fx_pool.c
+1-2sys/dev/random/random_harvestq.c
+1-2sys/sys/random.h
+2-73 files

FreeBSD/src 74cd979release Makefile

release: Add pkg .conf to METALOG on dvd

We're correctly recording all of the packages in the dvd METALOG file,
but if we don't record ./packages/repos/FreeBSD_install_cdrom.conf then
users won't be able to install them very easily.

Approved by:    re (cperciva)
Reviewed by:    markj
Reported by:    Lars Tunkrans
MFC after:      3 days
Sponsored by:   https://www.patreon.com/cperciva
Differential Revision:  https://reviews.freebsd.org/D53199

(cherry picked from commit 2b5c62494df95cdb844b5f6f852412f2178f66dd)
(cherry picked from commit 52ea1ca18a0674e5085d6d0ddbc3c13bf0850429)
DeltaFile
+2-0release/Makefile
+2-01 files

FreeBSD/src 6f1622drelease/pkg_repos release-dvd.conf

Revert "release: Switch back to latest packages for now"

We now have 15.x quarterly package sets for both amd64 and arm64.

This reverts commit dc5aae134a44d18921e179355e9b93a7eff534ed.

Approved by:    re (cperciva)
DeltaFile
+1-1release/pkg_repos/release-dvd.conf
+1-11 files

FreeBSD/src 06e48a8release/tools vmimage.subr

vmimage.subr: Fix when/where we fix up METALOG

We only need to check for unMETALOGed directories and sort the METALOG
file if we're using it, i.e. if we're doing a NO_ROOT build.  This
non-NO_ROOT builds by no longer bogusly writing to /METALOG*.

We only need to add databases (spwd.db etc) to METALOG if we're doing
a pkgbase-enabled NO_ROOT build; but we should always do this before
creating the filesystem, not only if we installed extra packages (in
vm_extra_install_packages, where that code was erroneously placed).
This fixes non-cloud VM images, which in 15.0-BETA2 shipped without
password databases.

Approved by:    re (cperciva)
Reviewed by:    ivy
MFC after:      3 days
Sponsored by:   https://www.patreon.com/cperciva
Differential Revision:  https://reviews.freebsd.org/D53194


    [2 lines not shown]
DeltaFile
+35-31release/tools/vmimage.subr
+35-311 files

FreeBSD/src 7492142usr.sbin/bsdinstall/scripts jail

bsdinstall: jail: Fix DISTMENU items

The menu was incorrectly using the fourth column (distname) instead of
the first (dist) of the MANIFEST.

The actual file name is on the first column of the MANIFEST file.
Remove the .txz part of the name to build the menu options.

Reviewed by:    jamie
MFC after:      5 days
Differential Revision:  https://reviews.freebsd.org/D53177
DeltaFile
+1-1usr.sbin/bsdinstall/scripts/jail
+1-11 files

FreeBSD/src 52ea1carelease Makefile

release: Add pkg .conf to METALOG on dvd

We're correctly recording all of the packages in the dvd METALOG file,
but if we don't record ./packages/repos/FreeBSD_install_cdrom.conf then
users won't be able to install them very easily.

Reviewed by:    markj
Reported by:    Lars Tunkrans
MFC after:      3 days
Sponsored by:   https://www.patreon.com/cperciva
Differential Revision:  https://reviews.freebsd.org/D53199

(cherry picked from commit 2b5c62494df95cdb844b5f6f852412f2178f66dd)
DeltaFile
+2-0release/Makefile
+2-01 files

FreeBSD/src 34943c3share/mk bsd.opts.mk src.opts.mk

src.opts.mk: Remove REPRODUCIBLE_BUILD from the default list

It was added to the list in bsd.opts.mk in commit 4f81c42fbd76, so
should have been removed here.

Sponsored by:   The FreeBSD Foundation
Sponsored by:   Klara, Inc.

(cherry picked from commit b2f5dc591ef2547ee2e9b68e58a263cd34948db1)
(cherry picked from commit 7626ba028089b97b5bb204b5203ee8fa24f63c48)

PR:             290427
DeltaFile
+1-1share/mk/bsd.opts.mk
+0-1share/mk/src.opts.mk
+1-22 files

FreeBSD/src 99bf680lib/libutil mntopts.c

Fix getmntpoint(3) to operate as it is documented in its manual page.

The -libutil function getmntpoint(3) is documented as accepting a device
name “with or without /dev/ prepended to it” but did not attempt to
prepend /dev/. This patch corrects the problem by prepending /dev/ to
names that do not begin with a '/'.

Reported-by: Dag-Erling Smørgrav
Differential Revision: https://reviews.freebsd.org/D53185
MFC-after:    1 week
Sponsored-by: Netflix
DeltaFile
+37-16lib/libutil/mntopts.c
+37-161 files

FreeBSD/src 2564a21lib/libc/stdtime strptime.c strptime.3

libc: Add "Z" as TZ designator for strptime.

ISO 8601 allows use of "Z" as the time zone designator. Update the
strptime parser to allow this usage.

While we are at it, update the manpage to reflect that both UTC and Z
are now valid options.

Reviewed by:    des
Differential Revision:  https://reviews.freebsd.org/D53083

(cherry picked from commit 79e57ea662d92ffcbe7d65854a284aefac6a332d)
DeltaFile
+2-1lib/libc/stdtime/strptime.c
+1-1lib/libc/stdtime/strptime.3
+3-22 files

FreeBSD/src 3b9b7e0lib/libc/stdtime strptime.c strptime.3

libc: Add "Z" as TZ designator for strptime.

ISO 8601 allows use of "Z" as the time zone designator. Update the
strptime parser to allow this usage.

While we are at it, update the manpage to reflect that both UTC and Z
are now valid options.

Reviewed by:    des
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D53083

(cherry picked from commit 79e57ea662d92ffcbe7d65854a284aefac6a332d)
DeltaFile
+2-1lib/libc/stdtime/strptime.c
+1-1lib/libc/stdtime/strptime.3
+3-22 files

FreeBSD/src 3d368c6lib/libc/stdtime strptime.c strptime.3

libc: Add "Z" as TZ designator for strptime.

ISO 8601 allows use of "Z" as the time zone designator. Update the
strptime parser to allow this usage.

While we are at it, update the manpage to reflect that both UTC and Z
are now valid options.

Reviewed by:    des
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D53083

(cherry picked from commit 79e57ea662d92ffcbe7d65854a284aefac6a332d)
DeltaFile
+2-1lib/libc/stdtime/strptime.c
+1-1lib/libc/stdtime/strptime.3
+3-22 files

FreeBSD/src 8e8ee8betc/mtree BSD.include.dist

mtree: Remove stray atm directory

ATM support for netgraph was removed in af0cc0b22362 ("NgATM: Remove
netgraph ATM support")

Remove the directory from the mtree specification.

Reviewed by:    emaste
Fixes:  21735dfaebdf ("include: Remove no longer existing netgraph/atm")
MFC after:      5 days
Differential Revision:  https://reviews.freebsd.org/D53260
DeltaFile
+0-2etc/mtree/BSD.include.dist
+0-21 files

FreeBSD/src a12857fusr.sbin/moused/moused moused.c

moused: fix GCC build

error: 'static' is not at beginning of declaration [-Werror=old-style-declaration]

(cherry picked from commit 54cc3da443da7e4a8a483d1fe46071382ff06ed0)
DeltaFile
+1-1usr.sbin/moused/moused/moused.c
+1-11 files

FreeBSD/src 62aef3fsys/kern vfs_cluster.c

vfs_cluster.c: Do not propagate VOP_BMAP errors to the caller

The code that makes this VOP_BMAP call tries to perform a read-ahead I/O
operation. Failing to do that for any reason isn't fatal for `cluster_read()`,
because we still can return some data to the caller. This change is consistent
with other places within `cluster_read()`, where error returned by VOP_BMAP is
not returned to the caller - see the `if (nblks > 1)` block above the changed
lines and `if (reqbp)` at the end of the function.

PR:     264196
Approved by:    markj, kib
Differential Revision: https://reviews.freebsd.org/D51254
DeltaFile
+3-1sys/kern/vfs_cluster.c
+3-11 files

FreeBSD/src c4530d6. UPDATING, sys/conf newvers.sh

Add UPDATING entries and bump version

Approved by:    so
DeltaFile
+5-0UPDATING
+1-1sys/conf/newvers.sh
+6-12 files

FreeBSD/src 8a7addetests/sys/netinet so_reuseport_lb_test.c

so_reuseport_lb_test: Add a test case for connected UDP sockets

Approved by:    so

(cherry picked from commit 1dd66c6ac2c146f540b2ff825fbee442354aeee5)
(cherry picked from commit 8e999e63c356839fa60cf964e33e0054b63c7c87)
DeltaFile
+148-0tests/sys/netinet/so_reuseport_lb_test.c
+148-01 files

FreeBSD/src 90e14aasys/netinet in_pcb.c

inpcb: Ignore SO_REUSEPORT_LB on connected sockets

While TCP disallows connect()ing a socket with SO_REUSEPORT_LB, UDP does
not.  As a result, a connected UDP socket can be placed in the lbgroup
hash and thus receive datagrams from sources other than the connected
host.

Reported by:    Amit Klein <amit.klein at mail.huji.ac.il>
Reported by:    Omer Ben Simhon <omer.bensimhon at mail.huji.ac.il>
Reviewed by:    glebius
Approved by:    so
Security:       FreeBSD-SA-25:09.netinet
Security:       CVE-2025-24934

(cherry picked from commit 320ad3dec5ff1b37f6907a47961c18b9d77e6a53)
(cherry picked from commit df888c8f41f633be3aacecdd357ebaad62aa11bd)
DeltaFile
+25-9sys/netinet/in_pcb.c
+25-91 files

FreeBSD/src 382f547. UPDATING, sys/conf newvers.sh

Add UPDATING entries and bump version

Approved by:    so
DeltaFile
+5-0UPDATING
+1-1sys/conf/newvers.sh
+6-12 files

FreeBSD/src 65f6f82tests/sys/netinet so_reuseport_lb_test.c

so_reuseport_lb_test: Add a test case for connected UDP sockets

Approved by:    so

(cherry picked from commit 1dd66c6ac2c146f540b2ff825fbee442354aeee5)
(cherry picked from commit 7272e2d029c20c3144d7aa49500dc86d70344030)
DeltaFile
+148-0tests/sys/netinet/so_reuseport_lb_test.c
+148-01 files

FreeBSD/src 058bcb5sys/netinet in_pcb.c

inpcb: Ignore SO_REUSEPORT_LB on connected sockets

While TCP disallows connect()ing a socket with SO_REUSEPORT_LB, UDP does
not.  As a result, a connected UDP socket can be placed in the lbgroup
hash and thus receive datagrams from sources other than the connected
host.

Reported by:    Amit Klein <amit.klein at mail.huji.ac.il>
Reported by:    Omer Ben Simhon <omer.bensimhon at mail.huji.ac.il>
Reviewed by:    glebius
Approved by:    so
Security:       FreeBSD-SA-25:09.netinet
Security:       CVE-2025-24934

(cherry picked from commit 320ad3dec5ff1b37f6907a47961c18b9d77e6a53)
(cherry picked from commit e276759b368701a49e543c45d5d6ea08ed4fbc38)
DeltaFile
+10-3sys/netinet/in_pcb.c
+10-31 files

FreeBSD/src c43777c. UPDATING, sys/conf newvers.sh

Add UPDATING entries and bump version

Approved by:    so
Approved by:    re (cperciva)
DeltaFile
+5-0UPDATING
+1-1sys/conf/newvers.sh
+6-12 files

FreeBSD/src aaf0414tests/sys/netinet so_reuseport_lb_test.c

so_reuseport_lb_test: Add a test case for connected UDP sockets

Approved by:    so
Approved by:    re (cperciva)

(cherry picked from commit 1dd66c6ac2c146f540b2ff825fbee442354aeee5)
(cherry picked from commit 25e065774302591b43a263a78362a816f799f715)
DeltaFile
+148-0tests/sys/netinet/so_reuseport_lb_test.c
+148-01 files

FreeBSD/src 98c5396sys/netinet in_pcb.c

inpcb: Ignore SO_REUSEPORT_LB on connected sockets

While TCP disallows connect()ing a socket with SO_REUSEPORT_LB, UDP does
not.  As a result, a connected UDP socket can be placed in the lbgroup
hash and thus receive datagrams from sources other than the connected
host.

Reported by:    Amit Klein <amit.klein at mail.huji.ac.il>
Reported by:    Omer Ben Simhon <omer.bensimhon at mail.huji.ac.il>
Reviewed by:    glebius
Approved by:    so
Approved by:    re (cperciva)
Security:       FreeBSD-SA-25:09.netinet
Security:       CVE-2025-24934

(cherry picked from commit 320ad3dec5ff1b37f6907a47961c18b9d77e6a53)
(cherry picked from commit ef159100ec2b73c22caccc00555bae4c3cbc0ea1)
DeltaFile
+10-3sys/netinet/in_pcb.c
+10-31 files

FreeBSD/src 8e999e6tests/sys/netinet so_reuseport_lb_test.c

so_reuseport_lb_test: Add a test case for connected UDP sockets

Approved by:    so

(cherry picked from commit 1dd66c6ac2c146f540b2ff825fbee442354aeee5)
DeltaFile
+148-0tests/sys/netinet/so_reuseport_lb_test.c
+148-01 files

FreeBSD/src df888c8sys/netinet in_pcb.c

inpcb: Ignore SO_REUSEPORT_LB on connected sockets

While TCP disallows connect()ing a socket with SO_REUSEPORT_LB, UDP does
not.  As a result, a connected UDP socket can be placed in the lbgroup
hash and thus receive datagrams from sources other than the connected
host.

Reported by:    Amit Klein <amit.klein at mail.huji.ac.il>
Reported by:    Omer Ben Simhon <omer.bensimhon at mail.huji.ac.il>
Reviewed by:    glebius
Approved by:    so
Security:       FreeBSD-SA-25:09.netinet
Security:       CVE-2025-24934

(cherry picked from commit 320ad3dec5ff1b37f6907a47961c18b9d77e6a53)
DeltaFile
+25-9sys/netinet/in_pcb.c
+25-91 files

FreeBSD/src 7272e2dtests/sys/netinet so_reuseport_lb_test.c

so_reuseport_lb_test: Add a test case for connected UDP sockets

Approved by:    so

(cherry picked from commit 1dd66c6ac2c146f540b2ff825fbee442354aeee5)
DeltaFile
+148-0tests/sys/netinet/so_reuseport_lb_test.c
+148-01 files

FreeBSD/src e276759sys/netinet in_pcb.c

inpcb: Ignore SO_REUSEPORT_LB on connected sockets

While TCP disallows connect()ing a socket with SO_REUSEPORT_LB, UDP does
not.  As a result, a connected UDP socket can be placed in the lbgroup
hash and thus receive datagrams from sources other than the connected
host.

Reported by:    Amit Klein <amit.klein at mail.huji.ac.il>
Reported by:    Omer Ben Simhon <omer.bensimhon at mail.huji.ac.il>
Reviewed by:    glebius
Approved by:    so
Security:       FreeBSD-SA-25:09.netinet
Security:       CVE-2025-24934

(cherry picked from commit 320ad3dec5ff1b37f6907a47961c18b9d77e6a53)
DeltaFile
+10-3sys/netinet/in_pcb.c
+10-31 files