@snafu By the sound of it you are already familiar with the patch program but given I just tested applying the patch I’ve linked to in this thread I thought I might as well do a little wiki entry on the same. It’s a bit rough but should help with instances where we (some what rarely so far) have a need for this procedure. I always have to re-discover the -p level and the -d option so at least it’s there now for future reference.
Do fee free to improve that document if you fancy.