FreeBSD/src b8e171bshare/misc organization.dot

organization.dot: Fix typos

MFC after:      3 days

(cherry picked from commit 806bd5e00658e66a5625397335cafa4748112f14)
DeltaFile
+2-2share/misc/organization.dot
+2-21 files

FreeBSD/src d7deb68sys/arm/arm gic.c

arm: Fix a typo in a KASSERT message

- s/resoure/resource/

(cherry picked from commit 178cf4b9db4bb6726e845b10923788cf4e7a5ef0)
DeltaFile
+1-1sys/arm/arm/gic.c
+1-11 files

FreeBSD/src d94c239sys/arm/freescale/vybrid vf_sai.c

freescale: Fix a typo in a source code comment

- s/cant/can't/

(cherry picked from commit 26f6c148bce2d6734a07ea621616724f1e76e4fd)
DeltaFile
+1-1sys/arm/freescale/vybrid/vf_sai.c
+1-11 files

FreeBSD/src 87f5c26sys/geom geom_subr.c

geom(4): Fix a typo in a source code comment

- s/cant/can't/

(cherry picked from commit c0a01ee83d3d4749ac9e7e46d8d47b991c65537f)
DeltaFile
+1-1sys/geom/geom_subr.c
+1-11 files

FreeBSD/src 656ec7bsys/kern uipc_domain.c

uipc_domain: Fix a typo in a source code comment

- s/cant/can't/

(cherry picked from commit 9576fc16ca6cb360e085735dfaf891ae6d7f6181)
DeltaFile
+1-1sys/kern/uipc_domain.c
+1-11 files

FreeBSD/src e03c9c3sys/arm/arm gic.c

arm: Fix a typo in a KASSERT message

- s/resoure/resource/

(cherry picked from commit 178cf4b9db4bb6726e845b10923788cf4e7a5ef0)
DeltaFile
+1-1sys/arm/arm/gic.c
+1-11 files

FreeBSD/src c64f93bsys/arm/freescale/vybrid vf_sai.c

freescale: Fix a typo in a source code comment

- s/cant/can't/

(cherry picked from commit 26f6c148bce2d6734a07ea621616724f1e76e4fd)
DeltaFile
+1-1sys/arm/freescale/vybrid/vf_sai.c
+1-11 files

FreeBSD/src 67e24edsys/geom geom_subr.c

geom(4): Fix a typo in a source code comment

- s/cant/can't/

(cherry picked from commit c0a01ee83d3d4749ac9e7e46d8d47b991c65537f)
DeltaFile
+1-1sys/geom/geom_subr.c
+1-11 files

FreeBSD/src 64dfe0asys/kern uipc_domain.c

uipc_domain: Fix a typo in a source code comment

- s/cant/can't/

(cherry picked from commit 9576fc16ca6cb360e085735dfaf891ae6d7f6181)
DeltaFile
+1-1sys/kern/uipc_domain.c
+1-11 files

FreeBSD/src a6ee6b6sys/arm/arm gic.c

arm: Fix a typo in a KASSERT message

- s/resoure/resource/

(cherry picked from commit 178cf4b9db4bb6726e845b10923788cf4e7a5ef0)
DeltaFile
+1-1sys/arm/arm/gic.c
+1-11 files

FreeBSD/src 87cf198sys/arm/freescale/vybrid vf_sai.c

freescale: Fix a typo in a source code comment

- s/cant/can't/

(cherry picked from commit 26f6c148bce2d6734a07ea621616724f1e76e4fd)
DeltaFile
+1-1sys/arm/freescale/vybrid/vf_sai.c
+1-11 files

FreeBSD/src 956a99bsys/geom geom_subr.c

geom(4): Fix a typo in a source code comment

- s/cant/can't/

(cherry picked from commit c0a01ee83d3d4749ac9e7e46d8d47b991c65537f)
DeltaFile
+1-1sys/geom/geom_subr.c
+1-11 files

FreeBSD/src 3b83e01sys/kern uipc_domain.c

uipc_domain: Fix a typo in a source code comment

- s/cant/can't/

(cherry picked from commit 9576fc16ca6cb360e085735dfaf891ae6d7f6181)
DeltaFile
+1-1sys/kern/uipc_domain.c
+1-11 files

FreeBSD/src a0d7d68crypto/heimdal/lib/hdb hdb-ldap.c

heimdal: Fix compiling hdb ldap as a module

Fix build when WITH_OPENLDAP defined.

PR:             278430
Obtained from:  Upstream c1c7da7f79
DeltaFile
+6-3crypto/heimdal/lib/hdb/hdb-ldap.c
+6-31 files

FreeBSD/src 9e248b7libexec/rc rc.conf, libexec/rc/rc.d kdc

kdc: Add restart option

