aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman I Khimov <khimov@altell.ru>2010-09-20 22:32:44 +0400
committerRoman I Khimov <khimov@altell.ru>2010-09-21 09:57:35 +0400
commit3e9ff12c2c9306b73de0892e7a02a90930458e8d (patch)
treed2e68c09b449fbb8c91b713c682a30e44f535c95
parent907d0ce00d72ee7f97bdd58193136ef15644bd9f (diff)
downloadopenembedded-3e9ff12c2c9306b73de0892e7a02a90930458e8d.tar.gz
openembedded-3e9ff12c2c9306b73de0892e7a02a90930458e8d.tar.bz2
openembedded-3e9ff12c2c9306b73de0892e7a02a90930458e8d.zip
bzip2: update 1.0.5 to 1.0.6
* fixes CVE-2010-0405 Signed-off-by: Roman I Khimov <khimov@altell.ru> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
-rw-r--r--recipes/bzip2/bzip2-1.0.6/bzip2-1.0.5-autoconfiscated.patch (renamed from recipes/bzip2/bzip2-1.0.5/bzip2-1.0.5-autoconfiscated.patch)4
-rw-r--r--recipes/bzip2/bzip2-full-native_1.0.6.bb (renamed from recipes/bzip2/bzip2-full-native_1.0.5.bb)7
-rw-r--r--recipes/bzip2/bzip2_1.0.6.bb (renamed from recipes/bzip2/bzip2_1.0.5.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
index ad720b8b38..af2bc7e450 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@bzip.org>])
++AC_INIT([bzip2], [1.0.6], [Julian Seward <jseward@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
index 14240e2ad8..896a271945 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
index a088230bbb..0d6d030527 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"