[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6590/8267] openssl: Upgrade 1.0.2k -> 1.0.2l

[Emmanuele Bassi <ebassi src gnome org>]

commit d9cb7e713970452d0bd8f46418c82110c7acfe37
Author: Changhyeok Bae <changhyeok bae gmail com>
Date:   Sun Jun 18 15:23:34 2017 +0000

    openssl: Upgrade 1.0.2k -> 1.0.2l
    
    1. Dropped obsolete patches, because the new version contains them:
      - fix-cipher-des-ede3-cfb1.patch
      - openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch
    2. LICENSE checksum change due to copyright years and wording tweak.
    3. Test binaries (x86-64) are included in source code. So remove those
    only for ptest.
    
    (From OE-Core rev: 64ec18d7e13d310e5e44080a04b3f2181ea96ae3)
    
    Signed-off-by: Changhyeok Bae <changhyeok bae gmail com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-connectivity/openssl/openssl.inc      |    5 ++++
 .../openssl/openssl/fix-cipher-des-ede3-cfb1.patch |   21 ------------------
 ...-pointer-dereference-in-EVP_DigestInit_ex.patch |   23 --------------------
 .../{openssl_1.0.2k.bb => openssl_1.0.2l.bb}       |    8 ++----
 4 files changed, 8 insertions(+), 49 deletions(-)
---
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index 3980ec2..ce295e8 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -236,6 +236,11 @@ do_install_ptest () {
        # modified again later when stripping them, but that's okay.
        touch ${D}${PTEST_PATH}
        find ${D}${PTEST_PATH} -type f -print0 | xargs --verbose -0 touch -r ${D}${PTEST_PATH}
+
+       # exclude binary files or the package won't install
+       for d in ssltest_old v3ext x509aux; do
+               rm -rf ${D}${libdir}/${BPN}/ptest/test/$d
+       done
 }
 
 do_install_append_class-native() {
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2k.bb 
b/meta/recipes-connectivity/openssl/openssl_1.0.2l.bb
similarity index 86%
rename from meta/recipes-connectivity/openssl/openssl_1.0.2k.bb
rename to meta/recipes-connectivity/openssl/openssl_1.0.2l.bb
index 83d1a50..a2ef2ac 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2k.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2l.bb
@@ -7,7 +7,7 @@ DEPENDS += "cryptodev-linux"
 CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
 CFLAG_append_class-native = " -fPIC"
 
-LIC_FILES_CHKSUM = "file://LICENSE;md5=27ffa5d74bb5a337056c14b2ef93fbf6"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=057d9218c6180e1d9ee407572b2dd225"
 
 export DIRS = "crypto ssl apps engines"
 export OE_LDFLAGS="${LDFLAGS}"
@@ -32,8 +32,6 @@ SRC_URI += "file://find.pl;subdir=${BP}/util/ \
             file://debian1.0.2/version-script.patch \
             file://debian1.0.2/soname.patch \
             file://openssl_fix_for_x32.patch \
-            file://fix-cipher-des-ede3-cfb1.patch \
-            file://openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch \
             file://openssl-fix-des.pod-error.patch \
             file://Makefiles-ptest.patch \
             file://ptest-deps.patch \
@@ -45,8 +43,8 @@ SRC_URI += "file://find.pl;subdir=${BP}/util/ \
             file://Use-SHA256-not-MD5-as-default-digest.patch \
             file://0001-Fix-build-with-clang-using-external-assembler.patch \
             "
-SRC_URI[md5sum] = "f965fc0bf01bf882b31314b61391ae65"
-SRC_URI[sha256sum] = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0"
+SRC_URI[md5sum] = "f85123cd390e864dfbe517e7616e6566"
+SRC_URI[sha256sum] = "ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c"
 
 PACKAGES =+ "${PN}-engines"
 FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines"