summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2016-3189.patch18
-rw-r--r--meta/recipes-extended/bzip2/bzip2-1.0.6/fix-bunzip2-qt-returns-0-for-corrupt-archives.patch55
-rw-r--r--meta/recipes-extended/bzip2/bzip2/Makefile.am (renamed from meta/recipes-extended/bzip2/bzip2-1.0.6/Makefile.am)0
-rw-r--r--meta/recipes-extended/bzip2/bzip2/configure.ac (renamed from meta/recipes-extended/bzip2/bzip2-1.0.6/configure.ac)0
-rw-r--r--meta/recipes-extended/bzip2/bzip2/run-ptest (renamed from meta/recipes-extended/bzip2/bzip2-1.0.6/run-ptest)0
-rw-r--r--meta/recipes-extended/bzip2/bzip2_1.0.7.bb (renamed from meta/recipes-extended/bzip2/bzip2_1.0.6.bb)13
6 files changed, 4 insertions, 82 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 @@
1Upstream-Status: Backport
2https://bugzilla.suse.com/attachment.cgi?id=681334
3
4CVE: CVE-2016-3189
5Signed-off-by: Armin Kuster <akuster@mvista.com>
6
7Index: bzip2-1.0.6/bzip2recover.c
8===================================================================
9--- bzip2-1.0.6.orig/bzip2recover.c
10+++ bzip2-1.0.6/bzip2recover.c
11@@ -457,6 +457,7 @@ Int32 main ( Int32 argc, Char** argv )
12 bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 );
13 bsPutUInt32 ( bsWr, blockCRC );
14 bsClose ( bsWr );
15+ outFile = NULL;
16 }
17 if (wrBlock >= rbCtr) break;
18 wrBlock++;
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 @@
1From 8068659388127e8e63f2d2297ba2348c72b20705 Mon Sep 17 00:00:00 2001
2From: Wenzong Fan <wenzong.fan@windriver.com>
3Date: Mon, 12 Oct 2015 03:19:51 -0400
4Subject: [PATCH] bzip2: fix bunzip2 -qt returns 0 for corrupt archives
5
6"bzip2 -t FILE" returns 2 if FILE exists, but is not a valid bzip2 file.
7"bzip2 -qt FILE" returns 0 when this happens, although it does print out
8an error message as is does so.
9
10This has been fix by Debian, just port changes from Debian patch file
11"20-legacy.patch".
12
13Debian defect:
14https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=279025
15
16Fix item from changelog:
17http://archive.debian.net/changelogs/pool/main/b/bzip2/bzip2_1.0.2-7/changelog
18
19 * Fixed "bunzip2 -qt returns 0 for corrupt archives" (Closes: #279025).
20
21Upstream-Status: Pending
22
23Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
24---
25 bzip2.c | 14 ++++++++------
26 1 file changed, 8 insertions(+), 6 deletions(-)
27
28diff --git a/bzip2.c b/bzip2.c
29index 6de9d1d..f2ce668 100644
30--- a/bzip2.c
31+++ b/bzip2.c
32@@ -2003,12 +2003,14 @@ IntNative main ( IntNative argc, Char *argv[] )
33 testf ( aa->name );
34 }
35 }
36- if (testFailsExist && noisy) {
37- fprintf ( stderr,
38- "\n"
39- "You can use the `bzip2recover' program to attempt to recover\n"
40- "data from undamaged sections of corrupted files.\n\n"
41- );
42+ if (testFailsExist) {
43+ if (noisy) {
44+ fprintf ( stderr,
45+ "\n"
46+ "You can use the `bzip2recover' program to attempt to recover\n"
47+ "data from undamaged sections of corrupted files.\n\n"
48+ );
49+ }
50 setExit(2);
51 exit(exitValue);
52 }
53--
541.9.1
55
diff --git a/meta/recipes-extended/bzip2/bzip2-1.0.6/Makefile.am b/meta/recipes-extended/bzip2/bzip2/Makefile.am
index dcf64584d9..dcf64584d9 100644
--- a/meta/recipes-extended/bzip2/bzip2-1.0.6/Makefile.am
+++ b/meta/recipes-extended/bzip2/bzip2/Makefile.am
diff --git a/meta/recipes-extended/bzip2/bzip2-1.0.6/configure.ac b/meta/recipes-extended/bzip2/bzip2/configure.ac
index e2bf1bf110..e2bf1bf110 100644
--- a/meta/recipes-extended/bzip2/bzip2-1.0.6/configure.ac
+++ b/meta/recipes-extended/bzip2/bzip2/configure.ac
diff --git a/meta/recipes-extended/bzip2/bzip2-1.0.6/run-ptest b/meta/recipes-extended/bzip2/bzip2/run-ptest
index 3b20fce1ee..3b20fce1ee 100644
--- a/meta/recipes-extended/bzip2/bzip2-1.0.6/run-ptest
+++ b/meta/recipes-extended/bzip2/bzip2/run-ptest
diff --git a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb b/meta/recipes-extended/bzip2/bzip2_1.0.7.bb
index 15a8e51550..02e9d9ef07 100644
--- a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
+++ b/meta/recipes-extended/bzip2/bzip2_1.0.7.bb
@@ -6,20 +6,16 @@ HOMEPAGE = "https://sourceware.org/bzip2/"
6SECTION = "console/utils" 6SECTION = "console/utils"
7LICENSE = "bzip2" 7LICENSE = "bzip2"
8LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;endline=37;md5=39406315f540c69bd05b1531daedd2ae" 8LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;endline=37;md5=39406315f540c69bd05b1531daedd2ae"
9PR = "r5"
10 9
11SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/${BP}.tar.gz \ 10SRC_URI = "https://sourceware.org/pub/${BPN}/${BPN}-${PV}.tar.gz \
12 file://fix-bunzip2-qt-returns-0-for-corrupt-archives.patch \
13 file://configure.ac;subdir=${BP} \ 11 file://configure.ac;subdir=${BP} \
14 file://Makefile.am;subdir=${BP} \ 12 file://Makefile.am;subdir=${BP} \
15 file://run-ptest \ 13 file://run-ptest \
16 file://CVE-2016-3189.patch \
17 " 14 "
15SRC_URI[md5sum] = "1a6a61cc867be4f3d6549037a09bf13e"
16SRC_URI[sha256sum] = "e768a87c5b1a79511499beb41500bcc4caf203726fff46a6f5f9ad27fe08ab2b"
18 17
19SRC_URI[md5sum] = "00b516f4704d4a7cb50a1d97e6e8e15b" 18UPSTREAM_CHECK_URI = "https://www.sourceware.org/pub/bzip2/"
20SRC_URI[sha256sum] = "a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"
21
22UPSTREAM_CHECK_URI = "https://www.sourceware.org/bzip2/"
23UPSTREAM_VERSION_UNKNOWN = "1" 19UPSTREAM_VERSION_UNKNOWN = "1"
24 20
25PACKAGES =+ "libbz2" 21PACKAGES =+ "libbz2"
@@ -44,4 +40,3 @@ RDEPENDS_${PN}-ptest += "make"
44 40
45PROVIDES_append_class-native = " bzip2-replacement-native" 41PROVIDES_append_class-native = " bzip2-replacement-native"
46BBCLASSEXTEND = "native nativesdk" 42BBCLASSEXTEND = "native nativesdk"
47