Add a new kdc_restart rc variable that manages kdc (or krb5kdc) under
daemon(8). This automatically restarts the kdc should it fail, i.e.
when it's configured to use LDAP as a backend and cannot connect to its
LDAP directory.

Set kdc_restart="YES" to auto restart kdc on abnormal termination.

Set kdc_restart_delay="N" to the number of seconds to delay before
restarting the kdc. The daemon(8) default seconds applies when not set.

Reported by:            Lexi Winter <lexi.freebsd at le-fay.org>
PR:                     278395
Differential Revision:  https://reviews.freebsd.org/D44898
DeltaFile
+27-2libexec/rc/rc.d/kdc
+2-0libexec/rc/rc.conf
+29-22 files

FreeBSD/src cae3362contrib/less ch.c

MFV: less: Do not trust st_size if it equals zero

This is a smaller version of upstream
1fafd968b48e5cea6c85f126d77071a8de707a55 to address the
issue that less not being able to operate on files
residing in pseudo-filesystems that advertize a zero
size value.

PR:             bin/276133
MFC after:      3 days
DeltaFile
+2-11contrib/less/ch.c
+2-111 files

FreeBSD/src e8ec4b5. ch.c

less: Do not trust st_size if it equals zero
DeltaFile
+2-11ch.c
+2-111 files

FreeBSD/src 835b1bdrelease/scripts pkg-stage.sh

release: Use the ABI of the target release to fetch packages

- Point --rootdir at the installed destdir in the dvd tree.  This
  causes pkg to determine the ABI from the installed destdir instead
  of the host's binaries.  Previously the result was that packages
  for the host's ABI were always downloaded breaking cross-releases
  (e.g. arm64 releases built on an amd64 host included amd64
  packages on the DVD ISO image rather than arm64 packages).  This
  also handles version mismatches, and I tested this by cross-building
  a 15.x arm64 release on a 14.x amd64 host.

- As a result, pkg now does a chdir(3) to the rootdir before running,
  so the -o argument to fetch needs to be updated to be relative to
  rootdir instead of the CWD as make runs.

- Add a new ROOTDIR variable to limit references to "dvd" to one
  place.  Ideally ROOTDIR would be an argument to this script so
  that it didn't really know about the dvd layout at all.


    [12 lines not shown]
DeltaFile
+11-12release/scripts/pkg-stage.sh
+11-121 files

FreeBSD/src 6b8ca8crelease Makefile.ec2 Makefile.gce

release: Support r/o /usr/ports for cloudware

Set WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles when building tools
needed for uploading cloudware images.

While I'm here, adjust the bsdec2-image-upload build target to match
the style used by the Azure/GCE/Vagrant Makefiles.

MFC after:      3 days

(cherry picked from commit 6c87aed39c3053cd338c1ec18fba5b1d773beca9)
DeltaFile
+10-6release/Makefile.ec2
+6-2release/Makefile.gce
+3-1release/Makefile.azure
+3-1release/Makefile.vagrant
+22-104 files

FreeBSD/src 1b0e859release Makefile.vm

release/Makefile.vm: Support read-only ports tree

Build qemu (if needed) with WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles
so that we can have a read-only /usr/ports and don't contaminate it.  This
became an issue when I enabled parallel release building, since one image
might be creating its ports.txz file at the same time as we're building
qemu as a prerequisite for building another image.

MFC after:      5 days

(cherry picked from commit 6f454c211b295ad13e80fc5b858efc9bad33e33b)
DeltaFile
+4-1release/Makefile.vm
+4-11 files

FreeBSD/src 5609315usr.sbin/bsdinstall/distfetch distfetch.c

Revert "bsdinstall/distfetch.c: check environment variables before downloading and handle memory allocation errors"

This reverts commit 91bdebc958bb0da03f604bad19f99e3b10e96ac7. It wasn't
as ready as I thought
DeltaFile
+10-23usr.sbin/bsdinstall/distfetch/distfetch.c
+10-231 files

FreeBSD/src feabaf8sbin/swapon swaplinux.c swapon.c

Revert "swapon: Do not overwrite Linux swap header"

This reverts commit cf04a7775a4e8ff6fd28c768be9daa3d83dd382e.This is
broken on armv7, and closer scrutiny of the reviews shows I was in error
when I thought it was ready.
DeltaFile
+0-66sbin/swapon/swaplinux.c
+1-53sbin/swapon/swapon.c
+0-5sbin/swapon/extern.h
+0-2sbin/swapon/Makefile
+1-1264 files

FreeBSD/src f239db4usr.bin/ktrace ktrace.h ktrace.1

ktrace: Remove CAPFAIL from default trace points

The CAPFAIL tracepoint was recently extended to report ECAPMODE
capability  violations for processes that do not enter capability mode.
This allows developers that are interested in Capsicumizing their
programs to determine where violations are being raised.

