BSD Commit Log Search

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master

release: Chase location of pkg repo databases

pkg used to store copies of upstream repository databases in
/var/db/pkg/repo-*.sqlite.  About a year ago this was moved to
/var/db/pkg/repos/*/, resulting in FreeBSD cloud images no longer
having those (unhelpful since they'll be long out of date before
the cloud images are launched) databases removed.

Remove the correct location, and hope that future pkg updates don't
break the base system again.

Sponsored by:   Amazon

(cherry picked from commit 078e8b34b13d6d0663661542eeac9007806fccdc)

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Merge branch 'freebsd/current/main' into hardened/current/master

release: Chase location of pkg repo databases

pkg used to store copies of upstream repository databases in
/var/db/pkg/repo-*.sqlite.  About a year ago this was moved to
/var/db/pkg/repos/*/, resulting in FreeBSD cloud images no longer
having those (unhelpful since they'll be long out of date before
the cloud images are launched) databases removed.

Remove the correct location, and hope that future pkg updates don't
break the base system again.

Sponsored by:   Amazon

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Merge branch 'freebsd/current/main' into hardened/current/master

release: Allow sudo -g anyone and sudo -u anyone -g anytwo

When only the user (ALL) is specified explicitly, and the group is
implied, only sudo -u works.  Specifying both the user and group, like
(ALL:ALL), is required to:

1. Use sudo -g by itself (with no -u user)
2. Use sudo -u and -g together, with a -g group that is different from
   the -u user's primary group

Obtained from:  https://github.com/sudo-project/sudo/commit/1d13533ea3cda05ec666c45c6c533b614fdd97aa
Reviewed by:    imp
Pull Request:   https://github.com/freebsd/freebsd-src/pull/835

release: Add the Ed25519 vagrant insecure key

Both insecure keys, RSA and Ed25519, are required.

Obtained from:  https://github.com/hashicorp/vagrant/commit/b40f6e5fdae1113518e9c92f96dfcd364b646ff9
Reviewed by:    imp
Pull Request:   https://github.com/freebsd/freebsd-src/pull/835

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

Conflicts:
        bin/cat/cat.c
        lib/libc/gen/auxv.3
        libexec/rc/rc.d/archdep
        share/man/man5/src.conf.5
        sys/amd64/amd64/elf_machdep.c
        sys/amd64/cloudabi64/cloudabi64_sysvec.c
        sys/amd64/linux/linux_sysvec.c
        sys/amd64/linux32/linux32_sysvec.c
        sys/arm/arm/elf_machdep.c
        sys/arm64/linux/linux_sysvec.c
        sys/compat/ia32/ia32_sysvec.c
        sys/i386/cloudabi32/cloudabi32_sysvec.c
        sys/i386/linux/imgact_linux.c
        sys/i386/linux/linux_sysvec.c
        sys/kern/imgact_aout.c
        sys/kern/kern_module.c

    [22 lines not shown]

Remove $FreeBSD$: one-line sh pattern

Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/

Similar commit in main:
(cherry picked from commit d0b2dbfa0ecf)

Merge remote-tracking branch 'internal/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        tools/build/options/WITH_OFED_EXTRA (deleted)
        usr.sbin/rpc.yppasswdd/Makefile (unresolved)

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

Conflicts:
        bin/cat/cat.c (unresolved)
        lib/csu/aarch64/crt1_c.c (unresolved)
        lib/csu/amd64/crt1_c.c (unresolved)
        lib/csu/i386/crt1_c.c (unresolved)
        lib/csu/powerpc64/crt1_c.c (unresolved)
        lib/csu/powerpc64/reloc.c (unresolved)
        lib/csu/riscv/crt1_c.c (unresolved)
        lib/libc/gen/auxv.3 (unresolved)
        lib/libcasper/services/cap_net/cap_net.3 (unresolved)
        sys/amd64/amd64/elf_machdep.c (unresolved)
        sys/amd64/include/sgxreg.h (deleted)
        sys/amd64/linux/linux_sysvec.c (unresolved)
        sys/amd64/linux32/linux32_sysvec.c (unresolved)
        sys/amd64/sgx/sgx.c (deleted)
        sys/amd64/sgx/sgx_linux.c (deleted)
        sys/amd64/sgx/sgxvar.h (deleted)

    [29 lines not shown]

Remove $FreeBSD$: one-line sh pattern

Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/

Merge remote-tracking branch 'freebsd/stable/13' into hardened/13-stable/master

release: allow VM_EXTRA_PACKAGES to be specified in the environment

This is useful for adding extra packages to the build of an AMI.
For example:
        env VM_EXTRA_PACKAGES="zsh" make -C release ec2ami

