xbps: merge two patches from git master.