diff(1): Commit our patches to contrib/ and get rid of -I-.