Closed liangyu-yang closed 9 years ago
running patch -p1 < cuckoo.patch resulted the following patching file analyzer/windows/analyzer.py Hunk #2 succeeded at 65 with fuzz 2 (offset 1 line). Hunk #3 succeeded at 236 (offset 10 lines). Hunk #4 succeeded at 640 (offset -16 lines). Hunk #5 FAILED at 675. Hunk #6 FAILED at 734. 2 out of 6 hunks FAILED -- saving rejects to file analyzer/windows/analyzer.py.rej patching file analyzer/windows/lib/api/process.py Hunk #1 FAILED at 1. Hunk #2 succeeded at 22 (offset 1 line). Hunk #3 succeeded at 182 (offset 1 line). Hunk #4 FAILED at 225. Hunk #5 succeeded at 325 (offset 2 lines). Hunk #6 succeeded at 383 (offset 4 lines). 2 out of 6 hunks FAILED -- saving rejects to file analyzer/windows/lib/api/process.py.rej patching file analyzer/windows/lib/common/defines.py Hunk #1 FAILED at 1 (different line endings). Hunk #2 FAILED at 74 (different line endings). Hunk #3 FAILED at 104 (different line endings). 3 out of 3 hunks FAILED -- saving rejects to file analyzer/windows/lib/common/defines.py.rej patching file analyzer/windows/modules/packages/applet.py Hunk #2 FAILED at 50. Hunk #3 FAILED at 57. 2 out of 3 hunks FAILED -- saving rejects to file analyzer/windows/modules/packages/applet.py.rej patching file analyzer/windows/modules/packages/bin.py Hunk #2 succeeded at 11 with fuzz 2. patching file analyzer/windows/modules/packages/cpl.py Hunk #2 FAILED at 26. 1 out of 2 hunks FAILED -- saving rejects to file analyzer/windows/modules/packages/cpl.py.rej patching file analyzer/windows/modules/packages/dll.py Hunk #2 FAILED at 14. Hunk #3 FAILED at 23. 2 out of 3 hunks FAILED -- saving rejects to file analyzer/windows/modules/packages/dll.py.rej patching file analyzer/windows/modules/packages/doc.py Hunk #2 FAILED at 37. 1 out of 2 hunks FAILED -- saving rejects to file analyzer/windows/modules/packages/doc.py.rej patching file analyzer/windows/modules/packages/exe.py Hunk #2 FAILED at 13. 1 out of 2 hunks FAILED -- saving rejects to file analyzer/windows/modules/packages/exe.py.rej patching file analyzer/windows/modules/packages/generic.py Hunk #2 FAILED at 14. Hunk #3 FAILED at 22. 2 out of 3 hunks FAILED -- saving rejects to file analyzer/windows/modules/packages/generic.py.rej patching file analyzer/windows/modules/packages/html.py Hunk #2 FAILED at 14. Hunk #3 FAILED at 21. 2 out of 3 hunks FAILED -- saving rejects to file analyzer/windows/modules/packages/html.py.rej patching file analyzer/windows/modules/packages/ie.py Hunk #2 FAILED at 15. Hunk #3 FAILED at 22. 2 out of 3 hunks FAILED -- saving rejects to file analyzer/windows/modules/packages/ie.py.rej patching file analyzer/windows/modules/packages/jar.py Hunk #2 FAILED at 33. Hunk #3 FAILED at 43. 2 out of 3 hunks FAILED -- saving rejects to file analyzer/windows/modules/packages/jar.py.rej patching file analyzer/windows/modules/packages/pdf.py Hunk #2 FAILED at 34. 1 out of 2 hunks FAILED -- saving rejects to file analyzer/windows/modules/packages/pdf.py.rej patching file analyzer/windows/modules/packages/ps1.py Hunk #1 FAILED at 33. Hunk #2 FAILED at 40. 2 out of 2 hunks FAILED -- saving rejects to file analyzer/windows/modules/packages/ps1.py.rej patching file analyzer/windows/modules/packages/vbs.py Hunk #2 FAILED at 33. 1 out of 2 hunks FAILED -- saving rejects to file analyzer/windows/modules/packages/vbs.py.rej patching file analyzer/windows/modules/packages/xls.py Hunk #2 FAILED at 36. 1 out of 2 hunks FAILED -- saving rejects to file analyzer/windows/modules/packages/xls.py.rej patching file analyzer/windows/modules/packages/zip.py Hunk #2 FAILED at 43. 1 out of 2 hunks FAILED -- saving rejects to file analyzer/windows/modules/packages/zip.py.rej patching file lib/cuckoo/common/logtbl.c patching file lib/cuckoo/common/logtbl.py patching file lib/cuckoo/core/startup.py Hunk #2 succeeded at 112 with fuzz 1. patching file modules/processing/behavior.py Hunk #1 succeeded at 329 (offset 3 lines). patching file utils/clean.sh Hunk #1 FAILED at 10. 1 out of 1 hunk FAILED -- saving rejects to file utils/clean.sh.rej patching file web/submission/views.py Hunk #2 succeeded at 45 with fuzz 1. patching file web/templates/submission/index.html Is this expected ?
running patch -p1 < cuckoo.patch resulted the following patching file analyzer/windows/analyzer.py Hunk #2 succeeded at 65 with fuzz 2 (offset 1 line). Hunk #3 succeeded at 236 (offset 10 lines). Hunk #4 succeeded at 640 (offset -16 lines). Hunk #5 FAILED at 675. Hunk #6 FAILED at 734. 2 out of 6 hunks FAILED -- saving rejects to file analyzer/windows/analyzer.py.rej patching file analyzer/windows/lib/api/process.py Hunk #1 FAILED at 1. Hunk #2 succeeded at 22 (offset 1 line). Hunk #3 succeeded at 182 (offset 1 line). Hunk #4 FAILED at 225. Hunk #5 succeeded at 325 (offset 2 lines). Hunk #6 succeeded at 383 (offset 4 lines). 2 out of 6 hunks FAILED -- saving rejects to file analyzer/windows/lib/api/process.py.rej patching file analyzer/windows/lib/common/defines.py Hunk #1 FAILED at 1 (different line endings). Hunk #2 FAILED at 74 (different line endings). Hunk #3 FAILED at 104 (different line endings). 3 out of 3 hunks FAILED -- saving rejects to file analyzer/windows/lib/common/defines.py.rej patching file analyzer/windows/modules/packages/applet.py Hunk #2 FAILED at 50. Hunk #3 FAILED at 57. 2 out of 3 hunks FAILED -- saving rejects to file analyzer/windows/modules/packages/applet.py.rej patching file analyzer/windows/modules/packages/bin.py Hunk #2 succeeded at 11 with fuzz 2. patching file analyzer/windows/modules/packages/cpl.py Hunk #2 FAILED at 26. 1 out of 2 hunks FAILED -- saving rejects to file analyzer/windows/modules/packages/cpl.py.rej patching file analyzer/windows/modules/packages/dll.py Hunk #2 FAILED at 14. Hunk #3 FAILED at 23. 2 out of 3 hunks FAILED -- saving rejects to file analyzer/windows/modules/packages/dll.py.rej patching file analyzer/windows/modules/packages/doc.py Hunk #2 FAILED at 37. 1 out of 2 hunks FAILED -- saving rejects to file analyzer/windows/modules/packages/doc.py.rej patching file analyzer/windows/modules/packages/exe.py Hunk #2 FAILED at 13. 1 out of 2 hunks FAILED -- saving rejects to file analyzer/windows/modules/packages/exe.py.rej patching file analyzer/windows/modules/packages/generic.py Hunk #2 FAILED at 14. Hunk #3 FAILED at 22. 2 out of 3 hunks FAILED -- saving rejects to file analyzer/windows/modules/packages/generic.py.rej patching file analyzer/windows/modules/packages/html.py Hunk #2 FAILED at 14. Hunk #3 FAILED at 21. 2 out of 3 hunks FAILED -- saving rejects to file analyzer/windows/modules/packages/html.py.rej patching file analyzer/windows/modules/packages/ie.py Hunk #2 FAILED at 15. Hunk #3 FAILED at 22. 2 out of 3 hunks FAILED -- saving rejects to file analyzer/windows/modules/packages/ie.py.rej patching file analyzer/windows/modules/packages/jar.py Hunk #2 FAILED at 33. Hunk #3 FAILED at 43. 2 out of 3 hunks FAILED -- saving rejects to file analyzer/windows/modules/packages/jar.py.rej patching file analyzer/windows/modules/packages/pdf.py Hunk #2 FAILED at 34. 1 out of 2 hunks FAILED -- saving rejects to file analyzer/windows/modules/packages/pdf.py.rej patching file analyzer/windows/modules/packages/ps1.py Hunk #1 FAILED at 33. Hunk #2 FAILED at 40. 2 out of 2 hunks FAILED -- saving rejects to file analyzer/windows/modules/packages/ps1.py.rej patching file analyzer/windows/modules/packages/vbs.py Hunk #2 FAILED at 33. 1 out of 2 hunks FAILED -- saving rejects to file analyzer/windows/modules/packages/vbs.py.rej patching file analyzer/windows/modules/packages/xls.py Hunk #2 FAILED at 36. 1 out of 2 hunks FAILED -- saving rejects to file analyzer/windows/modules/packages/xls.py.rej patching file analyzer/windows/modules/packages/zip.py Hunk #2 FAILED at 43. 1 out of 2 hunks FAILED -- saving rejects to file analyzer/windows/modules/packages/zip.py.rej patching file lib/cuckoo/common/logtbl.c patching file lib/cuckoo/common/logtbl.py patching file lib/cuckoo/core/startup.py Hunk #2 succeeded at 112 with fuzz 1. patching file modules/processing/behavior.py Hunk #1 succeeded at 329 (offset 3 lines). patching file utils/clean.sh Hunk #1 FAILED at 10. 1 out of 1 hunk FAILED -- saving rejects to file utils/clean.sh.rej patching file web/submission/views.py Hunk #2 succeeded at 45 with fuzz 1. patching file web/templates/submission/index.html Is this expected ?