HardenedBSD/src 0a7a549sbin/ipfw ipfw.8, share/man/man5 src.conf.5

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+40-49sys/cam/scsi/scsi_da.c
+21-3sbin/ipfw/ipfw.8
+7-7share/man/man9/locking.9
+8-1share/man/man5/src.conf.5
+6-0tools/build/options/WITH_REPRODUCIBLE_PATHS
+4-1usr.sbin/bsdinstall/scripts/pkgbase.in
+86-618 files not shown
+93-6714 files

HardenedBSD/src 307d36dsbin/ipfw ipfw.8, share/man/man9 locking.9

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+40-49sys/cam/scsi/scsi_da.c
+21-3sbin/ipfw/ipfw.8
+7-7share/man/man9/locking.9
+1-1share/vt/fonts/Makefile
+69-604 files

HardenedBSD/ports e7060bbaudio/logitechmediaserver pkg-plist pkg-plist.i386, audio/logitechmediaserver-trackstat pkg-plist

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+6,562-0lang/gnat14/pkg-plist
+0-2,585audio/logitechmediaserver/pkg-plist
+0-2,414audio/logitechmediaserver/pkg-plist.i386
+2,010-0audio/lyrionmusicserver/pkg-plist
+0-206audio/logitechmediaserver-trackstat/pkg-plist
+185-0audio/lyrionmusicserver/Makefile
+8,757-5,205135 files not shown
+9,847-6,475141 files

HardenedBSD/ports 2a30af6audio/logitechmediaserver pkg-plist pkg-plist.i386, audio/logitechmediaserver-trackstat pkg-plist

audio/logitechmediaserver: 8.5.2 -> 9.0.3, rename to audio/lyrionmusicserver

- With version 9, the project gets a new name.
  The basics are mostly the same.
- non-GPL firmware/files have been removed, so package can now
  be redistributed (result of discussions with Lyrion community)
- Many perl5 ports are now used, instead of vendor ports
- Some are left from the vendor code, which are not part of the p5 ports
- removing the plugins as they are unmaintained and maintainer is not sure
  the plugins worked with 8.5.2, anyway

Changes: https://lyrion.org/getting-started/changelog-lms9/#version-903-2025-10-03-9977737c1
DeltaFile
+0-2,585audio/logitechmediaserver/pkg-plist
+0-2,414audio/logitechmediaserver/pkg-plist.i386
+2,010-0audio/lyrionmusicserver/pkg-plist
+0-206audio/logitechmediaserver-trackstat/pkg-plist
+185-0audio/lyrionmusicserver/Makefile
+0-129audio/logitechmediaserver/Makefile
+2,195-5,33438 files not shown
+2,569-6,01344 files

HardenedBSD/ports a73d166audio/mixxx Makefile

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+1-28audio/mixxx/Makefile
+1-281 files

HardenedBSD/src fb18070share/man/man5 src.conf.5

HBSD: Regen src.conf.5.

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-4share/man/man5/src.conf.5
+0-41 files

HardenedBSD/ports fefc02dirc/iroffer-dinoex Makefile pkg-plist

irc/iroffer-dinoex: update to 3.34
DeltaFile
+11-5irc/iroffer-dinoex/Makefile
+7-0irc/iroffer-dinoex/pkg-plist
+3-3irc/iroffer-dinoex/distinfo
+21-83 files

HardenedBSD/src e561e15share/mk src.opts.mk

HBSD: Resolve merge conflict for share/mk/src.opts.mk

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

HardenedBSD/src 2d1e879share/man/man5 src.conf.5, share/mk src.opts.mk bsd.debug.mk

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

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
        share/mk/src.opts.mk (unresolved)
DeltaFile
+11-0share/man/man5/src.conf.5
+6-0tools/build/options/WITH_REPRODUCIBLE_PATHS
+4-0share/mk/src.opts.mk
+1-1sys/conf/kern.post.mk
+1-1share/mk/bsd.debug.mk
+1-1sys/conf/kmod.mk
+24-31 files not shown
+25-37 files

HardenedBSD/src 3cd0bccrelease Makefile, usr.sbin/bsdinstall Makefile

HBSD: Some pkgbase related changes

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+4-1usr.sbin/bsdinstall/scripts/pkgbase.in
+1-1usr.sbin/bsdinstall/Makefile
+0-1release/Makefile
+5-33 files

HardenedBSD/ports 812feb1www/fcgiwrap pkg-descr

www/fcgiwrap: Fix pkg-descr formatting

