HardenedBSD/src f95b974share/mk src.opts.mk

HBSD: Resolve merge conflict

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

HardenedBSD/src 59627d9sys/arm64/qualcomm qcom_gcc.c, sys/dev/qcom_gcc qcom_gcc_msm8916_clock.c qcom_gcc_msm8916_reset.c

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

Conflicts:
        share/mk/src.opts.mk (unresolved)
DeltaFile
+0-143sys/arm64/qualcomm/qcom_gcc.c
+0-112sys/netinet6/nd6_rtr.c
+84-0sys/dev/qcom_gcc/qcom_gcc_msm8916_clock.c
+71-0sys/dev/qcom_gcc/qcom_gcc_msm8916_reset.c
+41-0sys/dev/qcom_gcc/qcom_gcc_msm8916.h
+0-39sys/net/if_ethersubr.c
+196-29423 files not shown
+269-37929 files

HardenedBSD/src 0425476lib/libsys procctl.2, lib/libusb libusb20_dev_open.3 libusb20_be_device_foreach.3

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+7-77share/man/man5/style.mdoc.5
+69-0lib/libusb/libusb20_dev_open.3
+62-0share/man/man4/vmgenc.4
+56-0lib/libusb/libusb20_be_device_foreach.3
+24-24lib/libsys/procctl.2
+29-0share/man/man4/man4.arm/dwcotg.4
+247-10122 files not shown
+373-14428 files

HardenedBSD/ports 7e13347databases/movine distinfo, devel/cargo-deny distinfo Makefile

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+207-517devel/cargo-deny/distinfo
+283-247databases/movine/distinfo
+449-0sysutils/cardano-cli/Makefile.cabal
+1-435sysutils/cardano-cli/Makefile
+209-161sysutils/cardano-cli/distinfo
+103-259devel/cargo-deny/Makefile
+1,252-1,61971 files not shown
+2,178-2,59977 files

HardenedBSD/ports c1e582egames/xonix Makefile

games/xonix: Fix WRKSRC

Github default release file name differs from actual subdir
after extracting.
DeltaFile
+1-0games/xonix/Makefile
+1-01 files

HardenedBSD/ports b63a7f4games Makefile, games/xonix pkg-descr Makefile

games/xonix: Resurrect

This game has been deleted about a decade ago since the distfile
disappeared.  Haolin Xue convinced me to resurrect it, and give
it a home at Github.  They submitted a bunch of modernization
and security patches, so this is a new version now as well.
DeltaFile
+20-0games/xonix/pkg-descr
+17-0games/xonix/Makefile
+8-0games/xonix/pkg-plist
+3-0games/xonix/distinfo
+1-0games/Makefile
+49-05 files

HardenedBSD/src 4e3fdcesys/arm64/qualcomm qcom_gcc.c, sys/conf files.arm64

qcom_gcc: migrate the MSM8916 support to qcom_gcc

* migrate the MSM8916 (snapdragon 410) support to qcom_gcc
* add the full qcom_gcc / qcom_clk list to files.arm64, replacing
  the MSM8916 stub in sys/arm64/qualcomm .

Differential Revision:  https://reviews.freebsd.org/D49706
DeltaFile
+0-143sys/arm64/qualcomm/qcom_gcc.c
+84-0sys/dev/qcom_gcc/qcom_gcc_msm8916_clock.c
+71-0sys/dev/qcom_gcc/qcom_gcc_msm8916_reset.c
+41-0sys/dev/qcom_gcc/qcom_gcc_msm8916.h
+19-3sys/dev/qcom_gcc/qcom_gcc_main.c
+14-1sys/conf/files.arm64
+229-1475 files not shown
+244-15511 files

HardenedBSD/ports e5fe730devel/serd distinfo Makefile

devel/serd: Update 0.32.6 => 0.32.8

Changelog:
https://gitlab.com/drobilla/serd/-/releases/v0.32.8

PR:             294386
Reported by:    Goran Mekić <meka at tilda.center> (maintainer)
Approved by:    osa (mentor)
MFH:            2026Q2
DeltaFile
+3-3devel/serd/distinfo
+1-1devel/serd/Makefile
+4-42 files

HardenedBSD/ports f181420mail/py-mailsuite distinfo Makefile

mail/py-mailsuite: Update 1.11.1 => 1.11.2

Changelog:
https://github.com/seanthegeek/mailsuite/blob/master/CHANGELOG.md#1112

PR:             294387
Reported by:    Goran Mekić <meka at tilda.center> (maintainer)
Approved by:    osa (mentor)
DeltaFile
+3-3mail/py-mailsuite/distinfo
+1-1mail/py-mailsuite/Makefile
+4-42 files

HardenedBSD/ports cf05ca7mail/py-email-validator distinfo Makefile

