HardenedBSD/ports 2679b88devel/kBuild Makefile

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-7devel/kBuild/Makefile
+0-71 files

HardenedBSD/ports d079617devel/kBuild Makefile, emulators/flycast distinfo Makefile

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

Conflicts:
        devel/kBuild/Makefile (unresolved)
DeltaFile
+29-11www/mod_auth_gssapi/Makefile
+16-14devel/kBuild/Makefile
+25-2emulators/flycast/files/patch-CMakeLists.txt
+15-9emulators/flycast/distinfo
+10-9emulators/flycast/Makefile
+2-10emulators/flycast/files/patch-core_rend_vulkan_vulkan__context.cpp
+97-5524 files not shown
+213-9230 files

HardenedBSD/src 8b22a37lib/libc/gen directory.3, sbin/nvmecontrol telemetry.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+199-0sys/dev/smartpqi/smartpqi_ioctl.c
+52-38lib/libc/gen/directory.3
+30-38sys/netinet6/ip6_mroute.c
+19-37usr.bin/diff3/diff3.c
+23-15sbin/nvmecontrol/telemetry.c
+6-13usr.bin/diff/pr.c
+329-14136 files not shown
+415-18642 files

HardenedBSD/ports 614cec6devel/kBuild Makefile distinfo, devel/kBuild/files patch-src_kmk_glob_fnmatch.c patch-src_kmk_getopt.h

devel/kBuild: Update 0.1.9998r3660 => 0.1.9998r3687, fix build with GCC 15

Commit log:
https://trac.netlabs.org/kbuild/changeset?reponame=&new=3687%40trunk&old=3660%40trunk

PR:     292692 292801
DeltaFile
+13-18devel/kBuild/Makefile
+11-0devel/kBuild/files/patch-src_kmk_glob_fnmatch.c
+11-0devel/kBuild/files/patch-src_kmk_getopt.h
+11-0devel/kBuild/files/patch-src_oldsed_lib_getopt.h
+3-3devel/kBuild/distinfo
+2-0devel/kBuild/pkg-plist
+51-216 files

HardenedBSD/ports 78992d8audio/rubberband/files patch-src_common_mathmisc.h

audio/rubberband: fix build with libc++ 21

With libc++ 21 audio/rubberband fails to build, with errors similar to:

    In file included from ../src/common/mathmisc.cpp:24:
    ../src/common/mathmisc.h:58:1: error: unknown type name 'size_t'; did you mean 'std::size_t'?
       58 | size_t roundUp(size_t value); // to nearest power of two
          | ^~~~~~
          | std::size_t
    /usr/include/c++/v1/__cstddef/size_t.h:20:7: note: 'std::size_t' declared here
       20 | using size_t = decltype(sizeof(int));
          |       ^

This is because mathmisc.h depended on <stddef.h> being transitively
included, which is no longer the case. Add #include <stddef.h> to fix
the problem.

PR:             292868
Approved by:    acm (maintainer)
MFH:            2026Q1
DeltaFile
+10-0audio/rubberband/files/patch-src_common_mathmisc.h
+10-01 files

HardenedBSD/ports dcdd548devel/llvm-cheri distinfo Makefile.snapshot

devel/llvm-cheri: new snapshot

Sponsored by:   DARPA, AFRL
DeltaFile
+3-3devel/llvm-cheri/distinfo
+2-2devel/llvm-cheri/Makefile.snapshot
+5-52 files

HardenedBSD/ports 75ec43cdevel/llvm-morello distinfo Makefile.snapshot

devel/llvm-morello: new snapshot

Includes a fix for a bug (padding of globals in hybrid mode) that
prevented compiling a working FreeBSD aarch64 system.

Sponsored by:   DARPA, AFRL
DeltaFile
+3-3devel/llvm-morello/distinfo
+2-2devel/llvm-morello/Makefile.snapshot
+5-52 files

HardenedBSD/ports 7c32287devel/llvm22 distinfo Makefile

devel/llvm22: 22.1.0 RC2

Sponsored by:   DARPA, AFRL
DeltaFile
+3-3devel/llvm22/distinfo
+1-1devel/llvm22/Makefile
+4-42 files

