summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2015-07-09 23:01:09 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-15 14:25:46 (GMT)
commit9e4aad97c3b4395edeb9dc44bfad1092cdf30a47 (patch)
tree680de542bfd6b7c460c0a44ff4e83cefcf9d4ffd
parent240da756168b58eb05300a23c8282942f913db2d (diff)
downloadpoky-9e4aad97c3b4395edeb9dc44bfad1092cdf30a47.tar.gz
openssl: upgrade to 1.0.1p
This upgrade fixes CVE-2015-1793 Removed openssl-fix-link.patch. The linking issue has been fixed in openssl. (From OE-Core rev: d140c1b13c3f3a7e2d982b5aa8b11c5e0c23c158) Signed-off-by: Tudor Florea <tudor.florea@enea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssl/openssl/openssl-fix-link.patch35
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.1p.bb (renamed from meta/recipes-connectivity/openssl/openssl_1.0.1m.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 154106c..0000000
--- 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.1m.bb b/meta/recipes-connectivity/openssl/openssl_1.0.1p.bb
index cab6b3f..3f61790 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.1m.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.1p.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://debian/version-script.patch \ 18 file://debian/version-script.patch \
20 file://debian/pic.patch \ 19 file://debian/pic.patch \
21 file://debian/c_rehash-compat.patch \ 20 file://debian/c_rehash-compat.patch \
@@ -37,8 +36,8 @@ SRC_URI += "file://configure-targets.patch \
37 file://run-ptest \ 36 file://run-ptest \
38 " 37 "
39 38
40SRC_URI[md5sum] = "d143d1555d842a069cb7cc34ba745a06" 39SRC_URI[md5sum] = "7563e92327199e0067ccd0f79f436976"
41SRC_URI[sha256sum] = "095f0b7b09116c0c5526422088058dc7e6e000aa14d22acca6a4e2babcdfef74" 40SRC_URI[sha256sum] = "bd5ee6803165c0fb60bbecbacacf244f1f90d2aa0d71353af610c29121e9b2f1"
42 41
43PACKAGES =+ " \ 42PACKAGES =+ " \
44 ${PN}-engines \ 43 ${PN}-engines \