HardenedBSD/src e2bc48fsys/kern kern_exec.c imgact_elf.c

HBSD: Resolve merge conflicts

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-65sys/kern/kern_exec.c
+0-9sys/kern/imgact_elf.c
+0-742 files

HardenedBSD/src a9a1cc7sys/amd64/amd64 elf_machdep.c, sys/compat/ia32 ia32_sysvec.c

Merge remote-tracking branch 'internal/freebsd/current/main' into hardened/current/master

Conflicts:
        sys/kern/imgact_elf.c (unresolved)
        sys/kern/kern_exec.c (unresolved)
DeltaFile
+49-47sys/rpc/svc_auth_unix.c
+54-39sys/rpc/authunix_prot.c
+66-1sys/kern/kern_exec.c
+22-13sys/kern/imgact_elf.c
+9-15sys/compat/ia32/ia32_sysvec.c
+6-8sys/amd64/amd64/elf_machdep.c
+206-12312 files not shown
+254-15918 files

HardenedBSD/src 72babf8lib/msun/src e_remainder.c

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+2-2lib/msun/src/e_remainder.c
+2-21 files

HardenedBSD/src c7985ce. .cirrus.yml, lib/msun/src e_remainder.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+2-2lib/msun/src/e_remainder.c
+2-2usr.sbin/bsdinstall/scripts/auto
+2-2usr.sbin/bsdinstall/scripts/jail
+2-0.cirrus.yml
+8-64 files

HardenedBSD/ports 57bef30devel/aws-sdk-php pkg-plist, multimedia/ringrtc distinfo

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+2,214-1,663net-im/signal-desktop/files/package-lock.json
+1,572-1,202net-im/signal-desktop/files/pnpm-lock.yaml
+659-135devel/aws-sdk-php/pkg-plist
+30-57multimedia/ringrtc/files/patch-build_config_compiler_BUILD.gn
+37-39multimedia/ringrtc/distinfo
+31-29security/wpa_supplicant/files/patch-src_drivers_driver__bsd.c
+4,543-3,125697 files not shown
+5,545-3,953703 files

HardenedBSD/ports 164f4cddevel/aws-sdk-php pkg-plist distinfo

devel/aws-sdk-php: Update to 3.356.38

Sponsored by:   Rubicon Communications, LLC ("Netgate")
DeltaFile
+659-135devel/aws-sdk-php/pkg-plist
+3-3devel/aws-sdk-php/distinfo
+1-1devel/aws-sdk-php/Makefile
+663-1393 files

HardenedBSD/ports c6297aflang/go124 Makefile, lang/go125 Makefile

lang/go12[45]: silence portscout

Because this does not make sense:

Port                                            | Current version | New version
------------------------------------------------+-----------------+------------
lang/go124                                      | 1.24.8          | 1.25.3
------------------------------------------------+-----------------+------------

And pet portclippy in the meantime by reordering some variables.
DeltaFile
+9-6lang/go124/Makefile
+9-6lang/go125/Makefile
+18-122 files

HardenedBSD/ports efe4832databases/mongodb70 Makefile

databases/mongodb70: make_jobs_unsafe

For unknown reasons this port tends to fail a lot on @armv80a flavor.

From the build log:
"scons: *** [build/opt/mongo/db/catalog/collection_uuid_mismatch.o] Error -9"

I can't reproduce this locally. Let's try to remove parallel jobs and
see if it improves the build stability.

Reported-by:    https://portsfallout.com/fallout?port=databases%2Fmongodb%5B0-9%5D&maintainer=&env=&category=&flavor=
DeltaFile
+1-0databases/mongodb70/Makefile
+1-01 files

HardenedBSD/ports 1f69197ports-mgmt/poudriere-devel Makefile, ports-mgmt/poudriere-devel/files patch-src_share_poudriere_common.sh

ports-mgmt/poudriere-devel: Fix handling LOCALIPARGS
DeltaFile
+11-0ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_common.sh
+1-1ports-mgmt/poudriere-devel/Makefile
+12-12 files

HardenedBSD/ports 2bf57f0shells/dash distinfo Makefile

shells/dash: Update to v0.5.13
DeltaFile
+3-3shells/dash/distinfo
+2-2shells/dash/Makefile
+5-52 files

HardenedBSD/ports 90f9766benchmarks/ddosify Makefile, benchmarks/hey Makefile