PR:             281661
Reported by:    Anton Saietskii <vsasjason at gmail.com>
DeltaFile
+3-3www/fcgiwrap/pkg-descr
+3-31 files

HardenedBSD/ports f2dbbaftextproc/television distinfo Makefile

textproc/television: Update to 0.14.3

Changelogs:
https://github.com/alexpasmantier/television/releases/tag/0.14.3
https://github.com/alexpasmantier/television/releases/tag/0.14.2
DeltaFile
+3-3textproc/television/distinfo
+1-1textproc/television/Makefile
+4-42 files

HardenedBSD/ports d5ac012graphics/fotocx pkg-plist, graphics/fotocx/files patch-zfuncs.cc patch-fotocx.cc

graphics/fotocx: update the port to version 25.5

Get rid of PORTDOCS=* while here, two files do not
warrant it as we already use flattened `pkg-plist'.

Reported by:    portscout
DeltaFile
+26-56graphics/fotocx/files/patch-zfuncs.cc
+38-28graphics/fotocx/pkg-plist
+11-11graphics/fotocx/files/patch-fotocx.cc
+0-20graphics/fotocx/files/patch-f.file.cc
+9-10graphics/fotocx/files/patch-Makefile
+7-10graphics/fotocx/files/patch-zfuncs.h
+91-1352 files not shown
+95-1418 files

HardenedBSD/src e510471sbin/ipfw ipfw.8

ipfw.8: document how to delete nat configuration instance

MFC after:      3 days
DeltaFile
+15-1sbin/ipfw/ipfw.8
+15-11 files

HardenedBSD/ports eaec2a9cad/freecad Makefile

cad/freecad: chase ffmpeg dependency after c204aaf79162

ffmpeg's libavutil actually changed soname, and this one seems to
have slipped the net
DeltaFile
+1-1cad/freecad/Makefile
+1-11 files

HardenedBSD/ports c7d3aacaudio/libsidplayfp Makefile distinfo

audio/libsidplayfp: update to 2.16.0 release (+)

Disable usbsid support as it's not compatible with our current version/variant of libusb

Release notes:  https://github.com/libsidplayfp/libsidplayfp/releases/tag/v2.16.0
PR:             291913
DeltaFile
+5-6audio/libsidplayfp/Makefile
+3-3audio/libsidplayfp/distinfo
+8-92 files

HardenedBSD/ports 41b3f64x11-fm/doublecmd distinfo Makefile

x11-fm/doublecmd: update to 1.1.31 gamma release
DeltaFile
+3-3x11-fm/doublecmd/distinfo
+1-1x11-fm/doublecmd/Makefile
+4-42 files

HardenedBSD/ports f02bc3b. UPDATING, net/rsync Makefile pkg-message

net/rsync: Fix stealth dependency on Python

net/rsync includes a Python script installed as sbin/rrsync
without declaring a dependency on Python.

Adds a port option, PYTHON, that controls whether rrsync is
installed and adds the necessary dependency and remove the
pkg-message who advises that Python might be needed.

By default this option is off (updating the package will remove rrsync).

PR:             286073
Reported by:    Christian Ullrich <chris at chrullrich.net>
DeltaFile
+14-6net/rsync/Makefile
+9-0UPDATING
+0-8net/rsync/pkg-message
+2-2net/rsync/pkg-plist
+25-164 files

HardenedBSD/ports a99775ex11/xsnow distinfo Makefile

x11/xsnow: update to 3.9.1 (+)

Changelog:      https://www.ratrabbit.nl/ratrabbit/xsnow/changelog/index.html
DeltaFile
+3-3x11/xsnow/distinfo
+2-2x11/xsnow/Makefile
+5-52 files

HardenedBSD/ports c885a84multimedia/qmmp-qt6 distinfo Makefile

multimedia/qmmp-qt6: update to 2.3.1 release (+):

Changes since 2.3.0:
added IMA ADPCM support;
fixed grouping by parent directory;
fixed sorting by file name and path;
fixed detection of the PCM WAVE files with "JUNK", "bext" and "fact" chunks;
fixed color scheme change issues;
fixed drawing issues in the plugin list;
updated Chinese Simplified translation.
DeltaFile
+3-3multimedia/qmmp-qt6/distinfo
+1-2multimedia/qmmp-qt6/Makefile
+4-52 files

HardenedBSD/ports 6c03e31multimedia/qmmp-qt5 distinfo Makefile

multimedia/qmmp-qt5: update to 1.7.9 release (+)

Changes since 1.7.8:
added IMA ADPCM support;
fixed displaying mpeg plugin build status;
fixed default output under Windows;
fixed IPC messages charset;
fixed issues with "--pl-help" and "--nowplaying-syntax" command-line options;
fixed audio channel map for WMA;
fixed detection of the PCM WAVE files with "JUNK", "bext" and "fact" chunks;
fixed retrieving song lyrics;
fixed sorting by file name and path;
fixed drawing issues in the plugin list;
fixed color scheme change issues;
updated Chinese Simplified translation.
DeltaFile
+3-3multimedia/qmmp-qt5/distinfo
+1-2multimedia/qmmp-qt5/Makefile
+4-52 files

HardenedBSD/src b67a7c0sys/cam/scsi scsi_da.c

scsi: Make all da error messages greppable

Don't split the error messages across lines. We used to do that ages
ago, but have relaxed style(9) to encourage the opposite so all error
messages can be grepped. This constantly slows me down when I'm helping
others find issues, so start here by splitting according to normal
style(9) rules with a relaxed line length of 90.

Sponsored by:           Netflix
DeltaFile
+40-49sys/cam/scsi/scsi_da.c
+40-491 files

HardenedBSD/ports 3d6d005games/wesnoth distinfo Makefile

games/wesnoth: update to 1.18.6 release (+)

Version 1.18.6:
Multiplayer
* 5p - The Wilderlands:
* Fixed lag during AI turn (issue #10419)
Translations
* Updated translations: Ancient Greek, Arabic, Bengali, British English, Catalan, Chinese (Simplified), Czech, Finnish, French, Galician, Hungarian, Polish, Spanish
User interface
* The load-game dialog can now see the directories used by the development version (1.19.2 and later)
DeltaFile
+3-3games/wesnoth/distinfo
+1-2games/wesnoth/Makefile
+2-0games/wesnoth/pkg-plist
+6-53 files

HardenedBSD/ports ea92403net-im/nchat distinfo Makefile

net-im/nchat: update 5.11.32 -> 5.12.21

Sponsored by:   tipi.work
DeltaFile
+3-3net-im/nchat/distinfo
+1-1net-im/nchat/Makefile
+4-42 files

HardenedBSD/src 9fdf49esbin/ipfw ipfw.8

ipfw.8: fix misprint after previous change

rulese -> ruleset

MFC after:      3 days
X-MFC-with:     a7b8a5d37bcb0009297962137bfb6c6570e5af12
DeltaFile
+1-1sbin/ipfw/ipfw.8
+1-11 files

HardenedBSD/ports e2e6fa9mail/sendmail/files patch-srvrsmtp.c patch-mail.local.c

mail/sendmail: Update to 8.18.2
DeltaFile
+12-12mail/sendmail/files/patch-srvrsmtp.c
+5-5mail/sendmail/files/patch-mail.local.c
+5-5mail/sendmail/files/patch-readcf.c
+6-4mail/sendmail/files/patch-Makefile.m4
+3-3mail/sendmail/files/patch-sendmail.h
+3-3mail/sendmail/files/patch-smrsh.8
+34-323 files not shown
+42-409 files

HardenedBSD/ports da79c5faudio/mixxx pkg-plist, finance/odoo pkg-plist

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

Conflicts:
        audio/mixxx/Makefile (unresolved)
DeltaFile
+56,418-0finance/odoo18/pkg-plist
+35,721-5,348finance/odoo/pkg-plist
+497-0www/qt5-webengine/files/patch-ffmpeg7
+215-0www/qt5-webengine/files/patch-ffmpeg8
+96-87audio/mixxx/pkg-plist
+150-0www/qt5-webengine/files/patch-ffmpeg5
+93,097-5,435122 files not shown
+94,037-5,883128 files

HardenedBSD/ports 468375fdatabases/arrow Makefile

HBSD: Fix build of databases/arrow

Match the minimum LLVM version with what we have in base.

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+1-1databases/arrow/Makefile
+1-11 files

HardenedBSD/ports b69659flang/gcc12 Makefile

HBSD: Fix build of lang/gcc12

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+1-0lang/gcc12/Makefile
+1-01 files

HardenedBSD/src a7b8a5dsbin/ipfw ipfw.8

ipfw.8: fix documentation bug for setmark

A mark set with "setmark" keyword is intended to be "sticky"
and documented as such but in fact it is not yet,
as current implementation lacks "sticky" feature
and its implementation will be not MFC'd, most probably.

Correct the manual page until the implementation improved.

MFC after:      3 days
Discussed with: Boris Lytochkin <lytboris at gmail.com> (author)
DeltaFile
+6-2sbin/ipfw/ipfw.8
+6-21 files