Don't package /var/db/locate.database

... or install an empty file.

The locate database is a mutable working file, and unsuitable to be
managed by pkg(8). locate(1) copes gracefully with the absen

Don't package /var/db/locate.database

... or install an empty file.

The locate database is a mutable working file, and unsuitable to be
managed by pkg(8). locate(1) copes gracefully with the absence of
this file. Running /etc/periodic/weekly/310.locate will create the
locate database with the correct ownership and permissions.

Having the locate.database file as part of the FreeBSD-runtime package
means it gets zeroed if ever that package gets updated, which is
excessive, given that updating packages will typically only change a
relatively small number of the _filenames_ on the system -- unlike the
file contents. Plus it always causes it to flag as modified when
verifying checksums, but /var/db/locate.database is expected to be
modified by the user.

MFC after: 1 week
Reviewed by: manu
Differential Revision: https://reviews.freebsd.org/D45384

(cherry picked from commit 4354163e5fe8e180f62b892cdc3e51e3d7e4706f)

show more ...

pkgbase: separate /etc/mail/aliases from the sendmail package

move /etc/aliases and /etc/mail/aliases into the runtime package
this file is used by both sendmail and dma.

While here mark this file

pkgbase: separate /etc/mail/aliases from the sendmail package

move /etc/aliases and /etc/mail/aliases into the runtime package
this file is used by both sendmail and dma.

While here mark this file as a config file so 3way merge is performed

(cherry picked from commit 8cd7841d84356adb91450e3daf2c25454a102221)

show more ...

Proactively remove /usr/lib/kgdb file that became a directory

This was already handled in ObsoleteFiles.inc (see the 20201215 entry),
but some people never run "make delete-old", or want to upgrade

Proactively remove /usr/lib/kgdb file that became a directory

This was already handled in ObsoleteFiles.inc (see the 20201215 entry),
but some people never run "make delete-old", or want to upgrade directly
from a revision that still had the file to the most recent revision.

They would then encounter a failure during installworld, similar to:

install: /usr/libexec/kgdb exists but is not a directory

Therefore, clean it up in the distrib-cleanup phase, similar to the
earlier instances of libc++ header files that became a directory.

MFC after: 3 days

(cherry picked from commit e368e9b756772264acdbc11f3cc1d223bcd48dee)

show more ...

Proactively remove libc++ __tuple header file that became a directory

This was already handled in ObsoleteFiles.inc (see the 20230622 entry),
but some people never run "make delete-old", or want to

Proactively remove libc++ __tuple header file that became a directory

This was already handled in ObsoleteFiles.inc (see the 20230622 entry),
but some people never run "make delete-old", or want to upgrade directly
from a revision that still had libc++ 15 to the most recent revision.

They would then encounter a failure during installworld, similar to:

