[Buildroot] [PATCH 1/1] package/bzip2: security bump version to 1.0.8

[Buildroot] [PATCH 1/1] package/bzip2: security bump version to 1.0.8

[Bernd Kuhls]

Switched to new maintainer source:
https://sourceware.org/ml/bzip2-devel/2019-q2/msg00022.html

Version 1.0.7 fixes CVE-2016-3189 & CVE-2019-12900.

Version 1.0.8 fixes the fix for CVE-2019-12900 from 1.0.7:
https://sourceware.org/ml/bzip2-devel/2019-q3/msg00031.html

Rebased patch 0002-improve-build-system.patch.

Added upstream sha512 hash and updated license hash after upstream
commits:
https://sourceware.org/git/?p=bzip2.git;a=history;f=LICENSE;h=81a37eab7a5be1a34456f38adb74928cc9073e9b;hb=HEAD

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/bzip2/0002-improve-build-system.patch | 14 +++++++-------
 package/bzip2/Config.in                       |  2 ++
 package/bzip2/bzip2.hash                      |  8 +++-----
 package/bzip2/bzip2.mk                        |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/package/bzip2/0002-improve-build-system.patch b/package/bzip2/0002-improve-build-system.patch
index 90099aa288..2d6e2cf900 100644
--- a/package/bzip2/0002-improve-build-system.patch
+++ b/package/bzip2/0002-improve-build-system.patch
@@ -70,15 +70,15 @@ Index: b/Makefile-libbz2_so
        huffman.o    \
 @@ -37,8 +36,11 @@
  all: $(OBJS)
- 	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
- 	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
+ 	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS)
+ 	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
 -	rm -f libbz2.so.1.0
--	ln -s libbz2.so.1.0.6 libbz2.so.1.0
+-	ln -s libbz2.so.1.0.8 libbz2.so.1.0
 +
 +install:
-+	install -m 0755 -D libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1.0.6
-+	ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so
-+	ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1.0
++	install -m 0755 -D libbz2.so.1.0.8 $(PREFIX)/lib/libbz2.so.1.0.8
++	ln -sf libbz2.so.1.0.8 $(PREFIX)/lib/libbz2.so
++	ln -sf libbz2.so.1.0.8 $(PREFIX)/lib/libbz2.so.1.0
  
  clean: 
- 	rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared
+ 	rm -f $(OBJS) bzip2.o libbz2.so.1.0.8 libbz2.so.1.0 bzip2-shared
diff --git a/package/bzip2/Config.in b/package/bzip2/Config.in
index ca447bbb2d..7db1902b60 100644
--- a/package/bzip2/Config.in
+++ b/package/bzip2/Config.in
@@ -5,3 +5,5 @@ config BR2_PACKAGE_BZIP2
 	  It typically compresses files to within 10% to 15% of the best
 	  available techniques, while being around twice as fast at
 	  compression and six times faster at decompression.
+
+	  https://sourceware.org/bzip2/
diff --git a/package/bzip2/bzip2.hash b/package/bzip2/bzip2.hash
index ffe94aa454..cf66c402fc 100644
--- a/package/bzip2/bzip2.hash
+++ b/package/bzip2/bzip2.hash
@@ -1,6 +1,4 @@
-# From http://www.bzip.org/downloads.html
-md5	00b516f4704d4a7cb50a1d97e6e8e15b	bzip2-1.0.6.tar.gz
-
+# From https://sourceware.org/pub/bzip2/sha512.sum
+sha512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3  bzip2-1.0.8.tar.gz
 # Locally calculated
-sha256	a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd	bzip2-1.0.6.tar.gz
-sha256	4919cfb14a73cd64fcef67b107613970cf1659a09aa675dba31314f373bc7204	LICENSE
+sha256 c6dbbf828498be844a89eaa3b84adbab3199e342eb5cb2ed2f0d4ba7ec0f38a3  LICENSE
diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk
index a3af322993..b4d8eea25e 100644
--- a/package/bzip2/bzip2.mk
+++ b/package/bzip2/bzip2.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-BZIP2_VERSION = 1.0.6
-BZIP2_SITE = http://sources.buildroot.net
+BZIP2_VERSION = 1.0.8
+BZIP2_SITE = https://sourceware.org/pub/bzip2
 BZIP2_INSTALL_STAGING = YES
 BZIP2_LICENSE = bzip2 license
 BZIP2_LICENSE_FILES = LICENSE
-- 
2.20.1

[Buildroot] [PATCH 1/1] package/bzip2: security bump version to 1.0.8

[Peter Korsgaard]

>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:

 > Switched to new maintainer source:
 > https://sourceware.org/ml/bzip2-devel/2019-q2/msg00022.html

 > Version 1.0.7 fixes CVE-2016-3189 & CVE-2019-12900.

But we already have a fix for CVE-2019-12900 in
0003-Make-sure-nSelectors-is-not-out-of-range.patch. How come you are
not removing it?

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/1] package/bzip2: security bump version to 1.0.8

[Bernd Kuhls]

Am Sat, 03 Aug 2019 22:33:00 +0200 schrieb Peter Korsgaard:

> But we already have a fix for CVE-2019-12900 in
> 0003-Make-sure-nSelectors-is-not-out-of-range.patch. How come you are
> not removing it?

Hi Peter,

because the patch did not fail to apply to 1.0.8 and does not contain any 
mention about being a CVE fix.

In fact this patch was reverted upstream for the 1.0.8 release:
https://sourceware.org/git/?
p=bzip2.git;a=commitdiff;h=b07b105d1b66e32760095e3602261738443b9e13

Thanks for the hint, sent v2: http://patchwork.ozlabs.org/patch/1141605/

Regards, Bernd

[Buildroot] [PATCH 1/1] package/bzip2: security bump version to 1.0.8

[Peter Korsgaard]

>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:

 > Am Sat, 03 Aug 2019 22:33:00 +0200 schrieb Peter Korsgaard:
 >> But we already have a fix for CVE-2019-12900 in
 >> 0003-Make-sure-nSelectors-is-not-out-of-range.patch. How come you are
 >> not removing it?

 > Hi Peter,

 > because the patch did not fail to apply to 1.0.8 and does not contain any 
 > mention about being a CVE fix.

The git history does, and the upstream git history of decompress.c shows
that it should be removed.

git log package/bzip2/0003-Make-sure-nSelectors-is-not-out-of-range.patch
commit 6581c441dfc06c5e5e3666718e5c2e9801485ede
Author: Jared Bents <jared.bents@rockwellcollins.com>
Date:   Wed Jun 26 09:20:42 2019 -0500

    package/bzip2: add upstream security fix for CVE-2019-12900

    Patch to resolve cve-2019-12900 which affects bzip2 versions 1.0.6 and older

    More information can be found at
    https://nvd.nist.gov/vuln/detail/CVE-2019-12900

    Signed-off-by: Jared Bents <jared.bents@rockwellcollins.com>
    Signed-off-by: Peter Korsgaard <peter@korsgaard.com>


And the patch _IS_ the upstream git commit, as specified in the file:


https://sourceware.org/git/?p=bzip2.git;a=commit;h=7ed62bfb46e87a9e878712603469440e6882b184

 > In fact this patch was reverted upstream for the 1.0.8 release:
 > https://sourceware.org/git/?
 > p=bzip2.git;a=commitdiff;h=b07b105d1b66e32760095e3602261738443b9e13

 > Thanks for the hint, sent v2: http://patchwork.ozlabs.org/patch/1141605/

Thanks.

-- 
Bye, Peter Korsgaard