Date: Wed, 9 Sep 2009 14:39:02 -0500 From: "JimF" <jfoug@....net> To: <john-users@...ts.openwall.com> Subject: Re: error compiling patch "md5 gen 2" with 18.104.22.168 This was documented in the patch release as something that 'happens'. The 2 patches simply deal with the same area of the options.h file, and the patch will fail. There is a file created ./src/options.h.rej which shows the part of the file that NEEDS patched, but was not patched. I have included the options.h file (hopefully the attachment will make it through). This options.h contains the 'proper' patching. However, it should NOT be used other than working around this patch failure by someone who does not know how to read a patch reject file. Jim. ----- Original Message ----- From: "websiteaccess" <websiteaccess@...il.com> To: <john-users@...ts.openwall.com> Sent: Wednesday, September 09, 2009 6:52 AM Subject: [john-users] error compiling patch "md5 gen 2" with 22.214.171.124 > When I try JTR 126.96.36.199 and the following patches : > > gzcat ../john-188.8.131.52-all-5.diff.gz | patch -p1 -Z > gzcat ../john-184.108.40.206-all-5-fast-rawMD5-SSE2-1.diff.gz | patch -p1 -Z > gzcat ../john-220.127.116.11-all-5-phpass-3.diff.gz | patch -p1 -Z > gzcat ../john-18.104.22.168-all-5-several-performance-updates-1.diff.gz | > patch -p1 -Z > gzcat ../john-22.214.171.124-all-5-numerous_options_and_bugfixes-1.diff.gz | > patch -p1 -Z > + > john-126.96.36.199-all-5-md5_gen-2.diff.gz <=== > > I get the errors : > > iMac-de-xxx-xxx:john-188.8.131.52 xxxxxx$ gzcat > ../john-184.108.40.206-all-5-md5_gen-2.diff.gz | patch -p1 -Z [...] > patching file src/options.h > Hunk #2 FAILED at 86. > Hunk #3 succeeded at 109 (offset -2 lines). > Not setting time of file src/options.h (time mismatch) > 1 out of 3 hunks FAILED -- saving rejects to file src/options.h.rej > iMac-de-xxx-xxx:john-220.127.116.11 xxxxxx$ [...] Download attachment "options.h.gz" of type "application/x-gzip" (1421 bytes)
Powered by blists - more mailing lists
Confused about mailing lists and their use? Read about mailing lists on Wikipedia and check out these guidelines on proper formatting of your messages.