HardenedBSD/src ccec693stand defs.mk loader.mk, stand/efi/loader Makefile

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+10-10stand/libsa/zfs/Makefile.inc
+3-4stand/defs.mk
+2-2stand/i386/gptzfsboot/Makefile
+1-1stand/efi/loader/Makefile
+1-1stand/loader.mk
+1-1sys/kern/firmw.S
+18-193 files not shown
+21-229 files

HardenedBSD/src 8d04049bin/sh miscbltin.c sh.1, bin/sh/tests/builtins read12.0 read11.0

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+57-26bin/sh/miscbltin.c
+32-0bin/sh/tests/builtins/read12.0
+18-3bin/sh/tests/builtins/read11.0
+9-0crypto/openssh/sshconnect.c
+7-0crypto/openssh/FREEBSD-upgrade
+5-1bin/sh/sh.1
+128-301 files not shown
+129-307 files

HardenedBSD/src aff2010bin/sh miscbltin.c sh.1, bin/sh/tests/builtins read12.0 read11.0

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+57-26bin/sh/miscbltin.c
+32-0bin/sh/tests/builtins/read12.0
+18-3bin/sh/tests/builtins/read11.0
+9-0crypto/openssh/sshconnect.c
+7-0crypto/openssh/FREEBSD-upgrade
+5-1bin/sh/sh.1
+128-301 files not shown
+129-307 files

HardenedBSD/ports 073d17edatabases/iowow/files patch-src_CMakeLists.txt, devel/tinysparql pkg-plist Makefile

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+263-14devel/tinysparql/pkg-plist
+32-12devel/tinysparql/Makefile
+13-4databases/iowow/files/patch-src_CMakeLists.txt
+0-13math/octave-forge-quaternion/files/patch-is__real__array.cc
+0-11math/lean4/files/patch-src_bin_leanc.in
+0-11math/lean4/files/patch-stage0_src_bin_leanc.in
+308-6526 files not shown
+376-12532 files

HardenedBSD/ports e2d9861devel/glab distinfo Makefile

devel/glab: update to 1.78.3

Changes:        https://gitlab.com/gitlab-org/cli/-/releases
DeltaFile
+5-5devel/glab/distinfo
+1-1devel/glab/Makefile
+6-62 files

HardenedBSD/ports ffa3015databases/ejdb Makefile distinfo, databases/iowow distinfo pkg-plist

databases/iowow: update the port to version 1.4.18

- Squash the chains of consecutive spaces between compilation
  flags to make the build log more readable
- databases/ejdb: pull upstream patch to synchronize with the
  new IOWOW struct naming

Reported by:    portscout
DeltaFile
+13-4databases/iowow/files/patch-src_CMakeLists.txt
+3-3databases/iowow/distinfo
+3-1databases/iowow/pkg-plist
+3-0databases/ejdb/Makefile
+1-1databases/iowow/Makefile
+2-0databases/ejdb/distinfo
+25-96 files

HardenedBSD/ports 65e52a0math/lean4/files patch-src_bin_leanc.in patch-stage0_src_bin_leanc.in

math/lean4: Update patches
DeltaFile
+0-11math/lean4/files/patch-src_bin_leanc.in
+0-11math/lean4/files/patch-stage0_src_bin_leanc.in
+4-4math/lean4/files/patch-src_shell_CMakeLists.txt
+4-4math/lean4/files/patch-stage0_src_shell_CMakeLists.txt
+3-4math/lean4/files/patch-src_runtime_io.cpp
+4-2math/lean4/files/patch-src_runtime_stack__overflow.cpp
+15-366 files

HardenedBSD/ports 9d0f301math/zimpl distinfo Makefile

math/zimpl: update 3.6.2 → 3.7.0
DeltaFile
+3-3math/zimpl/distinfo
+2-2math/zimpl/Makefile
+5-52 files

HardenedBSD/ports 9bc6e7eaudio/tetraproc distinfo Makefile

audio/tetraproc: update 0.9.2 → 0.10.0
DeltaFile
+3-3audio/tetraproc/distinfo
+1-1audio/tetraproc/Makefile
+4-42 files

HardenedBSD/ports ea5fe08net/torsocks Makefile

net/torsocks: update 2.4.0 → 2.5.0
DeltaFile
+1-1net/torsocks/Makefile
+1-11 files

HardenedBSD/ports 5565c25archivers/zchunk distinfo Makefile

archivers/zchunk: update 1.5.2 → 1.5.3
DeltaFile
+3-3archivers/zchunk/distinfo
+2-2archivers/zchunk/Makefile
+1-1archivers/zchunk/pkg-plist
+6-63 files

HardenedBSD/ports a7d5924dns/subfinder distinfo Makefile

dns/subfinder: update 2.9.0 → 2.10.1
DeltaFile
+5-5dns/subfinder/distinfo
+2-2dns/subfinder/Makefile
+7-72 files

HardenedBSD/ports 409f916security/tor distinfo Makefile