mail/py-email-validator: Update 2.2.0 => 2.3.0

Changelog:
https://github.com/JoshData/python-email-validator/releases/tag/v2.3.0

PR:             294388
Reported by:    Goran Mekić <meka at tilda.center> (maintainer)
Approved by:    osa (mentor)
DeltaFile
+3-3mail/py-email-validator/distinfo
+1-2mail/py-email-validator/Makefile
+4-52 files

HardenedBSD/ports 9ce62a2multimedia/navidrome Makefile, multimedia/navidrome/files config.toml.sample.in pkg-message.in

multimedia/navidrome: Don't install ffmpeg by default

Don't install multimedia/ffmpeg by default so that users can install
the flavour they want at runtime (e.g.: multimedia/ffmpeg at default
or multimedia/ffmpeg at nox11).

And while here, update the configuration file to remove obsolete
parameters and add new ones. Now FFmpegPath is added, as it is
required for transcoding to work when running Navidrome via the
rc(8) script.

Reported by:    t at ida2.de (email)
DeltaFile
+24-23multimedia/navidrome/files/config.toml.sample.in
+3-0multimedia/navidrome/files/pkg-message.in
+0-1multimedia/navidrome/Makefile
+27-243 files

HardenedBSD/ports 5a812camath/lcalc Makefile distinfo

math/lcalc: upgrade to 2.2.1

Release notes: OpenMP support improved.
DeltaFile
+7-5math/lcalc/Makefile
+3-3math/lcalc/distinfo
+10-82 files

HardenedBSD/ports 33a99edmath/libsemigroups Makefile distinfo

math/libsemigroups: upgrade to v3.5.5

Release notes at
        https://github.com/libsemigroups/libsemigroups/releases/tag/v3.5.5
DeltaFile
+5-4math/libsemigroups/Makefile
+3-3math/libsemigroups/distinfo
+1-1math/libsemigroups/pkg-plist
+9-83 files

HardenedBSD/ports a0ecc03textproc/ibus-typing-booster Makefile pkg-plist, textproc/ibus-typing-booster/files patch-setup_ibus-setup-typing-booster.desktop.in.in patch-engine_itb__emoji.py

textproc/ibus-typing-booster: upgrade to 2.30.6

Release notes at
        https://github.com/mike-fabian/ibus-typing-booster/releases/tag/2.30.6
DeltaFile
+6-13textproc/ibus-typing-booster/Makefile
+4-7textproc/ibus-typing-booster/files/patch-setup_ibus-setup-typing-booster.desktop.in.in
+10-0textproc/ibus-typing-booster/files/patch-engine_itb__emoji.py
+6-3textproc/ibus-typing-booster/pkg-plist
+3-3textproc/ibus-typing-booster/distinfo
+29-265 files

HardenedBSD/ports 324c83cdevel/apache-log4j2 distinfo Makefile

devel/apache-log4j2: upgrade to 2.25.4

Release notes at
        https://logging.apache.org/log4j/2.x/release-notes.html#release-notes-2-25-4
DeltaFile
+3-3devel/apache-log4j2/distinfo
+1-2devel/apache-log4j2/Makefile
+4-52 files

HardenedBSD/ports 5ac3af5math/primecount distinfo Makefile

math/primecount: upgrade to v8.4

Release notes at https://github.com/kimwalisch/primecount/releases/tag/v8.4
DeltaFile
+3-3math/primecount/distinfo
+1-1math/primecount/Makefile
+4-42 files

HardenedBSD/ports 6a19853math/R-cran-admisc distinfo Makefile

math/R-cran-admisc: upgrade to 0.40

Changelog at https://cran.r-project.org/web/packages/admisc/ChangeLog
DeltaFile
+3-3math/R-cran-admisc/distinfo
+1-1math/R-cran-admisc/Makefile
+4-42 files

HardenedBSD/ports de3717fdevel/cargo-hack distinfo Makefile

devel/cargo-hack: update 0.6.43 → 0.6.44
DeltaFile
+31-31devel/cargo-hack/distinfo
+15-16devel/cargo-hack/Makefile
+46-472 files

HardenedBSD/ports 8276cf2science/py-arch Makefile distinfo, science/py-arch/files patch-pyproject.toml

science/py-arch: update 6.3.0 → 8.0.0
DeltaFile
+11-11science/py-arch/Makefile
+9-9science/py-arch/files/patch-pyproject.toml
+3-3science/py-arch/distinfo
+23-233 files

HardenedBSD/ports 72bf60asysutils/mise distinfo Makefile

sysutils/mise: update 2026.4.6 → 2026.4.8
DeltaFile
+7-7sysutils/mise/distinfo
+3-4sysutils/mise/Makefile
+10-112 files

