xbps: merge patch from master to fix the new vpkg issue.