xbps: merge another patch from git master to really fix xbps-create.