I believe this will break the bootstrap version of cat that is needed for building on Linux/macOS since caph_enter_casper() will fail there.
This probably needs a few more #ifndef BOOTSTRAP_CAT.
If you have a github fork, the github actions will test the non-FreeBSD build automatically for the "main" branch of your repository.

Otherwise this seems fine to me.

This revision now requires changes to proceed.Jan 15 2021, 6:55 PM

@arichardson

Yea, I wasn't sure about Linux/macOs build.
Good to know that! I will verify that!
We don't use the rescue headers to build a BOOTSTRAP version?

In D28083#629832, @oshogbo wrote:

@arichardson

Yea, I wasn't sure about Linux/macOs build.
Good to know that! I will verify that!
We don't use the rescue headers to build a BOOTSTRAP version?

The bootstrap version uses tools/build/cross-build/capsicum_stubs.c . I'm not sure what you mean by rescue head?

Fix cross build.

Harbormaster completed remote builds in B36240: Diff 82334.Jan 15 2021, 7:46 PM

@arichardson
I just needed to add a new service to the tools/build/Makefile and it work like charm - https://github.com/oshogbo/freebsd-src/runs/1710760934 (mac will finish in a moment).
Do you want me to test something else?

So in the case of the building rescue and the bootstrapping, we are using the libcapsicum/Casper headers that replace the caph_* functions with empty ones.

In D28083#629862, @oshogbo wrote:

@arichardson
I just needed to add a new service to the tools/build/Makefile and it work like charm - https://github.com/oshogbo/freebsd-src/runs/1710760934 (mac will finish in a moment).
Do you want me to test something else?

So in the case of the building rescue and the bootstrapping, we are using the libcapsicum/Casper headers that replace the caph_* functions with empty ones.

Thanks for checking!

This revision is now accepted and ready to land.Jan 15 2021, 7:58 PM

Closed by commit rGaefe30c54371: cat: capsicumize it (authored by oshogbo). · Explain WhyJan 15 2021, 8:24 PM

This revision was automatically updated to reflect the committed changes.

oshogbo added a commit: rGaefe30c54371: cat: capsicumize it.