openssl: update 1.0.0b to 1.0.0c

 * fixes CVE-2010-4180 and CVE-2010-4252
 * considered as safe upgrade

Signed-off-by: Roman I Khimov <khimov@altell.ru>
Acked-by: Khem Raj <raj.khem@gmail.com>

diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index d6d984b..f3fb7e6 100644 (file)
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -37,8 +37,8 @@ PREFERRED_VERSION_mythtv        = "0.23"
 PREFERRED_VERSION_mplayer       = "0.0+1.0rc3+svnr%"
 PREFERRED_VERSION_network-manager-applet = "0.8.1"
 PREFERRED_VERSION_networkmanager = "0.8.1"
-PREFERRED_VERSION_openssl = "1.0.0b"
-PREFERRED_VERSION_openssl-native = "1.0.0b"
+PREFERRED_VERSION_openssl = "1.0.0c"
+PREFERRED_VERSION_openssl-native = "1.0.0c"
 PREFERRED_VERSION_pango        = "1.24.4"
 PREFERRED_VERSION_pango-native     = "1.24.4"
 #PREFERRED_VERSION_pixman      = "0.13.2"

diff --git a/conf/distro/include/angstrom-2010-preferred-versions.inc b/conf/distro/include/angstrom-2010-preferred-versions.inc
index 5267202..3638c2d 100644 (file)
--- a/conf/distro/include/angstrom-2010-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2010-preferred-versions.inc
@@ -45,8 +45,8 @@ PREFERRED_VERSION_mplayer       = "0.0+1.0rc3+svnr%"
 PREFERRED_VERSION_network-manager-applet = "0.8.1"
 PREFERRED_VERSION_networkmanager = "0.8.1"
 PREFERRED_VERSION_networkmanager-openvpn = "0.8.1"
-PREFERRED_VERSION_openssl = "1.0.0b"
-PREFERRED_VERSION_openssl-native = "1.0.0b"
+PREFERRED_VERSION_openssl = "1.0.0c"
+PREFERRED_VERSION_openssl-native = "1.0.0c"
 PREFERRED_VERSION_pango        = "1.28.3"
 PREFERRED_VERSION_pango-native     = "1.28.3"
 PREFERRED_VERSION_perl = "5.10.1"

diff --git a/conf/distro/include/kaeilos-2009-preferred-versions.inc b/conf/distro/include/kaeilos-2009-preferred-versions.inc
index 6fcfd1c..388b08f 100644 (file)
--- a/conf/distro/include/kaeilos-2009-preferred-versions.inc
+++ b/conf/distro/include/kaeilos-2009-preferred-versions.inc
@@ -44,8 +44,8 @@ PREFERRED_VERSION_mythtv        = "0.23"
 PREFERRED_VERSION_mplayer       = "0.0+1.0rc3+svnr%"
 PREFERRED_VERSION_network-manager-applet = "0.8.1"
 PREFERRED_VERSION_networkmanager = "0.8.1"
-PREFERRED_VERSION_openssl = "1.0.0b"
-PREFERRED_VERSION_openssl-native = "1.0.0b"
+PREFERRED_VERSION_openssl = "1.0.0c"
+PREFERRED_VERSION_openssl-native = "1.0.0c"
 PREFERRED_VERSION_pango        = "1.24.4"
 PREFERRED_VERSION_pango-native     = "1.24.4"
 #PREFERRED_VERSION_pixman      = "0.13.2"

diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index 6a96798..1ca0c17 100644 (file)
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -23,8 +23,8 @@ PREFERRED_VERSION_hal           = "0.5.13"
 PREFERRED_VERSION_wpa-supplicant = "0.6.9"
 PREFERRED_VERSION_glib-2.0      = "2.26.1"
 PREFERRED_VERSION_glib-2.0-native = "2.26.1"
-PREFERRED_VERSION_openssl = "1.0.0b"
-PREFERRED_VERSION_openssl-native = "1.0.0b"
+PREFERRED_VERSION_openssl = "1.0.0c"
+PREFERRED_VERSION_openssl-native = "1.0.0c"
 UDEV_GE_141 = "1"
 
 PREFERRED_VERSION_postgresql = "8.4.4"

