Date   

[meta-oe][PATCH] nodejs: 12.20.1 -> 12.20.2

Sean Nyekjaer
 

---
.../nodejs/{nodejs_12.20.1.bb =3D> nodejs_12.20.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-devtools/nodejs/{nodejs_12.20.1.bb =3D> nodejs_12=
.20.2.bb} (98%)

diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_12.20.1.bb b/meta-oe/=
recipes-devtools/nodejs/nodejs_12.20.2.bb
similarity index 98%
rename from meta-oe/recipes-devtools/nodejs/nodejs_12.20.1.bb
rename to meta-oe/recipes-devtools/nodejs/nodejs_12.20.2.bb
index 0673a3202..6acc36b4f 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_12.20.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_12.20.2.bb
@@ -26,7 +26,7 @@ SRC_URI =3D "http://nodejs.org/dist/v${PV}/node-v${PV}.=
tar.xz \
SRC_URI_append_class-target =3D " \
file://0002-Using-native-binaries.patch \
"
-SRC_URI[sha256sum] =3D "e00eee325d705b2bfa9929b7d061eb2315402d7e8548945e=
ac9870bf84321853"
+SRC_URI[sha256sum] =3D "961ad600f0706c396390ebc7767fb01d5e3792a5022dc2e7=
774796756eec6d3c"
=20
S =3D "${WORKDIR}/node-v${PV}"
=20
--=20
2.29.2


[meta-oe][PATCH] zstd: split bin into separate package

Sean Nyekjaer
 

---
meta-oe/recipes-extended/zstd/zstd_1.4.5.bb | 2 ++
1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-extended/zstd/zstd_1.4.5.bb b/meta-oe/recipe=
s-extended/zstd/zstd_1.4.5.bb
index cd0b471e1..d0cc625aa 100644
--- a/meta-oe/recipes-extended/zstd/zstd_1.4.5.bb
+++ b/meta-oe/recipes-extended/zstd/zstd_1.4.5.bb
@@ -9,6 +9,8 @@ LICENSE =3D "BSD-3-Clause & GPLv2"
LIC_FILES_CHKSUM =3D "file://LICENSE;md5=3Dc7f0b161edbe52f5f345a3d1311d0=
b32 \
file://COPYING;md5=3D39bba7d2cf0ba1036f2a6e2be52fe3f=
0"
=20
+inherit lib_package
+
SRC_URI =3D "git://github.com/facebook/zstd.git;nobranch=3D1 \
file://0001-Fix-legacy-build-after-2103.patch \
"
--=20
2.29.2


"[meta-oe][PATCH] libgpiod: packageqa problem => static python lib to ${PN}-python-staticdev

Christian B. Sørensen
 

Problem:
QA Issue: non -staticdev package contains static .a library

Reason:
Both /usr/lib/python3.8/site-packages/gpiod.a and
/usr/lib/python3.8/site-packages/gpiod.so are in ${PN}-python.

Signed-off-by: Christian Bräuner Sørensen <yocto@...>
---
meta-oe/recipes-support/libgpiod/libgpiod_1.4.5.bb | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_1.4.5.bb b/meta-oe/recipes-support/libgpiod/libgpiod_1.4.5.bb
index aec50e7e6..ab9639fc2 100644
--- a/meta-oe/recipes-support/libgpiod/libgpiod_1.4.5.bb
+++ b/meta-oe/recipes-support/libgpiod/libgpiod_1.4.5.bb
@@ -27,7 +27,8 @@ PACKAGES =+ "${PN}-tools libgpiodcxx"
FILES_${PN}-tools = "${bindir}/*"
FILES_libgpiodcxx = "${libdir}/libgpiodcxx.so.*"

-PACKAGES =+ "${PN}-python"
-FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}"
+PACKAGES =+ "${PN}-python ${PN}-python-staticdev"
+FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*.so"
+FILES_${PN}-python-staticdev = "${PYTHON_SITEPACKAGES_DIR}/*.a"
RRECOMMENDS_PYTHON = "${@bb.utils.contains('PACKAGECONFIG', 'python3', '${PN}-python', '',d)}"
RRECOMMENDS_${PN}-python += "${RRECOMMENDS_PYTHON}"
--
2.25.1


[meta-oe][PATCH] crash: add support for lockless ringbuffer

Yu, Mingli
 

From: Mingli Yu <mingli.yu@...>

Backport 2 patches to add support for lockless ringbuffer to fix
below issue:
crash: cannot determine length of symbol: log_end

Reference: https://github.com/crash-utility/crash/issues/74

Signed-off-by: Mingli Yu <mingli.yu@...>
---
...-add-support-for-lockless-ringbuffer.patch | 445 ++++++++++++++++++
...use-committed-finalized-state-values.patch | 103 ++++
meta-oe/recipes-kernel/crash/crash_7.2.9.bb | 2 +
3 files changed, 550 insertions(+)
create mode 100644 meta-oe/recipes-kernel/crash/crash/0001-printk-add-support-for-lockless-ringbuffer.patch
create mode 100644 meta-oe/recipes-kernel/crash/crash/0002-printk-use-committed-finalized-state-values.patch

