HardenedBSD/src c59953asys/security/mac mac_policy.h mac_prison.c, sys/security/mac_stub mac_stub.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+34-0usr.bin/tr/tr.c
+9-0sys/security/mac_test/mac_test.c
+7-0sys/security/mac_stub/mac_stub.c
+3-0sys/security/mac/mac_policy.h
+3-0sys/security/mac/mac_prison.c
+1-1sys/sys/param.h
+57-16 files

HardenedBSD/ports 21b9c53devel/glab pkg-plist distinfo, devel/py-ty distinfo Makefile.crates

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+19-17devel/py-ty/distinfo
+8-7devel/py-ty/Makefile.crates
+14-0devel/glab/pkg-plist
+7-7finance/homebox/distinfo
+5-5misc/crush/distinfo
+5-5devel/glab/distinfo
+58-418 files not shown
+76-6414 files

HardenedBSD/src 625dc44usr.bin/tr tr.c

tr: fix class handling in unicode world

toupper/tolower logic was only handled for CCLASS_TOUPPER and
CCLASS_TOLOWER, add support for CCLASS ([:alpha:])

PR:             219900
MFC After:      1 week
DeltaFile
+34-0usr.bin/tr/tr.c
+34-01 files

HardenedBSD/ports dc826a8devel/glab distinfo Makefile

devel/glab: update to 1.85.1

Changes:        https://gitlab.com/gitlab-org/cli/-/releases/v1.85.1
DeltaFile
+5-5devel/glab/distinfo
+2-2devel/glab/Makefile
+7-72 files

HardenedBSD/ports 810a14fdevel/glab distinfo pkg-plist

devel/glab: update to 1.85.0

Changes:        https://gitlab.com/gitlab-org/cli/-/releases/v1.85.0
DeltaFile
+5-5devel/glab/distinfo
+4-0devel/glab/pkg-plist
+2-2devel/glab/Makefile
+11-73 files

HardenedBSD/ports 74c374edevel/glab distinfo Makefile

devel/glab: update to 1.84.0

Changes:        https://gitlab.com/gitlab-org/cli/-/releases/v1.84.0
DeltaFile
+5-5devel/glab/distinfo
+2-2devel/glab/Makefile
+7-72 files

HardenedBSD/ports 6269f5adevel/glab distinfo pkg-plist

devel/glab: update to 1.83.0

Changes:        https://gitlab.com/gitlab-org/cli/-/releases/v1.83.0
DeltaFile
+5-5devel/glab/distinfo
+10-0devel/glab/pkg-plist
+2-3devel/glab/Makefile
+17-83 files

HardenedBSD/ports 6726312textproc/R-cran-XML distinfo Makefile

textproc/R-cran-XML: Update to 3.99-0.22

Reported by:    portscout
DeltaFile
+3-3textproc/R-cran-XML/distinfo
+1-1textproc/R-cran-XML/Makefile
+4-42 files

HardenedBSD/src 99e138fsys/security/mac mac_policy.h mac_prison.c, sys/security/mac_stub mac_stub.c

kern: mac: add a prison_cleanup entry point

The MAC framework provides a lot of useful functionality that can be
configured per-jail without requiring the use of labels.  Having another
entry point that we invoke just for general prison cleanup rather than
freeing the label is useful to allow a module that can otherwise work
off of a series of MAC entry points + sysctls for configuration to free
its per-jail configuration without having to bring in osd(9).

One such example in the wild is HardenedBSD's secadm, but some of my
own personal use had wanted it as well- it was simply overlooked in the
final version because my first policy made more sense with labels.  On
that note, it's expected that prison_cleanup and prison_destroy_label
will effectively be mutually exclusive -- the former only used when
a label isn't needed, the latter when it is.

Note that prison_cleanup isn't perfectly symmetrical w.r.t.
prison_created: the latter takes a label as well, because it's called
later in jail setup and a better point for propagation than when the

    [11 lines not shown]
DeltaFile
+9-0sys/security/mac_test/mac_test.c
+7-0sys/security/mac_stub/mac_stub.c
+3-0sys/security/mac/mac_policy.h
+3-0sys/security/mac/mac_prison.c
+1-1sys/sys/param.h
+23-15 files

HardenedBSD/ports 8eafb85devel/py-ty distinfo Makefile.crates

devel/py-ty: Update to 0.0.17

Changelog: https://github.com/astral-sh/ty/blob/0.0.17/CHANGELOG.md

Reported by:    Repology
DeltaFile
+19-17devel/py-ty/distinfo
+8-7devel/py-ty/Makefile.crates
+1-1devel/py-ty/Makefile
+28-253 files

HardenedBSD/ports d4f0ba9misc/crush distinfo Makefile

misc/crush: Update to 0.43.0

Changelog:
- https://github.com/charmbracelet/crush/releases/tag/v0.42.0
- https://github.com/charmbracelet/crush/releases/tag/v0.43.0

