From: Roman I Khimov <khimov@altell.ru>
Date: Fri, 2 Jul 2010 15:15:13 +0000 (+0400)
Subject: openssl: update 1.0.0 to 1.0.0a
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6dc6481180353ce58978e4727934229dc20dd8e;p=openembedded.git

openssl: update 1.0.0 to 1.0.0a

* exactly one fix (CVE-2010-1633), considered as safe upgrade

Signed-off-by: Roman I Khimov <khimov@altell.ru>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
---

diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 54004de387..79de750c5b 100644
--- 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.22"
 PREFERRED_VERSION_mplayer       = "0.0+1.0rc3+svnr30165"
 PREFERRED_VERSION_network-manager-applet = "0.8"
 PREFERRED_VERSION_networkmanager = "0.8"
-PREFERRED_VERSION_openssl = "1.0.0"
-PREFERRED_VERSION_openssl-native = "1.0.0"
+PREFERRED_VERSION_openssl = "1.0.0a"
+PREFERRED_VERSION_openssl-native = "1.0.0a"
 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 6ac663e3af..0319ec316a 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -41,8 +41,8 @@ PREFERRED_VERSION_usbutils      = "0.86"
 PREFERRED_VERSION_wpa-supplicant = "0.6.9"
 PREFERRED_VERSION_glib-2.0      = "2.24.1"
 PREFERRED_VERSION_glib-2.0-native = "2.24.1"
-PREFERRED_VERSION_openssl = "1.0.0"
-PREFERRED_VERSION_openssl-native = "1.0.0"
+PREFERRED_VERSION_openssl = "1.0.0a"
+PREFERRED_VERSION_openssl-native = "1.0.0a"
 UDEV_GE_141 = "1"
 
 PREFERRED_VERSION_postgresql = "8.4.4"
diff --git a/recipes/openssl/openssl-1.0.0/configure-targets.patch b/recipes/openssl/openssl-1.0.0a/configure-targets.patch
similarity index 100%
rename from recipes/openssl/openssl-1.0.0/configure-targets.patch
rename to recipes/openssl/openssl-1.0.0a/configure-targets.patch
diff --git a/recipes/openssl/openssl-1.0.0/debian.patch b/recipes/openssl/openssl-1.0.0a/debian.patch
similarity index 100%
rename from recipes/openssl/openssl-1.0.0/debian.patch
rename to recipes/openssl/openssl-1.0.0a/debian.patch
diff --git a/recipes/openssl/openssl-1.0.0/engines-install-in-libdir-ssl.patch b/recipes/openssl/openssl-1.0.0a/engines-install-in-libdir-ssl.patch
similarity index 100%
rename from recipes/openssl/openssl-1.0.0/engines-install-in-libdir-ssl.patch
rename to recipes/openssl/openssl-1.0.0a/engines-install-in-libdir-ssl.patch
diff --git a/recipes/openssl/openssl-1.0.0/libdeps-first.patch b/recipes/openssl/openssl-1.0.0a/libdeps-first.patch
similarity index 100%
rename from recipes/openssl/openssl-1.0.0/libdeps-first.patch
rename to recipes/openssl/openssl-1.0.0a/libdeps-first.patch
diff --git a/recipes/openssl/openssl-1.0.0/oe-ldflags.patch b/recipes/openssl/openssl-1.0.0a/oe-ldflags.patch
similarity index 100%
rename from recipes/openssl/openssl-1.0.0/oe-ldflags.patch
rename to recipes/openssl/openssl-1.0.0a/oe-ldflags.patch
diff --git a/recipes/openssl/openssl-1.0.0/shared-libs.patch b/recipes/openssl/openssl-1.0.0a/shared-libs.patch
similarity index 100%
rename from recipes/openssl/openssl-1.0.0/shared-libs.patch
rename to recipes/openssl/openssl-1.0.0a/shared-libs.patch
diff --git a/recipes/openssl/openssl-native_1.0.0.bb b/recipes/openssl/openssl-native_1.0.0a.bb
similarity index 77%
rename from recipes/openssl/openssl-native_1.0.0.bb
rename to recipes/openssl/openssl-native_1.0.0a.bb
index 7029bfe77d..bb471b0ee2 100644
--- a/recipes/openssl/openssl-native_1.0.0.bb
+++ b/recipes/openssl/openssl-native_1.0.0a.bb
@@ -2,8 +2,8 @@ require openssl.inc
 
 inherit pkgconfig native
 
-SRC_URI[src.md5sum] = "89eaa86e25b2845f920ec00ae4c864ed"
-SRC_URI[src.sha256sum] = "1bbf9afc5a6215121ac094147d0a84178294fe4c3d0a231731038fd3717ba7ca"
+SRC_URI[src.md5sum] = "e3873edfffc783624cfbdb65e2249cbd"
+SRC_URI[src.sha256sum] = "18a9bd1fc02b8ef90dded34fafaa9089baaafef278a19fc4e89c2ab0dcf70f63"
 PR = "${INC_PR}.0"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/openssl/openssl_1.0.0.bb b/recipes/openssl/openssl_1.0.0a.bb
similarity index 77%
rename from recipes/openssl/openssl_1.0.0.bb
rename to recipes/openssl/openssl_1.0.0a.bb
index 4f7dcb7263..8dc4b89491 100644
--- a/recipes/openssl/openssl_1.0.0.bb
+++ b/recipes/openssl/openssl_1.0.0a.bb
@@ -1,10 +1,10 @@
 inherit pkgconfig
 
 require openssl.inc
-SRC_URI[src.md5sum] = "89eaa86e25b2845f920ec00ae4c864ed"
-SRC_URI[src.sha256sum] = "1bbf9afc5a6215121ac094147d0a84178294fe4c3d0a231731038fd3717ba7ca"
+SRC_URI[src.md5sum] = "e3873edfffc783624cfbdb65e2249cbd"
+SRC_URI[src.sha256sum] = "18a9bd1fc02b8ef90dded34fafaa9089baaafef278a19fc4e89c2ab0dcf70f63"
 
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.0"
 
 DEFAULT_PREFERENCE = "-1"