TL;DR - What is the most methodical way patch a patch that no longer cleanly applies to the upstream source?
I'm looking into upgrading net/kamailio (currently the port pins to v5.0.1 of the upstream, I want to uprev this to 5.1.2 from the upstream).
Following the procedure describe this thread in conjunction with the porter's handbook, I'm running into patch reject issues:
I guess you could take the latest version of the upstream and beat it back into shape and generate patches from that.
But that would potentially throw away the work done previously on the port. This might cause unnecessary rework and could introduce subtle bugs.
Is there known workflow to refresh a patch that has gone stale?
I'm looking into upgrading net/kamailio (currently the port pins to v5.0.1 of the upstream, I want to uprev this to 5.1.2 from the upstream).
Following the procedure describe this thread in conjunction with the porter's handbook, I'm running into patch reject issues:
Code:
===> Applying FreeBSD patches for kamailio-5.1.2_1
1 out of 3 hunks failed--saving rejects to src/Makefile.rej
=> FreeBSD patch patch-src_Makefile failed to apply cleanly.
I guess you could take the latest version of the upstream and beat it back into shape and generate patches from that.
But that would potentially throw away the work done previously on the port. This might cause unnecessary rework and could introduce subtle bugs.
Is there known workflow to refresh a patch that has gone stale?