HardenedBSD/ports b9c675edevel/cargo-deny distinfo Makefile

devel/cargo-deny: update 0.19.0 → 0.19.1
DeltaFile
+207-517devel/cargo-deny/distinfo
+103-259devel/cargo-deny/Makefile
+310-7762 files

HardenedBSD/ports 9ae940dtextproc/mdq distinfo Makefile

textproc/mdq: update 0.9.0 → 0.10.0
DeltaFile
+99-117textproc/mdq/distinfo
+49-59textproc/mdq/Makefile
+148-1762 files

HardenedBSD/ports 400c602devel/typeshare distinfo Makefile

devel/typeshare: update 1.13.3 → 1.13.4
DeltaFile
+19-17devel/typeshare/distinfo
+9-9devel/typeshare/Makefile
+28-262 files

HardenedBSD/ports fad9c35devel/cargo-llvm-cov distinfo Makefile

devel/cargo-llvm-cov: update 0.8.4 → 0.8.5
DeltaFile
+29-29devel/cargo-llvm-cov/distinfo
+14-15devel/cargo-llvm-cov/Makefile
+43-442 files

HardenedBSD/ports 0791d15databases/movine distinfo Makefile, databases/movine/files patch-cargo-crates_openssl-sys-0.9.61_build_expando.c patch-powerpc

databases/movine: update 0.11.0 → 0.11.4
DeltaFile
+283-247databases/movine/distinfo
+143-125databases/movine/Makefile
+0-26databases/movine/files/patch-cargo-crates_openssl-sys-0.9.61_build_expando.c
+2-14databases/movine/files/patch-powerpc
+0-15databases/movine/files/patch-cargo-crates_openssl-sys-0.9.61_src_ssl.rs
+0-14databases/movine/files/patch-cargo-crates_openssl-sys-0.9.61_build_main.rs
+428-4411 files not shown
+428-4537 files

HardenedBSD/ports a7478c4devel/gitui distinfo Makefile.crates

devel/gitui: update 0.28.0 → 0.28.1
DeltaFile
+151-159devel/gitui/distinfo
+74-78devel/gitui/Makefile.crates
+1-2devel/gitui/Makefile
+226-2393 files

HardenedBSD/ports 85919ddmisc/lean-ctx distinfo Makefile

misc/lean-ctx: update 2.21.11 → 3.0.0
DeltaFile
+3-3misc/lean-ctx/distinfo
+1-1misc/lean-ctx/Makefile
+4-42 files

HardenedBSD/ports 64b3e59net/mtg pkg-post-install distinfo, net/mtg/files mtg.in

net/mtg: Update 2.2.6 => 2.2.8

Changelogs:
* https://github.com/9seconds/mtg/releases/tag/v2.2.7
* https://github.com/9seconds/mtg/releases/tag/v2.2.8

Port changes:
* Add pkg-post-install script to change default secret
  in the configuration file for security purposes.

PR:             294300
Reported by:    Oleg Streejak <oleg at pcbtech.ru>
Approved by:    Boris Korzun <drtr0jan at yandex.ru> (maintainer)
Approved by:    osa (mentor)
MFH:            2026Q2
DeltaFile
+23-0net/mtg/pkg-post-install
+7-5net/mtg/files/mtg.in
+5-5net/mtg/distinfo
+3-4net/mtg/Makefile
+38-144 files

HardenedBSD/ports d708d9bftp/sftpgo pkg-plist

ftp/sftpgo: fix build without zsh

PR:             294377
Reported by:    vedad at kajtaz.net
DeltaFile
+1-1ftp/sftpgo/pkg-plist
+1-11 files

HardenedBSD/ports 0ad58b7dns/dnsdist Makefile distinfo, dns/dnsdist/files patch-dnsdist-lua.cc

dns/dnsdist: Update 2.0.2 => 2.0.3 (security)

While here:
* Drop backported patch since they're in new release
* Reduce portlint warnings by using increment for DISTFILES
* Use <bsd.port.options.mk> instead of <bsd.port.{pre,post}.mk>

Release notes:
https://blog.powerdns.com/2026/03/31/powerdns-dnsdist-1.9.12-and-2.0.3-released
Changelog:
https://www.dnsdist.org/changelog.html#change-2.0.3

PR:             294225
Reported by:    Jordan Ostreff <jordan at ostreff.info>
Approved by:    Ralf van der Enden <tremere at cainites.net> (maintainer)
Approved by:    osa (mentor)
Security:       CVE-2026-0396
Security:       CVE-2026-0397
Security:       CVE-2026-24028

    [5 lines not shown]
DeltaFile
+0-50dns/dnsdist/files/patch-dnsdist-lua.cc
+4-5dns/dnsdist/Makefile
+3-5dns/dnsdist/distinfo
+7-603 files