[oe][meta-python][kirkstone][PATCH] python3-pillow: Fix CVE-2023-44271
Add patch to fix CVE-2023-44271 Reference: https://github.com/python-pillow/Pillow/commit/1fe1bb49c452b0318cad12ea9d97c3bef188e9a7 Signed-off-by: Dnyandev Padalkar --- .../python3-pillow/CVE-2023-44271.patch | 156 ++ .../python/python3-pillow_9.4.0.bb| 1 + 2 files changed, 157 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python3-pillow/CVE-2023-44271.patch diff --git a/meta-python/recipes-devtools/python/python3-pillow/CVE-2023-44271.patch b/meta-python/recipes-devtools/python/python3-pillow/CVE-2023-44271.patch new file mode 100644 index 0..ad51f1728 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pillow/CVE-2023-44271.patch @@ -0,0 +1,156 @@ +From 1fe1bb49c452b0318cad12ea9d97c3bef188e9a7 Mon Sep 17 00:00:00 2001 +From: Andrew Murray +Date: Fri, 30 Jun 2023 23:32:26 +1000 +Subject: [PATCH] Added ImageFont.MAX_STRING_LENGTH + +Upstream-status: Backport [https://github.com/python-pillow/Pillow/commit/1fe1bb49c452b0318cad12ea9d97c3bef188e9a7] +CVE: CVE-2023-44271 +Comment: Refresh hunk for test_imagefont.py, ImageFont.py and +Remove hunk 10.0.0.rst because in our version it is 9.4.0 + +Signed-off-by: Pawan Badganchi +Signed-off-by: Dnyandev Padalkar +--- + Tests/test_imagefont.py | 19 +++ + docs/reference/ImageFont.rst | 18 ++ + src/PIL/ImageFont.py | 15 +++ + 3 files changed, 52 insertions(+) + +diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py +index 7fa8ff8cbfd..c50447a153d 100644 +--- a/Tests/test_imagefont.py b/Tests/test_imagefont.py +@@ -1107,6 +1107,25 @@ + assert_image_equal_tofile(im, "Tests/images/text_mono.gif") + + ++def test_too_many_characters(font): ++with pytest.raises(ValueError): ++font.getlength("A" * 101) ++with pytest.raises(ValueError): ++font.getbbox("A" * 101) ++with pytest.raises(ValueError): ++font.getmask2("A" * 101) ++ ++transposed_font = ImageFont.TransposedFont(font) ++with pytest.raises(ValueError): ++transposed_font.getlength("A" * 101) ++ ++default_font = ImageFont.load_default() ++with pytest.raises(ValueError): ++default_font.getlength("A" * 101) ++with pytest.raises(ValueError): ++default_font.getbbox("A" * 101) ++ ++ + @pytest.mark.parametrize( + "test_file", + [ +diff --git a/docs/reference/ImageFont.rst b/docs/reference/ImageFont.rst +index 946bd3c4bed..2abfa0cc997 100644 +--- a/docs/reference/ImageFont.rst b/docs/reference/ImageFont.rst +@@ -18,6 +18,15 @@ OpenType fonts (as well as other font formats supported by the FreeType + library). For earlier versions, TrueType support is only available as part of + the imToolkit package. + ++.. warning:: ++To protect against potential DOS attacks when using arbitrary strings as ++text input, Pillow will raise a ``ValueError`` if the number of characters ++is over a certain limit, :py:data:`MAX_STRING_LENGTH`. ++ ++This threshold can be changed by setting ++:py:data:`MAX_STRING_LENGTH`. It can be disabled by setting ++``ImageFont.MAX_STRING_LENGTH = None``. ++ + Example + --- + +@@ -73,3 +82,12 @@ Constants + + Requires Raqm, you can check support using + :py:func:`PIL.features.check_feature` with ``feature="raqm"``. ++ ++Constants ++- ++ ++.. data:: MAX_STRING_LENGTH ++ ++Set to 1,000,000, to protect against potential DOS attacks. Pillow will ++raise a ``ValueError`` if the number of characters is over this limit. The ++check can be disabled by setting ``ImageFont.MAX_STRING_LENGTH = None``. +diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py +index 3ddc1aaad64..1030985ebc4 100644 +--- a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py +@@ -43,6 +43,9 @@ + RAQM = 1 + + ++MAX_STRING_LENGTH = 100 ++ ++ + def __getattr__(name): + for enum, prefix in {Layout: "LAYOUT_"}.items(): + if name.startswith(prefix): +@@ -67,6 +67,12 @@ + core = _ImagingFtNotInstalled() + + ++def _string_length_check(text): ++if MAX_STRING_LENGTH is not None and len(text) > MAX_STRING_LENGTH: ++msg = "too many characters in string" ++raise ValueError(msg) ++ ++ + _UNSPECIFIED = object() + + +@@ -192,6 +192,7 @@ + + :return: ``(left, top, right, bottom)`` bounding box + """ ++_string_length_check(text) + width, height = self.font.getsize(text) + return 0, 0, width, height + +@@ -202,6 +202,7 @@ + + .. versionadded:: 9.2.0 + """ ++_string_length_check(text) + width, height = self.font.getsize(text) + return width + +@@ -359,6 +359,7 @@ + + :return: Width for horizontal, height for vertical text. + """ ++_string_length_check(text) + return self.font.getlength(text, mode, direction, features, language) / 64 + + def getbbox( +@@ -418
[oe] [meta-oe][PATCH] driverctl: upgrade 0.111 -> 0.115
Changelog: * driverctl: Fix duplicate ID write error * driverctl: add list-persisted command * Fix device driver binding issue after re-enumeration * driverctl: fix list_devices() when `driver_override` is not set Signed-off-by: alperak --- .../driverctl/driverctl_0.111.bb | 28 --- .../driverctl/driverctl_0.115.bb | 23 +++ 2 files changed, 23 insertions(+), 28 deletions(-) delete mode 100644 meta-oe/recipes-support/driverctl/driverctl_0.111.bb create mode 100644 meta-oe/recipes-support/driverctl/driverctl_0.115.bb diff --git a/meta-oe/recipes-support/driverctl/driverctl_0.111.bb b/meta-oe/recipes-support/driverctl/driverctl_0.111.bb deleted file mode 100644 index f5f542c54..0 --- a/meta-oe/recipes-support/driverctl/driverctl_0.111.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "driverctl is a device driver control utility for Linux" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1-only;md5=1a6d268fd218675ffea8be556788b780" - -REQUIRED_DISTRO_FEATURES = "systemd" - -DEPENDS = "systemd" -RDEPENDS:${PN} += "bash bash-completion" - -SRC_URI = " git://gitlab.com/driverctl/driverctl.git;branch=master" -SRCREV = "fa9dce43d1a667d6e6e26895fbed01b3b04362c9" - -S = "${WORKDIR}/git" - -inherit pkgconfig systemd features_check - -FILES:${PN} += "${libdir}" -FILES:${PN} += "${libdir}/udev" -FILES:${PN} += "${libdir}/udev/rules.d" -FILES:${PN} += "${systemd_unitdir}" -FILES:${PN} += "${systemd_unitdir}/system" -FILES:${PN} += "${datadir}" -FILES:${PN} += "${datadir}/bash-completion" -FILES:${PN} += "${datadir}/bash-completion/completions" - -do_install () { - oe_runmake install DESTDIR=${D} -} diff --git a/meta-oe/recipes-support/driverctl/driverctl_0.115.bb b/meta-oe/recipes-support/driverctl/driverctl_0.115.bb new file mode 100644 index 0..d37563eda --- /dev/null +++ b/meta-oe/recipes-support/driverctl/driverctl_0.115.bb @@ -0,0 +1,23 @@ +SUMMARY = "driverctl is a device driver control utility for Linux" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +REQUIRED_DISTRO_FEATURES = "systemd" + +DEPENDS = "systemd" +RDEPENDS:${PN} += "bash bash-completion" + +SRC_URI = "git://gitlab.com/driverctl/driverctl.git;branch=master;protocol=https" +SRCREV = "2ba60536eb20ca0a6a751bd8b6501dba84ec45d3" + +S = "${WORKDIR}/git" + +inherit pkgconfig systemd features_check + +do_install () { + oe_runmake install DESTDIR=${D} +} + +FILES:${PN} += "${libdir}" +FILES:${PN} += "${datadir}" + -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107746): https://lists.openembedded.org/g/openembedded-devel/message/107746 Mute This Topic: https://lists.openembedded.org/mt/103314578/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][dunfell][PATCH 2/2] opensc: Fix CVE-2023-40661
From: virendra thakur Upstream-Status: Backport[https://salsa.debian.org/opensc-team/opensc/-/commit/8026fb4ca0ed53d970c6c497252eb264d4192d50] Signed-off-by: virendra thakur --- .../opensc/opensc/CVE-2023-40661-1.patch | 47 +++ .../opensc/opensc/CVE-2023-40661-2.patch | 32 + .../opensc/opensc/CVE-2023-40661-3.patch | 31 .../opensc/opensc/CVE-2023-40661-4.patch | 28 +++ .../opensc/opensc/CVE-2023-40661-5.patch | 30 .../opensc/opensc/CVE-2023-40661-6.patch | 30 .../opensc/opensc/CVE-2023-40661-7.patch | 40 .../recipes-support/opensc/opensc_0.20.0.bb | 7 +++ 8 files changed, 245 insertions(+) create mode 100644 meta-oe/recipes-support/opensc/opensc/CVE-2023-40661-1.patch create mode 100644 meta-oe/recipes-support/opensc/opensc/CVE-2023-40661-2.patch create mode 100644 meta-oe/recipes-support/opensc/opensc/CVE-2023-40661-3.patch create mode 100644 meta-oe/recipes-support/opensc/opensc/CVE-2023-40661-4.patch create mode 100644 meta-oe/recipes-support/opensc/opensc/CVE-2023-40661-5.patch create mode 100644 meta-oe/recipes-support/opensc/opensc/CVE-2023-40661-6.patch create mode 100644 meta-oe/recipes-support/opensc/opensc/CVE-2023-40661-7.patch diff --git a/meta-oe/recipes-support/opensc/opensc/CVE-2023-40661-1.patch b/meta-oe/recipes-support/opensc/opensc/CVE-2023-40661-1.patch new file mode 100644 index 0..3ecff558c --- /dev/null +++ b/meta-oe/recipes-support/opensc/opensc/CVE-2023-40661-1.patch @@ -0,0 +1,47 @@ +Origin: https://github.com/OpenSC/OpenSC/commit/245efe608d083fd4e4ec96793fdefd218e26fde7 +From: Jakub Jelen +Date: Thu, 17 Aug 2023 13:54:42 +0200 +Subject: pkcs15: Avoid buffer overflow when getting last update + +Thanks oss-fuzz + +https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=60769 + +CVE: CVE-2023-40661 +Upstream-Status: Backport [https://salsa.debian.org/opensc-team/opensc/-/commit/8026fb4ca0ed53d970c6c497252eb264d4192d50] +Signed-off-by: Virendra Thakur +Comment: Hunk refreshed based on codebase. + +--- + src/libopensc/pkcs15.c | 16 +--- + 1 file changed, 9 insertions(+), 7 deletions(-) + +diff --git a/src/libopensc/pkcs15.c b/src/libopensc/pkcs15.c +index eb7fc6afcd..4215b733a8 100644 +--- a/src/libopensc/pkcs15.c b/src/libopensc/pkcs15.c +@@ -528,7 +528,7 @@ + struct sc_context *ctx = p15card->card->ctx; + struct sc_file *file = NULL; + struct sc_asn1_entry asn1_last_update[C_ASN1_LAST_UPDATE_SIZE]; +- unsigned char *content, last_update[32]; ++unsigned char *content, last_update[32] = {0}; + size_t lupdate_len = sizeof(last_update) - 1; + int r, content_len; + size_t size; +@@ -564,9 +564,11 @@ + if (r < 0) + return NULL; + +- p15card->tokeninfo->last_update.gtime = strdup((char *)last_update); +- if (!p15card->tokeninfo->last_update.gtime) +- return NULL; ++if (asn1_last_update[0].flags & SC_ASN1_PRESENT) { ++p15card->tokeninfo->last_update.gtime = strdup((char *)last_update); ++if (!p15card->tokeninfo->last_update.gtime) ++return NULL; ++} + done: + sc_log(ctx, "lastUpdate.gtime '%s'", p15card->tokeninfo->last_update.gtime); + return p15card->tokeninfo->last_update.gtime; + diff --git a/meta-oe/recipes-support/opensc/opensc/CVE-2023-40661-2.patch b/meta-oe/recipes-support/opensc/opensc/CVE-2023-40661-2.patch new file mode 100644 index 0..39e729c5a --- /dev/null +++ b/meta-oe/recipes-support/opensc/opensc/CVE-2023-40661-2.patch @@ -0,0 +1,32 @@ +Origin: https://github.com/OpenSC/OpenSC/commit/440ca666eff10cc7011901252d20f3fc4ea23651 +From: Jakub Jelen +Date: Thu, 17 Aug 2023 13:41:36 +0200 +Subject: setcos: Avoid buffer underflow + +Thanks oss-fuzz + +https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=60672 +CVE: CVE-2023-40661 +Upstream-Status: Backport [https://salsa.debian.org/opensc-team/opensc/-/commit/8026fb4ca0ed53d970c6c497252eb264d4192d50] +Signed-off-by: Virendra Thakur +Comment: Hunk refreshed based on codebase. +--- + src/pkcs15init/pkcs15-setcos.c | 4 + 1 file changed, 4 insertions(+) + +diff --git a/src/pkcs15init/pkcs15-setcos.c b/src/pkcs15init/pkcs15-setcos.c +index 1b56afe6d9..1907b47f9d 100644 +--- a/src/pkcs15init/pkcs15-setcos.c b/src/pkcs15init/pkcs15-setcos.c +@@ -346,6 +346,10 @@ + + /* Replace the path of instantiated key template by the path from the object data. */ + memcpy(&file->path, &key_info->path, sizeof(file->path)); ++ if (file->path.len < 2) { ++ sc_file_free(file); ++ LOG_TEST_RET(ctx, SC_ERROR_INVALID_DATA, "Invalid path"); ++ } + file->id = file->path.value[file->path.len - 2] * 0x100 + + file->path.value[file->path.len - 1]; + + diff --git a/meta-oe/recipes-support/opensc/opensc/CVE-2023-40
[oe] [meta-oe][dunfell][PATCH 1/2] opensc: Fix CVE-2023-40660
From: virendra thakur Upstream-Status: Backport [https://salsa.debian.org/opensc-team/opensc/-/commit/940e8bc764047c873f88bb1396933a5368d03533] Signed-off-by: virendra thakur --- .../opensc/opensc/CVE-2023-40660.patch| 55 +++ .../recipes-support/opensc/opensc_0.20.0.bb | 1 + 2 files changed, 56 insertions(+) create mode 100644 meta-oe/recipes-support/opensc/opensc/CVE-2023-40660.patch diff --git a/meta-oe/recipes-support/opensc/opensc/CVE-2023-40660.patch b/meta-oe/recipes-support/opensc/opensc/CVE-2023-40660.patch new file mode 100644 index 0..74e547298 --- /dev/null +++ b/meta-oe/recipes-support/opensc/opensc/CVE-2023-40660.patch @@ -0,0 +1,55 @@ +Origin: https://github.com/OpenSC/OpenSC/commit/868f76fb31255fd3fdacfc3e476452efeb61c3e7 +From: Frank Morgner +Date: Wed, 21 Jun 2023 12:27:23 +0200 +Subject: Fixed PIN authentication bypass + +If two processes are accessing a token, then one process may leave the +card usable with an authenticated PIN so that a key may sign/decrypt any +data. This is especially the case if the token does not support a way of +resetting the authentication status (logout). + +We have some tracking of the authentication status in software via +PKCS#11, Minidriver (os-wise) and CryptoTokenKit, which is why a +PIN-prompt will appear even though the card may technically be unlocked +as described in the above example. However, before this change, an empty +PIN was not verified (likely yielding an error during PIN-verification), +but it was just checked whether the PIN is authenticated. This defeats +the purpose of the PIN verification, because an empty PIN is not the +correct one. Especially during OS Logon, we don't want that kind of +shortcut, but we want the user to verify the correct PIN (even though +the token was left unattended and authentication at the computer). + +This essentially reverts commit e6f7373ef066cfab6e3162e8b5f692683db23864. + +CVE: CVE-2023-40660 +Upstream-Status: Backport [https://salsa.debian.org/opensc-team/opensc/-/commit/940e8bc764047c873f88bb1396933a5368d03533] +Signed-off-by: Virendra Thakur +--- + src/libopensc/pkcs15-pin.c | 13 - + 1 file changed, 13 deletions(-) + +diff --git a/src/libopensc/pkcs15-pin.c b/src/libopensc/pkcs15-pin.c +index 80a185fecd..393234efe4 100644 +--- a/src/libopensc/pkcs15-pin.c b/src/libopensc/pkcs15-pin.c +@@ -307,19 +307,6 @@ + LOG_FUNC_RETURN(ctx, SC_ERROR_INVALID_PIN_REFERENCE); + auth_info = (struct sc_pkcs15_auth_info *)pin_obj->data; + +- /* +- * if pin cache is disabled, we can get here with no PIN data. +- * in this case, to avoid error or unnecessary pin prompting on pinpad, +- * check if the PIN has been already verified and the access condition +- * is still open on card. +- */ +- if (pinlen == 0) { +- r = sc_pkcs15_get_pin_info(p15card, pin_obj); +- +- if (r == SC_SUCCESS && auth_info->logged_in == SC_PIN_STATE_LOGGED_IN) +- LOG_FUNC_RETURN(ctx, r); +- } +- + r = _validate_pin(p15card, auth_info, pinlen); + + if (r) + diff --git a/meta-oe/recipes-support/opensc/opensc_0.20.0.bb b/meta-oe/recipes-support/opensc/opensc_0.20.0.bb index b8cf203b7..3e77b8884 100644 --- a/meta-oe/recipes-support/opensc/opensc_0.20.0.bb +++ b/meta-oe/recipes-support/opensc/opensc_0.20.0.bb @@ -14,6 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" #v0.19.0 SRCREV = "45e29056ccde422e70ed3585084a7f150c632515" SRC_URI = "git://github.com/OpenSC/OpenSC;branch=master;protocol=https \ + file://CVE-2023-40660.patch \ " DEPENDS = "virtual/libiconv openssl" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107744): https://lists.openembedded.org/g/openembedded-devel/message/107744 Mute This Topic: https://lists.openembedded.org/mt/103314467/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] dool: upgrade 1.1.0 -> 1.3.1
* Patches removed because fixed in the new version * License-Update: GPL-2.0 -> GPL-3.0 Changelog: * Fix help of vmstat (as it includes sys instead of swap) * Fix multiple SWAP's breaks output * Better support for NVME drives * Support for Python v3.12 * Shorter and more concise device names * add support for terminals with only 16 colors * Correctly report disk stats for NVME drives * Capture VM name for top-cpu * Properly capitalize unit letters for real this time * Add a \n to output when using a count * Fix the NTP plugin for Python 3.x * Massive internal naming change dstat -> dool * Fix bits/bytes in CSV file output * Add a --devel logging option to assist in future developementg * Update Github templates to simplify them and reflect the Dool name * Lots of comments in the code as I slowly learn more about how it works * --output now correctly writes to files cleanly Introduced --display to allow outputting to both screen and file * Fix building docs with make docs * Update the .spec file to allow building RPMs for Dool on modern systems * Fix potential crashes from "OverflowError: cannot convert float infinity to integer" * Updated Lustre plugin for modern versions * Cleaned up output of sub frames in table output * Add a plug-in for Linux bonding devices * Add signal handling to better close down things when dool quits * Added an option for --diskset to group drives together Signed-off-by: alperak --- .../0001-Fix-build-error-as-following.patch | 39 --- .../dool/dool/0001-Fix-rename-in-docs.patch | 261 -- meta-oe/recipes-support/dool/dool_1.1.0.bb| 25 -- meta-oe/recipes-support/dool/dool_1.3.1.bb| 23 ++ 4 files changed, 23 insertions(+), 325 deletions(-) delete mode 100644 meta-oe/recipes-support/dool/dool/0001-Fix-build-error-as-following.patch delete mode 100644 meta-oe/recipes-support/dool/dool/0001-Fix-rename-in-docs.patch delete mode 100644 meta-oe/recipes-support/dool/dool_1.1.0.bb create mode 100644 meta-oe/recipes-support/dool/dool_1.3.1.bb diff --git a/meta-oe/recipes-support/dool/dool/0001-Fix-build-error-as-following.patch b/meta-oe/recipes-support/dool/dool/0001-Fix-build-error-as-following.patch deleted file mode 100644 index 2324af499..0 --- a/meta-oe/recipes-support/dool/dool/0001-Fix-build-error-as-following.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e81feec1ebbc676220cd8759d83f46335602d079 Mon Sep 17 00:00:00 2001 -From: Lei Maohui -Date: Fri, 7 Jan 2022 14:37:36 +0900 -Subject: [PATCH] Fix build error as following: - -*** No rule to make target 'dstat.1', needed by 'docs'. Stop. - -Upstream-Status: Pending - -Signed-off-by: Lei Maohui - docs/Makefile | 8 - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/docs/Makefile b/docs/Makefile -index c031e82..1a85e61 100644 a/docs/Makefile -+++ b/docs/Makefile -@@ -11,13 +11,13 @@ all: - - dist: docs - --docs: dstat.1 $(htmltargets) -+docs: dool.1 $(htmltargets) - --install: dstat.1 -- install -Dp -m0644 dstat.1 $(DESTDIR)$(mandir)/man1/dstat.1 -+install: dool.1 -+ install -Dp -m0644 dool.1 $(DESTDIR)$(mandir)/man1/dool.1 - - clean: -- rm -f dstat.1 *.html *.xml -+ rm -f dool.1 *.html *.xml - - %.1.html: %.1.adoc - asciidoc -d manpage $< --- -2.25.1 - diff --git a/meta-oe/recipes-support/dool/dool/0001-Fix-rename-in-docs.patch b/meta-oe/recipes-support/dool/dool/0001-Fix-rename-in-docs.patch deleted file mode 100644 index 8d576f5d5..0 --- a/meta-oe/recipes-support/dool/dool/0001-Fix-rename-in-docs.patch +++ /dev/null @@ -1,261 +0,0 @@ -From 689c65fb050976d5a548a5b9a0f5d2c14eaa3301 Mon Sep 17 00:00:00 2001 -From: Alexander Stein -Date: Thu, 8 Dec 2022 14:11:46 +0100 -Subject: [PATCH 1/1] Fix rename in docs - -The content of dool.1.adoc is completly unchanged from dstat.1.adoc. -Unfortunately the 'NAME' specifies the created file name. So -building/cleaning docs is currently broken - -Upstream-Status: Pending -https://github.com/scottchiefbaker/dool/pull/30 - -Signed-off-by: Alexander Stein - docs/dool.1.adoc | 108 +++ - 1 file changed, 54 insertions(+), 54 deletions(-) - -diff --git a/docs/dool.1.adoc b/docs/dool.1.adoc -index 24c4a54..921df1f 100644 a/docs/dool.1.adoc -+++ b/docs/dool.1.adoc -@@ -1,35 +1,35 @@ --= dstat(1) -+= dool(1) - Dag Wieers - v0.7.3, August 2014 - - - == NAME --dstat - versatile tool for generating system resource statistics -+dool - versatile tool for generating system resource statistics - - - == SYNOPSIS --dstat [-afv] [options..] [delay [count]] -+dool [-afv] [options..] [delay [count]] - - - == DESCRIPTION --Dstat is a versatile replacement for vmstat, iostat and ifstat. Dstat -+Dool is a versatile replacement for vmstat, iostat and ifstat. Dool - overcomes some of the limitations and adds some extra features. - --Dstat allows you to view all of your system resources instantly, you -+Dool allows you to view all
[oe] [meta-python][PATCH] python3-parse: update to version 1.20.0
Signed-off-by: Derek Straka --- ...ython3-parse_1.19.1.bb => python3-parse_1.20.0.bb} | 11 +++ 1 file changed, 3 insertions(+), 8 deletions(-) rename meta-python/recipes-devtools/python/{python3-parse_1.19.1.bb => python3-parse_1.20.0.bb} (56%) diff --git a/meta-python/recipes-devtools/python/python3-parse_1.19.1.bb b/meta-python/recipes-devtools/python/python3-parse_1.20.0.bb similarity index 56% rename from meta-python/recipes-devtools/python/python3-parse_1.19.1.bb rename to meta-python/recipes-devtools/python/python3-parse_1.20.0.bb index 9dc7f7931..3ca6fbbeb 100644 --- a/meta-python/recipes-devtools/python/python3-parse_1.19.1.bb +++ b/meta-python/recipes-devtools/python/python3-parse_1.20.0.bb @@ -3,18 +3,13 @@ HOMEPAGE = "https://github.com/r1chardj0n3s/parse"; LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=8ab458ad281b60e6f1b39b3feafbfc05" -SRC_URI[sha256sum] = "cc3a47236ff05da377617ddefa867b7ba983819c664e1afe46249e5b469be464" +SRC_URI[sha256sum] = "bd28bae37714b45d5894d77160a16e2be36b64a3b618c81168b3684676aa498b" SRC_URI += " \ -git://github.com/r1chardj0n3s/parse.git;branch=master;protocol=https \ file://run-ptest \ " -SRCREV ?= "72776522285d516032faa0f80c4ee6a8964075e8" - -S = "${WORKDIR}/git" - -inherit python_setuptools_build_meta ptest +inherit pypi python_setuptools_build_meta ptest RDEPENDS:${PN} += "\ python3-datetime \ @@ -27,5 +22,5 @@ RDEPENDS:${PN}-ptest += " \ " do_install_ptest() { -cp -f ${S}/test_parse.py ${D}${PTEST_PATH}/ +cp -f ${S}/tests/test*.py ${D}${PTEST_PATH}/ } -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107742): https://lists.openembedded.org/g/openembedded-devel/message/107742 Mute This Topic: https://lists.openembedded.org/mt/103309592/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH] python3-web3: update to version 6.13.0
Signed-off-by: Derek Straka --- .../python/{python3-web3_6.12.0.bb => python3-web3_6.13.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-python/recipes-devtools/python/{python3-web3_6.12.0.bb => python3-web3_6.13.0.bb} (84%) diff --git a/meta-python/recipes-devtools/python/python3-web3_6.12.0.bb b/meta-python/recipes-devtools/python/python3-web3_6.13.0.bb similarity index 84% rename from meta-python/recipes-devtools/python/python3-web3_6.12.0.bb rename to meta-python/recipes-devtools/python/python3-web3_6.13.0.bb index c54f362c6..0f0682fca 100644 --- a/meta-python/recipes-devtools/python/python3-web3_6.12.0.bb +++ b/meta-python/recipes-devtools/python/python3-web3_6.13.0.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=373fede350846fdffd23648fba504635" -SRC_URI[sha256sum] = "81a68519ff4416eee7f16d4dbc498e70deb90908c7c1d7bebc950e5f3d1f29d5" +SRC_URI[sha256sum] = "769ab3cfffea69c6b495c63a1aecdb522651c0304260fc25467a886d0be622e2" inherit pypi setuptools3 -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107741): https://lists.openembedded.org/g/openembedded-devel/message/107741 Mute This Topic: https://lists.openembedded.org/mt/103309460/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH] python3-greenlet: update to version 3.0.3
Signed-off-by: Derek Straka --- .../{python3-greenlet_3.0.2.bb => python3-greenlet_3.0.3.bb}| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-python/recipes-devtools/python/{python3-greenlet_3.0.2.bb => python3-greenlet_3.0.3.bb} (78%) diff --git a/meta-python/recipes-devtools/python/python3-greenlet_3.0.2.bb b/meta-python/recipes-devtools/python/python3-greenlet_3.0.3.bb similarity index 78% rename from meta-python/recipes-devtools/python/python3-greenlet_3.0.2.bb rename to meta-python/recipes-devtools/python/python3-greenlet_3.0.3.bb index 337bd95a6..abd6c49ca 100644 --- a/meta-python/recipes-devtools/python/python3-greenlet_3.0.2.bb +++ b/meta-python/recipes-devtools/python/python3-greenlet_3.0.3.bb @@ -4,6 +4,6 @@ LICENSE = "MIT & PSF-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e95668d68e4329085c7ab3535e6a7aee \ file://LICENSE.PSF;md5=c106931d9429eda0492617f037b8f69a" -SRC_URI[sha256sum] = "1c1129bc47266d83444c85a8e990ae22688cf05fb20d7951fd2866007c2ba9bc" +SRC_URI[sha256sum] = "43374442353259554ce33599da8b692d5aa96f8976d567d4badf263371fbe491" inherit pypi setuptools3 -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107740): https://lists.openembedded.org/g/openembedded-devel/message/107740 Mute This Topic: https://lists.openembedded.org/mt/103309432/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH] python3-flask-jwt-extended: update to version 4.6.0
Signed-off-by: Derek Straka --- ...wt-extended_4.5.3.bb => python3-flask-jwt-extended_4.6.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-python/recipes-devtools/python/{python3-flask-jwt-extended_4.5.3.bb => python3-flask-jwt-extended_4.6.0.bb} (80%) diff --git a/meta-python/recipes-devtools/python/python3-flask-jwt-extended_4.5.3.bb b/meta-python/recipes-devtools/python/python3-flask-jwt-extended_4.6.0.bb similarity index 80% rename from meta-python/recipes-devtools/python/python3-flask-jwt-extended_4.5.3.bb rename to meta-python/recipes-devtools/python/python3-flask-jwt-extended_4.6.0.bb index d5438f11a..cc07c92f4 100644 --- a/meta-python/recipes-devtools/python/python3-flask-jwt-extended_4.5.3.bb +++ b/meta-python/recipes-devtools/python/python3-flask-jwt-extended_4.6.0.bb @@ -7,7 +7,7 @@ inherit pypi setuptools3 PYPI_PACKAGE = "Flask-JWT-Extended" -SRC_URI[sha256sum] = "061ef3d25ed5743babe4964ab38f36d870e6d2fd8a126bab5d77ddef8a01932b" +SRC_URI[sha256sum] = "9215d05a9413d3855764bcd67035e75819d23af2fafb6b55197eb5a3313fdfb2" RDEPENDS:${PN} += "\ python3-werkzeug \ -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107739): https://lists.openembedded.org/g/openembedded-devel/message/107739 Mute This Topic: https://lists.openembedded.org/mt/103309345/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH] python3-mypy: update to version 1.8.0
Signed-off-by: Derek Straka --- .../python/{python3-mypy_1.7.1.bb => python3-mypy_1.8.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-python/recipes-devtools/python/{python3-mypy_1.7.1.bb => python3-mypy_1.8.0.bb} (86%) diff --git a/meta-python/recipes-devtools/python/python3-mypy_1.7.1.bb b/meta-python/recipes-devtools/python/python3-mypy_1.8.0.bb similarity index 86% rename from meta-python/recipes-devtools/python/python3-mypy_1.7.1.bb rename to meta-python/recipes-devtools/python/python3-mypy_1.8.0.bb index 90301f3cc..2e6c7cc07 100644 --- a/meta-python/recipes-devtools/python/python3-mypy_1.7.1.bb +++ b/meta-python/recipes-devtools/python/python3-mypy_1.8.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8d62fd8f8648cb018e52857347e340b9" inherit pypi python_setuptools_build_meta -SRC_URI[sha256sum] = "fcb6d9afb1b6208b4c712af0dafdc650f518836065df0d4fb1d800f5d6773db2" +SRC_URI[sha256sum] = "6ff8b244d7085a0b425b56d327b480c3b29cafbd2eff27316a004f9a7391ae07" BBCLASSEXTEND = "native" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107738): https://lists.openembedded.org/g/openembedded-devel/message/107738 Mute This Topic: https://lists.openembedded.org/mt/103309306/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH] python3-constantly: update to version 23.10.4
Signed-off-by: Derek Straka --- ...-constantly_15.1.0.bb => python3-constantly_23.10.4.bb} | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) rename meta-python/recipes-devtools/python/{python3-constantly_15.1.0.bb => python3-constantly_23.10.4.bb} (57%) diff --git a/meta-python/recipes-devtools/python/python3-constantly_15.1.0.bb b/meta-python/recipes-devtools/python/python3-constantly_23.10.4.bb similarity index 57% rename from meta-python/recipes-devtools/python/python3-constantly_15.1.0.bb rename to meta-python/recipes-devtools/python/python3-constantly_23.10.4.bb index 7f9b0326f..cb6ca0a82 100644 --- a/meta-python/recipes-devtools/python/python3-constantly_15.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-constantly_23.10.4.bb @@ -3,9 +3,10 @@ HOMEPAGE = "https://github.com/twisted/constantly"; LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=e393e4ddd223e3a74982efa784f89fd7" -SRC_URI[md5sum] = "f0762f083d83039758e53f8cf0086eef" -SRC_URI[sha256sum] = "586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35" +SRC_URI[sha256sum] = "aa92b70a33e2ac0bb33cd745eb61776594dc48764b06c35e0efd050b7f1c7cbd" -inherit pypi setuptools3 +inherit pypi python_poetry_core + +DEPENDS += "${PYTHON_PN}-versioneer-native" RDEPENDS:${PN} += "${PYTHON_PN}-json" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107737): https://lists.openembedded.org/g/openembedded-devel/message/107737 Mute This Topic: https://lists.openembedded.org/mt/103309286/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH] python3-pyroute2: update to version 0.7.10
Signed-off-by: Derek Straka --- .../{python3-pyroute2_0.7.9.bb => python3-pyroute2_0.7.10.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-python/recipes-devtools/python/{python3-pyroute2_0.7.9.bb => python3-pyroute2_0.7.10.bb} (92%) diff --git a/meta-python/recipes-devtools/python/python3-pyroute2_0.7.9.bb b/meta-python/recipes-devtools/python/python3-pyroute2_0.7.10.bb similarity index 92% rename from meta-python/recipes-devtools/python/python3-pyroute2_0.7.9.bb rename to meta-python/recipes-devtools/python/python3-pyroute2_0.7.10.bb index 9365a330e..6b340a18c 100644 --- a/meta-python/recipes-devtools/python/python3-pyroute2_0.7.9.bb +++ b/meta-python/recipes-devtools/python/python3-pyroute2_0.7.10.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=dccbff78d7d79ae7e53953d43445c6e6 \ file://LICENSE.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.Apache-2.0;md5=34281e312165f843a2b7d1f114fe65ce" -SRC_URI[sha256sum] = "b69d82f140b0774317d7ba40f6c5fa1d755098ba3f3eb619982d16e750dc631a" +SRC_URI[sha256sum] = "cc2f90aad1517cb0b301041f678cc8d3c3427c26e53f15c78c93c67928d89a02" inherit setuptools3 pypi ptest -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107736): https://lists.openembedded.org/g/openembedded-devel/message/107736 Mute This Topic: https://lists.openembedded.org/mt/103305930/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH 2/2] python3-setuptools-scm-git-archive: remove obsolete package
Upstream project is obsolete with setuptools_scm >= 7.0 which natively supports git archives See upstream repo for details - https://github.com/Changaco/setuptools_scm_git_archive/ Signed-off-by: Derek Straka --- .../packagegroups/packagegroup-meta-python.bb| 1 - .../python/python3-ansi2html_1.9.1.bb| 1 - .../python3-setuptools-scm-git-archive_1.1.bb| 16 3 files changed, 18 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-setuptools-scm-git-archive_1.1.bb diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb index a8b4532c3..7b7d7bee9 100644 --- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb @@ -391,7 +391,6 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-serpent \ python3-service-identity \ python3-setuptools-declarative-requirements \ -python3-setuptools-scm-git-archive \ python3-sh \ python3-sijax \ python3-simpleeval \ diff --git a/meta-python/recipes-devtools/python/python3-ansi2html_1.9.1.bb b/meta-python/recipes-devtools/python/python3-ansi2html_1.9.1.bb index 82b8ef37e..e419fdcf1 100644 --- a/meta-python/recipes-devtools/python/python3-ansi2html_1.9.1.bb +++ b/meta-python/recipes-devtools/python/python3-ansi2html_1.9.1.bb @@ -11,7 +11,6 @@ inherit pypi python_setuptools_build_meta DEPENDS += " \ ${PYTHON_PN}-setuptools-scm-native \ - ${PYTHON_PN}-setuptools-scm-git-archive-native \ " RDEPENDS:${PN} = " \ diff --git a/meta-python/recipes-devtools/python/python3-setuptools-scm-git-archive_1.1.bb b/meta-python/recipes-devtools/python/python3-setuptools-scm-git-archive_1.1.bb deleted file mode 100644 index 2068871d9..0 --- a/meta-python/recipes-devtools/python/python3-setuptools-scm-git-archive_1.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "setuptools_scm plugin for git archives" -HOMEPAGE = "https://pypi.org/project/setuptools-scm-git-archive/"; -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=838c366f69b72c5df05c96dff79b35f2" - -SRC_URI[sha256sum] = "6026f61089b73fa1b5ee737e95314f41cb512609b393530385ed281d0b46c062" - -inherit pypi setuptools3 - -PYPI_PACKAGE = "setuptools_scm_git_archive" -PYPI_SRC_URI = "https://files.pythonhosted.org/packages/7e/2c/0c15b29a1b5940250bfdc4a4f53272e35cd7cf8a34159291b6b4ec9eb291/${PYPI_ARCHIVE_NAME}"; - -DEPENDS += "python3-setuptools-scm-native" -RDEPENDS:${PN} += "python3-setuptools-scm" - -BBCLASSEXTEND = "native nativesdk" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107735): https://lists.openembedded.org/g/openembedded-devel/message/107735 Mute This Topic: https://lists.openembedded.org/mt/103305871/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH 1/2] python3-pytest-html: update to version 4.1.1
Signed-off-by: Derek Straka --- ...test-html_3.2.0.bb => python3-pytest-html_4.1.1.bb} | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) rename meta-python/recipes-devtools/python/{python3-pytest-html_3.2.0.bb => python3-pytest-html_4.1.1.bb} (59%) diff --git a/meta-python/recipes-devtools/python/python3-pytest-html_3.2.0.bb b/meta-python/recipes-devtools/python/python3-pytest-html_4.1.1.bb similarity index 59% rename from meta-python/recipes-devtools/python/python3-pytest-html_3.2.0.bb rename to meta-python/recipes-devtools/python/python3-pytest-html_4.1.1.bb index 713a84b41..b9023dfcd 100644 --- a/meta-python/recipes-devtools/python/python3-pytest-html_3.2.0.bb +++ b/meta-python/recipes-devtools/python/python3-pytest-html_4.1.1.bb @@ -4,13 +4,15 @@ DEPENDS += "${PYTHON_PN}-setuptools-scm-native" LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=5d425c8f3157dbf212db2ec53d9e5132" -SRC_URI[sha256sum] = "c4e2f4bb0bffc437f51ad2174a8a3e71df81bbc2f6894604e604af18fbe687c3" +SRC_URI[sha256sum] = "70a01e8ae5800f4a074b56a4cb1025c8f4f9b038bba5fe31e3c98eb996686f07" -PYPI_PACKAGE = "pytest-html" +PYPI_PACKAGE = "pytest_html" -inherit pypi python_setuptools_build_meta +inherit pypi python_hatchling -DEPENDS += "python3-setuptools-scm-git-archive-native" +DEPENDS += "\ +${PYTHON_PN}-hatch-vcs-native \ +" RDEPENDS:${PN} += " \ ${PYTHON_PN}-pytest \ -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107734): https://lists.openembedded.org/g/openembedded-devel/message/107734 Mute This Topic: https://lists.openembedded.org/mt/103305870/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH] python3-gspread: update to version 5.12.3
Signed-off-by: Derek Straka --- .../python3-gspread/python3-gspread_5.10.0.bb | 13 - .../python3-gspread/python3-gspread_5.12.3.bb | 12 2 files changed, 12 insertions(+), 13 deletions(-) delete mode 100644 meta-python/recipes-devtools/python3-gspread/python3-gspread_5.10.0.bb create mode 100644 meta-python/recipes-devtools/python3-gspread/python3-gspread_5.12.3.bb diff --git a/meta-python/recipes-devtools/python3-gspread/python3-gspread_5.10.0.bb b/meta-python/recipes-devtools/python3-gspread/python3-gspread_5.10.0.bb deleted file mode 100644 index 3918ed3ac..0 --- a/meta-python/recipes-devtools/python3-gspread/python3-gspread_5.10.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Google Spreadsheets Python API" -HOMEPAGE = "https://github.com/burnash/gspread"; -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9488e21983675fa56dc05af558b83e2f" - -SRC_URI = "https://files.pythonhosted.org/packages/b4/4f/033ebf34778745061b67b104ef212ed5b05fa65a530f345f88c4355fdcc3/gspread-5.10.0.tar.gz"; -SRC_URI[sha256sum] = "2b6bba6dc111580170346a9bcd1893e0e8c52f67a9e537caec7b7a1e27c14435" - -S = "${WORKDIR}/gspread-${PV}" - -RDEPENDS:${PN} = "python3-requests" - -inherit python_poetry_core diff --git a/meta-python/recipes-devtools/python3-gspread/python3-gspread_5.12.3.bb b/meta-python/recipes-devtools/python3-gspread/python3-gspread_5.12.3.bb new file mode 100644 index 0..932cf22b1 --- /dev/null +++ b/meta-python/recipes-devtools/python3-gspread/python3-gspread_5.12.3.bb @@ -0,0 +1,12 @@ +SUMMARY = "Google Spreadsheets Python API" +HOMEPAGE = "https://github.com/burnash/gspread"; +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9488e21983675fa56dc05af558b83e2f" + +SRC_URI[sha256sum] = "298ebab76e6ed6a998eabc81545ec58f5610f44e2ddb4858b539a0634093f8ce" + +S = "${WORKDIR}/gspread-${PV}" + +RDEPENDS:${PN} = "python3-requests" + +inherit pypi python_poetry_core -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107733): https://lists.openembedded.org/g/openembedded-devel/message/107733 Mute This Topic: https://lists.openembedded.org/mt/103305579/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH] python3-flask-wtf: fix upstream uri and version check
Signed-off-by: Derek Straka --- meta-python/recipes-devtools/python/python3-flask-wtf_1.2.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-flask-wtf_1.2.1.bb b/meta-python/recipes-devtools/python/python3-flask-wtf_1.2.1.bb index 54d7bd637..973bb570b 100644 --- a/meta-python/recipes-devtools/python/python3-flask-wtf_1.2.1.bb +++ b/meta-python/recipes-devtools/python/python3-flask-wtf_1.2.1.bb @@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=d98d089889e14b227732d45dac3aacc4" SRC_URI[sha256sum] = "8bb269eb9bb46b87e7c8233d7e7debdf1f8b74bf90cc1789988c29b37a97b695" PYPI_PACKAGE = "flask_wtf" +UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/Flask-WTF"; +UPSTREAM_CHECK_REGEX = "/Flask-WTF/(?P(\d+[\.\-_]*)+)" inherit pypi python_hatchling -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107732): https://lists.openembedded.org/g/openembedded-devel/message/107732 Mute This Topic: https://lists.openembedded.org/mt/103305433/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH 1/2] opensc: Fix CVE-2023-40660
On 12/21/23 4:15 AM, virendra thakur wrote: From: virendra thakur Upstream-Status: Backport [https://salsa.debian.org/opensc-team/opensc/-/commit/940e8bc764047c873f88bb1396933a5368d03533] Signed-off-by: virendra thakur Please indicate the branch it is intended for in the subject field to get proper attention, something like ... [branch][layer] recipe: Summary of change --- .../opensc/opensc/CVE-2023-40660.patch| 55 +++ .../recipes-support/opensc/opensc_0.20.0.bb | 1 + 2 files changed, 56 insertions(+) create mode 100644 meta-oe/recipes-support/opensc/opensc/CVE-2023-40660.patch diff --git a/meta-oe/recipes-support/opensc/opensc/CVE-2023-40660.patch b/meta-oe/recipes-support/opensc/opensc/CVE-2023-40660.patch new file mode 100644 index 0..74e547298 --- /dev/null +++ b/meta-oe/recipes-support/opensc/opensc/CVE-2023-40660.patch @@ -0,0 +1,55 @@ +Origin: https://github.com/OpenSC/OpenSC/commit/868f76fb31255fd3fdacfc3e476452efeb61c3e7 +From: Frank Morgner +Date: Wed, 21 Jun 2023 12:27:23 +0200 +Subject: Fixed PIN authentication bypass + +If two processes are accessing a token, then one process may leave the +card usable with an authenticated PIN so that a key may sign/decrypt any +data. This is especially the case if the token does not support a way of +resetting the authentication status (logout). + +We have some tracking of the authentication status in software via +PKCS#11, Minidriver (os-wise) and CryptoTokenKit, which is why a +PIN-prompt will appear even though the card may technically be unlocked +as described in the above example. However, before this change, an empty +PIN was not verified (likely yielding an error during PIN-verification), +but it was just checked whether the PIN is authenticated. This defeats +the purpose of the PIN verification, because an empty PIN is not the +correct one. Especially during OS Logon, we don't want that kind of +shortcut, but we want the user to verify the correct PIN (even though +the token was left unattended and authentication at the computer). + +This essentially reverts commit e6f7373ef066cfab6e3162e8b5f692683db23864. + +CVE: CVE-2023-40660 +Upstream-Status: Backport [https://salsa.debian.org/opensc-team/opensc/-/commit/940e8bc764047c873f88bb1396933a5368d03533] +Signed-off-by: Virendra Thakur +--- + src/libopensc/pkcs15-pin.c | 13 - + 1 file changed, 13 deletions(-) + +diff --git a/src/libopensc/pkcs15-pin.c b/src/libopensc/pkcs15-pin.c +index 80a185fecd..393234efe4 100644 +--- a/src/libopensc/pkcs15-pin.c b/src/libopensc/pkcs15-pin.c +@@ -307,19 +307,6 @@ + LOG_FUNC_RETURN(ctx, SC_ERROR_INVALID_PIN_REFERENCE); + auth_info = (struct sc_pkcs15_auth_info *)pin_obj->data; + +- /* +- * if pin cache is disabled, we can get here with no PIN data. +- * in this case, to avoid error or unnecessary pin prompting on pinpad, +- * check if the PIN has been already verified and the access condition +- * is still open on card. +- */ +- if (pinlen == 0) { +- r = sc_pkcs15_get_pin_info(p15card, pin_obj); +- +- if (r == SC_SUCCESS && auth_info->logged_in == SC_PIN_STATE_LOGGED_IN) +- LOG_FUNC_RETURN(ctx, r); +- } +- + r = _validate_pin(p15card, auth_info, pinlen); + + if (r) + diff --git a/meta-oe/recipes-support/opensc/opensc_0.20.0.bb b/meta-oe/recipes-support/opensc/opensc_0.20.0.bb index b8cf203b7..3e77b8884 100644 --- a/meta-oe/recipes-support/opensc/opensc_0.20.0.bb +++ b/meta-oe/recipes-support/opensc/opensc_0.20.0.bb @@ -14,6 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" #v0.19.0 SRCREV = "45e29056ccde422e70ed3585084a7f150c632515" SRC_URI = "git://github.com/OpenSC/OpenSC;branch=master;protocol=https \ + file://CVE-2023-40660.patch \ " DEPENDS = "virtual/libiconv openssl" OpenPGP_0xBB053355919D3314.asc Description: OpenPGP public key OpenPGP_signature.asc Description: OpenPGP digital signature -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107731): https://lists.openembedded.org/g/openembedded-devel/message/107731 Mute This Topic: https://lists.openembedded.org/mt/103299089/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH] python3-uswid: update to version 0.4.7
Signed-off-by: Derek Straka --- .../{python3-uswid_git.bb => python3-uswid_0.4.7.bb} | 12 +--- 1 file changed, 5 insertions(+), 7 deletions(-) rename meta-python/recipes-devtools/python/{python3-uswid_git.bb => python3-uswid_0.4.7.bb} (70%) diff --git a/meta-python/recipes-devtools/python/python3-uswid_git.bb b/meta-python/recipes-devtools/python/python3-uswid_0.4.7.bb similarity index 70% rename from meta-python/recipes-devtools/python/python3-uswid_git.bb rename to meta-python/recipes-devtools/python/python3-uswid_0.4.7.bb index 40adc34c1..4499edb21 100644 --- a/meta-python/recipes-devtools/python/python3-uswid_git.bb +++ b/meta-python/recipes-devtools/python/python3-uswid_0.4.7.bb @@ -2,6 +2,11 @@ SUMMARY = "A pure-python library for embedding CoSWID data" HOMEPAGE = "https://github.com/hughsie/python-uswid"; SECTION = "devel/python" LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=40d2542b8c43a3ec2b7f5da31a697b88" + +SRC_URI[sha256sum] = "de15c2421bedaa5f54606558700c1f628f07d73da49ec69d1888214ac52c49e6" + +inherit setuptools3 python3native pypi DEPENDS += " python3-cbor2 python3-lxml python3-pefile" RDEPENDS:${PN} += " \ @@ -10,12 +15,5 @@ RDEPENDS:${PN} += " \ python3-lxml \ python3-netclient \ " -LIC_FILES_CHKSUM = "file://LICENSE;md5=40d2542b8c43a3ec2b7f5da31a697b88" - -SRC_URI = "git://github.com/hughsie/python-uswid.git;branch=main;protocol=https" -SRCREV = "3223034abef88ae29cf79fdc7fe11ec7e21e11ff" -S = "${WORKDIR}/git" - -inherit setuptools3 python3native BBCLASSEXTEND = "native nativesdk" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107730): https://lists.openembedded.org/g/openembedded-devel/message/107730 Mute This Topic: https://lists.openembedded.org/mt/103305383/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH] python3-wpa-supplicant: fix upstream uri and version check
Signed-off-by: Derek Straka --- .../recipes-devtools/python/python3-wpa-supplicant_0.2.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-wpa-supplicant_0.2.bb b/meta-python/recipes-devtools/python/python3-wpa-supplicant_0.2.bb index 5ac7786ad..b9c62ced7 100644 --- a/meta-python/recipes-devtools/python/python3-wpa-supplicant_0.2.bb +++ b/meta-python/recipes-devtools/python/python3-wpa-supplicant_0.2.bb @@ -10,6 +10,8 @@ SRC_URI[sha256sum] = "3ad0f40a696763bb0f4d4dec5b51f6b53ccfeb7c16ebb5897349303045 SRC_URI += "file://0001-cli-drop-the-second-argument-from-click.argument-dec.patch" PYPI_PACKAGE = "wpa_supplicant" +UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/wpa_supplicant"; +UPSTREAM_CHECK_REGEX = "/wpa_supplicant/(?P(\d+[\.\-_]*)+)" inherit pypi setuptools3 -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107729): https://lists.openembedded.org/g/openembedded-devel/message/107729 Mute This Topic: https://lists.openembedded.org/mt/103305266/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH] python3-flask: fix upstream uri and version check
Signed-off-by: Derek Straka --- meta-python/recipes-devtools/python/python3-flask_2.3.3.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-flask_2.3.3.bb b/meta-python/recipes-devtools/python/python3-flask_2.3.3.bb index c8c8d870a..99a61f136 100644 --- a/meta-python/recipes-devtools/python/python3-flask_2.3.3.bb +++ b/meta-python/recipes-devtools/python/python3-flask_2.3.3.bb @@ -8,6 +8,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75" SRC_URI[sha256sum] = "09c347a92aa7ff4a8e7f3206795f30d826654baf38b873d0744cd571ca609efc" +UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/Flask"; +UPSTREAM_CHECK_REGEX = "/Flask/(?P(\d+[\.\-_]*)+)" + inherit pypi python_setuptools_build_meta CLEANBROKEN = "1" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107728): https://lists.openembedded.org/g/openembedded-devel/message/107728 Mute This Topic: https://lists.openembedded.org/mt/103305173/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH] python3-ipython-genutils: fix upstream uri and version check
Signed-off-by: Derek Straka --- .../recipes-devtools/python/python3-ipython-genutils_0.2.0.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-ipython-genutils_0.2.0.bb b/meta-python/recipes-devtools/python/python3-ipython-genutils_0.2.0.bb index 8725150e4..3261d8047 100644 --- a/meta-python/recipes-devtools/python/python3-ipython-genutils_0.2.0.bb +++ b/meta-python/recipes-devtools/python/python3-ipython-genutils_0.2.0.bb @@ -5,6 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING.md;md5=f7c3032c3ac398265224533a0a333a35" PYPI_PACKAGE = "ipython_genutils" +UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/ipython_genutils"; +UPSTREAM_CHECK_REGEX = "/ipython_genutils/(?P(\d+[\.\-_]*)+)" + SRC_URI[md5sum] = "5a4f9781f78466da0ea1a648f3e1f79f" SRC_URI[sha256sum] = "eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107727): https://lists.openembedded.org/g/openembedded-devel/message/107727 Mute This Topic: https://lists.openembedded.org/mt/103305012/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH] gyp: update to the latest commit
NOTE: gyp is now idle, and support will be removed in future releases https://chromium.googlesource.com/external/gyp/+/d6c5dd51dc3a60bf4ff32a5256713690a1a10376 Signed-off-by: Derek Straka --- ...01-Fix-for-Python-3.10-compatibility.patch | 36 --- meta-python/recipes-devtools/gyp/gyp_git.bb | 3 +- 2 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 meta-python/recipes-devtools/gyp/gyp/0001-Fix-for-Python-3.10-compatibility.patch diff --git a/meta-python/recipes-devtools/gyp/gyp/0001-Fix-for-Python-3.10-compatibility.patch b/meta-python/recipes-devtools/gyp/gyp/0001-Fix-for-Python-3.10-compatibility.patch deleted file mode 100644 index d1ac2c6b4..0 --- a/meta-python/recipes-devtools/gyp/gyp/0001-Fix-for-Python-3.10-compatibility.patch +++ /dev/null @@ -1,36 +0,0 @@ -From bfe579283e5fcab60172818bfe4e6e1d40c2bed0 Mon Sep 17 00:00:00 2001 -From: Kurt Kiefer -Date: Mon, 18 Oct 2021 11:21:14 -0700 -Subject: [PATCH] Fix for Python 3.10 compatibility - -The collections.abc module replaces collections for Python 3.10 - -Signed-off-by: Kurt Kiefer -Upstream-Status: Pending - - pylib/gyp/common.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pylib/gyp/common.py b/pylib/gyp/common.py -index b268d229..4f9cb0ec 100644 a/pylib/gyp/common.py -+++ b/pylib/gyp/common.py -@@ -4,7 +4,7 @@ - - from __future__ import with_statement - --import collections -+import collections.abc - import errno - import filecmp - import os.path -@@ -494,7 +494,7 @@ def uniquer(seq, idfun=None): - - - # Based on http://code.activestate.com/recipes/576694/. --class OrderedSet(collections.MutableSet): -+class OrderedSet(collections.abc.MutableSet): - def __init__(self, iterable=None): - self.end = end = [] - end += [None, end, end] # sentinel node for doubly linked list diff --git a/meta-python/recipes-devtools/gyp/gyp_git.bb b/meta-python/recipes-devtools/gyp/gyp_git.bb index 38906de75..0f94a4476 100644 --- a/meta-python/recipes-devtools/gyp/gyp_git.bb +++ b/meta-python/recipes-devtools/gyp/gyp_git.bb @@ -5,9 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ab828cb8ce4c62ee82945a11247b6bbd" SECTION = "devel" SRC_URI = "git://chromium.googlesource.com/external/gyp;protocol=https;branch=master \ - file://0001-Fix-for-Python-3.10-compatibility.patch \ " -SRCREV = "caa60026e223fc501e8b337fd5086ece4028b1c6" +SRCREV = "a03d7413becefc8d55c8aa3df58b55b9bd0e9052" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107726): https://lists.openembedded.org/g/openembedded-devel/message/107726 Mute This Topic: https://lists.openembedded.org/mt/103304965/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH] python3-wtforms: fix upstream uri and version check
Signed-off-by: Derek Straka --- meta-python/recipes-devtools/python/python3-wtforms_3.1.1.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-wtforms_3.1.1.bb b/meta-python/recipes-devtools/python/python3-wtforms_3.1.1.bb index c9ad1be48..b57c31100 100644 --- a/meta-python/recipes-devtools/python/python3-wtforms_3.1.1.bb +++ b/meta-python/recipes-devtools/python/python3-wtforms_3.1.1.bb @@ -7,6 +7,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=17ed54aa95f4a6cd0d7a4747d14b64d0" SRC_URI[sha256sum] = "5e51df8af9a60f6beead75efa10975e97768825a82146a65c7cbf5b915990620" +UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/WTForms"; +UPSTREAM_CHECK_REGEX = "/WTForms/(?P(\d+[\.\-_]*)+)" + inherit pypi python_hatchling DEPENDS += "\ -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107725): https://lists.openembedded.org/g/openembedded-devel/message/107725 Mute This Topic: https://lists.openembedded.org/mt/103304593/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH] python3-flask-sqlalchemy: fix upstream uri check
Signed-off-by: Derek Straka --- .../recipes-devtools/python/python3-flask-sqlalchemy_3.1.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-flask-sqlalchemy_3.1.1.bb b/meta-python/recipes-devtools/python/python3-flask-sqlalchemy_3.1.1.bb index ecbcf16dd..56f63bf03 100644 --- a/meta-python/recipes-devtools/python/python3-flask-sqlalchemy_3.1.1.bb +++ b/meta-python/recipes-devtools/python/python3-flask-sqlalchemy_3.1.1.bb @@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75" SRC_URI[sha256sum] = "e4b68bb881802dda1a7d878b2fc84c06d1ee57fb40b874d3dc97dabfa36b8312" PYPI_PACKAGE = "flask_sqlalchemy" +UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/Flask-SQLAlchemy"; +UPSTREAM_CHECK_REGEX = "/Flask-SQLAlchemy/(?P(\d+[\.\-_]*)+)" inherit pypi python_setuptools_build_meta -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107724): https://lists.openembedded.org/g/openembedded-devel/message/107724 Mute This Topic: https://lists.openembedded.org/mt/103303697/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH] python3-cmake: update to version 3.28.1
Signed-off-by: Derek Straka --- .../python/{python3-cmake_3.28.0.bb => python3-cmake_3.28.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-python/recipes-devtools/python/{python3-cmake_3.28.0.bb => python3-cmake_3.28.1.bb} (90%) diff --git a/meta-python/recipes-devtools/python/python3-cmake_3.28.0.bb b/meta-python/recipes-devtools/python/python3-cmake_3.28.1.bb similarity index 90% rename from meta-python/recipes-devtools/python/python3-cmake_3.28.0.bb rename to meta-python/recipes-devtools/python/python3-cmake_3.28.1.bb index c31161e8f..a6a7b6c4f 100644 --- a/meta-python/recipes-devtools/python/python3-cmake_3.28.0.bb +++ b/meta-python/recipes-devtools/python/python3-cmake_3.28.1.bb @@ -11,7 +11,7 @@ PYPI_PACKAGE = "cmake" PYPI_ARCHIVE_NAME_PREFIX = "pypi-" inherit pypi python_setuptools_build_meta -SRC_URI[sha256sum] = "cb16c350eaa8543afcb1a9b142809b075f5ee8d94fa07b7c769fbd827c985dd0" +SRC_URI[sha256sum] = "0d4051d101d151d8387156c463aa45c8cd0e164f870e0ac0c8c91d3ff08528e1" SRC_URI += " \ file://CMakeLists.txt \ -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107723): https://lists.openembedded.org/g/openembedded-devel/message/107723 Mute This Topic: https://lists.openembedded.org/mt/103303552/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [PATCH] renderdoc: no need to depend on vim-native
On Thu, Dec 21, 2023 at 2:20 AM Ross Burton wrote: > > From: Ross Burton > > Remove the patch to bring back the user of xxd from vim-native, the > patch claimed that the cross-compiling rules were broken. However they > work just fine if you tell it what compiler to use, as the default is > "c++" and that isn't in HOSTTOOLS. > > Signed-off-by: Ross Burton > --- > ...d-instead-of-cross-compiling-shim-bi.patch | 57 --- > .../renderdoc/renderdoc_1.27.bb | 2 +- > 2 files changed, 1 insertion(+), 58 deletions(-) > delete mode 100644 > meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch > > diff --git > a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch > > b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch > deleted file mode 100644 > index e96dedfc39..00 > --- > a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch > +++ /dev/null > @@ -1,57 +0,0 @@ > -From 41a8c9b5ac13066770baee476ebf9828371f4dad Mon Sep 17 00:00:00 2001 > -From: Adrian Ratiu > -Date: Tue, 24 Sep 2019 16:07:18 +0300 > -Subject: [PATCH] renderdoc: use xxd instead of cross-compiling shim binary > - > -Renderdoc's attempt to cross compile an xxd replacement by directly > -calling a host cross-compiler breaks under OE's recipe specific > -sysroots protection because this is not a native recipe, so we just > -use xxd-native instead. > - > -Upstream-Status: Inappropriate [embedded-specific] This is nice to remove such patches which are pure technical debt with no upstream path. Thanks. > - > > - renderdoc/CMakeLists.txt | 23 +-- > - 1 file changed, 1 insertion(+), 22 deletions(-) > - > -diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt > -index 5cb7440a4..453a034ba 100644 > a/renderdoc/CMakeLists.txt > -+++ b/renderdoc/CMakeLists.txt > -@@ -370,26 +370,6 @@ set(data > - set(data_objects) > - > - if(UNIX) > --# If we're cross-compiling, include-bin will get built for the target > and we > --# then can't execute it. Instead, we force calling c++ (which we can > safely > --# assume is present) directly to build the binary > -- > --if(CMAKE_CROSSCOMPILING) > --set(HOST_NATIVE_CPP_COMPILER c++ CACHE STRING "Command to run to > compile a .cpp into an executable. Default is just c++") > -- > --add_custom_command(OUTPUT > ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin > --WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} > --COMMAND ${CMAKE_COMMAND} -E make_directory > ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} > --COMMAND ${HOST_NATIVE_CPP_COMPILER} > 3rdparty/include-bin/main.cpp -o ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin > --DEPENDS 3rdparty/include-bin/main.cpp) > --set(INCLUDE_BIN_EXE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin") > --set(INCLUDE_BIN_DEP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin") > --else() > --add_executable(include-bin 3rdparty/include-bin/main.cpp) > --set(INCLUDE_BIN_EXE $) > --set(INCLUDE_BIN_DEP include-bin) > --endif() > -- > - foreach(res ${data}) > - set(in ${res}) > - set(working_dir ${CMAKE_CURRENT_SOURCE_DIR}) > -@@ -399,8 +379,7 @@ if(UNIX) > - add_custom_command(OUTPUT ${out_src} > - WORKING_DIRECTORY ${working_dir} > - COMMAND ${CMAKE_COMMAND} -E make_directory ${out_src_dir} > --COMMAND ${INCLUDE_BIN_EXE} ${in} ${out_src} > --DEPENDS ${INCLUDE_BIN_DEP} > -+COMMAND xxd -i ${in} ${out_src} > - DEPENDS ${res}) > - > - list(APPEND data_objects ${out_src}) > diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb > b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb > index 112f0ddcbe..58f2275736 100644 > --- a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb > +++ b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb > @@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = > "file://LICENSE.md;md5=36d34a46cb71546195d2b0c626a52e5d" > SRCREV = "35b13a8e8fd2a331854dba6da81a20452e142d6f" > SRC_URI = " \ > git://github.com/baldurk/${BPN}.git;protocol=https;branch=v1.x \ > -file://0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch \ > " > S = "${WORKDIR}/git" > > @@ -32,6 +31,7 @@ EXTRA_OECMAKE += "\ > -DENABLE_PYRENDERDOC=OFF \ > -DENABLE_RENDERDOCCMD=ON \ > -DCMAKE_BUILD_TYPE=Release \ > +-DHOST_NATIVE_CPP_COMPILER="${BUILD_CXX}" \ Just double checking here Does it need to be host toolchain provided cpp or cross cpp ? > " > > FILES:${PN} += "${libdir}" > -- > 2.34.1 > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107722): https://lists.openembedded.org/g/op
[oe] [meta-python][PATCH 2/2] python3-grpcio-tools: update to version 1.60.0
Delete upstreamed patch for off_t Rebase the other patches on the latest version Signed-off-by: Derek Straka --- .../0001-direct_mmap-Use-off_t-on-linux.patch | 37 --- ...f-Disable-musttail-attribute-on-mips.patch | 10 ++--- ...-Do-not-mix-C-and-C-compiler-options.patch | 25 +++-- ...56.0.bb => python3-grpcio-tools_1.60.0.bb} | 3 +- 4 files changed, 19 insertions(+), 56 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio-tools/0001-direct_mmap-Use-off_t-on-linux.patch rename meta-python/recipes-devtools/python/{python3-grpcio-tools_1.56.0.bb => python3-grpcio-tools_1.60.0.bb} (77%) diff --git a/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-direct_mmap-Use-off_t-on-linux.patch b/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-direct_mmap-Use-off_t-on-linux.patch deleted file mode 100644 index 9b3e5d4a5..0 --- a/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-direct_mmap-Use-off_t-on-linux.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 45fdade6c0415ec5af3f9312e6311a4ccc682a7b Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 28 Dec 2022 18:24:21 -0800 -Subject: [PATCH] direct_mmap: Use off_t on linux - -off64_t is not provided without defining _LARGEFILE64_SOURCE on musl -this define is not defined automatically like glibc where it gets -defined when _GNU_SOURCE is defined. Using off_t makes it portable -across musl/glibc and for using 64bit off_t on glibc 32bit systems --D_FILE_OFFSET_BITS=64 can be defined during build via CXXFLAGS - -Upstream-Status: Submitted [https://github.com/abseil/abseil-cpp/pull/1349] -Signed-off-by: Khem Raj - absl/base/internal/direct_mmap.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - a/third_party/abseil-cpp/absl/base/internal/direct_mmap.h -+++ b/third_party/abseil-cpp/absl/base/internal/direct_mmap.h -@@ -72,7 +72,7 @@ namespace base_internal { - // Platform specific logic extracted from - // https://chromium.googlesource.com/linux-syscall-support/+/master/linux_syscall_support.h - inline void* DirectMmap(void* start, size_t length, int prot, int flags, int fd, --off64_t offset) noexcept { -+off_t offset) noexcept { - #if defined(__i386__) || defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) || \ - defined(__m68k__) || defined(__sh__) || \ - (defined(__hppa__) && !defined(__LP64__)) || \ -@@ -102,7 +102,7 @@ inline void* DirectMmap(void* start, siz - #else - return reinterpret_cast( - syscall(SYS_mmap2, start, length, prot, flags, fd, -- static_cast(offset / pagesize))); -+ offset / pagesize)); - #endif - #elif defined(__s390x__) - // On s390x, mmap() arguments are passed in memory. diff --git a/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-protobuf-Disable-musttail-attribute-on-mips.patch b/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-protobuf-Disable-musttail-attribute-on-mips.patch index 8c70b2b6a..67505d0ce 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-protobuf-Disable-musttail-attribute-on-mips.patch +++ b/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-protobuf-Disable-musttail-attribute-on-mips.patch @@ -14,11 +14,11 @@ Signed-off-by: Wang Mingyu --- a/third_party/protobuf/src/google/protobuf/port_def.inc +++ b/third_party/protobuf/src/google/protobuf/port_def.inc -@@ -338,6 +338,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125 +@@ -298,6 +298,7 @@ #error PROTOBUF_TAILCALL was previously defined #endif - #if __has_cpp_attribute(clang::musttail) && !defined(__arm__) && \ -+!defined(__mips__) &&\ + #if ABSL_HAVE_CPP_ATTRIBUTE(clang::musttail) && !defined(__arm__) && \ ++!defined(__mips__) && \ !defined(_ARCH_PPC) && !defined(__wasm__) && \ - !(defined(_MSC_VER) && defined(_M_IX86)) && !defined(__i386__) && \ - !(defined(__NDK_MAJOR__) && __NDK_MAJOR <= 24) + !(defined(_MSC_VER) && defined(_M_IX86)) && !defined(__i386__) + // Compilation fails on ARM32: b/195943306 diff --git a/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch b/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch index 4aa11bd57..07276c17f 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch +++ b/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch @@ -30,29 +30,30 @@ diff --git a/setup.py b/setup.py index cc53e79..be3bc78 100644 --- a/setup.py +++ b/setup.py -@@ -87,8 +87,11 @@ def check_linker_need_libatomic(): - """Tes
[oe] [meta-python][PATCH 1/2] python3-grpcio: update to version 1.60.0
Signed-off-by: Derek Straka --- .../{python3-grpcio_1.59.3.bb => python3-grpcio_1.60.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-python/recipes-devtools/python/{python3-grpcio_1.59.3.bb => python3-grpcio_1.60.0.bb} (93%) diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.59.3.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.60.0.bb similarity index 93% rename from meta-python/recipes-devtools/python/python3-grpcio_1.59.3.bb rename to meta-python/recipes-devtools/python/python3-grpcio_1.60.0.bb index 7b1631527..77b4198e3 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio_1.59.3.bb +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.60.0.bb @@ -10,7 +10,7 @@ SRC_URI += "file://0001-Include-missing-cstdint-header.patch \ file://abseil-ppc-fixes.patch \ file://0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch \ " -SRC_URI[sha256sum] = "7800f99568a74a06ebdccd419dd1b6e639b477dcaf6da77ea702f8fb14ce5f80" +SRC_URI[sha256sum] = "2199165a1affb666aa24adf0c97436686d0a61bc5fc113c037701fb7c7fceb96" RDEPENDS:${PN} = "${PYTHON_PN}-protobuf \ ${PYTHON_PN}-setuptools \ -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107720): https://lists.openembedded.org/g/openembedded-devel/message/107720 Mute This Topic: https://lists.openembedded.org/mt/103303315/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH 5/5] python3-flask-wtf: update to version 1.2.1
Signed-off-by: Derek Straka --- ...ython3-flask-wtf_1.1.1.bb => python3-flask-wtf_1.2.1.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-python/recipes-devtools/python/{python3-flask-wtf_1.1.1.bb => python3-flask-wtf_1.2.1.bb} (66%) diff --git a/meta-python/recipes-devtools/python/python3-flask-wtf_1.1.1.bb b/meta-python/recipes-devtools/python/python3-flask-wtf_1.2.1.bb similarity index 66% rename from meta-python/recipes-devtools/python/python3-flask-wtf_1.1.1.bb rename to meta-python/recipes-devtools/python/python3-flask-wtf_1.2.1.bb index ec47fcac2..54d7bd637 100644 --- a/meta-python/recipes-devtools/python/python3-flask-wtf_1.1.1.bb +++ b/meta-python/recipes-devtools/python/python3-flask-wtf_1.2.1.bb @@ -2,11 +2,11 @@ DESCRIPTION = "Simple integration of Flask and WTForms." LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=d98d089889e14b227732d45dac3aacc4" -SRC_URI[sha256sum] = "41c4244e9ae626d63bed42ae4785b90667b885b1535d5a4095e1f63060d12aa9" +SRC_URI[sha256sum] = "8bb269eb9bb46b87e7c8233d7e7debdf1f8b74bf90cc1789988c29b37a97b695" -PYPI_PACKAGE = "Flask-WTF" +PYPI_PACKAGE = "flask_wtf" -inherit pypi setuptools3 +inherit pypi python_hatchling RDEPENDS:${PN} = "\ ${PYTHON_PN}-flask \ -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107719): https://lists.openembedded.org/g/openembedded-devel/message/107719 Mute This Topic: https://lists.openembedded.org/mt/103302171/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH 4/5] python3-eventlet: update to version 0.34.1
Remove patch incorporated in the upstream release Signed-off-by: Derek Straka --- ...o-host-0-is-not-supported-on-OpenInd.patch | 78 --- ...t_0.33.3.bb => python3-eventlet_0.34.1.bb} | 3 +- 2 files changed, 1 insertion(+), 80 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-eventlet/0001-tests-getaddrinfo-host-0-is-not-supported-on-OpenInd.patch rename meta-python/recipes-devtools/python/{python3-eventlet_0.33.3.bb => python3-eventlet_0.34.1.bb} (66%) diff --git a/meta-python/recipes-devtools/python/python3-eventlet/0001-tests-getaddrinfo-host-0-is-not-supported-on-OpenInd.patch b/meta-python/recipes-devtools/python/python3-eventlet/0001-tests-getaddrinfo-host-0-is-not-supported-on-OpenInd.patch deleted file mode 100644 index 61a37d94e..0 --- a/meta-python/recipes-devtools/python/python3-eventlet/0001-tests-getaddrinfo-host-0-is-not-supported-on-OpenInd.patch +++ /dev/null @@ -1,78 +0,0 @@ -From ac2f960a50710bb257e87bed4e3c95a746f2a0fe Mon Sep 17 00:00:00 2001 -From: Sergey Shepelev -Date: Mon, 27 Mar 2023 22:07:15 +0300 -Subject: [PATCH] tests: getaddrinfo(host, 0) is not supported on OpenIndiana - platform - -https://github.com/eventlet/eventlet/issues/791 - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin - tests/greendns_test.py | 14 +++--- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/tests/greendns_test.py b/tests/greendns_test.py -index feab2b6..3802f44 100644 a/tests/greendns_test.py -+++ b/tests/greendns_test.py -@@ -613,14 +613,14 @@ class TestGetaddrinfo(tests.LimitedTestCase): - def test_getaddrinfo_only_a_ans(self): - greendns.resolve = _make_mock_resolve() - greendns.resolve.add('example.com', '1.2.3.4') --res = greendns.getaddrinfo('example.com', 0) -+res = greendns.getaddrinfo('example.com', None) - addr = [('1.2.3.4', 0)] * len(res) - assert addr == [ai[-1] for ai in res] - - def test_getaddrinfo_only__ans(self): - greendns.resolve = _make_mock_resolve() - greendns.resolve.add('example.com', 'dead:beef::1') --res = greendns.getaddrinfo('example.com', 0) -+res = greendns.getaddrinfo('example.com', None) - addr = [('dead:beef::1', 0, 0, 0)] * len(res) - assert addr == [ai[-1] for ai in res] - -@@ -637,7 +637,7 @@ class TestGetaddrinfo(tests.LimitedTestCase): - res.raises = greendns.dns.exception.Timeout - greendns.resolver._resolver = res() - --result = greendns.getaddrinfo('example.com', 0, 0) -+result = greendns.getaddrinfo('example.com', None, 0) - addr = [('1.2.3.4', 0)] * len(result) - assert addr == [ai[-1] for ai in result] - -@@ -654,7 +654,7 @@ class TestGetaddrinfo(tests.LimitedTestCase): - res.raises = greendns.dns.exception.DNSException - greendns.resolver._resolver = res() - --result = greendns.getaddrinfo('example.com', 0, 0) -+result = greendns.getaddrinfo('example.com', None, 0) - addr = [('1.2.3.4', 0)] * len(result) - assert addr == [ai[-1] for ai in result] - -@@ -667,7 +667,7 @@ class TestGetaddrinfo(tests.LimitedTestCase): - greendns.resolver._resolver = res() - - with tests.assert_raises(socket.gaierror): --greendns.getaddrinfo('example.com', 0, 0) -+greendns.getaddrinfo('example.com', None, 0) - - def test_getaddrinfo_hosts_only_dns_error(self): - hostsres = _make_mock_base_resolver() -@@ -678,13 +678,13 @@ class TestGetaddrinfo(tests.LimitedTestCase): - greendns.resolver._resolver = res() - - with tests.assert_raises(socket.gaierror): --greendns.getaddrinfo('example.com', 0, 0) -+greendns.getaddrinfo('example.com', None, 0) - - def test_canonname(self): - greendns.resolve = _make_mock_resolve() - greendns.resolve.add('host.example.com', '1.2.3.4') - greendns.resolve_cname = self._make_mock_resolve_cname() --res = greendns.getaddrinfo('host.example.com', 0, -+res = greendns.getaddrinfo('host.example.com', None, -0, 0, 0, socket.AI_CANONNAME) - assert res[0][3] == 'cname.example.com' - diff --git a/meta-python/recipes-devtools/python/python3-eventlet_0.33.3.bb b/meta-python/recipes-devtools/python/python3-eventlet_0.34.1.bb similarity index 66% rename from meta-python/recipes-devtools/python/python3-eventlet_0.33.3.bb rename to meta-python/recipes-devtools/python/python3-eventlet_0.34.1.bb index fe4d4f020..cd6d2b25e 100644 --- a/meta-python/recipes-devtools/python/python3-eventlet_0.33.3.bb +++ b/meta-python/recipes-devtools/python/python3-eventlet_0.34.1.bb @@ -4,8 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=56472ad6de4caf50e05332a34b66e778" -SRC_URI += "file://0001-tests-getaddrinfo-host-0-is-not-supported-on-OpenIn
[oe] [meta-python][PATCH 2/5] python3-bitarray: update to version 2.9.0
Signed-off-by: Derek Straka --- .../{python3-bitarray_2.8.5.bb => python3-bitarray_2.9.0.bb}| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-python/recipes-devtools/python/{python3-bitarray_2.8.5.bb => python3-bitarray_2.9.0.bb} (80%) diff --git a/meta-python/recipes-devtools/python/python3-bitarray_2.8.5.bb b/meta-python/recipes-devtools/python/python3-bitarray_2.9.0.bb similarity index 80% rename from meta-python/recipes-devtools/python/python3-bitarray_2.8.5.bb rename to meta-python/recipes-devtools/python/python3-bitarray_2.9.0.bb index 5047784ab..e899c800b 100644 --- a/meta-python/recipes-devtools/python/python3-bitarray_2.8.5.bb +++ b/meta-python/recipes-devtools/python/python3-bitarray_2.9.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/ilanschnell/bitarray"; LICENSE = "PSF-2.0" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=2ad702cdcd49e8d2ac01d7e7d0810d2d" -SRC_URI[sha256sum] = "b7564fd218cc4479f7f0106d341e096f78907b47865aeeff702c807df1927c01" +SRC_URI[sha256sum] = "41f6b46f01bc59abfc38653d203565113b6e7dd04d0ec688774ed28e6d9755db" inherit setuptools3 pypi -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107716): https://lists.openembedded.org/g/openembedded-devel/message/107716 Mute This Topic: https://lists.openembedded.org/mt/103302165/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH 3/5] python3-pyfanotify: update to version 0.2.2
Signed-off-by: Derek Straka --- ...ine-FNM_EXTMATCH-if-not-already-defined.patch | 16 +++- ...tify_0.2.1.bb => python3-pyfanotify_0.2.2.bb} | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) rename meta-python/recipes-devtools/python/{python3-pyfanotify_0.2.1.bb => python3-pyfanotify_0.2.2.bb} (83%) diff --git a/meta-python/recipes-devtools/python/python3-pyfanotify/0001-ext-define-FNM_EXTMATCH-if-not-already-defined.patch b/meta-python/recipes-devtools/python/python3-pyfanotify/0001-ext-define-FNM_EXTMATCH-if-not-already-defined.patch index 2fa3cb05d..4c279bbcd 100644 --- a/meta-python/recipes-devtools/python/python3-pyfanotify/0001-ext-define-FNM_EXTMATCH-if-not-already-defined.patch +++ b/meta-python/recipes-devtools/python/python3-pyfanotify/0001-ext-define-FNM_EXTMATCH-if-not-already-defined.patch @@ -1,19 +1,20 @@ -From 9e7894b97ae7afe43a9901b774de5aef401549ac Mon Sep 17 00:00:00 2001 +From 87f1bf7d1e0ca2a841706d1c41d14382f11264db Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Thu, 28 Apr 2022 16:32:06 +0200 Subject: [PATCH] ext: define FNM_EXTMATCH if not already defined On musl this constant is not defined. Define it locally if not present. -Signed-off-by: Bartosz Golaszewski Upstream-Status: Inappropriate +Signed-off-by: Bartosz Golaszewski + +--- src/ext.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ext.c b/src/ext.c -index e0bbe21..7d979d3 100644 +index fb33de1..fa01a81 100644 --- a/src/ext.c +++ b/src/ext.c @@ -19,6 +19,9 @@ @@ -24,8 +25,5 @@ index e0bbe21..7d979d3 100644 +#define FNM_EXTMATCH 0 +#endif - PyDoc_STRVAR(ext__doc__, - "Wrapper for fanotify.\n" --- -2.34.1 - + #define FUNUSED __attribute__((unused)) + diff --git a/meta-python/recipes-devtools/python/python3-pyfanotify_0.2.1.bb b/meta-python/recipes-devtools/python/python3-pyfanotify_0.2.2.bb similarity index 83% rename from meta-python/recipes-devtools/python/python3-pyfanotify_0.2.1.bb rename to meta-python/recipes-devtools/python/python3-pyfanotify_0.2.2.bb index c9fd07144..292ceab2e 100644 --- a/meta-python/recipes-devtools/python/python3-pyfanotify_0.2.1.bb +++ b/meta-python/recipes-devtools/python/python3-pyfanotify_0.2.2.bb @@ -5,7 +5,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=636a36c9df04efcfacf839b8866d9a37" SRC_URI += "file://0001-ext-define-FNM_EXTMATCH-if-not-already-defined.patch" -SRC_URI[sha256sum] = "fd62dccdf3c17ca117e3279f0cbc65c639e53c9dec8a459d44ed6a35c1a18e60" +SRC_URI[sha256sum] = "90219aa9f8b78fa732f24aa7b21c7bb6ac97a6eb47f1763c899b8194e23af1df" inherit pypi setuptools3 -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107717): https://lists.openembedded.org/g/openembedded-devel/message/107717 Mute This Topic: https://lists.openembedded.org/mt/103302166/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH 1/5] python3-rapidjson: update to version 1.14
Signed-off-by: Derek Straka --- ...thon3-rapidjson_1.13.bb => python3-rapidjson_1.14.bb} | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) rename meta-python/recipes-devtools/python/{python3-rapidjson_1.13.bb => python3-rapidjson_1.14.bb} (82%) diff --git a/meta-python/recipes-devtools/python/python3-rapidjson_1.13.bb b/meta-python/recipes-devtools/python/python3-rapidjson_1.14.bb similarity index 82% rename from meta-python/recipes-devtools/python/python3-rapidjson_1.13.bb rename to meta-python/recipes-devtools/python/python3-rapidjson_1.14.bb index 1623f721f..8b76397bf 100644 --- a/meta-python/recipes-devtools/python/python3-rapidjson_1.13.bb +++ b/meta-python/recipes-devtools/python/python3-rapidjson_1.14.bb @@ -4,13 +4,12 @@ HOMEPAGE = "https://github.com/python-rapidjson/python-rapidjson"; LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=4daf3929156304df67003c33274a98bd" -SRC_URI = "git://github.com/python-rapidjson/python-rapidjson.git;protocol=https;branch=master" -SRCREV = "a87053d9b97750afddb504da05bd1cd9f4b94654" - -S = "${WORKDIR}/git" +SRC_URI[sha256sum] = "26806f0a658c34b48d2951d8d3f846ca9deb93a34e664ef436db632a188b6779" # Inheriting ptest provides functionality for packaging and installing runtime tests for this recipe -inherit setuptools3 ptest +inherit setuptools3 pypi ptest + +PYPI_PACKAGE = "python-rapidjson" SETUPTOOLS_BUILD_ARGS += " --rj-include-dir=${RECIPE_SYSROOT}${includedir}" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107715): https://lists.openembedded.org/g/openembedded-devel/message/107715 Mute This Topic: https://lists.openembedded.org/mt/103302164/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [kirkstone][PATCH 0/2] Add sipconfig.py support to sip3
Hi Armin, Is there anything else I can provide? I'm happy to do any additional testing if it helps. Regards, Rob From: Woolley, Rob Sent: Wednesday, December 6, 2023 11:57 AM To: akuster808 ; openembedded-devel@lists.openembedded.org Cc: raj.k...@gmail.com ; alex.kana...@gmail.com Subject: Re: [oe] [kirkstone][PATCH 0/2] Add sipconfig.py support to sip3 Hi Armin, Thanks for looking at this. No, I don't think we need it in master. Riverbank Computing changed python3-pyqt5 to only support SIP v6. (FYI I sent out a separate pull request to meta-qt5 to update python-pyqt5 to 5.15.7. This version is the last release to use SIP v4; see https://github.com/meta-qt5/meta-qt5/pull/546/commits/a82daf56e9c783c684da98a2996677bc1d7a439e) Langdale is the last Yocto release with the sip v4.19.23 recipe before we removed it and created a new recipe for SIP v6. Dunfell and Kirkstone are the only supported releases to still use SIP v4. I did a test build of Dunfell with a copy of the Kirkstone recipes. The sip3, sip3-native, qtbase, and python3-pyqt5 tasks all completed successfully. I am happy to send out a Dunfell patch if you would like me to. Regards, Rob From: akuster808 Sent: Wednesday, December 6, 2023 7:28 AM To: Woolley, Rob ; openembedded-devel@lists.openembedded.org Cc: raj.k...@gmail.com ; alex.kana...@gmail.com Subject: Re: [oe] [kirkstone][PATCH 0/2] Add sipconfig.py support to sip3 CAUTION: This email comes from a non Wind River email account! Do not click links or open attachments unless you recognize the sender and know the content is safe. On 12/1/23 10:09 PM, Rob Woolley via lists.openembedded.org wrote: > Some packages in meta-ros, like qt-gui-cpp, need sipconfig.py to be > present in python3-sip3. Changes are required to ensure that the > sip tools execute successfully and that paths from the host machine > don't get included in the SIP configuration file. Do similar changes need to go into Master? > > Rob Woolley (2): >sip3: Add sipconfig.py >sip3: Add py_ssize_t_clean argument > > ...ean-argument-to-the-module-directive.patch | 17679 > meta-oe/recipes-devtools/sip/sip3_4.19.23.bb |21 +- > 2 files changed, 17699 insertions(+), 1 deletion(-) > create mode 100644 > meta-oe/recipes-devtools/sip/sip3/added-the-py_ssize_t_clean-argument-to-the-module-directive.patch > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107714): https://lists.openembedded.org/g/openembedded-devel/message/107714 Mute This Topic: https://lists.openembedded.org/mt/102930497/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH] wavpack: upgrade 5.1.0 -> 5.6.0
Added openssl as a depends and sent v2 patch, thank you. Martin Jansa , 21 Ara 2023 Per, 15:30 tarihinde şunu yazdı: > > Adding the dependency on target openssl allows the build to finish OK. > > On Thu, Dec 21, 2023 at 1:06 PM Martin Jansa via lists.openembedded.org > wrote: >> >> Hi, >> >> it seems to be trying to link with native libcrypto in some builds: >> >> lib32-wavpack/5.6.0/recipe-sysroot-native/usr/lib/libcrypto.so: file not >> recognized: file format not recognized >> collect2: error: ld returned 1 exit status >> >> have you tried to build it e.g. for aarch64 or arm on x86_64 build host? >> >> On Wed, Dec 20, 2023 at 7:25 AM Alper Ak wrote: >>> >>> License-Update: Copyright year changes >>> >>> Changelog: >>> >>> * added: AIFF file import/export support >>> * added: WATCOM compiler and OS/2 support >>> * added: cmake support for mingw, builds Cooledit + Winamp plugins >>> * added: --force-even-byte-depth option for rounding up bit depths >>> * fixed: detect and report PCM files having non-zero padding bits >>> * fixed: possible crash when displaying long channel assignments >>> * fixed: big-endian-sourced "raw" files gave big-endian "wav"s >>> * fixed: numerous minor issues >>> * fixed: CVE-2021-44269 (encoding crafted DSD file triggers OOB read crash) >>> * fixed: very long filenames cause stack-overflow crash in all CLI programs >>> * fixed: the length stored in WAV headers not always corrected when using -i >>> * fixed: attempting to encode raw DSD audio from stdin sometimes causes >>> crash >>> * fixed: DSD to PCM decimation: small clicks between tracks and tiny DC >>> offset >>> * fixed: length update in library-generated WAV headers on big-endian >>> machines >>> * fixed: sanitize custom extensions read from WavPack files to be >>> alphanumeric >>> * added: accepting brace-delimited options in the wavpack executable >>> filename >>> * added: "--drop" option to Windows executables for multi-file >>> "drag-and-drop" >>> * added" "--raw-pcm" option to wvunpack executable (does DSD --> 24-bit PCM) >>> * added: "--no-overwrite" option to wavpack executable (to resume sessions) >>> * improved: build system clean-up including switch to non-recursive "make" >>> * fixed: potential security issue CVE-2020-35738 >>> * fixed: disable A32 asm code when building for Apple silicon >>> * fixed: issues with Adobe-style floating-point WAV files >>> * added: -vv option to wvunpack to quickly verify using just >>> block checksums (ideal for detecting corrupted files) >>> * added: --normalize-floats option to wvunpack for correctly >>> exporting un-normalized floating-point files >>> * updated: Visual Studio 2019 for Windows builds >>> * dropped: WinXP support in official binaries >>> * fixed: OSS-Fuzz issues 19925, 19928, 20060, 20448 >>> (no CVEs or vulnerabilities) >>> * fixed: trailing garbage characters on imported ID3v2 TXXX tags >>> * fixed: various minor undefined behavior and memory access issues >>> * fixed: sanitize tag extraction names for length and path inclusion >>> * improved: reformat wvunpack "help" and split into long + short versions >>> * added: regression testing to Travis CI for OSS-Fuzz crashers >>> * fixed: potential security issues including the following CVEs: >>> CVE-2018-19840 CVE-2018-19841 CVE-2018-10536 >>> CVE-2018-10537 CVE-2018-10538 CVE-2018-10539 >>> CVE-2018-10540 CVE-2018-7254 CVE-2018-7253 >>> CVE-2018-6767 >>> * added: support for CMake, Travis CI, and Google's OSS-fuzz >>> * fixed: use correction file for encode verify (pipe input, Windows) >>> * fixed: correct WAV header with actual length (pipe input, -i option) >>> * fixed: thumb interworking and not needing v6 architecture (ARM asm) >>> * added: handle more ID3v2.3 tag items and from all file types >>> * fixed: coredump on Sparc64 (changed MD5 implementation) >>> * fixed: handle invalid ID3v2.3 tags from sacd-ripper >>> * fixed: several corner-case memory leaks >>> >>> Signed-off-by: alperak >>> --- >>> .../wavpack/{wavpack_5.1.0.bb => wavpack_5.6.0.bb} | 6 +++--- >>> 1 file changed, 3 insertions(+), 3 deletions(-) >>> rename meta-oe/recipes-multimedia/wavpack/{wavpack_5.1.0.bb => >>> wavpack_5.6.0.bb} (63%) >>> >>> diff --git a/meta-oe/recipes-multimedia/wavpack/wavpack_5.1.0.bb >>> b/meta-oe/recipes-multimedia/wavpack/wavpack_5.6.0.bb >>> similarity index 63% >>> rename from meta-oe/recipes-multimedia/wavpack/wavpack_5.1.0.bb >>> rename to meta-oe/recipes-multimedia/wavpack/wavpack_5.6.0.bb >>> index 909612393..80671896c 100644 >>> --- a/meta-oe/recipes-multimedia/wavpack/wavpack_5.1.0.bb >>> +++ b/meta-oe/recipes-multimedia/wavpack/wavpack_5.6.0.bb >>> @@ -1,9 +1,9 @@ >>> DESCRIPTION = "WavPack is a completely open audio compression format >>> providing lossless, high-quality lossy, and a unique hybrid compression >>> mode." >>> LICENSE = "BSD-3-Clause" >>> -LIC_FILES_CHKSUM = >>> "file://license.txt;md5=8c1a910e5c2a8b30ec8ffb2ffa63d9b2" >>> +L
Re: [oe] [meta-oe][PATCH] wavpack: upgrade 5.1.0 -> 5.6.0
Adding the dependency on target openssl allows the build to finish OK. On Thu, Dec 21, 2023 at 1:06 PM Martin Jansa via lists.openembedded.org wrote: > Hi, > > it seems to be trying to link with native libcrypto in some builds: > > lib32-wavpack/5.6.0/recipe-sysroot-native/usr/lib/libcrypto.so: file not > recognized: file format not recognized > collect2: error: ld returned 1 exit status > > have you tried to build it e.g. for aarch64 or arm on x86_64 build host? > > On Wed, Dec 20, 2023 at 7:25 AM Alper Ak wrote: > >> License-Update: Copyright year changes >> >> Changelog: >> >> * added: AIFF file import/export support >> * added: WATCOM compiler and OS/2 support >> * added: cmake support for mingw, builds Cooledit + Winamp plugins >> * added: --force-even-byte-depth option for rounding up bit depths >> * fixed: detect and report PCM files having non-zero padding bits >> * fixed: possible crash when displaying long channel assignments >> * fixed: big-endian-sourced "raw" files gave big-endian "wav"s >> * fixed: numerous minor issues >> * fixed: CVE-2021-44269 (encoding crafted DSD file triggers OOB read >> crash) >> * fixed: very long filenames cause stack-overflow crash in all CLI >> programs >> * fixed: the length stored in WAV headers not always corrected when using >> -i >> * fixed: attempting to encode raw DSD audio from stdin sometimes causes >> crash >> * fixed: DSD to PCM decimation: small clicks between tracks and tiny DC >> offset >> * fixed: length update in library-generated WAV headers on big-endian >> machines >> * fixed: sanitize custom extensions read from WavPack files to be >> alphanumeric >> * added: accepting brace-delimited options in the wavpack executable >> filename >> * added: "--drop" option to Windows executables for multi-file >> "drag-and-drop" >> * added" "--raw-pcm" option to wvunpack executable (does DSD --> 24-bit >> PCM) >> * added: "--no-overwrite" option to wavpack executable (to resume >> sessions) >> * improved: build system clean-up including switch to non-recursive "make" >> * fixed: potential security issue CVE-2020-35738 >> * fixed: disable A32 asm code when building for Apple silicon >> * fixed: issues with Adobe-style floating-point WAV files >> * added: -vv option to wvunpack to quickly verify using just >> block checksums (ideal for detecting corrupted files) >> * added: --normalize-floats option to wvunpack for correctly >> exporting un-normalized floating-point files >> * updated: Visual Studio 2019 for Windows builds >> * dropped: WinXP support in official binaries >> * fixed: OSS-Fuzz issues 19925, 19928, 20060, 20448 >> (no CVEs or vulnerabilities) >> * fixed: trailing garbage characters on imported ID3v2 TXXX tags >> * fixed: various minor undefined behavior and memory access issues >> * fixed: sanitize tag extraction names for length and path inclusion >> * improved: reformat wvunpack "help" and split into long + short versions >> * added: regression testing to Travis CI for OSS-Fuzz crashers >> * fixed: potential security issues including the following CVEs: >> CVE-2018-19840 CVE-2018-19841 CVE-2018-10536 >> CVE-2018-10537 CVE-2018-10538 CVE-2018-10539 >> CVE-2018-10540 CVE-2018-7254 CVE-2018-7253 >> CVE-2018-6767 >> * added: support for CMake, Travis CI, and Google's OSS-fuzz >> * fixed: use correction file for encode verify (pipe input, Windows) >> * fixed: correct WAV header with actual length (pipe input, -i option) >> * fixed: thumb interworking and not needing v6 architecture (ARM asm) >> * added: handle more ID3v2.3 tag items and from all file types >> * fixed: coredump on Sparc64 (changed MD5 implementation) >> * fixed: handle invalid ID3v2.3 tags from sacd-ripper >> * fixed: several corner-case memory leaks >> >> Signed-off-by: alperak >> --- >> .../wavpack/{wavpack_5.1.0.bb => wavpack_5.6.0.bb} | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) >> rename meta-oe/recipes-multimedia/wavpack/{wavpack_5.1.0.bb => >> wavpack_5.6.0.bb} (63%) >> >> diff --git a/meta-oe/recipes-multimedia/wavpack/wavpack_5.1.0.bb >> b/meta-oe/recipes-multimedia/wavpack/wavpack_5.6.0.bb >> similarity index 63% >> rename from meta-oe/recipes-multimedia/wavpack/wavpack_5.1.0.bb >> rename to meta-oe/recipes-multimedia/wavpack/wavpack_5.6.0.bb >> index 909612393..80671896c 100644 >> --- a/meta-oe/recipes-multimedia/wavpack/wavpack_5.1.0.bb >> +++ b/meta-oe/recipes-multimedia/wavpack/wavpack_5.6.0.bb >> @@ -1,9 +1,9 @@ >> DESCRIPTION = "WavPack is a completely open audio compression format >> providing lossless, high-quality lossy, and a unique hybrid compression >> mode." >> LICENSE = "BSD-3-Clause" >> -LIC_FILES_CHKSUM = >> "file://license.txt;md5=8c1a910e5c2a8b30ec8ffb2ffa63d9b2" >> +LIC_FILES_CHKSUM = >> "file://license.txt;md5=bb5d037e3ad41a3c84c9f2d8bb65a7b4" >> >> SRC_URI = "git:// >> github.com/dbry/WavPack.git;branch=master;protocol=https" >> -SRCREV = "9ccc3fe4a37d069137ceabe513a4dd9b0a09c1c2" >>
[oe] [meta-oe][PATCH 2/2] opensc: Fix CVE-2023-40661
From: virendra thakur Upstream-Status: Backport[https://salsa.debian.org/opensc-team/opensc/-/commit/8026fb4ca0ed53d970c6c497252eb264d4192d50] Signed-off-by: virendra thakur --- .../opensc/opensc/CVE-2023-40661-1.patch | 47 +++ .../opensc/opensc/CVE-2023-40661-2.patch | 32 + .../opensc/opensc/CVE-2023-40661-3.patch | 31 .../opensc/opensc/CVE-2023-40661-4.patch | 28 +++ .../opensc/opensc/CVE-2023-40661-5.patch | 30 .../opensc/opensc/CVE-2023-40661-6.patch | 30 .../opensc/opensc/CVE-2023-40661-7.patch | 40 .../recipes-support/opensc/opensc_0.20.0.bb | 7 +++ 8 files changed, 245 insertions(+) create mode 100644 meta-oe/recipes-support/opensc/opensc/CVE-2023-40661-1.patch create mode 100644 meta-oe/recipes-support/opensc/opensc/CVE-2023-40661-2.patch create mode 100644 meta-oe/recipes-support/opensc/opensc/CVE-2023-40661-3.patch create mode 100644 meta-oe/recipes-support/opensc/opensc/CVE-2023-40661-4.patch create mode 100644 meta-oe/recipes-support/opensc/opensc/CVE-2023-40661-5.patch create mode 100644 meta-oe/recipes-support/opensc/opensc/CVE-2023-40661-6.patch create mode 100644 meta-oe/recipes-support/opensc/opensc/CVE-2023-40661-7.patch diff --git a/meta-oe/recipes-support/opensc/opensc/CVE-2023-40661-1.patch b/meta-oe/recipes-support/opensc/opensc/CVE-2023-40661-1.patch new file mode 100644 index 0..3ecff558c --- /dev/null +++ b/meta-oe/recipes-support/opensc/opensc/CVE-2023-40661-1.patch @@ -0,0 +1,47 @@ +Origin: https://github.com/OpenSC/OpenSC/commit/245efe608d083fd4e4ec96793fdefd218e26fde7 +From: Jakub Jelen +Date: Thu, 17 Aug 2023 13:54:42 +0200 +Subject: pkcs15: Avoid buffer overflow when getting last update + +Thanks oss-fuzz + +https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=60769 + +CVE: CVE-2023-40661 +Upstream-Status: Backport [https://salsa.debian.org/opensc-team/opensc/-/commit/8026fb4ca0ed53d970c6c497252eb264d4192d50] +Signed-off-by: Virendra Thakur +Comment: Hunk refreshed based on codebase. + +--- + src/libopensc/pkcs15.c | 16 +--- + 1 file changed, 9 insertions(+), 7 deletions(-) + +diff --git a/src/libopensc/pkcs15.c b/src/libopensc/pkcs15.c +index eb7fc6afcd..4215b733a8 100644 +--- a/src/libopensc/pkcs15.c b/src/libopensc/pkcs15.c +@@ -528,7 +528,7 @@ + struct sc_context *ctx = p15card->card->ctx; + struct sc_file *file = NULL; + struct sc_asn1_entry asn1_last_update[C_ASN1_LAST_UPDATE_SIZE]; +- unsigned char *content, last_update[32]; ++unsigned char *content, last_update[32] = {0}; + size_t lupdate_len = sizeof(last_update) - 1; + int r, content_len; + size_t size; +@@ -564,9 +564,11 @@ + if (r < 0) + return NULL; + +- p15card->tokeninfo->last_update.gtime = strdup((char *)last_update); +- if (!p15card->tokeninfo->last_update.gtime) +- return NULL; ++if (asn1_last_update[0].flags & SC_ASN1_PRESENT) { ++p15card->tokeninfo->last_update.gtime = strdup((char *)last_update); ++if (!p15card->tokeninfo->last_update.gtime) ++return NULL; ++} + done: + sc_log(ctx, "lastUpdate.gtime '%s'", p15card->tokeninfo->last_update.gtime); + return p15card->tokeninfo->last_update.gtime; + diff --git a/meta-oe/recipes-support/opensc/opensc/CVE-2023-40661-2.patch b/meta-oe/recipes-support/opensc/opensc/CVE-2023-40661-2.patch new file mode 100644 index 0..39e729c5a --- /dev/null +++ b/meta-oe/recipes-support/opensc/opensc/CVE-2023-40661-2.patch @@ -0,0 +1,32 @@ +Origin: https://github.com/OpenSC/OpenSC/commit/440ca666eff10cc7011901252d20f3fc4ea23651 +From: Jakub Jelen +Date: Thu, 17 Aug 2023 13:41:36 +0200 +Subject: setcos: Avoid buffer underflow + +Thanks oss-fuzz + +https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=60672 +CVE: CVE-2023-40661 +Upstream-Status: Backport [https://salsa.debian.org/opensc-team/opensc/-/commit/8026fb4ca0ed53d970c6c497252eb264d4192d50] +Signed-off-by: Virendra Thakur +Comment: Hunk refreshed based on codebase. +--- + src/pkcs15init/pkcs15-setcos.c | 4 + 1 file changed, 4 insertions(+) + +diff --git a/src/pkcs15init/pkcs15-setcos.c b/src/pkcs15init/pkcs15-setcos.c +index 1b56afe6d9..1907b47f9d 100644 +--- a/src/pkcs15init/pkcs15-setcos.c b/src/pkcs15init/pkcs15-setcos.c +@@ -346,6 +346,10 @@ + + /* Replace the path of instantiated key template by the path from the object data. */ + memcpy(&file->path, &key_info->path, sizeof(file->path)); ++ if (file->path.len < 2) { ++ sc_file_free(file); ++ LOG_TEST_RET(ctx, SC_ERROR_INVALID_DATA, "Invalid path"); ++ } + file->id = file->path.value[file->path.len - 2] * 0x100 + + file->path.value[file->path.len - 1]; + + diff --git a/meta-oe/recipes-support/opensc/opensc/CVE-2023-40
[oe] [meta-oe][PATCH 1/2] opensc: Fix CVE-2023-40660
From: virendra thakur Upstream-Status: Backport [https://salsa.debian.org/opensc-team/opensc/-/commit/940e8bc764047c873f88bb1396933a5368d03533] Signed-off-by: virendra thakur --- .../opensc/opensc/CVE-2023-40660.patch| 55 +++ .../recipes-support/opensc/opensc_0.20.0.bb | 1 + 2 files changed, 56 insertions(+) create mode 100644 meta-oe/recipes-support/opensc/opensc/CVE-2023-40660.patch diff --git a/meta-oe/recipes-support/opensc/opensc/CVE-2023-40660.patch b/meta-oe/recipes-support/opensc/opensc/CVE-2023-40660.patch new file mode 100644 index 0..74e547298 --- /dev/null +++ b/meta-oe/recipes-support/opensc/opensc/CVE-2023-40660.patch @@ -0,0 +1,55 @@ +Origin: https://github.com/OpenSC/OpenSC/commit/868f76fb31255fd3fdacfc3e476452efeb61c3e7 +From: Frank Morgner +Date: Wed, 21 Jun 2023 12:27:23 +0200 +Subject: Fixed PIN authentication bypass + +If two processes are accessing a token, then one process may leave the +card usable with an authenticated PIN so that a key may sign/decrypt any +data. This is especially the case if the token does not support a way of +resetting the authentication status (logout). + +We have some tracking of the authentication status in software via +PKCS#11, Minidriver (os-wise) and CryptoTokenKit, which is why a +PIN-prompt will appear even though the card may technically be unlocked +as described in the above example. However, before this change, an empty +PIN was not verified (likely yielding an error during PIN-verification), +but it was just checked whether the PIN is authenticated. This defeats +the purpose of the PIN verification, because an empty PIN is not the +correct one. Especially during OS Logon, we don't want that kind of +shortcut, but we want the user to verify the correct PIN (even though +the token was left unattended and authentication at the computer). + +This essentially reverts commit e6f7373ef066cfab6e3162e8b5f692683db23864. + +CVE: CVE-2023-40660 +Upstream-Status: Backport [https://salsa.debian.org/opensc-team/opensc/-/commit/940e8bc764047c873f88bb1396933a5368d03533] +Signed-off-by: Virendra Thakur +--- + src/libopensc/pkcs15-pin.c | 13 - + 1 file changed, 13 deletions(-) + +diff --git a/src/libopensc/pkcs15-pin.c b/src/libopensc/pkcs15-pin.c +index 80a185fecd..393234efe4 100644 +--- a/src/libopensc/pkcs15-pin.c b/src/libopensc/pkcs15-pin.c +@@ -307,19 +307,6 @@ + LOG_FUNC_RETURN(ctx, SC_ERROR_INVALID_PIN_REFERENCE); + auth_info = (struct sc_pkcs15_auth_info *)pin_obj->data; + +- /* +- * if pin cache is disabled, we can get here with no PIN data. +- * in this case, to avoid error or unnecessary pin prompting on pinpad, +- * check if the PIN has been already verified and the access condition +- * is still open on card. +- */ +- if (pinlen == 0) { +- r = sc_pkcs15_get_pin_info(p15card, pin_obj); +- +- if (r == SC_SUCCESS && auth_info->logged_in == SC_PIN_STATE_LOGGED_IN) +- LOG_FUNC_RETURN(ctx, r); +- } +- + r = _validate_pin(p15card, auth_info, pinlen); + + if (r) + diff --git a/meta-oe/recipes-support/opensc/opensc_0.20.0.bb b/meta-oe/recipes-support/opensc/opensc_0.20.0.bb index b8cf203b7..3e77b8884 100644 --- a/meta-oe/recipes-support/opensc/opensc_0.20.0.bb +++ b/meta-oe/recipes-support/opensc/opensc_0.20.0.bb @@ -14,6 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" #v0.19.0 SRCREV = "45e29056ccde422e70ed3585084a7f150c632515" SRC_URI = "git://github.com/OpenSC/OpenSC;branch=master;protocol=https \ + file://CVE-2023-40660.patch \ " DEPENDS = "virtual/libiconv openssl" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107709): https://lists.openembedded.org/g/openembedded-devel/message/107709 Mute This Topic: https://lists.openembedded.org/mt/103299089/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH] wavpack: upgrade 5.1.0 -> 5.6.0
Hi, it seems to be trying to link with native libcrypto in some builds: lib32-wavpack/5.6.0/recipe-sysroot-native/usr/lib/libcrypto.so: file not recognized: file format not recognized collect2: error: ld returned 1 exit status have you tried to build it e.g. for aarch64 or arm on x86_64 build host? On Wed, Dec 20, 2023 at 7:25 AM Alper Ak wrote: > License-Update: Copyright year changes > > Changelog: > > * added: AIFF file import/export support > * added: WATCOM compiler and OS/2 support > * added: cmake support for mingw, builds Cooledit + Winamp plugins > * added: --force-even-byte-depth option for rounding up bit depths > * fixed: detect and report PCM files having non-zero padding bits > * fixed: possible crash when displaying long channel assignments > * fixed: big-endian-sourced "raw" files gave big-endian "wav"s > * fixed: numerous minor issues > * fixed: CVE-2021-44269 (encoding crafted DSD file triggers OOB read crash) > * fixed: very long filenames cause stack-overflow crash in all CLI programs > * fixed: the length stored in WAV headers not always corrected when using > -i > * fixed: attempting to encode raw DSD audio from stdin sometimes causes > crash > * fixed: DSD to PCM decimation: small clicks between tracks and tiny DC > offset > * fixed: length update in library-generated WAV headers on big-endian > machines > * fixed: sanitize custom extensions read from WavPack files to be > alphanumeric > * added: accepting brace-delimited options in the wavpack executable > filename > * added: "--drop" option to Windows executables for multi-file > "drag-and-drop" > * added" "--raw-pcm" option to wvunpack executable (does DSD --> 24-bit > PCM) > * added: "--no-overwrite" option to wavpack executable (to resume sessions) > * improved: build system clean-up including switch to non-recursive "make" > * fixed: potential security issue CVE-2020-35738 > * fixed: disable A32 asm code when building for Apple silicon > * fixed: issues with Adobe-style floating-point WAV files > * added: -vv option to wvunpack to quickly verify using just > block checksums (ideal for detecting corrupted files) > * added: --normalize-floats option to wvunpack for correctly > exporting un-normalized floating-point files > * updated: Visual Studio 2019 for Windows builds > * dropped: WinXP support in official binaries > * fixed: OSS-Fuzz issues 19925, 19928, 20060, 20448 > (no CVEs or vulnerabilities) > * fixed: trailing garbage characters on imported ID3v2 TXXX tags > * fixed: various minor undefined behavior and memory access issues > * fixed: sanitize tag extraction names for length and path inclusion > * improved: reformat wvunpack "help" and split into long + short versions > * added: regression testing to Travis CI for OSS-Fuzz crashers > * fixed: potential security issues including the following CVEs: > CVE-2018-19840 CVE-2018-19841 CVE-2018-10536 > CVE-2018-10537 CVE-2018-10538 CVE-2018-10539 > CVE-2018-10540 CVE-2018-7254 CVE-2018-7253 > CVE-2018-6767 > * added: support for CMake, Travis CI, and Google's OSS-fuzz > * fixed: use correction file for encode verify (pipe input, Windows) > * fixed: correct WAV header with actual length (pipe input, -i option) > * fixed: thumb interworking and not needing v6 architecture (ARM asm) > * added: handle more ID3v2.3 tag items and from all file types > * fixed: coredump on Sparc64 (changed MD5 implementation) > * fixed: handle invalid ID3v2.3 tags from sacd-ripper > * fixed: several corner-case memory leaks > > Signed-off-by: alperak > --- > .../wavpack/{wavpack_5.1.0.bb => wavpack_5.6.0.bb} | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > rename meta-oe/recipes-multimedia/wavpack/{wavpack_5.1.0.bb => > wavpack_5.6.0.bb} (63%) > > diff --git a/meta-oe/recipes-multimedia/wavpack/wavpack_5.1.0.bb > b/meta-oe/recipes-multimedia/wavpack/wavpack_5.6.0.bb > similarity index 63% > rename from meta-oe/recipes-multimedia/wavpack/wavpack_5.1.0.bb > rename to meta-oe/recipes-multimedia/wavpack/wavpack_5.6.0.bb > index 909612393..80671896c 100644 > --- a/meta-oe/recipes-multimedia/wavpack/wavpack_5.1.0.bb > +++ b/meta-oe/recipes-multimedia/wavpack/wavpack_5.6.0.bb > @@ -1,9 +1,9 @@ > DESCRIPTION = "WavPack is a completely open audio compression format > providing lossless, high-quality lossy, and a unique hybrid compression > mode." > LICENSE = "BSD-3-Clause" > -LIC_FILES_CHKSUM = > "file://license.txt;md5=8c1a910e5c2a8b30ec8ffb2ffa63d9b2" > +LIC_FILES_CHKSUM = > "file://license.txt;md5=bb5d037e3ad41a3c84c9f2d8bb65a7b4" > > SRC_URI = "git://github.com/dbry/WavPack.git;branch=master;protocol=https > " > -SRCREV = "9ccc3fe4a37d069137ceabe513a4dd9b0a09c1c2" > +SRCREV = "e03e8e29dc618e08e7baba9636e57ba1254874ce" > S = "${WORKDIR}/git" > > -inherit autotools lib_package > +inherit cmake pkgconfig > -- > 2.25.1 > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107708):
[oe] [PATCH v2] lemon: upgrade to 3.44.2
From: Ross Burton Lemon is packaged as part of sqlite, and sqlite 3.7.3 was released back in 2010[1]. As the small source tarballs no longer include the tools, fetch the sqlite github mirror instead. Don't bother installing a pretty minimal manpage, as very few projects use lemon (sqlite itself, and libpbnjson). [1] https://www.sqlite.org/releaselog/3_7_3.html Signed-off-by: Ross Burton --- meta-oe/recipes-devtools/lemon/files/lemon.1 | 63 --- meta-oe/recipes-devtools/lemon/lemon.inc | 25 .../recipes-devtools/lemon/lemon_3.44.2.bb| 24 +++ meta-oe/recipes-devtools/lemon/lemon_3.7.3.bb | 7 --- 4 files changed, 24 insertions(+), 95 deletions(-) delete mode 100644 meta-oe/recipes-devtools/lemon/files/lemon.1 delete mode 100644 meta-oe/recipes-devtools/lemon/lemon.inc create mode 100644 meta-oe/recipes-devtools/lemon/lemon_3.44.2.bb delete mode 100644 meta-oe/recipes-devtools/lemon/lemon_3.7.3.bb diff --git a/meta-oe/recipes-devtools/lemon/files/lemon.1 b/meta-oe/recipes-devtools/lemon/files/lemon.1 deleted file mode 100644 index 914ee07013..00 --- a/meta-oe/recipes-devtools/lemon/files/lemon.1 +++ /dev/null @@ -1,63 +0,0 @@ -.Dd 2002-10-04 -.Dt LEMON 1 -.Os "Debian GNU/Linux" -.\" Manual page created by Guus Sliepen -.Sh NAME -.Nm lemon -.Nd The Lemon Parser Generator -.Sh SYNOPSIS -.Nm -.Op Fl bcgmqsx -.Ar input -.Sh DESCRIPTION -.Nm -is an LALR(1) parser generator for C or C++. -It does the same job as bison and yacc. -But -.Nm -is not another bison or yacc clone. -It uses a different grammar syntax which is designed to reduce the number of coding errors. -.Nm -also uses a more sophisticated parsing engine that is faster than yacc and bison -and which is both reentrant and thread-safe. -Furthermore, -.Nm -implements features that can be used to eliminate resource leaks, -making is suitable for use in long-running programs such as graphical user interfaces or embedded controllers. -.Pp -.Nm -will read the grammer from -.Ar input -and write out a parser for that grammar in the C language. -.Sh OPTIONS -.Bl -tag -width indent -.It Fl b -Print only the basis in report. -.It Fl c -Don't compress the action table. -.It Fl g -Print grammar without actions. -.It Fl m -Output a makeheaders compatible file. -.It Fl q -(Quiet) Don't print the report file. -.It Fl s -Print parser stats to standard output. -.It Fl x -Print the version number. -.El -.Sh FILES -.Bl -tag -width indent -.It Pa /usr/share/lemon/lempar.c -Driver template for the -.Nm -parser generator. -.El -.Sh AUTHOR -.Nm -has been written by -.An D. Richard Hipp Aq d...@hwaci.com . -.Pp -This manual page was written by -.An Guus Sliepen Aq g...@debian.org -for the Debian GNU/Linux system. diff --git a/meta-oe/recipes-devtools/lemon/lemon.inc b/meta-oe/recipes-devtools/lemon/lemon.inc deleted file mode 100644 index 57b9fb710e..00 --- a/meta-oe/recipes-devtools/lemon/lemon.inc +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "The Lemon Parser Generator" -HOMEPAGE = "http://www.hwaci.com/sw/lemon/"; -LICENSE = "PD" -SECTION = "devel" - -SRC_URI = "http://www.sqlite.org/sqlite-${PV}.tar.gz \ - file://lemon.1" - -S = "${WORKDIR}/sqlite-${PV}/tool" - -do_compile() { -${CC} ${CFLAGS} lemon.c -c -o lemon.o -${CCLD} ${LDFLAGS} lemon.o -o lemon -} - -do_install() { -install -d ${D}${bindir} -install -m 0755 lemon ${D}${bindir} -install -m 0644 lempar.c ${D}${bindir} -install -d ${D}${mandir}/man1 -install -m 0644 ${WORKDIR}/lemon.1 ${D}${mandir}/man1/ -} - -BBCLASSEXTEND = "native" - diff --git a/meta-oe/recipes-devtools/lemon/lemon_3.44.2.bb b/meta-oe/recipes-devtools/lemon/lemon_3.44.2.bb new file mode 100644 index 00..2904a454dc --- /dev/null +++ b/meta-oe/recipes-devtools/lemon/lemon_3.44.2.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "The Lemon Parser Generator" +HOMEPAGE = "https://sqlite.org/src/file/doc/lemon.html"; +LICENSE = "PD" +SECTION = "devel" + +LIC_FILES_CHKSUM = "file://tool/lemon.c;endline=8;md5=c7551a78fa3fdecd96d1ad6761d205ee" + +SRC_URI = "git://github.com/sqlite/sqlite;protocol=https;branch=branch-3.44" + +SRCREV = "c8f9803dc32bfee78a9ca2b1abbe39499729219b" + +S = "${WORKDIR}/git" + +do_compile() { +${CC} ${CFLAGS} ${LDFLAGS} tool/lemon.c -o lemon +} + +do_install() { +install -d ${D}${bindir} +install -m 0755 lemon ${D}${bindir} +install -m 0644 tool/lempar.c ${D}${bindir} +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-devtools/lemon/lemon_3.7.3.bb b/meta-oe/recipes-devtools/lemon/lemon_3.7.3.bb deleted file mode 100644 index 354db17e6e..00 --- a/meta-oe/recipes-devtools/lemon/lemon_3.7.3.bb +++ /dev/null @@ -1,7 +0,0 @@ -require lemon.inc - -LIC_FILES_CHKSUM = "file://lemon.c;endline=8;md5=c7551a78fa3fdecd96d1ad6761d205ee" - -SRC_URI[md5sum] = "5437978aae90350cf984993091e0d695" -SRC_URI[sha256sum] = "dbf352e8fbb74829f5e7a88f9f6ceeb80a709537f668c36e4b6cdfb271309ef6" - -- 2.34.1
Re: [oe] [PATCH 1/2] lemon: upgrade to 3.44.2
On 20 Dec 2023, at 21:41, Khem Raj via lists.openembedded.org wrote: >> +${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} tool/lemon.c -o lemon > > why do we need CPPFLAGS here ? I’ve just realised that CFLAGS includes CPPFLAGS. I wonder how many times I’ve done this. :) Ross -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107706): https://lists.openembedded.org/g/openembedded-devel/message/107706 Mute This Topic: https://lists.openembedded.org/mt/103283009/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [PATCH] renderdoc: no need to depend on vim-native
From: Ross Burton Remove the patch to bring back the user of xxd from vim-native, the patch claimed that the cross-compiling rules were broken. However they work just fine if you tell it what compiler to use, as the default is "c++" and that isn't in HOSTTOOLS. Signed-off-by: Ross Burton --- ...d-instead-of-cross-compiling-shim-bi.patch | 57 --- .../renderdoc/renderdoc_1.27.bb | 2 +- 2 files changed, 1 insertion(+), 58 deletions(-) delete mode 100644 meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch deleted file mode 100644 index e96dedfc39..00 --- a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 41a8c9b5ac13066770baee476ebf9828371f4dad Mon Sep 17 00:00:00 2001 -From: Adrian Ratiu -Date: Tue, 24 Sep 2019 16:07:18 +0300 -Subject: [PATCH] renderdoc: use xxd instead of cross-compiling shim binary - -Renderdoc's attempt to cross compile an xxd replacement by directly -calling a host cross-compiler breaks under OE's recipe specific -sysroots protection because this is not a native recipe, so we just -use xxd-native instead. - -Upstream-Status: Inappropriate [embedded-specific] - - renderdoc/CMakeLists.txt | 23 +-- - 1 file changed, 1 insertion(+), 22 deletions(-) - -diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt -index 5cb7440a4..453a034ba 100644 a/renderdoc/CMakeLists.txt -+++ b/renderdoc/CMakeLists.txt -@@ -370,26 +370,6 @@ set(data - set(data_objects) - - if(UNIX) --# If we're cross-compiling, include-bin will get built for the target and we --# then can't execute it. Instead, we force calling c++ (which we can safely --# assume is present) directly to build the binary -- --if(CMAKE_CROSSCOMPILING) --set(HOST_NATIVE_CPP_COMPILER c++ CACHE STRING "Command to run to compile a .cpp into an executable. Default is just c++") -- --add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin --WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} --COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} --COMMAND ${HOST_NATIVE_CPP_COMPILER} 3rdparty/include-bin/main.cpp -o ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin --DEPENDS 3rdparty/include-bin/main.cpp) --set(INCLUDE_BIN_EXE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin") --set(INCLUDE_BIN_DEP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin") --else() --add_executable(include-bin 3rdparty/include-bin/main.cpp) --set(INCLUDE_BIN_EXE $) --set(INCLUDE_BIN_DEP include-bin) --endif() -- - foreach(res ${data}) - set(in ${res}) - set(working_dir ${CMAKE_CURRENT_SOURCE_DIR}) -@@ -399,8 +379,7 @@ if(UNIX) - add_custom_command(OUTPUT ${out_src} - WORKING_DIRECTORY ${working_dir} - COMMAND ${CMAKE_COMMAND} -E make_directory ${out_src_dir} --COMMAND ${INCLUDE_BIN_EXE} ${in} ${out_src} --DEPENDS ${INCLUDE_BIN_DEP} -+COMMAND xxd -i ${in} ${out_src} - DEPENDS ${res}) - - list(APPEND data_objects ${out_src}) diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb index 112f0ddcbe..58f2275736 100644 --- a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb +++ b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb @@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=36d34a46cb71546195d2b0c626a52e5d" SRCREV = "35b13a8e8fd2a331854dba6da81a20452e142d6f" SRC_URI = " \ git://github.com/baldurk/${BPN}.git;protocol=https;branch=v1.x \ -file://0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch \ " S = "${WORKDIR}/git" @@ -32,6 +31,7 @@ EXTRA_OECMAKE += "\ -DENABLE_PYRENDERDOC=OFF \ -DENABLE_RENDERDOCCMD=ON \ -DCMAKE_BUILD_TYPE=Release \ +-DHOST_NATIVE_CPP_COMPILER="${BUILD_CXX}" \ " FILES:${PN} += "${libdir}" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107705): https://lists.openembedded.org/g/openembedded-devel/message/107705 Mute This Topic: https://lists.openembedded.org/mt/103298090/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] python 3.12 - help needed in fixing meta-oe failures
Le 19/12/2023 à 16:58, Khem Raj a écrit : > It would be good if you could send the patch this mailing list as well. Sent here => https://lists.openembedded.org/g/openembedded-devel/message/107703 > > On Tue, Dec 19, 2023 at 7:53 AM wrote: >> >> Hello, >> >> I send you a PR for this error: >> /srv/work/alex/meta-openembedded/meta-python/recipes-devtools/python/python3-click-spinner_0.1.10.bb:do_compile >> Here : >> https://github.com/kanavin/meta-openembedded/pull/1 >> >> These ones have not been maintained for years, maybe it's best to remove >> them: >> /srv/work/alex/meta-openembedded/meta-python/recipes-devtools/python/python3-oslash_0.6.3.bb:do_compile >> /srv/work/alex/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlrunner_1.7.7.bb:do_compile >> >> This one should be fixed by this patch: >> https://lists.openembedded.org/g/openembedded-devel/message/107547 >> >> Best regards, >> >> Ny Antra >> >> >> >> >> >> -- Yoann Congal Smile ECS - Tech Expert -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107704): https://lists.openembedded.org/g/openembedded-devel/message/107704 Mute This Topic: https://lists.openembedded.org/mt/103036574/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH] python3-click-spinner: backport patch that fixes deprecated methods
From: Ny Antra Ranaivoarison This allows build with python 3.12. Signed-off-by: Ny Antra Ranaivoarison Signed-off-by: Yoann Congal --- CC: Alexander Kanavin --- .../0001-Update-Versioneer-to-0.22.patch | 2489 + .../python/python3-click-spinner_0.1.10.bb|1 + 2 files changed, 2490 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python3-click-spinner/0001-Update-Versioneer-to-0.22.patch diff --git a/meta-python/recipes-devtools/python/python3-click-spinner/0001-Update-Versioneer-to-0.22.patch b/meta-python/recipes-devtools/python/python3-click-spinner/0001-Update-Versioneer-to-0.22.patch new file mode 100644 index 0..4edb5da9e --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-click-spinner/0001-Update-Versioneer-to-0.22.patch @@ -0,0 +1,2489 @@ +From 739f9da6bf0d2d9f0de624aee2ec71c65f62c275 Mon Sep 17 00:00:00 2001 +From: Hugo van Kemenade +Date: Tue, 10 May 2022 18:17:50 +0300 +Subject: [PATCH] Update Versioneer to 0.22 + +Upstream-Status: Backport [https://github.com/click-contrib/click-spinner/commit/5622ab0a0b4296dc8f10863f268ed98dccf4b642] + +Signed-off-by: Ny Antra Ranaivoarison +--- + click_spinner/__init__.py |5 +- + click_spinner/_version.py | 665 +- + versioneer.py | 1128 - + 3 files changed, 1400 insertions(+), 398 deletions(-) + +diff --git a/click_spinner/__init__.py b/click_spinner/__init__.py +index aeec089..8e9f4f9 100644 +--- a/click_spinner/__init__.py b/click_spinner/__init__.py +@@ -77,6 +77,5 @@ def spinner(beep=False, disable=False, force=False, stream=sys.stdout): + return Spinner(beep, disable, force, stream) + + +-from ._version import get_versions +-__version__ = get_versions()['version'] +-del get_versions ++from . import _version ++__version__ = _version.get_versions()['version'] +diff --git a/click_spinner/_version.py b/click_spinner/_version.py +index 5ae340e..d44565d 100644 +--- a/click_spinner/_version.py b/click_spinner/_version.py +@@ -1,21 +1,658 @@ + +-# This file was generated by 'versioneer.py' (0.16) from +-# revision-control system data, or from the parent directory name of an +-# unpacked source archive. Distribution tarballs contain a pre-generated copy +-# of this file. ++# This file helps to compute a version number in source trees obtained from ++# git-archive tarball (such as those provided by githubs download-from-tag ++# feature). Distribution tarballs (built by setup.py sdist) and build ++# directories (produced by setup.py build) will contain a much shorter file ++# that just contains the computed version number. + +-import json ++# This file is released into the public domain. Generated by ++# versioneer-0.22 (https://github.com/python-versioneer/python-versioneer) ++ ++"""Git implementation of _version.py.""" ++ ++import errno ++import os ++import re ++import subprocess + import sys ++from typing import Callable, Dict ++import functools ++ ++ ++def get_keywords(): ++"""Get the keywords needed to look up the version information.""" ++# these strings will be replaced by git during git-archive. ++# setup.py/versioneer.py will grep for the variable names, so they must ++# each be defined on a line of their own. _version.py will just call ++# get_keywords(). ++git_refnames = "$Format:%d$" ++git_full = "$Format:%H$" ++git_date = "$Format:%ci$" ++keywords = {"refnames": git_refnames, "full": git_full, "date": git_date} ++return keywords ++ ++ ++class VersioneerConfig: ++"""Container for Versioneer configuration parameters.""" ++ ++ ++def get_config(): ++"""Create, populate and return the VersioneerConfig() object.""" ++# these strings are filled in when 'setup.py versioneer' creates ++# _version.py ++cfg = VersioneerConfig() ++cfg.VCS = "git" ++cfg.style = "pep440" ++cfg.tag_prefix = "v" ++cfg.parentdir_prefix = "click-spinner-" ++cfg.versionfile_source = "click_spinner/_version.py" ++cfg.verbose = False ++return cfg ++ ++ ++class NotThisMethod(Exception): ++"""Exception raised if a method is not valid for the current scenario.""" ++ ++ ++LONG_VERSION_PY: Dict[str, str] = {} ++HANDLERS: Dict[str, Dict[str, Callable]] = {} ++ ++ ++def register_vcs_handler(vcs, method): # decorator ++"""Create decorator to mark a method as the handler of a VCS.""" ++def decorate(f): ++"""Store f in HANDLERS[vcs][method].""" ++if vcs not in HANDLERS: ++HANDLERS[vcs] = {} ++HANDLERS[vcs][method] = f ++return f ++return decorate ++ ++ ++def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, ++env=None): ++"""Call the given command(s).""" ++assert isinstance(commands, list) ++process = None ++ ++popen_kwargs = {} ++if sys.platform == "win32": ++# This hides the console window if pythonw.exe is used
Re: [oe] [meta-oe][PATCH v2] c-ares: Move to tarballs, add ptest and static support
On Thu, Dec 21, 2023 at 12:35 AM Khem Raj wrote: > > On 12/20/23 12:55 PM, Alex Kiernan wrote: > > Signed-off-by: Alex Kiernan > > --- > > > > Changes in v2: > > - Use relative path to arestest > > > > .../recipes-support/c-ares/c-ares/run-ptest | 7 +++ > > .../recipes-support/c-ares/c-ares_1.24.0.bb | 19 ++- > > 2 files changed, 21 insertions(+), 5 deletions(-) > > create mode 100644 meta-oe/recipes-support/c-ares/c-ares/run-ptest > > > > diff --git a/meta-oe/recipes-support/c-ares/c-ares/run-ptest > > b/meta-oe/recipes-support/c-ares/c-ares/run-ptest > > new file mode 100644 > > index ..15971dec058c > > --- /dev/null > > +++ b/meta-oe/recipes-support/c-ares/c-ares/run-ptest > > @@ -0,0 +1,7 @@ > > +#!/bin/sh > > + > > +if ./arestest; then > > + echo "PASS: c-ares" > > +else > > + echo "FAIL: c-ares" > > +fi > > I wonder if it could be added to regular runs with ptest images and > therefore added to PTESTS_FAST_META_OE ( if it runs with in 30s ) or > PTESTS_SLOW_META_OE in meta-oe/conf/include/ptest-packagelists-meta-oe.inc > Probably PTESTS_SLOW_META_OE - it's about a minute (I suspect mostly because there are timeout tests in there). Also the "live" tests fail if you just do it inside a default runqemu because we have no default resolv.conf there. That said it'd be nice to get this tested - I'll have a look at it (possibly a nice Christmas project!) > > diff --git a/meta-oe/recipes-support/c-ares/c-ares_1.24.0.bb > > b/meta-oe/recipes-support/c-ares/c-ares_1.24.0.bb > > index 2171002aa95e..3b3b2b83febc 100644 > > --- a/meta-oe/recipes-support/c-ares/c-ares_1.24.0.bb > > +++ b/meta-oe/recipes-support/c-ares/c-ares_1.24.0.bb > > @@ -5,14 +5,23 @@ SECTION = "libs" > > LICENSE = "MIT" > > LIC_FILES_CHKSUM = > > "file://LICENSE.md;md5=fdbc58a6da11a9f68aa73c453818decc" > > > > -SRC_URI = "git://github.com/c-ares/c-ares.git;branch=main;protocol=https" > > -SRCREV = "972f456f2808b4e4b1730c90ab506f6af5f4c725" > > +SRC_URI = "https://c-ares.org/download/c-ares-1.24.0.tar.gz \ > > + file://run-ptest" > > +SRC_URI[sha256sum] = > > "c517de6d5ac9cd55a9b72c1541c3e25b84588421817b5f092850ac09a8df5103" > > > > -UPSTREAM_CHECK_GITTAGREGEX = "cares-(?P\d+_(\d_?)+)" > > +PACKAGECONFIG ?= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', > > d)}" > > +PACKAGECONFIG[manpages] = "" > > +PACKAGECONFIG[tests] = > > "-DCARES_BUILD_TESTS=ON,-DCARES_BUILD_TESTS=OFF,googletest" > > > > -S = "${WORKDIR}/git" > > +inherit cmake manpages pkgconfig ptest > > > > -inherit cmake pkgconfig > > +EXTRA_OECMAKE = "-DCARES_STATIC=${@ 'ON' if d.getVar('DISABLE_STATIC') == > > '' else 'OFF' }" > > + > > +do_install_ptest () { > > + install -d ${D}${PTEST_PATH} > > + install -m 0755 ${B}/bin/arestest ${D}${PTEST_PATH} > > + install -m 0755 ${WORKDIR}/run-ptest ${D}${PTEST_PATH} > > +} > > > > PACKAGE_BEFORE_PN = "${PN}-utils" > > > > > > > > > > > > -- Alex Kiernan -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107702): https://lists.openembedded.org/g/openembedded-devel/message/107702 Mute This Topic: https://lists.openembedded.org/mt/103288852/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-