xbps: add patch from git master to fix xbps issue 31.