diff --git a/meta-oe/recipes-kernel/crash/crash/0001-printk-add-support-for-lockless-ringbuffer.patch b/meta-oe/recipes-kernel/crash/crash/0001-printk-add-support-for-lockless-ringbuffer.patch
new file mode 100644
index 000000000..1aaf1e6b0
--- /dev/null
+++ b/meta-oe/recipes-kernel/crash/crash/0001-printk-add-support-for-lockless-ringbuffer.patch
@@ -0,0 +1,445 @@
+From a5531b24750e7949c35640d996ea14c0587938bc Mon Sep 17 00:00:00 2001
+From: John Ogness <john.ogness@...>
+Date: Fri, 20 Nov 2020 05:56:59 +0000
+Subject: [PATCH 1/2] printk: add support for lockless ringbuffer
+
+Linux 5.10 introduces a new lockless ringbuffer. The new ringbuffer
+is structured completely different to the previous iterations.
+Add support for dumping the ringbuffer with the "log" command.
+The new ringbuffer is detected based on the availability of
+the "prb" symbol.
+
+Upstream-Status: Backport [https://github.com/crash-utility/crash/commit/a5531b24750e7949c35640d996ea14c0587938bc]
+
+Signed-off-by: John Ogness <john.ogness@...>
+Signed-off-by: Kazuhito Hagio <k-hagio-ab@...>
+Signed-off-by: Mingli Yu <mingli.yu@...>
+---
+ Makefile | 5 ++
+ defs.h | 30 +++++++
+ kernel.c | 7 +-
+ printk.c | 256 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ symbols.c | 27 ++++++
+ 5 files changed, 324 insertions(+), 1 deletion(-)
+ create mode 100644 printk.c
+
+diff --git a/Makefile b/Makefile
+index d185719..f66eba7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -61,6 +61,7 @@ VMWARE_HFILES=vmware_vmss.h
+
+ CFILES=main.c tools.c global_data.c memory.c filesys.c help.c task.c \
+ kernel.c test.c gdb_interface.c configure.c net.c dev.c bpf.c \
++ printk.c \
+ alpha.c x86.c ppc.c ia64.c s390.c s390x.c s390dbf.c ppc64.c x86_64.c \
+ arm.c arm64.c mips.c sparc64.c \
+ extensions.c remote.c va_server.c va_server_v1.c symbols.c cmdline.c \
+@@ -80,6 +81,7 @@ SOURCE_FILES=${CFILES} ${GENERIC_HFILES} ${MCORE_HFILES} \
+
+ OBJECT_FILES=main.o tools.o global_data.o memory.o filesys.o help.o task.o \
+ build_data.o kernel.o test.o gdb_interface.o net.o dev.o bpf.o \
++ printk.o \
+ alpha.o x86.o ppc.o ia64.o s390.o s390x.o s390dbf.o ppc64.o x86_64.o \
+ arm.o arm64.o mips.o sparc64.o \
+ extensions.o remote.o va_server.o va_server_v1.o symbols.o cmdline.o \
+@@ -363,6 +365,9 @@ task.o: ${GENERIC_HFILES} task.c
+ kernel.o: ${GENERIC_HFILES} kernel.c
+ ${CC} -c ${CRASH_CFLAGS} kernel.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+
++printk.o: ${GENERIC_HFILES} printk.c
++ ${CC} -c ${CRASH_CFLAGS} printk.c ${WARNING_OPTIONS} ${WARNING_ERROR}
++
+ gdb_interface.o: ${GENERIC_HFILES} gdb_interface.c
+ ${CC} -c ${CRASH_CFLAGS} gdb_interface.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+
+diff --git a/defs.h b/defs.h
+index 9594950..e1a18e9 100644
+--- a/defs.h
++++ b/defs.h
+@@ -2106,6 +2106,28 @@ struct offset_table { /* stash of commonly-used offsets */
+ long irq_common_data_affinity;
+ long irq_desc_irq_common_data;
+ long uts_namespace_name;
++ long printk_info_seq;
++ long printk_info_ts_nsec;
++ long printk_info_text_len;
++ long printk_info_level;
++ long printk_info_caller_id;
++ long printk_info_dev_info;
++ long dev_printk_info_subsystem;
++ long dev_printk_info_device;
++ long prb_desc_ring;
++ long prb_text_data_ring;
++ long prb_desc_ring_count_bits;
++ long prb_desc_ring_descs;
++ long prb_desc_ring_infos;
++ long prb_desc_ring_head_id;
++ long prb_desc_ring_tail_id;
++ long prb_desc_state_var;
++ long prb_desc_text_blk_lpos;
++ long prb_data_blk_lpos_begin;
++ long prb_data_blk_lpos_next;
++ long prb_data_ring_size_bits;
++ long prb_data_ring_data;
++ long atomic_long_t_counter;
+ };
+
+ struct size_table { /* stash of commonly-used sizes */
+@@ -2265,6 +2287,9 @@ struct size_table { /* stash of commonly-used sizes */
+ long xa_node;
+ long zram_table_entry;
+ long irq_common_data;
++ long printk_info;
++ long printk_ringbuffer;
++ long prb_desc;
+ };
+
+ struct array_table {
+@@ -6696,6 +6721,11 @@ int vmware_guestdump_memory_dump(FILE *);
+ */
+ int calc_kaslr_offset(ulong *, ulong *);
+
++/*
++ * printk.c
++ */
++void dump_lockless_record_log(int);
++
+ /*
+ * gnu_binutils.c
+ */
+diff --git a/kernel.c b/kernel.c
+index 9871637..e722ff9 100644
+--- a/kernel.c
++++ b/kernel.c
+@@ -5042,6 +5042,11 @@ dump_log(int msg_flags)
+ struct syment *nsp;
+ int log_wrap, loglevel, log_buf_len;
+
++ if (kernel_symbol_exists("prb")) {
++ dump_lockless_record_log(msg_flags);
++ return;
++ }
++
+ if (kernel_symbol_exists("log_first_idx") &&
+ kernel_symbol_exists("log_next_idx")) {
+ dump_variable_length_record_log(msg_flags);
+@@ -5289,7 +5294,7 @@ dump_log_entry(char *logptr, int msg_flags)
+ }
+
+ /*
+- * Handle the new variable-length-record log_buf.
++ * Handle the variable-length-record log_buf.
+ */
+ static void
+ dump_variable_length_record_log(int msg_flags)
+diff --git a/printk.c b/printk.c
+new file mode 100644
+index 0000000..f6d54ce
+--- /dev/null
++++ b/printk.c
+@@ -0,0 +1,256 @@
++#include "defs.h"
++#include <ctype.h>
++
++#define DESC_SV_BITS (sizeof(unsigned long) * 8)
++#define DESC_COMMITTED_MASK (1UL << (DESC_SV_BITS - 1))
++#define DESC_REUSE_MASK (1UL << (DESC_SV_BITS - 2))
++#define DESC_FLAGS_MASK (DESC_COMMITTED_MASK | DESC_REUSE_MASK)
++#define DESC_ID_MASK (~DESC_FLAGS_MASK)
++
++/* convenience struct for passing many values to helper functions */
++struct prb_map {
++ char *prb;
++
++ char *desc_ring;
++ unsigned long desc_ring_count;
++ char *descs;
++ char *infos;
++
++ char *text_data_ring;
++ unsigned long text_data_ring_size;
++ char *text_data;
++};
++
++static void
++init_offsets(void)
++{
++ char *n;
++
++ n = "printk_info";
++ STRUCT_SIZE_INIT(printk_info, n);
++ MEMBER_OFFSET_INIT(printk_info_seq, n, "seq");
++ MEMBER_OFFSET_INIT(printk_info_ts_nsec, n, "ts_nsec");
++ MEMBER_OFFSET_INIT(printk_info_text_len, n, "text_len");
++ MEMBER_OFFSET_INIT(printk_info_level, n, "level");
++ MEMBER_OFFSET_INIT(printk_info_caller_id, n, "caller_id");
++ MEMBER_OFFSET_INIT(printk_info_dev_info, n, "dev_info");
++
++ n = "dev_printk_info";
++ MEMBER_OFFSET_INIT(dev_printk_info_subsystem, n, "subsystem");
++ MEMBER_OFFSET_INIT(dev_printk_info_device, n, "device");
++
++ n = "printk_ringbuffer";
++ STRUCT_SIZE_INIT(printk_ringbuffer, n);
++ MEMBER_OFFSET_INIT(prb_desc_ring, n, "desc_ring");
++ MEMBER_OFFSET_INIT(prb_text_data_ring, n, "text_data_ring");
++
++ n = "prb_desc_ring";
++ MEMBER_OFFSET_INIT(prb_desc_ring_count_bits, n, "count_bits");
++ MEMBER_OFFSET_INIT(prb_desc_ring_descs, n, "descs");
++ MEMBER_OFFSET_INIT(prb_desc_ring_infos, n, "infos");
++ MEMBER_OFFSET_INIT(prb_desc_ring_head_id, n, "head_id");
++ MEMBER_OFFSET_INIT(prb_desc_ring_tail_id, n, "tail_id");
++
++ n = "prb_desc";
++ STRUCT_SIZE_INIT(prb_desc, n);
++ MEMBER_OFFSET_INIT(prb_desc_state_var, n, "state_var");
++ MEMBER_OFFSET_INIT(prb_desc_text_blk_lpos, n, "text_blk_lpos");
++
++ n = "prb_data_blk_lpos";
++ MEMBER_OFFSET_INIT(prb_data_blk_lpos_begin, n, "begin");
++ MEMBER_OFFSET_INIT(prb_data_blk_lpos_next, n, "next");
++
++ n = "prb_data_ring";
++ MEMBER_OFFSET_INIT(prb_data_ring_size_bits, n, "size_bits");
++ MEMBER_OFFSET_INIT(prb_data_ring_data, n, "data");
++
++ n = "atomic_long_t";
++ MEMBER_OFFSET_INIT(atomic_long_t_counter, n, "counter");
++}
++
++static void
++dump_record(struct prb_map *m, unsigned long id, int msg_flags)
++{
++ unsigned short text_len;
++ unsigned long state_var;
++ unsigned int caller_id;
++ unsigned char level;
++ unsigned long begin;
++ unsigned long next;
++ char buf[BUFSIZE];
++ uint64_t ts_nsec;
++ ulonglong nanos;
++ ulonglong seq;
++ int ilen = 0, i;
++ char *desc, *info, *text, *p;
++ ulong rem;
++
++ desc = m->descs + ((id % m->desc_ring_count) * SIZE(prb_desc));
++
++ /* skip non-committed record */
++ state_var = ULONG(desc + OFFSET(prb_desc_state_var) +
++ OFFSET(atomic_long_t_counter));
++ if ((state_var & DESC_FLAGS_MASK) != DESC_COMMITTED_MASK)
++ return;
++
++ info = m->infos + ((id % m->desc_ring_count) * SIZE(printk_info));
++
++ seq = ULONGLONG(info + OFFSET(printk_info_seq));
++ caller_id = UINT(info + OFFSET(printk_info_caller_id));
++ if (CRASHDEBUG(1))
++ fprintf(fp, "seq: %llu caller_id: %x (%s: %u)\n", seq, caller_id,
++ caller_id & 0x80000000 ? "cpu" : "pid", caller_id & ~0x80000000);
++
++ text_len = USHORT(info + OFFSET(printk_info_text_len));
++
++ begin = ULONG(desc + OFFSET(prb_desc_text_blk_lpos) +
++ OFFSET(prb_data_blk_lpos_begin)) %
++ m->text_data_ring_size;
++ next = ULONG(desc + OFFSET(prb_desc_text_blk_lpos) +
++ OFFSET(prb_data_blk_lpos_next)) %
++ m->text_data_ring_size;
++
++ /* skip data-less text blocks */
++ if (begin == next)
++ goto out;
++
++ if ((msg_flags & SHOW_LOG_TEXT) == 0) {
++ ts_nsec = ULONGLONG(info + OFFSET(printk_info_ts_nsec));
++ nanos = (ulonglong)ts_nsec / (ulonglong)1000000000;
++ rem = (ulonglong)ts_nsec % (ulonglong)1000000000;
++ if (msg_flags & SHOW_LOG_CTIME) {
++ time_t t = kt->boot_date.tv_sec + nanos;
++ sprintf(buf, "[%s] ", ctime_tz(&t));
++ } else
++ sprintf(buf, "[%5lld.%06ld] ", nanos, rem/1000);
++
++ ilen += strlen(buf);
++ fprintf(fp, "%s", buf);
++ }
++
++ if (msg_flags & SHOW_LOG_LEVEL) {
++ level = UCHAR(info + OFFSET(printk_info_level)) >> 5;
++ sprintf(buf, "<%x>", level);
++ ilen += strlen(buf);
++ fprintf(fp, "%s", buf);
++ }
++
++ /* handle wrapping data block */
++ if (begin > next)
++ begin = 0;
++
++ /* skip over descriptor ID */
++ begin += sizeof(unsigned long);
++
++ /* handle truncated messages */
++ if (next - begin < text_len)
++ text_len = next - begin;
++
++ text = m->text_data + begin;
++
++ for (i = 0, p = text; i < text_len; i++, p++) {
++ if (*p == '\n')
++ fprintf(fp, "\n%s", space(ilen));
++ else if (isprint(*p) || isspace(*p))
++ fputc(*p, fp);
++ else
++ fputc('.', fp);
++ }
++
++ if (msg_flags & SHOW_LOG_DICT) {
++ text = info + OFFSET(printk_info_dev_info) +
++ OFFSET(dev_printk_info_subsystem);
++ if (strlen(text))
++ fprintf(fp, "\n%sSUBSYSTEM=%s", space(ilen), text);
++
++ text = info + OFFSET(printk_info_dev_info) +
++ OFFSET(dev_printk_info_device);
++ if (strlen(text))
++ fprintf(fp, "\n%sDEVICE=%s", space(ilen), text);
++ }
++out:
++ fprintf(fp, "\n");
++}
++
++/*
++ * Handle the lockless printk_ringbuffer.
++ */
++void
++dump_lockless_record_log(int msg_flags)
++{
++ unsigned long head_id;
++ unsigned long tail_id;
++ unsigned long kaddr;
++ unsigned long id;
++ struct prb_map m;
++
++ if (INVALID_SIZE(printk_info))
++ init_offsets();
++
++ /* setup printk_ringbuffer */
++ get_symbol_data("prb", sizeof(char *), &kaddr);
++ m.prb = GETBUF(SIZE(printk_ringbuffer));
++ if (!readmem(kaddr, KVADDR, m.prb, SIZE(printk_ringbuffer),
++ "printk_ringbuffer contents", RETURN_ON_ERROR|QUIET)) {
++ error(WARNING, "\ncannot read printk_ringbuffer contents\n");
++ goto out_prb;
++ }
++
++ /* setup descriptor ring */
++ m.desc_ring = m.prb + OFFSET(prb_desc_ring);
++ m.desc_ring_count = 1 << UINT(m.desc_ring + OFFSET(prb_desc_ring_count_bits));
++
++ kaddr = ULONG(m.desc_ring + OFFSET(prb_desc_ring_descs));
++ m.descs = GETBUF(SIZE(prb_desc) * m.desc_ring_count);
++ if (!readmem(kaddr, KVADDR, m.descs, SIZE(prb_desc) * m.desc_ring_count,
++ "prb_desc_ring contents", RETURN_ON_ERROR|QUIET)) {
++ error(WARNING, "\ncannot read prb_desc_ring contents\n");
++ goto out_descs;
++ }
++
++ kaddr = ULONG(m.desc_ring + OFFSET(prb_desc_ring_infos));
++ m.infos = GETBUF(SIZE(printk_info) * m.desc_ring_count);
++ if (!readmem(kaddr, KVADDR, m.infos, SIZE(printk_info) * m.desc_ring_count,
++ "prb_info_ring contents", RETURN_ON_ERROR|QUIET)) {
++ error(WARNING, "\ncannot read prb_info_ring contents\n");
++ goto out_infos;
++ }
++
++ /* setup text data ring */
++ m.text_data_ring = m.prb + OFFSET(prb_text_data_ring);
++ m.text_data_ring_size = 1 << UINT(m.text_data_ring + OFFSET(prb_data_ring_size_bits));
++
++ kaddr = ULONG(m.text_data_ring + OFFSET(prb_data_ring_data));
++ m.text_data = GETBUF(m.text_data_ring_size);
++ if (!readmem(kaddr, KVADDR, m.text_data, m.text_data_ring_size,
++ "prb_text_data_ring contents", RETURN_ON_ERROR|QUIET)) {
++ error(WARNING, "\ncannot read prb_text_data_ring contents\n");
++ goto out_text_data;
++ }
++
++ /* ready to go */
++
++ tail_id = ULONG(m.desc_ring + OFFSET(prb_desc_ring_tail_id) +
++ OFFSET(atomic_long_t_counter));
++ head_id = ULONG(m.desc_ring + OFFSET(prb_desc_ring_head_id) +
++ OFFSET(atomic_long_t_counter));
++
++ hq_open();
++
++ for (id = tail_id; id != head_id; id = (id + 1) & DESC_ID_MASK)
++ dump_record(&m, id, msg_flags);
++
++ /* dump head record */
++ dump_record(&m, id, msg_flags);
++
++ hq_close();
++
++out_text_data:
++ FREEBUF(m.text_data);
++out_infos:
++ FREEBUF(m.infos);
++out_descs:
++ FREEBUF(m.descs);
++out_prb:
++ FREEBUF(m.prb);
++}
+diff --git a/symbols.c b/symbols.c
+index b2f4eb5..a51078d 100644
+--- a/symbols.c
++++ b/symbols.c
+@@ -10426,6 +10426,30 @@ dump_offset_table(char *spec, ulong makestruct)
+ OFFSET(log_level));
+ fprintf(fp, " log_flags_level: %ld\n",
+ OFFSET(log_flags_level));
++
++ fprintf(fp, " printk_info_seq: %ld\n", OFFSET(printk_info_seq));
++ fprintf(fp, " printk_info_ts_nseq: %ld\n", OFFSET(printk_info_ts_nsec));
++ fprintf(fp, " printk_info_text_len: %ld\n", OFFSET(printk_info_text_len));
++ fprintf(fp, " printk_info_level: %ld\n", OFFSET(printk_info_level));
++ fprintf(fp, " printk_info_caller_id: %ld\n", OFFSET(printk_info_caller_id));
++ fprintf(fp, " printk_info_dev_info: %ld\n", OFFSET(printk_info_dev_info));
++ fprintf(fp, " dev_printk_info_subsystem: %ld\n", OFFSET(dev_printk_info_subsystem));
++ fprintf(fp, " dev_printk_info_device: %ld\n", OFFSET(dev_printk_info_device));
++ fprintf(fp, " prb_desc_ring: %ld\n", OFFSET(prb_desc_ring));
++ fprintf(fp, " prb_text_data_ring: %ld\n", OFFSET(prb_text_data_ring));
++ fprintf(fp, " prb_desc_ring_count_bits: %ld\n", OFFSET(prb_desc_ring_count_bits));
++ fprintf(fp, " prb_desc_ring_descs: %ld\n", OFFSET(prb_desc_ring_descs));
++ fprintf(fp, " prb_desc_ring_infos: %ld\n", OFFSET(prb_desc_ring_infos));
++ fprintf(fp, " prb_desc_ring_head_id: %ld\n", OFFSET(prb_desc_ring_head_id));
++ fprintf(fp, " prb_desc_ring_tail_id: %ld\n", OFFSET(prb_desc_ring_tail_id));
++ fprintf(fp, " prb_desc_state_var: %ld\n", OFFSET(prb_desc_state_var));
++ fprintf(fp, " prb_desc_text_blk_lpos: %ld\n", OFFSET(prb_desc_text_blk_lpos));
++ fprintf(fp, " prb_data_blk_lpos_begin: %ld\n", OFFSET(prb_data_blk_lpos_begin));
++ fprintf(fp, " prb_data_blk_lpos_next: %ld\n", OFFSET(prb_data_blk_lpos_next));
++ fprintf(fp, " prb_data_ring_size_bits: %ld\n", OFFSET(prb_data_ring_size_bits));
++ fprintf(fp, " prb_data_ring_data: %ld\n", OFFSET(prb_data_ring_data));
++ fprintf(fp, " atomit_long_t_counter: %ld\n", OFFSET(atomic_long_t_counter));
++
+ fprintf(fp, " sched_rt_entity_my_q: %ld\n",
+ OFFSET(sched_rt_entity_my_q));
+ fprintf(fp, " task_group_parent: %ld\n",
+@@ -10850,6 +10874,9 @@ dump_offset_table(char *spec, ulong makestruct)
+ SIZE(xarray));
+ fprintf(fp, " xa_node: %ld\n",
+ SIZE(xa_node));
++ fprintf(fp, " printk_info: %ld\n", SIZE(printk_info));
++ fprintf(fp, " printk_ringbuffer: %ld\n", SIZE(printk_ringbuffer));
++ fprintf(fp, " prb_desc: %ld\n", SIZE(prb_desc));
+
+
+ fprintf(fp, "\n array_table:\n");
+--
+2.17.1
+
diff --git a/meta-oe/recipes-kernel/crash/crash/0002-printk-use-committed-finalized-state-values.patch b/meta-oe/recipes-kernel/crash/crash/0002-printk-use-committed-finalized-state-values.patch
new file mode 100644
index 000000000..5213195c7
--- /dev/null
+++ b/meta-oe/recipes-kernel/crash/crash/0002-printk-use-committed-finalized-state-values.patch
@@ -0,0 +1,103 @@
+From 71e159c64000467e94e08aefc144f5e1cdaa4aa0 Mon Sep 17 00:00:00 2001
+From: John Ogness <john.ogness@...>
+Date: Wed, 25 Nov 2020 05:27:53 +0106
+Subject: [PATCH 2/2] printk: use committed/finalized state values
+
+An addendum to the previous crash commit a5531b24750e.
+The ringbuffer entries use 2 state values (committed and finalized)
+rather than a single flag to represent being available for reading.
+Copy the definitions and state lookup function directly from the
+kernel source and use the new states.
+
+Upstream-Status: Backport [https://github.com/crash-utility/crash/commit/71e159c64000467e94e08aefc144f5e1cdaa4aa0]
+
+Signed-off-by: John Ogness <john.ogness@...>
+Signed-off-by: Nikolay Borisov <nborisov@...>
+Signed-off-by: Mingli Yu <mingli.yu@...>
+---
+ printk.c | 48 +++++++++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 41 insertions(+), 7 deletions(-)
+
+diff --git a/printk.c b/printk.c
+index f6d54ce..8658016 100644
+--- a/printk.c
++++ b/printk.c
+@@ -1,12 +1,6 @@
+ #include "defs.h"
+ #include <ctype.h>
+
+-#define DESC_SV_BITS (sizeof(unsigned long) * 8)
+-#define DESC_COMMITTED_MASK (1UL << (DESC_SV_BITS - 1))
+-#define DESC_REUSE_MASK (1UL << (DESC_SV_BITS - 2))
+-#define DESC_FLAGS_MASK (DESC_COMMITTED_MASK | DESC_REUSE_MASK)
+-#define DESC_ID_MASK (~DESC_FLAGS_MASK)
+-
+ /* convenience struct for passing many values to helper functions */
+ struct prb_map {
+ char *prb;
+@@ -21,6 +15,44 @@ struct prb_map {
+ char *text_data;
+ };
+
++/*
++ * desc_state and DESC_* definitions taken from kernel source:
++ *
++ * kernel/printk/printk_ringbuffer.h
++ */
++
++/* The possible responses of a descriptor state-query. */
++enum desc_state {
++ desc_miss = -1, /* ID mismatch (pseudo state) */
++ desc_reserved = 0x0, /* reserved, in use by writer */
++ desc_committed = 0x1, /* committed by writer, could get reopened */
++ desc_finalized = 0x2, /* committed, no further modification allowed */
++ desc_reusable = 0x3, /* free, not yet used by any writer */
++};
++
++#define DESC_SV_BITS (sizeof(unsigned long) * 8)
++#define DESC_FLAGS_SHIFT (DESC_SV_BITS - 2)
++#define DESC_FLAGS_MASK (3UL << DESC_FLAGS_SHIFT)
++#define DESC_STATE(sv) (3UL & (sv >> DESC_FLAGS_SHIFT))
++#define DESC_ID_MASK (~DESC_FLAGS_MASK)
++#define DESC_ID(sv) ((sv) & DESC_ID_MASK)
++
++/*
++ * get_desc_state() taken from kernel source:
++ *
++ * kernel/printk/printk_ringbuffer.c
++ */
++
++/* Query the state of a descriptor. */
++static enum desc_state get_desc_state(unsigned long id,
++ unsigned long state_val)
++{
++ if (id != DESC_ID(state_val))
++ return desc_miss;
++
++ return DESC_STATE(state_val);
++}
++
+ static void
+ init_offsets(void)
+ {
+@@ -74,6 +106,7 @@ dump_record(struct prb_map *m, unsigned long id, int msg_flags)
+ unsigned short text_len;
+ unsigned long state_var;
+ unsigned int caller_id;
++ enum desc_state state;
+ unsigned char level;
+ unsigned long begin;
+ unsigned long next;
+@@ -90,7 +123,8 @@ dump_record(struct prb_map *m, unsigned long id, int msg_flags)
+ /* skip non-committed record */
+ state_var = ULONG(desc + OFFSET(prb_desc_state_var) +
+ OFFSET(atomic_long_t_counter));
+- if ((state_var & DESC_FLAGS_MASK) != DESC_COMMITTED_MASK)
++ state = get_desc_state(id, state_var);
++ if (state != desc_committed && state != desc_finalized)
+ return;
+
+ info = m->infos + ((id % m->desc_ring_count) * SIZE(printk_info));
+--
+2.17.1
+
diff --git a/meta-oe/recipes-kernel/crash/crash_7.2.9.bb b/meta-oe/recipes-kernel/crash/crash_7.2.9.bb
index 4394b6fc6..0b6883a49 100644
--- a/meta-oe/recipes-kernel/crash/crash_7.2.9.bb
+++ b/meta-oe/recipes-kernel/crash/crash_7.2.9.bb
@@ -25,6 +25,8 @@ SRC_URI = "git://github.com/crash-utility/${BPN}.git \
file://remove-unrecognized-gcc-option-m32-for-mips.patch \
file://0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch \
file://0003-crash-detect-the-sysroot-s-glibc-header-file.patch \
+ file://0001-printk-add-support-for-lockless-ringbuffer.patch \
+ file://0002-printk-use-committed-finalized-state-values.patch \
"
SRCREV = "a25aa4b649d339dd25c20d5413d81b851a77e0b2"

--
2.17.1


Re: [meta-python2][dunfell][PATCH] python: Add fix for CVE-2019-9674

Anuj Mittal
 

On Tue, 2021-02-16 at 20:53 +0530, Rahul Taya wrote:
+* bpo-36260: Add pitfalls to zipfile module documentation
+
+We saw vulnerability warning description (including zip bomb) in
Doc/library/xml.rst file.
+This gave us the idea of documentation improvement.
+
+So, we moved a little bit forward :P
+And the doc patch can be found (pr).
+
+* fix trailing whitespace
+
+* 📜🤖 Added by blurb_it.
+
+* Reformat text for consistency.
+
+Upstream-Status:
Backport[
http://archive.ubuntu.com/ubuntu/pool/main/p/python3.5/python3.5_3.5.2-2ubuntu0~16.04.12.debian.tar.xz
]
It looks like this is just a documentation change that is changing a
file that I don't think we package. Is this something that we should
care about?

Thanks,

Anuj


[meta-multimedia][PATCH] aom: Disable neon when not present in TUNE_FEATURES

Khem Raj
 

Some older arm32 cores are without neon units e.g. armv6 (rpi0 fame)
therefore check for neon feature before enabling it

Signed-off-by: Khem Raj <raj.khem@...>
Cc: Andreas Müller <schnitzeltony@...>
---
meta-multimedia/recipes-multimedia/aom/aom_2.0.0.bb | 2 ++
1 file changed, 2 insertions(+)

diff --git a/meta-multimedia/recipes-multimedia/aom/aom_2.0.0.bb b/meta-multimedia/recipes-multimedia/aom/aom_2.0.0.bb
index c5ad1f8062..41ade08791 100644
--- a/meta-multimedia/recipes-multimedia/aom/aom_2.0.0.bb
+++ b/meta-multimedia/recipes-multimedia/aom/aom_2.0.0.bb
@@ -18,3 +18,5 @@ DEPENDS = " yasm-native"
EXTRA_OECMAKE = " -DBUILD_SHARED_LIBS=1 -DENABLE_TESTS=0 \
-DPERL_EXECUTABLE=${HOSTTOOLS_DIR}/perl \
"
+
+EXTRA_OECMAKE += "${@bb.utils.contains("TUNE_FEATURES","neon","-DENABLE_NEON=ON","-DENABLE_NEON=OFF",d)}"
--
2.30.1


[PATCH v3] recipes: Update common-licenses references to match new names

Khem Raj
 

The licenses were renamed to match their SPDX names, fix the
references in LIC_FILES_CHKSUM

Correct the checksums where they were wrong

Signed-off-by: Khem Raj <raj.khem@...>
---
v3: Update checksums where needed

meta-networking/recipes-connectivity/samba/samba_4.10.18.bb | 4 ++--
meta-networking/recipes-support/arptables/arptables_git.bb | 2 +-
meta-networking/recipes-support/ncp/ncp_1.2.4.bb | 2 +-
.../recipes-devtools/android-tools/android-tools_5.1.1.r37.bb | 2 +-
.../recipes-extended/inputattach-config/inputattach-config.bb | 2 +-
.../gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb | 4 ++--
.../recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb | 2 +-
meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb | 2 +-
meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb | 4 ++--
meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb | 2 +-
10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb b/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb
index 1a982368ec..166bf57279 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb
@@ -3,8 +3,8 @@ SECTION = "console/network"

LICENSE = "GPL-3.0+ & LGPL-3.0+ & GPL-2.0+"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
- file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \
- file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 "
+ file://${COREBASE}/meta/files/common-licenses/LGPL-3.0-or-later;md5=c51d3eef3be114124d11349ca0d7e117 \
+ file://${COREBASE}/meta/files/common-licenses/GPL-2.0-or-later;md5=fed54355545ffd980b814dab4a3b312c"

SAMBA_MIRROR = "http://samba.org/samba/ftp"
MIRRORS += "\
diff --git a/meta-networking/recipes-support/arptables/arptables_git.bb b/meta-networking/recipes-support/arptables/arptables_git.bb
index c02a19944d..5afec7663a 100644
--- a/meta-networking/recipes-support/arptables/arptables_git.bb
+++ b/meta-networking/recipes-support/arptables/arptables_git.bb
@@ -1,7 +1,7 @@
SUMMARY = "Administration tool for arp packet filtering"
SECTION = "net"
LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
SRCREV = "efae8949e31f8b2eb6290f377a28384cecaf105a"
PV = "0.0.5+git${SRCPV}"

diff --git a/meta-networking/recipes-support/ncp/ncp_1.2.4.bb b/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
index f42223b1f8..a2f0ccc069 100644
--- a/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
+++ b/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
@@ -4,7 +4,7 @@ security or integrity checking, no throttling, no features, except \
one: you don't have to type the coordinates of your peer."
HOMEPAGE = "http://www.fefe.de/ncp"
LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
DEPENDS = "libowfat"

SRC_URI = "https://dl.fefe.de/${BP}.tar.bz2"
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
index ae1463942a..d93a7f7239 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
+++ b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
@@ -3,7 +3,7 @@ SECTION = "console/utils"
LICENSE = "Apache-2.0 & GPL-2.0 & BSD-2-Clause & BSD-3-Clause"
LIC_FILES_CHKSUM = " \
file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10 \
- file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \
+ file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6 \
file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=cb641bc04cda31daea161b1bc15da69f \
file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \
"
diff --git a/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb b/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb
index 68beec670b..3933355abf 100644
--- a/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb
+++ b/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb
@@ -1,6 +1,6 @@
SUMMARY = "inputattach configuration file"
LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"

SRC_URI = "file://inputattach.conf"

diff --git a/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb b/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb
index d6da51b0de..f7fbedd6e0 100644
--- a/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb
+++ b/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb
@@ -3,8 +3,8 @@ DESCRIPTION = "This recipe provides m4 macros from gnome-doc-utils project, so \
that dependent recipes can build. Gnome-doc-utils itself is no longer packaged because \
it requires libxml2 and python 2 at the same time, which can no longer be satisfied. "
LICENSE = "GPLv2 & LGPLv2.1"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \
- file://${COREBASE}/meta/files/common-licenses/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6 \
+ file://${COREBASE}/meta/files/common-licenses/LGPL-2.1-only;md5=1a6d268fd218675ffea8be556788b780"
SRC_URI = "file://gnome-doc-utils.m4"

PROVIDES = "gnome-doc-utils"
diff --git a/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb b/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb
index 25e01fac0c..38598e2b49 100644
--- a/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb
+++ b/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb
@@ -12,7 +12,7 @@ SECTION = "libs"
LICENSE = "Artistic-1.0 | GPL-1.0+"

LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \
-file://${COMMON_LICENSE_DIR}/GPL-1.0;md5=e9e36a9de734199567a4d769498f743d"
+file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf61"

SRC_URI = "${CPAN_MIRROR}/authors/id/R/RE/REHSACK/Config-AutoConf-${PV}.tar.gz"

diff --git a/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb b/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb
index 3678ad7621..415652c1ed 100644
--- a/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb
+++ b/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb
@@ -9,7 +9,7 @@ LICENSE = "Artistic-1.0 | GPL-1.0+"
HOMEPAGE= "https://metacpan.org/release/File-Slurper"

LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \
-file://${COMMON_LICENSE_DIR}/GPL-1.0;md5=e9e36a9de734199567a4d769498f743d"
+file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf61"

SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEONT/File-Slurper-${PV}.tar.gz"

diff --git a/meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb b/meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb
index a1bb4a399e..c0113b4fd9 100644
--- a/meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb
+++ b/meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb
@@ -24,8 +24,8 @@ RDEPENDS_${PN} += "\

SRC_URI = "${CPAN_MIRROR}/authors/id/R/RE/REHSACK/Unix-Statgrab-${PV}.tar.gz"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \
- file://${COMMON_LICENSE_DIR}/GPL-1.0;md5=e9e36a9de734199567a4d769498f743d \
- file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
+ file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf61 \
+ file://${COMMON_LICENSE_DIR}/LGPL-2.1-or-later;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
"

SRC_URI[md5sum] = "a6bc06b3f7749f7d77a2b1bd13402821"
diff --git a/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb b/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb
index f2dda194dc..7cd07b2c0b 100644
--- a/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb
+++ b/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb
@@ -15,7 +15,7 @@ LICENSE = "Artistic-1.0 | GPL-1.0+"
HOMEPAGE= "https://metacpan.org/release/Test-Warnings"

LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \
-file://${COMMON_LICENSE_DIR}/GPL-1.0;md5=e9e36a9de734199567a4d769498f743d"
+file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf61"

SRC_URI = "https://cpan.metacpan.org/authors/id/E/ET/ETHER/Test-Warnings-${PV}.tar.gz"

--
2.30.1


[meta-python][PATCH v2] python3-grpcio: Upgrade to 1.35.0

Khem Raj
 

Drop 0001-Fix-build-on-riscv32.patch, its upstreamed
Forward port rest of the patches
Use OPENSSL_NO_ASM only for armv7+/aarch64

Signed-off-by: Khem Raj <raj.khem@...>
---
v2: Fix wrong detection of platform

.../0001-Fix-build-on-riscv32.patch | 65 --------------
...-Do-not-mix-C-and-C-compiler-options.patch | 86 ++++++++++---------
.../python/python3-grpcio/boring_ssl.patch | 36 ++++++++
.../ppc-boringssl-support.patch | 4 +-
.../python3-grpcio/riscv64_support.patch | 4 +-
...cio_1.27.1.bb => python3-grpcio_1.35.0.bb} | 20 +++--
6 files changed, 98 insertions(+), 117 deletions(-)
delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch
create mode 100644 meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch
rename meta-python/recipes-devtools/python/{python3-grpcio_1.27.1.bb => python3-grpcio_1.35.0.bb} (55%)

diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch
deleted file mode 100644
index 920fc1169d..0000000000
--- a/meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 04e28fdda03b545a0f7b446a784ec2fa7249cbb8 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@...>
-Date: Wed, 29 Apr 2020 15:37:40 -0700
-Subject: [PATCH] Fix build on riscv32
-
-Define __NR_mmap in terms of __NR_mmap2 and __NR_futex interms of
-__NR_futex_time64 for rv32, since there calls dont exist for rv32
-
-Also recognise rv32 as a new 32bit platform
-
-Upstream-Status: Submitted [https://github.com/abseil/abseil-cpp/pull/675]
-Signed-off-by: Khem Raj <raj.khem@...>
----
- absl/base/internal/direct_mmap.h | 5 +++++
- absl/base/internal/spinlock_linux.inc | 4 ++++
- absl/synchronization/internal/waiter.cc | 4 ++++
- 3 files changed, 13 insertions(+)
-
---- a/third_party/abseil-cpp/absl/base/internal/direct_mmap.h
-+++ b/third_party/abseil-cpp/absl/base/internal/direct_mmap.h
-@@ -26,6 +26,10 @@
-
- #ifdef __linux__
-
-+#if !defined(__NR_mmap) && defined(__riscv) && __riscv_xlen == 32
-+# define __NR_mmap __NR_mmap2
-+#endif
-+
- #include <sys/types.h>
- #ifdef __BIONIC__
- #include <sys/syscall.h>
-@@ -72,6 +76,7 @@ inline void* DirectMmap(void* start, siz
- #if defined(__i386__) || defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) || \
- (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) || \
- (defined(__PPC__) && !defined(__PPC64__)) || \
-+ (defined(__riscv) && __riscv_xlen == 32) || \
- (defined(__s390__) && !defined(__s390x__))
- // On these architectures, implement mmap with mmap2.
- static int pagesize = 0;
---- a/third_party/abseil-cpp/absl/base/internal/spinlock_linux.inc
-+++ b/third_party/abseil-cpp/absl/base/internal/spinlock_linux.inc
-@@ -14,6 +14,10 @@
- //
- // This file is a Linux-specific part of spinlock_wait.cc
-
-+#if !defined(__NR_futex) && defined(__riscv) && __riscv_xlen == 32
-+# define __NR_futex __NR_futex_time64
-+#endif
-+
- #include <linux/futex.h>
- #include <sys/syscall.h>
- #include <unistd.h>
---- a/third_party/abseil-cpp/absl/synchronization/internal/waiter.cc
-+++ b/third_party/abseil-cpp/absl/synchronization/internal/waiter.cc
-@@ -24,6 +24,10 @@
- #include <unistd.h>
- #endif
-
-+#if !defined(__NR_futex) && defined(__riscv) && __riscv_xlen == 32
-+# define __NR_futex __NR_futex_time64
-+#endif
-+
- #ifdef __linux__
- #include <linux/futex.h>
- #include <sys/syscall.h>
diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch
index bff50a0a11..373669461b 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch
+++ b/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch
@@ -1,26 +1,18 @@
-From 2ef8a85933f3ac36b289979ff9edd49dd12d0d16 Mon Sep 17 00:00:00 2001
+From de10fbc2386dcac3ab810c49b6977b2ee01bf426 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@...>
-Date: Fri, 4 Aug 2017 09:04:07 -0700
+Date: Wed, 17 Feb 2021 13:30:23 -0800
Subject: [PATCH] setup.py: Do not mix C and C++ compiler options

EXTRA_ENV_COMPILE_ARGS is used both with CC and CXX
so using -std=c++11 or -std=gnu99 together will cause
build time errors espcially with clang

-error: invalid argument '-std=gnu99' not allowed with 'C++'
-
-gcc7 ( defaults are -std=gnu11 and -std=gnu++14 )
- as well clang default to these standards mode or newer
-anyway
-
-Signed-off-by: Khem Raj <raj.khem@...>
-
-1. Keep '-std=c++11' and '-std=gnu99' to fix native build error
+Keep '-std=c++11' to fix native build error
with old gcc (such as gcc 5.4.0 on ubuntu 16.04), for clang
we will remove them through GRPC_PYTHON_CFLAGS at do_compile
in bb recipe.

-2. While export CC="gcc ", cc_args is None, it will
+While export CC="gcc ", cc_args is None, it will
cause subprocess.Popen always return 1. On centos 8, if you don't
install package libatomic, there will be a native build error
`cannot find /usr/lib64/libatomic.so.1.2.0'.
@@ -28,47 +20,57 @@ install package libatomic, there will be a native build error
Add no harm '-g' to cc_args if cc_args is empty.

Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Khem Raj <raj.khem@...>
Signed-off-by: Hongxu Jia <hongxu.jia@...>
---
- setup.py | 6 +++++-
+ setup.py | 9 ++++++---
src/python/grpcio/commands.py | 5 ++++-
- 2 files changed, 9 insertions(+), 2 deletions(-)
+ 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
-index e950057..1b68221 100644
+index 4b8c9d4..271b7b1 100644
--- a/setup.py
+++ b/setup.py
-@@ -144,9 +144,13 @@ ENABLE_DOCUMENTATION_BUILD = os.environ.get(
-
- def check_linker_need_libatomic():
- """Test if linker on system needs libatomic."""
-+ compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc'
-+ if not cc_args:
-+ cc_args = "-g"
+@@ -172,8 +172,11 @@ def check_linker_need_libatomic():
+ """Test if linker on system needs libatomic."""
+ code_test = (b'#include <atomic>\n' +
+ b'int main() { return std::atomic<int64_t>{}; }')
+- cxx = os.environ.get('CXX', 'c++')
+- cpp_test = subprocess.Popen([cxx, '-x', 'c++', '-std=c++11', '-'],
++ cxx, cxx_args = os.environ.get('CXX').split(' ', 1) or 'c++'
++ if not cxx_args:
++ cxx_args = "-g"
+
- code_test = (b'#include <atomic>\n' +
- b'int main() { return std::atomic<int64_t>{}; }')
-- cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'],
-+ cc_test = subprocess.Popen([compiler, cc_args, '-x', 'c++', '-std=c++11', '-'],
- stdin=PIPE,
- stdout=PIPE,
- stderr=PIPE)
++ cpp_test = subprocess.Popen([cxx, cxx_args, '-x', 'c++', '-std=c++11', '-'],
+ stdin=PIPE,
+ stdout=PIPE,
+ stderr=PIPE)
+@@ -183,7 +186,7 @@ def check_linker_need_libatomic():
+ # Double-check to see if -latomic actually can solve the problem.
+ # https://github.com/grpc/grpc/issues/22491
+ cpp_test = subprocess.Popen(
+- [cxx, '-x', 'c++', '-std=c++11', '-latomic', '-'],
++ [cxx, cxx_args, '-x', 'c++', '-std=c++11', '-latomic', '-'],
+ stdin=PIPE,
+ stdout=PIPE,
+ stderr=PIPE)
diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py
-index 064dda9..a75d8b9 100644
+index a8b2ff5..b928201 100644
--- a/src/python/grpcio/commands.py
+++ b/src/python/grpcio/commands.py
-@@ -216,7 +216,10 @@ class BuildExt(build_ext.build_ext):
- when invoked in C mode. GCC is okay with this, while clang is not.
+@@ -219,7 +219,10 @@ class BuildExt(build_ext.build_ext):
"""
- # TODO(lidiz) Remove the generated a.out for success tests.
-- cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++11', '-'],
-+ compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc'
-+ if not cc_args:
-+ cc_args = "-g"
-+ cc_test = subprocess.Popen([compiler, cc_args, '-x', 'c', '-std=c++11', '-'],
- stdin=subprocess.PIPE,
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE)
+ try:
+ # TODO(lidiz) Remove the generated a.out for success tests.
+- cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++11', '-'],
++ cc_test, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc'
++ if not cc_args:
++ cc_args = "-g"
++ cc_test = subprocess.Popen([cc_test, cc_args, '-x', 'c', '-std=c++11', '-'],
+ stdin=subprocess.PIPE,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE)
--
-2.7.4
+2.30.1

diff --git a/meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch b/meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch
new file mode 100644
index 0000000000..65db4a6ed4
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch
@@ -0,0 +1,36 @@
+Do not poke at the build machine to determine target platform or architecture
+pass it from environment instead for cross compiling to work
+
+Upstream-Status: Inappropriate [OE-Specific]
+Signed-off-by: Khem Raj <raj.khem@...>
+--- a/setup.py
++++ b/setup.py
+@@ -109,6 +109,8 @@ CLASSIFIERS = [
+ BUILD_WITH_BORING_SSL_ASM = os.environ.get('GRPC_BUILD_WITH_BORING_SSL_ASM',
+ True)
+
++BORING_SSL_PLATFORM = os.environ.get('GRPC_BORING_SSL_PLATFORM',
++ True)
+ # Environment variable to determine whether or not the Cython extension should
+ # *use* Cython or use the generated C files. Note that this requires the C files
+ # to have been generated by building first *with* Cython support. Even if this
+@@ -306,15 +308,15 @@ asm_key = ''
+ if BUILD_WITH_BORING_SSL_ASM and not BUILD_WITH_SYSTEM_OPENSSL:
+ LINUX_X86_64 = 'linux-x86_64'
+ LINUX_ARM = 'linux-arm'
+- if LINUX_X86_64 == util.get_platform():
++ if LINUX_X86_64 == BORING_SSL_PLATFORM:
+ asm_key = 'crypto_linux_x86_64'
+- elif LINUX_ARM == util.get_platform():
++ elif LINUX_ARM == BORING_SSL_PLATFORM:
+ asm_key = 'crypto_linux_arm'
+- elif "mac" in util.get_platform() and "x86_64" in util.get_platform():
++ elif "mac" in BORING_SSL_PLATFORM and "x86_64" in BORING_SSL_PLATFORM:
+ asm_key = 'crypto_mac_x86_64'
+ else:
+ print("ASM Builds for BoringSSL currently not supported on:",
+- util.get_platform())
++ BORING_SSL_PLATFORM)
+ if asm_key:
+ asm_files = grpc_core_dependencies.ASM_SOURCE_FILES[asm_key]
+ else:
diff --git a/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch b/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch
index 8ac2aef8c4..dadd3da85e 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch
+++ b/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch
@@ -3,8 +3,8 @@ Let boringSSL compile on ppc32 bit
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@...>

---- a/third_party/boringssl/include/openssl/base.h
-+++ b/third_party/boringssl/include/openssl/base.h
+--- a/third_party/boringssl-with-bazel/src/include/openssl/base.h
++++ b/third_party/boringssl-with-bazel/src/include/openssl/base.h
@@ -99,6 +99,9 @@ extern "C" {
#elif (defined(__PPC64__) || defined(__powerpc64__)) && defined(_LITTLE_ENDIAN)
#define OPENSSL_64_BIT
diff --git a/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch b/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch
index 8c9ffa21b7..7e071ae1e6 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch
+++ b/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch
@@ -2,8 +2,8 @@ Add RISC-V 64bit support

Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@...>
---- a/third_party/boringssl/include/openssl/base.h
-+++ b/third_party/boringssl/include/openssl/base.h
+--- a/third_party/boringssl-with-bazel/src/include/openssl/base.h
++++ b/third_party/boringssl-with-bazel/src/include/openssl/base.h
@@ -108,6 +108,14 @@ extern "C" {
#elif defined(__mips__) && defined(__LP64__)
#define OPENSSL_64_BIT
diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.35.0.bb
similarity index 55%
rename from meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb
rename to meta-python/recipes-devtools/python/python3-grpcio_1.35.0.bb
index 129bb35bcc..2c137f6ce7 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb
+++ b/meta-python/recipes-devtools/python/python3-grpcio_1.35.0.bb
@@ -9,10 +9,9 @@ DEPENDS += "${PYTHON_PN}-protobuf"
SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch"
SRC_URI_append_class-target = " file://ppc-boringssl-support.patch \
file://riscv64_support.patch \
- file://0001-Fix-build-on-riscv32.patch \
+ file://boring_ssl.patch \
"
-SRC_URI[md5sum] = "ccaf4e7eb4f031d926fb80035d193b98"
-SRC_URI[sha256sum] = "a899725d34769a498ecd3be154021c4368dd22bdc69473f6ec46779696f626c4"
+SRC_URI[sha256sum] = "7bd0ebbb14dde78bf66a1162efd29d3393e4e943952e2f339757aa48a184645c"

RDEPENDS_${PN} = "${PYTHON_PN}-protobuf \
${PYTHON_PN}-setuptools \
@@ -24,9 +23,18 @@ inherit pypi

export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY = "1"

-do_compile_prepend_toolchain-clang() {
- export GRPC_PYTHON_CFLAGS='-fvisibility=hidden -fno-wrapv -fno-exceptions'
-}
+BORING_SSL_PLATFORM_arm = "linux-arm"
+BORING_SSL_PLATFORM_x86-64 = "linux-x86_64"
+BORING_SSL_PLATFORM ?= "unsupported"
+export GRPC_BORING_SSL_PLATFORM = "${BORING_SSL_PLATFORM}"
+
+BORING_SSL_x86-64 = "1"
+BORING_SSL_arm = "1"
+BORING_SSL ?= "0"
+export GRPC_BUILD_WITH_BORING_SSL_ASM = "${BORING_SSL}"
+
+GRPC_CFLAGS_append_toolchain-clang = " -fvisibility=hidden -fno-wrapv -fno-exceptions"
+export GRPC_PYTHON_CFLAGS = "${GRPC_CFLAGS}"

CLEANBROKEN = "1"

--
2.30.1


[meta-networking][PATCH] wolfssl: updae to 4.7.0

Oleksandr Kravchuk
 

Signed-off-by: Oleksandr Kravchuk <open.source@...>
---
.../wolfssl/{wolfssl_4.6.0.bb => wolfssl_4.7.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-networking/recipes-connectivity/wolfssl/{wolfssl_4.6.0.bb => wolfssl_4.7.0.bb} (93%)

diff --git a/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.6.0.bb b/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.7.0.bb
similarity index 93%
rename from meta-networking/recipes-connectivity/wolfssl/wolfssl_4.6.0.bb
rename to meta-networking/recipes-connectivity/wolfssl/wolfssl_4.7.0.bb
index ad7e92341..83406f507 100644
--- a/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.6.0.bb
+++ b/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.7.0.bb
@@ -14,7 +14,7 @@ RPROVIDES_${PN} = "cyassl"

SRC_URI = "git://github.com/wolfSSL/wolfssl.git;protocol=https \
"
-SRCREV = "9c87f979a7f1d3a6d786b260653d566c1d31a1c4"
+SRCREV = "830de9a9fb99e30f9ac9caa0a7f7bba29c3b4863"
S = "${WORKDIR}/git"

inherit autotools
--
2.25.1


Re: [meta-python2][dunfell][PATCH] python: Add fix for CVE-2019-9674

Martin Jansa
 

On Thu, Feb 18, 2021 at 07:19:53AM -0800, akuster wrote:


On 2/16/21 7:23 AM, Rahul Taya wrote:
For python and python-native added patch to fix
CVE-2019-9674

Signed-off-by: Rahul Taya <Rahul.Taya@...>
Please add your signoff in the applying patches. see below for example.

Does this affect master or Gatesgarth?  What may avoid such questions is
by  adding  something like "Affects: < {version}" will convey that info.
python in meta-python2 is identical in dunfell/gatesgarth/master
branches, so it has to affect all of them.

-armin
---
recipes-devtools/python/python.inc | 1 +
.../python/python/CVE-2019-9674.patch | 83 +++++++++++++++++++
2 files changed, 84 insertions(+)
create mode 100644 recipes-devtools/python/python/CVE-2019-9674.patch

diff --git a/recipes-devtools/python/python.inc b/recipes-devtools/python/python.inc
index a4ba0c5..787f23e 100644
--- a/recipes-devtools/python/python.inc
+++ b/recipes-devtools/python/python.inc
@@ -8,6 +8,7 @@ INC_PR = "r1"
LIC_FILES_CHKSUM = "file://LICENSE;md5=203a6dbc802ee896020a47161e759642"

SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
+ file://CVE-2019-9674.patch \
"

SRC_URI[sha256sum] = "b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43"
diff --git a/recipes-devtools/python/python/CVE-2019-9674.patch b/recipes-devtools/python/python/CVE-2019-9674.patch
new file mode 100644
index 0000000..647d9da
--- /dev/null
+++ b/recipes-devtools/python/python/CVE-2019-9674.patch
@@ -0,0 +1,83 @@
+From 3ba51d587f6897a45301ce9126300c14fcd4eba2 Mon Sep 17 00:00:00 2001
+From: JunWei Song <sungboss2004@...>
+Date: Wed, 11 Sep 2019 23:04:12 +0800
+Subject: [PATCH] bpo-36260: Add pitfalls to zipfile module documentation
+ (#13378)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* bpo-36260: Add pitfalls to zipfile module documentation
+
+We saw vulnerability warning description (including zip bomb) in Doc/library/xml.rst file.
+This gave us the idea of documentation improvement.
+
+So, we moved a little bit forward :P
+And the doc patch can be found (pr).
+
+* fix trailing whitespace
+
+* 📜🤖 Added by blurb_it.
+
+* Reformat text for consistency.
+
+Upstream-Status: Backport[http://archive.ubuntu.com/ubuntu/pool/main/p/python3.5/python3.5_3.5.2-2ubuntu0~16.04.12.debian.tar.xz]
+CVE: CVE-2019-9674
+Link: http://archive.ubuntu.com/ubuntu/pool/main/p/python3.5/python3.5_3.5.2-2ubuntu0~16.04.12.debian.tar.xz
+Comment: From the original patch skipped changes for file
+Misc/NEWS.d/next/Documentation/2019-06-04-09-29-00.bpo-36260.WrGuc-.rst
+as this file is not present in our source code.
Signed-off-by: Rahul Taya <Rahul.Taya@...> <<<<----- somewhere in this area

I tend to do mine just after "cve:"

- armin

+---
+ Doc/library/zipfile.rst | 41 +++++++++++++++++++
+ 1 files changed, 41 insertions(+)
+
+diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst
+index b421ea5..2e0a91d 100644
+--- a/Doc/library/zipfile.rst
++++ b/Doc/library/zipfile.rst
+@@ -574,4 +574,45 @@ Instances have the following attributes:
+
+ Size of the uncompressed file.
+
++Decompression pitfalls
++----------------------
++
++The extraction in zipfile module might fail due to some pitfalls listed below.
++
++From file itself
++~~~~~~~~~~~~~~~~
++
++Decompression may fail due to incorrect password / CRC checksum / ZIP format or
++unsupported compression method / decryption.
++
++File System limitations
++~~~~~~~~~~~~~~~~~~~~~~~
++
++Exceeding limitations on different file systems can cause decompression failed.
++Such as allowable characters in the directory entries, length of the file name,
++length of the pathname, size of a single file, and number of files, etc.
++
++Resources limitations
++~~~~~~~~~~~~~~~~~~~~~
++
++The lack of memory or disk volume would lead to decompression
++failed. For example, decompression bombs (aka `ZIP bomb`_)
++apply to zipfile library that can cause disk volume exhaustion.
++
++Interruption
++~~~~~~~~~~~~
++
++Interruption during the decompression, such as pressing control-C or killing the
++decompression process may result in incomplete decompression of the archive.
++
++Default behaviors of extraction
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++
++Not knowing the default extraction behaviors
++can cause unexpected decompression results.
++For example, when extracting the same archive twice,
++it overwrites files without asking.
++
++
++.. _ZIP bomb: https://en.wikipedia.org/wiki/Zip_bomb
+ .. _PKZIP Application Note: https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT
--
2.17.1

This message contains information that may be privileged or confidential and is the property of the KPIT Technologies Ltd. It is intended only for the person to whom it is addressed. If you are not the intended recipient, you are not authorized to read, print, retain copy, disseminate, distribute, or use this message or any part thereof. If you receive this message in error, please notify the sender immediately and delete all copies of this message. KPIT Technologies Ltd. does not accept any liability for virus infected mails.





Re: [meta-python2][dunfell][PATCH] python: Add fix for CVE-2019-9674

Martin Jansa
 

"git am" doesn't like those emoticons in the .patch file..

git am ~/py2/cur/16136689*
error: cannot convert from 8bit to UTF-8
fatal: could not parse patch

either drop them or upload it to some git repo so I can cherry-pick it from there.

On Thu, Feb 18, 2021 at 3:18 PM Rahul Taya <Rahul.Taya@...> wrote:
For python and python-native added patch to fix
CVE-2019-9674

Signed-off-by: Rahul Taya <Rahul.Taya@...>
---
 recipes-devtools/python/python.inc            |  1 +
 .../python/python/CVE-2019-9674.patch         | 83 +++++++++++++++++++
 2 files changed, 84 insertions(+)
 create mode 100644 recipes-devtools/python/python/CVE-2019-9674.patch

diff --git a/recipes-devtools/python/python.inc b/recipes-devtools/python/python.inc
index a4ba0c5..787f23e 100644
--- a/recipes-devtools/python/python.inc
+++ b/recipes-devtools/python/python.inc
@@ -8,6 +8,7 @@ INC_PR = "r1"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=203a6dbc802ee896020a47161e759642"

 SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
+           file://CVE-2019-9674.patch \
            "

 SRC_URI[sha256sum] = "b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43"
diff --git a/recipes-devtools/python/python/CVE-2019-9674.patch b/recipes-devtools/python/python/CVE-2019-9674.patch
new file mode 100644
index 0000000..647d9da
--- /dev/null
+++ b/recipes-devtools/python/python/CVE-2019-9674.patch
@@ -0,0 +1,83 @@
+From 3ba51d587f6897a45301ce9126300c14fcd4eba2 Mon Sep 17 00:00:00 2001
+From: JunWei Song <sungboss2004@...>
+Date: Wed, 11 Sep 2019 23:04:12 +0800
+Subject: [PATCH] bpo-36260: Add pitfalls to zipfile module documentation
+ (#13378)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* bpo-36260: Add pitfalls to zipfile module documentation
+
+We saw vulnerability warning description (including zip bomb) in Doc/library/xml.rst file.
+This gave us the idea of documentation improvement.
+
+So, we moved a little bit forward :P
+And the doc patch can be found (pr).
+
+* fix trailing whitespace
+
+* 📜🤖 Added by blurb_it.
+
+* Reformat text for consistency.
+
+Upstream-Status: Backport[http://archive.ubuntu.com/ubuntu/pool/main/p/python3.5/python3.5_3.5.2-2ubuntu0~16.04.12.debian.tar.xz]
+CVE: CVE-2019-9674
+Link: http://archive.ubuntu.com/ubuntu/pool/main/p/python3.5/python3.5_3.5.2-2ubuntu0~16.04.12.debian.tar.xz
+Comment: From the original patch skipped changes for file
+Misc/NEWS.d/next/Documentation/2019-06-04-09-29-00.bpo-36260.WrGuc-.rst
+as this file is not present in our source code.
+---
+ Doc/library/zipfile.rst                       | 41 +++++++++++++++++++
+ 1 files changed, 41 insertions(+)
+
+diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst
+index b421ea5..2e0a91d 100644
+--- a/Doc/library/zipfile.rst
++++ b/Doc/library/zipfile.rst
+@@ -574,4 +574,45 @@ Instances have the following attributes:
+
+    Size of the uncompressed file.
+
++Decompression pitfalls
++----------------------
++
++The extraction in zipfile module might fail due to some pitfalls listed below.
++
++From file itself
++~~~~~~~~~~~~~~~~
++
++Decompression may fail due to incorrect password / CRC checksum / ZIP format or
++unsupported compression method / decryption.
++
++File System limitations
++~~~~~~~~~~~~~~~~~~~~~~~
++
++Exceeding limitations on different file systems can cause decompression failed.
++Such as allowable characters in the directory entries, length of the file name,
++length of the pathname, size of a single file, and number of files, etc.
++
++Resources limitations
++~~~~~~~~~~~~~~~~~~~~~
++
++The lack of memory or disk volume would lead to decompression
++failed. For example, decompression bombs (aka `ZIP bomb`_)
++apply to zipfile library that can cause disk volume exhaustion.
++
++Interruption
++~~~~~~~~~~~~
++
++Interruption during the decompression, such as pressing control-C or killing the
++decompression process may result in incomplete decompression of the archive.
++
++Default behaviors of extraction
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++
++Not knowing the default extraction behaviors
++can cause unexpected decompression results.
++For example, when extracting the same archive twice,
++it overwrites files without asking.
++
++
++.. _ZIP bomb: https://en.wikipedia.org/wiki/Zip_bomb
+ .. _PKZIP Application Note: https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT
--
2.17.1

This message contains information that may be privileged or confidential and is the property of the KPIT Technologies Ltd. It is intended only for the person to whom it is addressed. If you are not the intended recipient, you are not authorized to read, print, retain copy, disseminate, distribute, or use this message or any part thereof. If you receive this message in error, please notify the sender immediately and delete all copies of this message. KPIT Technologies Ltd. does not accept any liability for virus infected mails.




Re: [meta-python2][dunfell][PATCH] python: Add fix for CVE-2019-9674

Armin Kuster
 

On 2/16/21 7:23 AM, Rahul Taya wrote:
For python and python-native added patch to fix
CVE-2019-9674

Signed-off-by: Rahul Taya <Rahul.Taya@...>
Please add your signoff in the applying patches. see below for example.

Does this affect master or Gatesgarth?  What may avoid such questions is
by  adding  something like "Affects: < {version}" will convey that info.

Thanks for the patch.

-armin
---
recipes-devtools/python/python.inc | 1 +
.../python/python/CVE-2019-9674.patch | 83 +++++++++++++++++++
2 files changed, 84 insertions(+)
create mode 100644 recipes-devtools/python/python/CVE-2019-9674.patch

diff --git a/recipes-devtools/python/python.inc b/recipes-devtools/python/python.inc
index a4ba0c5..787f23e 100644
--- a/recipes-devtools/python/python.inc
+++ b/recipes-devtools/python/python.inc
@@ -8,6 +8,7 @@ INC_PR = "r1"
LIC_FILES_CHKSUM = "file://LICENSE;md5=203a6dbc802ee896020a47161e759642"

SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
+ file://CVE-2019-9674.patch \
"

SRC_URI[sha256sum] = "b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43"
diff --git a/recipes-devtools/python/python/CVE-2019-9674.patch b/recipes-devtools/python/python/CVE-2019-9674.patch
new file mode 100644
index 0000000..647d9da
--- /dev/null
+++ b/recipes-devtools/python/python/CVE-2019-9674.patch
@@ -0,0 +1,83 @@
+From 3ba51d587f6897a45301ce9126300c14fcd4eba2 Mon Sep 17 00:00:00 2001
+From: JunWei Song <sungboss2004@...>
+Date: Wed, 11 Sep 2019 23:04:12 +0800
+Subject: [PATCH] bpo-36260: Add pitfalls to zipfile module documentation
+ (#13378)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* bpo-36260: Add pitfalls to zipfile module documentation
+
+We saw vulnerability warning description (including zip bomb) in Doc/library/xml.rst file.
+This gave us the idea of documentation improvement.
+
+So, we moved a little bit forward :P
+And the doc patch can be found (pr).
+
+* fix trailing whitespace
+
+* 📜🤖 Added by blurb_it.
+
+* Reformat text for consistency.
+
+Upstream-Status: Backport[http://archive.ubuntu.com/ubuntu/pool/main/p/python3.5/python3.5_3.5.2-2ubuntu0~16.04.12.debian.tar.xz]
+CVE: CVE-2019-9674
+Link: http://archive.ubuntu.com/ubuntu/pool/main/p/python3.5/python3.5_3.5.2-2ubuntu0~16.04.12.debian.tar.xz
+Comment: From the original patch skipped changes for file
+Misc/NEWS.d/next/Documentation/2019-06-04-09-29-00.bpo-36260.WrGuc-.rst
+as this file is not present in our source code.
Signed-off-by: Rahul Taya <Rahul.Taya@...> <<<<----- somewhere in this area

I tend to do mine just after "cve:"

- armin

+---
+ Doc/library/zipfile.rst | 41 +++++++++++++++++++
+ 1 files changed, 41 insertions(+)
+
+diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst
+index b421ea5..2e0a91d 100644
+--- a/Doc/library/zipfile.rst
++++ b/Doc/library/zipfile.rst
+@@ -574,4 +574,45 @@ Instances have the following attributes:
+
+ Size of the uncompressed file.
+
++Decompression pitfalls
++----------------------
++
++The extraction in zipfile module might fail due to some pitfalls listed below.
++
++From file itself
++~~~~~~~~~~~~~~~~
++
++Decompression may fail due to incorrect password / CRC checksum / ZIP format or
++unsupported compression method / decryption.
++
++File System limitations
++~~~~~~~~~~~~~~~~~~~~~~~
++
++Exceeding limitations on different file systems can cause decompression failed.
++Such as allowable characters in the directory entries, length of the file name,
++length of the pathname, size of a single file, and number of files, etc.
++
++Resources limitations
++~~~~~~~~~~~~~~~~~~~~~
++
++The lack of memory or disk volume would lead to decompression
++failed. For example, decompression bombs (aka `ZIP bomb`_)
++apply to zipfile library that can cause disk volume exhaustion.
++
++Interruption
++~~~~~~~~~~~~
++
++Interruption during the decompression, such as pressing control-C or killing the
++decompression process may result in incomplete decompression of the archive.
++
++Default behaviors of extraction
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++
++Not knowing the default extraction behaviors
++can cause unexpected decompression results.
++For example, when extracting the same archive twice,
++it overwrites files without asking.
++
++
++.. _ZIP bomb: https://en.wikipedia.org/wiki/Zip_bomb
+ .. _PKZIP Application Note: https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT
--
2.17.1

This message contains information that may be privileged or confidential and is the property of the KPIT Technologies Ltd. It is intended only for the person to whom it is addressed. If you are not the intended recipient, you are not authorized to read, print, retain copy, disseminate, distribute, or use this message or any part thereof. If you receive this message in error, please notify the sender immediately and delete all copies of this message. KPIT Technologies Ltd. does not accept any liability for virus infected mails.



Re: [meta-python][PATCH 2/2] python-grpcio-tools: Upgrade to 1.35.0

Trevor Gamblin
 


On 2021-02-17 4:58 p.m., Khem Raj wrote:
[Please note: This e-mail is from an EXTERNAL e-mail address]

merge inc file into bb as this is the only consumer now
Fix the compiler name logic to match OE, since our compiler name is not
a single word but a collection of words

Signed-off-by: Khem Raj <raj.khem@...>
Acked-by: Trevor Gamblin <trevor.gamblin@...>
---
 ...-Do-not-mix-C-and-C-compiler-options.patch | 58 +++++++++++++++++++
 .../python/python3-grpcio-tools_1.14.1.bb     |  2 -
 ...ols.inc => python3-grpcio-tools_1.35.0.bb} |  7 ++-
 3 files changed, 62 insertions(+), 5 deletions(-)
 create mode 100644 meta-python/recipes-devtools/python/python3-grpcio-tools/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch
 delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio-tools_1.14.1.bb
 rename meta-python/recipes-devtools/python/{python-grpcio-tools.inc => python3-grpcio-tools_1.35.0.bb} (63%)

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
new file mode 100644
index 0000000000..aef67b5748
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch
@@ -0,0 +1,58 @@
+From 9b2f1d400db8b8d0045f5a58a748a2dc52b5c9ef Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@...>
+Date: Wed, 17 Feb 2021 13:38:55 -0800
+Subject: [PATCH] setup.py: Do not mix C and C++ compiler options
+
+EXTRA_ENV_COMPILE_ARGS is used both with CC and CXX
+so using -std=c++11 or -std=gnu99 together will cause
+build time errors espcially with clang
+
+Keep '-std=c++11' to fix native build error
+with old gcc (such as gcc 5.4.0 on ubuntu 16.04), for clang
+we will remove them through GRPC_PYTHON_CFLAGS at do_compile
+in bb recipe.
+
+While export CC="gcc ", cc_args is None, it will
+cause subprocess.Popen always return 1. On centos 8, if you don't
+install package libatomic, there will be a native build error
+`cannot find /usr/lib64/libatomic.so.1.2.0'.
+
+Add no harm '-g' to cc_args if cc_args is empty.
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Khem Raj <raj.khem@...>
+---
+ setup.py | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index a316038..70aa174 100644
+--- a/setup.py
++++ b/setup.py
+@@ -76,8 +76,11 @@ def check_linker_need_libatomic():
+     """Test if linker on system needs libatomic."""
+     code_test = (b'#include <atomic>\n' +
+                  b'int main() { return std::atomic<int64_t>{}; }')
+-    cxx = os.environ.get('CXX', 'c++')
+-    cpp_test = subprocess.Popen([cxx, '-x', 'c++', '-std=c++11', '-'],
++    cxx, cxx_args = os.environ.get('CXX').split(' ', 1) or 'c++'
++    if not cxx_args:
++      cxx_args = "-g"
++
++    cpp_test = subprocess.Popen([cxx, cxx_args, '-x', 'c++', '-std=c++11', '-'],
+                                 stdin=PIPE,
+                                 stdout=PIPE,
+                                 stderr=PIPE)
+@@ -87,7 +90,7 @@ def check_linker_need_libatomic():
+     # Double-check to see if -latomic actually can solve the problem.
+     # https://github.com/grpc/grpc/issues/22491
+     cpp_test = subprocess.Popen(
+-        [cxx, '-x', 'c++', '-std=c++11', '-latomic', '-'],
++        [cxx, cxx_args, '-x', 'c++', '-std=c++11', '-latomic', '-'],
+         stdin=PIPE,
+         stdout=PIPE,
+         stderr=PIPE)
+--
+2.30.1
+
diff --git a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.14.1.bb b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.14.1.bb
deleted file mode 100644
index 2da1a4df03..0000000000
--- a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.14.1.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-inherit setuptools3
-require python-grpcio-tools.inc
diff --git a/meta-python/recipes-devtools/python/python-grpcio-tools.inc b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.35.0.bb
similarity index 63%
rename from meta-python/recipes-devtools/python/python-grpcio-tools.inc
rename to meta-python/recipes-devtools/python/python3-grpcio-tools_1.35.0.bb
index 6675f904c1..0063b4b0ef 100644
--- a/meta-python/recipes-devtools/python/python-grpcio-tools.inc
+++ b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.35.0.bb
@@ -8,9 +8,10 @@ RDEPENDS_${PN} = "${PYTHON_PN}-grpcio"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=7145f7cdd263359b62d342a02f005515"

-inherit pypi
+inherit pypi setuptools3

-SRC_URI[md5sum] = "b2fabfb54c7824c1e49a02de2aa6628e"
-SRC_URI[sha256sum] = "4ce5aa660d7884f23aac1eafa93b97a4c3e2b512edff871e91fdb6ee86ebd5ea"
+SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch"
+
+SRC_URI[sha256sum] = "9e2a41cba9c5a20ae299d0fdd377fe231434fa04cbfbfb3807293c6ec10b03cf"

 BBCLASSEXTEND = "native nativesdk"
--
2.30.1





Re: [meta-python][PATCH 1/2] python3-grpcio: Upgrade to 1.35.0

Trevor Gamblin
 


On 2021-02-17 4:58 p.m., Khem Raj wrote:
[Please note: This e-mail is from an EXTERNAL e-mail address]

Drop 0001-Fix-build-on-riscv32.patch, its upstreamed
Forward port rest of the patches
Use OPENSSL_NO_ASM with clang

Signed-off-by: Khem Raj <raj.khem@...>
Acked-by: Trevor Gamblin <trevor.gamblin@...>
---
 .../0001-Fix-build-on-riscv32.patch           | 65 --------------
 ...-Do-not-mix-C-and-C-compiler-options.patch | 86 ++++++++++---------
 .../ppc-boringssl-support.patch               |  4 +-
 .../python3-grpcio/riscv64_support.patch      |  4 +-
 ...cio_1.27.1.bb => python3-grpcio_1.35.0.bb} |  9 +-
 5 files changed, 53 insertions(+), 115 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch
 rename meta-python/recipes-devtools/python/{python3-grpcio_1.27.1.bb => python3-grpcio_1.35.0.bb} (75%)

diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch
deleted file mode 100644
index 920fc1169d..0000000000
--- a/meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 04e28fdda03b545a0f7b446a784ec2fa7249cbb8 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@...>
-Date: Wed, 29 Apr 2020 15:37:40 -0700
-Subject: [PATCH] Fix build on riscv32
-
-Define __NR_mmap in terms of __NR_mmap2 and __NR_futex interms of
-__NR_futex_time64 for rv32, since there calls dont exist for rv32
-
-Also recognise rv32 as a new 32bit platform
-
-Upstream-Status: Submitted [https://github.com/abseil/abseil-cpp/pull/675]
-Signed-off-by: Khem Raj <raj.khem@...>
----
- absl/base/internal/direct_mmap.h        | 5 +++++
- absl/base/internal/spinlock_linux.inc   | 4 ++++
- absl/synchronization/internal/waiter.cc | 4 ++++
- 3 files changed, 13 insertions(+)
-
---- a/third_party/abseil-cpp/absl/base/internal/direct_mmap.h
-+++ b/third_party/abseil-cpp/absl/base/internal/direct_mmap.h
-@@ -26,6 +26,10 @@
-
- #ifdef __linux__
-
-+#if !defined(__NR_mmap) && defined(__riscv) && __riscv_xlen == 32
-+# define __NR_mmap __NR_mmap2
-+#endif
-+
- #include <sys/types.h>
- #ifdef __BIONIC__
- #include <sys/syscall.h>
-@@ -72,6 +76,7 @@ inline void* DirectMmap(void* start, siz
- #if defined(__i386__) || defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) || \
-     (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                   \
-     (defined(__PPC__) && !defined(__PPC64__)) ||                             \
-+    (defined(__riscv) && __riscv_xlen == 32)  ||                             \
-     (defined(__s390__) && !defined(__s390x__))
-   // On these architectures, implement mmap with mmap2.
-   static int pagesize = 0;
---- a/third_party/abseil-cpp/absl/base/internal/spinlock_linux.inc
-+++ b/third_party/abseil-cpp/absl/base/internal/spinlock_linux.inc
-@@ -14,6 +14,10 @@
- //
- // This file is a Linux-specific part of spinlock_wait.cc
-
-+#if !defined(__NR_futex) && defined(__riscv) && __riscv_xlen == 32
-+# define __NR_futex __NR_futex_time64
-+#endif
-+
- #include <linux/futex.h>
- #include <sys/syscall.h>
- #include <unistd.h>
---- a/third_party/abseil-cpp/absl/synchronization/internal/waiter.cc
-+++ b/third_party/abseil-cpp/absl/synchronization/internal/waiter.cc
-@@ -24,6 +24,10 @@
- #include <unistd.h>
- #endif
-
-+#if !defined(__NR_futex) && defined(__riscv) && __riscv_xlen == 32
-+# define __NR_futex __NR_futex_time64
-+#endif
-+
- #ifdef __linux__
- #include <linux/futex.h>
- #include <sys/syscall.h>
diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch
index bff50a0a11..373669461b 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch
+++ b/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch
@@ -1,26 +1,18 @@
-From 2ef8a85933f3ac36b289979ff9edd49dd12d0d16 Mon Sep 17 00:00:00 2001
+From de10fbc2386dcac3ab810c49b6977b2ee01bf426 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@...>
-Date: Fri, 4 Aug 2017 09:04:07 -0700
+Date: Wed, 17 Feb 2021 13:30:23 -0800
 Subject: [PATCH] setup.py: Do not mix C and C++ compiler options

 EXTRA_ENV_COMPILE_ARGS is used both with CC and CXX
 so using -std=c++11 or -std=gnu99 together will cause
 build time errors espcially with clang

-error: invalid argument '-std=gnu99' not allowed with 'C++'
-
-gcc7 ( defaults are -std=gnu11 and -std=gnu++14 )
- as well clang default to these standards mode or newer
-anyway
-
-Signed-off-by: Khem Raj <raj.khem@...>
-
-1. Keep '-std=c++11' and '-std=gnu99' to fix native build error
+Keep '-std=c++11' to fix native build error
 with old gcc (such as gcc 5.4.0 on ubuntu 16.04), for clang
 we will remove them through GRPC_PYTHON_CFLAGS at do_compile
 in bb recipe.

-2. While export CC="gcc ", cc_args is None, it will
+While export CC="gcc ", cc_args is None, it will
 cause subprocess.Popen always return 1. On centos 8, if you don't
 install package libatomic, there will be a native build error
 `cannot find /usr/lib64/libatomic.so.1.2.0'.
@@ -28,47 +20,57 @@ install package libatomic, there will be a native build error
 Add no harm '-g' to cc_args if cc_args is empty.

 Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Khem Raj <raj.khem@...>
 Signed-off-by: Hongxu Jia <hongxu.jia@...>
 ---
- setup.py                      | 6 +++++-
+ setup.py                      | 9 ++++++---
  src/python/grpcio/commands.py | 5 ++++-
- 2 files changed, 9 insertions(+), 2 deletions(-)
+ 2 files changed, 10 insertions(+), 4 deletions(-)

 diff --git a/setup.py b/setup.py
-index e950057..1b68221 100644
+index 4b8c9d4..271b7b1 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -144,9 +144,13 @@ ENABLE_DOCUMENTATION_BUILD = os.environ.get(
-
- def check_linker_need_libatomic():
-   """Test if linker on system needs libatomic."""
-+  compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc'
-+  if not cc_args:
-+      cc_args = "-g"
+@@ -172,8 +172,11 @@ def check_linker_need_libatomic():
+     """Test if linker on system needs libatomic."""
+     code_test = (b'#include <atomic>\n' +
+                  b'int main() { return std::atomic<int64_t>{}; }')
+-    cxx = os.environ.get('CXX', 'c++')
+-    cpp_test = subprocess.Popen([cxx, '-x', 'c++', '-std=c++11', '-'],
++    cxx, cxx_args = os.environ.get('CXX').split(' ', 1) or 'c++'
++    if not cxx_args:
++      cxx_args = "-g"
 +
-   code_test = (b'#include <atomic>\n' +
-                b'int main() { return std::atomic<int64_t>{}; }')
--  cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'],
-+  cc_test = subprocess.Popen([compiler, cc_args, '-x', 'c++', '-std=c++11', '-'],
-                              stdin=PIPE,
-                              stdout=PIPE,
-                              stderr=PIPE)
++    cpp_test = subprocess.Popen([cxx, cxx_args, '-x', 'c++', '-std=c++11', '-'],
+                                 stdin=PIPE,
+                                 stdout=PIPE,
+                                 stderr=PIPE)
+@@ -183,7 +186,7 @@ def check_linker_need_libatomic():
+     # Double-check to see if -latomic actually can solve the problem.
+     # https://github.com/grpc/grpc/issues/22491
+     cpp_test = subprocess.Popen(
+-        [cxx, '-x', 'c++', '-std=c++11', '-latomic', '-'],
++        [cxx, cxx_args, '-x', 'c++', '-std=c++11', '-latomic', '-'],
+         stdin=PIPE,
+         stdout=PIPE,
+         stderr=PIPE)
 diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py
-index 064dda9..a75d8b9 100644
+index a8b2ff5..b928201 100644
 --- a/src/python/grpcio/commands.py
 +++ b/src/python/grpcio/commands.py
-@@ -216,7 +216,10 @@ class BuildExt(build_ext.build_ext):
-             when invoked in C mode. GCC is okay with this, while clang is not.
+@@ -219,7 +219,10 @@ class BuildExt(build_ext.build_ext):
              """
-             # TODO(lidiz) Remove the generated a.out for success tests.
--            cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++11', '-'],
-+            compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc'
-+            if not cc_args:
-+                cc_args = "-g"
-+            cc_test = subprocess.Popen([compiler, cc_args, '-x', 'c', '-std=c++11', '-'],
-                                        stdin=subprocess.PIPE,
-                                        stdout=subprocess.PIPE,
-                                        stderr=subprocess.PIPE)
+             try:
+                 # TODO(lidiz) Remove the generated a.out for success tests.
+-                cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++11', '-'],
++                cc_test, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc'
++                if not cc_args:
++                    cc_args = "-g"
++                cc_test = subprocess.Popen([cc_test, cc_args, '-x', 'c', '-std=c++11', '-'],
+                                            stdin=subprocess.PIPE,
+                                            stdout=subprocess.PIPE,
+                                            stderr=subprocess.PIPE)
 --
-2.7.4
+2.30.1

diff --git a/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch b/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch
index 8ac2aef8c4..dadd3da85e 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch
+++ b/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch
@@ -3,8 +3,8 @@ Let boringSSL compile on ppc32 bit
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@...>

---- a/third_party/boringssl/include/openssl/base.h
-+++ b/third_party/boringssl/include/openssl/base.h
+--- a/third_party/boringssl-with-bazel/src/include/openssl/base.h
++++ b/third_party/boringssl-with-bazel/src/include/openssl/base.h
 @@ -99,6 +99,9 @@ extern "C" {
  #elif (defined(__PPC64__) || defined(__powerpc64__)) && defined(_LITTLE_ENDIAN)
  #define OPENSSL_64_BIT
diff --git a/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch b/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch
index 8c9ffa21b7..7e071ae1e6 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch
+++ b/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch
@@ -2,8 +2,8 @@ Add RISC-V 64bit support

 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@...>
---- a/third_party/boringssl/include/openssl/base.h
-+++ b/third_party/boringssl/include/openssl/base.h
+--- a/third_party/boringssl-with-bazel/src/include/openssl/base.h
++++ b/third_party/boringssl-with-bazel/src/include/openssl/base.h
 @@ -108,6 +108,14 @@ extern "C" {
  #elif defined(__mips__) && defined(__LP64__)
  #define OPENSSL_64_BIT
diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.35.0.bb
similarity index 75%
rename from meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb
rename to meta-python/recipes-devtools/python/python3-grpcio_1.35.0.bb
index 129bb35bcc..198f548fa7 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb
+++ b/meta-python/recipes-devtools/python/python3-grpcio_1.35.0.bb
@@ -9,10 +9,8 @@ DEPENDS += "${PYTHON_PN}-protobuf"
 SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch"
 SRC_URI_append_class-target = " file://ppc-boringssl-support.patch \
                                 file://riscv64_support.patch \
-                                file://0001-Fix-build-on-riscv32.patch \
 "
-SRC_URI[md5sum] = "ccaf4e7eb4f031d926fb80035d193b98"
-SRC_URI[sha256sum] = "a899725d34769a498ecd3be154021c4368dd22bdc69473f6ec46779696f626c4"
+SRC_URI[sha256sum] = "7bd0ebbb14dde78bf66a1162efd29d3393e4e943952e2f339757aa48a184645c"

 RDEPENDS_${PN} = "${PYTHON_PN}-protobuf \
                   ${PYTHON_PN}-setuptools \
@@ -24,8 +22,11 @@ inherit pypi

 export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY = "1"

+# Disable asm in openssl due to use of gnu asm see
+# third_party/boringssl-with-bazel/src/crypto/hrss/asm/poly_rq_mul.S
+# this can only compile with gcc
 do_compile_prepend_toolchain-clang() {
-    export GRPC_PYTHON_CFLAGS='-fvisibility=hidden -fno-wrapv -fno-exceptions'
+    export GRPC_PYTHON_CFLAGS='-fvisibility=hidden -fno-wrapv -fno-exceptions -DOPENSSL_NO_ASM'
 }

 CLEANBROKEN = "1"
--
2.30.1





Re: [PATCH][meta-python v2] python3-intelhex: add recipe for the intelhex package

Trevor Gamblin
 


On 2021-02-17 6:30 a.m., Ross Burton wrote:
[Please note: This e-mail is from an EXTERNAL e-mail address]

Signed-off-by: Ross Burton <ross.burton@...>
Acked-by: Trevor Gamblin <trevor.gamblin@...>
---
 .../packagegroups/packagegroup-meta-python.bb          |  1 +
 .../recipes-devtools/python/python3-intelhex_2.3.0.bb  | 10 ++++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 meta-python/recipes-devtools/python/python3-intelhex_2.3.0.bb

diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
index e31b0b8b40..635dee1942 100644
--- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
+++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
@@ -170,6 +170,7 @@ RDEPENDS_packagegroup-meta-python3 = "\
     python3-imageio \
     python3-incremental \
     python3-inflection \
+    python3-intelhex \
     python3-intervals \
     python3-ipaddress \
     python3-ipy \
diff --git a/meta-python/recipes-devtools/python/python3-intelhex_2.3.0.bb b/meta-python/recipes-devtools/python/python3-intelhex_2.3.0.bb
new file mode 100644
index 0000000000..befcb34780
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-intelhex_2.3.0.bb
@@ -0,0 +1,10 @@
+SUMMARY = "Python library for Intel HEX files manipulations"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4eba844696655c3eae07aca8e3a94772"
+
+SRC_URI[sha256sum] = "892b7361a719f4945237da8ccf754e9513db32f5628852785aea108dcd250093"
+
+inherit pypi setuptools3
+
+BBCLASSEXTEND = "native nativesdk"
+
--
2.25.1





[meta-python2][dunfell][PATCH] python: Add fix for CVE-2019-20907

Rahul Taya
 

For python and python-native added patch to fix
CVE-2019-20907

Signed-off-by: Rahul Taya <Rahul.Taya@...>
---
recipes-devtools/python/python.inc | 1 +
.../python/python/CVE-2019-20907.patch | 53 +++++++++++++++++++
2 files changed, 54 insertions(+)
create mode 100644 recipes-devtools/python/python/CVE-2019-20907.patch

diff --git a/recipes-devtools/python/python.inc b/recipes-devtools/python/python.inc
index a4ba0c5..4bf30ee 100644
--- a/recipes-devtools/python/python.inc
+++ b/recipes-devtools/python/python.inc
@@ -8,6 +8,7 @@ INC_PR = "r1"
LIC_FILES_CHKSUM = "file://LICENSE;md5=203a6dbc802ee896020a47161e759642"

SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
+ file://CVE-2019-20907.patch \
"

SRC_URI[sha256sum] = "b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43"
diff --git a/recipes-devtools/python/python/CVE-2019-20907.patch b/recipes-devtools/python/python/CVE-2019-20907.patch
new file mode 100644
index 0000000..4c24c53
--- /dev/null
+++ b/recipes-devtools/python/python/CVE-2019-20907.patch
@@ -0,0 +1,53 @@
+From f5481db4bebf9d53b79f29f960f4188af8ccdfde Mon Sep 17 00:00:00 2001
+From: Rishi <rishi_devan@...>
+Date: Wed, 15 Jul 2020 13:51:00 +0200
+Subject: [PATCH] bpo-39017: Avoid infinite loop in the tarfile module
+ (GH-21454)
+
+Avoid infinite loop when reading specially crafted TAR files using the tarfile module
+(CVE-2019-20907).
+---
+ Lib/tarfile.py | 2 ++
+ Lib/test/test_tarfile.py | 7 +++++++
+ 2 files changed, 9 insertions(+)
+
+Upstream-Status: Backport[https://github.com/xzy3/cpython/commit/f5481db4bebf9d53b79f29f960f4188af8ccdfde.patch]
+CVE: CVE-2019-20907
+Link: https://github.com/xzy3/cpython/commit/f5481db4bebf9d53b79f29f960f4188af8ccdfde.patch
+Comment: Second hunk refreshed and from the original patch skipped changes for files
+Lib/test/recursion.tar and Misc/NEWS.d/next/Library/2020-07-12-22-16-58.bpo-39017.x3Cg-9.rst
+as these files are not present in our source code.
+
+diff --git a/Lib/tarfile.py b/Lib/tarfile.py
+index e2b60532f693d..6769066cabd6f 100755
+--- a/Lib/tarfile.py
++++ b/Lib/tarfile.py
+@@ -1249,6 +1249,8 @@ def _proc_pax(self, tarfile):
+
+ length, keyword = match.groups()
+ length = int(length)
++ if length == 0:
++ raise InvalidHeaderError("invalid header")
+ value = buf[match.end(2) + 1:match.start(1) + length - 1]
+
+ # Normally, we could just use "utf-8" as the encoding and "strict"
+
+
+diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
+index 89bd738..c61d02b 100644
+--- a/Lib/test/test_tarfile.py
++++ b/Lib/test/test_tarfile.py
+@@ -321,6 +321,13 @@ class CommonReadTest(ReadTest):
+ with self.assertRaisesRegexp(tarfile.ReadError, "unexpected end of data"):
+ tar.extractfile(t).read()
+
++ def test_length_zero_header(self):
++ # bpo-39017 (CVE-2019-20907): reading a zero-length header should fail
++ # with an exception
++ with self.assertRaisesRegex(tarfile.ReadError, "file could not be opened successfully"):
++ with tarfile.open(support.findfile('recursion.tar')) as tar:
++ pass
++
+
+ class MiscReadTest(CommonReadTest):
+ taropen = tarfile.TarFile.taropen
--
2.17.1

This message contains information that may be privileged or confidential and is the property of the KPIT Technologies Ltd. It is intended only for the person to whom it is addressed. If you are not the intended recipient, you are not authorized to read, print, retain copy, disseminate, distribute, or use this message or any part thereof. If you receive this message in error, please notify the sender immediately and delete all copies of this message. KPIT Technologies Ltd. does not accept any liability for virus infected mails.


[meta-python2][dunfell][PATCH] python: Add fix for CVE-2019-9674

Rahul Taya
 


[PATCH v2] recipes: Update common-licenses references to match new names

Khem Raj
 

The licenses were renamed to match their SPDX names, fix the
references in LIC_FILES_CHKSUM

Signed-off-by: Khem Raj <raj.khem@...>
---
meta-networking/recipes-connectivity/samba/samba_4.10.18.bb | 4 ++--
meta-networking/recipes-support/arptables/arptables_git.bb | 2 +-
meta-networking/recipes-support/ncp/ncp_1.2.4.bb | 2 +-
.../recipes-devtools/android-tools/android-tools_5.1.1.r37.bb | 2 +-
.../recipes-extended/inputattach-config/inputattach-config.bb | 2 +-
.../gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb | 4 ++--
.../recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb | 2 +-
meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb | 2 +-
meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb | 4 ++--
meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb | 2 +-
10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb b/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb
index 1a982368ec..ebe71ce5cb 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb
@@ -3,8 +3,8 @@ SECTION = "console/network"

LICENSE = "GPL-3.0+ & LGPL-3.0+ & GPL-2.0+"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
- file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \
- file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 "
+ file://${COREBASE}/meta/files/common-licenses/LGPL-3.0-or-later;md5=bfccfe952269fff2b407dd11f2f3083b \
+ file://${COREBASE}/meta/files/common-licenses/GPL-2.0-or-later;md5=801f80980d171dd6425610833a22dbe6 "

SAMBA_MIRROR = "http://samba.org/samba/ftp"
MIRRORS += "\
diff --git a/meta-networking/recipes-support/arptables/arptables_git.bb b/meta-networking/recipes-support/arptables/arptables_git.bb
index c02a19944d..5afec7663a 100644
--- a/meta-networking/recipes-support/arptables/arptables_git.bb
+++ b/meta-networking/recipes-support/arptables/arptables_git.bb
@@ -1,7 +1,7 @@
SUMMARY = "Administration tool for arp packet filtering"
SECTION = "net"
LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
SRCREV = "efae8949e31f8b2eb6290f377a28384cecaf105a"
PV = "0.0.5+git${SRCPV}"

diff --git a/meta-networking/recipes-support/ncp/ncp_1.2.4.bb b/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
index f42223b1f8..a2f0ccc069 100644
--- a/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
+++ b/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
@@ -4,7 +4,7 @@ security or integrity checking, no throttling, no features, except \
one: you don't have to type the coordinates of your peer."
HOMEPAGE = "http://www.fefe.de/ncp"
LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
DEPENDS = "libowfat"

SRC_URI = "https://dl.fefe.de/${BP}.tar.bz2"
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
index ae1463942a..d93a7f7239 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
+++ b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
@@ -3,7 +3,7 @@ SECTION = "console/utils"
LICENSE = "Apache-2.0 & GPL-2.0 & BSD-2-Clause & BSD-3-Clause"
LIC_FILES_CHKSUM = " \
file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10 \
- file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \
+ file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6 \
file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=cb641bc04cda31daea161b1bc15da69f \
file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \
"
diff --git a/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb b/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb
index 68beec670b..3933355abf 100644
--- a/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb
+++ b/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb
@@ -1,6 +1,6 @@
SUMMARY = "inputattach configuration file"
LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"

SRC_URI = "file://inputattach.conf"

diff --git a/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb b/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb
index d6da51b0de..f7fbedd6e0 100644
--- a/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb
+++ b/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb
@@ -3,8 +3,8 @@ DESCRIPTION = "This recipe provides m4 macros from gnome-doc-utils project, so \
that dependent recipes can build. Gnome-doc-utils itself is no longer packaged because \
it requires libxml2 and python 2 at the same time, which can no longer be satisfied. "
LICENSE = "GPLv2 & LGPLv2.1"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \
- file://${COREBASE}/meta/files/common-licenses/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6 \
+ file://${COREBASE}/meta/files/common-licenses/LGPL-2.1-only;md5=1a6d268fd218675ffea8be556788b780"
SRC_URI = "file://gnome-doc-utils.m4"

PROVIDES = "gnome-doc-utils"
diff --git a/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb b/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb
index 25e01fac0c..fc185da453 100644
--- a/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb
+++ b/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb
@@ -12,7 +12,7 @@ SECTION = "libs"
LICENSE = "Artistic-1.0 | GPL-1.0+"

LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \
-file://${COMMON_LICENSE_DIR}/GPL-1.0;md5=e9e36a9de734199567a4d769498f743d"
+file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=e9e36a9de734199567a4d769498f743d"

SRC_URI = "${CPAN_MIRROR}/authors/id/R/RE/REHSACK/Config-AutoConf-${PV}.tar.gz"

diff --git a/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb b/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb
index 3678ad7621..f989f8c873 100644
--- a/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb
+++ b/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb
@@ -9,7 +9,7 @@ LICENSE = "Artistic-1.0 | GPL-1.0+"
HOMEPAGE= "https://metacpan.org/release/File-Slurper"

LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \
-file://${COMMON_LICENSE_DIR}/GPL-1.0;md5=e9e36a9de734199567a4d769498f743d"
+file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=e9e36a9de734199567a4d769498f743d"

SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEONT/File-Slurper-${PV}.tar.gz"

diff --git a/meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb b/meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb
index a1bb4a399e..4b30d2098b 100644
--- a/meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb
+++ b/meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb
@@ -24,8 +24,8 @@ RDEPENDS_${PN} += "\

SRC_URI = "${CPAN_MIRROR}/authors/id/R/RE/REHSACK/Unix-Statgrab-${PV}.tar.gz"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \
- file://${COMMON_LICENSE_DIR}/GPL-1.0;md5=e9e36a9de734199567a4d769498f743d \
- file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
+ file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=e9e36a9de734199567a4d769498f743d \
+ file://${COMMON_LICENSE_DIR}/LGPL-2.1-or-later;md5=1a6d268fd218675ffea8be556788b780 \
"

SRC_URI[md5sum] = "a6bc06b3f7749f7d77a2b1bd13402821"
diff --git a/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb b/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb
index f2dda194dc..b946d3f744 100644
--- a/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb
+++ b/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb
@@ -15,7 +15,7 @@ LICENSE = "Artistic-1.0 | GPL-1.0+"
HOMEPAGE= "https://metacpan.org/release/Test-Warnings"

LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \
-file://${COMMON_LICENSE_DIR}/GPL-1.0;md5=e9e36a9de734199567a4d769498f743d"
+file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=e9e36a9de734199567a4d769498f743d"

SRC_URI = "https://cpan.metacpan.org/authors/id/E/ET/ETHER/Test-Warnings-${PV}.tar.gz"

--
2.30.1


[PATCH] recipes: Update LICENSE fields to match new names

Khem Raj
 

The licenses were renamed to match their SPDX names, fix the
references in LICENSE.

Signed-off-by: Khem Raj <raj.khem@...>
---
meta-networking/recipes-connectivity/samba/samba_4.10.18.bb | 2 +-
meta-networking/recipes-support/arptables/arptables_git.bb | 2 +-
meta-networking/recipes-support/ncp/ncp_1.2.4.bb | 2 +-
.../recipes-devtools/android-tools/android-tools_5.1.1.r37.bb | 2 +-
.../recipes-extended/inputattach-config/inputattach-config.bb | 2 +-
.../gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb | 2 +-
.../recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb | 2 +-
meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb | 2 +-
meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb | 2 +-
meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb b/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb
index 1a982368ec..ee195c57ac 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb
@@ -1,7 +1,7 @@
HOMEPAGE = "https://www.samba.org/"
SECTION = "console/network"

-LICENSE = "GPL-3.0+ & LGPL-3.0+ & GPL-2.0+"
+LICENSE = "GPL-3.0-or-later & LGPL-3.0-or-later & GPL-2.0-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \
file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 "
diff --git a/meta-networking/recipes-support/arptables/arptables_git.bb b/meta-networking/recipes-support/arptables/arptables_git.bb
index c02a19944d..2dadd507a9 100644
--- a/meta-networking/recipes-support/arptables/arptables_git.bb
+++ b/meta-networking/recipes-support/arptables/arptables_git.bb
@@ -1,6 +1,6 @@
SUMMARY = "Administration tool for arp packet filtering"
SECTION = "net"
-LICENSE = "GPL-2.0"
+LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
SRCREV = "efae8949e31f8b2eb6290f377a28384cecaf105a"
PV = "0.0.5+git${SRCPV}"
diff --git a/meta-networking/recipes-support/ncp/ncp_1.2.4.bb b/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
index f42223b1f8..a94aa36b19 100644
--- a/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
+++ b/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "ncp is a utility for copying files in a LAN. It has absolutely no
security or integrity checking, no throttling, no features, except \
one: you don't have to type the coordinates of your peer."
HOMEPAGE = "http://www.fefe.de/ncp"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
DEPENDS = "libowfat"

diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
index ae1463942a..a44710c8fe 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
+++ b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Different utilities from Android"
SECTION = "console/utils"
-LICENSE = "Apache-2.0 & GPL-2.0 & BSD-2-Clause & BSD-3-Clause"
+LICENSE = "Apache-2.0 & GPL-2.0-only & BSD-2-Clause & BSD-3-Clause"
LIC_FILES_CHKSUM = " \
file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10 \
file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \
diff --git a/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb b/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb
index 68beec670b..000d2da535 100644
--- a/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb
+++ b/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb
@@ -1,5 +1,5 @@
SUMMARY = "inputattach configuration file"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"

SRC_URI = "file://inputattach.conf"
diff --git a/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb b/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb
index d6da51b0de..bc00caff0f 100644
--- a/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb
+++ b/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb
@@ -2,7 +2,7 @@ SUMMARY = "Stub implementation of gnome-doc-utils"
DESCRIPTION = "This recipe provides m4 macros from gnome-doc-utils project, so \
that dependent recipes can build. Gnome-doc-utils itself is no longer packaged because \
it requires libxml2 and python 2 at the same time, which can no longer be satisfied. "
-LICENSE = "GPLv2 & LGPLv2.1"
+LICENSE = "GPL-2.0-only & LGPL-2.1-only"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \
file://${COREBASE}/meta/files/common-licenses/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780"
SRC_URI = "file://gnome-doc-utils.m4"
diff --git a/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb b/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb
index 25e01fac0c..dc8bdacfe6 100644
--- a/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb
+++ b/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb
@@ -9,7 +9,7 @@ Shell developers."
HOMEPAGE= "https://metacpan.org/release/Config-AutoConf"

SECTION = "libs"
-LICENSE = "Artistic-1.0 | GPL-1.0+"
+LICENSE = "Artistic-1.0 | GPL-1.0-or-later"

LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \
file://${COMMON_LICENSE_DIR}/GPL-1.0;md5=e9e36a9de734199567a4d769498f743d"
diff --git a/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb b/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb
index 3678ad7621..026c7a713f 100644
--- a/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb
+++ b/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb
@@ -4,7 +4,7 @@ All functions are optionally exported. All functions throw exceptions on \
errors, write functions don't return any meaningful value."

SECTION = "libs"
-LICENSE = "Artistic-1.0 | GPL-1.0+"
+LICENSE = "Artistic-1.0 | GPL-1.0-or-later"

HOMEPAGE= "https://metacpan.org/release/File-Slurper"

diff --git a/meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb b/meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb
index a1bb4a399e..c573a2f9bf 100644
--- a/meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb
+++ b/meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb
@@ -7,7 +7,7 @@ etc."

HOMEPAGE = "https://metacpan.org/release/Unix-Statgrab"
SECTION = "libs"
-LICENSE = "Artistic-1.0 | GPL-1.0+ | LGPL-2.1+"
+LICENSE = "Artistic-1.0 | GPL-1.0-or-later | LGPL-2.1-or-later"
DEPENDS += "libcapture-tiny-perl-native"
DEPENDS += "libconfig-autoconf-perl-native"
DEPENDS += "libstatgrab"
diff --git a/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb b/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb
index f2dda194dc..324c14bfe5 100644
--- a/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb
+++ b/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb
@@ -10,7 +10,7 @@ be calculated *before* the warnings test is run, resulting in a TAP error. \
demonstration.)"

SECTION = "libs"
-LICENSE = "Artistic-1.0 | GPL-1.0+"
+LICENSE = "Artistic-1.0 | GPL-1.0-or-later"

HOMEPAGE= "https://metacpan.org/release/Test-Warnings"

--
2.30.1


[meta-oe][PATCH] liburing: Do not build examples on risc/musl

Khem Raj
 

it needs ucontext for building examples and its not implemented yet for
riscv

Signed-off-by: Khem Raj <raj.khem@...>
---
.../liburing/0001-do-not-build-examples.patch | 30 +++++++++++++++++++
.../recipes-support/liburing/liburing_0.7.bb | 7 ++++-
2 files changed, 36 insertions(+), 1 deletion(-)
create mode 100644 meta-oe/recipes-support/liburing/liburing/0001-do-not-build-examples.patch

diff --git a/meta-oe/recipes-support/liburing/liburing/0001-do-not-build-examples.patch b/meta-oe/recipes-support/liburing/liburing/0001-do-not-build-examples.patch
new file mode 100644
index 0000000000..19bf14708b
--- /dev/null
+++ b/meta-oe/recipes-support/liburing/liburing/0001-do-not-build-examples.patch
@@ -0,0 +1,30 @@
+From 3ee2f1e231bde18a99f86da747a9b8feca3c179d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@...>
+Date: Wed, 17 Feb 2021 19:18:16 -0800
+Subject: [PATCH] do not build examples
+
+examples need ucontext and some architectures on musl do not have it
+implemented e.g. riscv
+
+Upstream-Status: Inappropriate [Arch-Specific]
+
+Signed-off-by: Khem Raj <raj.khem@...>
+---
+ Makefile | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 948e004..8b63024 100644
+--- a/Makefile
++++ b/Makefile
+@@ -11,7 +11,6 @@ default: all
+ all:
+ @$(MAKE) -C src
+ @$(MAKE) -C test
+- @$(MAKE) -C examples
+
+ partcheck: all
+ @echo "make partcheck => TODO add tests with out kernel support"
+--
+2.30.1
+
diff --git a/meta-oe/recipes-support/liburing/liburing_0.7.bb b/meta-oe/recipes-support/liburing/liburing_0.7.bb
index e122a907cd..d79389a696 100644
--- a/meta-oe/recipes-support/liburing/liburing_0.7.bb
+++ b/meta-oe/recipes-support/liburing/liburing_0.7.bb
@@ -12,6 +12,9 @@ LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=d51b5805e2a675685e
SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https \
file://0001-test-Fix-build-on-32bit-architectures-with-6bit-time.patch \
"
+SRC_URI_append_libc-musl_riscv64 = " file://0001-do-not-build-examples.patch "
+SRC_URI_append_libc-musl_riscv32 = " file://0001-do-not-build-examples.patch "
+
SRCREV = "45f0735219a615ae848033c47c7e2d85d101d43e"
S = "${WORKDIR}/git"

@@ -20,7 +23,9 @@ XCFLAGS = "-pthread"
XCFLAGS_append_libc-musl = " -lucontext"

EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'LDFLAGS=${LDFLAGS}' 'XCFLAGS=${XCFLAGS}' 'BUILDDIR=${S}'"
-
+do_configure() {
+ ${S}/configure --prefix=${prefix}
+}
do_install () {
oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} INCLUDEDIR=${includedir}
}
--
2.30.1

9401 - 9420 of 98996