Tested on NetBSD-10 just by chaning PF_INET TO PF_INET6 and it works just as before.

Revert the change to etcupdate

Thank you for the support @adrian.
I am adding @roy_marples.name as a reviewer, he has deep insight since contributed a lot to this project.
The patch was submitted to the upstream and is awaiting acceptance.

The syzkaller test still triggers a panic:

In D49965#1139483, @emaste wrote:

I got my bikeshedding out of the way on other reviews so will reserve comment on the filename :)

I got my bikeshedding out of the way on other reviews so will reserve comment on the filename :)

Abandoning, arc diff totally messed this up.

Split off the bsd.suffixes-extra.mk part to D49965.

Use Nm to render libutil in HISTORY

getmntopts.c -> mntopts.c to match header and manpage.

In D49962#1139420, @emaste wrote:

Are you up for splitting bsd.suffixes-extra.mk out first, without any functional changes?

I still haven't looked it over fully but I'm fine with it going into the tree now.

Are you up for splitting bsd.suffixes-extra.mk out first, without any functional changes?

• actually install the manpage
• add guards to header

Thanks for the proper fixes @jhb!

Sorry, I didn't realize it would be this easy.

Thank you!

Note this requires D49951 to be committed first, since otherwise tests/sys/fs/fusefs falls over due to it picking sbin/mount.c over tests/sys/fs/fusefs/mount..cc for targeting mount.pieo. This has to do with some internal ordering in make that I haven't been able to fully figure out.

LGTM, as long as there are include guards in mntopts.h :)

Another minor remark, in D49958 I added include guards to mntopts.h. Since the header is now actually installed, I think it would be proper to do so here too.

Apart from the nits, LGTM!

In D49930#1139209, @emaste wrote:

You can drop the license boilerplate and just have the SPDX tag, if you like.

Remove license texts

Yeah, I already spotted and corrected that. I was editing the message to add kib to the reviewed-by list before noticing that it was already there.

Abandoning in favor of D49951 and D49952.

there are some typo Sponsored->Sponsored. @emaste Could you please help me to fix it when committing?

Please amend the commit message to point out that this may be worth a COMPILER_FEATURES entry in case it inspires someone to try and add more blocks stuff elsewhere, but it is hard to see the value with this little of proliferation at the moment

@kbowling can you please confirm this is good for me to merge?

If somebody would like to help me merge this patch. Please use the following url from github. Thanks.

LGTM with @brooks's comment incorporated. I can grab the change from GitHub, fold in that change, and push.

Also update the github branch.
https://github.com/freebsd/freebsd-src/commit/57b03648208dde96d64c5a8a4b7bf204bdffcfdc.patch

Fix private location

In D49958#1139282, @brooks wrote:

Sorry, I should have added you to D49951 and D49952 which this duplicates. I don't think a new library is warranted and if it is, it should probably be libmntopts or the like not something as generic as libmount.

If someone want to help me merge this patch. Please use the following commit on github:
https://github.com/aokblast/freebsd-src/commit/fd54c46f55ebd500bd7bf2380bacd818b4784059

Delete namespace and un-namespace stuff