Patch CVE-2014-3613.patch does not apply

[justus_m]

Dear Community,

id compiled Freescales Yocto BSP release Dizzy with the meta-qt5 layer for a nitrogen6x machine.

I have following error.

---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

Loading cache: 100% |###########################################| ETA:  00:00:00

Loaded 2060 entries from dependency cache.

NOTE: Resolving any missing task queue dependencies

NOTE: multiple providers are available for jpeg (jpeg, libjpeg-turbo)

NOTE: consider defining a PREFERRED_PROVIDER entry to match jpeg

Build Configuration:

BB_VERSION        = "1.24.0"

BUILD_SYS         = "x86_64-linux"

NATIVELSBSTRING   = "Ubuntu-14.10"

TARGET_SYS        = "arm-poky-linux-gnueabi"

MACHINE           = "nitrogen6x"

DISTRO            = "poky"

DISTRO_VERSION    = "1.7"

TUNE_FEATURES     = "arm armv7a vfp neon callconvention-hard cortexa9"

TARGET_FPU        = "vfp-neon"

meta             

meta-yocto        = "(nobranch):9bfb78bff606700176909abaa5cf8a332292738a"

meta-oe          

meta-multimedia   = "(nobranch):9efaed99125b1c4324663d9a1b2d3319c74e7278"

meta-fsl-arm      = "(nobranch):f8016b991029046be04675fc25869e6973edd4b1"

meta-fsl-arm-extra = "(nobranch):9404b049d79de889af02f5b4a11046b6e1543422"

meta-fsl-demos    = "(nobranch):7a9ba77d90e7f242eb8f3e7e7df697c79ed9ce59"

meta-qt5          = "dizzy:0732e184acef5e0200f46d7f95702774e5de1904"

meta-ruby        

meta-multimedia   = "(nobranch):9efaed99125b1c4324663d9a1b2d3319c74e7278"

NOTE: Preparing runqueue

NOTE: Executing SetScene Tasks

NOTE: Executing RunQueue Tasks

ERROR: Command Error: exit status: 1  Output:

Applying patch CVE-2014-3613.patch

patching file lib/cookie.c

patching file tests/data/test1105

patching file tests/data/test31

Hunk #1 FAILED at 49 (different line endings).

1 out of 2 hunks FAILED -- rejects in file tests/data/test31

patching file tests/data/test8

Patch CVE-2014-3613.patch does not apply (enforce with -f)

ERROR: Function failed: patch_do_patch

ERROR: Logfile of failure stored in: /home/meister/fsl-community-bsp/build/tmp/work/cortexa9hf-vfp-neon-poky-linux-gnueabi/curl/7.37.1-r0/temp/log.do_patch.22008

ERROR: Task 1833 (/home/meister/fsl-community-bsp/sources/poky/meta/recipes-support/curl/curl_7.37.1.bb, do_patch) failed with exit code '1'

NOTE: Tasks Summary: Attempted 1739 tasks of which 1734 didn't need to be rerun and 1 failed.

Waiting for 0 running tasks to finish:

Thanks,

Justus Metzler

[eb_amsi]

Saw there was new commits about 3 days ago, so I did a repo sync this morning and got the same error. As I began typing this "me-too" reply I noticed someone made a commit about an hour ago that looks like it may address this. So I repo sync'd yet again and now I have bit-bake running in the background, crossing my fingers it won't error out. It looks like it made it past the curl though, still have another thousand tasks to go before I get an image out of it.