Removed patches were upstreamed. Signed-off-by: Oleksandr Kravchuk <open.sou...@oleksandr-kravchuk.com> --- .../bzip2/bzip2-1.0.6/CVE-2016-3189.patch | 18 ------ ...p2-qt-returns-0-for-corrupt-archives.patch | 55 ------------------- .../bzip2/{bzip2-1.0.6 => bzip2}/Makefile.am | 0 .../bzip2/{bzip2-1.0.6 => bzip2}/configure.ac | 0 .../bzip2/{bzip2-1.0.6 => bzip2}/run-ptest | 0 .../bzip2/{bzip2_1.0.6.bb => bzip2_1.0.7.bb} | 13 ++--- 6 files changed, 4 insertions(+), 82 deletions(-) delete mode 100644 meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2016-3189.patch delete mode 100644 meta/recipes-extended/bzip2/bzip2-1.0.6/fix-bunzip2-qt-returns-0-for-corrupt-archives.patch rename meta/recipes-extended/bzip2/{bzip2-1.0.6 => bzip2}/Makefile.am (100%) rename meta/recipes-extended/bzip2/{bzip2-1.0.6 => bzip2}/configure.ac (100%) rename meta/recipes-extended/bzip2/{bzip2-1.0.6 => bzip2}/run-ptest (100%) rename meta/recipes-extended/bzip2/{bzip2_1.0.6.bb => bzip2_1.0.7.bb} (77%)
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 <akus...@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/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....@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....@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/Makefile.am b/meta/recipes-extended/bzip2/bzip2/Makefile.am similarity index 100% rename from meta/recipes-extended/bzip2/bzip2-1.0.6/Makefile.am rename to 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 similarity index 100% rename from meta/recipes-extended/bzip2/bzip2-1.0.6/configure.ac rename to 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 similarity index 100% rename from meta/recipes-extended/bzip2/bzip2-1.0.6/run-ptest rename to 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 similarity index 77% rename from meta/recipes-extended/bzip2/bzip2_1.0.6.bb rename to 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/" SECTION = "console/utils" LICENSE = "bzip2" LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;endline=37;md5=39406315f540c69bd05b1531daedd2ae" -PR = "r5" -SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/${BP}.tar.gz \ - file://fix-bunzip2-qt-returns-0-for-corrupt-archives.patch \ +SRC_URI = "https://sourceware.org/pub/${BPN}/${BPN}-${PV}.tar.gz \ file://configure.ac;subdir=${BP} \ file://Makefile.am;subdir=${BP} \ file://run-ptest \ - file://CVE-2016-3189.patch \ " +SRC_URI[md5sum] = "1a6a61cc867be4f3d6549037a09bf13e" +SRC_URI[sha256sum] = "e768a87c5b1a79511499beb41500bcc4caf203726fff46a6f5f9ad27fe08ab2b" -SRC_URI[md5sum] = "00b516f4704d4a7cb50a1d97e6e8e15b" -SRC_URI[sha256sum] = "a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd" - -UPSTREAM_CHECK_URI = "https://www.sourceware.org/bzip2/" +UPSTREAM_CHECK_URI = "https://www.sourceware.org/pub/bzip2/" UPSTREAM_VERSION_UNKNOWN = "1" PACKAGES =+ "libbz2" @@ -44,4 +40,3 @@ RDEPENDS_${PN}-ptest += "make" PROVIDES_append_class-native = " bzip2-replacement-native" BBCLASSEXTEND = "native nativesdk" - -- 2.17.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core