security/tor: update 0.4.8.20 → 0.4.8.21
DeltaFile
+3-3security/tor/distinfo
+1-1security/tor/Makefile
+4-42 files

HardenedBSD/src aac0ef5sys/kern firmw.S

kern: Fix section name for embedded firmware blobs

In practice this just ends up as an orphan section and so is placed next
to .rodata-like sections, so it's pretty harmless, but not intended.

Fixes:  a095390344fb ("Use a template assembly file for firmware object files.")
DeltaFile
+1-1sys/kern/firmw.S
+1-11 files

HardenedBSD/ports 3b09b6adevel/tinysparql pkg-plist Makefile

devel/tinysparql: update to 3.10.1

Changelog: https://gitlab.gnome.org/GNOME/tinysparql/-/blob/3.10.1/NEWS

- make options for avahi, bash completions, docs, man pages, tests and vapi
- create libtracker-sparql-3.0.so unversioned symlink for consumer LIB_DEPENDS
DeltaFile
+263-14devel/tinysparql/pkg-plist
+32-12devel/tinysparql/Makefile
+3-3devel/tinysparql/distinfo
+298-293 files

HardenedBSD/src 00e4b16crypto/openssh sshconnect.c FREEBSD-upgrade

openssh: Don't attempt to connect to unsupported addresses

When iterating over known addresses for the requested target host name,
skip those that are not supported by the running kernel.

MFC after:      1 week
PR:             195231
Reviewed by:    emaste
Differential Revision:  https://reviews.freebsd.org/D53588

(cherry picked from commit 5818b6ee552b302f5300934f9b8cb94881867a5f)
DeltaFile
+9-0crypto/openssh/sshconnect.c
+7-0crypto/openssh/FREEBSD-upgrade
+16-02 files

HardenedBSD/src 7f691e0bin/sh miscbltin.c sh.1, bin/sh/tests/builtins read12.0 read11.0

sh: Don't assume EINTR means SIGALRM

While waiting for input in the read builtin, if select() is interrupted
but there is no pending signal, we act like we timed out, and return the
same status as if we had been interrupted by SIGALRM, instead of looping
until we actually do time out.

* Replace the single select() call with a ppoll() loop.

* Improve validation of the timeout value.  We now accept things like
  "1h30m15s", which we used to silently truncate to "1h".  The flip side
  is that we no longer accept things like "1hour" or "5sec".

* Modify the existing `read -t 0` test case to verify that read returns
  immediately when there is input and fails immediately when there isn't.

* Add a second test case which performs the same tests with a non-zero
  timeout value.


    [7 lines not shown]
DeltaFile
+57-26bin/sh/miscbltin.c
+32-0bin/sh/tests/builtins/read12.0
+17-2bin/sh/tests/builtins/read11.0
+5-1bin/sh/sh.1
+1-0bin/sh/tests/builtins/Makefile
+112-295 files

HardenedBSD/src e9019e7bin/sh/tests/builtins read11.0

sh tests: Fix racy test11.0

This was sometimes exiting while the child fifo was created resulting in
[ENOTEMPTY] from rm.  The child fifo isn't needed, just sleep.

PR:     290837
Fixes:  e31fb97148f ("read builtin: Empty variables on timeout")
MFC after:      3 days

(cherry picked from commit 5d55553e160a93788372785300f5bd07c2451f93)
DeltaFile
+2-2bin/sh/tests/builtins/read11.0
+2-21 files

HardenedBSD/src fb57eacbin/sh miscbltin.c sh.1, bin/sh/tests/builtins read12.0 read11.0

sh: Don't assume EINTR means SIGALRM

While waiting for input in the read builtin, if select() is interrupted
but there is no pending signal, we act like we timed out, and return the
same status as if we had been interrupted by SIGALRM, instead of looping
until we actually do time out.

* Replace the single select() call with a ppoll() loop.

* Improve validation of the timeout value.  We now accept things like
  "1h30m15s", which we used to silently truncate to "1h".  The flip side
  is that we no longer accept things like "1hour" or "5sec".

* Modify the existing `read -t 0` test case to verify that read returns
  immediately when there is input and fails immediately when there isn't.

* Add a second test case which performs the same tests with a non-zero
  timeout value.


    [7 lines not shown]
DeltaFile
+57-26bin/sh/miscbltin.c
+32-0bin/sh/tests/builtins/read12.0
+17-2bin/sh/tests/builtins/read11.0
+5-1bin/sh/sh.1
+1-0bin/sh/tests/builtins/Makefile
+112-295 files

HardenedBSD/src 4004f9acrypto/openssh sshconnect.c FREEBSD-upgrade

openssh: Don't attempt to connect to unsupported addresses

When iterating over known addresses for the requested target host name,
skip those that are not supported by the running kernel.

MFC after:      1 week
PR:             195231
Reviewed by:    emaste
Differential Revision:  https://reviews.freebsd.org/D53588

