xbps: merge patch from git to make xbps-uhelper version match vpkgs.