Commit graph

5723 commits

Author SHA1 Message Date
John Baldwin
8b664b8f0e cryptocheck: Don't treat OpenSSL errors as fatal
Abort the current test but keep running additional tests if OpenSSL
reports an error during a test.  This matches the behavior for other
tests such as an error from OCF.

Reviewed by:	markj
Sponsored by:	AFRL, DARPA
Differential Revision:	https://reviews.freebsd.org/D45279

(cherry picked from commit b0e7358bf8b9791aaaf38807c841953946b88785)
2024-11-30 08:55:57 -05:00
John Baldwin
5b0997fb61 cryptocheck: Don't test Chacha20-Poly1305 with an IV size of 8
OpenSSL 3.0+ doesn't support an IV size of 8 either for the Chacha20
stream cipher or the AEAD combination with Poly1305.  This did work
previously with OpenSSL 1.1.

Reviewed by:	markj
Sponsored by:	AFRL, DARPA
Differential Revision:	https://reviews.freebsd.org/D45280

(cherry picked from commit 4ebf794a08de04ebf1c520f07bff3f8fdf48819a)
2024-11-30 08:55:57 -05:00
Kyle Evans
8b30c13fd5 localedata: add some exceptions to utf8proc widths
Hangul Jamo medial vowels and final consonants are reportedly combining
characters that won't take up any columns on their own and should be
reported as zero-width, so add an exception for these as well to reflect
how they work in practice.  This conforms to how other implementations
(e.g., glibc) treat these characters.

Reviewed by:	bapt (earlier version), jkim
Sponsored by:	Klara, Inc.

(cherry picked from commit 160c36eae41afa3c4944ed44778c2b48db8fbb77)
2024-11-21 22:52:02 -06:00
Kyle Evans
0350ebae7e localedata: update widths.txt after recent Hangul exceptions
Sponsored by:	Klara, Inc.

(cherry picked from commit 0f30aed1056a2e12ca40095debff6735642c4ff4)
2024-11-21 22:51:59 -06:00
Graham Percival
ddf4df54a7 manuals: Fix "unusual .Xr" warnings with a script
These were reported by `mandoc -T lint ...` as warnings:
- unusual Xr order
- unusual Xr punctuation

Fixes made by script in https://github.com/Tarsnap/freebsd-doc-scripts

Signed-off-by:	Graham Percival <gperciva@tarsnap.com>
Reviewed by:	mhorne, Alexander Ziaee <concussious.bugzilla@runbox.com>
Sponsored by:	Tarsnap Backup Inc.
Pull Request:	https://github.com/freebsd/freebsd-src/pull/1464

(cherry picked from commit 6e1fc0118033f42b7c0d3623c8f67a89ebecabb2)
2024-11-04 12:13:13 -04:00
Brooks Davis
22aed646a5 src.conf.5: LOADER_BIOS_TEXTONLY default change
WITH_LOADER_BIOS_TEXTONLY is now the default so document
WITHOUT_LOADER_BIOS_TEXTONLY.

Fixes:		23dee252daf2 loader: Change this BIOS tradeoff...
(cherry picked from commit 50b5a37a12d032085276b1f0ebb5f92c0cabed32)
2024-10-30 22:16:59 -06:00
Konstantin Belousov
b90d68c9b2 jemalloc: set LG_VADDR to 64 on amd64
(cherry picked from commit eade2001aa9d91440886de8359a4dec9edcde2a9)
2024-10-15 18:06:44 +03:00
Mark Johnston
20191b71ba src.conf: Add a MK_ZFS_TESTS knob
The in-tree ZFS test suite is somewhat outdated and I see a number of
failures there.  I tend to think that we want to integrate the OpenZFS
test suite somehow, replacing the legacy one, though it's also possible
to run that as a separate test suite.

In any case, if one wants to run the OpenZFS test suite separately, it's
useful to be able to disable installation of the legacy ZFS test suite,
so let's provide a src.conf option to do that.

Reviewed by:	asomers
MFC after:	2 weeks
Differential Revision:	https://reviews.freebsd.org/D46476

(cherry picked from commit 24affded3d4ec5fafb6b22f773ec1e20d73b9b03)
2024-09-20 11:39:16 +00:00
Wolfram Schneider
9ff3c094fd stale symlinks: configurable obj dir prefix
Use $MAKEOBJDIRPREFIX if set, otherwise /usr/obj

