FL-297: fork gnupg, apply clang fixes