On Wed, 25 May 2005, squid squid wrote:
I encounter the following when patching Squid 2.5 Stable 10 on Solaris 8 with Custom LogFormat:
patch -p1 <../customlog-2.5.patch Looks like a unified context diff. The next patch looks like a unified context diff. The next patch looks like a unified context diff. The next patch looks like a unified context diff. The next patch looks like a unified context diff. The next patch looks like a unified context diff. The next patch looks like a unified context diff. The next patch looks like a unified context diff. Hunk #4 succeeded at 1054 (offset 10 lines) Hunk 5 failed at line 2186. 1 out of 5 hunks failed: saving rejects to src/structs.h.rej The next patch looks like a unified context diff. done
Kindly advise can I proceed with configure and make install???
See src/struct.h.rej for changes the patch command could not figure out how to do and which you need to do manually.
But oddly enought i am not aware of there beeing any conflicts with 2.5.STABLE10. I am still using the patch from 20030509 without any problems with 2.5.STABLE10.
The custom_log-2.5 branch has now been updated to be relative to 2.5.STABLE10 and should be available for download tomorrow just in case. But no conflics were observed during the update of the branch either..
It could obviously be that I am usign the GNU patch command which perhaps is a little more forgiving when there is trivial conflicts with the original than the patch command you are using.
Regards Henrik
