xbps: add two bugfixes from git master.