xbps: merge patch from git that should resolve issues in the build server.