FreeBSD/src 8bbe1d5. ObsoleteFiles.inc

ObsoleteFiles: Add some ancient locale symlinks

These were dropped in 2021 but were never listed in ObsoleteFiles.inc,
so systems that have been upgraded from source since before that date
(or from 13.x) may still have them.

PR:             295668
MFC after:      1 week
Fixes:          0a36787e4c1f ("locales: separate unicode from other locales")
Reviewed by:    bapt
Differential Revision:  https://reviews.freebsd.org/D57331

(cherry picked from commit 1cef7e9eb0822c606fc34f975efd14b6daeff756)
DeltaFile
+7-0ObsoleteFiles.inc
+7-01 files

FreeBSD/src 34fc5cclib/libutil login_class.c

login_class: Fix kqueues, pipebuf resource types

* kqueues is a count but is listed as a size

* pipebuf is a size but is listed as a count

PR:             295623
MFC after:      1 week
Fixes:          a4c04958f526 ("libutil: support RLIMIT_PIPEBUF")
Fixes:          85a0ddfd0b26 ("Add a resource limit for the total...")
Reviewed by:    kib
Differential Revision:  https://reviews.freebsd.org/D57333

(cherry picked from commit b5dce0ae4f78251f56ffcb6c6a58b9e6c20380e0)
DeltaFile
+2-2lib/libutil/login_class.c
+2-21 files

FreeBSD/src c435622bin/sh miscbltin.c

sh: Fix pipebuf limit

Since the factor is not 1, we need to provide a unit.

MFC after:      1 week
Fixes:          5d92f20c7d31 ("bin/sh: support RLIMIT_PIPEBUF")
Reviewed by:    kib
Differential Revision:  https://reviews.freebsd.org/D57352

(cherry picked from commit dfd2273d27627313f944650840381e878077e825)
DeltaFile
+1-1bin/sh/miscbltin.c
+1-11 files

FreeBSD/src 78381cdlib/libutil login.conf.5

login.conf(5): Add missing resource limits

While here, reorder the table.

PR:             295618
MFC after:      1 week
Reviewed by:    olce
Differential Revision:  https://reviews.freebsd.org/D57258

(cherry picked from commit e9346d1d1383e8c1dced50a3aceb28edd5a4a5e2)
DeltaFile
+6-5lib/libutil/login.conf.5
+6-51 files

FreeBSD/src d3c855flib/libc/gen fts.3

fts: Improve the description of FTS_NOSTAT

Note that we still need to stat directories and the roots.

MFC after:      1 week
Sponsored by:   Klara, Inc.
Reviewed by:    kevans
Differential Revision:  https://reviews.freebsd.org/D57325

(cherry picked from commit dce6aff90b13f30fcb4c1fa263868607ccda8041)
DeltaFile
+8-1lib/libc/gen/fts.3
+8-11 files

FreeBSD/src 7546f06. ObsoleteFiles.inc

ObsoleteFiles: Add some ancient locale symlinks

These were dropped in 2021 but were never listed in ObsoleteFiles.inc,
so systems that have been upgraded from source since before that date
(or from 13.x) may still have them.

PR:             295668
MFC after:      1 week
Fixes:          0a36787e4c1f ("locales: separate unicode from other locales")
Reviewed by:    bapt
Differential Revision:  https://reviews.freebsd.org/D57331

(cherry picked from commit 1cef7e9eb0822c606fc34f975efd14b6daeff756)
DeltaFile
+7-0ObsoleteFiles.inc
+7-01 files

FreeBSD/src e8abb10lib/libutil login.conf.5

login.conf(5): Add missing resource limits

While here, reorder the table.

PR:             295618
MFC after:      1 week
Reviewed by:    olce
Differential Revision:  https://reviews.freebsd.org/D57258

(cherry picked from commit e9346d1d1383e8c1dced50a3aceb28edd5a4a5e2)
DeltaFile
+6-5lib/libutil/login.conf.5
+6-51 files

FreeBSD/src 7ad1006bin/sh miscbltin.c

sh: Fix pipebuf limit

