HardenedBSD/ports 0fa6212net/tigervnc-server Makefile.common.mk, security/nmap Makefile

HBSD: Resolve merge conflicts

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+1-3security/nmap/Makefile
+0-4net/tigervnc-server/Makefile.common.mk
+1-72 files

HardenedBSD/ports 53de44adeskutils/ekphos distinfo, math/py-pcodec distinfo Makefile.crates

Merge remote-tracking branch 'internal/freebsd/main' into hardenedbsd/main

Conflicts:
        net/tigervnc-server/Makefile.common.mk (unresolved)
        security/nmap/Makefile (unresolved)
DeltaFile
+313-281sysutils/rust-coreutils/distinfo
+267-325math/py-pcodec/distinfo
+133-162math/py-pcodec/Makefile.crates
+155-139sysutils/rust-coreutils/Makefile.crates
+199-33deskutils/ekphos/distinfo
+163-0sysutils/bareos24-server/files/patch-core-src-stored-backends_chunked_device.cc
+1,230-9401,535 files not shown
+5,650-4,8831,541 files

HardenedBSD/src af12912sys/kern vfs_mount.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+2-0sys/kern/vfs_mount.c
+2-01 files

HardenedBSD/src c3c4021share/mk src.opts.mk, sys/dev/bnxt/bnxt_en if_bnxt.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+3-4sys/dev/bnxt/bnxt_en/if_bnxt.c
+0-5share/mk/src.opts.mk
+3-92 files

HardenedBSD/ports 78fcec3net/realtek-re-kmod Makefile distinfo

net/realtek-re-kmod: Fix build when updating to 15 with PORTS_MODULES

PR:             292900
Submitted by:   nork
DeltaFile
+1-7net/realtek-re-kmod/Makefile
+3-3net/realtek-re-kmod/distinfo
+4-102 files

HardenedBSD/ports bd756ecdevel/rubygem-graphql-client Makefile

devel/rubygem-graphql-client: fix build issue

Reported by:    pkg-fallout
DeltaFile
+2-1devel/rubygem-graphql-client/Makefile
+2-11 files

HardenedBSD/src cd8d441sys/kern vfs_mount.c

unmount(2): do not allow MNT_DEFERRED or MNT_RECURSE flags from userspace

Repprted and tested by: pho
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
DeltaFile
+2-0sys/kern/vfs_mount.c
+2-01 files

HardenedBSD/ports 27f4d09x11-wm/mangowc distinfo Makefile

x11-wm/mangowc: Update to 0.12.0

ChangeLog:      https://github.com/DreamMaoMao/mangowc/releases/tag/0.12.0
Reported by:    DreamMaoMao <notifications at github.com>
DeltaFile
+3-3x11-wm/mangowc/distinfo
+1-1x11-wm/mangowc/Makefile
+4-42 files

HardenedBSD/ports dbaf90cdeskutils/ekphos distinfo Makefile.crates

deskutils/ekphos: Update to 0.20.5

ChangeLog:      https://github.com/hanebox/ekphos/releases/tag/v0.20.5
Reported by:    han <notifications at github.com>
DeltaFile
+199-33deskutils/ekphos/distinfo
+98-15deskutils/ekphos/Makefile.crates
+2-2deskutils/ekphos/Makefile
+299-503 files

HardenedBSD/src a9f9496share/mk src.opts.mk

src.opts: Remove MK_SOUND artifact

Fixes:          f74f891581bc ("src.opts: Introduce MK_SOUND")
PR:             291853
Sponsored by:   The FreeBSD Foundation
MFC after:      4 days

(cherry picked from commit b9289743f40dae677f910be1d3e56198a3a3ff9b)
DeltaFile
+0-5share/mk/src.opts.mk
+0-51 files

HardenedBSD/ports bc15372net/mvfst distinfo Makefile

net/mvfst: update 2026.01.26.00 → 2026.02.02.00
DeltaFile
+3-3net/mvfst/distinfo
+1-1net/mvfst/Makefile
+0-2net/mvfst/pkg-plist
+4-63 files