Reported by:    GitHub (watch releases)
DeltaFile
+5-5misc/crush/distinfo
+1-1misc/crush/Makefile
+6-62 files

HardenedBSD/src fe2dd04share/mk src.opts.mk

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-3share/mk/src.opts.mk
+0-31 files

HardenedBSD/src e748bc2bin/timeout timeout.c, share/man/man4 multicast.4

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

Conflicts:
        share/mk/src.opts.mk (unresolved)
DeltaFile
+73-85bin/timeout/timeout.c
+54-38usr.bin/diff/tests/diff_test.sh
+26-18usr.bin/diff/diff.c
+20-15sys/netinet6/ip6_mroute.c
+15-14sys/netinet/ip_mroute.c
+22-4share/man/man4/multicast.4
+210-17420 files not shown
+294-21526 files

HardenedBSD/ports 41f8859finance/homebox distinfo Makefile

finance/homebox: Update to 0.23.1

ChangeLogs:
https://github.com/sysadminsmedia/homebox/compare/v0.22.3...v0.23.1
DeltaFile
+7-7finance/homebox/distinfo
+3-4finance/homebox/Makefile
+10-112 files

HardenedBSD/ports 017c667security/netbird distinfo Makefile

security/netbird: Update 0.64.3 => 0.65.0

Changelogs:
https://github.com/netbirdio/netbird/releases/tag/v0.64.4
https://github.com/netbirdio/netbird/releases/tag/v0.64.5
https://github.com/netbirdio/netbird/releases/tag/v0.64.6
https://github.com/netbirdio/netbird/releases/tag/v0.65.0

Commit log:
https://github.com/netbirdio/netbird/compare/v0.64.3...v0.65.0

PR:             293166
Security:       CWE-639
MFH:            2026Q1
DeltaFile
+5-5security/netbird/distinfo
+2-5security/netbird/Makefile
+7-102 files

HardenedBSD/ports 2d05dd3security/libgcrypt/files patch-mpi_ec.c patch-cipher_ecc.c, security/voa distinfo Makefile.crates

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+162-0security/libgcrypt/files/patch-mpi_ec.c
+153-0security/libgcrypt/files/patch-cipher_ecc.c
+117-0security/libgcrypt/files/patch-cipher_ecc-eddsa.c
+57-55security/voa/distinfo
+68-0security/libgcrypt/files/patch-cipher_ecc-sm2.c
+28-27security/voa/Makefile.crates
+585-8263 files not shown
+929-19369 files

HardenedBSD/ports fb751basysutils/backrest distinfo Makefile

sysutils/backrest: Update to 1.11.2

ChangeLog: https://github.com/garethgeorge/backrest/releases/tag/v1.11.2
DeltaFile
+7-7sysutils/backrest/distinfo
+4-5sysutils/backrest/Makefile
+11-122 files

HardenedBSD/ports 141378bmultimedia/navidrome Makefile, security/opkssh Makefile