HardenedBSD/ports 8fd03ddgraphics/gegl Makefile, x11/babl Makefile

graphics/gegl: disable relocatable

On discussing with upstream, "relocatable" does not mean ELF
relocation. Currently enabling the feature causes GIMP and other
consumers build and runtime failures.

While here, update comment in x11/babl due to similar architecture.

Reported by: Tatsuki Makino
DeltaFile
+4-2graphics/gegl/Makefile
+1-1x11/babl/Makefile
+5-32 files

HardenedBSD/ports 0e43143. UPDATING, www/bluefish distinfo pkg-plist

www/bluefish: Update to 2.4.0

ChangeLog: https://sourceforge.net/p/bluefish/code/HEAD/tree/tags/bluefish_2_4_0/ChangeLog
DeltaFile
+11-0UPDATING
+3-3www/bluefish/distinfo
+5-0www/bluefish/pkg-plist
+1-1www/bluefish/Makefile
+20-44 files

HardenedBSD/src 9e0fe12sys/i386/i386 swtch.S

i386: Fix build and remove empty unused macro

When inlining the macro, reg was not substituted with the %ecx argument
previously passed in. One of the definitions was also left behind as an
empty macro.

PR:             292883
Fixes:          377c053a43f3 ("cpu_switch(): unconditionally wait on the blocked mutex transient")
MFC after:      1 week
DeltaFile
+1-3sys/i386/i386/swtch.S
+1-31 files

HardenedBSD/ports 82b0a20emulators/flycast distinfo Makefile, emulators/flycast/files patch-CMakeLists.txt patch-core_rend_vulkan_vulkan__context.cpp

emulators/flycast: Update 2.5 => 2.6

Changelog:
https://github.com/flyinghead/flycast/releases/tag/v2.6

* Update git submodules to latest release versions and reorder them into
  alphabetical sequence.
* Remove set-include in vulkan_context.cpp patch because it's now in
  upstream.
* Make slight simplification in post-install-DOCS-on.

PR:     292421
DeltaFile
+25-2emulators/flycast/files/patch-CMakeLists.txt
+15-9emulators/flycast/distinfo
+10-9emulators/flycast/Makefile
+2-10emulators/flycast/files/patch-core_rend_vulkan_vulkan__context.cpp
+11-0emulators/flycast/files/patch-core_sdl_dreampicoport.cpp
+63-305 files

HardenedBSD/ports f4ae815devel/air-go distinfo Makefile

devel/air-go: Update to 1.64.5
DeltaFile
+5-5devel/air-go/distinfo
+1-1devel/air-go/Makefile
+6-62 files

HardenedBSD/src f7144a9sys/sys sdt.h

sdt: Use the "cc" operand modifier for the address of probes for GCC 15+

This is required for GCC on RISC-V.  The GCC 15 docs claim that "cc" is
similar to "c" except that it "tries harder".

NB: I have not yet found a way to make the DTrace probes compile on
RISC-V with older versions of GCC.

Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D54964
DeltaFile
+4-0sys/sys/sdt.h
+4-01 files

HardenedBSD/src 03d8ac9crypto/heimdal/kdc mit_dump.c

heimdal: Pass the correct pointer to realloc when growing a string buffer

The realloc in my_fgetln was trying to grow the pointer to the string
buffer, not the string buffer itself.

In function 'my_fgetln',
    inlined from 'mit_prop_dump' at crypto/heimdal/kdc/mit_dump.c:156:19:
crypto/heimdal/kdc/mit_dump.c:119:13: error: 'realloc' called on unallocated object 'line' [-Werror=free-nonheap-object]
  119 |         n = realloc(buf, *sz + (*sz >> 1));
      |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
crypto/heimdal/kdc/mit_dump.c: In function 'mit_prop_dump':
crypto/heimdal/kdc/mit_dump.c:139:11: note: declared here
  139 |     char *line = NULL;
      |           ^~~~

Reviewed by:    rmacklem, cy
Fixes:          a93e1b731ae4 ("heimdal-kadmin: Add support for the -f dump option")
Differential Revision:  https://reviews.freebsd.org/D54933
DeltaFile
+1-1crypto/heimdal/kdc/mit_dump.c
+1-11 files

