Merge "Switch to current upstream OpenBSD wsetup.c."