Since the factor is not 1, we need to provide a unit.

MFC after:      1 week
Fixes:          5d92f20c7d31 ("bin/sh: support RLIMIT_PIPEBUF")
Reviewed by:    kib
Differential Revision:  https://reviews.freebsd.org/D57352

(cherry picked from commit dfd2273d27627313f944650840381e878077e825)
DeltaFile
+1-1bin/sh/miscbltin.c
+1-11 files

FreeBSD/src b1cec2blib/libc/tests/gen fts_options_test.c

fts: Add some depth to the options test

MFC after:      1 week
Sponsored by:   Klara, Inc.
Reviewed by:    kevans
Differential Revision:  https://reviews.freebsd.org/D57323

(cherry picked from commit 7ec549870f2adeb0e896885220d4af6b47c4c9ba)
DeltaFile
+74-0lib/libc/tests/gen/fts_options_test.c
+74-01 files

FreeBSD/src 2a0e9a9lib/libutil login_class.c

login_class: Fix kqueues, pipebuf resource types

* kqueues is a count but is listed as a size

* pipebuf is a size but is listed as a count

PR:             295623
MFC after:      1 week
Fixes:          a4c04958f526 ("libutil: support RLIMIT_PIPEBUF")
Fixes:          85a0ddfd0b26 ("Add a resource limit for the total...")
Reviewed by:    kib
Differential Revision:  https://reviews.freebsd.org/D57333

(cherry picked from commit b5dce0ae4f78251f56ffcb6c6a58b9e6c20380e0)
DeltaFile
+2-2lib/libutil/login_class.c
+2-21 files

FreeBSD/src e6cabe3lib/libc/gen fts.3

fts: Improve the description of FTS_NOSTAT

Note that we still need to stat directories and the roots.

MFC after:      1 week
Sponsored by:   Klara, Inc.
Reviewed by:    kevans
Differential Revision:  https://reviews.freebsd.org/D57325

(cherry picked from commit dce6aff90b13f30fcb4c1fa263868607ccda8041)
DeltaFile
+8-1lib/libc/gen/fts.3
+8-11 files

FreeBSD/src e4dd350lib/libc/gen fts.c

fts: Check link count before using it

* Check the range of the link count before trying to use it.

* Rewrite the comment explaining what the link count is used for.

MFC after:      1 week
Sponsored by:   Klara, Inc.
Reviewed by:    kevans
Differential Revision:  https://reviews.freebsd.org/D57324

(cherry picked from commit b2b95249ae0e24a6e24ad4286da56f1aff7a6db0)
DeltaFile
+39-5lib/libc/gen/fts.c
+39-51 files

FreeBSD/src 42e6660sys/amd64/amd64 machdep.c

amd64: do not switch back and restore UEFI IDT in wrmsr_early_safe_end()

(cherry picked from commit 606d3cb1be5fd594c1f51addd063e7c13e16bdbc)
DeltaFile
+0-8sys/amd64/amd64/machdep.c
+0-81 files

FreeBSD/src c6ccef4sys/x86/x86 ucode.c

amd64: there is no reason to copy ucode around in ucode_load_bsp()

PR:     294630

(cherry picked from commit 16f21c5af35002b8361ffb2e83ff3c92cd899a3a)
DeltaFile
+9-11sys/x86/x86/ucode.c
+9-111 files

FreeBSD/src c7ff706stand/lua core.lua cli.lua, stand/man loader.8

lualoader: add be-list and be-switch commands

This is useful for driving BE changes from the loader command prompt,
rather than having to use the menu.  Note that the active carousel in
the boot environment carousel doesn't currently reflect a switch in
boot environments done this way- I'm considering this only a minor bug,
as you probably can't or won't go back to the menu if you're using these
commands.

Reviewed by:    imp (previous version)
DeltaFile
+43-0stand/lua/core.lua
+23-0stand/lua/cli.lua
+16-1stand/lua/core.lua.8
+14-1stand/man/loader.8
+1-6stand/lua/menu.lua
+97-85 files

