bzip2: update to 1.0.7

Removed patches were upstreamed.

(From OE-Core rev: 3f88fcac8b5d3067bd4079af336eaf823ba00c96)

Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

5 files changed, 0 insertions, 159 deletions

diff --git a/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2016-3189.patch b/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2016-3189.patch
deleted file mode 100644
index 1d0c3a6dd3..0000000000
--- a/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2016-3189.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Upstream-Status: Backport
-https://bugzilla.suse.com/attachment.cgi?id=681334
-
-CVE: CVE-2016-3189
-Signed-off-by: Armin Kuster <akuster@mvista.com>
-
-Index: bzip2-1.0.6/bzip2recover.c
-===================================================================
---- bzip2-1.0.6.orig/bzip2recover.c
-+++ bzip2-1.0.6/bzip2recover.c
-@@ -457,6 +457,7 @@ Int32 main ( Int32 argc, Char** argv )
-             bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 );
-             bsPutUInt32 ( bsWr, blockCRC );
-             bsClose ( bsWr );
-+            outFile = NULL;
-          }
-          if (wrBlock >= rbCtr) break;
-          wrBlock++;
diff --git a/meta/recipes-extended/bzip2/bzip2-1.0.6/Makefile.am b/meta/recipes-extended/bzip2/bzip2-1.0.6/Makefile.am
deleted file mode 100644
index dcf64584d9..0000000000
--- a/meta/recipes-extended/bzip2/bzip2-1.0.6/Makefile.am
+++ /dev/null
@@ -1,73 +0,0 @@
-
-lib_LTLIBRARIES = libbz2.la
-libbz2_la_LDFLAGS = -version-info 1:6:0
-
-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)
-
-runtest:
-        ./bzip2 -1  < sample1.ref > sample1.rb2
-        ./bzip2 -2  < sample2.ref > sample2.rb2
-        ./bzip2 -3  < sample3.ref > sample3.rb2
-        ./bzip2 -d  < sample1.bz2 > sample1.tst
-        ./bzip2 -d  < sample2.bz2 > sample2.tst
-        ./bzip2 -ds < sample3.bz2 > sample3.tst
-        @if cmp sample1.bz2 sample1.rb2; then echo "PASS: sample1 compress";\
-        else echo "FAIL: sample1 compress"; fi
-        @if cmp sample2.bz2 sample2.rb2; then echo "PASS: sample2 compress";\
-        else echo "FAIL: sample2 compress"; fi
-        @if cmp sample3.bz2 sample3.rb2; then echo "PASS: sample3 compress";\
-        else echo "FAIL: sample3 compress"; fi
-        @if cmp sample1.tst sample1.ref; then echo "PASS: sample1 decompress";\
-        else echo "FAIL: sample1 decompress"; fi
-        @if cmp sample2.tst sample2.ref; then echo "PASS: sample2 decompress";\
-        else echo "FAIL: sample2 decompress"; fi
-        @if cmp sample3.tst sample3.ref; then echo "PASS: sample3 decompress";\
-        else echo "FAIL: sample3 decompress"; fi
-
-install-ptest:
-        sed  -n '/^runtest:/,/^install-ptest:/{/^install-ptest:/!p}' \
-           $(srcdir)/Makefile.am      > $(DESTDIR)/Makefile
-        cp $(srcdir)/sample1.ref        $(DESTDIR)/
-        cp $(srcdir)/sample2.ref        $(DESTDIR)/
-        cp $(srcdir)/sample3.ref        $(DESTDIR)/
-        cp $(srcdir)/sample1.bz2        $(DESTDIR)/
-        cp $(srcdir)/sample2.bz2        $(DESTDIR)/
-        cp $(srcdir)/sample3.bz2        $(DESTDIR)/
-        ln -s $(bindir)/bzip2           $(DESTDIR)/bzip2
-
-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
deleted file mode 100644
index e2bf1bf110..0000000000
--- a/meta/recipes-extended/bzip2/bzip2-1.0.6/configure.ac
+++ /dev/null
@@ -1,11 +0,0 @@
-AC_PREREQ([2.57])
-
-AC_INIT(bzip2, 1.0.6)
-AM_INIT_AUTOMAKE(foreign)
-AM_MAINTAINER_MODE
-
-AC_PROG_CC
-AC_PROG_LIBTOOL
-
-AC_OUTPUT([Makefile])
-
diff --git a/meta/recipes-extended/bzip2/bzip2-1.0.6/fix-bunzip2-qt-returns-0-for-corrupt-archives.patch b/meta/recipes-extended/bzip2/bzip2-1.0.6/fix-bunzip2-qt-returns-0-for-corrupt-archives.patch
deleted file mode 100644
index ece90d94e6..0000000000
--- a/meta/recipes-extended/bzip2/bzip2-1.0.6/fix-bunzip2-qt-returns-0-for-corrupt-archives.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 8068659388127e8e63f2d2297ba2348c72b20705 Mon Sep 17 00:00:00 2001
-From: Wenzong Fan <wenzong.fan@windriver.com>
-Date: Mon, 12 Oct 2015 03:19:51 -0400
-Subject: [PATCH] bzip2: fix bunzip2 -qt returns 0 for corrupt archives
-
-"bzip2 -t FILE" returns 2 if FILE exists, but is not a valid bzip2 file.
-"bzip2 -qt FILE" returns 0 when this happens, although it does print out
-an error message as is does so.
-
-This has been fix by Debian, just port changes from Debian patch file
-"20-legacy.patch".
-
-Debian defect:
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=279025
-
-Fix item from changelog:
-http://archive.debian.net/changelogs/pool/main/b/bzip2/bzip2_1.0.2-7/changelog
-
-  * Fixed "bunzip2 -qt returns 0 for corrupt archives" (Closes: #279025).
-
-Upstream-Status: Pending
-
-Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
----
- bzip2.c | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/bzip2.c b/bzip2.c
-index 6de9d1d..f2ce668 100644
---- a/bzip2.c
-+++ b/bzip2.c
-@@ -2003,12 +2003,14 @@ IntNative main ( IntNative argc, Char *argv[] )
-             testf ( aa->name );
-         }
-       }
--      if (testFailsExist && noisy) {
--         fprintf ( stderr,
--           "\n"
--           "You can use the `bzip2recover' program to attempt to recover\n"
--           "data from undamaged sections of corrupted files.\n\n"
--         );
-+      if (testFailsExist) {
-+         if (noisy) {
-+            fprintf ( stderr,
-+              "\n"
-+              "You can use the `bzip2recover' program to attempt to recover\n"
-+              "data from undamaged sections of corrupted files.\n\n"
-+            );
-+         }
-          setExit(2);
-          exit(exitValue);
-       }
--- 
-1.9.1
-
diff --git a/meta/recipes-extended/bzip2/bzip2-1.0.6/run-ptest b/meta/recipes-extended/bzip2/bzip2-1.0.6/run-ptest
deleted file mode 100644
index 3b20fce1ee..0000000000
--- a/meta/recipes-extended/bzip2/bzip2-1.0.6/run-ptest
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-make -k runtest