xbps: merge 2 patches from master for 2 bugfixes.