FreeBSD/src 4f7d987. .git-blame-ignore-revs

.git-blame-ignore-revs: <assert.h> whitespace changes: Fix comment

Fixes:          8ee0f80252d1 (".git-blame-ignore-revs: <assert.h> whitespace changes")
Sponsored by:   The FreeBSD Foundation
DeltaFile
+1-1.git-blame-ignore-revs
+1-11 files

FreeBSD/ports 4dcd601www/privoxy Makefile distinfo

www/privoxy: Update 4.1.0 => 4.2.0

Privoxy 4.2.0 fixes a couple of bugs and brings general improvements
such as support for elliptic-curve keys.
Two potential security problems have been reported and addressed.

Changelog:
https://lists.privoxy.org/pipermail/privoxy-announce/2026-June/000013.html

Port changes:
- The Privoxy tools come with proper man pages now so install
  them when the tools are enabled.

PR:             295848
Reported by:    Fabian Keil <fk at fabiankeil.de> (maintainer)
Approved by:    osa, vvd (Mentors, implicit)
MFH:            2026Q2

(cherry picked from commit c9cc3d36733d5f4f0ce5ae4f6b3ce02ca868384c)
DeltaFile
+4-2www/privoxy/Makefile
+3-3www/privoxy/distinfo
+3-0www/privoxy/pkg-plist
+10-53 files

FreeBSD/ports c9cc3d3www/privoxy Makefile distinfo

www/privoxy: Update 4.1.0 => 4.2.0

Privoxy 4.2.0 fixes a couple of bugs and brings general improvements
such as support for elliptic-curve keys.
Two potential security problems have been reported and addressed.

Changelog:
https://lists.privoxy.org/pipermail/privoxy-announce/2026-June/000013.html

Port changes:
- The Privoxy tools come with proper man pages now so install
  them when the tools are enabled.

PR:             295848
Reported by:    Fabian Keil <fk at fabiankeil.de> (maintainer)
Approved by:    osa, vvd (Mentors, implicit)
MFH:            2026Q2
DeltaFile
+4-2www/privoxy/Makefile
+3-3www/privoxy/distinfo
+3-0www/privoxy/pkg-plist
+10-53 files

FreeBSD/src 8ee0f80. .git-blame-ignore-revs

.git-blame-ignore-revs: <assert.h> whitespace changes

Reminded by:    brooks
Sponsored by:   The FreeBSD Foundation
DeltaFile
+4-0.git-blame-ignore-revs
+4-01 files

FreeBSD/ports 98a8b5emultimedia/plexmediaserver-plexpass distinfo Makefile

multimedia/plexmediaserver-plexpass: Update 1.43.1.10611 => 1.43.2.10687

Changelog:
https://forums.plex.tv/t/plex-media-server/30447/706

PR:             295659
Reported by:    Ziggy Gable <ziggy at ziggythehamster.sh>
Approved by:    Ben Shertenlieb <b.shertenlieb at yahoo.com> (maintainer)
Approved by:    osa, vvd (Mentors, implicit)
DeltaFile
+3-3multimedia/plexmediaserver-plexpass/distinfo
+2-2multimedia/plexmediaserver-plexpass/Makefile
+5-52 files

FreeBSD/ports 5d7d3abmultimedia/libdvbcsa Makefile

multimedia/libdvbcsa: Fix WWW and pet portfmt
DeltaFile
+8-7multimedia/libdvbcsa/Makefile
+8-71 files

FreeBSD/src eb3a0a7lib/libarchive Makefile.inc, usr.bin/bsdcat Makefile

libarchive: Clean up the build configuration

* Move settings duplicated in libarchive, bsdcat, bsdcpio, bsdtar, and
  bsdunzip into libarchive's Makefile.inc.

* Drop some CFLAGS that merely duplicated some of the contents of our
  platform configuration header.

MFC after:      1 week
Reviewed by:    mm
Differential Revision:  https://reviews.freebsd.org/D57307
DeltaFile
+5-13usr.bin/cpio/Makefile
+6-11usr.bin/bsdcat/Makefile
+11-5lib/libarchive/Makefile.inc
+7-8usr.bin/cpio/tests/Makefile
+7-8usr.bin/bsdcat/tests/Makefile
+4-10usr.bin/unzip/Makefile
+40-555 files not shown
+63-8611 files

