Clayton Craft authored May 10, 2022 and alice committed May 11, 2022

The previous patches have been dropped due to being already
implemented/merged in the new version. A number of patches fixing
musl compilation issues are included. They're merged upstream but not
yet in a release.