From patchwork Wed Jun 28 19:56:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 26634 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0FEFEB64DD for ; Wed, 28 Jun 2023 19:56:39 +0000 (UTC) Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by mx.groups.io with SMTP id smtpd.web10.153.1687982192969203168 for ; Wed, 28 Jun 2023 12:56:33 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=i8jiXXD1; spf=pass (domain: gmail.com, ip: 209.85.208.43, mailfrom: martin.jansa@gmail.com) Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-51bece5d935so7784723a12.1 for ; Wed, 28 Jun 2023 12:56:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687982191; x=1690574191; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=OKlvjeBVWFm611eUw9HMp5LOXc4fLX4kPkbQd6yTN88=; b=i8jiXXD16G8IRU8wrG+BD4BaNxTQc/SvAbGmnMM3W7Iq1qMhO3rxmfh5GLuUPj0PQi cu7DScOMeOd8Gafr6VOOUJHybsH7VOU8R+FkpnLgvN2pILxWNEIA8YPUzUVlTlXOg3zp bdywuuhiykoDod0fcLc5mE0NclfZHC9EB5vIfilI2n8k5lByuBaJpSE1fZXtT+wh6ty7 BA3ss1rLTVa8hZqv9ZzfkJhRADs9aZQcu/3AZsHx40qaYLGyd1It4FaaoGp/oiaKAewk PgVpWu7jFi02cPNe0uXt4OdNGYDblzX9NAjYzHKpcDb9c5zJD3UBYhAO8u6i8KSUZZ2z Trvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687982191; x=1690574191; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=OKlvjeBVWFm611eUw9HMp5LOXc4fLX4kPkbQd6yTN88=; b=jldBuVOHJXD7+5XLuGibn46a+ViyoiS7qOnYeOoX6hjxRS9jsGrPRc1pByNyu8ebSA XTHUKhg9NYkQyI8XwBXySDpIYHVAyOF/4geU87S/JmV4Olp1YT4Tm14RgNabQRPNwF/2 xW55mjczcW2Lh4aHFGP2KsPDFBVO27GsCX8h8dTNdSA2A1hyh9v7xezTQx+eN8z9YrQ4 2TlRTx5AxXkcO3sUDo0nhjY3A0Qfc2DSw5f1tuflej88Ha8tDg4RA/sFYbVGtsQKuLKs keaiC7bcLog6JheC+hq63da5DylcvylitcaJXQwcwLKG61eiIDde76S4VGoEAMTaknER OnOQ== X-Gm-Message-State: AC+VfDwmVJlTu4wPR4U6hJ7Y9a53ziWXCQh+CEqzxOxZThpC02LSNwwp T60YVKgMr7/EMPaW8NyMjOC/YmS8xg8= X-Google-Smtp-Source: ACHHUZ7zIOibBmPY6Y29rt8nM79rNvJsdUI2SVckEC2nMoB65mby7s4uvzbcX+R3G6bqBtO03++m3w== X-Received: by 2002:a17:907:2d26:b0:992:1bb2:61d9 with SMTP id gs38-20020a1709072d2600b009921bb261d9mr5507740ejc.54.1687982191011; Wed, 28 Jun 2023 12:56:31 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id ox27-20020a170907101b00b0098d66ce416esm6132900ejb.142.2023.06.28.12.56.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jun 2023 12:56:30 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-devel@lists.openembedded.org Cc: Martin Jansa Subject: [meta-oe][PATCH 1/3] nodejs: use PIE for host binaries Date: Wed, 28 Jun 2023 21:56:08 +0200 Message-ID: <20230628195610.744894-1-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 28 Jun 2023 19:56:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/103633 * mksnapshot is built as host binary, but then gets executed under qemu-arm, because for 32bit target we need to run 32bit mksnapshot even when building on x86-64 host * unfortunately since upgrade to qemu-8 in: https://git.openembedded.org/openembedded-core/commit/?id=fe8125565af07b73f9b29db2188ecb6e884bcc70 the mksnapshot fails to execute with: LD_LIBRARY_PATH=/OE/build/oe-core/tmp-glibc/work/cortexa8t2hf-neon-oe-linux-gnueabi/nodejs/18.16.0-r0/node-v18.16.0/out/Release/lib.host:/OE/build/oe-core/tmp-glibc/work/cortexa8t2hf-neon-oe-linux-gnueabi/nodejs/18.16.0-r0/node-v18.16.0/out/Release/lib.target:$LD_LIBRARY_PATH; export LD_LIBRARY_PATH; cd ../tools/v8_gypfiles; mkdir -p /OE/build/oe-core/tmp-glibc/work/cortexa8t2hf-neon-oe-linux-gnueabi/nodejs/18.16.0-r0/node-v18.16.0/out/Release/obj.target/v8_snapshot/geni; "/OE/build/oe-core/tmp-glibc/work/cortexa8t2hf-neon-oe-linux-gnueabi/nodejs/18.16.0-r0/node-v18.16.0/out/Release/v8-qemu-wrapper.sh" "/OE/build/oe-core/tmp-glibc/work/cortexa8t2hf-neon-oe-linux-gnueabi/nodejs/18.16.0-r0/node-v18.16.0/out/Release/mksnapshot" --turbo_instruction_scheduling "--target_os=linux" "--target_arch=arm" --startup_src "/OE/build/oe-core/tmp-glibc/work/cortexa8t2hf-neon-oe-linux-gnueabi/nodejs/18.16.0-r0/node-v18.16.0/out/Release/obj.target/v8_snapshot/geni/snapshot.cc" --embedded_variant Default --embedded_src "/OE/build/oe-core/tmp-glibc/work/cortexa8t2hf-neon-oe-linux-gnueabi/nodejs/18.16.0-r0/node-v18.16.0/out/Release/obj.target/v8_snapshot/geni/embedded.S" --no-native-code-counters # # Fatal process OOM in Failed to reserve virtual memory for CodeRange # /OE/build/oe-core/tmp-glibc/work/cortexa8t2hf-neon-oe-linux-gnueabi/nodejs/18.16.0-r0/node-v18.16.0/out/Release/v8-qemu-wrapper.sh: line 7: 669880 Trace/breakpoint trap (core dumped) PSEUDO_UNLOAD=1 qemu-arm -r 5.15 -L /OE/build/oe-core/tmp-glibc/work/cortexa8t2hf-neon-oe-linux-gnueabi/nodejs/18.16.0-r0/recipe-sysroot -E LD_LIBRARY_PATH=/OE/build/oe-core/tmp-glibc/work/cortexa8t2hf-neon-oe-linux-gnueabi/nodejs/18.16.0-r0/recipe-sysroot/usr/lib:/OE/build/oe-core/tmp-glibc/work/cortexa8t2hf-neon-oe-linux-gnueabi/nodejs/18.16.0-r0/recipe-sysroot/lib "$@" It was failing only in some of my builds first, in the end I was able to narrow the difference between the build where it fails and where it doesn't fail to require conf/distro/include/security_flags.inc then GCCPIE = "--enable-default-pie" and lastly this PIE enabled just for nodejs to work around this issue without downgrading qemu-native. * using -strace with qemu doesn't help much, just confirms that the OOM error message is really caused by failed mmap2: --- SIGPROF {si_signo=SIGPROF, si_code=SI_TKILL, si_pid=2908258, si_uid=1026} --- clock_gettime64(CLOCK_MONOTONIC,0x407ef640) = 0 ({tv_sec=20187,tv_nsec=678404286}) rt_sigreturn(0x407efb70) = -1 errno=513 (Successful exit from sigreturn) write(3,0x141e538,28) = 28 write(3,0x141e538,28) = 28 write(3,0x141e538,32) = 32 mmap2(0x0097a000,33554432,PROT_NONE,MAP_PRIVATE|MAP_ANONYMOUS|MAP_NORESERVE,-1,0) = -1 errno=12 (Cannot allocate memory) mmap2(0x0097a000,33554432,PROT_NONE,MAP_PRIVATE|MAP_ANONYMOUS|MAP_NORESERVE,-1,0) = -1 errno=12 (Cannot allocate memory) * diffoscope on this 1.7G binary didn't really help as it got killed by OOMK after a while Out of memory: Killed process 1136999 (diffoscope) total-vm:404300108kB, anon-rss:122594688kB, file-rss:512kB, shmem-rss:0kB, UID:1026 pgtables:764240kB oom_score_adj:0 Signed-off-by: Martin Jansa --- meta-oe/recipes-devtools/nodejs/nodejs_18.16.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_18.16.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_18.16.0.bb index 06631f27db..3adb51549e 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_18.16.0.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_18.16.0.bb @@ -79,9 +79,9 @@ PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" # and we need to use the right flags during host compile, # too. EXTRA_OEMAKE = "\ - CC.host='${CC}' \ + CC.host='${CC} -pie -fPIE' \ CFLAGS.host='${CPPFLAGS} ${CFLAGS}' \ - CXX.host='${CXX}' \ + CXX.host='${CXX} -pie -fPIE' \ CXXFLAGS.host='${CPPFLAGS} ${CXXFLAGS}' \ LDFLAGS.host='${LDFLAGS}' \ AR.host='${AR}' \ From patchwork Wed Jun 28 19:56:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 26635 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB2A6EB64D7 for ; Wed, 28 Jun 2023 19:56:39 +0000 (UTC) Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by mx.groups.io with SMTP id smtpd.web11.158.1687982193620422651 for ; Wed, 28 Jun 2023 12:56:33 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=ABG8YCcK; spf=pass (domain: gmail.com, ip: 209.85.218.48, mailfrom: martin.jansa@gmail.com) Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-991a8eba169so24299666b.2 for ; Wed, 28 Jun 2023 12:56:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687982192; x=1690574192; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vhUtctcKEMcj8OUKcLQLVaoSwMWpRVV3tQiGC+kft7E=; b=ABG8YCcKJPGkx7db5KuMkEtN5P1weRRyjb3v/6R2RBeohoX34oxBHjsll4ZNx9ZIJg Sdt+noGak4WtN2JILcJLaFvwG7AAhf4ZfehiTfhvAgvi2ht4VTP1+AkWY/q/i8hQHjTA a8A9pZEvyM6Ufm9NHnzqdtlu0xM6ckOWf0te64r3xf6TFon428hdOhmVfVxnWSpCUHlZ +9Vet+doZUB9g5qe7o36MGK6+R87PJvadM2RUc8FF3zcQvTfCBKdFub3BzA70fIA6u4j c0zhfVaxns1mwLieYlL8xUreOxkxABNRG0jj9ucUMVzgokEsjeHH6iNuSSBnBArJ7Ieb iZeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687982192; x=1690574192; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vhUtctcKEMcj8OUKcLQLVaoSwMWpRVV3tQiGC+kft7E=; b=bsd15HFL41RdnsaZGUSLqch0h0Gi5fMrHV0hhSoJtC84Ql4YYFRn7rxSVHij9X11mG uY0FTqnJQipAm5FoY53D+Ws/RIq/OYhr5KmJReMol8gVTtuDyLjZN2zDvek0IVN0Ygb4 NZ+qxmIQA0vLIzP9oOTGR+M4W9/xtdjv30H3ZZwldIrDgj61Jeyg5sq55kJMKTe2M1MZ /SN0iPOhRcRZjKusolIK+mT1tmwFmjoZQ/CT/xBgDQQU0bNxhO+cyxnGoZ3sEELkx+/S R6cZ0E7RfY0cBnFn+G3M59P9LJGW5CTyAwHfvGTzQH8QQ3dEKYH1VI0nvadlIAt+pXCE WgYQ== X-Gm-Message-State: AC+VfDztJXbnx/xrEaZHxw4EXUYCr4VDqP7K6aLZes5swFgVzmDcmxZH KttZtG0j0LMsvBoPmY1SqMCrFvSyfsk= X-Google-Smtp-Source: ACHHUZ4nfm1vvHwl0V72PyWsJwsXtHQpfw+GfkRcDpVGFFZuaBLaZp2uwhE//OQBcRe2YBK5frZkcA== X-Received: by 2002:a17:906:c359:b0:98d:63c5:d135 with SMTP id ci25-20020a170906c35900b0098d63c5d135mr14584826ejb.54.1687982191812; Wed, 28 Jun 2023 12:56:31 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id k25-20020a17090666d900b009821ce1ea33sm6053758ejp.7.2023.06.28.12.56.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jun 2023 12:56:31 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-devel@lists.openembedded.org Cc: Martin Jansa Subject: [meta-oe][PATCH 2/3] gupnp: backport a fix not to use deprecated xmlReadMemory Date: Wed, 28 Jun 2023 21:56:09 +0200 Message-ID: <20230628195610.744894-2-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230628195610.744894-1-Martin.Jansa@gmail.com> References: <20230628195610.744894-1-Martin.Jansa@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 28 Jun 2023 19:56:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/103634 * deprecated since libxml2-2.11 upgraded in oe-core in: https://git.openembedded.org/openembedded-core/commit/?id=24860598ba8557ea3a145f249938ea411f1ef1d8 * fixes: ../gupnp-1.4.1/libgupnp/gupnp-service-info.c: In function 'got_scpd_url': ../gupnp-1.4.1/libgupnp/gupnp-service-info.c:595:17: error: 'xmlRecoverMemory' is deprecated [-Werror=deprecated-declarations] 595 | scpd = xmlRecoverMemory (msg->response_body->data, | ^~~~ In file included from /OE/build/luneos-nanbield/webos-ports/tmp-glibc/work/cortexa8t2hf-neon-webos-linux-gnueabi/gupnp/1.4.1-r0/recipe-sysroot/usr/include/libxml2/libxml/globals.h:18, from /OE/build/luneos-nanbield/webos-ports/tmp-glibc/work/cortexa8t2hf-neon-webos-linux-gnueabi/gupnp/1.4.1-r0/recipe-sysroot/usr/include/libxml2/libxml/threads.h:35, from /OE/build/luneos-nanbield/webos-ports/tmp-glibc/work/cortexa8t2hf-neon-webos-linux-gnueabi/gupnp/1.4.1-r0/recipe-sysroot/usr/include/libxml2/libxml/xmlmemory.h:222, from /OE/build/luneos-nanbield/webos-ports/tmp-glibc/work/cortexa8t2hf-neon-webos-linux-gnueabi/gupnp/1.4.1-r0/recipe-sysroot/usr/include/libxml2/libxml/tree.h:1310, from ../gupnp-1.4.1/libgupnp/gupnp-service-introspection-private.h:12, from ../gupnp-1.4.1/libgupnp/gupnp-service-info.c:26: /OE/build/luneos-nanbield/webos-ports/tmp-glibc/work/cortexa8t2hf-neon-webos-linux-gnueabi/gupnp/1.4.1-r0/recipe-sysroot/usr/include/libxml2/libxml/parser.h:872:17: note: declared here 872 | xmlRecoverMemory (const char *buffer, | ^~~~~~~~~~~~~~~~ cc1: some warnings being treated as errors Signed-off-by: Martin Jansa --- .../0001-all-Drop-xmlRecoverMemory.patch | 107 ++++++++++++++++++ .../recipes-connectivity/gupnp/gupnp_1.4.1.bb | 4 +- 2 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-all-Drop-xmlRecoverMemory.patch diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-all-Drop-xmlRecoverMemory.patch b/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-all-Drop-xmlRecoverMemory.patch new file mode 100644 index 0000000000..a3941f345f --- /dev/null +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-all-Drop-xmlRecoverMemory.patch @@ -0,0 +1,107 @@ +From 46f13d9929c81ec2340a1a5d48f596b1892c5a81 Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Thu, 4 May 2023 19:14:29 +0200 +Subject: [PATCH] all: Drop xmlRecoverMemory + +use xmlReadMemory, also use NONET flat + +Signed-off-by: Martin Jansa +Upstream-Status: Backport [https://github.com/GNOME/gupnp/commit/80e68995b745a5900eaaa1d0c424d3a9d354e42d] +--- + libgupnp/gupnp-control-point.c | 7 +++++-- + libgupnp/gupnp-service-info.c | 7 +++++-- + libgupnp/gupnp-service-proxy-action.c | 7 +++++-- + libgupnp/gupnp-service-proxy.c | 7 +++++-- + libgupnp/gupnp-service.c | 7 +++++-- + 5 files changed, 25 insertions(+), 10 deletions(-) + +diff --git a/libgupnp/gupnp-control-point.c b/libgupnp/gupnp-control-point.c +index dc04732..99ebda5 100644 +--- a/libgupnp/gupnp-control-point.c ++++ b/libgupnp/gupnp-control-point.c +@@ -608,8 +608,11 @@ got_description_url (SoupSession *session, + xmlDoc *xml_doc; + + /* Parse response */ +- xml_doc = xmlRecoverMemory (msg->response_body->data, +- msg->response_body->length); ++ xml_doc = xmlReadMemory (msg->response_body->data, ++ msg->response_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + if (xml_doc) { + doc = gupnp_xml_doc_new (xml_doc); + +diff --git a/libgupnp/gupnp-service-info.c b/libgupnp/gupnp-service-info.c +index 9a9f4de..d468801 100644 +--- a/libgupnp/gupnp-service-info.c ++++ b/libgupnp/gupnp-service-info.c +@@ -592,8 +592,11 @@ got_scpd_url (G_GNUC_UNUSED SoupSession *session, + if (SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) { + xmlDoc *scpd; + +- scpd = xmlRecoverMemory (msg->response_body->data, +- msg->response_body->length); ++ scpd = xmlReadMemory (msg->response_body->data, ++ msg->response_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + if (scpd) { + introspection = gupnp_service_introspection_new (scpd); + +diff --git a/libgupnp/gupnp-service-proxy-action.c b/libgupnp/gupnp-service-proxy-action.c +index 4d9336c..ef8a808 100644 +--- a/libgupnp/gupnp-service-proxy-action.c ++++ b/libgupnp/gupnp-service-proxy-action.c +@@ -86,8 +86,11 @@ check_action_response (G_GNUC_UNUSED GUPnPServiceProxy *proxy, + } + + /* Parse response */ +- response = xmlRecoverMemory (action->msg->response_body->data, +- action->msg->response_body->length); ++ response = xmlReadMemory (action->msg->response_body->data, ++ action->msg->response_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + + if (!response) { + if (action->msg->status_code == SOUP_STATUS_OK) { +diff --git a/libgupnp/gupnp-service-proxy.c b/libgupnp/gupnp-service-proxy.c +index 25d5ef6..af2fd46 100644 +--- a/libgupnp/gupnp-service-proxy.c ++++ b/libgupnp/gupnp-service-proxy.c +@@ -1560,8 +1560,11 @@ server_handler (G_GNUC_UNUSED SoupServer *soup_server, + } + + /* Parse the actual XML message content */ +- doc = xmlRecoverMemory (msg->request_body->data, +- msg->request_body->length); ++ doc = xmlReadMemory (msg->request_body->data, ++ msg->request_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + if (doc == NULL) { + /* Failed */ + g_warning ("Failed to parse NOTIFY message body"); +diff --git a/libgupnp/gupnp-service.c b/libgupnp/gupnp-service.c +index 67b3d43..0ebfb26 100644 +--- a/libgupnp/gupnp-service.c ++++ b/libgupnp/gupnp-service.c +@@ -985,8 +985,11 @@ control_server_handler (SoupServer *server, + *end = '\0'; + + /* Parse action_node */ +- doc = xmlRecoverMemory (msg->request_body->data, +- msg->request_body->length); ++ doc = xmlReadMemory (msg->request_body->data, ++ msg->request_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + if (doc == NULL) { + soup_message_set_status (msg, SOUP_STATUS_BAD_REQUEST); + diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb index 708e3844ff..c21e7a05bf 100644 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb @@ -7,7 +7,9 @@ DEPENDS = "e2fsprogs gssdp libsoup-2.4 libxml2" inherit meson pkgconfig vala gobject-introspection -SRC_URI = "${GNOME_MIRROR}/${BPN}/1.4/${BPN}-${PV}.tar.xz" +SRC_URI = "${GNOME_MIRROR}/${BPN}/1.4/${BPN}-${PV}.tar.xz \ + file://0001-all-Drop-xmlRecoverMemory.patch \ +" SRC_URI[sha256sum] = "899196b5e66f03b8e25f046a7a658cd2a6851becb83f2d55345ab3281655dc0c" SYSROOT_PREPROCESS_FUNCS += "gupnp_sysroot_preprocess" From patchwork Wed Jun 28 19:56:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 26636 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC0FBEB64DA for ; Wed, 28 Jun 2023 19:56:39 +0000 (UTC) Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by mx.groups.io with SMTP id smtpd.web11.159.1687982194202317760 for ; Wed, 28 Jun 2023 12:56:34 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=rWikzjkM; spf=pass (domain: gmail.com, ip: 209.85.218.44, mailfrom: martin.jansa@gmail.com) Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-98d34f1e54fso20938666b.2 for ; Wed, 28 Jun 2023 12:56:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687982192; x=1690574192; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PD01dNSrE2GVG/yBgcWblVezBQNLxqLyR4+xajbunLQ=; b=rWikzjkM5drT3qxg3bBbJdyeLbrL8ZPgZvjTtpMsfIKwqMw20tJ3rV+l9SYw+VRSVt gQhZPQik65K7X5N0dwyPU4Y5fJ6pKrsNwTwxh8JJS5JMESKC7514Pd+l4H9A8XXvyfWD fr2aqR9rgilHN8KN9xUfgFgUyFn5pBNjsYPTUY4IogBzR9uF57514SCzpryL/5z9bfaR IIDmshTsdhJrdz6cslhbmVvCrXEKnb6c/2NvwmchALvNHlbK91S3qT5aET0geDYph52h 3WMqpwDhTd1fVsrzUXFs41lo6+1KkNWnAj9xG+A3lg+X+XP10qVV5SvWXc7BsvNvhf4S cE+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687982192; x=1690574192; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PD01dNSrE2GVG/yBgcWblVezBQNLxqLyR4+xajbunLQ=; b=iHgd1KZ0267/LlBuVYi5RL393iBGBCO2doGF+Yoxv7YmzChMhCE+k8ddF3DT5fGanU Ms+HHEyQAj0MOX+ZT1o5INcHmEHIV3Fr64zg62MOpIWeJ5fhWwp/lCtSAF54Slp6Bju1 2j2a+hMn5GmPvfytc730Z0F6Q3R9OuBIoPrVvRR6mkDR3PQvWC6iV4VeMoj3WEpKzInc 00Q14yghxiM9w9G9slrU1rp2jcqWb9Hx8Rg44qtpP5ga/dfAuN4HNH/IoIcFidS70z9L iE+c2FuLZ4sr0Vd0GAsYPib7IeAeYL6E6Kb6XrRW9xnyFypHvFbK/jyxRLrC9WncpCfc xuWw== X-Gm-Message-State: AC+VfDzMDONUL0qwGg3jeiwVu3JSTgnn5TjQsctQ5xShyiaTVu9TVnV8 82rc/Q+fzl3W8GdnpM1I5TeZmdfnM4Q= X-Google-Smtp-Source: ACHHUZ4zXgCSwuMZLq56heztHl6y8nIeeE1CD11QtuYsNp8EKWHXwqb+qhFwtmm3UGDheY1E6xQshg== X-Received: by 2002:a17:907:25c2:b0:978:8a30:aaf with SMTP id ae2-20020a17090725c200b009788a300aafmr26978942ejc.64.1687982192660; Wed, 28 Jun 2023 12:56:32 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id l16-20020a1709065a9000b00988be3c1d87sm6043562ejq.116.2023.06.28.12.56.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jun 2023 12:56:32 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-devel@lists.openembedded.org Cc: Martin Jansa Subject: [meta-oe][PATCH 3/3] pidgin-sipe: allow to build with libxml2-2.11 Date: Wed, 28 Jun 2023 21:56:10 +0200 Message-ID: <20230628195610.744894-3-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230628195610.744894-1-Martin.Jansa@gmail.com> References: <20230628195610.744894-1-Martin.Jansa@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 28 Jun 2023 19:56:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/103635 * deprecated since libxml2-2.11 upgraded in oe-core in: https://git.openembedded.org/openembedded-core/commit/?id=24860598ba8557ea3a145f249938ea411f1ef1d8 * avoids: | ../../../pidgin-sipe-1.25.0/src/core/sipe-xml.c: In function 'sipe_xml_parse': | ../../../pidgin-sipe-1.25.0/src/core/sipe-xml.c:220:17: error: 'xmlSAXUserParseMemory' is deprecated [-Werror=deprecated-declarations] | 220 | if (xmlSAXUserParseMemory(&parser, pd, string, length)) | | ^~ Signed-off-by: Martin Jansa --- meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb b/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb index c0e1790ec2..90e1701488 100644 --- a/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb +++ b/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb @@ -35,3 +35,5 @@ FILES:${PN} += " \ ${datadir}/appdata \ ${datadir}/metainfo \ " + +CFLAGS = "-Wno-error=deprecated-declarations"