[oe-commits] Roy Li : openssl: add openssl-CVE-2010-5298.patch SRC_URI

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: daisy
Commit: 1bd77c28fdb51d1a0dad55c8d1af2991046c801d
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=1bd77c28fdb51d1a0dad55c8d1af2991046c801d

Author: Roy Li <rongqing.li at windriver.com>
Date:   Thu May 22 14:42:51 2014 +0800

openssl: add openssl-CVE-2010-5298.patch SRC_URI

make openssl-CVE-2010-5298.patch truely work

(From OE-Core rev: eab33442480cc27a5cd00b3f46984fea74b7c0f9)

Signed-off-by: Roy Li <rongqing.li at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

Conflicts:
	meta/recipes-connectivity/openssl/openssl_1.0.1g.bb

---

 .../openssl/{openssl-1.0.1e => openssl}/openssl-CVE-2010-5298.patch      | 0
 meta/recipes-connectivity/openssl/openssl_1.0.1g.bb                      | 1 +
 2 files changed, 1 insertion(+)

diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-CVE-2010-5298.patch b/meta/recipes-connectivity/openssl/openssl/openssl-CVE-2010-5298.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-CVE-2010-5298.patch
rename to meta/recipes-connectivity/openssl/openssl/openssl-CVE-2010-5298.patch
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb b/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb
index d5f9660..579cf03 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb
@@ -35,6 +35,7 @@ SRC_URI += "file://configure-targets.patch \
             file://find.pl \
             file://openssl-fix-des.pod-error.patch \
             file://openssl-CVE-2014-0198-fix.patch \
+            file://openssl-CVE-2010-5298.patch \
            "
 
 SRC_URI[md5sum] = "de62b43dfcd858e66a74bee1c834e959"