aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2015-07-10 01:01:09 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-15 15:24:45 +0100
commitd140c1b13c3f3a7e2d982b5aa8b11c5e0c23c158 (patch)
treed35f3c1dfc8e321a518e811c8e0a273b2cec8c6e
parent5a577ec878a15f3caaf4893b819825ffb8c81266 (diff)
downloadopenembedded-core-d140c1b13c3f3a7e2d982b5aa8b11c5e0c23c158.zip
openembedded-core-d140c1b13c3f3a7e2d982b5aa8b11c5e0c23c158.tar.gz
openembedded-core-d140c1b13c3f3a7e2d982b5aa8b11c5e0c23c158.tar.bz2
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. 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 @@
-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.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 \
file://shared-libs.patch \
file://oe-ldflags.patch \
file://engines-install-in-libdir-ssl.patch \
- file://openssl-fix-link.patch \
file://debian/version-script.patch \
file://debian/pic.patch \
file://debian/c_rehash-compat.patch \
@@ -37,8 +36,8 @@ SRC_URI += "file://configure-targets.patch \
file://run-ptest \
"
-SRC_URI[md5sum] = "d143d1555d842a069cb7cc34ba745a06"
-SRC_URI[sha256sum] = "095f0b7b09116c0c5526422088058dc7e6e000aa14d22acca6a4e2babcdfef74"
+SRC_URI[md5sum] = "7563e92327199e0067ccd0f79f436976"
+SRC_URI[sha256sum] = "bd5ee6803165c0fb60bbecbacacf244f1f90d2aa0d71353af610c29121e9b2f1"
PACKAGES =+ " \
${PN}-engines \