(cherry picked from commit ccb0365643dc5e8d37ada3789bbe370b81ba5b3c)
2024-09-16 08:30:06 +00:00
Wolfram Schneider
a213882b9c stale-symlink-buildworld.sh: improve documentation
(cherry picked from commit c77ca9a72c9934c407852f00d88cba09f5c9e31f)
2024-09-16 08:30:06 +00:00
Jessica Clarke
c3d7b96df0 tools/build/make.py: Avoid Python 3.7+ subprocess.run capture_output
This is just a convenient alias for setting stdout and stderr to PIPE,
so substitute it for that to be compatible with Python 3.6.

Fixes:	69cfdc81ea ("tools/build/make.py: Keep bootstrapped bmake binary up-to-date")

(cherry picked from commit b771d5705fc95445d4d81e054be664b7842156ff)
2024-09-07 01:20:39 +01:00
Jessica Clarke
8161eb6182 tools/build/make.py: Add missing comma to fix tinderbox and worlds
The missing comma meant this was interpreted as a single target called
"tinderboxworlds", and so neither tinderbox nor worlds were recognised
as being MI targets (i.e. still required TARGET(_ARCH) to be given).

Fixes:	5157b451c6 ("tools/build/make.py: Grow the list of MI targets")

(cherry picked from commit edec803c5b72681b39ce969cc16d634e08bb3ac2)
2024-09-07 01:20:36 +01:00
Jessica Clarke
0abe896f19 beinstall: Pass -B to etcupdate
Since commit 246364454f ("etcupdate: Use new buildetc and installetc
targets when available"), beinstall has been much slower for the
etcupdate step, as it's been doing a kernel-toolchain (admittedly
without LLVM itself being built). Given beinstall requires an object
tree to already have been built and just installs it, we can pass -B to
beinstall to reuse that tree rather than build kernel-toolchain in
another one.

Reported by:	olivier
Tested by:	olivier
MFC after:	1 week

(cherry picked from commit 18aef07cfac41fde763e1328366cc6e334bb9254)
2024-09-07 01:03:14 +01:00
Warner Losh
38b00f73b8 options: Make it clearer some x86 / BIOS only things
Suggested by: jrtc27
Sponsored by: Netflix

(cherry picked from commit bf4f27e85aa62e459fb4cde9ebd51e32bdac7910)
2024-08-27 12:32:54 -04:00
John Baldwin
7b182a286d Remove the MK_NVME build option
The drivers and utilities are now built and installed unconditionally.

Reviewed by:	imp, emaste
Sponsored by:	Chelsio Communications
Differential Revision:	https://reviews.freebsd.org/D44843

(cherry picked from commit ee3187f6fa7986c6bfaa97528e050b796eaca343)
2024-08-27 11:54:45 -04:00
Cy Schubert
818e3dc03d tools: Remove stray "then"
Fixes:		26a09db3add3
(cherry picked from commit f7f570eb97c70bc7f545d79a96c3192181bb8dd1)
2024-08-26 19:39:32 -04:00
Brooks Davis
8d2b36ef6c Fix incremental build with WITH_NVME newly enabled
rescue.mk doesn't get updated when options change so nvme_util.o is now
missing on architectures were NVME was previously marked BROKEN.

Reviewed by:	imp
Fixes:		2fda3ab0ac19 WITH_NVME: Remove from broken.
Differential Revision:	https://reviews.freebsd.org/D44826

(cherry picked from commit 26a09db3add30238b99e3214c56a3aee63fd71d1)
2024-08-26 19:39:15 -04:00
Warner Losh
e179ee000e loader: Add WITH/WITHOUT_LOADER_PXEBOOT build option
Make it possible to disable pxeboot. This loader will fail to build when
it's too large. When /boot/loader needs to be larger like that, this
options will disable a component whose build will fail. It is an explicit
option rather than implicit when things are too large to force the user to
make the explicit tradeoffs rather than wonder why they have a stale pxeboot
or other odd failure mode.

MFC After:		3 days
Sponsored by:		Netflix
Differential Revision:	https://reviews.freebsd.org/D46212