various: Bump go ports for go-1.24.9
DeltaFile
+1-1benchmarks/ddosify/Makefile
+1-1benchmarks/hey/Makefile
+1-1benchmarks/plow/Makefile
+1-1benchmarks/vegeta/Makefile
+1-1biology/kmcp/Makefile
+1-1biology/ncbi-entrez-direct/Makefile
+6-6599 files not shown
+605-575605 files

HardenedBSD/ports 173d3a7lang/go124 distinfo Makefile

lang/go124: Update to 1.24.9

Changes: go1.24.9 (released 2025-10-13) includes fixes to the
crypto/x509 package. See the Go 1.24.9 milestone on our issue tracker
for details.
DeltaFile
+3-3lang/go124/distinfo
+1-1lang/go124/Makefile
+4-42 files

HardenedBSD/ports d571ec9devel/goreleaser Makefile, filesystems/zrepl-dsh2dsh Makefile

various: Bump go ports for go-1.25.3
DeltaFile
+1-1net-mgmt/victoria-logs/Makefile
+1-1devel/goreleaser/Makefile
+1-1filesystems/zrepl-dsh2dsh/Makefile
+1-1multimedia/mediamtx/Makefile
+1-1net-mgmt/check_wg/Makefile
+1-1net-mgmt/telegraf/Makefile
+6-620 files not shown
+26-1426 files

HardenedBSD/ports ed41bf9lang/go125 distinfo Makefile

lang/go125: Update to 1.25.3.

Changes: go1.25.3 (released 2025-10-13) includes fixes to the
crypto/x509 package. See the Go 1.25.3 milestone on our issue tracker
for details.
DeltaFile
+3-3lang/go125/distinfo
+1-1lang/go125/Makefile
+4-42 files

HardenedBSD/src eb895ad. .cirrus.yml

Revert ".cirrus.yml: Reenable CI with pre-commit CI scripts"

This reverts commit 676d64ee8327851063d92d0dd6a4ceee6b3a25e6.

These tests take a combined 3h to run and are consuming our montly
Cirrus-CI credits in short order, before failing.

In the PR markj reports that the failure appeared somewhere between:

good: da64f6e047b5f6cd9b9e8450d19072cb0b6e44d0
bad:  b197d2abcb6895d78bc9df8404e374397aa44748

Unfortunately, even after we find the offending commit and have a fix we
still do not have sufficient monthly compute credit.  Disable these
tests for now, pending a solution to both issues.

PR:             289696
Reviewed by:    ngie
Differential Revision: https://reviews.freebsd.org/D52618

    [2 lines not shown]
DeltaFile
+2-0.cirrus.yml
+2-01 files

HardenedBSD/src dbd1e32usr.sbin/bsdinstall/scripts auto jail

bsdinstall: Tweak pkgbase/dist set labels

Have the button labels refer to the artifact type directly (distribution
sets / packages), and use "Tech Preview" as packaged base is no longer
experimental.

Reviewed by:    ivy, cperciva
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D52999

(cherry picked from commit abd9424590ba37ac10e92723ad6428f0448024c1)
DeltaFile
+2-2usr.sbin/bsdinstall/scripts/auto
+2-2usr.sbin/bsdinstall/scripts/jail
+4-42 files

HardenedBSD/ports 10b8eb0www/freenginx-devel Makefile

www/freengxinx-devel: take mainternship

Approved by:    joneum (maintainier)
DeltaFile
+1-1www/freenginx-devel/Makefile
+1-11 files

HardenedBSD/ports 6f2d79ewww/nginx-devel Makefile

www/nginx-devel: release maintainership
DeltaFile
+1-1www/nginx-devel/Makefile
+1-11 files

HardenedBSD/ports 561470cdevel/libunistring distinfo Makefile

devel/libunistring: update to 1.4.1

Changes:

 - Fixed a compilation error in C++ mode.

Reported by:    fuz
PR:             290195
MFH:            2025Q4
DeltaFile
+3-3devel/libunistring/distinfo
+1-1devel/libunistring/Makefile
+4-42 files

HardenedBSD/ports f82acd0net Makefile, net/wutil Makefile pkg-descr

net/wutil: Add new port

wutil is a WiFi management utility for FreeBSD with a CLI (wutil) and
a TUI (wutui). It supports station-mode operations and manages
wpa_supplicant configuration.

WWW: https://github.com/MainKt/wutil/

Sponsored by:   Google LLC (GSoC 2025)
PR:             289079
DeltaFile
+30-0net/wutil/Makefile
+3-0net/wutil/pkg-descr
+3-0net/wutil/distinfo
+1-0net/Makefile
+37-04 files

