openssl-1.0.0b.diff does not apply cleanly

Gert Kello gert.kello at gmail.com
Thu Nov 25 20:18:54 CET 2010


Hi.

the emerge\portage\win32libs-sources\openssl-src\openssl-1.0.0b.diff
produces following output:

patching file apps/apps.c
patching file crypto/buffer/buffer.h
patching file crypto/err/err.h
patching file crypto/rand/randfile.c
patching file e_os.h
Hunk #1 FAILED at 150.
Hunk #2 succeeded at 273 (offset -1 lines).
Hunk #3 succeeded at 309 (offset -1 lines).
Hunk #4 succeeded at 338 (offset -1 lines).
Hunk #5 succeeded at 500 (offset -1 lines).
1 out of 5 hunks FAILED -- saving rejects to file e_os.h.rej
patching file engines/ccgost/gost_lcl.h
patching file include/openssl/buffer.h
patching file include/openssl/dtls1.h
patching file include/openssl/err.h
patching file ssl/dtls1.h
patching file ssl/ssltest.c
patching file util/pl/VC-32.pl
Hunk #2 succeeded at 152 (offset 5 lines).
Hunk #3 FAILED at 266.
1 out of 3 hunks FAILED -- saving rejects to file util/pl/VC-32.pl.rej
emerge fatal error: command unpack failed
emerge fatal error: running python
e:\kde4\emerge\portage\win32libs-sources\openssl-src\openssl-src-1.0.0b.py
unpack

I've attached the .rej files. Unfortunalty I can even not undertsand
if I can ignore the patch failure... I'll give it a try anyway.

Gert
-------------- next part --------------
A non-text attachment was scrubbed...
Name: VC-32.pl.rej
Type: application/octet-stream
Size: 809 bytes
Desc: not available
Url : http://mail.kde.org/pipermail/kde-windows/attachments/20101125/b17b325a/attachment.dll 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: e_os.h.rej
Type: application/octet-stream
Size: 654 bytes
Desc: not available
Url : http://mail.kde.org/pipermail/kde-windows/attachments/20101125/b17b325a/attachment-0001.dll 


More information about the Kde-windows mailing list