(cherry picked from commit 20d35d5817851df3a6d20e75df2e14a192b94940)
2024-08-13 11:31:38 -06:00
Warner Losh
b013b81a03 loader: Document that WITH_BEARSSL may need other tweaks
/boot/loader is right up aginst the 500k limit we have to make sure
everything works in a wide variety of environments. However, adding
WITH_BEARSSL can push it over the edge since we are so close to the
limit with it enabled. One may also need to increase LOADERSIZE when
enabling it. It's often safe to go much higher, especially when you
don't plan on using pxeldr. Document this trade off here.

MFC After:		3 days
Sponsored by:		Netflix
Reviewed by:		sjg, markj
Differential Revision:	https://reviews.freebsd.org/D46211

(cherry picked from commit 7ee781e2bfc2558060dec95564414a0bff4415c1)
2024-08-13 11:31:38 -06:00
Gordon Bergling
402db142e0 stress2: Fix a typo in namecache2.sh
- s/inconsistancy/inconsistency/

(cherry picked from commit 32a9b95a8751f916deef5970476f010995244bfe)
2024-08-12 14:52:27 +02:00
Ed Maste
f06d322e9d Remove "All Rights Reserved" from FreeBSD Foundation copyrights
These ones were unambiguous cases where the Foundation was the only
listed copyright holder.

Sponsored by:	The FreeBSD Foundation

(cherry picked from commit 5c2bc3db201a4fe8d7911cf816bea104d5dc2138)
2024-08-06 15:39:53 -04:00
Ed Maste
5daa7f5bef depend-cleanup: remove entries from 2020 and 2021
> These tests increase the build time (albeit by a small amount), so
> they should be removed once enough time has passed and it is extremely
> unlikely anyone would try a NO_CLEAN build against an object tree from
> before the related change.

The comment suggests a year is a reasonable period but we'll be somewhat
more conservative for now, in part so that we retain different examples
of special cases.

Reviewed by:	brooks, imp
Sponsored by:	The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D46178

(cherry picked from commit 4a06d149371c16287e1dd5a8fa51e92346a0c3f4)
2024-08-06 15:39:52 -04:00
Jose Luis Duran
ed4fbdda58 tools/build/make.py: Minor typo fix
If the object directory prefix does not exist, make.py previously exited
with a message indicating that the chosen prefix does not exit.

Reviewed by:	emaste
Pull request:	https://github.com/freebsd/freebsd-src/pull/1348

(cherry picked from commit d55de30efd09ee011bf4604be1c15ce4155775c1)
2024-08-06 15:39:52 -04:00
Ed Maste
311f95ce3d mfc-candidates: move pretty printing into lua
d51c59002367 moved the MFC hash matching logic into a lua utility
script but left the output formatting in the shell script. Simplify this
slightly by just printing the formatted output from lua.

Sponsored by:	The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D44836

(cherry picked from commit 793745fad866f65863ab3b16a17bdf18dc779efd)
2024-08-01 11:11:45 -04:00
Ed Maste
63cd0ebe4b mfc-candidates: fix output order with incorrect commit dates
Previously we obtained the list of MFC candidate hashes (i.e., those
commits only in the mfc-from branch), removed the already-merged
commits based on "cherry picked from" commit message entries, and then
printed the list sorted by commit time.  This is usually the correct
order, but it is not when commits have non-monotonically-increasing
commit times.  This is unfortunately the case for a number of commits in
our tree.  This made it difficult to merge some groups of dependent
commits in the correct order.

Instead, leave the from-list in git rev-parse order, and move the
matching logic to a new lua script.

Reviewed by:	imp
Sponsored by:	The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D44808

