From a0fb0c209056a958a5d775cc9efee57875a6234a Mon Sep 17 00:00:00 2001 From: Qing He Date: Wed, 3 Nov 2010 15:06:24 +0800 Subject: bzip2: upgrade to version 1.0.6 resolves security bug CVE-2010-0405 Signed-off-by: Qing He --- .../recipes-extended/bzip2/bzip2-1.0.5/Makefile.am | 41 ---------------------- .../bzip2/bzip2-1.0.5/configure.ac | 14 -------- .../recipes-extended/bzip2/bzip2-1.0.6/Makefile.am | 41 ++++++++++++++++++++++ .../bzip2/bzip2-1.0.6/configure.ac | 14 ++++++++ meta/recipes-extended/bzip2/bzip2_1.0.5.bb | 26 -------------- meta/recipes-extended/bzip2/bzip2_1.0.6.bb | 26 ++++++++++++++ 6 files changed, 81 insertions(+), 81 deletions(-) delete mode 100644 meta/recipes-extended/bzip2/bzip2-1.0.5/Makefile.am delete mode 100644 meta/recipes-extended/bzip2/bzip2-1.0.5/configure.ac create mode 100644 meta/recipes-extended/bzip2/bzip2-1.0.6/Makefile.am create mode 100644 meta/recipes-extended/bzip2/bzip2-1.0.6/configure.ac delete mode 100644 meta/recipes-extended/bzip2/bzip2_1.0.5.bb create mode 100644 meta/recipes-extended/bzip2/bzip2_1.0.6.bb diff --git a/meta/recipes-extended/bzip2/bzip2-1.0.5/Makefile.am b/meta/recipes-extended/bzip2/bzip2-1.0.5/Makefile.am deleted file mode 100644 index 070d57b24..000000000 --- a/meta/recipes-extended/bzip2/bzip2-1.0.5/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ - -lib_LTLIBRARIES = libbz2.la - -libbz2_la_SOURCES = blocksort.c \ - huffman.c \ - crctable.c \ - randtable.c \ - compress.c \ - decompress.c \ - bzlib.c - -bin_PROGRAMS = bzip2 bzip2recover - -bzip2_SOURCES = bzip2.c -bzip2_LDADD = libbz2.la -bzip2_DEPENDENCIES = libbz2.la - -include_HEADERS = bzlib.h - -bzip2recover_SOURCES = bzip2recover.c -bzip2recover_LDADD = libbz2.la -bzip2recover_DEPENDENCIES = libbz2.la - -bin_SCRIPTS = bzgrep bzmore bzdiff - -man_MANS = bzip2.1 bzgrep.1 bzmore.1 bzdiff.1 -EXTRA_DIST = $(man_MANS) - -install-exec-hook: - ln -s $(bindir)/bzip2$(EXEEXT) $(DESTDIR)$(bindir)/bunzip2$(EXEEXT) - ln -s $(bindir)/bzip2$(EXEEXT) $(DESTDIR)$(bindir)/bzcat$(EXEEXT) - ln -s $(bindir)/bzgrep$(EXEEXT) $(DESTDIR)$(bindir)/bzegrep$(EXEEXT) - ln -s $(bindir)/bzgrep$(EXEEXT) $(DESTDIR)$(bindir)/bzfgrep$(EXEEXT) - ln -s $(bindir)/bzmore$(EXEEXT) $(DESTDIR)$(bindir)/bzless$(EXEEXT) - ln -s $(bindir)/bzdiff$(EXEEXT) $(DESTDIR)$(bindir)/bzcmp$(EXEEXT) - -install-data-hook: - echo ".so man1/bzgrep.1" > $(DESTDIR)$(mandir)/man1/bzegrep.1 - echo ".so man1/bzgrep.1" > $(DESTDIR)$(mandir)/man1/bzfgrep.1 - echo ".so man1/bzmore.1" > $(DESTDIR)$(mandir)/man1/bzless.1 - echo ".so man1/bzdiff.1" > $(DESTDIR)$(mandir)/man1/bzcmp.1 diff --git a/meta/recipes-extended/bzip2/bzip2-1.0.5/configure.ac b/meta/recipes-extended/bzip2/bzip2-1.0.5/configure.ac deleted file mode 100644 index 14b1d1809..000000000 --- a/meta/recipes-extended/bzip2/bzip2-1.0.5/configure.ac +++ /dev/null @@ -1,14 +0,0 @@ -AC_PREREQ([2.57]) - -AC_INIT(bzip2, 2.0.5, , libXrender) -AM_INIT_AUTOMAKE() -AM_MAINTAINER_MODE - -#AM_CONFIG_HEADER(config.h) - -# Check for progs -AC_PROG_CC -AC_PROG_LIBTOOL - -AC_OUTPUT([Makefile]) - diff --git a/meta/recipes-extended/bzip2/bzip2-1.0.6/Makefile.am b/meta/recipes-extended/bzip2/bzip2-1.0.6/Makefile.am new file mode 100644 index 000000000..070d57b24 --- /dev/null +++ b/meta/recipes-extended/bzip2/bzip2-1.0.6/Makefile.am @@ -0,0 +1,41 @@ + +lib_LTLIBRARIES = libbz2.la + +libbz2_la_SOURCES = blocksort.c \ + huffman.c \ + crctable.c \ + randtable.c \ + compress.c \ + decompress.c \ + bzlib.c + +bin_PROGRAMS = bzip2 bzip2recover + +bzip2_SOURCES = bzip2.c +bzip2_LDADD = libbz2.la +bzip2_DEPENDENCIES = libbz2.la + +include_HEADERS = bzlib.h + +bzip2recover_SOURCES = bzip2recover.c +bzip2recover_LDADD = libbz2.la +bzip2recover_DEPENDENCIES = libbz2.la + +bin_SCRIPTS = bzgrep bzmore bzdiff + +man_MANS = bzip2.1 bzgrep.1 bzmore.1 bzdiff.1 +EXTRA_DIST = $(man_MANS) + +install-exec-hook: + ln -s $(bindir)/bzip2$(EXEEXT) $(DESTDIR)$(bindir)/bunzip2$(EXEEXT) + ln -s $(bindir)/bzip2$(EXEEXT) $(DESTDIR)$(bindir)/bzcat$(EXEEXT) + ln -s $(bindir)/bzgrep$(EXEEXT) $(DESTDIR)$(bindir)/bzegrep$(EXEEXT) + ln -s $(bindir)/bzgrep$(EXEEXT) $(DESTDIR)$(bindir)/bzfgrep$(EXEEXT) + ln -s $(bindir)/bzmore$(EXEEXT) $(DESTDIR)$(bindir)/bzless$(EXEEXT) + ln -s $(bindir)/bzdiff$(EXEEXT) $(DESTDIR)$(bindir)/bzcmp$(EXEEXT) + +install-data-hook: + echo ".so man1/bzgrep.1" > $(DESTDIR)$(mandir)/man1/bzegrep.1 + echo ".so man1/bzgrep.1" > $(DESTDIR)$(mandir)/man1/bzfgrep.1 + echo ".so man1/bzmore.1" > $(DESTDIR)$(mandir)/man1/bzless.1 + echo ".so man1/bzdiff.1" > $(DESTDIR)$(mandir)/man1/bzcmp.1 diff --git a/meta/recipes-extended/bzip2/bzip2-1.0.6/configure.ac b/meta/recipes-extended/bzip2/bzip2-1.0.6/configure.ac new file mode 100644 index 000000000..14b1d1809 --- /dev/null +++ b/meta/recipes-extended/bzip2/bzip2-1.0.6/configure.ac @@ -0,0 +1,14 @@ +AC_PREREQ([2.57]) + +AC_INIT(bzip2, 2.0.5, , libXrender) +AM_INIT_AUTOMAKE() +AM_MAINTAINER_MODE + +#AM_CONFIG_HEADER(config.h) + +# Check for progs +AC_PROG_CC +AC_PROG_LIBTOOL + +AC_OUTPUT([Makefile]) + diff --git a/meta/recipes-extended/bzip2/bzip2_1.0.5.bb b/meta/recipes-extended/bzip2/bzip2_1.0.5.bb deleted file mode 100644 index 1e858f4b1..000000000 --- a/meta/recipes-extended/bzip2/bzip2_1.0.5.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "Very high-quality data compression program." -HOMEPAGE = "http://www.bzip.org/" -SECTION = "console/utils" -LICENSE = "bzip2" -LIC_FILES_CHKSUM = "file://LICENSE;beginline=8;endline=37;md5=40d9d1eb05736d1bfc86cfdd9106e6b2" -PR = "r3" - -SRC_URI = "http://www.bzip.org/${PV}/${BPN}-${PV}.tar.gz \ - file://configure.ac \ - file://Makefile.am" - -CFLAGS_append = " -fPIC -fpic -Winline -fno-strength-reduce -D_FILE_OFFSET_BITS=64" - -inherit autotools update-alternatives - -ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_LINKS = "${bindir}/bunzip2 ${bindir}/bzcat" - -do_configure_prepend () { - cp ${WORKDIR}/configure.ac ${S}/ - cp ${WORKDIR}/Makefile.am ${S}/ - cp ${STAGING_DATADIR_NATIVE}/automake*/install-sh ${S}/ -} - -PROVIDES_append_virtclass-native = " bzip2-full-native" -BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb new file mode 100644 index 000000000..1e858f4b1 --- /dev/null +++ b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Very high-quality data compression program." +HOMEPAGE = "http://www.bzip.org/" +SECTION = "console/utils" +LICENSE = "bzip2" +LIC_FILES_CHKSUM = "file://LICENSE;beginline=8;endline=37;md5=40d9d1eb05736d1bfc86cfdd9106e6b2" +PR = "r3" + +SRC_URI = "http://www.bzip.org/${PV}/${BPN}-${PV}.tar.gz \ + file://configure.ac \ + file://Makefile.am" + +CFLAGS_append = " -fPIC -fpic -Winline -fno-strength-reduce -D_FILE_OFFSET_BITS=64" + +inherit autotools update-alternatives + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_LINKS = "${bindir}/bunzip2 ${bindir}/bzcat" + +do_configure_prepend () { + cp ${WORKDIR}/configure.ac ${S}/ + cp ${WORKDIR}/Makefile.am ${S}/ + cp ${STAGING_DATADIR_NATIVE}/automake*/install-sh ${S}/ +} + +PROVIDES_append_virtclass-native = " bzip2-full-native" +BBCLASSEXTEND = "native" -- cgit v1.2.3