HardenedBSD/ports 28e36afsecurity/nmap Makefile

HBSD: Resolave merge conflict

HardenedBSD does not support FreeBSD 13.

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-4security/nmap/Makefile
+0-41 files

HardenedBSD/ports 1b1457cmath/heyoka pkg-plist, math/heyoka/files patch-test_llvm_helpers.cpp

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

Conflicts:
        security/nmap/Makefile (unresolved)
DeltaFile
+195-187sysutils/tldr/distinfo
+96-92sysutils/tldr/Makefile.crates
+33-33www/py-primp/distinfo
+28-28misc/github-copilot-cli/files/package-lock.json
+43-0math/heyoka/files/patch-test_llvm_helpers.cpp
+33-7math/heyoka/pkg-plist
+428-347177 files not shown
+1,245-1,043183 files

HardenedBSD/src efc607bsys/dev/acpica acpi_spmc.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+2-2sys/dev/acpica/acpi_spmc.c
+2-21 files

HardenedBSD/src 88110f9sys/dev/acpica acpi_spmc.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+2-2sys/dev/acpica/acpi_spmc.c
+2-21 files

HardenedBSD/src 13a9715sys/conf NOTES, sys/dev/sound/pcm feeder_rate.c buffer.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+13-44sys/dev/sound/pcm/feeder_rate.c
+0-26sys/dev/sound/pcm/buffer.c
+9-13sys/dev/sound/usb/uaudio.c
+0-20sys/tools/sound/emu10k1-mkalsa.sh
+0-19sys/dev/sound/pcm/feeder_mixer.c
+2-17sys/conf/NOTES
+24-13913 files not shown
+43-24719 files

HardenedBSD/ports 94dc97ddevel/hs-shake distinfo Makefile

devel/hs-shake: Update 0.19.8 => 0.19.9

Approved by:            haskell@ (alven@)
Approved by:            db@, yuri@ (Mentors, implicit)
DeltaFile
+11-11devel/hs-shake/distinfo
+1-16devel/hs-shake/Makefile
+13-0devel/hs-shake/Makefile.cabal
+25-273 files

HardenedBSD/ports 4cc3bd3devel/violet distinfo Makefile

devel/violet: Follow upstream tarball reroll

Approved by:            db@, yuri@ (Mentors, implicit)
DeltaFile
+3-3devel/violet/distinfo
+1-1devel/violet/Makefile
+4-42 files

HardenedBSD/ports 567a0e3multimedia/gst123 Makefile pkg-message

multimedia/gst123: Fix build with ncurses 6.6

Apply the upstream patch to fix the build.
Update USE_GSTREAMER and USE_XORG.
Since it has been a while since the version was updated, remove the
pkg-message for migration.

In file included from gst123.cc:33:
./terminal.h:31:30: error: field has incomplete type 'struct termios'
   31 |   struct termios             tio_orig;
      |                              ^
./terminal.h:31:10: note: forward declaration of 'termios'
   31 |   struct termios             tio_orig;
      |          ^

PR:             292500
Approved by:    fluffy (mentor)
DeltaFile
+7-3multimedia/gst123/Makefile
+0-8multimedia/gst123/pkg-message
+3-1multimedia/gst123/distinfo
+10-123 files

HardenedBSD/ports 13a3e44japanese/proxy2ch Makefile distinfo, japanese/proxy2ch/files proxy2ch.in

japanese/proxy2ch: Update to 20260306-snapshot

The domain for 5Channel has changed from 5ch.net to 5ch.io.
Since data acquisition is no longer possible in the release version,
update to a snapshot.
The proxy2ch_flags in rc.d/proxy2ch wasn't working, so change it to
proxy2ch_args.

Changelog (japanese):
https://codeberg.org/NanashiNoGombe/proxy2ch/releases/tag/v20260306-snapshot

PR:             294108
Approved by:    fluffy (mentor)
DeltaFile
+8-4japanese/proxy2ch/files/proxy2ch.in
+4-5japanese/proxy2ch/Makefile
+3-3japanese/proxy2ch/distinfo
+2-2japanese/proxy2ch/pkg-descr
+17-144 files

HardenedBSD/ports da6b209japanese/multiskkserv Makefile, japanese/multiskkserv/files extra-patch-configure.ac

japanese/multiskkserv: Fix build with cdb-20251021

Add EXTRA_PATCHES.

PR:             290686
Approved by:    fluffy (mentor)
DeltaFile
+11-0japanese/multiskkserv/files/extra-patch-configure.ac
+2-0japanese/multiskkserv/Makefile
+13-02 files

HardenedBSD/ports 824a384databases/cdb pkg-descr Makefile, databases/cdb/files patch-error.h

