I think you need to rebase this on master first, as it already has 2.3.0. And removing patches needs to be explained.
Alex On Tue, 25 May 2021 at 11:10, Andrej Valek <[email protected]> wrote: > Includes lot of security fixes, especially CVE-2013-0340/CWE-776. > > Signed-off-by: Andrej Valek <[email protected]> > --- > .../expat/0001-Add-output-of-tests-result.patch | 83 > ---------------------- > .../expat/{expat_2.2.10.bb => expat_2.4.1.bb} | 3 +- > 2 files changed, 1 insertion(+), 85 deletions(-) > delete mode 100644 > meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patch > rename meta/recipes-core/expat/{expat_2.2.10.bb => expat_2.4.1.bb} (84%) > > diff --git > a/meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patch > b/meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patch > deleted file mode 100644 > index c5c18ead74..0000000000 > --- a/meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patch > +++ /dev/null > @@ -1,83 +0,0 @@ > -From aa84835a00bfd65e784d58411e76f60658e939dc Mon Sep 17 00:00:00 2001 > -From: Oleksandr Popovych <[email protected]> > -Date: Tue, 18 Feb 2020 19:04:55 +0200 > -Subject: [PATCH] Add output of tests result > - > -Added console output of testing results in form 'RESULT: TEST_NAME'. > - > -Changed verbose mode of test application set by '-v' ('--verbose') > -argument to CK_NORMAL. > -Added new supported argument '-vv' ('--extra-verbose') that changes > -verbose mode of test application to CK_VERBOSE. Results of each test > -are shown in output only if this mode is set. > - > -Upstream-Status: Denied > - > -This patch changes potentially deprecated feature that shoud be changed > -in upstream. [https://github.com/libexpat/libexpat/issues/382] > - > -Signed-off-by: Oleksandr Popovych <[email protected]> > ---- > - tests/minicheck.c | 10 +++++++++- > - tests/runtests.c | 4 +++- > - 2 files changed, 12 insertions(+), 2 deletions(-) > - > -diff --git a/expat/tests/minicheck.c b/expat/tests/minicheck.c > -index a5a1efb..94fa412 100644 > ---- a/tests/minicheck.c > -+++ b/tests/minicheck.c > -@@ -164,6 +164,8 @@ srunner_run_all(SRunner *runner, int verbosity) { > - if (tc->setup != NULL) { > - /* setup */ > - if (setjmp(env)) { > -+ if (verbosity >= CK_VERBOSE) > -+ printf("SKIP: %s\n", _check_current_function); > - add_failure(runner, verbosity); > - continue; > - } > -@@ -171,6 +173,8 @@ srunner_run_all(SRunner *runner, int verbosity) { > - } > - /* test */ > - if (setjmp(env)) { > -+ if (verbosity >= CK_VERBOSE) > -+ printf("FAIL: %s\n", _check_current_function); > - add_failure(runner, verbosity); > - continue; > - } > -@@ -178,12 +182,16 @@ srunner_run_all(SRunner *runner, int verbosity) { > - > - /* teardown */ > - if (tc->teardown != NULL) { > -- if (setjmp(env)) { > -+ if (setjmp(env)) { > -+ if (verbosity >= CK_VERBOSE) > -+ printf("PASS: %s\n", _check_current_function); > - add_failure(runner, verbosity); > - continue; > - } > - tc->teardown(); > - } > -+ if (verbosity >= CK_VERBOSE) > -+ printf("PASS: %s\n", _check_current_function); > - } > - tc = tc->next_tcase; > - } > -diff --git a/tests/runtests.c b/expat/tests/runtests.c > -index 7791fe0..75724e5 100644 > ---- a/tests/runtests.c > -+++ b/tests/runtests.c > -@@ -11619,9 +11619,11 @@ main(int argc, char *argv[]) { > - for (i = 1; i < argc; ++i) { > - char *opt = argv[i]; > - if (strcmp(opt, "-v") == 0 || strcmp(opt, "--verbose") == 0) > -- verbosity = CK_VERBOSE; > -+ verbosity = CK_NORMAL; > - else if (strcmp(opt, "-q") == 0 || strcmp(opt, "--quiet") == 0) > - verbosity = CK_SILENT; > -+ else if (strcmp(opt, "-vv") == 0 || strcmp(opt, "--extra-verbose") > == 0) > -+ verbosity = CK_VERBOSE; > - else { > - fprintf(stderr, "runtests: unknown option '%s'\n", opt); > - return 2; > --- > -2.17.1 > diff --git a/meta/recipes-core/expat/expat_2.2.10.bb > b/meta/recipes-core/expat/expat_2.4.1.bb > similarity index 84% > rename from meta/recipes-core/expat/expat_2.2.10.bb > rename to meta/recipes-core/expat/expat_2.4.1.bb > index fa263775b3..476c5f8cc7 100644 > --- a/meta/recipes-core/expat/expat_2.2.10.bb > +++ b/meta/recipes-core/expat/expat_2.4.1.bb > @@ -9,10 +9,9 @@ LIC_FILES_CHKSUM = > "file://COPYING;md5=9e2ce3b3c4c0f2670883a23bbd7c37a9" > SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ > file://libtool-tag.patch \ > file://run-ptest \ > - file://0001-Add-output-of-tests-result.patch \ > " > > -SRC_URI[sha256sum] = > "b2c160f1b60e92da69de8e12333096aeb0c3bf692d41c60794de278af72135a5" > +SRC_URI[sha256sum] = > "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40" > > EXTRA_OECMAKE_class-native += "-DEXPAT_BUILD_DOCS=OFF" > > -- > 2.11.0 > > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#152206): https://lists.openembedded.org/g/openembedded-core/message/152206 Mute This Topic: https://lists.openembedded.org/mt/83071958/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
