In D49239#1124170, @diizzy wrote:

Initial thoughts... (not tested in Poudriere)

While I like granuality I'm a bit on the fence about this one at least in its current form adds a lot of complexity to an already complex port, is there an underlying reason as I guess we don't save much disk space by splitting it up?

I see no problem with this, in general.

I simply removed the Malloc, Realloc, and Free functions with direct calls to the authoritative libc versions, malloc, etc...

Same diff but with -U99999 to capture the full files for review.

This update of the patch addresses Adrian's concern that *_chan() are polluted by references to USB (*uc) data structures. Instead of setting uc->uc_write_delay directly the *chan() functions set a chan_flag in the sc to indicate that execution is in a sensitive part of channel processing, that a delay should be made before the write.

This is a much simplified patch. Plus a comment why we need to unset ntpd_user because rc.subr will use that to su(1) for us and we don't want this behavior. We want ntpd to setuid() itself.

This has been simplified. Will upload it.