curl: Fixup line ending merge issues

Somehow the patch line endings got messed up during merge. This restores
the delta.

(From OE-Core rev: 5dee4e241d64e6144d74967cca583d249689773a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta/recipes-support/curl/curl/CVE-2014-3613.patch b/meta/recipes-support/curl/curl/CVE-2014-3613.patch
index e517949..3e2fee0 100644 (file)
--- a/meta/recipes-support/curl/curl/CVE-2014-3613.patch
+++ b/meta/recipes-support/curl/curl/CVE-2014-3613.patch
@@ -170,15 +170,15 @@ index 38af83b..dfcac04 100644
 --- a/tests/data/test31
 +++ b/tests/data/test31
 @@ -49,11 +49,12 @@ Set-Cookie: nodomainnovalue
- Set-Cookie:   nodomain=value; expires=Fri Feb 2 11:56:27 GMT 2035
- Set-Cookie: novalue; domain=reallysilly
- Set-Cookie: test=yes; domain=foo.com; expires=Sat Feb 2 11:56:27 GMT 2030
- Set-Cookie: test2=yes; domain=se; expires=Sat Feb 2 11:56:27 GMT 2030
- Set-Cookie: magic=yessir; path=/silly/; HttpOnly
--Set-Cookie: blexp=yesyes; domain=.0.0.1; domain=.0.0.1; expiry=totally bad;
-+Set-Cookie: blexp=yesyes; domain=127.0.0.1; domain=127.0.0.1; expiry=totally bad;
-+Set-Cookie: partialip=nono; domain=.0.0.1;
- 
+ Set-Cookie:   nodomain=value; expires=Fri Feb 2 11:56:27 GMT 2035\r
+ Set-Cookie: novalue; domain=reallysilly\r
+ Set-Cookie: test=yes; domain=foo.com; expires=Sat Feb 2 11:56:27 GMT 2030\r
+ Set-Cookie: test2=yes; domain=se; expires=Sat Feb 2 11:56:27 GMT 2030\r
+ Set-Cookie: magic=yessir; path=/silly/; HttpOnly\r
+-Set-Cookie: blexp=yesyes; domain=.0.0.1; domain=.0.0.1; expiry=totally bad;\r
++Set-Cookie: blexp=yesyes; domain=127.0.0.1; domain=127.0.0.1; expiry=totally bad;\r
++Set-Cookie: partialip=nono; domain=.0.0.1;\r
+ \r
  boo
  </data>
  </reply>

diff --git a/meta/recipes-support/curl/curl/CVE-2014-3620.patch b/meta/recipes-support/curl/curl/CVE-2014-3620.patch
index 0ddefec..d11f190 100644 (file)
--- a/meta/recipes-support/curl/curl/CVE-2014-3620.patch
+++ b/meta/recipes-support/curl/curl/CVE-2014-3620.patch
@@ -53,14 +53,14 @@ index d2de279..e6dbbb9 100644
 --- a/tests/data/test61
 +++ b/tests/data/test61
 @@ -21,10 +21,11 @@ Set-Cookie: test=yes; httponly; domain=foo.com; expires=Fri Feb 2 11:56:27 GMT 2
- SET-COOKIE: test2=yes; domain=host.foo.com; expires=Fri Feb 2 11:56:27 GMT 2035
- Set-Cookie: test3=maybe; domain=foo.com; path=/moo; secure
- Set-Cookie: test4=no; domain=nope.foo.com; path=/moo; secure
- Set-Cookie: test5=name; domain=anything.com; path=/ ; secure
- Set-Cookie: fake=fooledyou; domain=..com; path=/;
+ SET-COOKIE: test2=yes; domain=host.foo.com; expires=Fri Feb 2 11:56:27 GMT 2035\r
+ Set-Cookie: test3=maybe; domain=foo.com; path=/moo; secure\r
+ Set-Cookie: test4=no; domain=nope.foo.com; path=/moo; secure\r
+ Set-Cookie: test5=name; domain=anything.com; path=/ ; secure\r
+ Set-Cookie: fake=fooledyou; domain=..com; path=/;\r
 +Set-Cookie: supercookie=fooledyou; domain=.com; path=/;^M
- Content-Length: 4
- 
+ Content-Length: 4\r
+ \r
  boo
  </data>
  </reply>