xbps: merge patch from git that fixes xbps issue #24.