From patchwork Sun Aug 25 18:49:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 48194 X-Patchwork-Delegate: steve@sakoman.com 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 490D6C54734 for ; Sun, 25 Aug 2024 18:50:05 +0000 (UTC) Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by mx.groups.io with SMTP id smtpd.web11.37007.1724611797705399604 for ; Sun, 25 Aug 2024 11:49:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=wnGprGOS; spf=softfail (domain: sakoman.com, ip: 209.85.215.170, mailfrom: steve@sakoman.com) Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-7cd9d408040so2456168a12.0 for ; Sun, 25 Aug 2024 11:49:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1724611797; x=1725216597; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=/odtV6tlh5TXgDyANMJxi40NNE+X8c2JICDo+9S0JcQ=; b=wnGprGOS0SwPhZovVQWD2iDlP6JIw2kU0IPiq8mqhTGnoyUOILWnfzwQBGmmDLUsv+ FVvwm8HfRx4xGrTJl8/0jJdeNUXtLuYMmZ5+0CPeWuO0MHFuBhhHh9BNjN8fhmrszuF9 oPR4CVyKaOPx4ypuL2in7Yn/Kk0q445Ez1IF4jL53IMxzbo8SQiAbEPejaRUbYKtVaea r4TNzNUdNhYZlLNKNrZp/dAKCxwTx+nJBPWvCCV7MgyG3lvVb++5w8m838BRuCXk11y3 Uuz8jSRlhk/nwtWvX6CbrAwMMEpZEl/K8NETo3/lEnf/SVXqx+ulQ1yenPwxA2QQtJ8l RdFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724611797; x=1725216597; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/odtV6tlh5TXgDyANMJxi40NNE+X8c2JICDo+9S0JcQ=; b=DG0YJ4ujRA7HlS9TA/VoGJsDIjdINxER038mCDnCLixJ36vjw+AM1ibXQxCNqc6bR3 RZ+qz45zQw3SEojyVvbV0JkmU7wvuRoXUWtFE0pllZFfcTYtQFLCkAGrsfonmV/+xFmx xI20uejojtledI7gUJeJspDp/TI7YcBko+hGPkUsAS8R38yzoLhPY5AtFaxDZgyMdEio 846dEHHgyky//RhpO4S3T01DqwjbSxl4WBXvdLyMYipFG64W71SGU+VahlicC/BCT9p5 rvkCeW5y+lAtaFRKv5VRO5wLGl2ccYJm71vPWMexZaUJ37IToKXhXmjiD3ifWHE4jvJG FHfw== X-Gm-Message-State: AOJu0YzrtvrcNR1tEvIqfCP03rYFbiVAXqscUjEe36Ez9ytrZACezm8X 9uYSDOc8+ExNsyVFnVmtRP3ATLXjxO32exAirLvUwYjtrFGU81TRpvQ7aDaSvG0vGvYSMZGEEEB NGpQOWw== X-Google-Smtp-Source: AGHT+IGeZWWLDei7nR9tRaSDAd7BbzCmn3nWixBzFfNwFlRo/mn/JSw/F6LoFTBUF0FItKgn8ZyKxA== X-Received: by 2002:a17:90b:356:b0:2cf:fe5d:ea12 with SMTP id 98e67ed59e1d1-2d646c4ddb0mr9663805a91.24.1724611796925; Sun, 25 Aug 2024 11:49:56 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2d61391fe09sm8294216a91.19.2024.08.25.11.49.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Aug 2024 11:49:56 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 1/6] libyaml: ignore CVE-2024-35326 Date: Sun, 25 Aug 2024 11:49:46 -0700 Message-Id: <18e011245dd978985eecc368c503822f61d52f21.1724611692.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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, 25 Aug 2024 18:50:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/203726 From: Peter Marko This is the same problem as already ignored CVE-2024-35328. See laso this comment in addition: https://github.com/yaml/libyaml/issues/298#issuecomment-2167684233 Signed-off-by: Peter Marko Signed-off-by: Steve Sakoman --- meta/recipes-support/libyaml/libyaml_0.2.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/libyaml/libyaml_0.2.5.bb b/meta/recipes-support/libyaml/libyaml_0.2.5.bb index f7c29e7e0f..e30dc5a43f 100644 --- a/meta/recipes-support/libyaml/libyaml_0.2.5.bb +++ b/meta/recipes-support/libyaml/libyaml_0.2.5.bb @@ -19,6 +19,6 @@ DISABLE_STATIC:class-nativesdk = "" DISABLE_STATIC:class-native = "" # upstream-wontfix: Upstream thinks there is no working code that is exploitable - https://github.com/yaml/libyaml/issues/302 -CVE_CHECK_IGNORE += "CVE-2024-35328" +CVE_CHECK_IGNORE += "CVE-2024-35326 CVE-2024-35328" BBCLASSEXTEND = "native nativesdk" From patchwork Sun Aug 25 18:49:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 48192 X-Patchwork-Delegate: steve@sakoman.com 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 49086C54732 for ; Sun, 25 Aug 2024 18:50:05 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web10.37431.1724611799279652704 for ; Sun, 25 Aug 2024 11:49:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=zQmrgA9A; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2d3e46ba5bcso2513946a91.0 for ; Sun, 25 Aug 2024 11:49:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1724611798; x=1725216598; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=BnfIkqWPbJGS11lpTEkZEtvnDCdQD20SbCcsLCLKFss=; b=zQmrgA9AI8nOEVOJ8YSjxw6OsyDLJSBG0ZaQoJwEg+7vO7ykkUO6CbqsosVxdA4bkG PKQ3gb8Zyqy/R203xXcKbKloEziEKbc4BRIP0G8uHlEKKk/IIp3kqZkIvkevFclLEFmK 0g9oCdHwXThjQAqCqcpAtY0JoKgYPqgYrW+ZAuQw5eX/uOV0c2qMKuIHUukdHuD1TVxe Mz/jAToCY9uGwbTCOWOys6wWINDTJPcLKWV2pXVrk3zNJue6d5qrQwIwG/aZQDLeKiba Qi+aU99PzSbcjXkPwYFHgMy15UJDLmLy+qvK7F0EstE5s7nDpzYF4qGJO868KKkmLEde EpFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724611798; x=1725216598; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BnfIkqWPbJGS11lpTEkZEtvnDCdQD20SbCcsLCLKFss=; b=ZlrgiMuve/Rt3a/vFX567zetHBtZyVObzWc+NHjzs1pqoZd3JlIGyPeyWEiIKoOccN 5KYsmUFqF4LF3zGSEkevXQvTKvFhnk9cMhhUA//2RrtM5eqFnamGkBVnaikmimtwPdQ+ cYJocKL6KmfaNRXdV8kaTgyQFOoriLSKzgci1lExQqocWDSNd3+0O4YSSdOuid9p9JwB lUdbcIILUA3uQhqYQqiaEKwPEvn1bkK+VW/hsFDAg4ScW3yigdYtwZn+Hs4afgOX7RAp bSZUVG+b4SKC4ClwlnGgHYdAlY+ouRhFjN162kZdi04bXkufAQIHQXfptCrFnYIy/MW9 YegA== X-Gm-Message-State: AOJu0YzTjchUSm+Qw3RmUc4OZa4RN58WE1k6OMXLIoYo/4FeIuFu2crw AV7GqAcMC0Bh2Gv4uq7nJbFiVdw7hCeNh/Pr4Onabx7W5qPwc/u7CjboUfbO2GNZPicIxv4JM5S 3io/P2Q== X-Google-Smtp-Source: AGHT+IG8isbP42g43UAy2yc1SP8ON6/Zt4eLm/4qPX8hNgi5bbQw5Nknbru7LXQr/cKvBbexZQrIVw== X-Received: by 2002:a17:90b:1e06:b0:2d3:b643:8386 with SMTP id 98e67ed59e1d1-2d646b8b7f5mr6871825a91.9.1724611798407; Sun, 25 Aug 2024 11:49:58 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2d61391fe09sm8294216a91.19.2024.08.25.11.49.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Aug 2024 11:49:58 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 2/6] Tiff: Security fix for CVE-2024-7006 Date: Sun, 25 Aug 2024 11:49:47 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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, 25 Aug 2024 18:50:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/203727 From: Siddharth Doshi Upstream-Status: Backport from [https://gitlab.com/libtiff/libtiff/-/commit/818fb8ce881cf839fbc710f6690aadb992aa0f9e] CVE's Fixed: CVE-2024-7006 libtiff: NULL pointer dereference in tif_dirinfo.c Signed-off-by: Siddharth Doshi Signed-off-by: Steve Sakoman --- .../libtiff/tiff/CVE-2024-7006.patch | 64 +++++++++++++++++++ meta/recipes-multimedia/libtiff/tiff_4.3.0.bb | 1 + 2 files changed, 65 insertions(+) create mode 100644 meta/recipes-multimedia/libtiff/tiff/CVE-2024-7006.patch diff --git a/meta/recipes-multimedia/libtiff/tiff/CVE-2024-7006.patch b/meta/recipes-multimedia/libtiff/tiff/CVE-2024-7006.patch new file mode 100644 index 0000000000..217de0ea92 --- /dev/null +++ b/meta/recipes-multimedia/libtiff/tiff/CVE-2024-7006.patch @@ -0,0 +1,64 @@ +From 818fb8ce881cf839fbc710f6690aadb992aa0f9e Mon Sep 17 00:00:00 2001 +From: Su_Laus +Date: Fri, 1 Dec 2023 20:12:25 +0100 +Subject: [PATCH] Check return value of _TIFFCreateAnonField(). + +Fixes #624 + +Upstream-Status: Backport [https://gitlab.com/libtiff/libtiff/-/commit/818fb8ce881cf839fbc710f6690aadb992aa0f9e] +CVE: CVE-2024-7006 +Signed-off-by: Siddharth Doshi +--- + libtiff/tif_dirinfo.c | 2 +- + libtiff/tif_dirread.c | 15 ++++++--------- + 2 files changed, 7 insertions(+), 10 deletions(-) + +diff --git a/libtiff/tif_dirinfo.c b/libtiff/tif_dirinfo.c +index a212d01..95226a8 100644 +--- a/libtiff/tif_dirinfo.c ++++ b/libtiff/tif_dirinfo.c +@@ -797,7 +797,7 @@ _TIFFFindOrRegisterField(TIFF *tif, uint32_t tag, TIFFDataType dt) + fld = TIFFFindField(tif, tag, dt); + if (fld == NULL) { + fld = _TIFFCreateAnonField(tif, tag, dt); +- if (!_TIFFMergeFields(tif, fld, 1)) ++ if (fld == NULL || !_TIFFMergeFields(tif, fld, 1)) + return NULL; + } + +diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c +index 0e283fc..1781166 100644 +--- a/libtiff/tif_dirread.c ++++ b/libtiff/tif_dirread.c +@@ -3735,11 +3735,9 @@ TIFFReadDirectory(TIFF* tif) + dp->tdir_tag,dp->tdir_tag); + /* the following knowingly leaks the + anonymous field structure */ +- if (!_TIFFMergeFields(tif, +- _TIFFCreateAnonField(tif, +- dp->tdir_tag, +- (TIFFDataType) dp->tdir_type), +- 1)) { ++ const TIFFField *fld = _TIFFCreateAnonField( ++ tif, dp->tdir_tag, (TIFFDataType)dp->tdir_type); ++ if (fld == NULL || !_TIFFMergeFields(tif, fld, 1)) { + TIFFWarningExt(tif->tif_clientdata, + module, + "Registering anonymous field with tag %"PRIu16" (0x%"PRIx16") failed", +@@ -4502,10 +4500,9 @@ TIFFReadCustomDirectory(TIFF* tif, toff_t diroff, + TIFFWarningExt(tif->tif_clientdata, module, + "Unknown field with tag %"PRIu16" (0x%"PRIx16") encountered", + dp->tdir_tag, dp->tdir_tag); +- if (!_TIFFMergeFields(tif, _TIFFCreateAnonField(tif, +- dp->tdir_tag, +- (TIFFDataType) dp->tdir_type), +- 1)) { ++ const TIFFField *fld = _TIFFCreateAnonField( ++ tif, dp->tdir_tag, (TIFFDataType)dp->tdir_type); ++ if (fld == NULL || !_TIFFMergeFields(tif, fld, 1)) { + TIFFWarningExt(tif->tif_clientdata, module, + "Registering anonymous field with tag %"PRIu16" (0x%"PRIx16") failed", + dp->tdir_tag, dp->tdir_tag); +-- +2.35.7 + diff --git a/meta/recipes-multimedia/libtiff/tiff_4.3.0.bb b/meta/recipes-multimedia/libtiff/tiff_4.3.0.bb index b4af179e76..209b38b8f2 100644 --- a/meta/recipes-multimedia/libtiff/tiff_4.3.0.bb +++ b/meta/recipes-multimedia/libtiff/tiff_4.3.0.bb @@ -53,6 +53,7 @@ SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \ file://CVE-2023-6277-2.patch \ file://CVE-2023-6277-3.patch \ file://CVE-2023-6277-4.patch \ + file://CVE-2024-7006.patch \ " SRC_URI[sha256sum] = "0e46e5acb087ce7d1ac53cf4f56a09b221537fc86dfc5daaad1c2e89e1b37ac8" From patchwork Sun Aug 25 18:49:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 48195 X-Patchwork-Delegate: steve@sakoman.com 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 359BFC5472F for ; Sun, 25 Aug 2024 18:50:05 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mx.groups.io with SMTP id smtpd.web11.37008.1724611800892310434 for ; Sun, 25 Aug 2024 11:50:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=i0TDZsG3; spf=softfail (domain: sakoman.com, ip: 209.85.216.53, mailfrom: steve@sakoman.com) Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-2d3c08541cdso2811968a91.2 for ; Sun, 25 Aug 2024 11:50:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1724611800; x=1725216600; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=O+E5QeQduXXY946XAZ8LTGkiijvaj4ejsgfwzCZdCFs=; b=i0TDZsG3emt2TCUKuek0dzphMts/Wukip1321zk6o4Ce8U84jgamOndz9KTYHH3PKs 22uS5LuClEmL5udStffiNVMPXKR3wElsjyBHpVg2qWaGuPK9BPpQxCpxNhNhkQpUwRJ5 7SvhlZStiD8fYLFDgAoQYit02EZmV0tcqfgbWDGZbB/H5FpxSzkZdBFcDZg7NSwgTwJj 2jS4dG3re2+l7qJSi/ILwGW0o0cN6E9N1Wzc5jBxuNQuvRyegJD8kd8UNREdjxdu+Dz1 AbANyqNLZ0LhC03cPGp5wtLav789TRnr8JWHuj1pJPFD82UYJQX1fwAbUOS3rQahECea 4m6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724611800; x=1725216600; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=O+E5QeQduXXY946XAZ8LTGkiijvaj4ejsgfwzCZdCFs=; b=QVUE7HxYr7fjDGH97FNh2ZCy+5aS+hk4UulJjQRc5MIkDR0Kk+DgSvu8nsUx019oQD ZhvcygaUPQlDeyRUhUcSWOF+a4WF2eSjoRC6Ee/eKLK93VujMKsUEl7l/GgzEVv5tDa/ jbV8C8l4kEkZJ/PPC3AB4BTDRjp1BX7J+GmE7eA7Qte+qjkFaS5F07i8oJRyeJ2TMb1L mOOJeBx9QuJ+S/5jQ9n5Q3+4dLBFfb7/TpiRRek+fw2ogbJhCLU26MFW63SfSo0qaiNc xH4SbmlGDbGxrT3eUyU6qTD9186uaODfzmmFqu16Lf2d/l9xPaDGeQ/30cABXXg9VLIW suJQ== X-Gm-Message-State: AOJu0YwuxczCCVT2Q9Y2ASs/W6Zm9tjm3nMk37cPiQ3c+1WEkUficH8P 8NwwRhGTBaShPuY6oi/ebAHQ5yISFAX+myjwM3VGVc/VV+hIL0/3e5o/rS9cDT72mtHEiHh62GO +JmuokQ== X-Google-Smtp-Source: AGHT+IEQ1wkrpbbt0nGBvdcyVaMfKVPE+3+lNkCDxMqhAryL60E7ZkU1Xeh92lRhJvavKnhI4X7W7Q== X-Received: by 2002:a17:90b:4c12:b0:2d3:cc16:826f with SMTP id 98e67ed59e1d1-2d64672be1emr8865210a91.0.1724611799922; Sun, 25 Aug 2024 11:49:59 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2d61391fe09sm8294216a91.19.2024.08.25.11.49.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Aug 2024 11:49:59 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 3/6] curl: Security fix for CVE-2024-7264 Date: Sun, 25 Aug 2024 11:49:48 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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, 25 Aug 2024 18:50:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/203728 From: Siddharth Doshi Upstream-Status: Backport from [https://github.com/curl/curl/commit/27959ecce75cdb2809c0bdb3286e60e08fadb519] CVE's Fixed: ============ CVE-2024-7264 libcurl: ASN.1 date parser overread Signed-off-by: Siddharth Doshi Signed-off-by: Steve Sakoman --- .../curl/curl/CVE-2024-7264_1.patch | 66 ++++ .../curl/curl/CVE-2024-7264_2.patch | 320 ++++++++++++++++++ meta/recipes-support/curl/curl_7.82.0.bb | 2 + 3 files changed, 388 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2024-7264_1.patch create mode 100644 meta/recipes-support/curl/curl/CVE-2024-7264_2.patch diff --git a/meta/recipes-support/curl/curl/CVE-2024-7264_1.patch b/meta/recipes-support/curl/curl/CVE-2024-7264_1.patch new file mode 100644 index 0000000000..2e1d8eeaaa --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2024-7264_1.patch @@ -0,0 +1,66 @@ +From 3c914bc680155b32178f1f15ca8d47c7f4640afe Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Tue, 30 Jul 2024 10:05:17 +0200 +Subject: [PATCH] x509asn1: clean up GTime2str + +Co-authored-by: Stefan Eissing +Reported-by: Dov Murik + +Closes #14307 + +Note: This patch is needed by the main patch to be backported. + +Upstream-Status: Backport from [https://github.com/curl/curl/commit/3c914bc680155b32178f1f15ca8d47c7f4640afe] +CVE: CVE-2024-7264 +Signed-off-by: Siddharth Doshi +--- + lib/vtls/x509asn1.c | 23 ++++++++++++++--------- + 1 file changed, 14 insertions(+), 9 deletions(-) + +diff --git a/lib/vtls/x509asn1.c b/lib/vtls/x509asn1.c +index f64acb8..b538bd9 100644 +--- a/lib/vtls/x509asn1.c ++++ b/lib/vtls/x509asn1.c +@@ -539,7 +539,7 @@ static const char *GTime2str(const char *beg, const char *end) + /* Convert an ASN.1 Generalized time to a printable string. + Return the dynamically allocated string, or NULL if an error occurs. */ + +- for(fracp = beg; fracp < end && *fracp >= '0' && *fracp <= '9'; fracp++) ++ for(fracp = beg; fracp < end && ISDIGIT(*fracp); fracp++) + ; + + /* Get seconds digits. */ +@@ -558,17 +558,22 @@ static const char *GTime2str(const char *beg, const char *end) + return NULL; + } + +- /* Scan for timezone, measure fractional seconds. */ ++ /* timezone follows optional fractional seconds. */ + tzp = fracp; +- fracl = 0; ++ fracl = 0; /* no fractional seconds detected so far */ + if(fracp < end && (*fracp == '.' || *fracp == ',')) { +- fracp++; +- do ++ /* Have fractional seconds, e.g. "[.,]\d+". How many? */ ++ tzp = fracp++; /* should be a digit char or BAD ARGUMENT */ ++ while(tzp < end && ISDIGIT(*tzp)) + tzp++; +- while(tzp < end && *tzp >= '0' && *tzp <= '9'); +- /* Strip leading zeroes in fractional seconds. */ +- for(fracl = tzp - fracp - 1; fracl && fracp[fracl - 1] == '0'; fracl--) +- ; ++ if(tzp == fracp) /* never looped, no digit after [.,] */ ++ return CURLE_BAD_FUNCTION_ARGUMENT; ++ fracl = tzp - fracp - 1; /* number of fractional sec digits */ ++ DEBUGASSERT(fracl > 0); ++ /* Strip trailing zeroes in fractional seconds. ++ * May reduce fracl to 0 if only '0's are present. */ ++ while(fracl && fracp[fracl - 1] == '0') ++ fracl--; + } + + /* Process timezone. */ +-- +2.35.7 + diff --git a/meta/recipes-support/curl/curl/CVE-2024-7264_2.patch b/meta/recipes-support/curl/curl/CVE-2024-7264_2.patch new file mode 100644 index 0000000000..e8853c1e0c --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2024-7264_2.patch @@ -0,0 +1,320 @@ +From 27959ecce75cdb2809c0bdb3286e60e08fadb519 Mon Sep 17 00:00:00 2001 +From: Stefan Eissing +Date: Tue, 30 Jul 2024 16:40:48 +0200 +Subject: [PATCH] x509asn1: unittests and fixes for gtime2str + +Fix issues in GTime2str() and add unit test cases to verify correct +behaviour. + +Follow-up to 3c914bc6801 + +Closes #14316 + +Upstream-Status: Backport from [https://github.com/curl/curl/commit/27959ecce75cdb2809c0bdb3286e60e08fadb519] +CVE: CVE-2024-7264 +Signed-off-by: Siddharth Doshi +--- + lib/vtls/x509asn1.c | 32 +++++++--- + lib/vtls/x509asn1.h | 11 ++++ + tests/data/Makefile.inc | 2 +- + tests/data/test1656 | 22 +++++++ + tests/unit/Makefile.inc | 4 +- + tests/unit/unit1656.c | 133 ++++++++++++++++++++++++++++++++++++++++ + 6 files changed, 194 insertions(+), 10 deletions(-) + create mode 100644 tests/data/test1656 + create mode 100644 tests/unit/unit1656.c + +diff --git a/lib/vtls/x509asn1.c b/lib/vtls/x509asn1.c +index b538bd9..a25a6e6 100644 +--- a/lib/vtls/x509asn1.c ++++ b/lib/vtls/x509asn1.c +@@ -563,12 +563,13 @@ static const char *GTime2str(const char *beg, const char *end) + fracl = 0; /* no fractional seconds detected so far */ + if(fracp < end && (*fracp == '.' || *fracp == ',')) { + /* Have fractional seconds, e.g. "[.,]\d+". How many? */ +- tzp = fracp++; /* should be a digit char or BAD ARGUMENT */ ++ fracp++; /* should be a digit char or BAD ARGUMENT */ ++ tzp = fracp; + while(tzp < end && ISDIGIT(*tzp)) + tzp++; + if(tzp == fracp) /* never looped, no digit after [.,] */ + return CURLE_BAD_FUNCTION_ARGUMENT; +- fracl = tzp - fracp - 1; /* number of fractional sec digits */ ++ fracl = tzp - fracp; /* number of fractional sec digits */ + DEBUGASSERT(fracl > 0); + /* Strip trailing zeroes in fractional seconds. + * May reduce fracl to 0 if only '0's are present. */ +@@ -577,18 +578,24 @@ static const char *GTime2str(const char *beg, const char *end) + } + + /* Process timezone. */ +- if(tzp >= end) +- ; /* Nothing to do. */ ++ if(tzp >= end) { ++ tzp = ""; ++ tzl = 0; ++ } + else if(*tzp == 'Z') { +- tzp = " GMT"; +- end = tzp + 4; ++ sep = " "; ++ tzp = "GMT"; ++ tzl = 3; ++ } ++ else if((*tzp == '+') || (*tzp == '-')) { ++ sep = " UTC"; ++ tzl = end - tzp; + } + else { + sep = " "; +- tzp++; ++ tzl = end - tzp; + } + +- tzl = end - tzp; + return curl_maprintf("%.4s-%.2s-%.2s %.2s:%.2s:%c%c%s%.*s%s%.*s", + beg, beg + 4, beg + 6, + beg + 8, beg + 10, sec1, sec2, +@@ -596,6 +603,15 @@ static const char *GTime2str(const char *beg, const char *end) + sep, (int)tzl, tzp); + } + ++#ifdef UNITTESTS ++/* used by unit1656.c */ ++CURLcode Curl_x509_GTime2str(struct dynbuf *store, ++ const char *beg, const char *end) ++{ ++ return GTime2str(store, beg, end); ++} ++#endif ++ + /* + * Convert an ASN.1 UTC time to a printable string. + * Return the dynamically allocated string, or NULL if an error occurs. +diff --git a/lib/vtls/x509asn1.h b/lib/vtls/x509asn1.h +index db7df0e..515cb7e 100644 +--- a/lib/vtls/x509asn1.h ++++ b/lib/vtls/x509asn1.h +@@ -73,6 +73,17 @@ CURLcode Curl_extract_certinfo(struct Curl_easy *data, int certnum, + const char *beg, const char *end); + CURLcode Curl_verifyhost(struct Curl_easy *data, struct connectdata *conn, + const char *beg, const char *end); ++ ++#ifdef UNITTESTS ++#if defined(USE_GNUTLS) || defined(USE_SCHANNEL) || defined(USE_SECTRANSP) || \ ++ defined(USE_MBEDTLS) ++ ++/* used by unit1656.c */ ++CURLcode Curl_x509_GTime2str(struct dynbuf *store, ++ const char *beg, const char *end); ++#endif ++#endif ++ + #endif /* USE_GSKIT or USE_NSS or USE_GNUTLS or USE_WOLFSSL or USE_SCHANNEL + * or USE_SECTRANSP */ + #endif /* HEADER_CURL_X509ASN1_H */ +diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc +index 47117b6..5415f37 100644 +--- a/tests/data/Makefile.inc ++++ b/tests/data/Makefile.inc +@@ -208,7 +208,7 @@ test1620 test1621 \ + \ + test1630 test1631 test1632 test1633 test1634 \ + \ +-test1650 test1651 test1652 test1653 test1654 test1655 \ ++test1650 test1651 test1652 test1653 test1654 test1655 test1656 \ + test1660 test1661 \ + \ + test1700 test1701 test1702 test1703 \ +diff --git a/tests/data/test1656 b/tests/data/test1656 +new file mode 100644 +index 0000000..2fab21b +--- /dev/null ++++ b/tests/data/test1656 +@@ -0,0 +1,22 @@ ++ ++ ++ ++unittest ++Curl_x509_GTime2str ++ ++ ++ ++# ++# Client-side ++ ++ ++none ++ ++ ++unittest ++ ++ ++Curl_x509_GTime2str unit tests ++ ++ ++ +diff --git a/tests/unit/Makefile.inc b/tests/unit/Makefile.inc +index 7e7844e..b5650b2 100644 +--- a/tests/unit/Makefile.inc ++++ b/tests/unit/Makefile.inc +@@ -34,7 +34,7 @@ UNITPROGS = unit1300 unit1301 unit1302 unit1303 unit1304 unit1305 unit1307 \ + unit1600 unit1601 unit1602 unit1603 unit1604 unit1605 unit1606 unit1607 \ + unit1608 unit1609 unit1610 unit1611 unit1612 \ + unit1620 unit1621 \ +- unit1650 unit1651 unit1652 unit1653 unit1654 unit1655 \ ++ unit1650 unit1651 unit1652 unit1653 unit1654 unit1655 unit1656 \ + unit1660 unit1661 + + unit1300_SOURCES = unit1300.c $(UNITFILES) +@@ -155,6 +155,8 @@ unit1654_CPPFLAGS = $(AM_CPPFLAGS) + unit1655_SOURCES = unit1655.c $(UNITFILES) + unit1655_CPPFLAGS = $(AM_CPPFLAGS) + ++unit1656_SOURCES = unit1656.c $(UNITFILES) ++ + unit1660_SOURCES = unit1660.c $(UNITFILES) + unit1660_CPPFLAGS = $(AM_CPPFLAGS) + +diff --git a/tests/unit/unit1656.c b/tests/unit/unit1656.c +new file mode 100644 +index 0000000..644e72f +--- /dev/null ++++ b/tests/unit/unit1656.c +@@ -0,0 +1,133 @@ ++/*************************************************************************** ++ * _ _ ____ _ ++ * Project ___| | | | _ \| | ++ * / __| | | | |_) | | ++ * | (__| |_| | _ <| |___ ++ * \___|\___/|_| \_\_____| ++ * ++ * Copyright (C) Daniel Stenberg, , et al. ++ * ++ * This software is licensed as described in the file COPYING, which ++ * you should have received as part of this distribution. The terms ++ * are also available at https://curl.se/docs/copyright.html. ++ * ++ * You may opt to use, copy, modify, merge, publish, distribute and/or sell ++ * copies of the Software, and permit persons to whom the Software is ++ * furnished to do so, under the terms of the COPYING file. ++ * ++ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY ++ * KIND, either express or implied. ++ * ++ * SPDX-License-Identifier: curl ++ * ++ ***************************************************************************/ ++#include "curlcheck.h" ++ ++#include "vtls/x509asn1.h" ++ ++static CURLcode unit_setup(void) ++{ ++ return CURLE_OK; ++} ++ ++static void unit_stop(void) ++{ ++ ++} ++ ++#if defined(USE_GNUTLS) || defined(USE_SCHANNEL) || defined(USE_SECTRANSP) || \ ++ defined(USE_MBEDTLS) ++ ++#ifndef ARRAYSIZE ++#define ARRAYSIZE(A) (sizeof(A)/sizeof((A)[0])) ++#endif ++ ++struct test_spec { ++ const char *input; ++ const char *exp_output; ++ CURLcode exp_result; ++}; ++ ++static struct test_spec test_specs[] = { ++ { "190321134340", "1903-21-13 43:40:00", CURLE_OK }, ++ { "", NULL, CURLE_BAD_FUNCTION_ARGUMENT }, ++ { "WTF", NULL, CURLE_BAD_FUNCTION_ARGUMENT }, ++ { "0WTF", NULL, CURLE_BAD_FUNCTION_ARGUMENT }, ++ { "19032113434", NULL, CURLE_BAD_FUNCTION_ARGUMENT }, ++ { "19032113434WTF", NULL, CURLE_BAD_FUNCTION_ARGUMENT }, ++ { "190321134340.", NULL, CURLE_BAD_FUNCTION_ARGUMENT }, ++ { "190321134340.1", "1903-21-13 43:40:00.1", CURLE_OK }, ++ { "19032113434017.0", "1903-21-13 43:40:17", CURLE_OK }, ++ { "19032113434017.01", "1903-21-13 43:40:17.01", CURLE_OK }, ++ { "19032113434003.001", "1903-21-13 43:40:03.001", CURLE_OK }, ++ { "19032113434003.090", "1903-21-13 43:40:03.09", CURLE_OK }, ++ { "190321134340Z", "1903-21-13 43:40:00 GMT", CURLE_OK }, ++ { "19032113434017.0Z", "1903-21-13 43:40:17 GMT", CURLE_OK }, ++ { "19032113434017.01Z", "1903-21-13 43:40:17.01 GMT", CURLE_OK }, ++ { "19032113434003.001Z", "1903-21-13 43:40:03.001 GMT", CURLE_OK }, ++ { "19032113434003.090Z", "1903-21-13 43:40:03.09 GMT", CURLE_OK }, ++ { "190321134340CET", "1903-21-13 43:40:00 CET", CURLE_OK }, ++ { "19032113434017.0CET", "1903-21-13 43:40:17 CET", CURLE_OK }, ++ { "19032113434017.01CET", "1903-21-13 43:40:17.01 CET", CURLE_OK }, ++ { "190321134340+02:30", "1903-21-13 43:40:00 UTC+02:30", CURLE_OK }, ++ { "19032113434017.0+02:30", "1903-21-13 43:40:17 UTC+02:30", CURLE_OK }, ++ { "19032113434017.01+02:30", "1903-21-13 43:40:17.01 UTC+02:30", CURLE_OK }, ++ { "190321134340-3", "1903-21-13 43:40:00 UTC-3", CURLE_OK }, ++ { "19032113434017.0-04", "1903-21-13 43:40:17 UTC-04", CURLE_OK }, ++ { "19032113434017.01-01:10", "1903-21-13 43:40:17.01 UTC-01:10", CURLE_OK }, ++}; ++ ++static bool do_test(struct test_spec *spec, size_t i, struct dynbuf *dbuf) ++{ ++ CURLcode result; ++ const char *in = spec->input; ++ ++ Curl_dyn_reset(dbuf); ++ result = Curl_x509_GTime2str(dbuf, in, in + strlen(in)); ++ if(result != spec->exp_result) { ++ fprintf(stderr, "test %zu: expect result %d, got %d\n", ++ i, spec->exp_result, result); ++ return FALSE; ++ } ++ else if(!result && strcmp(spec->exp_output, Curl_dyn_ptr(dbuf))) { ++ fprintf(stderr, "test %zu: input '%s', expected output '%s', got '%s'\n", ++ i, in, spec->exp_output, Curl_dyn_ptr(dbuf)); ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ ++UNITTEST_START ++{ ++ size_t i; ++ struct dynbuf dbuf; ++ bool all_ok = TRUE; ++ ++ Curl_dyn_init(&dbuf, 32*1024); ++ ++ if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { ++ fprintf(stderr, "curl_global_init() failed\n"); ++ return TEST_ERR_MAJOR_BAD; ++ } ++ ++ for(i = 0; i < ARRAYSIZE(test_specs); ++i) { ++ if(!do_test(&test_specs[i], i, &dbuf)) ++ all_ok = FALSE; ++ } ++ fail_unless(all_ok, "some tests of Curl_x509_GTime2str() fails"); ++ ++ Curl_dyn_free(&dbuf); ++ curl_global_cleanup(); ++} ++UNITTEST_STOP ++ ++#else ++ ++UNITTEST_START ++{ ++ puts("not tested since Curl_x509_GTime2str() is not built-in"); ++} ++UNITTEST_STOP ++ ++#endif +-- +2.35.7 + diff --git a/meta/recipes-support/curl/curl_7.82.0.bb b/meta/recipes-support/curl/curl_7.82.0.bb index 72d8544e08..81a653b583 100644 --- a/meta/recipes-support/curl/curl_7.82.0.bb +++ b/meta/recipes-support/curl/curl_7.82.0.bb @@ -58,6 +58,8 @@ SRC_URI = "https://curl.se/download/${BP}.tar.xz \ file://CVE-2023-46219-0002.patch \ file://CVE-2023-46219-0003.patch \ file://CVE-2024-2398.patch \ + file://CVE-2024-7264_1.patch \ + file://CVE-2024-7264_2.patch \ " SRC_URI[sha256sum] = "0aaa12d7bd04b0966254f2703ce80dd5c38dbbd76af0297d3d690cdce58a583c" From patchwork Sun Aug 25 18:49:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 48193 X-Patchwork-Delegate: steve@sakoman.com 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 34436C54731 for ; Sun, 25 Aug 2024 18:50:05 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web10.37434.1724611801994339493 for ; Sun, 25 Aug 2024 11:50:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=yASfdZkP; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2d3da94f059so2437236a91.2 for ; Sun, 25 Aug 2024 11:50:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1724611801; x=1725216601; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=woDdN/nS08VA87R6iDArZFtZGcWPgw9UoPAP2cS8BPQ=; b=yASfdZkP8qIZWCt40pFz/Y35mrMD8X4vKTlasAtZOR9wyGkTjGzJrxokscSwPRTzpG CnIJCMSmDfaNB2nM25mZB2PhrBIGH6Le1duxkQ7qkJveZ2j+g2l7yXvFxn7BAWEH3xYy /RNM7JGNtkO1SQZi9jK2w2l4rRnauYHbzytLFnDFtwqFau5Tz8/agbMpmT5B/0/VCnob /7r003IGW+grQ2VzTaNOR6Y617bXP8F3CkCDjRi+sMWiqieIVwpD05UQdAp45Li8kdS4 NQkKQ+GhZKmr9JkHNwR6m0LKeMLiNgzaODlvKxSBD/XQ+ZEptxukZUr57PSPaugJLrw5 o2SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724611801; x=1725216601; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=woDdN/nS08VA87R6iDArZFtZGcWPgw9UoPAP2cS8BPQ=; b=rn50XLO4h36+5DGyvTHlz6+OZtDSByj8bsdZoeN2t6Z3UmEsd7QqGgk0xwRuu4TJ/R 10eaEf2UYWzFySHo3/Y3hZJCIi7OCQWu2LYiHbKly87vy3LBAT9SgbQi19ZRUf3u/Tm1 R6+a4/cDDA+lpwOGhS0AjUUX7WeGkVf3NHLAtfq0Lu7oEgHYCVo4TnMK3DQd+pdqU1PD b+kD14kPotRZo8FUbsMOSJXgnAEC/cvBt/viSteopDgdHDwFdWGJwRKsZ3Jv5Unlwn20 eAMfIg1IShhx7Zss7QVD0QSnrmns4eoPAu5FsqiVDsl+AsN5Qbnr4xiEb5gA0ngOkXzO SPbw== X-Gm-Message-State: AOJu0YzJWUlxLxaQ9DHP1465s6bVv5hs6AuHNxbnhU2TU/pIGIN0OgNy fRku0SMTdzNfGVajOPN4mR1mx52Nf4H9VGtJ2QOzeU3GNxtG7GXj3Q0SY7KE4FdwJWcNe0aNMxW rkh9+EQ== X-Google-Smtp-Source: AGHT+IH3K+29NS19Dn8ieS9hCOX+Q/TYEg8iJkcd5Kz4xN5XW/NjH5b2QYLW4+0BBLacPrb8flGfSA== X-Received: by 2002:a17:90b:1651:b0:2c9:cf1d:1bcc with SMTP id 98e67ed59e1d1-2d646d44d9dmr6161589a91.36.1724611801206; Sun, 25 Aug 2024 11:50:01 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2d61391fe09sm8294216a91.19.2024.08.25.11.50.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Aug 2024 11:50:00 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 4/6] python3: add PACKAGECONFIG[editline] Date: Sun, 25 Aug 2024 11:49:49 -0700 Message-Id: <12dc7d2081a1aaec90ffb3ed6718d757ce14b5ab.1724611692.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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, 25 Aug 2024 18:50:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/203729 From: Leon Anavi Backport PACKAGECONFIG[editline] from Scarthgap to Kirkstone because libedit has feature parity with readline but is more permissively licensed (BSD verses GPLv3). This patch provides means of enabling editline in a distribution without GPLv3 and in this case improves Python REPL keyboard support. Signed-off-by: Leon Anavi Signed-off-by: Steve Sakoman --- meta/recipes-devtools/python/python3_3.10.14.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/python/python3_3.10.14.bb b/meta/recipes-devtools/python/python3_3.10.14.bb index 31c458c09a..b5bc80ab88 100644 --- a/meta/recipes-devtools/python/python3_3.10.14.bb +++ b/meta/recipes-devtools/python/python3_3.10.14.bb @@ -106,7 +106,8 @@ CACHED_CONFIGUREVARS = " \ PACKAGECONFIG:class-target ??= "readline gdbm ${@bb.utils.filter('DISTRO_FEATURES', 'lto', d)}" PACKAGECONFIG:class-native ??= "readline gdbm" PACKAGECONFIG:class-nativesdk ??= "readline gdbm" -PACKAGECONFIG[readline] = ",,readline" +PACKAGECONFIG[readline] = "--with-readline=readline,,readline,,,editline" +PACKAGECONFIG[editline] = "--with-readline=editline,,libedit,,,readline" # Use profile guided optimisation by running PyBench inside qemu-user PACKAGECONFIG[pgo] = "--enable-optimizations,,qemu-native" PACKAGECONFIG[tk] = ",,tk" @@ -118,7 +119,7 @@ do_configure:prepend () { cat > ${B}/Modules/Setup.local << EOF *disabled* ${@bb.utils.contains('PACKAGECONFIG', 'gdbm', '', '_gdbm _dbm', d)} -${@bb.utils.contains('PACKAGECONFIG', 'readline', '', 'readline', d)} +${@bb.utils.contains_any('PACKAGECONFIG', 'readline editline', '', 'readline', d)} EOF } From patchwork Sun Aug 25 18:49:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 48191 X-Patchwork-Delegate: steve@sakoman.com 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 25A2FC5472C for ; Sun, 25 Aug 2024 18:50:05 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web11.37012.1724611803422165727 for ; Sun, 25 Aug 2024 11:50:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=u0bvJPPg; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-71456acebe8so998814b3a.3 for ; Sun, 25 Aug 2024 11:50:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1724611803; x=1725216603; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=iR0vkpIy9nCczthekizmpRvD3VV08z3DO8XUWQ3Rh+Y=; b=u0bvJPPgO3XOppKrrSyZ7VuFbDo46MbOwHWMHAm99NYcNbRACgDrIyDCeVt2gPyIlQ O33vLVIjmOt3HqFjMCFMeivje7v7FEjsfsPRFgSWMEeoe0ghLEsae9mulkKt7eZILnCp T3gDJblA4C1AYFxUucdfpwHYab0A4VsZqevDKG5o1n/PfJO2qwj94utsdNRIrBU+L+HE XsvVfhSY1mMa4isoGauXp0trmsZocbA+hlDvaNusFFngKLXGfX91MJwGIIoikfJV4cw/ v7zko0MIvzxR3pD+/wCpWa2mfXAbMDoOPHj9HgBQzDwIHCDXUea4wRDGIMMglPjNUsMx AT4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724611803; x=1725216603; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iR0vkpIy9nCczthekizmpRvD3VV08z3DO8XUWQ3Rh+Y=; b=dPVR/MkhYhvFFZFPWbEKw0lGIF8MehYFhBOnUsuprksLwBopzka1ZIxQoqbb6ZOzSb LxcMk2UEImMuhcq6cTLyQpUdtVobLn40Z5bwsBHoRkSV655DBMQiuEOjy1ch8KGqJux9 Auv568VscYaAAoxLZMjBPdKrWJGHOTGYWJxj8F1MGy8pdyU9EOFXX7S7nNGDOerkUhdV dItgmgHclh8Ixkv/pBU0eirJPH+ypAJr4+4aEKApJCREvVjF0fs796J5L2OAnXYjUjyy AezNg2E60gbLa+Pdc/GhwC7naUvvP9i9XyI5s5pH1zGyKP0KgLgoSM9HsrJbgbzDYZQX OIoQ== X-Gm-Message-State: AOJu0YzAI8pcn/c1PU3tZ5Velc8hzPne9O9wNpnTQoC49VXkwJQorDst 4pOYP883JKlMu66PrciIoTx69XMGe4JmdLCC1LZC/JNE/aID7zRHKafpzakgR+QutqmIcpp1M2H KJE92kQ== X-Google-Smtp-Source: AGHT+IHmbR8UJEde36oHF/AGEzafV6q16rMJP1EPRrjJ7/MNoQog4tJTolLMbGT3CWsFUK+VAmvtnA== X-Received: by 2002:a05:6a21:e8a:b0:1c6:ed16:30e4 with SMTP id adf61e73a8af0-1cc89d29e87mr9014640637.7.1724611802571; Sun, 25 Aug 2024 11:50:02 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2d61391fe09sm8294216a91.19.2024.08.25.11.50.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Aug 2024 11:50:02 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 5/6] image_types.bbclass: Use --force also with lz4,lzop Date: Sun, 25 Aug 2024 11:49:50 -0700 Message-Id: <35a92023766b562dab9f8561cc3adb4938b03692.1724611692.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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, 25 Aug 2024 18:50:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/203730 From: Niko Mauno Several conversion commands already make use of 'force' option in the compression, which enables overwriting existing files without prompting. Since occasionally an existing residual destination file from a previously aborted or failed task can prevent the re-execution of the conversion command task, by enabling the 'force' option also for lz4 and lzop compression commands we can avoid following kind of BitBake failures with these compressors: | DEBUG: Executing shell function do_image_cpio | 117685 blocks | 2 blocks | example-image.cpio.lz4 already exists; do you want to overwrite (y/N) ? not overwritten | Error 20 : example-image.cpio : open file error | WARNING: exit code 20 from a shell command. ERROR: Task (.../recipes-core/images/example-image.bb:do_image_cpio) failed with exit code '1' (From OE-Core rev: 623ab22434909f10aaf613cd3032cc2a2c6e3ff9) Signed-off-by: Niko Mauno Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- meta/classes/image_types.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 9d5f8c68a4..72245019f4 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -292,8 +292,8 @@ CONVERSION_CMD:lzma = "lzma -k -f -7 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" CONVERSION_CMD:gz = "gzip -f -9 -n -c --rsyncable ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.gz" CONVERSION_CMD:bz2 = "pbzip2 -f -k ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" CONVERSION_CMD:xz = "xz -f -k -c ${XZ_COMPRESSION_LEVEL} ${XZ_DEFAULTS} --check=${XZ_INTEGRITY_CHECK} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.xz" -CONVERSION_CMD:lz4 = "lz4 -9 -z -l ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.lz4" -CONVERSION_CMD:lzo = "lzop -9 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" +CONVERSION_CMD:lz4 = "lz4 -f -9 -z -l ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.lz4" +CONVERSION_CMD:lzo = "lzop -f -9 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" CONVERSION_CMD:zip = "zip ${ZIP_COMPRESSION_LEVEL} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.zip ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" CONVERSION_CMD:zst = "zstd -f -k -T0 -c ${ZSTD_COMPRESSION_LEVEL} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.zst" CONVERSION_CMD:sum = "sumtool -i ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} -o ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sum ${JFFS2_SUM_EXTRA_ARGS}" From patchwork Sun Aug 25 18:49:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 48190 X-Patchwork-Delegate: steve@sakoman.com 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 19999C5321E for ; Sun, 25 Aug 2024 18:50:05 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mx.groups.io with SMTP id smtpd.web11.37013.1724611804685128706 for ; Sun, 25 Aug 2024 11:50:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=DhhYcVqK; spf=softfail (domain: sakoman.com, ip: 209.85.215.182, mailfrom: steve@sakoman.com) Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-7cd830e0711so2754886a12.0 for ; Sun, 25 Aug 2024 11:50:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1724611804; x=1725216604; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=f1lopRC/reW/13oqb0mGLgzjNJen5adKOjogZ5MFNPw=; b=DhhYcVqKVQfhUppcY/qBFMshKhvFrra3v8+23geb56SlE+sGYJZ3LgIyQcfP5xxEmJ 1lZljoyyL35RRGiBEFFIFCf+uuHz23Z1WgtXTxsk0i+/GBhzkwK9sSozYlei79x/MIuD iIJLfvS8IsX9cpS6ibGZ+fWdtWPvQ48ZJJhz1KIxPImG/lhKDT0wkKkyQ8TFonmYdNol ZR3/H4pjd7BS7rbpywosIVY2WEtRdL17HVuXca06ZsKyDGtdzfjopXSOGS7BwQW7MCbc jkp/rHWAtceRAMBqf0EyjJbKoqZARaoUF/c6oXfoND0kqtBn7jMuvIk7LfQMN5uSRGXR MbRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724611804; x=1725216604; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f1lopRC/reW/13oqb0mGLgzjNJen5adKOjogZ5MFNPw=; b=JXNq1TSSTVSYviryG1md5l5s4IhBTCke/SDNRsoEa3wGgwmxSnJjEC/Oh/Wzw47qKE rSilpy0eghrbSnVj/TBHfomsz/RKMoKa2bAzAhJi5oU2Ih02IpFaAsWZ7NL9y6OV5BrX ILDOHQgVcbLXtDD5WLUcB3xAGxdYxan/kDGlNnq/5LP2ivzq3clm5DEv53NkRu68jCjT TklWzQbbI7SFijWsXryCsvECYUb80E1ILPae0rtT1S1z6LHk1eoTYpapttsw3Y1rynFN m+AoJ0qXM11YHs9nLbSP87ttmdTViD+xJwRZgqj55wX47DMv4jjIJD78sYHke9rG72KP vEXQ== X-Gm-Message-State: AOJu0YzuiBEjKjaz1JYFjFHhSwVKxa6fqwl/X9mmuYCzu4RxV3pkfXkf ACFxJSfcGf+DZyswjY3hb+BXuDROsE9r3xkSmZvLzyi9YcM/kwdOjznqWiglpx5PlzCBMxQDST3 P77Z/EA== X-Google-Smtp-Source: AGHT+IGgIFgqY74nrJJvu3ymMvfT+sTPpzklsIp4LJI5MKDH//ljjsZIAqSgrEZEwVzVKX44LxSLbg== X-Received: by 2002:a17:90b:180f:b0:2d3:c365:53b1 with SMTP id 98e67ed59e1d1-2d6447b2771mr14306994a91.6.1724611803907; Sun, 25 Aug 2024 11:50:03 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2d61391fe09sm8294216a91.19.2024.08.25.11.50.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Aug 2024 11:50:03 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 6/6] libsoup: fix compile error on centos7 Date: Sun, 25 Aug 2024 11:49:51 -0700 Message-Id: <963085afced737863cf4ff8515a1cf08365d5d87.1724611692.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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, 25 Aug 2024 18:50:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/203731 From: Guocai He Backport a patch [1] to fix the below build failure. FAILED: libsoup/libsoup-2.4.so.1.11.0.p/soup-address.c.o In file included from /usr/include/glib-2.0/gio/gnetworking.h:40, from ../libsoup-2.72.0/libsoup/soup-address.c:14: /usr/include/resolv.h:75:15: error: unknown type name ‘u_char’ const u_char **__query, ^~~~~~ [1] https://gitlab.gnome.org/GNOME/libsoup/-/commit/5c3d431bdb094c59997f2a23e31e83f815ab667c Signed-off-by: Guocai He Signed-off-by: Steve Sakoman --- .../0001-meson.build-set-c_std-to-gnu99.patch | 44 +++++++++++++++++++ .../libsoup/libsoup-2.4_2.74.2.bb | 4 +- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/libsoup/libsoup-2.4/0001-meson.build-set-c_std-to-gnu99.patch diff --git a/meta/recipes-support/libsoup/libsoup-2.4/0001-meson.build-set-c_std-to-gnu99.patch b/meta/recipes-support/libsoup/libsoup-2.4/0001-meson.build-set-c_std-to-gnu99.patch new file mode 100644 index 0000000000..4a7d189515 --- /dev/null +++ b/meta/recipes-support/libsoup/libsoup-2.4/0001-meson.build-set-c_std-to-gnu99.patch @@ -0,0 +1,44 @@ +From c41784deb1d4a923007ffe14cfa676f785808f45 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 21 Aug 2024 06:48:32 +0000 +Subject: [PATCH] meson.build: set c_std to gnu99 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Set c_std to gnu99 to avoid the following build failure with gcc 4.8: + +In file included from /tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/resolv.h:65:0, + from /tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/glib-2.0/gio/gnetworking.h:40, + from ../libsoup/soup-address.c:14: +/tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/arpa/nameser.h:115:2: error: unknown type name 'u_char' + const u_char *_msg, *_eom; + ^ + +Fixes: + - http://autobuild.buildroot.org/results/56b9cb987e25b99d6fed16c537552f47c3376f21 + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/5c3d431bdb094c59997f2a23e31e83f815ab667c] + +Signed-off-by: Fabrice Fontaine +Signed-off-by: guocai +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 3cc56fb..506c5a4 100644 +--- a/meson.build ++++ b/meson.build +@@ -2,7 +2,7 @@ project('libsoup', 'c', + version: '2.74.2', + meson_version : '>=0.50', + license : 'LGPL2', +- default_options : 'c_std=c99') ++ default_options : 'c_std=gnu99') + + gnome = import('gnome') + +-- +2.35.5 + diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.74.2.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.74.2.bb index 6ff393c9a3..be286e1849 100644 --- a/meta/recipes-support/libsoup/libsoup-2.4_2.74.2.bb +++ b/meta/recipes-support/libsoup/libsoup-2.4_2.74.2.bb @@ -11,7 +11,9 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 libpsl" SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" -SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" +SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \ + file://0001-meson.build-set-c_std-to-gnu99.patch \ + " SRC_URI[sha256sum] = "f0a427656e5fe19e1df71c107e88dfa1b2e673c25c547b7823b6018b40d01159" CVE_PRODUCT = "libsoup"