bzip2: version bump 1.0.6 -> 1.0.8

Patch 0002 (CVE-2016-3189) was merged upstream in bzip2-1.0.7, remove
it. Unfuzz the other patch.

The copyright dates, the version number and the author's e-mail address
changed in LICENSE.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
Message-Id: <20210516185231.5680-3-rhi@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

5 files changed, 12 insertions, 38 deletions

diff --git a/patches/bzip2-1.0.6/0002-bzip2recover-Fix-potential-use-after-free.patch b/patches/bzip2-1.0.6/0002-bzip2recover-Fix-potential-use-after-free.patch
deleted file mode 100644
index d3ba2379a..000000000
--- a/patches/bzip2-1.0.6/0002-bzip2recover-Fix-potential-use-after-free.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Jakub Martisko <jamartis@redhat.com>
-Date: Wed, 30 Mar 2016 10:22:27 +0200
-Subject: [PATCH] bzip2recover: Fix potential use-after-free
-
-Origin: https://bugzilla.redhat.com/attachment.cgi?id=1169843&action=edit
-Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2016-3189
-Bug-Debian: https://bugs.debian.org/827744
----
- bzip2recover.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/bzip2recover.c b/bzip2recover.c
-index f9de0496abf1..252c1b79853d 100644
---- a/bzip2recover.c
-+++ b/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/patches/bzip2-1.0.6/series b/patches/bzip2-1.0.6/series
deleted file mode 100644
index faf98db85..000000000
--- a/patches/bzip2-1.0.6/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-fixup-Makefile.patch
-0002-bzip2recover-Fix-potential-use-after-free.patch
-# b97444d53b93823526970708b2bbb965  - git-ptx-patches magic
diff --git a/patches/bzip2-1.0.6/0001-fixup-Makefile.patch b/patches/bzip2-1.0.8/0001-fixup-Makefile.patch
index 0e2602134..af14b2d54 100644
--- a/patches/bzip2-1.0.6/0001-fixup-Makefile.patch
+++ b/patches/bzip2-1.0.8/0001-fixup-Makefile.patch
@@ -3,17 +3,15 @@ Date: Sat, 29 Oct 2011 18:59:40 +0200
 Subject: [PATCH] fixup Makefile
 
 This patch fixes various problems in the makefile and disables compile
-time test. It was taken from Debinan.
+time test. It was taken from Debian.
 
 Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
 ---
-# 20091210 rsc: needs probably another look before going mainline
-
- Makefile |  134 ++++++++++++++++++++++++++++++++------------------------------
- 1 files changed, 69 insertions(+), 65 deletions(-)
+ Makefile | 134 ++++++++++++++++++++++++++++++++-------------------------------
+ 1 file changed, 69 insertions(+), 65 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 9754ddf286b1..8e6a46b63904 100644
+index f8a17722e1c3..d2c7e75ed744 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -12,6 +12,8 @@
@@ -203,5 +201,5 @@ index 9754ddf286b1..8e6a46b63904 100644
 -	rm -f manual.ps manual.html manual.pdf
 +	#rm -f manual.ps manual.html manual.pdf
  
- DISTNAME=bzip2-1.0.6
+ DISTNAME=bzip2-1.0.8
  dist: check manual
diff --git a/patches/bzip2-1.0.8/series b/patches/bzip2-1.0.8/series
new file mode 100644
index 000000000..78ff34566
--- /dev/null
+++ b/patches/bzip2-1.0.8/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-fixup-Makefile.patch
+# cf8c416b9e8252c5e89375edfd4523b9  - git-ptx-patches magic
diff --git a/rules/bzip2.make b/rules/bzip2.make
index 4bf856e56..8247b24c1 100644
--- a/rules/bzip2.make
+++ b/rules/bzip2.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_BZIP2) += bzip2
 #
 # Paths and names
 #
-BZIP2_VERSION	:= 1.0.6
-BZIP2_MD5	:= 00b516f4704d4a7cb50a1d97e6e8e15b
+BZIP2_VERSION	:= 1.0.8
+BZIP2_MD5	:= 67e051268d0c475ea773822f7500d0e5
 BZIP2		:= bzip2-$(BZIP2_VERSION)
 BZIP2_SUFFIX	:= tar.gz
 BZIP2_URL	:= \
@@ -25,7 +25,7 @@ BZIP2_URL	:= \
 BZIP2_SOURCE	:= $(SRCDIR)/$(BZIP2).$(BZIP2_SUFFIX)
 BZIP2_DIR	:= $(BUILDDIR)/$(BZIP2)
 BZIP2_LICENSE	:= bzip2-1.0.6
-BZIP2_LICENSE_FILES	:= file://LICENSE;md5=ddeb76cd34e791893c0f539fdab879bb
+BZIP2_LICENSE_FILES	:= file://LICENSE;md5=1e5cffe65fc786f83a11a4b225495c0b
 
 # ----------------------------------------------------------------------------
 # Prepare