summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2012-04-24 22:13:13 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-25 09:21:19 +0100
commit88d17caf6d0eb241f54b1af1704405d5f47eadc5 (patch)
treed4920ef038ff8a7df902fe5432b0c31e60cd72f5
parenta2009fd8548d818c4e647dae554b98074bd3eecd (diff)
downloadopenembedded-core-88d17caf6d0eb241f54b1af1704405d5f47eadc5.tar.gz
openembedded-core-88d17caf6d0eb241f54b1af1704405d5f47eadc5.tar.bz2
openembedded-core-88d17caf6d0eb241f54b1af1704405d5f47eadc5.zip
openssl: upgrade to 1.0.0i
Addresses CVE-2012-2110 Fixes bug [YOCTO #2368] Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0i/configure-targets.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0h/configure-targets.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/c_rehash-compat.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/c_rehash-compat.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/ca.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/ca.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/debian-targets.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/debian-targets.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/make-targets.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/make-targets.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/man-dir.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/man-dir.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/man-section.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/man-section.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/no-rpath.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/no-rpath.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/no-symbolic.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/no-symbolic.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/pic.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/pic.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/version-script.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/version-script.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0i/engines-install-in-libdir-ssl.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0h/engines-install-in-libdir-ssl.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0i/oe-ldflags.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0h/oe-ldflags.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0i/openssl-fix-link.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0h/openssl-fix-link.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0i/openssl_fix_for_x32.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0h/openssl_fix_for_x32.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0i/shared-libs.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0h/shared-libs.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl.inc3
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.0i.bb (renamed from meta/recipes-connectivity/openssl/openssl_1.0.0h.bb)4
18 files changed, 3 insertions, 4 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0h/configure-targets.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0i/configure-targets.patch
index 6d23771e8d..6d23771e8d 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0h/configure-targets.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0i/configure-targets.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/c_rehash-compat.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/c_rehash-compat.patch
index 8f9a034a0f..8f9a034a0f 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/c_rehash-compat.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/c_rehash-compat.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/ca.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/ca.patch
index aba4d42983..aba4d42983 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/ca.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/ca.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/debian-targets.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/debian-targets.patch
index 9feae38b15..9feae38b15 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/debian-targets.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/debian-targets.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/make-targets.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/make-targets.patch
index f7a6dfdc20..f7a6dfdc20 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/make-targets.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/make-targets.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/man-dir.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/man-dir.patch
index 4085e3b1d7..4085e3b1d7 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/man-dir.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/man-dir.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/man-section.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/man-section.patch
index e8b92681d5..e8b92681d5 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/man-section.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/man-section.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/no-rpath.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/no-rpath.patch
index 1ccb3b86ee..1ccb3b86ee 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/no-rpath.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/no-rpath.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/no-symbolic.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/no-symbolic.patch
index cc4408ab7d..cc4408ab7d 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/no-symbolic.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/no-symbolic.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/pic.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/pic.patch
index e368241095..e368241095 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/pic.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/pic.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/version-script.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/version-script.patch
index a79c082ef2..a79c082ef2 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/version-script.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0i/debian/version-script.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0h/engines-install-in-libdir-ssl.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0i/engines-install-in-libdir-ssl.patch
index d8a6f1a23c..d8a6f1a23c 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0h/engines-install-in-libdir-ssl.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0i/engines-install-in-libdir-ssl.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0h/oe-ldflags.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0i/oe-ldflags.patch
index 292e13dc5f..292e13dc5f 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0h/oe-ldflags.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0i/oe-ldflags.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0h/openssl-fix-link.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0i/openssl-fix-link.patch
index 154106cbcd..154106cbcd 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0h/openssl-fix-link.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0i/openssl-fix-link.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0h/openssl_fix_for_x32.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0i/openssl_fix_for_x32.patch
index 3191ce9632..3191ce9632 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0h/openssl_fix_for_x32.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0i/openssl_fix_for_x32.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0h/shared-libs.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0i/shared-libs.patch
index 09986731a8..09986731a8 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0h/shared-libs.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0i/shared-libs.patch
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index 089b9a4884..78cf272ec7 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -4,8 +4,7 @@ HOMEPAGE = "http://www.openssl.org/"
BUGTRACKER = "http://www.openssl.org/news/vulnerabilities.html"
SECTION = "libs/network"
-# Big Jump for OpenSSL 1.0 support with meta-oe
-INC_PR = "r15"
+INC_PR = "r0"
# "openssl | SSLeay" dual license
LICENSE = "openssl"
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.0h.bb b/meta/recipes-connectivity/openssl/openssl_1.0.0i.bb
index 744fe2a6b7..68b092f390 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.0h.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.0i.bb
@@ -31,8 +31,8 @@ SRC_URI += "file://configure-targets.patch \
file://openssl_fix_for_x32.patch \
"
-SRC_URI[md5sum] = "a5bc483c570f2ac3758ce5c19b667fab"
-SRC_URI[sha256sum] = "7e3dfc21aa57ed33ea673170053d1921322803b8a6a624a4f0d2e4c308bd418d"
+SRC_URI[md5sum] = "b4df9c11af454fd68178c85a1d5f328f"
+SRC_URI[sha256sum] = "548262d15777c504be1ab9bb8fabef1e14a3de54837a6593c8f403dd843d5e57"
PACKAGES =+ " \
${PN}-engines \