Update to gnupg 2.5.4
Also a add a check for packages/BUILDTYPE so that we won't run into surprising error messages.