databases/cdb: Update to 20251021

Take maintainership.
Update MASTER_SITES, WWW and pkg-descr.
Add LICENSE and DOCS option.

Changelog: https://cdb.cr.yp.to/download.html#changelog

PR:             290686
Approved by:    fluffy (mentor)
DeltaFile
+16-18databases/cdb/pkg-descr
+22-11databases/cdb/Makefile
+0-11databases/cdb/files/patch-error.h
+7-0databases/cdb/pkg-plist
+3-2databases/cdb/distinfo
+48-425 files

HardenedBSD/src 33e095esys/dev/acpica acpi_spmc.c

acpi_spmc: Improve device description

"Low Power S0 Idle" doesn't mean that much. "System Power Management
Controller" is what "SPMC" stands for in the first place.

Sponsored by:   The FreeBSD Foundation
DeltaFile
+2-2sys/dev/acpica/acpi_spmc.c
+2-21 files

HardenedBSD/ports 8d1438enet-im/linux-discord distinfo Makefile

net-im/linux-discord: Update to 0.0.131
DeltaFile
+3-3net-im/linux-discord/distinfo
+1-1net-im/linux-discord/Makefile
+4-42 files

HardenedBSD/src 3d85a2asys/dev/sound/pcm channel.h

sound: Remove unimplemented chn_reinit() definition

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week

(cherry picked from commit 2e1cf242292a33a71839c512d222115d36f8fd40)
DeltaFile
+0-1sys/dev/sound/pcm/channel.h
+0-11 files

HardenedBSD/src d89987bsys/dev/sound/pcm ac97.c

sound: Address some XXX comments regarding AC'97 IDs

These seem harmless to address. Not sure why the original author did not
just assign the appropriate names if he knew they were wrong.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D56044

(cherry picked from commit edad981e1e8673b6dd14656fe75b9f239fb777ce)
DeltaFile
+2-12sys/dev/sound/pcm/ac97.c
+2-121 files

HardenedBSD/src dfcbb9csys/tools/sound emu10k1-mkalsa.sh

sound: Retire unused emu10k1-mkalsa.sh

It is a legacy script which is no longer used. Its utility is also
unknown.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D56043

(cherry picked from commit 71c46c8c901be2a6e0708c912f0d766d49e5b335)
DeltaFile
+0-20sys/tools/sound/emu10k1-mkalsa.sh
+0-201 files

HardenedBSD/src 332c782sys/dev/sound/pcm feeder_rate.c

sound: Retire Z_PARANOID

It is always defined.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D56042

(cherry picked from commit 6b91c8d5d2c35c4c6231eb172b514f95ce6e10d7)
DeltaFile
+0-6sys/dev/sound/pcm/feeder_rate.c
+0-61 files

HardenedBSD/src 02c9c1asys/dev/sound/pcm feeder_rate.c

sound: Remove most Z_RATE_* aliases

They introduce an extra level of abstraction for no reason at all.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D56041

(cherry picked from commit 0ee95151931688e3d321ea7fb13e037b211a40ba)
DeltaFile
+13-24sys/dev/sound/pcm/feeder_rate.c
+13-241 files

HardenedBSD/src 9990340sys/dev/sound/pcm ac97.c

sound: Remove dead code in pcm/ac97.c

ac97_uninitmixer() does not exist also.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D56045

(cherry picked from commit d048cec5fb41cf9529dd0b637a51c7ee72b59b3b)
DeltaFile
+0-4sys/dev/sound/pcm/ac97.c
+0-41 files

HardenedBSD/src 4b7b7a7sys/conf NOTES files

snd_dummy: Add to sys/conf/files and sys/conf/NOTES

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D56040

(cherry picked from commit 72e85a4d977eff23fcd2b12a3513f0e8fd2ac332)
(cherry picked from commit 82a066b8593a14e0bbf8e1fcdc75fd9ecf0d9e62)
DeltaFile
+2-0sys/conf/NOTES
+1-0sys/conf/files
+3-02 files

HardenedBSD/src 6681676sys/dev/sound/pcm channel.c matrix.h

sound: Retire CHN_SETVOLUME() and use chn_setvolume_matrix()

CHN_SETVOLUME() is just a wrapped around chn_setvolume_matrix() anyway,
so use it directly.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D55992

(cherry picked from commit 127aa056fea0714116952efb7664956e0f2b69cd)
DeltaFile
+2-2sys/dev/sound/pcm/channel.c
+1-2sys/dev/sound/pcm/matrix.h
+0-2sys/dev/sound/pcm/channel.h
+3-63 files

HardenedBSD/src 901d6fdsys/dev/sound/pcm dsp.c channel.h