HardenedBSD/src 7f54c65sys/dev/smartpqi smartpqi_ioctl.c smartpqi_defines.h

smartpqi: Update to vendor version 14.4690.0.2008 - 15.2.0.2008

Update to versions:
FreeBSD14 14.4690.2008
FreeBSD15 15.2.0.2008

Included in this update are:
 - Support for new controllers
 - Add code that utilizes the new BIG_IOCTL_Command_struct and allows
   the I/O buffer size for a single passthrough ioctl to be stored as a
   32 bit integer instead of the original 16 bit integer.
 - Update occurrences of Microsemi to Microchip
 - Some format changes including converting comments from C++ to C
   style, remove instances of /* $FreeBSD$ */, and updating copyright
   dates.

Update to versions:
FreeBSD14 14.4690.2008
FreeBSD15 15.2.0.2008

    [22 lines not shown]
DeltaFile
+199-0sys/dev/smartpqi/smartpqi_ioctl.c
+8-3sys/dev/smartpqi/smartpqi_defines.h
+8-1sys/dev/smartpqi/smartpqi_ioctl.h
+6-2sys/dev/smartpqi/smartpqi_controllers.h
+3-1sys/dev/smartpqi/smartpqi_helper.c
+2-2sys/dev/smartpqi/smartpqi_event.c
+226-910 files not shown
+237-1916 files

HardenedBSD/ports 3cc38e4www/mod_auth_gssapi Makefile

www/mod_auth_gssapi: Add options for base/ports MIT Kerberos

Allow selection of base MIT on FreeBSD 15+.

Improve port:
- Replace PORTVERSION with DISTVERSION.
- Merge CONFIGURE_ARGS and repalce "+=" with "=" - unnecessary.
- Remove "+" in "PLIST_SUB+=" - unnecessary.
- Fix warnings from portclippy.
- Merge MKDIRs in do-install.

PR:             292474
Co-authored-by: Vladimir Druzenko <vvd at FreeBSD.org>
DeltaFile
+29-11www/mod_auth_gssapi/Makefile
+29-111 files

HardenedBSD/src a45fb94sys/netinet6 ip6_mroute.c

ip6_mroute: Remove an unhelpful comment

ifnets already track if_allmulti() calls in the if_amcount field.  That
field is older than the comment, so I'm not exactly sure what the intent
was; let's just remove it.

MFC after:      2 weeks
Sponsored by:   Stormshield
Sponsored by:   Klara, Inc.
DeltaFile
+0-4sys/netinet6/ip6_mroute.c
+0-41 files

HardenedBSD/src 5bb953bsys/netinet6 ip6_mroute.c

ip6_mroute: Fix the UPCALL_TIMING build

MFC after:      2 weeks
Sponsored by:   Stormshield
Sponsored by:   Klara, Inc.
DeltaFile
+1-1sys/netinet6/ip6_mroute.c
+1-11 files

HardenedBSD/src d0474edlib/libsys socket.2

socket.2: Cross-reference netintro(4)

netintro(4) is a great manual page that provides a basic introduction to
network facilities, I think it is well worth mentioning in the
socket(2).

I also think we can incorporate this reference somewhere in the text as
well, but I'm not sure, maybe the reference in the SEE ALSO section
would be enough.

Reviewed by:    glebius
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D55032
DeltaFile
+2-1lib/libsys/socket.2
+2-11 files

HardenedBSD/src 07940d1tests/atf_python/sys/net vnet.py

atf_python: Run vnet handlers in $HOME

When kyua runs a test, it creates a temp directory and sets $HOME to
point to it.  Tests are run with the cwd set to that temp directory.

When a process attaches to a jail, its cwd is set to the root of the
jail.  Modify atf_python to cd to $HOME instead, so that it's easier for
tests to share files.

Reviewed by:    zlei, ngie
MFC after:      2 weeks
Sponsored by:   Stormshield
Sponsored by:   Klara, Inc.
Differential Revision:  https://reviews.freebsd.org/D54971
DeltaFile
+1-0tests/atf_python/sys/net/vnet.py
+1-01 files