*/*: Add more information about instructions for creating assets

Reported by:    bapt@
DeltaFile
+2-0multimedia/navidrome/Makefile
+2-0security/opkssh/Makefile
+2-0sysutils/backrest/Makefile
+2-0sysutils/go-ntfy/Makefile
+2-0sysutils/gol/Makefile
+2-0sysutils/nginx-ui/Makefile
+12-011 files not shown
+34-017 files

HardenedBSD/ports e6fbff1net-im/telegram-desktop distinfo Makefile

net-im/telegram-desktop: update 6.5.0 -> 6.5.1

ChangeLog:      https://github.com/telegramdesktop/tdesktop/compare/v6.5.0...v6.5.1

Sponsored by:   tipi.work
DeltaFile
+3-3net-im/telegram-desktop/distinfo
+1-2net-im/telegram-desktop/Makefile
+4-52 files

HardenedBSD/ports 4fb0ecclang/quickjs-ng distinfo Makefile

lang/quickjs-ng: update: 0.11.0 -> 0.12.1

ChangeLog:      https://github.com/quickjs-ng/quickjs/compare/v0.11.0...v0.12.1

Sponsored by:   tipi.work
DeltaFile
+3-3lang/quickjs-ng/distinfo
+1-1lang/quickjs-ng/Makefile
+4-42 files

HardenedBSD/src cc3d59flib/clang/libllvm Makefile

HBSD: Missed a file in the last merge conflict resolution

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+4-2lib/clang/libllvm/Makefile
+4-21 files

HardenedBSD/ports aa7a14esecurity/wazuh-dashboard distinfo

security/wazuh-dashboard: Fix distinfo

Reported by:    girgen
DeltaFile
+3-3security/wazuh-dashboard/distinfo
+3-31 files

HardenedBSD/src fc6a600usr.bin/diff3 diff3.c, usr.bin/diff3/tests diff3_test.sh

Merge remote-tracking branch 'origin/freebsd/current/main' into hardened/current/master
DeltaFile
+110-125usr.sbin/ngctl/main.c
+25-26usr.bin/diff3/diff3.c
+42-3usr.bin/diff3/tests/diff3_test.sh
+16-23usr.sbin/ngctl/msg.c
+18-13usr.sbin/ngctl/config.c
+18-10usr.sbin/ngctl/write.c
+229-20034 files not shown
+430-27040 files

HardenedBSD/src ed285eblib/clang/libclang Makefile, lib/clang/liblldb Makefile

HBSD: Resolve merge conflicts

This also brings us a little closer to upstream's llvm-related
Makefiles. Reintroduce the MK_LLVM_LINK_STATIC_LIBRARIES option,
defaulted to yes.

It is not advised for HardenedBSD users to set
WITHOUT_LLVM_LINK_STATIC_LIBRARIES just yet. Initial testing
demonstrated some issues with linking the right libraries. I do plan to
still move us towards supporting the src compiler toolchain being
compiled as PIEs.

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+19-6lib/clang/libclang/Makefile
+20-5lib/clang/liblldb/Makefile
+0-5lib/clang/libllvm/Makefile
+0-4sys/netinet6/nd6_rtr.c
+0-4sys/arm64/arm64/pmap.c
+1-0share/mk/src.opts.mk
+40-246 files

HardenedBSD/ports 8b3dd5ewww/firefox-esr distinfo Makefile

www/firefox-esr: update to 140.7.1 (rc1)

Release Notes (soon):
  https://www.firefox.com/en-US/firefox/140.7.1/releasenotes/
DeltaFile
+3-3www/firefox-esr/distinfo
+1-2www/firefox-esr/Makefile
+4-52 files

HardenedBSD/ports b742d70www/firefox distinfo Makefile

www/firefox: update to 147.0.4 (rc1)

Release Notes (soon):
  https://www.firefox.com/en-US/firefox/147.0.4/releasenotes/
DeltaFile
+3-3www/firefox/distinfo
+1-1www/firefox/Makefile
+4-42 files

HardenedBSD/src 07c4eb5sys/compat/freebsd32 freebsd32.h

sys/compat/freebsd32: Fix i386 compilation

The compile assertion now failing is due to the change '__int64_t' =>
'__int32_t' as the type of 'time32_t' on i386, which is the correct
value.  The use of 'freebsd32.h' on i386 may seem strange, but it comes
from 'kern_umtx.c' including it unconditionally as it needs 'struct
umutex32'.

Fixes:          87632ddf67b0 ("openzfs sys/types32.h: use abi_compat.h for time32_t")
Sponsored by:   The FreeBSD Foundation
DeltaFile
+1-1sys/compat/freebsd32/freebsd32.h
+1-11 files

HardenedBSD/src 2ce028esys/kern link_elf_obj.c, sys/sys elf_common.h

sys: ELF: Rename SHN_FBSD_CACHED => SHN_FREEBSD_CACHED

All other FreeBSD-specific constants have FREEBSD fully spelled out in
their names.  Be consistent.

No functional change (intended).

Reviewed by:    kib
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D55224
DeltaFile
+2-2sys/kern/link_elf_obj.c
+2-1sys/sys/elf_common.h
+4-32 files

HardenedBSD/src f2c2e5bshare/man/man4 multicast.4

multicast.4: Fix disabling multicast forwarding

Reviewed by: markj, glebius
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D55266
DeltaFile
+22-4share/man/man4/multicast.4
+22-41 files

HardenedBSD/ports be18d9fsecurity/libgcrypt/files patch-mpi_ec.c patch-cipher_ecc.c

security/libgcrypt: Fix Curve25519 key validation

Starting with version 1.12.0, libgcrypt was failing to validate
Curve25519 secret keys on FreeBSD-main.  This resulted in failures such
as in the example below.  Incorporate the patch from
https://dev.gnupg.org/T8094 to fix the problem.

% TEMP_GPG=$(mktemp -d)

% GNUPGHOME=$TEMP_GPG gpg --batch --import < ./test/openpgp4-secret-key.asc
gpg: keybox '/tmp/tmp.gkqFaMAlVu/pubring.kbx' created
gpg: /tmp/tmp.gkqFaMAlVu/trustdb.gpg: trustdb created
gpg: key 7E6ABE924645CC60: public key "Notmuch Test Suite (INSECURE!) <test_suite at notmuchmail.org>" imported
gpg: key 7E6ABE924645CC60: secret key imported
gpg: Total number processed: 1
gpg:               imported: 1
gpg:       secret keys read: 1
gpg:   secret keys imported: 1


    [10 lines not shown]
DeltaFile
+162-0security/libgcrypt/files/patch-mpi_ec.c
+153-0security/libgcrypt/files/patch-cipher_ecc.c
+117-0security/libgcrypt/files/patch-cipher_ecc-eddsa.c
+68-0security/libgcrypt/files/patch-cipher_ecc-sm2.c
+37-0security/libgcrypt/files/patch-cipher_ecc-misc.c
+28-0security/libgcrypt/files/patch-cipher_ecc-ecdh.c
+565-07 files not shown
+678-013 files