HardenedBSD/ports 649a8f4net/fb303 distinfo Makefile

net/fb303: update 2026.01.26.00 → 2026.02.02.00
DeltaFile
+3-3net/fb303/distinfo
+1-1net/fb303/Makefile
+4-42 files

HardenedBSD/ports e1b3091devel/fatal distinfo Makefile

devel/fatal: update 2026.01.26.00 → 2026.02.02.00
DeltaFile
+3-3devel/fatal/distinfo
+1-1devel/fatal/Makefile
+4-42 files

HardenedBSD/ports 8fd0106www/proxygen distinfo Makefile

www/proxygen: update 2026.01.26.00 → 2026.02.02.00
DeltaFile
+3-3www/proxygen/distinfo
+1-1www/proxygen/Makefile
+4-42 files

HardenedBSD/ports a883eefdevel/fbthrift pkg-plist distinfo

devel/fbthrift: update 2026.01.26.00 → 2026.02.02.00
DeltaFile
+10-1devel/fbthrift/pkg-plist
+3-3devel/fbthrift/distinfo
+1-1devel/fbthrift/Makefile
+14-53 files

HardenedBSD/ports ff01d95net/wangle pkg-plist distinfo

net/wangle: update 2026.01.26.00 → 2026.02.02.00
DeltaFile
+2-14net/wangle/pkg-plist
+3-3net/wangle/distinfo
+2-2net/wangle/Makefile
+7-193 files

HardenedBSD/ports 0d413d8security/fizz distinfo Makefile

security/fizz: update 2026.01.26.00 → 2026.02.02.00
DeltaFile
+3-3security/fizz/distinfo
+1-1security/fizz/Makefile
+2-0security/fizz/pkg-plist
+6-43 files

HardenedBSD/ports ee40347devel/folly pkg-plist distinfo

devel/folly: update 2026.01.26.00 → 2026.02.02.00
DeltaFile
+4-3devel/folly/pkg-plist
+3-3devel/folly/distinfo
+1-1devel/folly/Makefile
+8-73 files

HardenedBSD/src 79c748esys/dev/bnxt/bnxt_en if_bnxt.c

bnxt: don't set media status if link is down

When the link is down don't set flags other than IFM_AVALID & IFM_ETHER
This avoids `media: Ethernet autoselect (Unknown <full-duplex>)` on ifconfig

Reviewed by:    zlei, pouria
Approved by:    glebius (mentor)
MFC after:      1 week
Sponsored by:   Stormshield
Differential Revision: https://reviews.freebsd.org/D54573

(cherry picked from commit 69de2b4e96794793f04d1b323d354fcde3c480f6)
DeltaFile
+3-4sys/dev/bnxt/bnxt_en/if_bnxt.c
+3-41 files

HardenedBSD/ports 0eb97bfsysutils/rust-coreutils distinfo Makefile.crates

sysutils/rust-coreutils: update to 0.6.0

Changelog:      https://github.com/uutils/coreutils/releases/tag/0.6.0
DeltaFile
+313-281sysutils/rust-coreutils/distinfo
+155-139sysutils/rust-coreutils/Makefile.crates
+1-2sysutils/rust-coreutils/Makefile
+0-1sysutils/rust-coreutils/pkg-plist
+469-4234 files

HardenedBSD/ports 35f59fbnet/tigervnc-server Makefile distinfo, net/tigervnc-viewer Makefile pkg-plist

net/tigervnc*: Update to 1.16.0

It now depends on GNU make (abspath).  While here cleanup Xorg configure
arguments.

Changes:        https://github.com/TigerVNC/tigervnc/releases/tag/v1.16.0
DeltaFile
+3-5net/tigervnc-server/Makefile
+3-3net/tigervnc-server/distinfo
+2-2net/tigervnc-server/Makefile.common.mk
+0-1net/tigervnc-viewer/Makefile
+1-0net/tigervnc-viewer/pkg-plist
+9-115 files