FreeBSD/src b3a8659. MAINTAINERS, .github CODEOWNERS

MAINTAINERS, CODEOWNERS: Add myself to fts and stdio
DeltaFile
+9-6MAINTAINERS
+5-2.github/CODEOWNERS
+14-82 files

FreeBSD/ports 0d8a603sysutils/rustic distinfo Makefile.crates

sysutils/rustic: Update to 0.11.3

ChangeLog:      https://github.com/rustic-rs/rustic/releases/tag/v0.11.3
Reported by:    "github-actions[bot]" <notifications at github.com>
DeltaFile
+391-235sysutils/rustic/distinfo
+194-116sysutils/rustic/Makefile.crates
+2-2sysutils/rustic/Makefile
+2-0sysutils/rustic/pkg-plist
+589-3534 files

FreeBSD/ports 5201649devel/osc Makefile distinfo, devel/osc/files patch-tests_test__git_editor.py

devel/osc: update 1.26.0 → 1.27.0
DeltaFile
+41-0devel/osc/files/patch-tests_test__git_editor.py
+5-2devel/osc/Makefile
+3-3devel/osc/distinfo
+49-53 files

FreeBSD/ports ea3889e. MOVED, games Makefile

games/minetestmapper: revert removal and update 2022022120250408

Please do not remove ports abruptly. Instead, go through a proper
process of first documenting the breakage with unconditional BROKEN
and then scheduling the removal with DEPRECATED/EXPIRATION_DATE.

Pointyhat to:   diizzy
DeltaFile
+41-0games/minetestmapper/Makefile
+3-0games/minetestmapper/pkg-plist
+3-0games/minetestmapper/distinfo
+1-0games/minetestmapper/pkg-descr
+0-1MOVED
+1-0games/Makefile
+49-16 files

FreeBSD/ports ad6c560net/olsrd Makefile

net/olsrd: Fix WWW to use https
DeltaFile
+1-1net/olsrd/Makefile
+1-11 files

FreeBSD/ports 594238a. MOVED, graphics Makefile

graphics/tippecanoe: revert removal

Please do not remove ports abruptly. Instead, go through a proper
process of first documenting the breakage with unconditional BROKEN
and then scheduling the removal with DEPRECATED/EXPIRATION_DATE.

This reverts commit 4c9bd41bd6fe492b8796ff927d3443ae1f5e58a2.

Pointyhat to:   diizzy
DeltaFile
+43-0graphics/tippecanoe/Makefile
+21-0graphics/tippecanoe/pkg-descr
+3-0graphics/tippecanoe/distinfo
+0-1MOVED
+1-0graphics/Makefile
+68-15 files

FreeBSD/ports 366acdcmultimedia/minisatip Makefile distinfo

multimedia/minisatip: Update to 2.0.81
DeltaFile
+4-4multimedia/minisatip/Makefile
+3-3multimedia/minisatip/distinfo
+7-72 files

FreeBSD/src 7487932include assert.h

assert.h: style(9): Space after #define, between #endif and comment

style(9) still allows TAB after #define but this is a historical
artifact and by far the minority of uses cases.  Going forward, we would
like to promote the use of a single space, as it allows alignment to
survive line prefixing (such as in diffs).

style(9) also has prescribed a single space between '#else' or '#endif'
and a comment recalling the guard since 2002.

So, commit 157c184689ea ("assert.h: Remove leading tabs for whitespace
consistency") was good, and in line with rules about whitespace changes
(since the file was heavily modified by surrounding commits).

This commit is thus basically a revert of 439710cf003b ("assert.h:
Revert "Remove leading tabs for whitespace consistency"), which extended
replacing spaces with TABs in the code introduced in the meantime (after
commit 157c184689ea).


    [4 lines not shown]
DeltaFile
+13-13include/assert.h
+13-131 files