FreeBSD/src 4cb65fdusr.bin/wc wc.1 wc.c

wc: Fix usage and manual SYNOPSIS + nits

The -c and -m flags are mututally exclusive. Also minor manual fixes:

+ Angle quotes do not work in prose, use double quote matching extant
+ Align manual page options list
+ Tag SPDX license identifier for manual

PR:             292408
MFC after:      3 days
DeltaFile
+8-4usr.bin/wc/wc.1
+1-1usr.bin/wc/wc.c
+9-52 files

FreeBSD/src 202dd86sys/dev/bnxt/bnxt_en if_bnxt.c

bnxt: fix i2c read to allow access to different addresses

Allow reading of i2c addresses other than A0. A0 does provide most
information, but doesn't provide things like module temps, and optical
signal levels.

Sponsored by: Netflix
Reviewed by: sumit.saxena_broadcom.com
Differential Revision: https://reviews.freebsd.org/D54590
MFC after: 3 days

(cherry picked from commit b72cb305899ed30daf103b92818c199ccfc52378)
DeltaFile
+1-1sys/dev/bnxt/bnxt_en/if_bnxt.c
+1-11 files

FreeBSD/src ef8c912share/man/man4 iflib.4

iflib: document new sysctls

Document the new tx related sysctls I've added to iflib in the
last few months:  tx_reclaim_ticks & tx_reclaim_thresh

Sponsored by: Netflix
Reviewed by: ziaee
Differential Revision: https://reviews.freebsd.org/D54564
MFC after: 3 days

(cherry picked from commit 83e6f0d7807b4ebc74bc58e6f03adde56db942bf)
DeltaFile
+10-0share/man/man4/iflib.4
+10-01 files

FreeBSD/src ced7f29libexec/rc rc.conf, libexec/rc/rc.d os-release

rc: Add os-release URL rc.conf variables

Add rc.conf defaults for the os-release URL settings introduced in the
os-release rc.d script. This makes it easier for downstream integrators
and appliances to override the URLs via rc.conf instead of patching the
script.

The following variables are added to libexec/rc/rc.conf:
- osrelease_home_url
- osrelease_documentation_url
- osrelease_support_url
- osrelease_bug_report_url

These correspond to HOME_URL, DOCUMENTATION_URL, SUPPORT_URL, and
BUG_REPORT_URL in the generated os-release file.

Signed-off-by: NVSRahul <nvsrahul at hotmail.com>
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1961
DeltaFile
+8-7libexec/rc/rc.d/os-release
+4-0libexec/rc/rc.conf
+12-72 files

FreeBSD/src babc4d8libexec/rc/rc.d os-release

rc: Improve os-release URLs and add rc.conf overrides

Add DOCUMENTATION_URL and SUPPORT_URL to the generated /var/run/os-release
file, and route the existing URLs through rc.conf-configurable variables:

  - osrelease_home_url
  - osrelease_documentation_url
  - osrelease_support_url
  - osrelease_bug_report_url

This allows downstreams and appliance vendors to customize these URLs
without patching the base script, while providing useful defaults for
stock FreeBSD installations.

Tested:
  - sh -n libexec/rc/rc.d/os-release
  - (No FreeBSD host available; not runtime-tested yet)

Signed-off-by: NVSRahul <nvsrahul at hotmail.com>

    [2 lines not shown]
DeltaFile
+8-2libexec/rc/rc.d/os-release
+8-21 files

FreeBSD/src 3f2f3c5share/man/man5 src.conf.5

src.conf.5: Regen after addition of MK_SOUND

A description for WITHOUT_SOUND is still missing though.
DeltaFile
+7-1share/man/man5/src.conf.5
+7-11 files

FreeBSD/src 215d16ecrypto/openssh FREEBSD-upgrade

openssh: Add detail on client side VersionAddendum

FreeBSD introduced VersionAddendum for the server as a local change in
2001 in commit 933ca70f8f88 and later extended it to the client in
commit 9e2cbe04ff4f.

In 2012 upstream added support for server VersionAddendum, in commit
23528816dc10.  They did not add client support.