(cherry picked from commit 83952a5baa337cc257858feb4886d947ba1a60e3)

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        Makefile.inc1 (unresolved)
        libexec/rtld-elf/Makefile (unresolved)
        share/man/man5/src.conf.5 (unresolved)
        targets/pseudo/bootstrap-tools/Makefile (unresolved)

Merge branch 'freebsd/current/main' into hardened/current/master

release: allow VM_EXTRA_PACKAGES to be specified in the environment

This is useful for adding extra packages to the build of an AMI.
For example:
        env VM_EXTRA_PACKAGES="zsh" make -C release ec2ami

Approved by:    gjb
MFC after:      1 week
Sponsored by:   Rubicon Communications, LLC ("Netgate")

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        Makefile.inc1 (unresolved)
        share/man/man5/src.conf.5 (unresolved)
        targets/pseudo/bootstrap-tools/Makefile (unresolved)
        tools/build/options/WITH_OFED_EXTRA (deleted)

Merge branch 'freebsd/13-stable/main' into hardened/13-stable/master

* freebsd/13-stable/main:
  pass UNAME_r to fix building 14.x ports on 13.x
  release: fix VMSIZE following 1ca8842f3ad9
  release: do not set __MAKE_CONF and SRCCONF for the chroot build
  release: sync 'git count' logic with newvers.sh
  release.sh: Skip installing textproc/docproj when NODOC is set
  Add some regression tests for O_PATH and AT_EMPTY_PATH
  pmcstat: fix the usage message for -t
  pmcstat: set initial counter value to zero
  pmc_allocate(3): document the count argument

release: fix VMSIZE following 1ca8842f3ad9

truncate(1) is not case-sensitive with regard to setting the size
of a file.  makefs(8), however, does not honor upper-case values.
Update release-specific files and the release(7) manual page to
reflect this.

Submitted by:   ehem_freebsd_m5p.com (original)
Differential Review:    https://reviews.freebsd.org/D28979
Sponsored by:   Rubicon Communications, LLC ("Netgate")

(cherry picked from commit fa04db476201c4cad5f6a5f67da8f2ef1e1cdad3)

Merge branch 'freebsd/current/main' into hardened/current/master

* freebsd/current/main:
  mvebu_gpio: Multiple fixes.
  simple_mfd: switch to controllable locking for syscon provider.
  link_elf_obj: Handle init_array sections in KLDs
  Fix creating the early arm64 level 2 blocks
  Modernize geom_stats_snapshot_get
  release: sprinkle UNAME_r hacks following c883b6fd8ccd
  compress(1): warn about link handling
  release: fix VMSIZE following 1ca8842f3ad9
  Remove obsolete bc library and dc test files
  mq_open(2): Fix xref to mq_unlink(2)
  elftoolchain: stop leaving tempfiles on error

release: fix VMSIZE following 1ca8842f3ad9

truncate(1) is not case-sensitive with regard to setting the size
of a file.  makefs(8), however, does not honor upper-case values.
Update release-specific files and the release(7) manual page to
reflect this.

MFC with:       1ca8842f3ad9
Submitted by:   ehem_freebsd_m5p.com (original)
Differential Review:    https://reviews.freebsd.org/D28979
Sponsored by:   Rubicon Communications, LLC ("Netgate")

Merge branch 'hardened/current/master' into hardened/current/uninit-autoinit

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        Makefile.inc1 (unresolved)
        lib/csu/amd64/Makefile (unresolved)
        lib/csu/i386/Makefile (unresolved)
        share/man/man5/src.conf.5 (unresolved)

Merge branch 'freebsd/current/master' into hardened/current/master

* freebsd/current/master:
  Make struct ctl_be_lun first element of struct ctl_be_*_lun.
  Add an entry to Symbol.map for the rpctls_syscall added by r361599.
  Update the files created from the new syscalls.master from r361599.
  vt(4): Add support for `vidcontrol -C'
  MFV:  r361597
  Add a syscall for the nfs-over-tls daemons to use.
  fortune: remove warning about potentially offensive fortunes
  Fix boot on systems where NUMA domain 0 is unpopulated.
  Include the shells/bash port on Vagrant images, which prevents a shell issue during startup.
  Remove ctl_free_beio() LUN and ctl_io dependencies.

Merge branch 'freebsd/12-stable/master' into hardened/12-stable/master

* freebsd/12-stable/master:
  Include the shells/bash port on Vagrant images, which prevents a shell issue during startup.
  MFC r361313:

Include the shells/bash port on Vagrant images, which prevents
a shell issue during startup.

Approved by:    re (kib, insta-MFC)
PR:             245051
Sponsored by:   Rubicon Communications, LLC (netgate.com)

Include the shells/bash port on Vagrant images, which prevents
a shell issue during startup.

Approved by:    re (kib, insta-MFC)
PR:             245051
Sponsored by:   Rubicon Communications, LLC (netgate.com)