xbps: merge another bugfix from git master.