diff options
| author | Wenzong Fan <wenzong.fan@windriver.com> | 2015-10-13 22:55:17 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-24 12:17:45 +0100 |
| commit | b983822b57f60c5c210c9f23b3541f450d04ae3d (patch) | |
| tree | e114ccae3ec8f5d497376bffaf32d4e96f05f67c /meta | |
| parent | 48a596fe8564d8bbc3b84dcc47dec8476e7da0d2 (diff) | |
| download | openembedded-core-b983822b57f60c5c210c9f23b3541f450d04ae3d.tar.gz openembedded-core-b983822b57f60c5c210c9f23b3541f450d04ae3d.tar.bz2 openembedded-core-b983822b57f60c5c210c9f23b3541f450d04ae3d.zip | |
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).
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-extended/bzip2/bzip2-1.0.6/fix-bunzip2-qt-returns-0-for-corrupt-archives.patch | 55 | ||||
| -rw-r--r-- | meta/recipes-extended/bzip2/bzip2_1.0.6.bb | 1 |
2 files changed, 56 insertions, 0 deletions
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 new file mode 100644 index 0000000000..ece90d94e6 --- /dev/null +++ b/meta/recipes-extended/bzip2/bzip2-1.0.6/fix-bunzip2-qt-returns-0-for-corrupt-archives.patch @@ -0,0 +1,55 @@ +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.bb b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb index 233fe4c33b..d7b8c0655a 100644 --- a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb +++ b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;beginline=8;endline=37;md5=40d9d1eb05736d1bfc PR = "r5" SRC_URI = "http://www.bzip.org/${PV}/${BP}.tar.gz \ + file://fix-bunzip2-qt-returns-0-for-corrupt-archives.patch \ file://configure.ac;subdir=${BP} \ file://Makefile.am;subdir=${BP} \ file://run-ptest" |