HardenedBSD/ports 9442be9net/rospo distinfo Makefile

net/rospo: update to 0.15.1

Changelog: https://github.com/ferama/rospo/releases/tag/v0.15.1

MFH:            2025Q4
DeltaFile
+5-5net/rospo/distinfo
+1-2net/rospo/Makefile
+6-72 files

HardenedBSD/ports c1aacf2sysutils/superfile distinfo Makefile

sysutils/superfile: update to 1.4.0

 - now requires go 1.25 to build

Changelog: https://github.com/yorukot/superfile/releases/tag/v1.4.0
DeltaFile
+5-5sysutils/superfile/distinfo
+2-3sysutils/superfile/Makefile
+7-82 files

HardenedBSD/ports 6634e68textproc/goldendict-ng Makefile

textproc/goldendict-ng: Drop maintainership

PR:             289954
DeltaFile
+1-1textproc/goldendict-ng/Makefile
+1-11 files

HardenedBSD/ports edaddcdsecurity/wpa_supplicant Makefile, security/wpa_supplicant/files patch-src_drivers_driver__bsd.c patch-src_drivers_driver__ndis.c

security/wpa_supplicant: Add option to build libwpa_client

CONFIG_BUILD_WPA_CLIENT_SO allows building the libwpa_client shared
library and the wpa_ctrl.h header file.  This library provides helpers
to interact with the wpa_supplicant control interface.

This is required for net/wutil.

Approved by:    cy (maintainer timeout)
PR:             288933
Sponsored by:   Google LLC (GSoC 2025)
DeltaFile
+31-29security/wpa_supplicant/files/patch-src_drivers_driver__bsd.c
+18-3security/wpa_supplicant/Makefile
+9-9security/wpa_supplicant/files/patch-src_drivers_driver__ndis.c
+11-2security/wpa_supplicant/files/patch-wpa__supplicant_Makefile
+6-6security/wpa_supplicant/files/patch-wpa__supplicant_main.c
+4-5security/wpa_supplicant/files/patch-src_utils_os__unix.c
+79-545 files not shown
+93-6811 files

HardenedBSD/ports 109a993deskutils/remind distinfo Makefile

deskutils/remind: update to 06.01.05

Changelog: https://salsa.debian.org/dskoll/remind/-/blob/master/docs/WHATSNEW?ref_type=heads

MFH:            2025Q4
DeltaFile
+3-3deskutils/remind/distinfo
+1-1deskutils/remind/Makefile
+4-42 files

HardenedBSD/ports 33210e9finance/ticker distinfo Makefile

finance/ticker: update to 5.0.7

 - remove now useless GH_ACCOUNT

Changelog: https://github.com/achannarasappa/ticker

MFH:            2025Q4
DeltaFile
+5-5finance/ticker/distinfo
+1-3finance/ticker/Makefile
+6-82 files

HardenedBSD/src d1bd541tests/sys/fs/fusefs bad_server.cc

fusefs: fix intermittency in the BadServer.ShortWrite test

This test implicitly depended on the order in which two threads
completed.  If the test thread finished first, the test would pass.  But
if the mock file system thread did, it would attempt to read from an
unmounted file system, and fail.  As a result, the test would randomly
fail once out of every several thousand executions.  Fix it by telling
the mock file system's event loop to exit without attempting to read any
more events.

Reported by:    Siva Mahadevan <me at svmhdvn.name>
MFC after:      1 week
Reviewed by:    Siva Mahadevan <me at svmhdvn.name>
Differential Revision: https://reviews.freebsd.org/D53080
DeltaFile
+5-0tests/sys/fs/fusefs/bad_server.cc
+5-01 files

HardenedBSD/ports 54e1231net/wireshark/files patch-epan_dissectors_packet-its.c

net/wireshark: Attempt to fix the build on i386
DeltaFile
+11-0net/wireshark/files/patch-epan_dissectors_packet-its.c
+11-01 files

HardenedBSD/ports 9770140math/octave-forge-joystick Makefile

math/octave-forge-joystick: Fix stupid typo.
DeltaFile
+1-1math/octave-forge-joystick/Makefile
+1-11 files

HardenedBSD/ports 52e4a02mail/spamassassin pkg-plist distinfo

mail/spamassassin: mail/spamassassin: update to 4.0.2

PR:     290224
DeltaFile
+13-2mail/spamassassin/pkg-plist
+3-3mail/spamassassin/distinfo
+2-2mail/spamassassin/Makefile
+18-73 files