HardenedBSD/ports 460e62cdevel/libunicode-contour Makefile

devel/libunicode-contour: Fix build when samurai is used instead of ninja

When samurai is used instead of ninja, python is not pulled in as its
dependency. The build process requires python's existence so the port
must explictly depend on python in build time.

PR:             292683
Reported by:    Eric Camachat <eric at camachat.org>
MFH:            2026Q1
DeltaFile
+1-1devel/libunicode-contour/Makefile
+1-11 files

HardenedBSD/ports c8876b8security/py-google-cloud-kms distinfo Makefile

security/py-google-cloud-kms: Update to 3.10.0

Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-kms-v3.10.0/packages/google-cloud-kms/CHANGELOG.md

Reported by:    portscout
DeltaFile
+3-3security/py-google-cloud-kms/distinfo
+1-1security/py-google-cloud-kms/Makefile
+4-42 files

HardenedBSD/src dcbe59esys/dev/acpica acpi.c, sys/dev/tpm tpm_crb.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+207-5sys/dev/tpm/tpm_crb.c
+0-92sys/kern/sched_ule.c
+91-0sys/kern/sched_shim.c
+47-34sys/kern/subr_smp.c
+72-0sys/dev/acpica/acpi.c
+3-45sys/powerpc/aim/mmu_oea64.c
+420-1766 files not shown
+453-19212 files

HardenedBSD/src cce3de2lib/libc/gen Makefile.inc, share/man Makefile

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+3-3lib/libc/gen/Makefile.inc
+2-2share/man/Makefile
+1-1sys/conf/kmod.mk
+1-1sys/modules/Makefile
+1-1tests/sys/netpfil/pf/pflog.sh
+1-1usr.sbin/services_mkdb/Makefile
+9-96 files

HardenedBSD/ports 1d761acscience/afni distinfo Makefile

science/afni: Update to 26.0.08
DeltaFile
+3-3science/afni/distinfo
+1-2science/afni/Makefile
+4-52 files

HardenedBSD/ports b5df013www/gohugo distinfo Makefile

www/gohugo: Update to 0.155.2

ChangeLog: https://github.com/gohugoio/hugo/releases/tag/v0.155.2

 * Fix template change detection for multi-version sites
 * resources/image: Add some image decode/encode debug logging

Approved by:    doceng@ (implicit)
DeltaFile
+5-5www/gohugo/distinfo
+1-1www/gohugo/Makefile
+6-62 files

HardenedBSD/ports 71364b6misc/py-huggingface-hub distinfo Makefile

misc/py-huggingface-hub: Update to 1.3.7

Changelog:
- https://github.com/huggingface/huggingface_hub/releases/tag/v1.3.3
- https://github.com/huggingface/huggingface_hub/releases/tag/v1.3.4
- https://github.com/huggingface/huggingface_hub/releases/tag/v1.3.5
- https://github.com/huggingface/huggingface_hub/releases/tag/v1.3.7

Reported by:    portscout
DeltaFile
+3-3misc/py-huggingface-hub/distinfo
+1-1misc/py-huggingface-hub/Makefile
+4-42 files

HardenedBSD/ports fd9ed80sysutils/bareos24-client Makefile

sysutils/bareos24-client: Remove entry from CONFLICTS

- Bump PORTREVISION
DeltaFile
+2-2sysutils/bareos24-client/Makefile
+2-21 files

HardenedBSD/ports 43930fasysutils/bareos24-server Makefile, sysutils/bareos24-server/files patch-core-src-stored-backends_chunked_device.cc patch-core-src-include_baconfig.h

sysutils/bareos24-*: Remove BROKEN

- server: Define ONLY_FOR_ARCHS to aarch64 and amd64
- Remove CONFLICTS to bareos22*
- Bump PORTREVISION
DeltaFile
+163-0sysutils/bareos24-server/files/patch-core-src-stored-backends_chunked_device.cc
+18-0sysutils/bareos24-server/files/patch-core-src-include_baconfig.h
+4-4sysutils/bareos24-server/Makefile
+185-43 files