merge: trivial code fixes

 * split if's containing assignments
 * drop unnecessary FGETCONV typedef
 * add doxygen warnings
 * pgppubring: fix signed and unsigned comparison
 * fix sensitive flag for config variables
 * remove unnecessary preprocessor symbol
 * add some checks to buffer code
 * move conditional includes after others