Previously, CAPFAIL only produced output for processes using Capsicum(4)
capabilties. Thus, most ktrace users never received log output from the
trace point. With the recent changes, this is no longer the case.

Having this trace point enabled by default will produce output for all
processes that use syscalls that are not permitted in capability mode.
This may lead to confusion for users that are not familiar with the
feature. Remove KTRFAC_CAPFAIL from ktrace's default points to avoid
this.

Approved by:    markj (mentor)
Reviewed by:    markj

    [2 lines not shown]
DeltaFile
+3-4usr.bin/ktrace/ktrace.h
+1-1usr.bin/ktrace/ktrace.1
+4-52 files

FreeBSD/src 4f2ada0usr.bin/ktrace ktrace.1

ktrace: Describe CAPFAIL trace point in man page

Update the ktrace(1) man page to describe the recently improved
capability failure tracing.

Approved by:    markj (mentor)
Reviewed by:    markj
MFC after:      1 month
Differential Revision:  https://reviews.freebsd.org/D44886
DeltaFile
+18-2usr.bin/ktrace/ktrace.1
+18-21 files

FreeBSD/src a8acc2bsys/kern uipc_socket.c

sockets: inherit SO_ACCEPTFILTER from listener to child

This is crucial for operation of accept_filter(9).  See added comment.

Fixes:  d29b95ecc0d049406d27a6c11939d40a46658733
DeltaFile
+6-2sys/kern/uipc_socket.c
+6-21 files

FreeBSD/src 91bdebcusr.sbin/bsdinstall/distfetch distfetch.c

bsdinstall/distfetch.c: check environment variables before downloading and handle memory allocation errors

1. Currently, distfetch checks environment variables existence
when it will use them or in a case (in chdir()) it doesn't check
at all. As they are necessary to set before doing anything with
it, check them, if they set or not, before proceeding any further.
This also avoids extra cleaning when that environment variable
isn't set.

2. Handle memory allocation error in malloc(PATH_MAX) and replace
(sizeof const char *) with (sizeof char *). Both are similar and
const doesn't have a size.

3. Indent the error message a bit in chdir().

Signed-off-by: rilysh <nightquick at proton.me>
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1071
DeltaFile
+23-10usr.sbin/bsdinstall/distfetch/distfetch.c
+23-101 files

FreeBSD/src 0d4ad64sys/contrib/openzfs/module/os/linux/zfs abd_os.c, sys/contrib/openzfs/module/zfs dbuf.c zio_inject.c

zfs: merge openzfs/zfs at 1f940de07

Notable upstream pull request merges:
 #16038 1f940de07 L2ARC: Cleanup buffer re-compression
 #16093 c183d164a Parallel pool import
 #16094 cd3e6b4f4 Add zfetch stats in arcstats
 #16103 35bf25848 Fix: FreeBSD Arm64 does not build currently
 #16104 4036b8d02 Refactor dbuf_read() for safer decryption
 #16110 9f83eec03 Handle FLUSH errors as "expected"
 #16117 c346068e5 zfs get: add '-t fs' and '-t vol' options

Obtained from:  OpenZFS
OpenZFS commit: 1f940de07224c2068e7c721222b1f3a519820ca9
DeltaFile
+108-114sys/contrib/openzfs/module/zfs/dbuf.c
+165-0sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_parallel_admin.ksh
+129-9sys/contrib/openzfs/module/zfs/zio_inject.c
+137-0sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_parallel_pos.ksh
+130-0sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_parallel_neg.ksh
+74-46sys/contrib/openzfs/module/os/linux/zfs/abd_os.c
+743-16934 files not shown
+1,145-30840 files

FreeBSD/src cf04a77sbin/swapon swaplinux.c swapon.c

swapon: Do not overwrite Linux swap header

Reviewed by: imp, jhb
Pull Request: https://github.com/freebsd/freebsd-src/pull/1084
DeltaFile
+66-0sbin/swapon/swaplinux.c
+53-1sbin/swapon/swapon.c
+5-0sbin/swapon/extern.h
+2-0sbin/swapon/Makefile
+126-14 files

FreeBSD/src 4f223e0release/tools vmimage.subr

release: Change vmimage EFI GPT label

This matches the default bsdinstall nomenclature.

PR: 278480
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1188
DeltaFile
+2-2release/tools/vmimage.subr
+2-21 files

FreeBSD/src 14e3f2dtools/tools/nanobsd/embedded common

nanobsd: Set a GPT label for EFI and cfg partitions

Use efiboot0 for the EFI partition, the nomenclature efiboot + #index
was taken from bsdinstall (zfsboot).

Use cfg for the cfg partition.  Poudriere firmware images are already
using this label.

PR: 278480
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1187
DeltaFile
+2-2tools/tools/nanobsd/embedded/common
+2-21 files