diff options
| author | Jan Wetter <jan.wetter@mikrom.com> | 2015-07-09 17:33:48 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-10 13:34:36 +0100 |
| commit | 631632addbc81b06b7accfca8f8a9871d6b09111 (patch) | |
| tree | 866f6b3b16939cc9d91a172832f24477311ae289 /meta | |
| parent | 5a1f80e15d7fb60fd7c2b82aa769adef95d877a9 (diff) | |
| download | openembedded-core-631632addbc81b06b7accfca8f8a9871d6b09111.tar.gz openembedded-core-631632addbc81b06b7accfca8f8a9871d6b09111.tar.bz2 openembedded-core-631632addbc81b06b7accfca8f8a9871d6b09111.zip | |
openssl: upgrade to 1.0.2d
This upgrade fixes CVE-2015-1793
Removed openssl-fix-link.patch. The linking issue has been fixed in openssl.
Signed-off-by: Jan Wetter <jan.wetter@mikrom.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl/openssl-fix-link.patch | 35 | ||||
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.0.2d.bb (renamed from meta/recipes-connectivity/openssl/openssl_1.0.2c.bb) | 5 |
2 files changed, 2 insertions, 38 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-fix-link.patch b/meta/recipes-connectivity/openssl/openssl/openssl-fix-link.patch deleted file mode 100644 index 154106cbcd..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/openssl-fix-link.patch +++ /dev/null @@ -1,35 +0,0 @@ -From aabfb6f78af8e337d3239142117ba303fce55e7e Mon Sep 17 00:00:00 2001 -From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> -Date: Thu, 22 Sep 2011 08:55:26 +0200 -Subject: [PATCH] fix the parallel build regarding shared libraries. - -Upstream-Status: Pending ---- - .../openssl-1.0.0e/Makefile.org | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile.org -index 3c7aea1..6326cd6 100644 ---- a/Makefile.org -+++ b/Makefile.org -@@ -243,13 +243,13 @@ build_libs: build_crypto build_ssl build_engines - - build_crypto: - @dir=crypto; target=all; $(BUILD_ONE_CMD) --build_ssl: -+build_ssl: build_crypto - @dir=ssl; target=all; $(BUILD_ONE_CMD) --build_engines: -+build_engines: build_crypto - @dir=engines; target=all; $(BUILD_ONE_CMD) --build_apps: -+build_apps: build_crypto build_ssl - @dir=apps; target=all; $(BUILD_ONE_CMD) --build_tests: -+build_tests: build_crypto build_ssl - @dir=test; target=all; $(BUILD_ONE_CMD) - build_tools: - @dir=tools; target=all; $(BUILD_ONE_CMD) --- -1.6.6.1 - diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2c.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2d.bb index fd4ba6c5fa..32d8dce269 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.2c.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.2d.bb @@ -15,7 +15,6 @@ SRC_URI += "file://configure-targets.patch \ file://shared-libs.patch \ file://oe-ldflags.patch \ file://engines-install-in-libdir-ssl.patch \ - file://openssl-fix-link.patch \ file://debian1.0.2/block_diginotar.patch \ file://debian1.0.2/block_digicert_malaysia.patch \ file://debian/ca.patch \ @@ -39,8 +38,8 @@ SRC_URI += "file://configure-targets.patch \ file://openssl-1.0.2a-x32-asm.patch \ " -SRC_URI[md5sum] = "8c8d81a9ae7005276e486702edbcd4b6" -SRC_URI[sha256sum] = "0038ba37f35a6367c58f17a7a7f687953ef8ce4f9684bbdec63e62515ed36a83" +SRC_URI[md5sum] = "38dd619b2e77cbac69b99f52a053d25a" +SRC_URI[sha256sum] = "671c36487785628a703374c652ad2cebea45fa920ae5681515df25d9f2c9a8c8" PACKAGES =+ " \ ${PN}-engines \ |