Ok, I now have a script which tries much harder to do the right thing that I'm building the repository from, and I also fixed all the patch files which had .orig or .rej files in them not to in my cached copy, so they won't spring into existance and then disappear again.

I did note my "patched to v342 from v1" had some (minor?) diffs from the v342 bzip2 tarball on the hijack website. A diff is attached.