main/musl: add few more commits from today, add funlockfile check