We removed the client support from main in commit bffe60ead024 ("ssh:
retire client VersionAddendum").

As of the 10.0p2 release upstream has added client-side VersionAddendum.
Make note of this in FREEBSD-upgrade's patches section.

Sponsored by:   The FreeBSD Foundation

(cherry picked from commit b55439338dc40d1954fd37281d48786148483190)
DeltaFile
+9-2crypto/openssh/FREEBSD-upgrade
+9-21 files

FreeBSD/src 82d5ceelib/libkldelf ef_mips.c Makefile, sys/cddl/contrib/opensolaris/uts/mips/dtrace fasttrap_isa.c

mips: remove mips leftovers

Signed-off-by: Minsoo Choo <minsoochoo0122 at proton.me>
Pull-request: https://github.com/freebsd/freebsd-src/pull/1909
(cherry picked from commit 6c6e00b7f16f3bda1b56da6a57d65ff6e26ae3e7)
DeltaFile
+0-116lib/libkldelf/ef_mips.c
+0-48sys/cddl/contrib/opensolaris/uts/mips/sys/fasttrap_isa.h
+0-30sys/cddl/contrib/opensolaris/uts/mips/dtrace/fasttrap_isa.c
+0-1lib/libkldelf/Makefile
+0-1usr.sbin/kldxref/Makefile
+0-1965 files

FreeBSD/src dac74b2usr.sbin/bsdinstall/scripts jail auto

bsdinstall: Drop "Technology preview" from package sets

And refer to dist sets as "legacy."  This matches our expectation for
FreeBSD 16.0.

Reviewed by:    cperciva
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D54156
DeltaFile
+2-2usr.sbin/bsdinstall/scripts/jail
+2-2usr.sbin/bsdinstall/scripts/auto
+4-42 files

FreeBSD/src a551b05tests/sys/fs/tarfs tarfs_test.sh

tarfs: tests: Increase timeout (again)

Bump the timeout value (a little more), to avoid cutoff on emulated
architectures on ci.freebsd.org.

Reported by:    Jenkins
Fixes:          47015e454661 ("tests: Increase timeout")
MFC after:      3 days
DeltaFile
+1-1tests/sys/fs/tarfs/tarfs_test.sh
+1-11 files

FreeBSD/src 237ce0a. RELNOTES

RELNOTES: Add entry for 256d05617c71
DeltaFile
+4-0RELNOTES
+4-01 files

FreeBSD/src a7d9d1bsys/contrib/openzfs/module/icp/asm-x86_64/modes aesni-gcm-x86_64.S ghash-x86_64.S

zfs: emit .note.GNU-stack section for all ELF targets

On FreeBSD, linking the zfs kernel module with binutils ld 2.44 shows
the following warning:

    ld: warning: aesni-gcm-avx2-vaes.o: missing .note.GNU-stack section implies executable stack
    ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker

Some of the `.S` files under `module/icp/asm-x86_64/modes` check whether
to emit the `.note.GNU-stack` section using:

    #if defined(__linux__) && defined(__ELF__)

We could add `&& defined(__FreeBSD__)` to the test, but since all other
`.S` files in the OpenZFS tree use:

    #ifdef __ELF__

it would seem more logical to use that instead. Any recent ELF platform

    [7 lines not shown]
DeltaFile
+1-1sys/contrib/openzfs/module/icp/asm-x86_64/modes/aesni-gcm-x86_64.S
+1-1sys/contrib/openzfs/module/icp/asm-x86_64/modes/ghash-x86_64.S
+2-22 files

FreeBSD/src 0e80562sys/contrib/openzfs/module/icp/asm-x86_64/modes aesni-gcm-x86_64.S ghash-x86_64.S

zfs: emit .note.GNU-stack section for all ELF targets

On FreeBSD, linking the zfs kernel module with binutils ld 2.44 shows
the following warning:

    ld: warning: aesni-gcm-avx2-vaes.o: missing .note.GNU-stack section implies executable stack
    ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker

Some of the `.S` files under `module/icp/asm-x86_64/modes` check whether
to emit the `.note.GNU-stack` section using:

    #if defined(__linux__) && defined(__ELF__)

We could add `&& defined(__FreeBSD__)` to the test, but since all other
`.S` files in the OpenZFS tree use:

    #ifdef __ELF__

it would seem more logical to use that instead. Any recent ELF platform

    [7 lines not shown]
DeltaFile
+1-1sys/contrib/openzfs/module/icp/asm-x86_64/modes/aesni-gcm-x86_64.S
+1-1sys/contrib/openzfs/module/icp/asm-x86_64/modes/ghash-x86_64.S
+2-22 files

FreeBSD/src 74bb8b9sys/contrib/openzfs/module/icp/asm-x86_64/modes ghash-x86_64.S aesni-gcm-avx2-vaes.S

zfs: emit .note.GNU-stack section for all ELF targets

On FreeBSD, linking the zfs kernel module with binutils ld 2.44 shows
the following warning:

    ld: warning: aesni-gcm-avx2-vaes.o: missing .note.GNU-stack section implies executable stack
    ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker

Some of the `.S` files under `module/icp/asm-x86_64/modes` check whether
to emit the `.note.GNU-stack` section using:

    #if defined(__linux__) && defined(__ELF__)

We could add `&& defined(__FreeBSD__)` to the test, but since all other
`.S` files in the OpenZFS tree use:

    #ifdef __ELF__

it would seem more logical to use that instead. Any recent ELF platform

    [7 lines not shown]
DeltaFile
+1-1sys/contrib/openzfs/module/icp/asm-x86_64/modes/ghash-x86_64.S
+1-1sys/contrib/openzfs/module/icp/asm-x86_64/modes/aesni-gcm-avx2-vaes.S
+1-1sys/contrib/openzfs/module/icp/asm-x86_64/modes/aesni-gcm-x86_64.S
+3-33 files

FreeBSD/src 1971c31. RELNOTES

RELNOTES:  Revert back to commit hash in commit a3f28d70969c

inadvertently changed the commit hash to the commit on stable/15
DeltaFile
+1-1RELNOTES
+1-11 files

FreeBSD/src 8d87742. RELNOTES

RELNOTES:  Correct commit hash in commit ec98cb56861f
DeltaFile
+4-0RELNOTES
+4-01 files

FreeBSD/src 8591ee9stand/common gfx_fb.c

loader.efi: only use firmware provided Blt on GOP

gfx_state.tg_private points to a EFI_GRAPHICS_OUTPUT_PROTOCOL only when
using GOP.

The firmware provided Blt functions on UGA platforms have been observed
to not work on old MacBooks, and are likley hit or miss anyways as UGA
has been deprecated since 2006.

Reviewed by:    tsoome
PR:             291935
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54432

(cherry picked from commit 9595055ae7494997bb07b4aaed544f88ac4c5e7f)
DeltaFile
+5-2stand/common/gfx_fb.c
+5-21 files

FreeBSD/src b16ae77stand/efi/loader framebuffer.c

loader.efi: add stride & offset for MacBookPro3,1

Note that there are three variants of this MacBook. We only have the
stride and offset values for the 17" 1680x1050 model.

Reviewed by:    vexeduxr
Pull Request:   https://github.com/freebsd/freebsd-src/pull/1584

(cherry picked from commit be6ba97aaee762c2e5300834f1916ae5dfd5a0b9)
DeltaFile
+17-0stand/efi/loader/framebuffer.c
+17-01 files

FreeBSD/src f4e56d1stand/efi/loader framebuffer.c

loader.efi: probe for UGA if GOP isn't found

Probe for UGA instead of returning early if we can't find GOP.

Reviewed by:    tsoome
PR:             291935
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54431

(cherry picked from commit 5d85dde27b4769604fc108b89328607e70e767ed)
DeltaFile
+41-39stand/efi/loader/framebuffer.c
+41-391 files

FreeBSD/src da358dbsys/netgraph ng_tty.c

ng_tty: avoid the sign extention of char

When c is compared to sc->hotchar, both undergo integer promotion, which
can lead to c being sign extended. Fix this by casting c to an unsigned
char.

Reviewed by:    kevans
MFC after:      5 days
Differential Revision:  https://reviews.freebsd.org/D54544

(cherry picked from commit 9b2478f60bfda663c84b48e272a2293159e1b0a0)
DeltaFile
+2-1sys/netgraph/ng_tty.c
+2-11 files

FreeBSD/src 7f20404stand/efi/loader framebuffer.c

loader.efi: add stride & offset for MacBookPro3,1

Note that there are three variants of this MacBook. We only have the
stride and offset values for the 17" 1680x1050 model.

Reviewed by:    vexeduxr
Pull Request:   https://github.com/freebsd/freebsd-src/pull/1584

(cherry picked from commit be6ba97aaee762c2e5300834f1916ae5dfd5a0b9)
DeltaFile
+17-0stand/efi/loader/framebuffer.c
+17-01 files

FreeBSD/src 00d2b1bsys/netgraph ng_tty.c

ng_tty: avoid the sign extention of char

When c is compared to sc->hotchar, both undergo integer promotion, which
can lead to c being sign extended. Fix this by casting c to an unsigned
char.

Reviewed by:    kevans
MFC after:      5 days
Differential Revision:  https://reviews.freebsd.org/D54544

(cherry picked from commit 9b2478f60bfda663c84b48e272a2293159e1b0a0)
DeltaFile
+2-1sys/netgraph/ng_tty.c
+2-11 files

FreeBSD/src 6741fb1stand/common gfx_fb.c

loader.efi: only use firmware provided Blt on GOP

gfx_state.tg_private points to a EFI_GRAPHICS_OUTPUT_PROTOCOL only when
using GOP.

The firmware provided Blt functions on UGA platforms have been observed
to not work on old MacBooks, and are likley hit or miss anyways as UGA
has been deprecated since 2006.

Reviewed by:    tsoome
PR:             291935
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54432

(cherry picked from commit 9595055ae7494997bb07b4aaed544f88ac4c5e7f)
DeltaFile
+5-2stand/common/gfx_fb.c
+5-21 files

FreeBSD/src 4832232stand/efi/loader framebuffer.c

loader.efi: probe for UGA if GOP isn't found

Probe for UGA instead of returning early if we can't find GOP.

Reviewed by:    tsoome
PR:             291935
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54431

(cherry picked from commit 5d85dde27b4769604fc108b89328607e70e767ed)
DeltaFile
+41-39stand/efi/loader/framebuffer.c
+41-391 files

FreeBSD/src d3902bastand/common gfx_fb.c

loader.efi: only use firmware provided Blt on GOP

gfx_state.tg_private points to a EFI_GRAPHICS_OUTPUT_PROTOCOL only when
using GOP.

The firmware provided Blt functions on UGA platforms have been observed
to not work on old MacBooks, and are likley hit or miss anyways as UGA
has been deprecated since 2006.

Reviewed by:    tsoome
PR:             291935
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54432

(cherry picked from commit 9595055ae7494997bb07b4aaed544f88ac4c5e7f)
DeltaFile
+6-2stand/common/gfx_fb.c
+6-21 files

FreeBSD/src 5a9e2c5stand/efi/loader framebuffer.c

loader.efi: probe for UGA if GOP isn't found

Probe for UGA instead of returning early if we can't find GOP.

Reviewed by:    tsoome
PR:             291935
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54431

(cherry picked from commit 5d85dde27b4769604fc108b89328607e70e767ed)
DeltaFile
+41-39stand/efi/loader/framebuffer.c
+41-391 files

FreeBSD/src 60a85a5stand/efi/loader framebuffer.c

loader.efi: add stride & offset for MacBookPro3,1

Note that there are three variants of this MacBook. We only have the
stride and offset values for the 17" 1680x1050 model.

Reviewed by:    vexeduxr
Pull Request:   https://github.com/freebsd/freebsd-src/pull/1584

(cherry picked from commit be6ba97aaee762c2e5300834f1916ae5dfd5a0b9)
DeltaFile
+17-0stand/efi/loader/framebuffer.c
+17-01 files

FreeBSD/src c72aa34sys/netgraph ng_tty.c

ng_tty: avoid the sign extention of char

When c is compared to sc->hotchar, both undergo integer promotion, which
can lead to c being sign extended. Fix this by casting c to an unsigned
char.

Reviewed by:    kevans
MFC after:      5 days
Differential Revision:  https://reviews.freebsd.org/D54544

(cherry picked from commit 9b2478f60bfda663c84b48e272a2293159e1b0a0)
DeltaFile
+2-1sys/netgraph/ng_tty.c
+2-11 files

FreeBSD/src e25aedblib/libgeom geom_xml2tree.c

libgeom: Fix 32-bit gcc build

MFC after:      1 week
Fixes:          27894e20f140 ("libgeom: Fix segfault in 32-on-64 case")

(cherry picked from commit 17355cf50fcbd0d8ddb638e1f2fd5861b526edbe)
DeltaFile
+5-2lib/libgeom/geom_xml2tree.c
+5-21 files

FreeBSD/src 08e7bdalib/libgeom geom_xml2tree.c

libgeom: Fix segfault in 32-on-64 case

We were using strtoul() to parse object identifiers, which are kernel
pointers.  This works fine as long as the kernel and userland match,
but in a 32-bit libgeom on a 64-bit kernel this will return ULONG_MAX
for all objects, resulting in memory corruption when we later pick the
wrong object while resolving consumer-producer references.

MFC after:      1 week
PR:             292127
Reviewed by:    imp
Differential Revision:  https://reviews.freebsd.org/D54452

(cherry picked from commit 27894e20f140ee2729c14b589035870c8185b87d)
DeltaFile
+2-2lib/libgeom/geom_xml2tree.c
+2-21 files