xbps: merge 2 patches from git master.
xbps-git: bump version.