[oe-commits] Ross Burton : openssl: upgrade to 1.0.1j

[git at git.openembedded.org]

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

Author: Ross Burton <ross.burton at intel.com>
Date:   Thu Oct 16 17:18:11 2014 +0100

openssl: upgrade to 1.0.1j

Signed-off-by: Ross Burton <ross.burton at intel.com>

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

---

 .../openssl/{openssl_1.0.1g.bb => openssl_1.0.1j.bb}       | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb b/meta/recipes-connectivity/openssl/openssl_1.0.1j.bb
similarity index 77%
rename from meta/recipes-connectivity/openssl/openssl_1.0.1g.bb
rename to meta/recipes-connectivity/openssl/openssl_1.0.1j.bb
index 274c69d..2da18ae 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.1j.bb
@@ -27,23 +27,19 @@ SRC_URI += "file://configure-targets.patch \
             file://debian/no-symbolic.patch \
             file://debian/debian-targets.patch \
             file://openssl_fix_for_x32.patch \
-            file://openssl-fix-doc.patch \
             file://fix-cipher-des-ede3-cfb1.patch \
             file://openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch \
             file://openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch \
             file://initial-aarch64-bits.patch \
             file://find.pl \
             file://openssl-fix-des.pod-error.patch \
-            file://openssl-1.0.1e-cve-2014-0195.patch \
-            file://openssl-1.0.1e-cve-2014-0198.patch \
-            file://openssl-1.0.1e-cve-2014-0221.patch \
-            file://openssl-1.0.1e-cve-2014-0224.patch \
-            file://openssl-1.0.1e-cve-2014-3470.patch \
-            file://openssl-CVE-2010-5298.patch \
+            file://Makefiles-ptest.patch \
+            file://ptest-deps.patch \
+            file://run-ptest \
            "
 
-SRC_URI[md5sum] = "de62b43dfcd858e66a74bee1c834e959"
-SRC_URI[sha256sum] = "53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028"
+SRC_URI[md5sum] = "f7175c9cd3c39bb1907ac8bba9df8ed3"
+SRC_URI[sha256sum] = "1b60ca8789ba6f03e8ef20da2293b8dc131c39d83814e775069f02d26354edf3"
 
 PACKAGES =+ " \
 	${PN}-engines \