HardenedBSD/src 71ab783contrib/bsddialog/examples_library slider.c, contrib/bsddialog/examples_utility slider.sh

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+670-0contrib/bsddialog/lib/slider.c
+70-55sbin/geom/core/geom.c
+64-26contrib/bsddialog/utility/util_builders.c
+44-0contrib/bsddialog/examples_library/slider.c
+34-0contrib/bsddialog/examples_utility/slider.sh
+10-1contrib/bsddialog/utility/util_cli.c
+892-8213 files not shown
+948-9319 files

HardenedBSD/src 47b8d3dcontrib/bsddialog/examples_library slider.c, contrib/bsddialog/examples_utility slider.sh

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+670-0contrib/bsddialog/lib/slider.c
+70-55sbin/geom/core/geom.c
+64-26contrib/bsddialog/utility/util_builders.c
+44-0contrib/bsddialog/examples_library/slider.c
+34-0contrib/bsddialog/examples_utility/slider.sh
+10-1contrib/bsddialog/utility/util_cli.c
+892-8213 files not shown
+948-9319 files

HardenedBSD/ports 5fed20bmisc/xplr distinfo Makefile.crates, net/openmpi pkg-plist

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+13,650-4,891www/firefox/files/patch-libwebrtc-generated
+319-285misc/xplr/distinfo
+384-0net/pmix/pkg-plist
+0-331net/openmpi/pkg-plist
+323-0net/prrte/pkg-plist
+159-142misc/xplr/Makefile.crates
+14,835-5,64988 files not shown
+15,381-6,04094 files

HardenedBSD/src deb684fsys/netpfil/ipfw/pmod tcpmod.c

ipfw: pmod: avoid further rule processing after tcp-mod failures

