From patchwork Sun Dec 15 18:36:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Kuster X-Patchwork-Id: 54119 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 F23FAE7717F for ; Sun, 15 Dec 2024 18:36:23 +0000 (UTC) Received: from mail-yw1-f179.google.com (mail-yw1-f179.google.com [209.85.128.179]) by mx.groups.io with SMTP id smtpd.web10.40711.1734287778141483087 for ; Sun, 15 Dec 2024 10:36:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=GWf8Z/Z+; spf=pass (domain: gmail.com, ip: 209.85.128.179, mailfrom: akuster808@gmail.com) Received: by mail-yw1-f179.google.com with SMTP id 00721157ae682-6eff5f99de4so37089547b3.1 for ; Sun, 15 Dec 2024 10:36:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734287777; x=1734892577; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=r4WxAkp/7HNY2wQaGMiXKyJxyV7tNBGzO2XyRXw4P/M=; b=GWf8Z/Z+l1XGhyci16MpPk2Njp6+yNLWFV7jBRNRg166bq+NWa116+2iaiN0p+0ztq jPSfVftjLLQ1wrc6uBLK+CLjubGLqDqSuRJtdY+lO4T/SLyjlpZfP7NEBWKEkOFGl2Jz rEgPnezwacfoWf6BnCUuiWn5RI9xbYR20qX8C7Kg7Lp1zb7Qm5HfrNRgEdRTZlniXvcr CbPWUzH+UAMosZe+dssBsp0vdn9BMSD2uboo4oa7utQL9ThOoAiRAt8XWi+HmkOJeJWO kxaj/kM8OCpipdfkxmFKUyF31j0WEDNI66CZvs2EzpChJWKV6aUSdkZV8upnSvc91vpo vL0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734287777; x=1734892577; 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=r4WxAkp/7HNY2wQaGMiXKyJxyV7tNBGzO2XyRXw4P/M=; b=lYbbYJJpgLDyyk75XlRmRqZHlGeg8RFPhtLKFZPQs+iCex2cv5NVH8zGXkxe1kOINr jUgV1bWGyD2lQ9cTUc1PhrurcQBcANQ9W9iO93YBlQJYNzTc8V2/HGGy758rVHJnqEQU fDXqRbile3VbBQfq2Xm9i0CJgp11U4ex38SYq0KJqBDp9dmuSnl/l62nfwXdoo7OGZoH AduWMXEkZYiebn08a1oH7QicjW/eK53gzuDmwkgqCK9aYItsCLMdUYK5VBBsR5kiUovb aDNa2kB5dLx4ANHOpFYodu0+TWVLIaeUg95QhkKZYMgP2dFIHGu/aTcWuEkz5qCIhsnF tRZQ== X-Gm-Message-State: AOJu0Yx8+1zeUhlORf04nxXVdoeYmw4TJiEs2qsT6kUFincPSBftMM2o MZ9YugTdlcqSZ0C4+l82bPQOMjDij1pBDRH0qE35V+PCZ2XhGXtpLaOMnUq7 X-Gm-Gg: ASbGnct8ZxP/kt4ZISZySYSEgTqW4IZIbbgE6QCiUIWALOWHdXw1SAAz0n/B20nYY9W /ldRWi12bLUt7Ubpq7mxsTfEXeUFjhx1l5iYwHbm231SZtqkP1NCqYSf6Q2RMoQtH4JpPFAMpcy RrGfiQvxbhOKj1U0gBYWGMPxhGoksQyCWkuk0MrlZM6/N52n3adPcGZoG+xYeWEV+ozQaAqPldY G9ZXl9jnJgiXFdtUpnx/PN2iQX0paY5H2gZQg42L8+8uIMXd63gCq9yJf5BXjVQrTtrUw== X-Google-Smtp-Source: AGHT+IFESlAmJNmEIHvqxTwPB82FkzvskLs/u3XrHyKkGg0ssx2R+g9cUbWg6gGGyH+mx6ksC/d75A== X-Received: by 2002:a05:6902:10c4:b0:e47:dcde:6415 with SMTP id 3f1490d57ef6-e47dcde6757mr3427128276.27.1734287777223; Sun, 15 Dec 2024 10:36:17 -0800 (PST) Received: from keaua.attlocal.net ([2600:1700:45dd:7000:a906:ba5:bc1d:da36]) by smtp.gmail.com with ESMTPSA id 3f1490d57ef6-e47035366easm985356276.18.2024.12.15.10.36.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2024 10:36:16 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][styhead][PATCH 1/5] mariadb: Fix build with clang-20/trunk Date: Sun, 15 Dec 2024 13:36:12 -0500 Message-ID: <20241215183616.7218-1-akuster808@gmail.com> X-Mailer: git-send-email 2.43.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 ; Sun, 15 Dec 2024 18:36:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/114317 From: Khem Raj Signed-off-by: Khem Raj (cherry picked from commit 5de95a5b7af6da3784498398181d156b948f049f) Signed-off-by: Armin Kuster --- meta-oe/recipes-dbs/mysql/mariadb.inc | 1 + ...ction-as-deleter-prototype-in-unique.patch | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 meta-oe/recipes-dbs/mysql/mariadb/0001-Use-a-lambda-function-as-deleter-prototype-in-unique.patch diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index ae6581ec71..39c9f4c9d5 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -23,6 +23,7 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \ file://lfs64.patch \ file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ + file://0001-Use-a-lambda-function-as-deleter-prototype-in-unique.patch \ " SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch" SRC_URI[sha256sum] = "0a00180864cd016187c986faab8010de23a117b9a75f91d6456421f894e48d20" diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Use-a-lambda-function-as-deleter-prototype-in-unique.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Use-a-lambda-function-as-deleter-prototype-in-unique.patch new file mode 100644 index 0000000000..416b17ba23 --- /dev/null +++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-Use-a-lambda-function-as-deleter-prototype-in-unique.patch @@ -0,0 +1,26 @@ +From 713c21880e25108bf0703433432acca58377cc7b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 27 Sep 2024 11:55:53 -0700 +Subject: [PATCH] Use a lambda function as deleter prototype in unique_ptr + +Fixes build with clang/libc++ 20+ + +Upstream-Status: Submitted [https://jira.mariadb.org/browse/MDEV-35040] +Signed-off-by: Khem Raj +--- + extra/mariabackup/backup_copy.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc +index a328f5e0ec7..2ab04b78bce 100644 +--- a/extra/mariabackup/backup_copy.cc ++++ b/extra/mariabackup/backup_copy.cc +@@ -1641,7 +1641,7 @@ is_aria_log_dir_file(const datadir_node_t &node) + bool + copy_back_aria_logs(const char *dstdir) + { +- std::unique_ptr ++ std::unique_ptr> + ds_ctxt_aria_log_dir_path(ds_create(dstdir, DS_TYPE_LOCAL), ds_destroy); + + datadir_node_t node; From patchwork Sun Dec 15 18:36:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Kuster X-Patchwork-Id: 54123 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 24A13E77187 for ; Sun, 15 Dec 2024 18:36:24 +0000 (UTC) Received: from mail-yb1-f171.google.com (mail-yb1-f171.google.com [209.85.219.171]) by mx.groups.io with SMTP id smtpd.web10.40712.1734287778798384536 for ; Sun, 15 Dec 2024 10:36:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Tt42C+8H; spf=pass (domain: gmail.com, ip: 209.85.219.171, mailfrom: akuster808@gmail.com) Received: by mail-yb1-f171.google.com with SMTP id 3f1490d57ef6-e0875f1e9edso2263989276.1 for ; Sun, 15 Dec 2024 10:36:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734287778; x=1734892578; darn=lists.openembedded.org; 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=WbSXaOQWyDKwxO39ZFrMWf1Z/0MjXGz8/veSJvHytyE=; b=Tt42C+8HJUNLvDzGj+IaAOp2wdvNQ7agwpmucV7Fskbv19Wwam6sb6Y9y1G4UP0UkJ F3FTUZxDJtpg3Ki1460ZDfiny3ZDl8MLfq5CFcsM+k9QqCBzDeIVRrpprKKBr78Dk07O YgkkjxPIg+4VTMuV0vxjKUQroUdeaPB0mbUA1SdrQoXOxPmm6H3+i9I/Zjdesd15pzxP GZtVLm3jkvvTgR/P6Brhp+mdsPzoEumEExOhH7qge4Y5WYrwRq5cMiRZgWC80gFL3bZB 1BXCKOtPIEitU9l0zUB4J/jdXjJVzVTa1TITpOyLvkyvZuATzYkZEEWoW55MZ1q9fiif z9Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734287778; x=1734892578; 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=WbSXaOQWyDKwxO39ZFrMWf1Z/0MjXGz8/veSJvHytyE=; b=F3fqKsIedvfeQZbDqkA7E2Chb1WYfA6Lnayoi7LaHHFEZvUj8MNbNvY1Dk4JECDpTW h+f5oQujY0Ho0ZjjoLzxotD4nyattj3a7uLdPFEnScdrc4Oa5eqSHJLrtddJMm7Y9/7o peuB5k1t4nnkQceldFRSOyacjEuELt/GRvoz3A+sr+IZmD2npxXTP/Q/HcdcXqZtDl7s 2xTxxR2/OJKxU4toM0t0YYtS1gcc7UOpCxf5i4Har0K4hjWVKEOwxI7gv+F/1PEbQcK+ Cc2LgUpYCWDRu/52MuSuL0mddic3XdPNYq0q4qiAhmZvaLmUoGT+AN2Wog89eRMLYnOd akaQ== X-Gm-Message-State: AOJu0YxuJ4S17/Un0rfl+ZiF9+ztaL1zX1bFN6sDG+/3oG0kAXmqYszq NzxhxWxZpUzSAYaUmKHktD1I86lE2KEl4GgGQCusi2khlokA7t4241XDMuTa X-Gm-Gg: ASbGncsKszvgpmPwevA7yl87tdrBz+78YbPeCFDDh7rPU9VUpfSgTKj5H/+oWP9Bvn4 ZttylRIlDWyfni4kt90Y+KDZj4miPIL9ggmjCXOqO49Fe2tf9PPTU+L01dQVKn7xWUWgJuUK292 7oo36sgTn92CdBS6+rSFmsypvQXOkv7b8Pl4JtfVuP4L3J1cap3tW99C61X6OAElq7a5BtehdvN j5Dr75DQMRagP4NJnfXgyzHwVRgGEItuSVBFjh7b6uo/kvH7EVJ/nWND4D4qlI7jlsO5w== X-Google-Smtp-Source: AGHT+IEyZxcjDv5089+SZRSe36ahJ666y8hG/Rw6xFKTpXr+IHEFQt40RYn6av+kO+VaX5kC4VaixA== X-Received: by 2002:a05:6902:2213:b0:e4a:8132:26c6 with SMTP id 3f1490d57ef6-e4a81322f97mr2701561276.42.1734287777778; Sun, 15 Dec 2024 10:36:17 -0800 (PST) Received: from keaua.attlocal.net ([2600:1700:45dd:7000:a906:ba5:bc1d:da36]) by smtp.gmail.com with ESMTPSA id 3f1490d57ef6-e47035366easm985356276.18.2024.12.15.10.36.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2024 10:36:17 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: Ruiqiang Hao , Khem Raj Subject: [meta-oe][styhead][PATCH 2/5] mariadb: Ensure compatibility with ARMv9 by updating .arch directive Date: Sun, 15 Dec 2024 13:36:13 -0500 Message-ID: <20241215183616.7218-2-akuster808@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241215183616.7218-1-akuster808@gmail.com> References: <20241215183616.7218-1-akuster808@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 ; Sun, 15 Dec 2024 18:36:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/114318 From: Ruiqiang Hao The pmem_cvap() function currently uses the '.arch armv8.2-a' directive for the 'dc cvap' instruction. This will cause build errors below when compiling for ARMv9 systems. Update the '.arch' directive to 'armv9.4-a' to ensure compatibility with ARMv9 architectures. {standard input}: Assembler messages: {standard input}:169: Error: selected processor does not support `retaa' {standard input}:286: Error: selected processor does not support `retaa' make[2]: *** [storage/innobase/CMakeFiles/innobase_embedded.dir/build.make: 1644: storage/innobase/CMakeFiles/innobase_embedded.dir/sync/cache.cc.o] Error 1 Signed-off-by: Ruiqiang Hao Signed-off-by: Khem Raj (cherry picked from commit aa667cbe219d207412fb5d89182887759fd63bc7) Signed-off-by: Armin Kuster --- meta-oe/recipes-dbs/mysql/mariadb.inc | 1 + ...lity-with-ARMv9-by-updating-.arch-di.patch | 44 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 meta-oe/recipes-dbs/mysql/mariadb/0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 39c9f4c9d5..f3b8b5eed4 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -24,6 +24,7 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://lfs64.patch \ file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ file://0001-Use-a-lambda-function-as-deleter-prototype-in-unique.patch \ + file://0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch \ " SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch" SRC_URI[sha256sum] = "0a00180864cd016187c986faab8010de23a117b9a75f91d6456421f894e48d20" diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch new file mode 100644 index 0000000000..11d1724768 --- /dev/null +++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch @@ -0,0 +1,44 @@ +From 1b0c05b53ede7decb3f4dfe6187f9573cab5e0ab Mon Sep 17 00:00:00 2001 +From: Ruiqiang Hao +Date: Mon, 2 Dec 2024 02:18:46 +0000 +Subject: [PATCH] Ensure compatibility with ARMv9 by updating .arch directive + +The pmem_cvap() function currently uses the '.arch armv8.2-a' directive +for the 'dc cvap' instruction. This will cause build errors below when +compiling for ARMv9 systems. Update the '.arch' directive to 'armv9.4-a' +to ensure compatibility with ARMv9 architectures. + +{standard input}: Assembler messages: +{standard input}:169: Error: selected processor does not support `retaa' +{standard input}:286: Error: selected processor does not support `retaa' +make[2]: *** [storage/innobase/CMakeFiles/innobase_embedded.dir/build.make: +1644: storage/innobase/CMakeFiles/innobase_embedded.dir/sync/cache.cc.o] +Error 1 + +Upstream-Status: Submitted + +Signed-off-by: Ruiqiang Hao +--- + storage/innobase/sync/cache.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/storage/innobase/sync/cache.cc b/storage/innobase/sync/cache.cc +index 43d642d05b5..af2d1f3d221 100644 +--- a/storage/innobase/sync/cache.cc ++++ b/storage/innobase/sync/cache.cc +@@ -82,7 +82,12 @@ static void pmem_cvap(const void* buf, size_t size) + for (uintptr_t u= uintptr_t(buf) & ~(CPU_LEVEL1_DCACHE_LINESIZE), + end= uintptr_t(buf) + size; + u < end; u+= CPU_LEVEL1_DCACHE_LINESIZE) ++#if defined __ARM_ARCH && __ARM_ARCH == 9 ++ __asm__ __volatile__(".arch armv9.4-a\n dc cvap, %0" :: "r"(u) : "memory"); ++#else + __asm__ __volatile__(".arch armv8.2-a\n dc cvap, %0" :: "r"(u) : "memory"); ++#endif ++ + __asm__ __volatile__("dmb ishst" ::: "memory"); + } + +-- +2.43.0 + From patchwork Sun Dec 15 18:36:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Kuster X-Patchwork-Id: 54122 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 0CEC8E77184 for ; Sun, 15 Dec 2024 18:36:24 +0000 (UTC) Received: from mail-yb1-f175.google.com (mail-yb1-f175.google.com [209.85.219.175]) by mx.groups.io with SMTP id smtpd.web11.40491.1734287779567104603 for ; Sun, 15 Dec 2024 10:36:19 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=R3c1GVXY; spf=pass (domain: gmail.com, ip: 209.85.219.175, mailfrom: akuster808@gmail.com) Received: by mail-yb1-f175.google.com with SMTP id 3f1490d57ef6-e39f43344c5so2553895276.1 for ; Sun, 15 Dec 2024 10:36:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734287778; x=1734892578; darn=lists.openembedded.org; 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=U8R45s8KbkWJz5OEFqTsKoyxHltpyTDYf8JrtumXCjs=; b=R3c1GVXYIKSnp8w7MCAePRP/3p8vSa/5PBU3gWRdPwvFz8DKU+HqoGu98YkI6XEJlj Cn+JhUI1PwFzzpoRD+HxI3umr1nHPc2sSSBDRaAdoqX+0eRCBP1Q9YdPqra6ixtvwceH 8lmzzxFEiwXTHEC3a1eKCT2MIOH+dgeR+9Hib8SY3Jwcktud95ZeBEh0oMS0jyjny2P4 qSKyywwP5l3dJobtmAzL/Fu6F4ASlfG/V4VcMovTu/mT8RdnPCIZwaTDoOXeLq+vnOr+ 8vtYii9rh/nnKm55ouWo2CAZ0Exv9Q4Voe6yhUAPwk0vaUKg0u6IbdvFnRzno2waVAiI sl4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734287778; x=1734892578; 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=U8R45s8KbkWJz5OEFqTsKoyxHltpyTDYf8JrtumXCjs=; b=NLhbNJbbI/XKM+3btwy0x3LBxWneDLxkP+FNbB0H1G5vw9JDJMiLV7CBgjMP4kj6QW m2pk79T2wsxZV1Sjwm2aQoVDc3rzv/SriBxVt1dJPS3vWVr9d+pE1JRvEjtNtPsMLj6I hSdpcCpiXxiSpUt+wfs+jOEgnSjpkX2Dnm7O+xkAEymACJ4jCurRCV7XubedO8BC4+7v wgZMcJFrC/mtpUkidYM+Ep9FOtU4Tesk9uK46BpRW3q+Rz2rGfiMQGx5RgSYYtupSDor M/D9jvztncmoQ3Sh8svMYKTyEccH5/6MZMPMXVIm3nwCdOxketvVD5J7d6oH14j9EW0h l0qg== X-Gm-Message-State: AOJu0YxoqYyO73zUy95bbxz3ISUJbPHbXBxHK4eXkezZH5Wc9J4pemqZ r6BwYaE3PY+vo33SFYkFPrK5YrAAtKPsKPBNarSRg7TZvdqpbjsHTzz6+g4s X-Gm-Gg: ASbGncsShaMMm80bIYMB5s+tTR81Wv19VBDMVgKf4P3Nb/avgQqEk1Lqs2nqYRyjwS8 D3vCecimdaCfq+YCLTzyrPdIJVLrTfBHVWgXEEfYjrpmzIIgGbm76WbSMO+idIPre+/QFg+edQE 0BlcBGkMU9aTDb39BqPMvpKdb7RYH0Yk0sMu3ys07KDxzTM6ejjEQiTcaTp69MDy/G0qlrOdj8/ ReRjP77gFlsGadzQ6BWDhzbR637/t8+pBaffcRnJKcGWrDgK9s2aLEevEcihApbaPcJJg== X-Google-Smtp-Source: AGHT+IET7cbv7a8vZM7vZXHBt74nOcaNilz8fihUogAbskHMKgv0vzRLir0f1Sjog+Ppwy/sdWq0xQ== X-Received: by 2002:a05:6902:2511:b0:e4a:7154:9249 with SMTP id 3f1490d57ef6-e4a71731bbamr2364638276.38.1734287778620; Sun, 15 Dec 2024 10:36:18 -0800 (PST) Received: from keaua.attlocal.net ([2600:1700:45dd:7000:a906:ba5:bc1d:da36]) by smtp.gmail.com with ESMTPSA id 3f1490d57ef6-e47035366easm985356276.18.2024.12.15.10.36.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2024 10:36:18 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: Peter Marko , Khem Raj Subject: [meta-oe][styhead][PATCH 3/5] proftpd: set status of CVE-2001-0027 Date: Sun, 15 Dec 2024 13:36:14 -0500 Message-ID: <20241215183616.7218-3-akuster808@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241215183616.7218-1-akuster808@gmail.com> References: <20241215183616.7218-1-akuster808@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 ; Sun, 15 Dec 2024 18:36:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/114319 From: Peter Marko This ancient CVE [1] is unversioned ("*") in NVD DB. "mod_sqlpw module in ProFTPD does not reset a cached password..." Looking at history and changelog, the module was removed [2] around the time when this CVE was published, likely as reaction to this CVE. "mod_sqlpw.c, mod_mysql.c and mod_pgsql.c have been REMOVED from the distribution. They are currently unmaintained and have numerous bugs." Note: It was later re-introduced as mod_sql when it got fixed under new maintainer. [1] https://nvd.nist.gov/vuln/detail/CVE-2001-0027 [2] https://github.com/proftpd/proftpd/blob/v1.3.8b/NEWS#L3362 Signed-off-by: Peter Marko Signed-off-by: Khem Raj (cherry picked from commit 03a1b56bc7ce88a3b0ad6790606b0498899cc1e3) Signed-off-by: Armin Kuster --- meta-networking/recipes-daemons/proftpd/proftpd_1.3.8b.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.8b.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.8b.bb index 33480bff2c..ce31c8a475 100644 --- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.8b.bb +++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.8b.bb @@ -21,6 +21,8 @@ S = "${WORKDIR}/git" inherit autotools-brokensep useradd update-rc.d systemd multilib_script +CVE_STATUS[CVE-2001-0027] = "fixed-version: version 1.2.0rc3 removed affected module" + EXTRA_OECONF += "--enable-largefile INSTALL=install" PACKAGECONFIG ??= "shadow \ From patchwork Sun Dec 15 18:36:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Armin Kuster X-Patchwork-Id: 54121 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 0D230E77186 for ; Sun, 15 Dec 2024 18:36:24 +0000 (UTC) Received: from mail-yb1-f178.google.com (mail-yb1-f178.google.com [209.85.219.178]) by mx.groups.io with SMTP id smtpd.web10.40713.1734287780214034428 for ; Sun, 15 Dec 2024 10:36:20 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=B0TkDN2Z; spf=pass (domain: gmail.com, ip: 209.85.219.178, mailfrom: akuster808@gmail.com) Received: by mail-yb1-f178.google.com with SMTP id 3f1490d57ef6-e3978c00a5aso2451151276.1 for ; Sun, 15 Dec 2024 10:36:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734287779; x=1734892579; darn=lists.openembedded.org; 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=8HowMzID34hgb1UCyDHViLl3S26kmtrY5xwfXP9j8EM=; b=B0TkDN2Zpd8C7gSiIEdV1ciHV5kgBW0gTLLOdmQcJ4GY2oL3CJ6HYsGjy5m3LUD0F2 hhco3Ul2u6++sgTCFyWNuSKH5luCmd+fCQgy41VvYzhlqzDq2+sykmyvPp3ObVFSJT1m fzbXs9x9A2W9SkJntKAp7aPqjDXhOPe1n6oSc9eBFuXfyaxuM4d1HITqwUuLcRIusKU5 jQTuPiY1vvoZL3VtA5+3t3CLOUoTe6iCyB9JErj6kLjUXBNBu415JPwR76Skb97/neT6 cRTnmOwl+A78FyPf44pBwgvLSAe1/Cka3C50xzYQCGhWjapFOW4PkGRlgQIB0MTs2Mrb tZIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734287779; x=1734892579; 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=8HowMzID34hgb1UCyDHViLl3S26kmtrY5xwfXP9j8EM=; b=M/5G41d0aNmxyfgvW+W2/yFQylnNlBHkECBEnZfu4+Oz1M8vNlEbh5MFJlQusiRDsZ rJRUcdFY5dMNKUJeP36xRzao0kyxdV7kx496y91e/0rVwiHzPSJnFaUjl+Z7YKJVBIer 0nN7IGBptMHnrrO6r2b+Wwvvq/bcwFC5SYemu7PAG6jcAkA5NEL+/vfFwE8W8H5OGak6 w7qbLGTBX6bG3SlLD0YE14LGan2cS+McXMAFHp0Bh8I+zLs5GF/v8yw+KEJVjQxG+CF2 1AhBt+E5cJoqayEwezLeMWkFXmi5kxtY53Vg++aD6ZoGsrwTEliPIUly29zLKwmb/LYx Lz0g== X-Gm-Message-State: AOJu0Yxvw1RZa9MTUjlogP6+nbpWzwnw1dywEnBt829tc+BT1zHeaTYp mF7cN84rIIelg2hX1w6puLdMaLwpW3K5XWTh86u5V0nCDnOpsvYdGKBM3VaL X-Gm-Gg: ASbGnctPmfJPUPlw5kKsIyQzT8wHHNu0nQjXE45HHxGNW6vVzYMjK69N+sClbEeVdYM XpyRJpPzulkvkXfqNY1C2fNGA77eAiQLeOVlo3AuOIb7K+3uLcsWx4sw7m03+vEUwgmAfxgMkuG oh+vWJLaW13RYbo8NExAdRJAebyqG6YkmtR+twUYnHC6hTDWc6zJf+2Gmjdd1K3ITXWJxPdhd+3 DRNOu42Qh1cjNcqWHfQ78P43zQ7024M9aIWAOrIvcahas2Qll2Bt8kb9OCt72ZLHhfxWw== X-Google-Smtp-Source: AGHT+IG8ornReQ5Vw7m5XPmGdF8JqsxFxWLtzauGQDHE+6SA7/8R579gHggnn1PZT5XBg/eb5I3UnA== X-Received: by 2002:a05:6902:70b:b0:e38:87bf:8e61 with SMTP id 3f1490d57ef6-e434f83f44bmr7731143276.27.1734287779292; Sun, 15 Dec 2024 10:36:19 -0800 (PST) Received: from keaua.attlocal.net ([2600:1700:45dd:7000:a906:ba5:bc1d:da36]) by smtp.gmail.com with ESMTPSA id 3f1490d57ef6-e47035366easm985356276.18.2024.12.15.10.36.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2024 10:36:18 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: =?utf-8?q?Ghislain_Mang=C3=A9?= , Yoann Congal , Khem Raj Subject: [meta-oe][styhead][PATCH 4/5] wireshark: use inherit_defer for conditional cases Date: Sun, 15 Dec 2024 13:36:15 -0500 Message-ID: <20241215183616.7218-4-akuster808@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241215183616.7218-1-akuster808@gmail.com> References: <20241215183616.7218-1-akuster808@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 ; Sun, 15 Dec 2024 18:36:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/114320 From: Ghislain Mangé Conditionnal inherit may be missed when PACKAGECONFIG qt5 is activated after this inherit, eg in .bbappend. see patch [0] [0]: https://lists.openembedded.org/g/bitbake-devel/message/16815 Reviewed-by: Yoann Congal Signed-off-by: Ghislain Mangé Signed-off-by: Khem Raj (cherry picked from commit 97318e27ebf9f528acf77fb0759c332bd83adb4b) Signed-off-by: Armin Kuster --- meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb b/meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb index 3fa293d0cd..9c93fd026c 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb @@ -48,7 +48,7 @@ PACKAGECONFIG[nghttp2] = "-DENABLE_NGHTTP2=ON,-DENABLE_NGHTTP2=OFF, nghttp2" # these next two options require addional layers PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON -DBUILD_wireshark=ON, -DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qttools-native qtmultimedia qtsvg" -inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} +inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} EXTRA_OECMAKE += "-DENABLE_NETLINK=ON \ -DBUILD_mmdbresolve=OFF \ From patchwork Sun Dec 15 18:36:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Kuster X-Patchwork-Id: 54120 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 F0A83E7716A for ; Sun, 15 Dec 2024 18:36:23 +0000 (UTC) Received: from mail-yb1-f177.google.com (mail-yb1-f177.google.com [209.85.219.177]) by mx.groups.io with SMTP id smtpd.web10.40714.1734287780797325408 for ; Sun, 15 Dec 2024 10:36:20 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ZJv9EbTp; spf=pass (domain: gmail.com, ip: 209.85.219.177, mailfrom: akuster808@gmail.com) Received: by mail-yb1-f177.google.com with SMTP id 3f1490d57ef6-e4930eca0d4so603628276.3 for ; Sun, 15 Dec 2024 10:36:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734287780; x=1734892580; darn=lists.openembedded.org; 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=Io6nIVi9VgsUPo2qG8yDzR6NWUlwwRZZeIMBhqursxI=; b=ZJv9EbTpjCzEl15rN14l9V1TQxKISUftTI0onl621s5kCVYq0pxdraQWL1kgjkxled 0Vqy9p871h6aeBDGyp93bN/kr1QBjZugVFyrbPgU94G2J/N8qg7VT6K+HX3XjWDjBtmK +Q0BeUYb7tkO3NxTzCypEKco46qE+UGc+Xww9+gcbN0JnbWKitnKyQMks2xCSrfYli3+ RDFql8qVJz61gRysM6U2xbpkPeRQRVPiIhuwUudm/ntqw90yaCuQXALxT5KBXlCa5Jqy z4Y9knk7B+MQuryW1MV3Vn1TScCkmGuKj4RLnMrdRM4DzcnpgIsYuLu3DYwEdtQgx9KT qzMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734287780; x=1734892580; 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=Io6nIVi9VgsUPo2qG8yDzR6NWUlwwRZZeIMBhqursxI=; b=CH3OXwN14tuidXuVc8b+OsNOxrE27x9swzlkOHXqgZszl2gpgugBxFWGJR92pBnLEh wWx5YDQcgFIGcKBxVEx1qGueZNn/HMVNVfywJQ4HUowb1S/uCMoPlYQ60qTOSTIW/aJc kSgy05xFcSza9QqUbR5ffYReksiMsYy2ORBqQBk1sSn1Kr4ksaYw0zpQc+BzEmRVsm0j WQ2v5OBYHV3Ptb5C2Y0Dmxio5CIGu3BbVpMT8k/G+q9scwhtHRUqLZ8B6q8V15mnZKnY EmTBiu56iW0KOaOCQHBkte7BKCvRp/PPDd/idx3wEbpLjWYdAyeU4IebIE0BMZTKc39F rkhQ== X-Gm-Message-State: AOJu0YxrLmz0kbiQvqR3pxNlEWQvlejaPj8LhfPI4KhEBHF1XutumXug YwFPojKR7j6RvWEYZYI7asFuNBYIcY9jvZRFZRcPDpLLKuPQ5sGGEGtxZSC5 X-Gm-Gg: ASbGncvZMHEnpgbZNwlR7+T4o0SYQ7MLzAHpTNM8xLIm1bWWNx0fOCJvcJMUUE84bFu Djxv+aFiNYt6B3ZfFFCNSAe90orh2DQmQE/0+7S59S4IlKkCsqwxRUUdW0yC3ojS6h+qmyemmyg /RihzOr6qNgn9ahcD3gu9Q5KCcIgAemHZk30FbojjKWt0OOLz6m9rY4vjshMsKqxcxVcjfUS6ii HaIZp/vj4FlVjHQuka7qDb4V5jfDjcPK6Om3SOmK8VezdNzcFsp/Xn8DbVjBiF4uGNNbA== X-Google-Smtp-Source: AGHT+IFr31Bl/fh6M750Ba7pN+TbaiSvX7bRzEGciI5vgXVafabIvUNFfplYVXsv4UAe3chpbYu4Hw== X-Received: by 2002:a05:6902:1542:b0:e4b:f516:38ba with SMTP id 3f1490d57ef6-e4bf516431amr1478443276.17.1734287779859; Sun, 15 Dec 2024 10:36:19 -0800 (PST) Received: from keaua.attlocal.net ([2600:1700:45dd:7000:a906:ba5:bc1d:da36]) by smtp.gmail.com with ESMTPSA id 3f1490d57ef6-e47035366easm985356276.18.2024.12.15.10.36.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2024 10:36:19 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: Hongxu Jia , Khem Raj Subject: [meta-oe][styhead][PATCH 5/5] ntfs-3g-ntfsprogs: fix CVE-2023-52890 Date: Sun, 15 Dec 2024 13:36:16 -0500 Message-ID: <20241215183616.7218-5-akuster808@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241215183616.7218-1-akuster808@gmail.com> References: <20241215183616.7218-1-akuster808@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 ; Sun, 15 Dec 2024 18:36:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/114321 From: Hongxu Jia Backport fix from upstream https://github.com/tuxera/ntfs-3g/commit/75dcdc2cf37478fad6c0e3427403d198b554951d Signed-off-by: Hongxu Jia Signed-off-by: Khem Raj (cherry picked from commit c452799c4df849b3e573e9e4cb937ca7a474ec30) Signed-off-by: Armin Kuster --- ...use-after-free-in-ntfs_uppercase_mbs.patch | 42 +++++++++++++++++++ .../ntfs-3g-ntfsprogs_2022.10.3.bb | 1 + 2 files changed, 43 insertions(+) create mode 100644 meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-unistr.c-Fix-use-after-free-in-ntfs_uppercase_mbs.patch diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-unistr.c-Fix-use-after-free-in-ntfs_uppercase_mbs.patch b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-unistr.c-Fix-use-after-free-in-ntfs_uppercase_mbs.patch new file mode 100644 index 0000000000..3160f56880 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-unistr.c-Fix-use-after-free-in-ntfs_uppercase_mbs.patch @@ -0,0 +1,42 @@ +From 7b6210c5be46e5120b42c09f910e8f104bf3edf1 Mon Sep 17 00:00:00 2001 +From: Erik Larsson +Date: Tue, 13 Jun 2023 17:47:15 +0300 +Subject: [PATCH] unistr.c: Fix use-after-free in 'ntfs_uppercase_mbs'. + +If 'utf8_to_unicode' throws an error due to an invalid UTF-8 sequence, +then 'n' will be less than 0 and the loop will terminate without storing +anything in '*t'. After the loop the uppercase string's allocation is +freed, however after it is freed it is unconditionally accessed through +'*t', which points into the freed allocation, for the purpose of NULL- +terminating the string. This leads to a use-after-free. +Fixed by only NULL-terminating the string when no error has been thrown. + +Thanks for Jeffrey Bencteux for reporting this issue: +https://github.com/tuxera/ntfs-3g/issues/84 + +Upstream-Status: Backport [https://github.com/tuxera/ntfs-3g/commit/75dcdc2cf37478fad6c0e3427403d198b554951d] +CVE: CVE-2023-52890 +Signed-off-by: Hongxu Jia + +--- + libntfs-3g/unistr.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libntfs-3g/unistr.c b/libntfs-3g/unistr.c +index 5854b3b..db8ddf4 100644 +--- a/libntfs-3g/unistr.c ++++ b/libntfs-3g/unistr.c +@@ -1189,8 +1189,9 @@ char *ntfs_uppercase_mbs(const char *low, + free(upp); + upp = (char*)NULL; + errno = EILSEQ; ++ } else { ++ *t = 0; + } +- *t = 0; + } + return (upp); + } +-- +2.34.1 + diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb index 37a8106bb0..be2a5245ce 100644 --- a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb +++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ SRC_URI = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${PV}.tgz \ file://0001-libntfs-3g-Makefile.am-fix-install-failed-while-host.patch \ + file://0001-unistr.c-Fix-use-after-free-in-ntfs_uppercase_mbs.patch \ " S = "${WORKDIR}/ntfs-3g_ntfsprogs-${PV}" SRC_URI[sha256sum] = "f20e36ee68074b845e3629e6bced4706ad053804cbaf062fbae60738f854170c"