[oe-commits] Roman I Khimov : bzip2: update 1.0.5 to 1.0.6

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 3e9ff12c2c9306b73de0892e7a02a90930458e8d
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=3e9ff12c2c9306b73de0892e7a02a90930458e8d

Author: Roman I Khimov <khimov at altell.ru>
Date:   Mon Sep 20 22:32:44 2010 +0400

bzip2: update 1.0.5 to 1.0.6

 * fixes CVE-2010-0405

Signed-off-by: Roman I Khimov <khimov at altell.ru>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>

---

 .../bzip2-1.0.5-autoconfiscated.patch              |    4 ++--
 ...-native_1.0.5.bb => bzip2-full-native_1.0.6.bb} |    7 +++----
 recipes/bzip2/{bzip2_1.0.5.bb => bzip2_1.0.6.bb}   |    9 ++++-----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/recipes/bzip2/bzip2-1.0.5/bzip2-1.0.5-autoconfiscated.patch b/recipes/bzip2/bzip2-1.0.6/bzip2-1.0.5-autoconfiscated.patch
similarity index 99%
rename from recipes/bzip2/bzip2-1.0.5/bzip2-1.0.5-autoconfiscated.patch
rename to recipes/bzip2/bzip2-1.0.6/bzip2-1.0.5-autoconfiscated.patch
index ad720b8..af2bc7e 100644
--- a/recipes/bzip2/bzip2-1.0.5/bzip2-1.0.5-autoconfiscated.patch
+++ b/recipes/bzip2/bzip2-1.0.6/bzip2-1.0.5-autoconfiscated.patch
@@ -61,9 +61,9 @@ diff -urN bzip2-1.0.5.orig/configure.ac bzip2-1.0.5.autoconfiscated/configure.ac
 +# Process this file with autoconf to produce a configure script.
 +
 +AC_PREREQ([2.57])
-+AC_INIT([bzip2], [1.0.5], [Julian Seward <jseward at bzip.org>])
++AC_INIT([bzip2], [1.0.6], [Julian Seward <jseward at bzip.org>])
 +BZIP2_LT_CURRENT=1
-+BZIP2_LT_REVISION=5
++BZIP2_LT_REVISION=6
 +BZIP2_LT_AGE=0
 +AC_CONFIG_SRCDIR([bzlib.h])
 +AC_CONFIG_MACRO_DIR([m4])
diff --git a/recipes/bzip2/bzip2-full-native_1.0.5.bb b/recipes/bzip2/bzip2-full-native_1.0.6.bb
similarity index 71%
rename from recipes/bzip2/bzip2-full-native_1.0.5.bb
rename to recipes/bzip2/bzip2-full-native_1.0.6.bb
index 14240e2..896a271 100644
--- a/recipes/bzip2/bzip2-full-native_1.0.5.bb
+++ b/recipes/bzip2/bzip2-full-native_1.0.6.bb
@@ -1,11 +1,13 @@
 DESCRIPTION = "Very high-quality data compression program"
 SECTION = "console/utils"
-PR = "r1"
+PR = "r0"
 
 LICENSE = "bzip2"
 FILESPATHPKG =. "bzip2-${PV}:"
 SRC_URI = "http://www.bzip.org/${PV}/bzip2-${PV}.tar.gz \
 	   file://bzip2-1.0.5-autoconfiscated.patch"
+SRC_URI[md5sum] = "00b516f4704d4a7cb50a1d97e6e8e15b"
+SRC_URI[sha256sum] = "a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"
 
 S = "${WORKDIR}/bzip2-${PV}"
 
@@ -14,6 +16,3 @@ inherit autotools pkgconfig native
 do_configure_prepend () {
 	if test -f LICENSE ; then sh ./autogen.sh ; fi
 }
-
-SRC_URI[md5sum] = "3c15a0c8d1d3ee1c46a1634d00617b1a"
-SRC_URI[sha256sum] = "f7bf5368309d76e5daf3a89d4d1bea688dac7780742e7a0ae1af19be9316fe22"
diff --git a/recipes/bzip2/bzip2_1.0.5.bb b/recipes/bzip2/bzip2_1.0.6.bb
similarity index 79%
rename from recipes/bzip2/bzip2_1.0.5.bb
rename to recipes/bzip2/bzip2_1.0.6.bb
index a088230..0d6d030 100644
--- a/recipes/bzip2/bzip2_1.0.5.bb
+++ b/recipes/bzip2/bzip2_1.0.6.bb
@@ -1,10 +1,12 @@
 DESCRIPTION = "Very high-quality data compression program"
 SECTION = "console/utils"
-PR = "r2"
+PR = "r0"
 
 LICENSE = "bzip2"
 SRC_URI = "http://www.bzip.org/${PV}/bzip2-${PV}.tar.gz \
 	   file://bzip2-1.0.5-autoconfiscated.patch"
+SRC_URI[md5sum] = "00b516f4704d4a7cb50a1d97e6e8e15b"
+SRC_URI[sha256sum] = "a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"
 
 inherit autotools pkgconfig
 
@@ -15,7 +17,7 @@ do_configure_prepend () {
 do_install_append () {
 	mv ${D}${bindir}/bunzip2 ${D}${bindir}/bunzip2.${PN}
 	mv ${D}${bindir}/bzcat ${D}${bindir}/bzcat.${PN}
-	ln -sf libbz2.so.1.0.5 ${D}${libdir}/libbz2.so.1.0
+	ln -sf libbz2.so.${PV} ${D}${libdir}/libbz2.so.1.0
 }
 
 PACKAGES =+ "libbz2"
@@ -30,6 +32,3 @@ pkg_prerm_${PN} () {
 	update-alternatives --remove bunzip2 bunzip2.${PN}
 	update-alternatives --remove bzcat bzcat.${PN}
 }
-
-SRC_URI[md5sum] = "3c15a0c8d1d3ee1c46a1634d00617b1a"
-SRC_URI[sha256sum] = "f7bf5368309d76e5daf3a89d4d1bea688dac7780742e7a0ae1af19be9316fe22"