diff --git a/recipes/openssl/openssl-1.0.0b/configure-targets.patch b/recipes/openssl/openssl-1.0.0c/configure-targets.patch
similarity index 100%
rename from recipes/openssl/openssl-1.0.0b/configure-targets.patch
rename to recipes/openssl/openssl-1.0.0c/configure-targets.patch

diff --git a/recipes/openssl/openssl-1.0.0b/debian.patch b/recipes/openssl/openssl-1.0.0c/debian.patch
similarity index 100%
rename from recipes/openssl/openssl-1.0.0b/debian.patch
rename to recipes/openssl/openssl-1.0.0c/debian.patch

diff --git a/recipes/openssl/openssl-1.0.0b/engines-install-in-libdir-ssl.patch b/recipes/openssl/openssl-1.0.0c/engines-install-in-libdir-ssl.patch
similarity index 100%
rename from recipes/openssl/openssl-1.0.0b/engines-install-in-libdir-ssl.patch
rename to recipes/openssl/openssl-1.0.0c/engines-install-in-libdir-ssl.patch

diff --git a/recipes/openssl/openssl-1.0.0b/libdeps-first.patch b/recipes/openssl/openssl-1.0.0c/libdeps-first.patch
similarity index 100%
rename from recipes/openssl/openssl-1.0.0b/libdeps-first.patch
rename to recipes/openssl/openssl-1.0.0c/libdeps-first.patch

diff --git a/recipes/openssl/openssl-1.0.0b/oe-ldflags.patch b/recipes/openssl/openssl-1.0.0c/oe-ldflags.patch
similarity index 100%
rename from recipes/openssl/openssl-1.0.0b/oe-ldflags.patch
rename to recipes/openssl/openssl-1.0.0c/oe-ldflags.patch

diff --git a/recipes/openssl/openssl-1.0.0b/shared-libs.patch b/recipes/openssl/openssl-1.0.0c/shared-libs.patch
similarity index 100%
rename from recipes/openssl/openssl-1.0.0b/shared-libs.patch
rename to recipes/openssl/openssl-1.0.0c/shared-libs.patch

diff --git a/recipes/openssl/openssl-native_1.0.0b.bb b/recipes/openssl/openssl-native_1.0.0c.bb
similarity index 74%
rename from recipes/openssl/openssl-native_1.0.0b.bb
rename to recipes/openssl/openssl-native_1.0.0c.bb
index 3da055d..8483293 100644 (file)
--- a/recipes/openssl/openssl-native_1.0.0b.bb
+++ b/recipes/openssl/openssl-native_1.0.0c.bb
@@ -2,9 +2,9 @@ require openssl.inc
 
 inherit pkgconfig native
 
-SRC_URI[src.md5sum] = "104deb3b7e6820cae6de3f49ba0ff2b0"
-SRC_URI[src.sha256sum] = "4e7b4e2fb33ee2d97c5e143561ab495dbbfc08f0a863e617a0c7adca19017331"
-PR = "${INC_PR}.1"
+SRC_URI[src.md5sum] = "ff8fb85610aef328315a9decbb2712e4"
+SRC_URI[src.sha256sum] = "f731b36de3edaa361179ae6f449668b248a360e34e31e92902d976e9b9d604eb"
+PR = "${INC_PR}.0"
 
 DEFAULT_PREFERENCE = "-1"
 

diff --git a/recipes/openssl/openssl_1.0.0b.bb b/recipes/openssl/openssl_1.0.0c.bb
similarity index 79%
rename from recipes/openssl/openssl_1.0.0b.bb
rename to recipes/openssl/openssl_1.0.0c.bb
index ee33371..1c0e37a 100644 (file)
--- a/recipes/openssl/openssl_1.0.0b.bb
+++ b/recipes/openssl/openssl_1.0.0c.bb
@@ -1,8 +1,8 @@
 inherit pkgconfig
 
 require openssl.inc
-SRC_URI[src.md5sum] = "104deb3b7e6820cae6de3f49ba0ff2b0"
-SRC_URI[src.sha256sum] = "4e7b4e2fb33ee2d97c5e143561ab495dbbfc08f0a863e617a0c7adca19017331"
+SRC_URI[src.md5sum] = "ff8fb85610aef328315a9decbb2712e4"
+SRC_URI[src.sha256sum] = "f731b36de3edaa361179ae6f449668b248a360e34e31e92902d976e9b9d604eb"
 
 PR = "${INC_PR}.1"