summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-01-16 17:54:42 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-17 14:53:04 +0000
commit294e808d12131412bf1edb6f4babc9e57c8141e0 (patch)
tree566dd168453ba85b69035c0b21fafd0f567de2da
parent980ba5e77438c3a22c295f56ffb71f1d290db50a (diff)
downloadopenembedded-core-294e808d12131412bf1edb6f4babc9e57c8141e0.tar.gz
openembedded-core-294e808d12131412bf1edb6f4babc9e57c8141e0.tar.bz2
openembedded-core-294e808d12131412bf1edb6f4babc9e57c8141e0.zip
openssl-1.0.0: Update to 1.0.0e and fix QA Warning
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-4108 http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-4576 http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-4577 http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-4619 http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-0027 [YOCTO #1905] Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0f/configure-targets.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/configure-targets.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/c_rehash-compat.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/c_rehash-compat.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/ca.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/ca.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/debian-targets.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/debian-targets.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/make-targets.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/make-targets.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/man-dir.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/man-dir.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/man-section.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/man-section.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/no-rpath.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/no-rpath.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/no-symbolic.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/no-symbolic.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/pic.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/pic.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/pkg-config.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/pkg-config.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/version-script.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/version-script.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0f/engines-install-in-libdir-ssl.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/engines-install-in-libdir-ssl.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0f/oe-ldflags.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/oe-ldflags.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0f/openssl-fix-link.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/openssl-fix-link.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0f/openssl_fix_for_x32.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/openssl_fix_for_x32.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0f/shared-libs.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/shared-libs.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.0f.bb (renamed from meta/recipes-connectivity/openssl/openssl_1.0.0e.bb)8
18 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0e/configure-targets.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0f/configure-targets.patch
index 6d23771e8d..6d23771e8d 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0e/configure-targets.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0f/configure-targets.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/c_rehash-compat.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/c_rehash-compat.patch
index 8f9a034a0f..8f9a034a0f 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/c_rehash-compat.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/c_rehash-compat.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/ca.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/ca.patch
index aba4d42983..aba4d42983 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/ca.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/ca.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/debian-targets.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/debian-targets.patch
index 9feae38b15..9feae38b15 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/debian-targets.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/debian-targets.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/make-targets.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/make-targets.patch
index f7a6dfdc20..f7a6dfdc20 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/make-targets.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/make-targets.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/man-dir.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/man-dir.patch
index 4085e3b1d7..4085e3b1d7 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/man-dir.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/man-dir.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/man-section.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/man-section.patch
index e8b92681d5..e8b92681d5 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/man-section.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/man-section.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/no-rpath.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/no-rpath.patch
index 1ccb3b86ee..1ccb3b86ee 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/no-rpath.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/no-rpath.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/no-symbolic.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/no-symbolic.patch
index cc4408ab7d..cc4408ab7d 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/no-symbolic.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/no-symbolic.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/pic.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/pic.patch
index e368241095..e368241095 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/pic.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/pic.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/pkg-config.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/pkg-config.patch
index 0f1f392472..0f1f392472 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/pkg-config.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/pkg-config.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/version-script.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/version-script.patch
index a79c082ef2..a79c082ef2 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/version-script.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/version-script.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0e/engines-install-in-libdir-ssl.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0f/engines-install-in-libdir-ssl.patch
index d8a6f1a23c..d8a6f1a23c 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0e/engines-install-in-libdir-ssl.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0f/engines-install-in-libdir-ssl.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0e/oe-ldflags.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0f/oe-ldflags.patch
index 292e13dc5f..292e13dc5f 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0e/oe-ldflags.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0f/oe-ldflags.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0e/openssl-fix-link.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0f/openssl-fix-link.patch
index 154106cbcd..154106cbcd 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0e/openssl-fix-link.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0f/openssl-fix-link.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0e/openssl_fix_for_x32.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0f/openssl_fix_for_x32.patch
index 3191ce9632..3191ce9632 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0e/openssl_fix_for_x32.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0f/openssl_fix_for_x32.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0e/shared-libs.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0f/shared-libs.patch
index 09986731a8..09986731a8 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0e/shared-libs.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0f/shared-libs.patch
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.0e.bb b/meta/recipes-connectivity/openssl/openssl_1.0.0f.bb
index e29740b14e..f3404d6084 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.0e.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.0f.bb
@@ -6,7 +6,7 @@ DEPENDS += "ocf-linux"
CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
@@ -32,15 +32,15 @@ SRC_URI += "file://configure-targets.patch \
file://openssl_fix_for_x32.patch \
"
-SRC_URI[md5sum] = "7040b89c4c58c7a1016c0dfa6e821c86"
-SRC_URI[sha256sum] = "e361dc2775733fb84de7b5bf7b504778b772869e8f7bfac0b28b935cbf7380f7"
+SRC_URI[md5sum] = "e358705fb4a8827b5e9224a73f442025"
+SRC_URI[sha256sum] = "faf1eab0ef85fd6c3beca271c356b31b5cc831e2c6b7f23cf672e7ab4680fde1"
PACKAGES =+ " \
${PN}-engines \
${PN}-engines-dbg \
"
-FILES_${PN}-engines = "${libdir}/ssl/engines/*.so"
+FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines"
FILES_${PN}-engines-dbg = "${libdir}/ssl/engines/.debug"
PARALLEL_MAKEINST = ""