m_pullup() here will have freed the mbuf chain, but we pass back an
IP_FW_DENY without any signal that the outer loop should finish.  Thus,
rule processing continues without an mbuf and there's a chance that we
conclude that the packet may pass (but there's no mbuf remaining)
depending on the rules that follow it.

PR:             284606
Reviewed by:    ae

(cherry picked from commit c0382512bfce872102d213b9bc2550de0bc30b67)
DeltaFile
+16-9sys/netpfil/ipfw/pmod/tcpmod.c
+16-91 files

HardenedBSD/src 21d55aesys/netpfil/ipfw/pmod tcpmod.c

ipfw: pmod: avoid further rule processing after tcp-mod failures

m_pullup() here will have freed the mbuf chain, but we pass back an
IP_FW_DENY without any signal that the outer loop should finish.  Thus,
rule processing continues without an mbuf and there's a chance that we
conclude that the packet may pass (but there's no mbuf remaining)
depending on the rules that follow it.

PR:             284606
Reviewed by:    ae

(cherry picked from commit c0382512bfce872102d213b9bc2550de0bc30b67)
DeltaFile
+16-9sys/netpfil/ipfw/pmod/tcpmod.c
+16-91 files

HardenedBSD/ports a48e645lang/python314 Makefile pkg-plist, lang/python314/files pkg-message.in

lang/python314: split out _sqlite3 again.

to avoid a dependency loop through ICU.

Reported by:    diizzy@
DeltaFile
+3-2lang/python314/Makefile
+1-0lang/python314/files/pkg-message.in
+0-1lang/python314/pkg-plist
+4-33 files

HardenedBSD/src 8234c18release/tools gce.conf

release: Make fetch happen in GCE images

We want to fetch distfiles, regardless of whether they contain known
vulnerabilities or we're building images for a different version of
FreeBSD.

Reviewed by:    ivy
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D53569
DeltaFile
+3-2release/tools/gce.conf
+3-21 files

HardenedBSD/src 05b3a45release/tools gce.conf

release: Don't try to fetch distfiles for pkgbase

In order to comply with the require that GCE images must include their
source code, we fetch distfiles for all of the packages installed into
GCE images.  This fails for obvious reasons for packages with an origin
of base/*; filter those out to generate the list to fetch.

Reviewed by:    ivy
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D53568
DeltaFile
+1-1release/tools/gce.conf
+1-11 files

HardenedBSD/src 7f536b1release Makefile.vm

release: GCE builds depend on ftp

GCE images are required by Google to include their source code; we do
this by extracting {src,ports}.txz into the images, from the (legacy)
distribution sets.

Make sure those distribution sets actually exist.

Reviewed by:    ivy
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D53567
DeltaFile
+7-0release/Makefile.vm
+7-01 files

HardenedBSD/ports 887436cx11/plank distinfo Makefile

x11/plank: Update 0.11.153 => 0.11.154

Changelog:
https://github.com/zquestz/plank-reloaded/releases/tag/0.11.154

PR:             290750
Approved by:    daniel at shafer.cc (maintainer, implicit - innactive from 2021)
DeltaFile
+3-3x11/plank/distinfo
+1-1x11/plank/Makefile
+4-42 files

HardenedBSD/ports 017eb05misc/xplr distinfo Makefile.crates

misc/xplr: Update to 1.0.0

Changes:        https://github.com/sayanarijit/xplr/releases/tag/v1.0.0
PR:             286220
DeltaFile
+319-285misc/xplr/distinfo
+159-142misc/xplr/Makefile.crates
+1-2misc/xplr/Makefile
+479-4293 files

HardenedBSD/ports c3e4eb2ports-mgmt/poudriere-dsh2dsh distinfo Makefile

ports-mgmt/poudriere-dsh2dsh: Update 3.4.99.20251027 => 3.4.99.20251102

Changelog:
- fix broken `pkgclean -f`.

PR:     290748
DeltaFile
+3-3ports-mgmt/poudriere-dsh2dsh/distinfo
+1-1ports-mgmt/poudriere-dsh2dsh/Makefile
+4-42 files

HardenedBSD/ports 5b23c25x11-wm/cagebreak distinfo Makefile

x11-wm/cagebreak: update to 3.1.0

Changes:        https://github.com/project-repo/cagebreak/releases/tag/3.1.0
Reported by:    GitHub (watch releases)
DeltaFile
+3-3x11-wm/cagebreak/distinfo
+1-1x11-wm/cagebreak/Makefile
+4-42 files

HardenedBSD/ports 8728aeagraphics/mesa-devel Makefile

graphics/mesa-devel: unbreak build on aarch64 around 9557360d5a11

FAILED: [code=1] src/gallium/targets/rusticl/libRusticlOpenCL.so.1.0.0
ld: error: ld-temp.o <inline asm>:3:1: symbol 'loop64' is already defined
loop64:
^

ld: error: ld-temp.o <inline asm>:3:1: symbol 'loop64' is already defined
loop64:
^

ld: error: ld-temp.o <inline asm>:3:1: symbol 'loop64' is already defined
loop64:
^

ld: error: ld-temp.o <inline asm>:3:1: symbol 'loop64' is already defined
loop64:
^


    [3 lines not shown]
DeltaFile
+1-0graphics/mesa-devel/Makefile
+1-01 files

HardenedBSD/src e2a87c0sbin/ifconfig ifconfig.8

ifconfig.8: Mention max name length

PR:             289113
MFC after:      3 days

(cherry picked from commit 832cd05905980d0f6547bf02745b054c1f4af1eb)
DeltaFile
+3-0sbin/ifconfig/ifconfig.8
+3-01 files

HardenedBSD/src 6d6132dlib/geom/shsec gshsec.8

gshsec.8: Fix list alignment, tag spdx

MFC after:      3 days

(cherry picked from commit 05d48584607221922539bb6917c9c118236d78d5)
DeltaFile
+5-2lib/geom/shsec/gshsec.8
+5-21 files

HardenedBSD/src 772837cusr.sbin/bhyve bhyve.8

bhyve.8: Correct description for -c flag, tag spdx

The examples only show the usage of `-c <numcpus>`, as did the flag
description, however the -c flag supports more complex cpu topology
specifiers. These were documented correctly in SYNOPSIS, add them to
the body of the DESCRIPTION as well. Someone could go further and do
and example with using them.

MFC after:      3 days (there was a merge conflict with the date)
Event:          OpenZFS Developer Summit '25
Reported by:    Levi Worley <levi at gainframe.com>

(cherry picked from commit 205af037e302fbd50dabc485a89e2222cd063b9e)
DeltaFile
+5-2usr.sbin/bhyve/bhyve.8
+5-21 files

HardenedBSD/src 16f37d9usr.bin/cut cut.1

cut.1: Align option list and tag spdx

MFC after:      3 days
DeltaFile
+4-1usr.bin/cut/cut.1
+4-11 files

HardenedBSD/src c174f51sbin/geom/core geom.c

Refinements to the --libxo support for geom status and list sub commands.

Changes based on comments in D53110: tags should be lowercase; rename a
few containers so that the JSON/XML output says "DISK" or "MULTIPATH"
(depending on class) instead of a generic "Geom"; adds {t:} to trim
extra whitespaces that sometimes appeared in the value fields of
JSON/XML output.

Submitted-by: Johan Söllvander
MFC-after:    1 week
Differential Revision: https://reviews.freebsd.org/D53313
DeltaFile
+70-55sbin/geom/core/geom.c
+70-551 files

HardenedBSD/ports 1677e7earchivers/py-rjsmin distinfo Makefile

archivers/py-rjsmin: Update to 1.2.5

Changes: https://github.com/ndparker/rjsmin/blob/1.2.5/CHANGES
DeltaFile
+3-3archivers/py-rjsmin/distinfo
+1-1archivers/py-rjsmin/Makefile
+4-42 files

HardenedBSD/ports 6ba11ddarchivers/py-rcssmin distinfo Makefile

archivers/py-rcsmin: Update to 1.2.2

Changes: https://github.com/ndparker/rcssmin/blob/1.2.2/CHANGES
DeltaFile
+3-3archivers/py-rcssmin/distinfo
+1-1archivers/py-rcssmin/Makefile
+4-42 files

HardenedBSD/ports 8b1025fmath/octave Makefile pkg-plist

math/octave: Fix package problem.

- pkg build failed with JAVA UNSET, due to missing octave.jar.
- Bump portrevision.

PR:             290769
Reported by:    morten at unx.dk
DeltaFile
+1-1math/octave/Makefile
+1-1math/octave/pkg-plist
+2-22 files

HardenedBSD/ports 8d19917multimedia/subtitlecomposer distinfo pkg-plist, multimedia/subtitlecomposer/files patch-src_subtitlecomposer.xml

multimedia/subtitlecomposer: Update to 0.8.2
DeltaFile
+0-17multimedia/subtitlecomposer/files/patch-src_subtitlecomposer.xml
+3-3multimedia/subtitlecomposer/distinfo
+3-0multimedia/subtitlecomposer/pkg-plist
+1-2multimedia/subtitlecomposer/Makefile
+7-224 files

HardenedBSD/ports 6d07167devel/py-ipywidgets distinfo Makefile

devel/py-ipywidgets: Update to 8.1.8
DeltaFile
+3-3devel/py-ipywidgets/distinfo
+1-1devel/py-ipywidgets/Makefile
+4-42 files

HardenedBSD/ports 6c2aaaddevel/py-ipympl distinfo Makefile

devel/py-ipympl: Update to 0.9.8
DeltaFile
+3-3devel/py-ipympl/distinfo
+1-2devel/py-ipympl/Makefile
+4-52 files

HardenedBSD/ports 2353b3cdevel/py-jupyterlab-widgets distinfo Makefile

devel/py-jupyterlab-widgets: Update to 3.0.16
DeltaFile
+3-3devel/py-jupyterlab-widgets/distinfo
+1-1devel/py-jupyterlab-widgets/Makefile
+4-42 files

HardenedBSD/ports 7f29b54devel/py-widgetsnbextension distinfo Makefile

devel/py-widgetsnbextension: Update to 4.0.15
DeltaFile
+3-3devel/py-widgetsnbextension/distinfo
+1-1devel/py-widgetsnbextension/Makefile
+4-42 files

HardenedBSD/src 6c321dcsys/dev/nvme nvme_pci.c nvme_ctrlr.c

nvme: Add handling for bar5

The NVMe spec allows the Table BIR (TBIR) and PBA DIR (PBIR) to
be 0, 4, or 5. The existing NVMe driver basically only has support
for 4, perhaps under the assumption that BAR4 is 64-bit and also
occupies BAR5.

This change adds support for BAR5, covering the case where BAR4
and BAR5 might both be present and 32-bit, where the Table BIR
might be 4 and the PBA BIR might be 5, or vice versa.

The NVMe spec (in the SR-IOV section) also permits VFs to use BIR=2,
so I haven't added stricter checks on which BIR will be permitted
by the driver.

This enables FreeBSD on Google Compute Engine C4 Machines.

MFC after:              3 days
Reviewed by:            imp

    [6 lines not shown]
DeltaFile
+37-11sys/dev/nvme/nvme_pci.c
+7-2sys/dev/nvme/nvme_ctrlr.c
+4-2sys/dev/nvme/nvme_private.h
+48-153 files

HardenedBSD/ports 9413b32cad/fdm_materials pkg-plist Makefile

cad/fdm_materials: Update 5.7.0 => 10.9.0

Changelogs:
* https://github.com/Ultimaker/fdm_materials/releases/tag/v10.9.0-0
* https://github.com/Ultimaker/fdm_materials/compare/5.7.0...v10.9.0-0

* Improve pkg-descr
* Clarify the LICENSE
* Pet portclippy(1) and portfmt(1)

Approved by:            yuri@ (Mentor)
Differential Revision:  https://reviews.freebsd.org/D52971
DeltaFile
+19-0cad/fdm_materials/pkg-plist
+6-3cad/fdm_materials/Makefile
+3-3cad/fdm_materials/distinfo
+2-1cad/fdm_materials/pkg-descr
+30-74 files

HardenedBSD/src 6a13aearelease/tools vmimage.subr

vmimage.subr: pkg autoremove after pkg install

A bug in pkg, which somehow only surfaced as a consequence of pkgbase,
results in pkg install sometimes pulling in false dependencies.  This
problem might be limited to cases when the lib32 pkgbase packages are
not installed.  In the case of EC2 "small" images, installing the
ebsnvme-id package results in binutils, gcc12-devel, gmp, indexinfo,
liblz4, mpc, mpfr, and zstd packages being installed.

These false dependencies are however not recorded as dependencies --
at some level pkg does understand that they're not needed -- so running
pkg autoremove immediately after pkg install cleans them up.

Note: This does not remove lines from METALOG corresponding to these
packages, and makefs emits an error when it attempts to create the
filesystem but cannot find the files listed in METALOG -- but makefs
does seem to complete normally despite the error messages.

This change should be reverted once the pkg issue has been located and

    [6 lines not shown]
DeltaFile
+9-0release/tools/vmimage.subr
+9-01 files