summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJan Wetter <jan.wetter@mikrom.com>2015-07-09 17:33:48 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-10 13:35:40 +0100
commitb80ddb02294a4c4cf043274d8979b547721f22d3 (patch)
tree378cde2ea962454c48a2a25fbe5b9bb5245fe589 /meta
parentf9ea480e6c26fea46c3011c4e9d0e2de3d5c81b4 (diff)
downloadpoky-b80ddb02294a4c4cf043274d8979b547721f22d3.tar.gz
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. (From OE-Core rev: 631632addbc81b06b7accfca8f8a9871d6b09111) 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.patch35
-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 @@
1From aabfb6f78af8e337d3239142117ba303fce55e7e Mon Sep 17 00:00:00 2001
2From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
3Date: Thu, 22 Sep 2011 08:55:26 +0200
4Subject: [PATCH] fix the parallel build regarding shared libraries.
5
6Upstream-Status: Pending
7---
8 .../openssl-1.0.0e/Makefile.org | 8 ++++----
9 1 files changed, 4 insertions(+), 4 deletions(-)
10
11diff --git a/Makefile.org
12index 3c7aea1..6326cd6 100644
13--- a/Makefile.org
14+++ b/Makefile.org
15@@ -243,13 +243,13 @@ build_libs: build_crypto build_ssl build_engines
16
17 build_crypto:
18 @dir=crypto; target=all; $(BUILD_ONE_CMD)
19-build_ssl:
20+build_ssl: build_crypto
21 @dir=ssl; target=all; $(BUILD_ONE_CMD)
22-build_engines:
23+build_engines: build_crypto
24 @dir=engines; target=all; $(BUILD_ONE_CMD)
25-build_apps:
26+build_apps: build_crypto build_ssl
27 @dir=apps; target=all; $(BUILD_ONE_CMD)
28-build_tests:
29+build_tests: build_crypto build_ssl
30 @dir=test; target=all; $(BUILD_ONE_CMD)
31 build_tools:
32 @dir=tools; target=all; $(BUILD_ONE_CMD)
33--
341.6.6.1
35
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 \
15 file://shared-libs.patch \ 15 file://shared-libs.patch \
16 file://oe-ldflags.patch \ 16 file://oe-ldflags.patch \
17 file://engines-install-in-libdir-ssl.patch \ 17 file://engines-install-in-libdir-ssl.patch \
18 file://openssl-fix-link.patch \
19 file://debian1.0.2/block_diginotar.patch \ 18 file://debian1.0.2/block_diginotar.patch \
20 file://debian1.0.2/block_digicert_malaysia.patch \ 19 file://debian1.0.2/block_digicert_malaysia.patch \
21 file://debian/ca.patch \ 20 file://debian/ca.patch \
@@ -39,8 +38,8 @@ SRC_URI += "file://configure-targets.patch \
39 file://openssl-1.0.2a-x32-asm.patch \ 38 file://openssl-1.0.2a-x32-asm.patch \
40 " 39 "
41 40
42SRC_URI[md5sum] = "8c8d81a9ae7005276e486702edbcd4b6" 41SRC_URI[md5sum] = "38dd619b2e77cbac69b99f52a053d25a"
43SRC_URI[sha256sum] = "0038ba37f35a6367c58f17a7a7f687953ef8ce4f9684bbdec63e62515ed36a83" 42SRC_URI[sha256sum] = "671c36487785628a703374c652ad2cebea45fa920ae5681515df25d9f2c9a8c8"
44 43
45PACKAGES =+ " \ 44PACKAGES =+ " \
46 ${PN}-engines \ 45 ${PN}-engines \