Fix FTBFS due to function signature of read_xdr_file/write_xdr_file

This ports back two patches from upstream and closes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1060076