sound: Retire CHN_GETMUTE() and use chn_getmute_matrix()

chn_getmute_matrix() does what CHN_GETMUTE() does, but with a few
additional checks.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D55993

(cherry picked from commit d171d5b8b5acb145efb41a57a2a8f3cded59a484)
DeltaFile
+3-2sys/dev/sound/pcm/dsp.c
+0-2sys/dev/sound/pcm/channel.h
+3-42 files

HardenedBSD/src 9b322a2sys/dev/sound sndstat.c, sys/dev/sound/pcm dsp.c mixer.c

sound: Retire CHN_GETVOLUME() and use chn_getvolume_matrix()

CHN_GETVOLUME() is just a wrapped around chn_getvolume_matrix() anyway,
so use it directly.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D55991

(cherry picked from commit f190fad18c385c184cb3600b7e24a362858a1911)
DeltaFile
+4-4sys/dev/sound/pcm/dsp.c
+2-2sys/dev/sound/pcm/mixer.c
+2-2sys/dev/sound/sndstat.c
+0-1sys/dev/sound/pcm/channel.h
+8-94 files

HardenedBSD/src d6b36b8sys/dev/sound/pcm matrix.h

sound: Retire SND_MULTICHANNEL

SND_MULTICHANNEL is always defined, so SND_CHN_MAX will also always be
8. Apart from the fact that there is no other place in the code that
touches SND_MULTICHANNEL, there is also no good reason nowadays to set
SND_CHN_MAX to 2.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D55934

(cherry picked from commit 712bd9b2750a71ad7f8b6bebc5177c47d33a6364)
DeltaFile
+0-7sys/dev/sound/pcm/matrix.h
+0-71 files

HardenedBSD/src e6da660sys/conf NOTES options, sys/dev/sound/pcm feeder_mixer.c feeder_chain.c

sound: Retire SND_DEBUG

Not useful anymore.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D55932

(cherry picked from commit 5d311c75324a205f3cd8a8a404a25ebdadb18b54)
DeltaFile
+0-16sys/dev/sound/pcm/feeder_mixer.c
+0-5sys/conf/NOTES
+1-1sys/dev/sound/pcm/feeder_chain.c
+0-1sys/conf/options
+1-234 files

HardenedBSD/src e93c021sys/dev/sound/usb uaudio.c

snd_uaudio: Simplify chan->curr_cable calculation in uaudio_bulk_write_callback()

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D55918

(cherry picked from commit 039477d3e7e72285174d83b973e58cea8de85280)
DeltaFile
+1-3sys/dev/sound/usb/uaudio.c
+1-31 files

HardenedBSD/src cf4199esys/dev/sound/pcm feeder_rate.c

sound: Retire unused Z_MULTIFORMAT

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week

(cherry picked from commit 12633057f5914a533df81030b553d6bd47681d87)
DeltaFile
+0-2sys/dev/sound/pcm/feeder_rate.c
+0-21 files

HardenedBSD/src a7c0ee9sys/dev/sound/pcm channel.h

sound: Always use chn_getvolume_matrix()

There is no reason not to use it. We do it already with CHN_SETVOLUME().
chn_getvolume_matrix() is the same as the non-INVARIANTS
CHN_GETVOLUME(), just without the additional KASSERT
chn_getvolume_matrix() provides.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D55990

(cherry picked from commit 0b7f9597024a0061b1e6c544d78bc2ed9392bd89)
DeltaFile
+0-4sys/dev/sound/pcm/channel.h
+0-41 files

HardenedBSD/src 1edf301sys/dev/sound/pcm buffer.c

sound: Remove SND_DIAGNOSTIC section in buffer.c

The purpose of this has not been documented, but it seems like it makes
it possible to view the maximum number of bytes that passed to
sndbuf_feed(), as well as the maximum number of cycles taken inside its
main loop. These do not seem particularly useful anymore.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D55989

(cherry picked from commit 4324e0fa71f85f274013100d912584a042c9909e)
DeltaFile
+0-26sys/dev/sound/pcm/buffer.c
+0-261 files

HardenedBSD/src 7c483aasys/dev/sound/pcm channel.c

sound: Do not create root feeder in chn_init()

The feeder chain gets destroyed when feeder_chain() is called, which is
after the chn_reset() call in chn_init() further down for primary chans,
or vchan_create() for vchans. This makes the root feeder creation in
chn_init() essentially a no-op. Remove it altogether and let
feeder_chain() after chn_reset() take care of creating the feeder
properly. It creates the root one as well.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D55941

(cherry picked from commit b9f9fc473eb56273978df4d4c889acba2862b21c)
DeltaFile
+0-12sys/dev/sound/pcm/channel.c
+0-121 files