HardenedBSD/src b320e89sys/netinet6 ip6_mroute.c

ip6_mroute: Remove an unused constant

No functional change intended.

MFC after:      2 weeks
Sponsored by:   Stormshield
Sponsored by:   Klara, Inc.
DeltaFile
+0-2sys/netinet6/ip6_mroute.c
+0-21 files

HardenedBSD/src b370fccsys/netinet6 ip6_mroute.c

ip6_mroute: Make MF6CFIND a regular function

This is more natural and corresponds more closely to the v4 multicast
routing code.  No functional change intended.

Reviewed by:    glebius
MFC after:      2 weeks
Sponsored by:   Stormshield
Sponsored by:   Klara, Inc.
Differential Revision:  https://reviews.freebsd.org/D54983
DeltaFile
+20-25sys/netinet6/ip6_mroute.c
+20-251 files

HardenedBSD/src 7483987sys/netinet ip_mroute.c, sys/netinet6 ip6_mroute.c raw_ip6.c

ip_mroute: Make privilege checking more consistent

- The v6 socket option and ioctl handlers had no privilege checks at
  all.  The socket options, I believe, can only be reached via a raw
  socket, but a jailed root user with a raw socket shouldn't be able to
  configure multicast routing in a non-VNET jail.  The ioctls can only
  be used to fetch stats.
- Delete a bogus comment in X_mrt_ioctl(), one can issue multicast
  routing ioctls against any socket.  Note that the call path is
  soo_ioctl()->rtioctl_fib()->mrt_ioctl().

I think all of the mroute privilege checks should be done within the
ip(6)_mroute code, but let's first make the v4 and v6 modules
consistent.

Reviewed by:    glebius
MFC after:      2 weeks
Sponsored by:   Stormshield
Sponsored by:   Klara, Inc.
Differential Revision:  https://reviews.freebsd.org/D54982
DeltaFile
+9-6sys/netinet6/ip6_mroute.c
+6-0sys/netinet6/raw_ip6.c
+0-5sys/netinet/ip_mroute.c
+15-113 files

HardenedBSD/src d030974. ObsoleteFiles.inc

ObsoleteFiles.mk: Remove obsolete MIT KRB5 plugins

Fixes:                  1f9da4793cb1, dd0ec030f8fd
MFC after:              1 week
Differential revision:  https://reviews.freebsd.org/D54780
DeltaFile
+9-0ObsoleteFiles.inc
+9-01 files

HardenedBSD/src 1c00d5alib/libc/gen dirfd.c

libc: Fix missing include

Although not needed on FreeBSD due to namespace pollution, we should
technically #include <stddef.h> to secure a definition of NULL.

Fixes:          5074d5c9845e ("libc: Improve POSIX conformance of dirfd()")
DeltaFile
+1-0lib/libc/gen/dirfd.c
+1-01 files

HardenedBSD/ports 36c0330archivers/par2cmdline pkg-plist distinfo

archivers/par2cmdline: Update to 1.1.0

Also, switch PLIST_FILES to pkg-plist.

Changelog: https://github.com/Parchive/par2cmdline/blob/v1.1.0/ChangeLog
DeltaFile
+8-0archivers/par2cmdline/pkg-plist
+3-3archivers/par2cmdline/distinfo
+1-4archivers/par2cmdline/Makefile
+12-73 files

HardenedBSD/src 4047536usr.bin/diff3 diff3.c

diff3: use pdwait instead of homemade one

MFC After:      3 days
DeltaFile
+19-37usr.bin/diff3/diff3.c
+19-371 files

HardenedBSD/src c479817usr.bin/diff pr.h

diff: remove useless include as kevent is not used anymore

MFC After:      3 days
DeltaFile
+0-2usr.bin/diff/pr.h
+0-21 files

HardenedBSD/src 0ec58e7usr.bin/diff pr.c pr.h

diff: use pdwait(2) instead of homemade one

MFC After:      3 days
Reviewed by:    des
Differential Revision:  https://reviews.freebsd.org/D55053
DeltaFile
+6-13usr.bin/diff/pr.c
+1-2usr.bin/diff/pr.h
+7-152 files