install: target directory `/usr/include/c++/v1/__tuple/' does not exist

Therefore, clean it up in the distrib-cleanup phase, similar to the
earlier instance of the libc++ __string header file that became a
directory.

PR: 273753
MFC after: 1 month

(cherry picked from commit ca217224f17229570f40227893353ca10ae1dda1)

show more ...

Remove $FreeBSD$: one-line sh pattern

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

etc: Automatically generate BSD.lib${libcompat}.dist lists

Note that each libcompat still has its own file that must exist.

Reviewed by: brooks, jhb
Differential Revision: https://reviews.freebsd.o

etc: Automatically generate BSD.lib${libcompat}.dist lists

Note that each libcompat still has its own file that must exist.

Reviewed by: brooks, jhb
Differential Revision: https://reviews.freebsd.org/D41182

show more ...

etc: Don't create stray directories in NO_ROOT distrib-dirs

The loop above is responsible for creating the actual directories,
whilst this one is just responsible for creating the corresponding
META

etc: Don't create stray directories in NO_ROOT distrib-dirs

The loop above is responsible for creating the actual directories,
whilst this one is just responsible for creating the corresponding
METALOG. Since DESTDIR already includes DISTBASE, this results in
creating a second set of roots (one per MTREES entry) within DISTBASE
whenever DISTBASE is non-empty, such as base/base, base/base/var,
base/base/usr, etc. in the distributeworld case. This is purely cosmetic
though as they won't appear in the METALOG.

show more ...

rc.d: Generate machine-id from hostid_save

rc.d/hostid_save saves a UUID generated by rc.d/hostid in /etc/hostid.
Store the same UUID, without hyphens, in /etc/machine-id. The hypĥens
are removed w

rc.d: Generate machine-id from hostid_save

rc.d/hostid_save saves a UUID generated by rc.d/hostid in /etc/hostid.
Store the same UUID, without hyphens, in /etc/machine-id. The hypĥens
are removed with a shell function because hostid_save runs before file
systems are mounted so other tools may not be available yet.

This eliminates some duplication between hostid and machine-id and for
virtual machines machine-id now contains the UUID configured in the
hypervisor like it does on Linux.

Reviewed by: delphij
Discussed with: bapt
MFC after: 3 days
Differential Revision: https://reviews.freebsd.org/D38811

show more ...

Add new rc: machine_id to generate /etc/machine-id

This new default-enabled rc will generate a /etc/machine-id file if it
does not exist, and pre-fill it with a newly generated UUID of version 4
[2]

Add new rc: machine_id to generate /etc/machine-id

This new default-enabled rc will generate a /etc/machine-id file if it
does not exist, and pre-fill it with a newly generated UUID of version 4
[2].

The file is generated in /var/db/machine-id and symlinked to
/etc/machine-id to allow for read-only root partitions.

This file is amongst other things used by libraries like GLib.

Bump FreeBSD version 1400076 to be able to easily add support for older
version of FreeBSD via a package.

[1] Linux machine-id(5): https://www.man7.org/linux/man-pages/man5/machine-id.5.html
[2] f176fe8e7f638e585afcd2f4dd52a522c4648f63

Approved by: bapt
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D37722

show more ...

Fix mergemaster(8) breakage in the 6ad780caa.

Split out termcap.small generation into its own Makefile under
etc/termcap, so it's properly executed by the underlying command:

make 'SUBDIR_OVERRID

Fix mergemaster(8) breakage in the 6ad780caa.

Split out termcap.small generation into its own Makefile under
etc/termcap, so it's properly executed by the underlying command:

make 'SUBDIR_OVERRIDE=etc' everything

Reported by: gbe
MFC after: 1 month

show more ...

etc: Fix distrib-dirs to not rely on a BSDism

FreeBSD and macOS have a test that treats == as an alias for =, but
Linux tends to use GNU coreutils (when not a builtin) which does not.
Use the standa

etc: Fix distrib-dirs to not rely on a BSDism

FreeBSD and macOS have a test that treats == as an alias for =, but
Linux tends to use GNU coreutils (when not a builtin) which does not.
Use the standard syntax instead for compatibility.

Obtained from: CheriBSD
Differential Revision: https://reviews.freebsd.org/D35811

show more ...

libsoft: Remove support for installing libsoft

Remove the infrasturcture needed to create the libsoft directories.

Sponsored by: Netflix

pkgbase: Put the last sendmail files in the sendmail package

Differential Revision: https://reviews.freebsd.org/D30757
Sponsored by: Diablotin Systems

pkgbase: resolve mailer.conf conflict WITHOUT_SENDMAIL

When WITHOUT_SENDMAIL is set, we end up with two different mailer.conf that
conflict, and hilarity ensues. There's currently three different pl

pkgbase: resolve mailer.conf conflict WITHOUT_SENDMAIL

When WITHOUT_SENDMAIL is set, we end up with two different mailer.conf that
conflict, and hilarity ensues. There's currently three different places that
we might install mailer.conf:

- ^/etc/Makefile (package=runtime, contingent on MK_MAIL != no)
- ^/libexec/dma/dmagent/Makefile (package=dma, contingent on MK_SENDMAIL !=
no)
- ^/usr.sbin/mailwrapper/Makefile (package=utilities, contingent on
not-installed)

The mailwrapper installation will effectively never happen because the ^/etc
one will first.

This patch simplifies the whole situation; remove the ^/etc/Makefile version
and install it primarily in mailwrapper if MK_MAILWRAPPER != "no". The
scenarios covered in mailwrapper are:

- sendmail(8) is installed, dma(8) may or may not be installed
- neither sendmail(8) nor dma(8) is installed

In the first scenario, sendmail(8) is dominant so we can go ahead and
install the version in ^/etc/mail. In the unlisted scenario, sendmail(8) is
not installed but dma(8) is, we'll let ^/libexec/dma/dmagent do the
installation. In the second listed scenario, we still want to install an
example mailer.conf so just install the base sendmail(8) version.

Reviewed by: bapt
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D24924

show more ...

Normalize deployment tools usage and definitions by putting into one place
instead of sprinkling them out over many disjoint files. This is a follow-up
to achieve the same goal in an incomplete rev.3

Normalize deployment tools usage and definitions by putting into one place
instead of sprinkling them out over many disjoint files. This is a follow-up
to achieve the same goal in an incomplete rev.348521.

Approved by: imp
MFC after: 1 month
Differential Revision: https://reviews.freebsd.org/D20520

show more ...

pkgbase: Move device.hints from the runtime to the bootloader package

Also mark it as config file so if a user changes this file pkg will attempt
to merge the new file upon an update.
device.hints i

pkgbase: Move device.hints from the runtime to the bootloader package

Also mark it as config file so if a user changes this file pkg will attempt
to merge the new file upon an update.
device.hints is neither related to runtime or loader but it make more sense
to have it in loader in case some user delete /boot/ and wants to recreate it,
now only two packages are required FreeBSD-bootloader and the kernel package.
While here change where we override the package for files installed in /boot,
this allow us to keep other tags (such as config).

Reported by: pizzamig
Reviewed by: bapt pizzamig emaste
Differential Revision: https://reviews.freebsd.org/D24159

show more ...

Tag NLS aliases with pkgbase package

POSIX and en_US.US_ASCII are aliases (symlinks) to the C locale. They were
not previously tagged with a pkgbase pacakge. Add the tag so that they are
handled c

Tag NLS aliases with pkgbase package

POSIX and en_US.US_ASCII are aliases (symlinks) to the C locale. They were
not previously tagged with a pkgbase pacakge. Add the tag so that they are
handled correctly on pkgbase-installed/updated systems.

[This is r356990 reapplied with a corrected commit message.]

Discussed with: manu

show more ...

revert r356990 to reapply with correct commit message

Requested by: rgrimes

Tag NLS aliases with package=runtime

POSIX and en_US.US_ASCII are aliases (symlinks) to the C locale. They were
not previously tagged with a pkgbase pacakge. Add the tag so that they are
handled c

Tag NLS aliases with package=runtime

POSIX and en_US.US_ASCII are aliases (symlinks) to the C locale. They were
not previously tagged with a pkgbase pacakge. Add the tag so that they are
handled correctly on pkgbase-installed/updated systems.

Discussed with: manu

show more ...

Tag os-release symlink with package=runtime

This ensures it gets into pkgbase-(installed/updated) systems.

Create /etc/os-release file.

Each boot, regenerate /var/run/os-release based on the currently running
system. Create a /etc/os-release symlink pointing to this file (so that this
doesn't create a ne

Create /etc/os-release file.

Each boot, regenerate /var/run/os-release based on the currently running
system. Create a /etc/os-release symlink pointing to this file (so that this
doesn't create a new reason /etc can not be mounted read-only).

This is compatible with what other systems do and is what the sysutil/os-release
port attempted to do, but in an incomplete way. Linux, Solaris and DragonFly all
implement this natively as well. The complete standard can be found at
https://www.freedesktop.org/software/systemd/man/os-release.html

Moving this to the base solves both the non-standard location problem with the
port, as well as the lack of update of this file on system update.

Bump __FreeBSD_version to 1300060

PR: 238953
Differential Revision: https://reviews.freebsd.org/D22271

show more ...

pkgbase: Add some tags to files installed in distribution target

Add the MK_MAIL dependant file to the runtime package as well as the
MK_KERBEROS ones the empty locate database, the FreeBSD copyrigh

pkgbase: Add some tags to files installed in distribution target

Add the MK_MAIL dependant file to the runtime package as well as the
MK_KERBEROS ones the empty locate database, the FreeBSD copyright file
and the GENERIC.hints.
Tag the unbound link from /etc to /var to belong in the unbound package.

Reviewed by: bapt
MFC after: 1 month
Differential Revision: https://reviews.freebsd.org/D20607

show more ...

Put back MTREE_CMD here for now. Doh, not my day, perhaps.

Reported by: markj, mav

Leave mtree hardcoded for now. Reverting partially 348521 and also
the followup stopgap change, because I don't think it's a correct. I still
need to figure out where to stick it in. In cannot be in

Leave mtree hardcoded for now. Reverting partially 348521 and also
the followup stopgap change, because I don't think it's a correct. I still
need to figure out where to stick it in. In cannot be in Makefile.inc1
and it cannot be in etc/Makefile from the looks of it to avoid
chicken-and-egg problem.

show more ...

Fix several places where tool name has been hardcoded:

install -> ${INSTALL}
mtree -> ${MTREE_CMD}
services_mkdb -> ${SERVICES_MKDB_CMD}
cap_mkdb -> ${CAP_MKDB_CMD}
pwd_mkdb -> $

Fix several places where tool name has been hardcoded:

install -> ${INSTALL}
mtree -> ${MTREE_CMD}
services_mkdb -> ${SERVICES_MKDB_CMD}
cap_mkdb -> ${CAP_MKDB_CMD}
pwd_mkdb -> ${PWD_MKDB_CMD}
kldxref -> ${KLDXREF_CMD}

If you do custom FreeBSD builds you may want to override those
in some cases.

Sponsored by: Sippy Software, Inc.

show more ...