(cherry picked from commit 5818b6ee552b302f5300934f9b8cb94881867a5f)
DeltaFile
+9-0crypto/openssh/sshconnect.c
+7-0crypto/openssh/FREEBSD-upgrade
+16-02 files

HardenedBSD/src 43b1b7cbin/sh/tests/builtins read11.0

sh tests: Fix racy test11.0

This was sometimes exiting while the child fifo was created resulting in
[ENOTEMPTY] from rm.  The child fifo isn't needed, just sleep.

PR:     290837
Fixes:  e31fb97148f ("read builtin: Empty variables on timeout")
MFC after:      3 days

(cherry picked from commit 5d55553e160a93788372785300f5bd07c2451f93)
DeltaFile
+2-2bin/sh/tests/builtins/read11.0
+2-21 files

HardenedBSD/ports 9bc177dmath/octave-forge-quaternion Makefile distinfo, math/octave-forge-quaternion/files patch-is__real__array.cc

math/octave-forge-quaternion: Update to 2.4.1.
DeltaFile
+0-13math/octave-forge-quaternion/files/patch-is__real__array.cc
+2-3math/octave-forge-quaternion/Makefile
+3-2math/octave-forge-quaternion/distinfo
+5-183 files

HardenedBSD/ports 718dd4dconverters/recode/files patch-src__names.c

HBSD: Fix HARDCFLAGS for converters/recode

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+13-4converters/recode/files/patch-src__names.c
+13-41 files

HardenedBSD/src 1e8988bsys/dev/cxgbe t4_main.c, sys/kern kern_prot.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+47-69sys/kern/kern_prot.c
+8-2usr.bin/mdo/mdo.c
+2-4sys/dev/cxgbe/t4_main.c
+1-1sys/sys/syscallsubr.h
+58-764 files

HardenedBSD/src 37c18e4libexec/nuageinit nuageinit nuage.lua, libexec/nuageinit/tests addfile.lua nuageinit.sh

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+19-13libexec/nuageinit/nuageinit
+2-4libexec/nuageinit/nuage.lua
+1-1libexec/nuageinit/tests/addfile.lua
+1-1libexec/nuageinit/tests/nuageinit.sh
+23-194 files

HardenedBSD/src 5987531libexec/nuageinit nuageinit nuage.lua, libexec/nuageinit/tests addfile.lua nuageinit.sh

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+19-13libexec/nuageinit/nuageinit
+2-4libexec/nuageinit/nuage.lua
+2-2sys/netpfil/ipfw/ip_fw2.c
+1-1libexec/nuageinit/tests/addfile.lua
+1-1libexec/nuageinit/tests/nuageinit.sh
+25-215 files

HardenedBSD/ports d1f4135deskutils/treesheets distinfo, deskutils/treesheets/files patch-CMakeLists.txt

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+4-10graphics/mesa-devel/Makefile
+7-5deskutils/treesheets/files/patch-CMakeLists.txt
+5-5x11-wm/wlmaker/distinfo
+5-5deskutils/treesheets/distinfo
+6-2security/tripwire/Makefile
+3-3www/firefox/distinfo
+30-3029 files not shown
+77-7135 files

HardenedBSD/src 3c85756stand defs.mk, stand/efi/libefi Makefile

stand: Rename ZFSSRC to SAZFSSRC to avoid confusion

ZFSSRC is abiguous on its surface and too clos to ZFSTOP, so rename it
to SAZFSSRC.

Sponsored by:           Netflix
Reviewed by:            tsoome
Differential Revision:  https://reviews.freebsd.org/D53901
DeltaFile
+2-2stand/libsa/zfs/Makefile.inc
+2-2stand/i386/gptzfsboot/Makefile
+1-1stand/efi/libefi/Makefile
+1-1stand/efi/loader/Makefile
+1-1stand/kboot/kboot/Makefile
+1-1stand/defs.mk
+8-82 files not shown
+10-108 files

HardenedBSD/src 646c0a2libexec/nuageinit nuageinit

nuageinit: Add guards against empty user data

Add guards against attempting to process a user data file with an empty
first line or contents.

PR:             290395
Reviewed by:    bapt (earlier), dtxdf, markj
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D53239

(cherry picked from commit 57d25b6333523491ac7a3e869bd5d16127203eed)
DeltaFile
+8-0libexec/nuageinit/nuageinit
+8-01 files

HardenedBSD/src 9eca972libexec/nuageinit nuageinit nuage.lua, libexec/nuageinit/tests addfile.lua nuageinit.sh

nuageinit: Silence luacheck warnings and fix typos

No functional change intended.

Reviewed by:    bapt, dtxdf, kevans
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D53238

(cherry picked from commit 81af04b081402d131c7e34b30c88b7c337271fad)
DeltaFile
+11-13libexec/nuageinit/nuageinit
+2-4libexec/nuageinit/nuage.lua
+1-1libexec/nuageinit/tests/addfile.lua
+1-1libexec/nuageinit/tests/nuageinit.sh
+15-194 files