(cherry picked from commit d51c590023675ca20a7da74d75a3b5a5dcfdfddc)
2024-08-01 11:11:45 -04:00
Wolfram Schneider
cf1bc41b29 stale-symlink-buildworld.sh: a script to check for stale symlinks on a FreeBSD system
You can run the script before or after `make installworld'

You may also check your local ports with:

  env STALE_SYMLINK_BUILDWORLD_DIRS=/usr/local ./stale-symlink-buildworld.sh

PR: 276235

(cherry picked from commit e880dd644f63fbe068c38b73b44aa7e7c5f176f3)
2024-07-13 10:11:51 +00:00
Alexander Ziaee
a3e8efd45a git-arc.1: list width typo
Reviewed by:	mhorne
MFC after:	3 days
Fixes:	 	760be44702 ("git-arc: document "create" command options")
Pull Request:	https://github.com/freebsd/freebsd-src/pull/1272

(cherry picked from commit 41d6858ebd6ae0431196c1bc6f03f8e388eae8e6)
2024-06-21 10:05:01 -03:00
Olivier Certner
9f06e6c990
Remove remnants of portsnap(8)
This was prompted by noticing that '/var/db/portsnap' still exists on
newly-installed machines.

With this change, all mentions of portsnap(8) in the tree are gone,
except for the historical note in the AUTHORS section of manpage
phttpget(8).

locate(1) will thus start indexing again '/var/db/portsnap' on machines
where this directory still exists, which may be a good way to push
administrators to delete it.

Reviewed by:            cperciva
Approved by:            emaste (mentor)
MFC after:              3 days
Sponsored by:           The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D45023

(cherry picked from commit 9b30b96c1fa4ee0dfc540878fbb3247bf92d19eb)

ObsoleteFiles.inc: Remove /var/db/portsnap

This is a followup to commit "Remove remnants of portsnap(8)"
(9b30b96c1fa4).  I wasn't aware of OLD_DIRS.

Approved by:            markj (mentor)
MFC after:              1 day
MFC with:               9b30b96c1fa4
Sponsored by:           The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D45023

(cherry picked from commit 54bbcc09a72b5d7a581f51416c9e635a33c2f884)

Approved by:            markj (mentor)
2024-05-09 15:52:53 +09:00
Gordon Bergling
176336c65a mwlstats: Fix a typo in an error message
- s/the the/the/

(cherry picked from commit e1e149ad8ada85267e981cb9d4c6b48d4ce9e1f4)
2024-04-25 08:16:42 +02:00
Ed Maste
99ec4feefb mfc-candidates: use stable/14 as default MFC-to branch
This tool is typically invoked from within a working tree containing the
desired MFC target branch, which is detected automatically.  It also has
a default for when it is invoked from elsewhere.  Switch the default to
the most recent branch, stable/14.

Sponsored by:	The FreeBSD Foundation

(cherry picked from commit 76a8625bc71da3fa63eef5abb4782553d2588f5c)
2024-04-24 19:47:33 -04:00
Dimitry Andric
e710425beb Merge llvm-project main llvmorg-18-init-15692-g007ed0dccd6a
This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvm-project main llvmorg-18-init-15692-g007ed0dccd6a.

PR:		276104
MFC after:	1 month

(cherry picked from commit cb14a3fe5122c879eae1fb480ed7ce82a699ddb6)
2024-04-19 23:12:22 +02:00
Dimitry Andric
c9157d925c Merge llvm-project main llvmorg-18-init-15088-gd14ee76181fb
This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvm-project main llvmorg-18-init-15088-gd14ee76181fb.

PR:		276104
MFC after:	1 month

(cherry picked from commit 5f757f3ff9144b609b3c433dfd370cc6bdc191ad)
2024-04-19 23:12:03 +02:00
Warner Losh
fcfd7396ae loader: Add new option WITH_LOADER_BIOS_TEXTONLY
This option will omit all the graphics support, the teken terminal
library, video mode support, etc and support a simple, basic, text-only
video console for the x86 BIOS boot loader. It uses the FreeBSD 12
version of vidconsole.c. It defaults to NO.

Sponsored by:		Netflix
Differential Revision:	https://reviews.freebsd.org/D43912

(cherry picked from commit 63e9c976640d05ef65842eaf3d54de9a8d48cbdc)
2024-04-16 13:54:25 -06:00
Baptiste Daroussin
16a6da44e2 nuageinit: add basic support for cloudinit.
this is a very early script to support cloudinit, it does not intend to
be a full featured cloudinit client, but will support a good enough
subset to be viable in most case.

It support nocloud and openstack config-2 config drive mode (iso9660 or
msdosfs)

The following features are currently supported:
- adding users (including a default user named 'freebsd' with password
  'freebsd'
- adding groups
- adding ssh keys
- static ipv4, static ipv6, dynamic ipv4

With this one is able to use the 'bring your own image feature" out of
box.

It is expected that the script grows the support of other clouds
supporting cloud-init, contributions are welcomed.

It is designed to be only run once via the firstboot mecanism.

Sponsored by:	OVHCloud
Differential Revision:	https://reviews.freebsd.org/D44141

(cherry picked from commit a42d6f76018e4ed8324e319ab48aac904bda437c)
(cherry picked from commit c051f22bce42d920abba61bd7cf4ef5b6a270ffa)
(cherry picked from commit b8c053c9a612651d4909f7a323088f3e92485b7b)
(cherry picked from commit 9eae9233fdcc946945f4191e1413f548adfa2943)
2024-04-11 13:52:52 +02:00
Olivier Cochard
18ec7a9003 OptionalObsoleteFiles: add missed cuda wrappers include files
Files introduced since clang 17.0.2.

Approved by:	dim
Sponsored by:	Netflix
Differential Revision:	https://reviews.freebsd.org/D44597

(cherry picked from commit a9275714690942e973ae69a3c179e3a435cf50dd)
2024-04-06 18:36:36 +02:00
Dag-Erling Smørgrav
ddee3ee4e0 usr.bin: Make lorder conditional on MK_TOOLCHAIN.
MFC after:	1 week
Reviewed by:	allanjude, markj
Differential Revision:	https://reviews.freebsd.org/D44558

(cherry picked from commit 125c4560bc70971b950d035cfcd2255b89984011)
2024-04-04 11:53:25 +02:00
John F. Carr
c3c2233c96 gpioevents: Fix build with newer Clang
PR:		277422
(cherry picked from commit 42b117a4bd104246589149fa9f7b9b7ddc144f23)
2024-03-24 13:48:55 -04:00
Dimitry Andric
c4149abc5d Optionally create full debuginfo for llvm-related executables
Commit de6feefdb7 limited the amount of debuginfo generated for clang
and other llvm-related executables. This was done to save disk space and
memory during building, but it makes debugging any of these executables
much harder.

Add a new src.conf(5) setting, WITH_LLVM_FULL_DEBUGINFO, to generate
full debuginfo instead. This is off by default, but could for example be
enabled for release builds or snapshots, so llvm executables are easier
to debug.

Reviewed by:	emaste
MFC after:	1 week
Differential Revision: https://reviews.freebsd.org/D43839

(cherry picked from commit 73ff7384e025033abc98fd5437a48beb8077a90b)
2024-03-08 09:15:34 +01:00
Ed Maste
0ed5a20392 mfc-candidates: search by committer only, not author
When both --author and --committer are specified, `git log` requires
both to match.  Search only by committer, as it is typically the FreeBSD
committer who will perform the MFC.

Reviewed by:	jhb
Sponsored by:	The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D41964

(cherry picked from commit 61f8df6a13a357e1d45c22a2016b87491f10de87)
2024-02-20 10:13:33 -05:00
Andrew Turner
55e2bfab44 tools/build: Support building with glibc 2.38
Ubuntu 23.10 uses glibc 2.38. This adds strlcpy and strlcmp so we need
to remove them from the cross build environment.

Reviewed by:	jrtc27 (earlier version), arichardson
Sponsored by:	Arm Ltd
Differential Revision:	https://reviews.freebsd.org/D42303

(cherry picked from commit ceefd491c7f0490515fadca2f3740cb24e3f449e)
2024-02-19 13:11:00 +00:00
Bjoern A. Zeeb
e1d739471e tools/net80211: add mlme_assoc
mlme_assoc is a tool to trigger net80211::ieee80211_sta_join1() calls
which in certain conditions cause problems to the LinuxKPI 802.11 compat
code (but also believed to possibly cause problems in case of race to
other firmware based drivers).  This has proven to be a good reproducer
for the problem even on setups which otherwise could run for days without
hitting it.

Sponsored by:	The FreeBSD Foundation
PR:		271979

(cherry picked from commit 643d6dce6c1e39f067f8d0feea8615913b324891)
2024-02-18 18:31:13 +00:00
Gregory Neil Shapiro
58ae50f31e Merge commit '850ef5ae11d69ea3381bd310f564f025fc8caea3'
Merge vendor sendmail 8.18.1 into HEAD

(cherry picked from commit d39bd2c1388b520fcba9abed1932acacead60fba)

Add new source file for sendmail 8.18.1

(cherry picked from commit 19d4fb85bf17579780e8f0c3cbae8a5e92a6922e)

New sendmail 8.18.1 cf file

(cherry picked from commit 1b6a5580c1f999fb1ba5f9860cf63a8aefc55b3c)

Minor change to update these files so new freebsd*.cf files are
generated

(cherry picked from commit 2c191ba6b0b5d1b3729a5ac428d51cfc5d5f3d2e)

Belatedly update version and date for sendmail 8.18.1 upgrade

(cherry picked from commit 31fbc98c949bfca30ab55afef04b4396a61b7e92)

Add a note about sendmail 8.18.1's stricter SMTP protocol enforcement
(akin to commit 21c1f1deb6a3ac6a60e4516261e5264a28e0b7a6 in main)

Update import date for stable/14

Relnotes:	Yes
Security:	CVE-2023-51765
2024-02-07 02:29:43 +00:00
Jessica Clarke
2fbed5e9ea Make kldxref a bootstrap tool and use unconditionally
Now that kldxref is a generic cross tool and can be built on non-FreeBSD
we can bootstrap it during the build and thus remove the condition for
whether it exists. We also need to make sure to add it to the METALOG
for -DNO_ROOT builds.

Reviewed by:	brooks, imp
Differential Revision:	https://reviews.freebsd.org/D43051

(cherry picked from commit ff7c12c1f17e52337169d8ce48433fae96a9c9db)
2024-01-18 14:30:06 -08:00
Jessica Clarke
d735315d4d tools/build: Provide sys/linker_set.h when cross-building
This is needed for kldxref, which will shortly become a bootstrap tool.
Linux can use the same one as FreeBSD (provided the cross-building
sys/cdefs.h is augmented appropriately), whilst macOS needs its own
Mach-O-specific implementation.

Reviewed by:	brooks
Differential Revision:	https://reviews.freebsd.org/D43049

(cherry picked from commit 881ec81372e0748f2869fe6c18e909afa8304e7a)
2024-01-18 14:26:48 -08:00
Dimitry Andric
fe013be447 Merge llvm-project main llvmorg-17-init-19304-gd0b54bb50e51
This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvm-project main llvmorg-17-init-19304-gd0b54bb50e51, the
last commit before the upstream release/17.x branch was created.

PR:		273753
MFC after:	1 month

(cherry picked from commit 06c3fb2749bda94cb5201f81ffdb8fa6c3161b2e)
2024-01-07 18:46:17 +01:00
Gordon Bergling
7f19b9b458 gpioevents: Fix a typo in a diagnostic output message
- s/recieved/received/

(cherry picked from commit 63c928f17e08f58fd3bd44b45c36ea5df7d15e77)
2024-01-07 12:42:25 +01:00
John Baldwin
e7b9d03df1 OptionalObsoleteFiles.inc: Add libnss_tacplus_p.a as an old profiled library
Noticed this was still present after upgrading a 12.x stable host to
14.0 stable.

(cherry picked from commit e7300a8f638e6eb801953c0fb9e53d99308dc3f0)
2024-01-04 16:29:43 -08:00
Gleb Smirnoff
98bac6fb06 nanobsd: Fix the fix to a typo
Submitted by:		jlduran@gmail.com
Reviewed by:		imp, glebius, emaste
PR:			275691
Differential Revision:	https://reviews.freebsd.org/D43035
Fixes:			d8c70d6dfb

(cherry picked from commit 330089470f56d502c629352b85e11522691e3368)
2024-01-02 11:05:08 -08:00
Baptiste Daroussin
693ea5a3b1 sendmail: remove all m4 files with WITHOUT_SENDMAIL
(cherry picked from commit 358f8a7add3c83f5f5a37b4c295e116ec511936b)
2023-12-04 11:22:22 +01:00
Brooks Davis
d5aedf850d OptionalObsoleteFiles.inc: document block order
Options should be in sort(1) order by primary option (usually, but not
always, first in the if statement).

Reviewed by:	emaste, imp, netchild
Pull Request:	https://github.com/freebsd/freebsd-src/pull/896

(cherry picked from commit 4cd0f014a1285c1b57e583b260282ca433a8ccdd)
2023-12-02 00:12:02 +00:00