Unversion the contrib/bzip2/ directory.
Import bzip-1.0.5 which fixes CVE-2008-1372.
Update to bzip2-1.0.4.
Import bzip2-1.0.3 modulo unneeded files.