[oe-commits] Richard Purdie : curl: Fixup line ending merge issues

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: dizzy
Commit: 5dee4e241d64e6144d74967cca583d249689773a
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=5dee4e241d64e6144d74967cca583d249689773a

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Mon Nov 24 16:23:16 2014 +0000

curl: Fixup line ending merge issues

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

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-support/curl/curl/CVE-2014-3613.patch | 18 +++++++++---------
 meta/recipes-support/curl/curl/CVE-2014-3620.patch | 14 +++++++-------
 2 files changed, 16 insertions(+), 16 deletions(-)

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
--- 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
+ 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;
+ 
  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
--- 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
+ 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: supercookie=fooledyou; domain=.com; path=/;^M
- Content-Length: 4
- 
+ Content-Length: 4
+ 
  boo
  </data>
  </reply>