diff options
author | Qing He <qing.he@intel.com> | 2011-04-15 16:11:08 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-18 05:51:20 +0100 |
commit | 47cb36d1c897ac72718ce67f0acdf118da894228 (patch) | |
tree | d51755484ba02aecc8d63283e53b0e958eb712b1 | |
parent | 2f3c46d953da38193fc2255b442b3f4903f48036 (diff) | |
download | ast2050-yocto-poky-47cb36d1c897ac72718ce67f0acdf118da894228.zip ast2050-yocto-poky-47cb36d1c897ac72718ce67f0acdf118da894228.tar.gz |
openssl: upgrade to version 0.9.8r
[YOCTO #979]
from 0.9.8p
fixes CVE-2010-4180, CVE-2010-4252, CVE-2010-0014
(From OE-Core rev: e28e11930a22a4e89075e7e026e58c081f984ddf)
Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-0.9.8r/configure-targets.patch (renamed from meta/recipes-connectivity/openssl/openssl-0.9.8p/configure-targets.patch) | 1 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/ca.patch (renamed from meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/ca.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/config-hurd.patch (renamed from meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/config-hurd.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/debian-targets.patch (renamed from meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/debian-targets.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/engines-path.patch (renamed from meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/engines-path.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/kfreebsd-pipe.patch (renamed from meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/kfreebsd-pipe.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/make-targets.patch (renamed from meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/make-targets.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/man-dir.patch (renamed from meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/man-dir.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/man-section.patch (renamed from meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/man-section.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/no-rpath.patch (renamed from meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/no-rpath.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/no-symbolic.patch (renamed from meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/no-symbolic.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/perl-path.diff (renamed from meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/perl-path.diff) | 0 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/pic.patch (renamed from meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/pic.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/pkg-config.patch (renamed from meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/pkg-config.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/rc4-amd64.patch (renamed from meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/rc4-amd64.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/rehash-crt.patch (renamed from meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/rehash-crt.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/rehash_pod.patch (renamed from meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/rehash_pod.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/series (renamed from meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/series) | 0 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/shared-lib-ext.patch (renamed from meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/shared-lib-ext.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/stddef.patch (renamed from meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/stddef.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/version-script.patch (renamed from meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/version-script.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-0.9.8r/parallel-make-fix.patch (renamed from meta/recipes-connectivity/openssl/openssl-0.9.8p/parallel-make-fix.patch) | 2 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-0.9.8r/shared-libs.patch (renamed from meta/recipes-connectivity/openssl/openssl-0.9.8p/shared-libs.patch) | 2 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl.inc | 2 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_0.9.8r.bb (renamed from meta/recipes-connectivity/openssl/openssl_0.9.8p.bb) | 6 |
25 files changed, 9 insertions, 4 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/configure-targets.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8r/configure-targets.patch index 6fd2769..2317949 100644 --- a/meta/recipes-connectivity/openssl/openssl-0.9.8p/configure-targets.patch +++ b/meta/recipes-connectivity/openssl/openssl-0.9.8r/configure-targets.patch @@ -1,3 +1,4 @@ +Upstream-Status: Inappropriate [embedded specific] The number of colons are important :) diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/ca.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/ca.patch index 761eebe..761eebe 100644 --- a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/ca.patch +++ b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/ca.patch diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/config-hurd.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/config-hurd.patch index 21b7935..21b7935 100644 --- a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/config-hurd.patch +++ b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/config-hurd.patch diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/debian-targets.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/debian-targets.patch index fed4734..fed4734 100644 --- a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/debian-targets.patch +++ b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/debian-targets.patch diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/engines-path.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/engines-path.patch index 49400ff..49400ff 100644 --- a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/engines-path.patch +++ b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/engines-path.patch diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/kfreebsd-pipe.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/kfreebsd-pipe.patch index da97186..da97186 100644 --- a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/kfreebsd-pipe.patch +++ b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/kfreebsd-pipe.patch diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/make-targets.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/make-targets.patch index b123972..b123972 100644 --- a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/make-targets.patch +++ b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/make-targets.patch diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/man-dir.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/man-dir.patch index 29563ec..29563ec 100644 --- a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/man-dir.patch +++ b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/man-dir.patch diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/man-section.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/man-section.patch index fe20ab0..fe20ab0 100644 --- a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/man-section.patch +++ b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/man-section.patch diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/no-rpath.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/no-rpath.patch index 3ebc9ac..3ebc9ac 100644 --- a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/no-rpath.patch +++ b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/no-rpath.patch diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/no-symbolic.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/no-symbolic.patch index 2504fa7..2504fa7 100644 --- a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/no-symbolic.patch +++ b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/no-symbolic.patch diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/perl-path.diff b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/perl-path.diff index a72f938..a72f938 100644 --- a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/perl-path.diff +++ b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/perl-path.diff diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/pic.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/pic.patch index b534afa..b534afa 100644 --- a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/pic.patch +++ b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/pic.patch diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/pkg-config.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/pkg-config.patch index 38923b0..38923b0 100644 --- a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/pkg-config.patch +++ b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/pkg-config.patch diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/rc4-amd64.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/rc4-amd64.patch index 6f0421a..6f0421a 100644 --- a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/rc4-amd64.patch +++ b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/rc4-amd64.patch diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/rehash-crt.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/rehash-crt.patch index a8ff28c..a8ff28c 100644 --- a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/rehash-crt.patch +++ b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/rehash-crt.patch diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/rehash_pod.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/rehash_pod.patch index 94792c4..94792c4 100644 --- a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/rehash_pod.patch +++ b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/rehash_pod.patch diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/series b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/series index b764c04..b764c04 100644 --- a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/series +++ b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/series diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/shared-lib-ext.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/shared-lib-ext.patch index d27e9b2..d27e9b2 100644 --- a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/shared-lib-ext.patch +++ b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/shared-lib-ext.patch diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/stddef.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/stddef.patch index bb65b23..bb65b23 100644 --- a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/stddef.patch +++ b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/stddef.patch diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/version-script.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/version-script.patch index 64d8fc7..64d8fc7 100644 --- a/meta/recipes-connectivity/openssl/openssl-0.9.8p/debian/version-script.patch +++ b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/version-script.patch diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/parallel-make-fix.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8r/parallel-make-fix.patch index 60fab9d..bfddfc8 100644 --- a/meta/recipes-connectivity/openssl/openssl-0.9.8p/parallel-make-fix.patch +++ b/meta/recipes-connectivity/openssl/openssl-0.9.8r/parallel-make-fix.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + fix the parallel build regarding shared libraries. Signed-off-by: Qing He <qing.he@intel.com> diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/shared-libs.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8r/shared-libs.patch index 10d9146..19de112 100644 --- a/meta/recipes-connectivity/openssl/openssl-0.9.8p/shared-libs.patch +++ b/meta/recipes-connectivity/openssl/openssl-0.9.8r/shared-libs.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + diff --git a/Makefile.org b/Makefile.org index e87d623..25ff367 100644 --- a/Makefile.org diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index 68b3d7b..fe168c3 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc @@ -6,7 +6,7 @@ SECTION = "libs/network" # "openssl | SSLeay" dual license LICENSE = "openssl" -LIC_FILES_CHKSUM = "file://LICENSE;md5=83d26c69f6f0172ee7f795790424b453" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8" DEPENDS = "perl-native" diff --git a/meta/recipes-connectivity/openssl/openssl_0.9.8p.bb b/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb index f42b3cb..5fc38a3 100644 --- a/meta/recipes-connectivity/openssl/openssl_0.9.8p.bb +++ b/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb @@ -1,6 +1,6 @@ require openssl.inc -PR = "r3" +PR = "r0" SRC_URI += "file://debian/ca.patch \ file://debian/config-hurd.patch;apply=no \ file://debian/debian-targets.patch \ @@ -21,8 +21,8 @@ SRC_URI += "file://debian/ca.patch \ file://debian/version-script.patch \ file://debian/perl-path.diff" -SRC_URI[md5sum] = "7f24047f70364c9eabc94899e356ce39" -SRC_URI[sha256sum] = "b2645e2a2af221fa230b5ef6aa2b9388a875801b74cbddbb16be557f80f45242" +SRC_URI[md5sum] = "0352932ea863bc02b056cda7c9ac5b79" +SRC_URI[sha256sum] = "42b2368f786b05ed3be846838dce126b4e8e3dba8fb2e0ce83102df28c102fad" SRC_URI += "file://configure-targets.patch \ file://shared-libs.patch" |