From patchwork Sat Jun 1 12:24:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 44499 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 6C3BCC25B76 for ; Sat, 1 Jun 2024 12:24:56 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web11.36105.1717244695857232652 for ; Sat, 01 Jun 2024 05:24:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=yUJWzobF; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1f6342c5faaso14143475ad.2 for ; Sat, 01 Jun 2024 05:24:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1717244695; x=1717849495; 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=PpsNJJ1vaTMj6Bab8Sc1T9LAO37T8gScAw8IneOXZtI=; b=yUJWzobFQFeXBlISXld6ygHz1CdZuJ/LGeG21HBvVTo3hm8fFU3gOzKE6VMV/Apdvx W6YBrG5dZAFvGVGMgT5rFZzoWQLVGbb/4N5snVMl1aSeD5RKoFyLMJtJEJFZNV/iinv6 A+s2ryIRAXrDbIRYo4mAJqo2vcWri9ZDhS8vIVdQZLplu9iso4jZX9Mh7va6z2qMvYcT BqFRRxguCvUDSE4R1ms+dh03tSgeLwnBnDbdhCVRg+/BDExEi6q/a67D6kelsgycUHHV UEEyMgRPztENjKRfwolhZ7mMR5eaF7F7eUuXA8yLQd7JJxYKLJounqU2HRDZ9wruKlkP 7kcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717244695; x=1717849495; 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=PpsNJJ1vaTMj6Bab8Sc1T9LAO37T8gScAw8IneOXZtI=; b=BdmHO0JY944C2qhNwz2/vK7mgDrqDTCJCfmzpA4ioJ8lTndCAxpkdpscJNmQV0yfm/ Pujq8PA+XS3AYgToPCPysT6uV3catPZjQwVDmu0W502Hy0yE3B42WhmjJnFSkMMI1uYi msId3cgmCG333ohE1Rg76ScFAs0N9V2M92Npd8cnOTzq8MZfM3efjTs4dNwdT6JJFrkd uBRuRS/bcLLHS4tf0DZrNXYVaTfPejTp/D3gwK/LzfhSJIeCeUpSzRSevv343L5k7YUW osCXveZ1mzXxbx9jDfrpd+1YuaSsoyUMFTfICTTBQDcu0wDREEvahnD9U+1pUEcMugz5 5IpA== X-Gm-Message-State: AOJu0YzsDkK9UB39E/4LDuVZi+u66S9N2hWMQvIbLK88woHKMtkWJHNT YtC5JrP+OMEs25a/SwLyAfA1QZlkFthwVe9r5qZSRkjivGOdJGgNmJZekw/PjJ1O8IQ2yTJYJMW 0 X-Google-Smtp-Source: AGHT+IFz/8aWJIqzj0AImfECIgxqMhTvPBbkq7u7GqDDadmdMGmluJh71Bcc3/cDxP6TaEz9g0rtyw== X-Received: by 2002:a17:902:f7d4:b0:1f6:1f90:987c with SMTP id d9443c01a7336-1f63709be5dmr32406085ad.48.1717244694725; Sat, 01 Jun 2024 05:24:54 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f63241d4d9sm31804165ad.296.2024.06.01.05.24.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jun 2024 05:24:54 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 01/21] ttyrun: define CVE_PRODUCT Date: Sat, 1 Jun 2024 05:24:27 -0700 Message-Id: <9e07ff39c1b2794d6de7f8d14cdf47707db50f5a.1717243719.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 ; Sat, 01 Jun 2024 12:24:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200097 From: Peter Marko Single executable ttyrun is taken ouf of s390-tools repository containing ton of other helper tools. CVEs are not assigned to executables, but to whole components. Historically there also already exists one CVE for s390-tools. Most of the CVEs will not be for ttyrun, but this is the way how to get notified even if most we get will have to be ignored. (From oe-core rev: df28547387c2c122aef3e5326b216ec3f4d3caa7) Signed-off-by: Peter Marko Signed-off-by: Steve Sakoman --- meta/recipes-core/ttyrun/ttyrun_2.31.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/ttyrun/ttyrun_2.31.0.bb b/meta/recipes-core/ttyrun/ttyrun_2.31.0.bb index 122dd9d8e7..fac11d6310 100644 --- a/meta/recipes-core/ttyrun/ttyrun_2.31.0.bb +++ b/meta/recipes-core/ttyrun/ttyrun_2.31.0.bb @@ -9,6 +9,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f5118f167b055bfd7c3450803f1847af" SRC_URI = "git://github.com/ibm-s390-linux/s390-tools;protocol=https;branch=master" SRCREV = "6f15ed326491a17d83ca60cd2bda47fb5e8a0175" +CVE_PRODUCT = "s390-tools" + S = "${WORKDIR}/git" EXTRA_OEMAKE = "\ From patchwork Sat Jun 1 12:24:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 44502 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 41F17C25B76 for ; Sat, 1 Jun 2024 12:25:06 +0000 (UTC) Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by mx.groups.io with SMTP id smtpd.web11.36106.1717244697817727688 for ; Sat, 01 Jun 2024 05:24:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=A/wX2HoK; spf=softfail (domain: sakoman.com, ip: 209.85.215.173, mailfrom: steve@sakoman.com) Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-6c53a315c6eso1045693a12.3 for ; Sat, 01 Jun 2024 05:24:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1717244697; x=1717849497; 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=Cq6mLixbadsvOWNNEFBjvZdLE6AU1MF33U2+QnxNg8o=; b=A/wX2HoKhRQwQiglGpRz9jE99zqJKt63lUMPxI7abTkJ55WdkKQRNFUjC78kNT+B/f z5IMbJ0Uu31dY1+JsaLr0z8ErilEhIhume2QtrTqp6JWzfPnqmiSGm7GQsDgtp/sWpPn OzGCxvwnuShptcczN9PMYjZt3WKAX7tGTSYUE1xbp385CWEE/s3putj4r4Ql4KwCIfaO g5SBg7DLHhAQ5OTt96NpC0Fgvpmv4pjFDgTHwGpUb4+d7vHPQXajrgOxpp2b5SvYZCDn JoaMAxk4hedo/aAxkrHvCP3IDBTnxru9TmmDkxkaH6AwKBOtOb4e5d6H/fAXgCxn1Kmj BGPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717244697; x=1717849497; 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=Cq6mLixbadsvOWNNEFBjvZdLE6AU1MF33U2+QnxNg8o=; b=d5C5NBcvV3mq6kDSrVQ+tE0tfl56UZh0lxXxoziiQ88yYCkbHk/EUEXDwHSZ1Isn+4 2ra7OTIJGHY6yNP8SL8oEij1DD2bl9l5sLZO3ahWNnCxjNMT6nJpLrNOVg+GKCYYM5mF mNadVD3FMN5pl3jw1zU9Yd+8FRf7azrV6V9PmWucce8es033oslohPW3PUXwpLejWYPZ sr1FsmqPzmhtg6VZzjprHIZFtr3jNfL8AX3yuK/WmSEXjRJx2fiO2Hm5a9PO9B7cdKjF oFyRmSE2cE/k0VkOJrh/bgc9epnFe+X9tzu5df634P2J85oYxtg4X4XejBu/6VN9Ogir T2pA== X-Gm-Message-State: AOJu0Yw1njETs18OZS/vWFq0YkhvsHek2JgrkzTdHzcE8nGo5m9tNFTi PCySxxYkkD6PxsSaJl4zneOuq/szs6lGu1vGaVXntEKBu6rLxBW8CuvFo26ZrXTxvEez7suH3LI l X-Google-Smtp-Source: AGHT+IEbAfbyEofdfVFij3FgYRq83jrf5tgVGi16aLH7mpKsqq6r/x/3620g5nNG19o1vMOFd/m8Mg== X-Received: by 2002:a17:902:eb8c:b0:1f3:35d9:432b with SMTP id d9443c01a7336-1f636fd2790mr45075995ad.10.1717244696993; Sat, 01 Jun 2024 05:24:56 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f63241d4d9sm31804165ad.296.2024.06.01.05.24.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jun 2024 05:24:56 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 02/21] ncurses: Fix CVE-2023-45918 Date: Sat, 1 Jun 2024 05:24:28 -0700 Message-Id: <5385b15345dddc958fc961246e56b962db735276.1717243719.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 ; Sat, 01 Jun 2024 12:25:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200098 From: Soumya Sambu From: Soumya Sambu ncurses 6.4-20230610 has a NULL pointer dereference in tgetstr in tinfo/lib_termcap.c. References: https://nvd.nist.gov/vuln/detail/CVE-2023-45918 (From OE-Core rev: 6573995adf4cfd48b036f8463b39f3864fcfd85b) Signed-off-by: Soumya Sambu Signed-off-by: Richard Purdie Signed-off-by: Peter Marko Signed-off-by: Steve Sakoman --- .../ncurses/files/CVE-2023-45918.patch | 180 ++++++++++++++++++ meta/recipes-core/ncurses/ncurses_6.4.bb | 1 + 2 files changed, 181 insertions(+) create mode 100644 meta/recipes-core/ncurses/files/CVE-2023-45918.patch diff --git a/meta/recipes-core/ncurses/files/CVE-2023-45918.patch b/meta/recipes-core/ncurses/files/CVE-2023-45918.patch new file mode 100644 index 0000000000..fbdae49a61 --- /dev/null +++ b/meta/recipes-core/ncurses/files/CVE-2023-45918.patch @@ -0,0 +1,180 @@ +From bcf02d3242f1c7d57224a95f7903fcf4b5e7695d Mon Sep 17 00:00:00 2001 +From: Thomas E. Dickey +Date: Fri, 16 Jun 2023 02:54:29 +0530 +Subject: [PATCH] Fix CVE-2023-45918 + +CVE: CVE-2023-45918 + +Upstream-Status: Backport [https://ncurses.scripts.mit.edu/?p=ncurses.git;a=commit;h=bcf02d3242f1c7d57224a95f7903fcf4b5e7695d] + +Signed-off-by: Soumya Sambu +--- + ncurses/tinfo/comp_error.c | 15 ++++++--- + ncurses/tinfo/read_entry.c | 65 ++++++++++++++++++++++++++------------ + 2 files changed, 56 insertions(+), 24 deletions(-) + +diff --git a/ncurses/tinfo/comp_error.c b/ncurses/tinfo/comp_error.c +index 48f48784..ee518e28 100644 +--- a/ncurses/tinfo/comp_error.c ++++ b/ncurses/tinfo/comp_error.c +@@ -60,8 +60,15 @@ _nc_get_source(void) + NCURSES_EXPORT(void) + _nc_set_source(const char *const name) + { +- FreeIfNeeded(SourceName); +- SourceName = strdup(name); ++ if (name == NULL) { ++ free(SourceName); ++ SourceName = NULL; ++ } else if (SourceName == NULL) { ++ SourceName = strdup(name); ++ } else if (strcmp(name, SourceName)) { ++ free(SourceName); ++ SourceName = strdup(name); ++ } + } + + NCURSES_EXPORT(void) +@@ -95,9 +102,9 @@ static NCURSES_INLINE void + where_is_problem(void) + { + fprintf(stderr, "\"%s\"", SourceName ? SourceName : "?"); +- if (_nc_curr_line >= 0) ++ if (_nc_curr_line > 0) + fprintf(stderr, ", line %d", _nc_curr_line); +- if (_nc_curr_col >= 0) ++ if (_nc_curr_col > 0) + fprintf(stderr, ", col %d", _nc_curr_col); + if (TermType != 0 && TermType[0] != '\0') + fprintf(stderr, ", terminal '%s'", TermType); +diff --git a/ncurses/tinfo/read_entry.c b/ncurses/tinfo/read_entry.c +index 341337d2..b0c3ad26 100644 +--- a/ncurses/tinfo/read_entry.c ++++ b/ncurses/tinfo/read_entry.c +@@ -138,12 +138,13 @@ convert_16bits(char *buf, NCURSES_INT2 *Numbers, int count) + } + #endif + +-static void +-convert_strings(char *buf, char **Strings, int count, int size, char *table) ++static bool ++convert_strings(char *buf, char **Strings, int count, int size, ++ char *table, bool always) + { + int i; + char *p; +- bool corrupt = FALSE; ++ bool success = TRUE; + + for (i = 0; i < count; i++) { + if (IS_NEG1(buf + 2 * i)) { +@@ -159,13 +160,10 @@ convert_strings(char *buf, char **Strings, int count, int size, char *table) + TR(TRACE_DATABASE, ("Strings[%d] = %s", i, + _nc_visbuf(Strings[i]))); + } else { +- if (!corrupt) { +- corrupt = TRUE; +- TR(TRACE_DATABASE, +- ("ignore out-of-range index %d to Strings[]", nn)); +- _nc_warning("corrupt data found in convert_strings"); +- } +- Strings[i] = ABSENT_STRING; ++ TR(TRACE_DATABASE, ++ ("found out-of-range index %d to Strings[%d]", nn, i)); ++ success = FALSE; ++ break; + } + } + +@@ -175,10 +173,25 @@ convert_strings(char *buf, char **Strings, int count, int size, char *table) + if (*p == '\0') + break; + /* if there is no NUL, ignore the string */ +- if (p >= table + size) ++ if (p >= table + size) { + Strings[i] = ABSENT_STRING; ++ } else if (p == Strings[i] && always) { ++ TR(TRACE_DATABASE, ++ ("found empty but required Strings[%d]", i)); ++ success = FALSE; ++ break; ++ } ++ } else if (always) { /* names are always needed */ ++ TR(TRACE_DATABASE, ++ ("found invalid but required Strings[%d]", i)); ++ success = FALSE; ++ break; + } + } ++ if (!success) { ++ _nc_warning("corrupt data found in convert_strings"); ++ } ++ return success; + } + + static int +@@ -382,7 +395,10 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) + if (Read(string_table, (unsigned) str_size) != str_size) { + returnDB(TGETENT_NO); + } +- convert_strings(buf, ptr->Strings, str_count, str_size, string_table); ++ if (!convert_strings(buf, ptr->Strings, str_count, str_size, ++ string_table, FALSE)) { ++ returnDB(TGETENT_NO); ++ } + } + #if NCURSES_XNAMES + +@@ -483,8 +499,10 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) + ("Before computing extended-string capabilities " + "str_count=%d, ext_str_count=%d", + str_count, ext_str_count)); +- convert_strings(buf, ptr->Strings + str_count, ext_str_count, +- ext_str_limit, ptr->ext_str_table); ++ if (!convert_strings(buf, ptr->Strings + str_count, ext_str_count, ++ ext_str_limit, ptr->ext_str_table, FALSE)) { ++ returnDB(TGETENT_NO); ++ } + for (i = ext_str_count - 1; i >= 0; i--) { + TR(TRACE_DATABASE, ("MOVE from [%d:%d] %s", + i, i + str_count, +@@ -516,10 +534,13 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) + TR(TRACE_DATABASE, + ("ext_NAMES starting @%d in extended_strings, first = %s", + base, _nc_visbuf(ptr->ext_str_table + base))); +- convert_strings(buf + (2 * ext_str_count), +- ptr->ext_Names, +- (int) need, +- ext_str_limit, ptr->ext_str_table + base); ++ if (!convert_strings(buf + (2 * ext_str_count), ++ ptr->ext_Names, ++ (int) need, ++ ext_str_limit, ptr->ext_str_table + base, ++ TRUE)) { ++ returnDB(TGETENT_NO); ++ } + } + + TR(TRACE_DATABASE, +@@ -572,13 +593,17 @@ _nc_read_file_entry(const char *const filename, TERMTYPE2 *ptr) + int limit; + char buffer[MAX_ENTRY_SIZE + 1]; + +- if ((limit = (int) fread(buffer, sizeof(char), sizeof(buffer), fp)) +- > 0) { ++ limit = (int) fread(buffer, sizeof(char), sizeof(buffer), fp); ++ if (limit > 0) { ++ const char *old_source = _nc_get_source(); + + TR(TRACE_DATABASE, ("read terminfo %s", filename)); ++ if (old_source == NULL) ++ _nc_set_source(filename); + if ((code = _nc_read_termtype(ptr, buffer, limit)) == TGETENT_NO) { + _nc_free_termtype2(ptr); + } ++ _nc_set_source(old_source); + } else { + code = TGETENT_NO; + } +-- +2.40.0 diff --git a/meta/recipes-core/ncurses/ncurses_6.4.bb b/meta/recipes-core/ncurses/ncurses_6.4.bb index 31f18bbadc..97130c06d6 100644 --- a/meta/recipes-core/ncurses/ncurses_6.4.bb +++ b/meta/recipes-core/ncurses/ncurses_6.4.bb @@ -7,6 +7,7 @@ SRC_URI += "file://0001-tic-hang.patch \ file://0001-Fix-CVE-2023-29491.patch \ file://0001-Updating-reset-code-ncurses-6.4-patch-20231104.patch \ file://CVE-2023-50495.patch \ + file://CVE-2023-45918.patch \ " # commit id corresponds to the revision in package version SRCREV = "79b9071f2be20a24c7be031655a5638f6032f29f" From patchwork Sat Jun 1 12:24:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 44506 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 73BB7C27C53 for ; Sat, 1 Jun 2024 12:25:06 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web11.36107.1717244699516597029 for ; Sat, 01 Jun 2024 05:24:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=BO5V9/1Q; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1f6262c0a22so14573415ad.1 for ; Sat, 01 Jun 2024 05:24:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1717244699; x=1717849499; 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=w5hxJV99rkfROveOUOpjk7E9Nd/rYqkN/Nrx+CyeiUE=; b=BO5V9/1Qxc2cDkcAZ/GEwKwZhJomh+nWmWtesuOacxyCCLNfxDpC5/7zNvgrtD3Pt+ hTHTgZOrbuOH0ZcD7wYVIA2aIUPumGtwa9AmrGfKhoADgMcYzWfIk+z4o5tL9jt6ZNrR aNby+nYxEilHaxpDJ9TbX76qNAGp6sLLlXXSaIojdmEgk+Uu4veIqUEMIPUQm5MxQ3z2 BDY0kfLSXMfbQ+BR0sFvYBc8bDXfMbGN6GnOtNiX98W/LFPd/Za0UrNsj8lOtE9hIVeN fyZabCqRTVdkjPsNw4kNYTgDju3pTEo6Zr3zyrq6drnQOOwFu/b1tvr0bMs4oi33Yf28 vSQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717244699; x=1717849499; 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=w5hxJV99rkfROveOUOpjk7E9Nd/rYqkN/Nrx+CyeiUE=; b=qRq2vqNzyW2BY3gqa4xUMNepY30HfUrddiJeDMRhuk5SaVTJs3aVy8CL3Jb2g/h223 DyDo49gFAdhTLCMHlND8Qph3FKabJImGbDCR+sGOadoCausAdiuP8JrDRP9lSoQY2nXx PveWQc42/CAbE8mEjStDtd8FV5Jn4ictqn8e1FCzSOLrsN8ew3hOq3azOftff0BI3h8L XMuccC7yYbXNGXPZTR41ffnQEqZ565tuCbdx2BsmW8DaxfLP62G0RIDIpQ93DlhLGXs7 DrXWUuDb7ATVgBnJ1Zo1kNnMNLhPDWK2UA8h7XP6KGWUx0h4nHW8E0otxcLOR0mnqBVN /HRg== X-Gm-Message-State: AOJu0YwXynN4vSXAuRwSgitsKgumeaS53G+c1rRXlD0W+pkgM2PeZIMU RA+x4U+uFJFTtbuGqpLxPxHka1RBP7OllHOdvKagv99Mte9fyq67oGfKWtWmKPzj9P2jU3nqRXu c X-Google-Smtp-Source: AGHT+IFYHcrznXNoZeiX0WWQafnMucqVZamVu801SWa/dtNlLf8DqbQWSTZk+n4GOe5cZmAC0yeWsg== X-Received: by 2002:a17:902:ec88:b0:1f6:62aa:e0e with SMTP id d9443c01a7336-1f662aa0fc0mr2047435ad.15.1717244698727; Sat, 01 Jun 2024 05:24:58 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f63241d4d9sm31804165ad.296.2024.06.01.05.24.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jun 2024 05:24:58 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 03/21] libusb1: Set CVE_PRODUCT Date: Sat, 1 Jun 2024 05:24:29 -0700 Message-Id: <89e991380aac2bea93732a8dff1c4c646bb2cea1.1717243719.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 ; Sat, 01 Jun 2024 12:25:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200099 From: Ricardo Simoes From: Ricardo Simoes This commit sets the CVE_PRODUCT variable to "libusb" to match the product name used in the NIST CPE database [1]. [1]: https://nvd.nist.gov/products/cpe/search Signed-off-by: Ricardo Simoes Signed-off-by: Mark Jonas Signed-off-by: Alexandre Belloni Signed-off-by: Peter Marko Signed-off-by: Steve Sakoman --- meta/recipes-support/libusb/libusb1_1.0.27.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-support/libusb/libusb1_1.0.27.bb b/meta/recipes-support/libusb/libusb1_1.0.27.bb index f2431d75c8..5bf854f95d 100644 --- a/meta/recipes-support/libusb/libusb1_1.0.27.bb +++ b/meta/recipes-support/libusb/libusb1_1.0.27.bb @@ -8,6 +8,8 @@ SECTION = "libs" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +CVE_PRODUCT = "libusb" + BBCLASSEXTEND = "native nativesdk" SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libusb-${PV}.tar.bz2 \ From patchwork Sat Jun 1 12:24:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 44501 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 42B2CC41513 for ; Sat, 1 Jun 2024 12:25:06 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web10.36153.1717244701018805677 for ; Sat, 01 Jun 2024 05:25:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=rEpm3aYr; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1f65a3abd01so1774825ad.3 for ; Sat, 01 Jun 2024 05:25:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1717244700; x=1717849500; 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=CNmHJ8ghS4KyE8+EYkuwnwIt1TAolfVhKWlq5d94kxQ=; b=rEpm3aYr/NUY2XQs1u6T9jnFS8l10JGwqC6PsXRtvtwLA+xzJSIS7KOD+1fQc2gPit WwO/Q6SHkMVnsL+5S6zLQmRIlkiE60iOZEjEWXkstwX8wxbKKNOE3h+n/c4o9wmCG5nT 2t78z83eBnA/xpYAwSk8q18cXTUb2tFDt0jtfy7+6eXhOLneF3zkX2qn6wSTeGqZSi1z 7QKAm/keG9gSDY6EG9z2zui7HOEX5IMeeyBuu5SJFrVwX+hpeHU3ho2acEyai+Jvdiuq L7vdCPdJ3o8+z9SznhQezHFR3h9Rat+N5qjwx0CzK0sOKM4Rvl1culV/wVNI9OwJTjfU Krmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717244700; x=1717849500; 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=CNmHJ8ghS4KyE8+EYkuwnwIt1TAolfVhKWlq5d94kxQ=; b=PicmDQz9QUSC/omTwycEkZ1ESFVgc8WhgVDmX0y7UmbH8ysuVAFHvypQwv37BaNhre ccELGc5Edphs58hizrj0liamHZ3qgfGzNDvuR9tTyDwNN5jkKwP6wzITmKaNPdk0nP9Y 0PIAR0zZlyZwdr4SwRTqzA/OR5voT32TxVkhdm1GzHKVWqCsG80CtukvoAEaPrlZcsKl JyXCbqyweYHSeRFEEAEDsff3piX2uXxOQ4XWuU9ypzPoI0oH7xCFfyFderCxFs9YWUb4 8FFQIOFm6oEo3rWqGzvb8B2Xuzlu1qbMm3Vvs9PdXcJF/Is6/IPkG/BwSWXO4M8hdLDC /n0Q== X-Gm-Message-State: AOJu0YzNdn4Tq+u5IIUM8DeqvTcioIgh6Ti+wZAekS9rrL1X07ARRNNU 9o/3JYnbhsKkj32+tQUcjFV4rfPsXrKp5VL2QMKliFq2mTkQI2stULY/8zOzHG70bqV9ziP3Ql5 G X-Google-Smtp-Source: AGHT+IE2u3EhuRPLQNeesPHmNf+ScisNYTnLrYZKqkIkuJ+p0/16n7KYzxiM/XMMmjZtyCA+uby5qw== X-Received: by 2002:a17:902:d2d0:b0:1f4:af72:35da with SMTP id d9443c01a7336-1f6370b120bmr56531065ad.65.1717244700214; Sat, 01 Jun 2024 05:25:00 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f63241d4d9sm31804165ad.296.2024.06.01.05.24.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jun 2024 05:24:59 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 04/21] ghostscript: fix CVE-2024-33870 Date: Sat, 1 Jun 2024 05:24:30 -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 ; Sat, 01 Jun 2024 12:25:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200100 From: Archana Polampalli Signed-off-by: Archana Polampalli Signed-off-by: Steve Sakoman --- .../ghostscript/CVE-2024-33870.patch | 99 +++++++++++++++++++ .../ghostscript/ghostscript_10.02.1.bb | 1 + 2 files changed, 100 insertions(+) create mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33870.patch diff --git a/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33870.patch b/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33870.patch new file mode 100644 index 0000000000..9c2b9dcfa2 --- /dev/null +++ b/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33870.patch @@ -0,0 +1,99 @@ +From 79aef19c685984dc3da2dc090450407d9fbcff80 Mon Sep 17 00:00:00 2001 +From: Ken Sharp +Date: Tue, 26 Mar 2024 12:00:14 +0000 +Subject: [PATCH 1/5] Bug #707686 + +See bug thread for details + +In addition to the noted bug; an error path (return from +gp_file_name_reduce not successful) could elad to a memory leak as we +did not free 'bufferfull'. Fix that too. + +This addresses CVE-2024-33870 + +CVE: CVE-2024-33870 + +Upstream-Status: Backport [https://cgit.ghostscript.com/cgi-bin/cgit.cgi/ghostpdl.git/commit/?id=79aef19c685984dc] + +Signed-off-by: Archana Polampalli +--- + base/gpmisc.c | 36 ++++++++++++++++++++++++++++++++---- + 1 file changed, 32 insertions(+), 4 deletions(-) + +diff --git a/base/gpmisc.c b/base/gpmisc.c +index 2b0064b..c4a69b0 100644 +--- a/base/gpmisc.c ++++ b/base/gpmisc.c +@@ -1,4 +1,4 @@ +-/* Copyright (C) 2001-2023 Artifex Software, Inc. ++/* Copyright (C) 2001-2024 Artifex Software, Inc. + All Rights Reserved. + + This software is provided AS-IS with no warranty, either express or +@@ -1042,7 +1042,7 @@ gp_validate_path_len(const gs_memory_t *mem, + const uint len, + const char *mode) + { +- char *buffer, *bufferfull; ++ char *buffer, *bufferfull = NULL; + uint rlen; + int code = 0; + const char *cdirstr = gp_file_name_current(); +@@ -1096,8 +1096,10 @@ gp_validate_path_len(const gs_memory_t *mem, + return gs_error_VMerror; + + buffer = bufferfull + prefix_len; +- if (gp_file_name_reduce(path, (uint)len, buffer, &rlen) != gp_combine_success) +- return gs_error_invalidfileaccess; ++ if (gp_file_name_reduce(path, (uint)len, buffer, &rlen) != gp_combine_success) { ++ code = gs_note_error(gs_error_invalidfileaccess); ++ goto exit; ++ } + buffer[rlen] = 0; + } + while (1) { +@@ -1132,9 +1134,34 @@ gp_validate_path_len(const gs_memory_t *mem, + code = gs_note_error(gs_error_invalidfileaccess); + } + if (code < 0 && prefix_len > 0 && buffer > bufferfull) { ++ uint newlen = rlen + cdirstrl + dirsepstrl; ++ char *newbuffer; ++ int code; ++ + buffer = bufferfull; + memcpy(buffer, cdirstr, cdirstrl); + memcpy(buffer + cdirstrl, dirsepstr, dirsepstrl); ++ ++ /* We've prepended a './' or similar for the current working directory. We need ++ * to execute file_name_reduce on that, to eliminate any '../' or similar from ++ * the (new) full path. ++ */ ++ newbuffer = (char *)gs_alloc_bytes(mem->thread_safe_memory, newlen + 1, "gp_validate_path"); ++ if (newbuffer == NULL) { ++ code = gs_note_error(gs_error_VMerror); ++ goto exit; ++ } ++ ++ memcpy(newbuffer, buffer, rlen + cdirstrl + dirsepstrl); ++ newbuffer[newlen] = 0x00; ++ ++ code = gp_file_name_reduce(newbuffer, (uint)newlen, buffer, &newlen); ++ gs_free_object(mem->thread_safe_memory, newbuffer, "gp_validate_path"); ++ if (code != gp_combine_success) { ++ code = gs_note_error(gs_error_invalidfileaccess); ++ goto exit; ++ } ++ + continue; + } + else if (code < 0 && cdirstrl > 0 && prefix_len == 0 && buffer == bufferfull) { +@@ -1153,6 +1180,7 @@ gp_validate_path_len(const gs_memory_t *mem, + gs_path_control_flag_is_scratch_file); + } + ++exit: + gs_free_object(mem->thread_safe_memory, bufferfull, "gp_validate_path"); + #ifdef EACCES + if (code == gs_error_invalidfileaccess) +-- +2.40.0 diff --git a/meta/recipes-extended/ghostscript/ghostscript_10.02.1.bb b/meta/recipes-extended/ghostscript/ghostscript_10.02.1.bb index 3dff16eec2..ca6f628f38 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_10.02.1.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_10.02.1.bb @@ -26,6 +26,7 @@ SRC_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/downlo file://ghostscript-9.16-Werror-return-type.patch \ file://avoid-host-contamination.patch \ file://configure.ac-add-option-to-explicitly-disable-neon.patch \ + file://CVE-2024-33870.patch \ " SRC_URI[sha256sum] = "e429e4f5b01615a4f0f93a4128e8a1a4d932dff983b1774174c79c0630717ad9" From patchwork Sat Jun 1 12:24:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 44505 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 57B0CC27C4F for ; Sat, 1 Jun 2024 12:25:06 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web10.36155.1717244702599890309 for ; Sat, 01 Jun 2024 05:25:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=J72QMseU; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1f47f07aceaso16028285ad.0 for ; Sat, 01 Jun 2024 05:25:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1717244702; x=1717849502; 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=mbsx/bQydrlXw/lQez8RCl/4uNoZVsr3cF+QT+kJOoU=; b=J72QMseUDWjdSDTRS+afjXG4FQKIjCnBK8w6OXBONG5p+0dNvt8lECLWch/TXTPLey B5LP5Gm2H6iDlDHvuFhpfeRpLsatFqCu7oMk8QSat7XWLBgHsVGhmFv5jVi7MyPWZOz5 bw8vTGPY1YGBViXofgX9pCBXjb5+xh4yhfbUOP+AXlRzj83YnPo00UtMgou9Re9gRDxW CmBpDL5ZrSlvGkO3skiLkxcgO4pESpsTiADaa0BVGvc/qY2HqU+QH2O8G/7UMQB+EYYk cZu6nPrPnDGWtZYcKpsPchE2mOE0BxnInqF/nhNl3RMS6sHDnl72bCd7kvTtPWAAUKDA jm4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717244702; x=1717849502; 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=mbsx/bQydrlXw/lQez8RCl/4uNoZVsr3cF+QT+kJOoU=; b=H5NMkLEANwTX0T5U71FfwuHBRnsBRsHgj7TAXYq/HZ9tIXh0BOGsNdG2TPkC+2zeYd sx2C0eKDd1Z0HhrcoPXJnpbX4ra+JRbb5PMpnUkG0cUutCy9dYdILLcQrcKouu4OOSHM DOwgw6ETQ+yyVfwhLZonClogkRpBHsqP0q9Qp8k7kvnV5LzpxPEoyudFROjiEoF06ab3 GhHt4jEA3Xl0bxEl09k1CnEnSQk9xkcsDnHYPywiRwzOh2e6/Lo/9MMiu3uNZlB8YXA5 pssFnHUXCfBF3QQ+OEVAniXUgrSq+kK0361XEKcWNny6oAt6Quz9sDNPVGQx6VEdZSWO y4SQ== X-Gm-Message-State: AOJu0Yz7D4ZisN2iwJ4VMtSqyyEJsKGr7Vo5syue1FkYdxMk/jTwXQZw ljF3DPvSaJTMNyTWuQTcdXpA7+owhMnlP3DxySIcdXPOaToRx9JMMPVpVMw2bGtf6lkJ/0FKPpm H X-Google-Smtp-Source: AGHT+IE8/h/+A4Mfzp5Xnpzb3dSw0FUNcCP4QH9lAJIyS/ZHrkk/eLYjKrwHwPd7KZDnCfCtcrlKZw== X-Received: by 2002:a17:902:c94b:b0:1f4:5d87:ffb3 with SMTP id d9443c01a7336-1f636fe89e5mr60583625ad.17.1717244701583; Sat, 01 Jun 2024 05:25:01 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f63241d4d9sm31804165ad.296.2024.06.01.05.25.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jun 2024 05:25:01 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 05/21] ghostscript: fix CVE-2024-33869 Date: Sat, 1 Jun 2024 05:24:31 -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 ; Sat, 01 Jun 2024 12:25:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200101 From: Archana Polampalli Signed-off-by: Archana Polampalli Signed-off-by: Steve Sakoman --- .../ghostscript/CVE-2024-33869-0001.patch | 39 ++++++++++++++ .../ghostscript/CVE-2024-33869-0002.patch | 52 +++++++++++++++++++ .../ghostscript/ghostscript_10.02.1.bb | 2 + 3 files changed, 93 insertions(+) create mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33869-0001.patch create mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33869-0002.patch diff --git a/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33869-0001.patch b/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33869-0001.patch new file mode 100644 index 0000000000..2f20c66ea3 --- /dev/null +++ b/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33869-0001.patch @@ -0,0 +1,39 @@ +From 5ae2e320d69a7d0973011796bd388cd5befa1a43 Mon Sep 17 00:00:00 2001 +From: Ken Sharp +Date: Tue, 26 Mar 2024 12:02:57 +0000 +Subject: [PATCH 2/5] Bug #707691 + +Part 1; when stripping a potential Current Working Dirctory specifier +from a path, make certain it really is a CWD, and not simply large +ebough to be a CWD. + +Reasons are in the bug thread, this is not (IMO) serious. + +This is part of the fix for CVE-2024-33869 + +CVE: CVE-2024-33869 + +Upstream-Status: Backport [https://cgit.ghostscript.com/cgi-bin/cgit.cgi/ghostpdl.git/commit/?id=5ae2e320d69a7d0973] + +Signed-off-by: Archana Polampalli +--- + base/gpmisc.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/base/gpmisc.c b/base/gpmisc.c +index c4a69b0..1d4d5d8 100644 +--- a/base/gpmisc.c ++++ b/base/gpmisc.c +@@ -1164,8 +1164,8 @@ gp_validate_path_len(const gs_memory_t *mem, + + continue; + } +- else if (code < 0 && cdirstrl > 0 && prefix_len == 0 && buffer == bufferfull) { +- buffer = bufferfull + cdirstrl + dirsepstrl; ++ else if (code < 0 && cdirstrl > 0 && prefix_len == 0 && buffer == bufferfull ++ && memcmp(buffer, cdirstr, cdirstrl) && !memcmp(buffer + cdirstrl, dirsepstr, dirsepstrl)) { + continue; + } + break; +-- +2.40.0 diff --git a/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33869-0002.patch b/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33869-0002.patch new file mode 100644 index 0000000000..5dcbcca998 --- /dev/null +++ b/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33869-0002.patch @@ -0,0 +1,52 @@ +From f5336e5b4154f515ac83bc5b9eba94302e6618d4 Mon Sep 17 00:00:00 2001 +From: Ken Sharp +Date: Tue, 26 Mar 2024 12:07:18 +0000 +Subject: [PATCH 3/5] Bug 707691 part 2 + +See bug thread for details + +This is the second part of the fix for CVE-2024-33869 + +CVE: CVE-2024-33869 + +Upstream-Status: Backport [https://cgit.ghostscript.com/cgi-bin/cgit.cgi/ghostpdl.git/commit/?id=f5336e5b4154f515ac83] + +Signed-off-by: Archana Polampalli +--- + base/gpmisc.c | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +diff --git a/base/gpmisc.c b/base/gpmisc.c +index 1d4d5d8..b0d5c71 100644 +--- a/base/gpmisc.c ++++ b/base/gpmisc.c +@@ -1090,6 +1090,27 @@ gp_validate_path_len(const gs_memory_t *mem, + rlen = len; + } + else { ++ char *test = (char *)path, *test1; ++ uint tlen = len, slen; ++ ++ /* Look for any pipe (%pipe% or '|' specifications between path separators ++ * Reject any path spec which has a %pipe% or '|' anywhere except at the start. ++ */ ++ while (tlen > 0) { ++ if (test[0] == '|' || (tlen > 5 && memcmp(test, "%pipe", 5) == 0)) { ++ code = gs_note_error(gs_error_invalidfileaccess); ++ goto exit; ++ } ++ test1 = test; ++ slen = search_separator((const char **)&test, path + len, test1, 1); ++ if(slen == 0) ++ break; ++ test += slen; ++ tlen -= test - test1; ++ if (test >= path + len) ++ break; ++ } ++ + rlen = len+1; + bufferfull = (char *)gs_alloc_bytes(mem->thread_safe_memory, rlen + prefix_len, "gp_validate_path"); + if (bufferfull == NULL) +-- +2.40.0 diff --git a/meta/recipes-extended/ghostscript/ghostscript_10.02.1.bb b/meta/recipes-extended/ghostscript/ghostscript_10.02.1.bb index ca6f628f38..91285ed2ad 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_10.02.1.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_10.02.1.bb @@ -27,6 +27,8 @@ SRC_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/downlo file://avoid-host-contamination.patch \ file://configure.ac-add-option-to-explicitly-disable-neon.patch \ file://CVE-2024-33870.patch \ + file://CVE-2024-33869-0001.patch \ + file://CVE-2024-33869-0002.patch \ " SRC_URI[sha256sum] = "e429e4f5b01615a4f0f93a4128e8a1a4d932dff983b1774174c79c0630717ad9" From patchwork Sat Jun 1 12:24:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 44504 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 57F5BC27C51 for ; Sat, 1 Jun 2024 12:25:06 +0000 (UTC) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mx.groups.io with SMTP id smtpd.web10.36156.1717244703968853107 for ; Sat, 01 Jun 2024 05:25:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=YetGH3hR; spf=softfail (domain: sakoman.com, ip: 209.85.214.178, mailfrom: steve@sakoman.com) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1f44b45d6abso20968295ad.0 for ; Sat, 01 Jun 2024 05:25:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1717244703; x=1717849503; 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=U2fKnvmSzXFNKsC2kaIY/ZKGck9eKm5iZA1sQKa8ORU=; b=YetGH3hRyE4glaByqI7P8opnE90Ab0TIDgDF1tNW0eS4sUhazJ3Q63sXrnSFn89dWK LkqzYF43JPnyuuhb1SAakeOwCzP4Jc4QlzODHDfjc/QgH35WQo2bleg8G6Vdw7JBlXCQ ZW876XtdIj1RUbQg34sAkSTaqqxE8fc8cC9IRugBvJKFIxuiVqPNy20Na0jU7Hw1kXws cwezM7lXjCvMdUgd5KWKsvYR0yTeJ5ofnIILpGAn5gj6nSlwnRVj+zFI1IdELlVKuNQH K+FMGRuTazQdphkrx9fnCCVhZgJ6yEAzDqKY8k+at0yPbuNU3bz03De+e5RebEy/BGLx UvWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717244703; x=1717849503; 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=U2fKnvmSzXFNKsC2kaIY/ZKGck9eKm5iZA1sQKa8ORU=; b=ZF9O0Wa1vC5Fk56A3a6j+1L9maTY2D3Fg6Q3eJyqWKw1bfbcml18CeGiB+jpY6ac33 N7YXR+gE0WjJlsuE1y/glj3kAj8aOFYx3p/QKR8/pi6YkceIXfJNLvUfu4HePTHJzH9L ftUgEicLEWlfCIzbsoadTJi7HpJOkupuvOafMvPI+8uiGADvRRvF3scOW3k8ewPy1dsT Ico3osy/CCRfb5F3X5+q/j/s3W0CEFCVPXNDTn34V59RiwbZhoINb2wve9cdpI+IyyJD faC9Go8FMtwMH2yp/KUS06KQ5GSNgo+vtQ64ZlEY2yhlkMc3eh6P1bQz2ErZbzlXJlBg LXfQ== X-Gm-Message-State: AOJu0YyEN4PeL6Rec941HbYkRR1tdB6VeyLdySXbBKbu2Nd6VS1+z3Om yO9hnPS64s/mRJYKnjYtu+mzOhPO1blpqjdPwwdBBTJpaa7gWXFLbS2t52T9fI6430tOtHsJ8Uo i X-Google-Smtp-Source: AGHT+IGH2sfbPN/efPJRbrG2w5P6PfD27MuI1t0wjUG8Rc+8qiTPIgOUuIHgvm+jKn2t/GBVKekecg== X-Received: by 2002:a17:903:32c2:b0:1f3:2e5d:902d with SMTP id d9443c01a7336-1f636fd9704mr50378575ad.4.1717244702917; Sat, 01 Jun 2024 05:25:02 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f63241d4d9sm31804165ad.296.2024.06.01.05.25.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jun 2024 05:25:02 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 06/21] ghostscript: fix CVE-2024-33871 Date: Sat, 1 Jun 2024 05:24:32 -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 ; Sat, 01 Jun 2024 12:25:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200102 From: Archana Polampalli Signed-off-by: Archana Polampalli Signed-off-by: Steve Sakoman --- .../ghostscript/CVE-2024-33871.patch | 43 +++++++++++++++++++ .../ghostscript/ghostscript_10.02.1.bb | 1 + 2 files changed, 44 insertions(+) create mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33871.patch diff --git a/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33871.patch b/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33871.patch new file mode 100644 index 0000000000..abe6384997 --- /dev/null +++ b/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-33871.patch @@ -0,0 +1,43 @@ +From 7145885041bb52cc23964f0aa2aec1b1c82b5908 Mon Sep 17 00:00:00 2001 +From: Zdenek Hutyra +Date: Mon, 22 Apr 2024 13:33:47 +0100 +Subject: [PATCH 4/5] OPVP device - prevent unsafe parameter change with SAFER + +Bug #707754 "OPVP device - Arbitrary code execution via custom Driver library" + +The "Driver" parameter for the "opvp"/"oprp" device specifies the name +of a dynamic library and allows any library to be loaded. + +The patch does not allow changing this parameter after activating path +control. + +This addresses CVE-2024-33871 + +CVE: CVE-2024-33871 + +Upstream-Status: Backport [https://cgit.ghostscript.com/cgi-bin/cgit.cgi/ghostpdl.git/commit/?id=7145885041bb52cc2396] + +Signed-off-by: Archana Polampalli +--- + contrib/opvp/gdevopvp.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/contrib/opvp/gdevopvp.c b/contrib/opvp/gdevopvp.c +index 74200cf..80eb23b 100644 +--- a/contrib/opvp/gdevopvp.c ++++ b/contrib/opvp/gdevopvp.c +@@ -3456,6 +3456,12 @@ _put_params(gx_device *dev, gs_param_list *plist) + code = param_read_string(plist, pname, &vdps); + switch (code) { + case 0: ++ if (gs_is_path_control_active(dev->memory) ++ && (!opdev->globals.vectorDriver || strlen(opdev->globals.vectorDriver) != vdps.size ++ || memcmp(opdev->globals.vectorDriver, vdps.data, vdps.size) != 0)) { ++ param_signal_error(plist, pname, gs_error_invalidaccess); ++ return_error(gs_error_invalidaccess); ++ } + buff = realloc(buff, vdps.size + 1); + memcpy(buff, vdps.data, vdps.size); + buff[vdps.size] = 0; +-- +2.40.0 diff --git a/meta/recipes-extended/ghostscript/ghostscript_10.02.1.bb b/meta/recipes-extended/ghostscript/ghostscript_10.02.1.bb index 91285ed2ad..8bda4404cc 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_10.02.1.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_10.02.1.bb @@ -29,6 +29,7 @@ SRC_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/downlo file://CVE-2024-33870.patch \ file://CVE-2024-33869-0001.patch \ file://CVE-2024-33869-0002.patch \ + file://CVE-2024-33871.patch \ " SRC_URI[sha256sum] = "e429e4f5b01615a4f0f93a4128e8a1a4d932dff983b1774174c79c0630717ad9" From patchwork Sat Jun 1 12:24:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 44503 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 642A7C27C52 for ; Sat, 1 Jun 2024 12:25:06 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web10.36158.1717244705110497156 for ; Sat, 01 Jun 2024 05:25:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=DSLsdH/o; spf=softfail (domain: sakoman.com, ip: 209.85.214.179, mailfrom: steve@sakoman.com) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1f480624d0dso23686295ad.1 for ; Sat, 01 Jun 2024 05:25:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1717244704; x=1717849504; 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=QdSzq2A82jghBt4zQBv3GyrK83FFWGl9ksvAlOrMydA=; b=DSLsdH/oACgz9oLD322xM5jVhwYIpq3GfXkAZcNBR4QixfoDy6N+/UXnDjk0yN5xzQ tZywRDyrWG7dM0GGL91Lu6Wf4kpZUEcXKCD58J5dFDDQsdKmMpZZZgp13GQqFkhoKLbY 6qPXVqi7WEsAHQNpQiyYTKspqHqe1SCHoEvuI6ZJfXYz7+DriC5rzUcpk3oOI2hLHnRN noFnvkRXxkLHPnCuFLiil3RuR++NIlzdMrUXEPfMgzca9h9+BZ+ZnG/gjjXtqPujIBpX hdFdP4wUehaxbThCa3ggviElmool/3DnAGXA9vSEkMmxLoqq9FVq1g8S43unMcCrN7Ww 91LA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717244704; x=1717849504; 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=QdSzq2A82jghBt4zQBv3GyrK83FFWGl9ksvAlOrMydA=; b=aWx3eucLw2iSDETuowE5uNDoFKzsoNvNvkVCfYGwBIdoiF6QftmhMhWgzfzNZ1k1sQ LJjHEOgWvWUEbN10G02xizc9pA3+7yEDT1Trzq2deubnGNDkDgGmDS7eM6rwU+h1glxK TNbIVcBacU+H8536pjbJSGGysDhZ8QKIXnzgvDIrBMAqHP5qYil3Ikyz9oj+xVgiPrp7 kTZolxaC2yUQ1YfsfPWSXAGYJow1WEtZgEtco+Qnv1QJZ6lcKMSV1HCw8BLFlYRitvfo Y4BkCDqZCWWCiSmZlrvydBk2irYhOCnViOqece/wiNUoLJMDcpd5PlOLzvH5phX5Yxq2 A/3g== X-Gm-Message-State: AOJu0YxG5wT2q7vUOSuAaJc/+XF381rseJhoOt3qHbvgbSpTTKcdGO5o Et5+O8yJzJ2B9AreOYD+aNZlBVofzDVS25KbzGdPOoXplc4y7Cs77UH9SuUeUdytGCYZxmfKOQG c X-Google-Smtp-Source: AGHT+IFvtGW9HX11neLpD7MccjmUT47uCA9qOHcLgE+wTz0gEGA3nfLxuKAwKJm16wGFQ9VtT3P+XA== X-Received: by 2002:a17:902:e846:b0:1f2:f63b:4795 with SMTP id d9443c01a7336-1f636fc56e3mr56920375ad.14.1717244704262; Sat, 01 Jun 2024 05:25:04 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f63241d4d9sm31804165ad.296.2024.06.01.05.25.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jun 2024 05:25:04 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 07/21] ghostscript: fix CVE-2024-29510 Date: Sat, 1 Jun 2024 05:24:33 -0700 Message-Id: <202b2b0a5c447baf7d84c19b7829a81a846413d9.1717243719.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 ; Sat, 01 Jun 2024 12:25:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200103 From: Archana Polampalli Signed-off-by: Archana Polampalli Signed-off-by: Steve Sakoman --- .../ghostscript/CVE-2024-29510.patch | 84 +++++++++++++++++++ .../ghostscript/ghostscript_10.02.1.bb | 1 + 2 files changed, 85 insertions(+) create mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2024-29510.patch diff --git a/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-29510.patch b/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-29510.patch new file mode 100644 index 0000000000..692d35157f --- /dev/null +++ b/meta/recipes-extended/ghostscript/ghostscript/CVE-2024-29510.patch @@ -0,0 +1,84 @@ +From 3b1735085ecef20b29e8db3416ab36de93e86d1f Mon Sep 17 00:00:00 2001 +From: Ken Sharp +Date: Thu, 21 Mar 2024 09:01:15 +0000 +Subject: [PATCH 5/5] Uniprint device - prevent string configuration changes + when SAFER + +Bug #707662 + +We cannot sanitise the string arguments used by the Uniprint device +because they can potentially include anything. + +This commit ensures that these strings are locked and cannot be +changed by PostScript once SAFER is activated. Full configuration from +the command line is still possible (see the *.upp files in lib). + +This addresses CVE-2024-29510 + +CVE: CVE-2024-29510 + +Upstream-Status: Backport [https://cgit.ghostscript.com/cgi-bin/cgit.cgi/ghostpdl.git/commit/?id=3b1735085ecef20b29e] + +Signed-off-by: Archana Polampalli +--- + devices/gdevupd.c | 31 +++++++++++++++++++++++++++++++ + 1 file changed, 31 insertions(+) + +diff --git a/devices/gdevupd.c b/devices/gdevupd.c +index 740dae0..a50571a 100644 +--- a/devices/gdevupd.c ++++ b/devices/gdevupd.c +@@ -1887,6 +1887,16 @@ out on this copies. + if(!upd_strings[i]) continue; + UPD_PARAM_READ(param_read_string,upd_strings[i],value,udev->memory); + if(0 == code) { ++ if (gs_is_path_control_active(udev->memory)) { ++ if (strings[i].size != value.size) ++ error = gs_error_invalidaccess; ++ else { ++ if (strings[i].data && memcmp(strings[i].data, value.data, strings[i].size) != 0) ++ error = gs_error_invalidaccess; ++ } ++ if (error < 0) ++ goto exit; ++ } + if(0 <= error) error |= UPD_PUT_STRINGS; + UPD_MM_DEL_PARAM(udev->memory, strings[i]); + if(!value.size) { +@@ -1904,6 +1914,26 @@ out on this copies. + if(!upd_string_a[i]) continue; + UPD_PARAM_READ(param_read_string_array,upd_string_a[i],value,udev->memory); + if(0 == code) { ++ if (gs_is_path_control_active(udev->memory)) { ++ if (string_a[i].size != value.size) ++ error = gs_error_invalidaccess; ++ else { ++ int loop; ++ for (loop = 0;loop < string_a[i].size;loop++) { ++ gs_param_string *tmp1 = (gs_param_string *)&(string_a[i].data[loop]); ++ gs_param_string *tmp2 = (gs_param_string *)&value.data[loop]; ++ ++ if (tmp1->size != tmp2->size) ++ error = gs_error_invalidaccess; ++ else { ++ if (tmp1->data && memcmp(tmp1->data, tmp2->data, tmp1->size) != 0) ++ error = gs_error_invalidaccess; ++ } ++ } ++ } ++ if (error < 0) ++ goto exit; ++ } + if(0 <= error) error |= UPD_PUT_STRING_A; + UPD_MM_DEL_APARAM(udev->memory, string_a[i]); + if(!value.size) { +@@ -2098,6 +2128,7 @@ transferred into the device-structure. In the case of "uniprint", this may + if(0 > code) error = code; + } + ++exit: + if(0 < error) { /* Actually something loaded without error */ + + if(!(upd = udev->upd)) { +-- +2.40.0 diff --git a/meta/recipes-extended/ghostscript/ghostscript_10.02.1.bb b/meta/recipes-extended/ghostscript/ghostscript_10.02.1.bb index 8bda4404cc..db9481816a 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_10.02.1.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_10.02.1.bb @@ -30,6 +30,7 @@ SRC_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/downlo file://CVE-2024-33869-0001.patch \ file://CVE-2024-33869-0002.patch \ file://CVE-2024-33871.patch \ + file://CVE-2024-29510.patch \ " SRC_URI[sha256sum] = "e429e4f5b01615a4f0f93a4128e8a1a4d932dff983b1774174c79c0630717ad9" From patchwork Sat Jun 1 12:24:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 44508 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 6BC91C41513 for ; Sat, 1 Jun 2024 12:25:16 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web11.36111.1717244706573041772 for ; Sat, 01 Jun 2024 05:25:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=pzJEMy7V; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1f44b42d1caso22692285ad.0 for ; Sat, 01 Jun 2024 05:25:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1717244706; x=1717849506; 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=VxmcAP+OMPNv+w2cj4maJLBYsmSiMdizSzeEu1rEoiI=; b=pzJEMy7VjrY7TEXXQrMPYzlXX4wxpaOftTlTfXIbUPRPi5bEjGw/H9d5vWNn/7mGMt z+IGCHOU4DO3wOsZq2zHA71D+3hfM0SSzHqezHU51pQqsIbsCMk3tWZKpwzqEYDpk1A4 fckYpho2PLG9mv0FZ810L5IbDq+/jELIMLC6tEb1uiRNMOkNL2A9ZRCBouW0nixw8vck LbAlu0f14hCvqFj+e2LkKc3yYLBWISX0nizwMUSolXUhJ1G4nORbRN+TWJPayljCV98w F/T8gDbVxz7xLvf8tjX3DSqRgMhetSu47GRlEVK7DXyp4qkBo6IlypBdlfe3zSRqKhwk ejTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717244706; x=1717849506; 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=VxmcAP+OMPNv+w2cj4maJLBYsmSiMdizSzeEu1rEoiI=; b=ma3r0YCjPSnhYCh4PyIzjxTuJz9BJUUe8Bkof+AfSJ2GmP3udElvj403JRi9MW0MFu JB25ARzoC/LHUHhW49TqwN5gQ3ztbWi2HIIGnSSjueLFHxODjRcYPXoox2Jz6/kxLBe6 OzQN/xvUFuiqBixt7W808CcPP054GhI3qxHxL/trDAbf4XL1GnQHykvZ4hDsnEHz7JDA eHdUCDOfIQtT1kgu/CdyHVDxrDyEEZVub2wK0H7eq7X2rhVIZnVdSpl6khCtG9kjQeou GOF7ZNeVHP+W6sj6oADh4fmXLxJqBplUArsLYPVLgzQCbg4EJzA4X22OXvkEQE/0U9Nj UFCA== X-Gm-Message-State: AOJu0YxGpM3av0quKMuZuM42OtoJXtEltou4ckBeszLnErFVFzR32yiW TsNgpPjRWbuM+kace6cA5BLVq/35Zk4ORzKO3XR2t2mwcrCiqpVemmUWHHAXB0wNuxIzW03dIaX 6 X-Google-Smtp-Source: AGHT+IFVkx8W00n2+CJtmaHsV6tZQN+aOIdv+L8sf9h9NzZESlFzhb5puYeYEip39Kad2rXwl5xomg== X-Received: by 2002:a17:902:f544:b0:1f4:7bf1:71dc with SMTP id d9443c01a7336-1f63704eed4mr41758305ad.39.1717244705661; Sat, 01 Jun 2024 05:25:05 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f63241d4d9sm31804165ad.296.2024.06.01.05.25.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jun 2024 05:25:05 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 08/21] gcc: Fix for CVE-2024-0151 Date: Sat, 1 Jun 2024 05:24:34 -0700 Message-Id: <165a7007678c27b6c0a27cda25652a00768c2fee.1717243719.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 ; Sat, 01 Jun 2024 12:25:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200104 From: Mark Hatle Fix for insufficient argument checking in Secure state Entry functions in software using Cortex-M Security Extensions (CMSE), that has been compiled using toolchains that implement 'Arm v8-M Security Extensions Requirements on Development Tools' prior to version 1.4, allows an attacker to pass values to Secure state that are out of range for types smaller than 32-bits. Out of range values might lead to incorrect operations in secure state. Signed-off-by: Mark Hatle Signed-off-by: Steve Sakoman --- meta/recipes-devtools/gcc/gcc-13.2.inc | 1 + .../gcc/gcc/CVE-2024-0151.patch | 315 ++++++++++++++++++ 2 files changed, 316 insertions(+) create mode 100644 meta/recipes-devtools/gcc/gcc/CVE-2024-0151.patch diff --git a/meta/recipes-devtools/gcc/gcc-13.2.inc b/meta/recipes-devtools/gcc/gcc-13.2.inc index 603377a49a..abf177822b 100644 --- a/meta/recipes-devtools/gcc/gcc-13.2.inc +++ b/meta/recipes-devtools/gcc/gcc-13.2.inc @@ -68,6 +68,7 @@ SRC_URI = "${BASEURI} \ file://CVE-2023-4039.patch \ file://0026-aarch64-Fix-loose-ldpstp-check-PR111411.patch \ file://0027-Fix-gcc-vect-module-testcases.patch \ + file://CVE-2024-0151.patch \ " SRC_URI[sha256sum] = "e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da" diff --git a/meta/recipes-devtools/gcc/gcc/CVE-2024-0151.patch b/meta/recipes-devtools/gcc/gcc/CVE-2024-0151.patch new file mode 100644 index 0000000000..12883388cb --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc/CVE-2024-0151.patch @@ -0,0 +1,315 @@ +arm: Zero/Sign extends for CMSE security + +This patch makes the following changes: + +1) When calling a secure function from non-secure code then any arguments + smaller than 32-bits that are passed in registers are zero- or sign-extended. +2) After a non-secure function returns into secure code then any return value + smaller than 32-bits that is passed in a register is zero- or sign-extended. + +This patch addresses the following CVE-2024-0151. + +gcc/ChangeLog: + PR target/114837 + * config/arm/arm.cc (cmse_nonsecure_call_inline_register_clear): + Add zero/sign extend. + (arm_expand_prologue): Add zero/sign extend. + +gcc/testsuite/ChangeLog: + + * gcc.target/arm/cmse/extend-param.c: New test. + * gcc.target/arm/cmse/extend-return.c: New test. + +CVE: CVE-2024-0151 +Upstream-Status: Backport [https://gcc.gnu.org/pipermail/gcc-patches/2024-April/649973.html] +Signed-off-by: Mark Hatle + +diff --git a/gcc/config/arm/arm.cc b/gcc/config/arm/arm.cc +index 0217abc218d60956ce727e6d008d46b9176dddc5..ea0c963a4d67ecd70e1571624e84dfe46d757df9 100644 +--- a/gcc/config/arm/arm.cc ++++ b/gcc/config/arm/arm.cc +@@ -19210,6 +19210,30 @@ cmse_nonsecure_call_inline_register_clear (void) + end_sequence (); + emit_insn_before (seq, insn); + ++ /* The AAPCS requires the callee to widen integral types narrower ++ than 32 bits to the full width of the register; but when handling ++ calls to non-secure space, we cannot trust the callee to have ++ correctly done so. So forcibly re-widen the result here. */ ++ tree ret_type = TREE_TYPE (fntype); ++ if ((TREE_CODE (ret_type) == INTEGER_TYPE ++ || TREE_CODE (ret_type) == ENUMERAL_TYPE ++ || TREE_CODE (ret_type) == BOOLEAN_TYPE) ++ && known_lt (GET_MODE_SIZE (TYPE_MODE (ret_type)), 4)) ++ { ++ machine_mode ret_mode = TYPE_MODE (ret_type); ++ rtx extend; ++ if (TYPE_UNSIGNED (ret_type)) ++ extend = gen_rtx_ZERO_EXTEND (SImode, ++ gen_rtx_REG (ret_mode, R0_REGNUM)); ++ else ++ extend = gen_rtx_SIGN_EXTEND (SImode, ++ gen_rtx_REG (ret_mode, R0_REGNUM)); ++ emit_insn_after (gen_rtx_SET (gen_rtx_REG (SImode, R0_REGNUM), ++ extend), insn); ++ ++ } ++ ++ + if (TARGET_HAVE_FPCXT_CMSE) + { + rtx_insn *last, *pop_insn, *after = insn; +@@ -23652,6 +23676,51 @@ arm_expand_prologue (void) + + ip_rtx = gen_rtx_REG (SImode, IP_REGNUM); + ++ /* The AAPCS requires the callee to widen integral types narrower ++ than 32 bits to the full width of the register; but when handling ++ calls to non-secure space, we cannot trust the callee to have ++ correctly done so. So forcibly re-widen the result here. */ ++ if (IS_CMSE_ENTRY (func_type)) ++ { ++ function_args_iterator args_iter; ++ CUMULATIVE_ARGS args_so_far_v; ++ cumulative_args_t args_so_far; ++ bool first_param = true; ++ tree arg_type; ++ tree fndecl = current_function_decl; ++ tree fntype = TREE_TYPE (fndecl); ++ arm_init_cumulative_args (&args_so_far_v, fntype, NULL_RTX, fndecl); ++ args_so_far = pack_cumulative_args (&args_so_far_v); ++ FOREACH_FUNCTION_ARGS (fntype, arg_type, args_iter) ++ { ++ rtx arg_rtx; ++ ++ if (VOID_TYPE_P (arg_type)) ++ break; ++ ++ function_arg_info arg (arg_type, /*named=*/true); ++ if (!first_param) ++ /* We should advance after processing the argument and pass ++ the argument we're advancing past. */ ++ arm_function_arg_advance (args_so_far, arg); ++ first_param = false; ++ arg_rtx = arm_function_arg (args_so_far, arg); ++ gcc_assert (REG_P (arg_rtx)); ++ if ((TREE_CODE (arg_type) == INTEGER_TYPE ++ || TREE_CODE (arg_type) == ENUMERAL_TYPE ++ || TREE_CODE (arg_type) == BOOLEAN_TYPE) ++ && known_lt (GET_MODE_SIZE (GET_MODE (arg_rtx)), 4)) ++ { ++ if (TYPE_UNSIGNED (arg_type)) ++ emit_set_insn (gen_rtx_REG (SImode, REGNO (arg_rtx)), ++ gen_rtx_ZERO_EXTEND (SImode, arg_rtx)); ++ else ++ emit_set_insn (gen_rtx_REG (SImode, REGNO (arg_rtx)), ++ gen_rtx_SIGN_EXTEND (SImode, arg_rtx)); ++ } ++ } ++ } ++ + if (IS_STACKALIGN (func_type)) + { + rtx r0, r1; +diff --git a/gcc/testsuite/gcc.target/arm/cmse/extend-param.c b/gcc/testsuite/gcc.target/arm/cmse/extend-param.c +new file mode 100644 +index 0000000000000000000000000000000000000000..01fac7862385f871f3ecc246ede95eea180be025 +--- /dev/null ++++ b/gcc/testsuite/gcc.target/arm/cmse/extend-param.c +@@ -0,0 +1,96 @@ ++/* { dg-do compile } */ ++/* { dg-options "-mcmse" } */ ++/* { dg-final { check-function-bodies "**" "" "" } } */ ++ ++#include ++#include ++ ++#define ARRAY_SIZE (256) ++char array[ARRAY_SIZE]; ++ ++enum offset ++{ ++ zero = 0, ++ one = 1, ++ two = 2 ++}; ++ ++/* ++**__acle_se_unsignSecureFunc: ++** ... ++** uxtb r0, r0 ++** ... ++*/ ++__attribute__((cmse_nonsecure_entry)) char unsignSecureFunc (unsigned char index) { ++ if (index >= ARRAY_SIZE) ++ return 0; ++ return array[index]; ++} ++ ++/* ++**__acle_se_signSecureFunc: ++** ... ++** sxtb r0, r0 ++** ... ++*/ ++__attribute__((cmse_nonsecure_entry)) char signSecureFunc (signed char index) { ++ if (index >= ARRAY_SIZE) ++ return 0; ++ return array[index]; ++} ++ ++/* ++**__acle_se_shortUnsignSecureFunc: ++** ... ++** uxth r0, r0 ++** ... ++*/ ++__attribute__((cmse_nonsecure_entry)) char shortUnsignSecureFunc (unsigned short index) { ++ if (index >= ARRAY_SIZE) ++ return 0; ++ return array[index]; ++} ++ ++/* ++**__acle_se_shortSignSecureFunc: ++** ... ++** sxth r0, r0 ++** ... ++*/ ++__attribute__((cmse_nonsecure_entry)) char shortSignSecureFunc (signed short index) { ++ if (index >= ARRAY_SIZE) ++ return 0; ++ return array[index]; ++} ++ ++/* ++**__acle_se_enumSecureFunc: ++** ... ++** uxtb r0, r0 ++** ... ++*/ ++__attribute__((cmse_nonsecure_entry)) char enumSecureFunc (enum offset index) { ++ ++ // Compiler may optimize away bounds check as value is an unsigned char. ++ ++ // According to AAPCS caller will zero extend to ensure value is < 256. ++ ++ if (index >= ARRAY_SIZE) ++ return 0; ++ return array[index]; ++ ++} ++ ++/* ++**__acle_se_boolSecureFunc: ++** ... ++** uxtb r0, r0 ++** ... ++*/ ++__attribute__((cmse_nonsecure_entry)) char boolSecureFunc (bool index) { ++ ++ if (index >= ARRAY_SIZE) ++ return 0; ++ return array[index]; ++ ++} +\ No newline at end of file +diff --git a/gcc/testsuite/gcc.target/arm/cmse/extend-return.c b/gcc/testsuite/gcc.target/arm/cmse/extend-return.c +new file mode 100644 +index 0000000000000000000000000000000000000000..cf731ed33df7e6dc101320c1970016f01b14c59a +--- /dev/null ++++ b/gcc/testsuite/gcc.target/arm/cmse/extend-return.c +@@ -0,0 +1,92 @@ ++/* { dg-do compile } */ ++/* { dg-options "-mcmse" } */ ++/* { dg-final { check-function-bodies "**" "" "" } } */ ++ ++#include ++#include ++ ++enum offset ++{ ++ zero = 0, ++ one = 1, ++ two = 2 ++}; ++ ++typedef unsigned char __attribute__ ((cmse_nonsecure_call)) ns_unsign_foo_t (void); ++typedef signed char __attribute__ ((cmse_nonsecure_call)) ns_sign_foo_t (void); ++typedef unsigned short __attribute__ ((cmse_nonsecure_call)) ns_short_unsign_foo_t (void); ++typedef signed short __attribute__ ((cmse_nonsecure_call)) ns_short_sign_foo_t (void); ++typedef enum offset __attribute__ ((cmse_nonsecure_call)) ns_enum_foo_t (void); ++typedef bool __attribute__ ((cmse_nonsecure_call)) ns_bool_foo_t (void); ++ ++/* ++**unsignNonsecure0: ++** ... ++** bl __gnu_cmse_nonsecure_call ++** uxtb r0, r0 ++** ... ++*/ ++unsigned char unsignNonsecure0 (ns_unsign_foo_t * ns_foo_p) ++{ ++ return ns_foo_p (); ++} ++ ++/* ++**signNonsecure0: ++** ... ++** bl __gnu_cmse_nonsecure_call ++** sxtb r0, r0 ++** ... ++*/ ++signed char signNonsecure0 (ns_sign_foo_t * ns_foo_p) ++{ ++ return ns_foo_p (); ++} ++ ++/* ++**shortUnsignNonsecure0: ++** ... ++** bl __gnu_cmse_nonsecure_call ++** uxth r0, r0 ++** ... ++*/ ++unsigned short shortUnsignNonsecure0 (ns_short_unsign_foo_t * ns_foo_p) ++{ ++ return ns_foo_p (); ++} ++ ++/* ++**shortSignNonsecure0: ++** ... ++** bl __gnu_cmse_nonsecure_call ++** sxth r0, r0 ++** ... ++*/ ++signed short shortSignNonsecure0 (ns_short_sign_foo_t * ns_foo_p) ++{ ++ return ns_foo_p (); ++} ++ ++/* ++**enumNonsecure0: ++** ... ++** bl __gnu_cmse_nonsecure_call ++** uxtb r0, r0 ++** ... ++*/ ++unsigned char __attribute__((noipa)) enumNonsecure0 (ns_enum_foo_t * ns_foo_p) ++{ ++ return ns_foo_p (); ++} ++ ++/* ++**boolNonsecure0: ++** ... ++** bl __gnu_cmse_nonsecure_call ++** uxtb r0, r0 ++** ... ++*/ ++unsigned char boolNonsecure0 (ns_bool_foo_t * ns_foo_p) ++{ ++ return ns_foo_p (); ++} +\ No newline at end of file From patchwork Sat Jun 1 12:24:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 44514 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 B3157C3DA40 for ; Sat, 1 Jun 2024 12:25:16 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web10.36160.1717244707793956347 for ; Sat, 01 Jun 2024 05:25:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=TtlW3H8V; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1f44b594deeso21951625ad.2 for ; Sat, 01 Jun 2024 05:25:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1717244707; x=1717849507; 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=CFBO0dX5mwd6cB73TWb5c1cizFlJeGx4g6DIgQw8xyo=; b=TtlW3H8VbNjuhlA2+vAAcge0HSzH7/unvEgYtnGBytWLAD4onIqoqaZmTDd57soV9o 9rWCosvVFP+QZ1HD9hL2Fli5zhEDYWMoUvdyuIxQ16ROkuC3nBHtWmuaNfPIqzKyjLUv rgxto/lPEGqSa679QngSuM1EmxS/87Onieml2UmbHNNAaimUNZ8MHusUWam8Kkp1X1Do 7SXd/BpuUDdAsildfA/JFaxfredEV8l0CTR5PmziuzAXQ4xPrztpv64j/B80slcsoUSq znjMU+1grmdiGgChTAvmb6Jp1TOvuleAA9JnEJuxPGkkWjSSsuZnTYAtOgEFt9NNB53B nlTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717244707; x=1717849507; 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=CFBO0dX5mwd6cB73TWb5c1cizFlJeGx4g6DIgQw8xyo=; b=vjy/e3QOShsc+g6rbCWMGLqeGvsLyrEH3FqwsG8fQw2HZrPtlAeQAKdqJIehIkxCXR kOku//FhXx4e14dVR2IbchoY+XpFiNXzPO9YXkOnjI7wXYXY2S63T29Ttu3EAkejKvI6 GNUZDXGrzUNNU4bvNOGbsBRoD9Xp+lzQ3h/RRc9gy+jW9P33dCOYo6HLye3muSwDg+hU yPWYQQggpqw5ZgrWcDRRPjcIkEP8XA355H2yQ1p40DUGAGBo3XbmvYLX/0ClYQ98/fYn OqOiYFNhfkhXMTbQnO4o6mU+uISjEhdHwBxPtNYdp9yXn1KE7SibaoBtRRljrU1EWA7G DGcA== X-Gm-Message-State: AOJu0YyMtg7RDFnH9raAZnuTYTBWs0ajopNT9AhZYlVMXM3S/0GrRdVo 4kM76Iats7iGnKtAqtOhxhL0pqZHvsZ3u3fIgphGb1LmKslJLTH1st4TS+xRJoCm9F113OJAIOM q X-Google-Smtp-Source: AGHT+IGx73dgGRH2Sf2eQqJ8lebG2I+lskCB7esttR2tAGkZiVRTO5Sx9tZsZ1Miusessx+BEqmuAA== X-Received: by 2002:a17:903:228c:b0:1f4:9ce1:6e76 with SMTP id d9443c01a7336-1f6370ced3amr51812845ad.65.1717244706959; Sat, 01 Jun 2024 05:25:06 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f63241d4d9sm31804165ad.296.2024.06.01.05.25.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jun 2024 05:25:06 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 09/21] xserver-xorg: upgrade 21.1.11 -> 21.1.12 Date: Sat, 1 Jun 2024 05:24:35 -0700 Message-Id: <64174dc0f593baa4f74c0080726de94802b903ef.1717243719.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 ; Sat, 01 Jun 2024 12:25:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200105 From: Archana Polampalli This release contains security fixes for * CVE-2024-31080 * CVE-2024-31081 * CVE-2024-31082 * CVE-2024-31083 Changelog: =========== 101caa1b0 (tag: xorg-server-21.1.12) xserver 21.1.12 117315640 render: fix refcounting of glyphs during ProcRenderAddGlyphs 0e34d8ebc Xquartz: ProcAppleDRICreatePixmap needs to use unswapped length to send reply cea92ca78 Xi: ProcXIPassiveGrabDevice needs to use unswapped length to send reply 8a7cd0e3e Xi: ProcXIGetSelectedEvents needs to use unswapped length to send reply 5ca3a9513 Xext: SProcSyncCreateFence needs to swap drawable id too 5d7272f05 Allow disabling byte-swapped clients 8a46a463f Initialize Mode->name in xf86CVTMode() f653d9a0a hw/xfree86: fix NULL pointer refrence to mode name 8b75ec34d dix: Fix use after free in input device shutdown https://lists.x.org/archives/xorg-announce/2024-April/003497.html Signed-off-by: Archana Polampalli Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 12dfa6889a1c322d0e20fd9b7638dcb861e032f2) Signed-off-by: Steve Sakoman --- .../{xserver-xorg_21.1.11.bb => xserver-xorg_21.1.12.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_21.1.11.bb => xserver-xorg_21.1.12.bb} (92%) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.11.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.12.bb similarity index 92% rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.11.bb rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.12.bb index 6506d775ca..570e08d5ae 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.11.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.12.bb @@ -3,7 +3,7 @@ require xserver-xorg.inc SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ " -SRC_URI[sha256sum] = "1d3dadbd57fb86b16a018e9f5f957aeeadf744f56c0553f55737628d06d326ef" +SRC_URI[sha256sum] = "1e016e2be1b5ccdd65eac3ea08e54bd13ce8f4f6c3fb32ad6fdac4e71729a90f" # These extensions are now integrated into the server, so declare the migration # path for in-place upgrades. From patchwork Sat Jun 1 12:24:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 44507 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 6BB8EC25B76 for ; Sat, 1 Jun 2024 12:25:16 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web10.36161.1717244709294744352 for ; Sat, 01 Jun 2024 05:25:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=vI/EHBSs; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1f62fae8c1aso16009005ad.3 for ; Sat, 01 Jun 2024 05:25:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1717244708; x=1717849508; 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=Rx+mhfI8Wl0UYb5GaAOE3ydMnuuq3ZjrtQ9b+b3twnM=; b=vI/EHBSsLSUYOiJgHEB1/6MyuX+7kE8uffsT1PPFvoA24GyO0W2Q3UlWdUijFlykmT DqEJ4yykJO2ob6/YnW5PZrEHw6oYVaFHudktDjoPi9oDqJcYvmOoq5F8NlMG4bCj8l+L YajbfTymyMPTcqLJBAjCdUeeCS9JIkt85IeWgQcRibi2jCmamUntOdHASoQPW60MtWyr 1BBmbrXBZErWoAONP/yVPwI+JZ35AbsnTTNAAMJLYa79qgqjrPOlI1P5bKc8JkmYXut1 MAV9uWUE8y4FFv+V3vf8PZZD5bZ+2K9qmzI9tueVMfYK0LMXahkztylX4ORhmdRkF+HD XvEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717244708; x=1717849508; 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=Rx+mhfI8Wl0UYb5GaAOE3ydMnuuq3ZjrtQ9b+b3twnM=; b=St21bAlk2cIRRtW4aBSJKnDW1Z5PmuT2hnbOyc2xteu6Zfc1d2Gu/dPr4aGfYpWD8f zVi4Fabp7evQdNtSSUyCFP0Z3RqOXkKuWXaLfG957PjGfIQb2mbUplUrh4eMJlE2VG6s xxCn8gY4a3LYkq98gtObEsdfEoG7hnqSBQ6B6Vq99WDdIMfC04ECz5jDcuEGP1Q4fg7v XfhNPurXKRH0dUiw8/OqrEZRk3pB9qi5s/uZdvMJ7hPVlWZno84otbDxBXewo/CmcIDQ tpCFXwR+BhICh9/1VCZMPPYWLSELTctky9+y+hbn0K1gNovz9+O1KZWRVcn0eoi3Ino8 exQQ== X-Gm-Message-State: AOJu0YweortnuHHPFQapp1S1w3M6PcCenPoynH4wvfUIJyKzqaKrBufy jjHIPs5XZ7PcDb/Moj19GxFein4KMYX6swz3JCDZt1HLDrmF+UPhRlzm65Ha4J0YKpsWGWoaQnQ K X-Google-Smtp-Source: AGHT+IENyT3iBwNfqzbIRhFP6XDdq1XBAiZnkYo9k4NwX8Wt8tRYkwjC88cwKlVem2ZZ+6YkoUtZzw== X-Received: by 2002:a17:902:ea02:b0:1f4:5da0:815e with SMTP id d9443c01a7336-1f6370ba6bfmr53550845ad.54.1717244708319; Sat, 01 Jun 2024 05:25:08 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f63241d4d9sm31804165ad.296.2024.06.01.05.25.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jun 2024 05:25:07 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 10/21] llvm: Upgrade to 18.1.4 Date: Sat, 1 Jun 2024 05:24:36 -0700 Message-Id: <56ef42d454fb13a0eff0a7210a37ec4b54a2afc3.1717243719.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 ; Sat, 01 Jun 2024 12:25:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200106 From: Khem Raj From: Khem Raj Brings following fixes * e6c3289804a6 [CMake][Release] Disable PGO (#88465) (#89000) * 028e425f86cc [MIPS] Fix the opcode of max.fmt and mina.fmt (#85609) * e3c832b37b0a Fix override keyword being print to the left side * 1deeee3f5da4 Revert "[Mips] Fix missing sign extension in expansion of sub-word atomic max (#77072)" * 995539ce05ba [LLD] [COFF] Don't add pseudo relocs for dangling references (#88487) * db67e6fb9ad1 [libc++] Fix -Wgnu-include-next in stddef.h (#88214) * 647fbc710840 [SelectionDAG] Prevent combination on inconsistent type in `combineCarryDiamond` (#84888) * eaae766a20fd [RISCV] Support rv{32, 64}e in the compiler builtins (#88252) * c24b41d71f2e github-upload-release.py: Fix bug preventing release creation (#84571) * c837970dd7e9 [Codegen][X86] Fix /HOTPATCH with clang-cl and inline asm (#87639) * d0ddcce21d91 [InstSimplify] Make sure the simplified value doesn't generate poison in threadBinOpOverSelect (#87075) * 4056cc29dfd3 Prepend all library intrinsics with `#` when building for Arm64EC (#87542) * 6e071cf30599 [SLP]Fix a crash if the argument of call was affected by minbitwidth analysis. * d89da2ac8839 [libcxx] coerce formatter precision to int (#87738) * b6ebea7972cd [SPARC] Implement L and H inline asm argument modifiers (#87259) * bffecba7ce4c [libc++] Simplify the implementation of (#86843) * 9899a2d76c8f [lit][ci] Publish lit wheels (#88072) * 3ceccbdb1995 [clang-format] Correctly annotate braces of empty ctors/dtors (#82097) * 429d62872525 [Headers] Don't declare unreachable() from stddef.h in C++ (#86748) * feba8727f805 [ConstantRange] Fix off by 1 bugs in UIToFP and SIToFP handling. (#86041) * e4259b583c92 [Float2Int] Pre-commit test for SIToFP/UIToFP ConstantRange bug. NFC * daca56d8e162 Bump version to 18.1.4 (#87715) (From OE-Core rev: adc2651a8e902af24fee6ff30a72f4b7c63bef6f) Signed-off-by: Khem Raj Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie Signed-off-by: Peter Marko Signed-off-by: Steve Sakoman --- meta/recipes-devtools/llvm/llvm_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index c4fd73f2d7..e7fa88b30e 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb @@ -17,14 +17,14 @@ inherit cmake pkgconfig # could be 'rcX' or 'git' or empty ( for release ) VER_SUFFIX = "" -PV = "18.1.3${VER_SUFFIX}" +PV = "18.1.4${VER_SUFFIX}" MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" LLVM_RELEASE = "${PV}" BRANCH = "release/${MAJOR_VERSION}.x" -SRCREV = "c13b7485b87909fcf739f62cfa382b55407433c0" +SRCREV = "e6c3289804a67ea0bb6a86fadbe454dd93b8d855" SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH};protocol=https \ file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \ From patchwork Sat Jun 1 12:24:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 44511 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 79F16C27C44 for ; Sat, 1 Jun 2024 12:25:16 +0000 (UTC) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mx.groups.io with SMTP id smtpd.web10.36162.1717244710356359905 for ; Sat, 01 Jun 2024 05:25:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=EbNlEsO0; spf=softfail (domain: sakoman.com, ip: 209.85.214.181, mailfrom: steve@sakoman.com) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1f60a502bb2so21477755ad.3 for ; Sat, 01 Jun 2024 05:25:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1717244710; x=1717849510; 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=ZF89pMRGFWkNX8dlUP/tx6Q6niwlRkzwOuE8PeeGKQw=; b=EbNlEsO0DTJnHv8yDVFksqkfHgd+7SawbyjKRovNzjEsep6J8+bS/iBI1Y8aOl7h6Z i5OOkIQXBGNLHo0B4YK7qYLiUDaR3Xk1Ell4iEnMEpXvt7gbqYb4dPDI6h6saQP+4WpT X2UVlcrzMR7Zz6GAnqyKqIUR2i7IuYEw+gbUN9qPgdeIHxbqlYIcTHup3cyhYnrHtE3N P4APO79b5vkVcPIUUN683SCLJdqfIv6Uur+bVh+TrnFH4ptU6UswB7HK0A/uZ/zXA5bS NjoMsV3TBIe8YXdLilMFKhn912qxyhV/OX1OcvzFB1y2HhCpX93zVJRY71XcCQtXAKgw hgmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717244710; x=1717849510; 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=ZF89pMRGFWkNX8dlUP/tx6Q6niwlRkzwOuE8PeeGKQw=; b=eVIoAOWQNKQZJvWEmrE8mLXcA65RRMRV7t9sfaPqEzJfQ7+WnvqeEYIDCe5WsfVTl0 LILb1h/2317olIUjOVmeKPC8T7NUL5b3U3EwxWf4kJBkviPV15CUWC9B1fng03X+8XBi Ri5MAFsoE9ZUyKYoAuuFCfQ4qYIWCVcqRlKrDpbcBq0kY8EJEw6WS4mwFBbFZoQTpQq8 hJwpudDkKOlryi1I05xtcdAFMkGmlIZXATGK8h1bbbHt2fTxp5cm1qhXaInm5/2hjBa/ IggHCkf+VcUjLUcy2dTqZVbRdYtKz0491WXwShpd4I4GCLex+b1CKBWiCC91y8DLgwDr b90Q== X-Gm-Message-State: AOJu0YyGZAWCfdTXiMUiJMhHLncOshYFClgVvTYanug5dR0OlrYz9eC7 zfJ25fnMZuizntxi5JhWGXbz2JlzcC7/0tvAbufpi3BWy8+ioe8cnAcRCcl84WOqybLMs/DrwJf n X-Google-Smtp-Source: AGHT+IHkb05MTT6mTs80CCUbdzfQpjl9VyZp5i7veeg6pBvGtvoV7fAxbJOaA67Tz7e5t1u2q2awgg== X-Received: by 2002:a17:903:11cd:b0:1f6:da3:9eae with SMTP id d9443c01a7336-1f636ffed3emr54665105ad.4.1717244709596; Sat, 01 Jun 2024 05:25:09 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f63241d4d9sm31804165ad.296.2024.06.01.05.25.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jun 2024 05:25:09 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 11/21] llvm: Upgrade to 18.1.5 Date: Sat, 1 Jun 2024 05:24:37 -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 ; Sat, 01 Jun 2024 12:25:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200107 From: Khem Raj From: Khem Raj Brings 617a15a9eac9 [clang codegen] Fix MS ABI detection of user-provided constructors. (#90151) 20b9ed64ea07 [RISCV][ISel] Fix types in tryFoldSelectIntoOp (#90659) ece9d35f1a70 [GlobalISel] Fix store merging incorrectly classifying an unknown index expr as 0. (#90375) a7b8b890600a [X86] Enable EVEX512 when host CPU has AVX512 (#90479) 4da5b1417493 [GlobalISel] Don't form anyextending atomic loads. a96b04442c9f [AArch64] Remove invalid uabdl patterns. (#89272) aea091b70eda [clang][CoverageMapping] do not emit a gap region when either end doesn't have valid source locations (#89564) 58648f334d62 [X86][EVEX512] Check hasEVEX512 for canExtendTo512DQ (#90390) 6350acdb134d [CGP] Drop poison-generating flags after hoisting (#90382) f341c76b9461 [Clang] Handle structs with inner structs and no fields (#89126) abf6b13085fb [IRCE] Skip icmp ptr in InductiveRangeCheck::parseRangeCheckICmp (#89967) ee5bb0c95667 Fix Objective-C++ Sret of non-trivial data types on Windows ARM64 (#88671) 6dbaa89433f7 [clang-format] Fix a regression in ContinuationIndenter (#88414) 51ff7f38b633 [clang-format] Fix a regression in annotating TrailingReturnArrow (#86624) b544217fb31f [AMDGPU] Fix setting nontemporal in memory legalizer (#83815) 78b99c73ee4b [DAGCombiner] Fix miscompile bug in combineShiftOfShiftedLogic (#89616) 1aa91720cc4f [DAGCombiner] Pre-commit test case for miscompile bug in combineShiftOfShiftedLogic 35fea1032741 release/18.x: [clang-format] Correctly annotate braces in macros (#87953) b9b73814ad8a [libcxx] [modules] Add _LIBCPP_USING_IF_EXISTS on aligned_alloc (#89827) c0b48372d82a release/18.x: [clang-format] Revert breaking stream operators to previous default (#89016) 3b4ba7277bd7 [analyzer] Fix performance of getTaintedSymbolsImpl() (#89606) 7699b341b763 release/18.x: [clang-format] Fix a regression in annotating BK_BracedInit (#87450) fb865928c8e0 [GlobalISel] Fix fewerElementsVectorPhi to insert after G_PHIs (#87927) 111ae4509c96 [X86] Fix miscompile in combineShiftRightArithmetic 76cbd417af50 [X86] Pre-commit tests (NFC) e7c816b3cd3e [InstCombine] Fix unexpected overwriting in foldSelectWithSRem (#89539) 3685a599c866 ReleaseNote: Mention SpecialCaseList change (#89141) a981a4f7653c [X86] Always use 64-bit relocations in no-PIC large code model (#89101) 4ddac856c55f [analyzer] Fix a security.cert.env.InvalidPtr crash c6d63d4fc555 Bump version to 18.1.5 (#89291) (From OE-Core rev: 02df2fc6241ac8fb0e78f2fdff97a04e5c561d54) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie Signed-off-by: Peter Marko Signed-off-by: Steve Sakoman --- meta/recipes-devtools/llvm/llvm_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index e7fa88b30e..dfaa031012 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb @@ -17,14 +17,14 @@ inherit cmake pkgconfig # could be 'rcX' or 'git' or empty ( for release ) VER_SUFFIX = "" -PV = "18.1.4${VER_SUFFIX}" +PV = "18.1.5${VER_SUFFIX}" MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" LLVM_RELEASE = "${PV}" BRANCH = "release/${MAJOR_VERSION}.x" -SRCREV = "e6c3289804a67ea0bb6a86fadbe454dd93b8d855" +SRCREV = "617a15a9eac96088ae5e9134248d8236e34b91b1" SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH};protocol=https \ file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \ From patchwork Sat Jun 1 12:24:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 44510 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 83B50C27C51 for ; Sat, 1 Jun 2024 12:25:16 +0000 (UTC) Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by mx.groups.io with SMTP id smtpd.web11.36112.1717244711683719390 for ; Sat, 01 Jun 2024 05:25:11 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=gVdS0KE4; spf=softfail (domain: sakoman.com, ip: 209.85.215.181, mailfrom: steve@sakoman.com) Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-6c7df306e86so334691a12.2 for ; Sat, 01 Jun 2024 05:25:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1717244711; x=1717849511; 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=62QOrcVHx8CZeLylUqOWA4GxFzaKRdDsXx1M5Xnt3bc=; b=gVdS0KE4fce/I9IC3Z8KGNV4pNvLjFHSHfnYsA2cC2fyCWI0BBJyeyt78tVuB9vLV5 7nbSHsqViS3YoHf3AkHADn1c3JtdpN+VJWBwt0n7Nbq+50yAxxlsYFVI1jZ2CtuWhEDZ IO74HBgsqroQ6UwaD9i1/4cixYUvcsCb3Lr6NZR6m+S7RhibGUE7LcgaQd5WAkYlY1uo h2DvW35YbiOpvOqAyLS6tHN9SMacXGeR+yWcZCB7J49GELTxPFL6jXRWNPNTUgdfmPo0 dXN6hOlZgvL2PhPWFVC+/7oExnOLBKtti1a8q1CSA44JUUK14td/KOvLkXi9oXTYd3DP o91A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717244711; x=1717849511; 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=62QOrcVHx8CZeLylUqOWA4GxFzaKRdDsXx1M5Xnt3bc=; b=SFZHoyTAagx2sw2nyUmcUm9UdOd7W2B6Z0Rn8/g/ZA7dkQRl0MreJjqmasYUuBhmpq CH6WyXRLjkmS0NA76jqP/muOGu05Q1HenyDaiKHuIxSMI5mEw3sH96xBEuK/Yi00Hrto vujoAbA/7/LdLr8tZrJV82j4hNkOZkbdNUhmM51hr5WZnl31q1vKC65VjsJ00PKlzIRj th9L1ohGNY637GPBJWUtxcTTjSNCzE9c9J/e/mSxfLAuzK46oyQXhm3r7SWnTR8tnVzu 77l/3iT77gY+eeWScfFSrUsysIxNGvzPkXVnA6gcAqdT/anRMpe9O2z3GI53Ic+cR0OG z6pw== X-Gm-Message-State: AOJu0Yzzy8UlmgoAjAdloX7MqmimtjDNDjj0ZrVrYQSUy+z/rrVGrJZy PQA/ZCEdeRFifpIdVGTqHp/hSoHaqhg11QW2gDO0ZLBwKpE970liI+74f6deQoeM+f3lpi1xX7A X X-Google-Smtp-Source: AGHT+IG1aDSmStZRTE2evVY13hdg4k1TfH+iy9sgk3NUv0AOo90Y5M6ugG2HrSSx1PzZ696m5d1RRA== X-Received: by 2002:a17:902:7846:b0:1f6:62c:96df with SMTP id d9443c01a7336-1f6370c3b66mr35244685ad.69.1717244710898; Sat, 01 Jun 2024 05:25:10 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f63241d4d9sm31804165ad.296.2024.06.01.05.25.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jun 2024 05:25:10 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 12/21] llvm: Switch to using release tarballs Date: Sat, 1 Jun 2024 05:24:38 -0700 Message-Id: <251d626a7d3cf6dfb3c0d8617f6cace666c7ea74.1717243719.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 ; Sat, 01 Jun 2024 12:25:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200108 From: Khem Raj From: Khem Raj git checkouts are in excess of 3G, which is not ideal for everyone to download/clone, instead switch to fetching release tarball which is ~126M as of 18.1.5 release (From OE-Core rev: 800e6576e4f3af10846af13c2f217f986c1afdb4) Signed-off-by: Khem Raj Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie Signed-off-by: Peter Marko Signed-off-by: Steve Sakoman --- .../llvm/{llvm_git.bb => llvm_18.1.5.bb} | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) rename meta/recipes-devtools/llvm/{llvm_git.bb => llvm_18.1.5.bb} (93%) diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_18.1.5.bb similarity index 93% rename from meta/recipes-devtools/llvm/llvm_git.bb rename to meta/recipes-devtools/llvm/llvm_18.1.5.bb index dfaa031012..4b6763e580 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_18.1.5.bb @@ -13,27 +13,26 @@ DEPENDS = "libffi libxml2 zlib zstd libedit ninja-native llvm-native" RDEPENDS:${PN}:append:class-target = " ncurses-terminfo" inherit cmake pkgconfig - # could be 'rcX' or 'git' or empty ( for release ) VER_SUFFIX = "" -PV = "18.1.5${VER_SUFFIX}" +PV .= "${VER_SUFFIX}" MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" LLVM_RELEASE = "${PV}" -BRANCH = "release/${MAJOR_VERSION}.x" -SRCREV = "617a15a9eac96088ae5e9134248d8236e34b91b1" -SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH};protocol=https \ +SRC_URI = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/llvm-project-${PV}.src.tar.xz \ file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \ file://llvm-config \ " +SRC_URI[sha256sum] = "3591a52761a7d390ede51af01ea73abfecc4b1d16445f9d019b67a57edd7de56" -UPSTREAM_CHECK_GITTAGREGEX = "llvmorg-(?P\d+(\.\d+)+)" +UPSTREAM_CHECK_URI = "https://github.com/llvm/llvm-project" +UPSTREAM_CHECK_REGEX = "llvmorg-(?P\d+(\.\d+)+)" -S = "${WORKDIR}/git/llvm" +S = "${WORKDIR}/llvm-project-${PV}.src/llvm" LLVM_INSTALL_DIR = "${WORKDIR}/llvm-install" From patchwork Sat Jun 1 12:24:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 44509 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 8F091C27C4F for ; Sat, 1 Jun 2024 12:25:16 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web11.36113.1717244712972359851 for ; Sat, 01 Jun 2024 05:25:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=j7BPZ3cr; spf=softfail (domain: sakoman.com, ip: 209.85.214.179, mailfrom: steve@sakoman.com) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1f47f0d8ec9so24981275ad.3 for ; Sat, 01 Jun 2024 05:25:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1717244712; x=1717849512; 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=RUgXXMW68/7OD3TVvlheoOEmmsiu4a5F9xAsmEo047U=; b=j7BPZ3crI7iOdYCrAwHQg2EQmyO/l44LrhsNspTA6qbKMAD7VhvQsWMHCPh/9c7agO v7BF/O3Ze1MZBZsedz88/NbpMUz/qLq2RvMKxOy6dGK1POhzUxejikPqhZ+dShMjTKiB zNmWfWnSuQD+MFq8iFag6KYQ0eptZqF+24GH89ghwzWIp1KKyon5k4VPWmxeGl2WjDQY 9X14iOE9huLNEyi5eOnQn7/Bb18fkNEePfLcymxwhmojf1knJD+t49ak1uUIDRExcOa2 LSZMlK/beCHNCO0x3R4dYQZeb5kL/ladLmIhf/cSIoDJwRVfI8kgMhkAIZxQP9lATHO8 fkhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717244712; x=1717849512; 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=RUgXXMW68/7OD3TVvlheoOEmmsiu4a5F9xAsmEo047U=; b=XqNZRc3ms39MNxO+0qHVZ7Kw4JXqcCKlRxd3TmHhZfg5MBcHOfQUW8w9eTY5WEG7X+ X2SFbnCpDMG8jYQMERB9JzpO9CU3JQJQFFZeawoYL/qOFsICW+ozmIdpzWEen8PescVz 83ZBbqE9Q7GGr+VZEGJtoK9UG7f5HcTQpTaLJzLzAU3XHLi8osikUzbIgBCczJ4z9xSp BDrnEaBHGoXU4uacqP4WNPV11bF+cLOChfOqsrgZtbpUo3GQa6sRzOKVpLdxny37BRvt 2ojmP3JJrs3KEZ8focvYnPnzsk4fclJL4Tj9kx9eoO4YdHB6MVlZB5doyWWh5tYYxHNo y+9A== X-Gm-Message-State: AOJu0YwlN5SdyiIDHyLbAx1AfIPJMB/7R9KoOOVnBluFGe0QLdVTnK5x 3BlzE8lfOK/Sw/VJmyshrdKn3gHAIvJa4fP0WFSCK/3K4b8YqBQRzJoo1w+jrIG+kMhQC+RpLbX c X-Google-Smtp-Source: AGHT+IFyUPhwsBH9sNEDKZ257MSQzspZ0oZsMRMfrxXaqcFnJEh/Pbrx92rlD3MeSoWJeurfy7Fp6A== X-Received: by 2002:a17:902:d4cd:b0:1f4:8b95:a1fe with SMTP id d9443c01a7336-1f6370191b2mr53747255ad.29.1717244712151; Sat, 01 Jun 2024 05:25:12 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f63241d4d9sm31804165ad.296.2024.06.01.05.25.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jun 2024 05:25:11 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 13/21] ptest-runner: Bump to 2.4.4 (95f528c) Date: Sat, 1 Jun 2024 05:24:39 -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 ; Sat, 01 Jun 2024 12:25:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200109 From: Changqing Li Changes in 2.4.4: 95f528c utils.c: run_ptests improve error handling on ptests iteration c48e5fc utils.c: run-ptests improve pseudo-terminal handling Signed-off-by: Changqing Li Signed-off-by: Steve Sakoman --- .../{ptest-runner_2.4.3.bb => ptest-runner_2.4.4.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-support/ptest-runner/{ptest-runner_2.4.3.bb => ptest-runner_2.4.4.bb} (95%) diff --git a/meta/recipes-support/ptest-runner/ptest-runner_2.4.3.bb b/meta/recipes-support/ptest-runner/ptest-runner_2.4.4.bb similarity index 95% rename from meta/recipes-support/ptest-runner/ptest-runner_2.4.3.bb rename to meta/recipes-support/ptest-runner/ptest-runner_2.4.4.bb index e6668da01f..2263e07280 100644 --- a/meta/recipes-support/ptest-runner/ptest-runner_2.4.3.bb +++ b/meta/recipes-support/ptest-runner/ptest-runner_2.4.4.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/ptest-runner2/about/" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" -SRCREV = "92c1b97bfdb4a94acc1cabcaf97eef52dc29144c" +SRCREV = "95f528cff0bc52903b98c292d4a322fcffa74471" PV .= "+git" SRC_URI = "git://git.yoctoproject.org/ptest-runner2;branch=master;protocol=https \ From patchwork Sat Jun 1 12:24:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 44512 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 A0A2AC27C52 for ; Sat, 1 Jun 2024 12:25:16 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web10.36164.1717244714334990123 for ; Sat, 01 Jun 2024 05:25:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=PLoFlLh/; spf=softfail (domain: sakoman.com, ip: 209.85.214.179, mailfrom: steve@sakoman.com) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1f44b441b08so22904365ad.0 for ; Sat, 01 Jun 2024 05:25:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1717244713; x=1717849513; 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=ZjUL/IQ/4U2RiN0JQSp47ZCPgdCDFyr317UBmYQYTTg=; b=PLoFlLh/dCXRqzxCnRyj6EU5+mhPG1CjVaaSE32QWvQmf2ZVDDkNin8vsDfzJRhMg2 fSEi6gNhV1tTtmfmwKB4kk7ZXAvfzluI08ImuhZW2JLcC9w61ighUNQYAdUhBEWrfHel CKCko9/RLJmB42MrDYWjsWkiPenadCXbT0EHN7Kspcv0J6/mio/Xlyzf/p1iAHVxuesr C/GuGTV6sHglrNE69FwZK8FR4QzXGIYwl9WR7M277mW1hjLIh87xdzD60wurI5v8BbK3 1lrvxlpnLH94+eTGy9eyY181CoMOmBdNRPt0Hkj0qvCiQPVcwC0y0BUiiR76zldxxgH6 6zgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717244713; x=1717849513; 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=ZjUL/IQ/4U2RiN0JQSp47ZCPgdCDFyr317UBmYQYTTg=; b=PWJoLrOKgR6wYdvrYgHlKe84C5o0EN57qT+26a2jJiEhfb/g/vnlt5bNsjk2IIaqvC 3LOewhMIbrCqw5CY0XEvoKefMClEmkzGXYEHXnYQL1hC3VwxycnzAMhYCVTD/PFWh7IV rEas3lfluaFyYCQGiEA75N50FtTqowg1r5WnUUocVZHC5IaqGqJGutatTT+b/bG9/rji 6av5mC2k1eEAqCvG1zVdmikszl152QzSYpRJDDCmB2f4wPQkSSGf8vAbo2ZWhwYAVAHd 1wBHydg1g19t4id2kRiBHhoyEWild8gVQuVamnYPFDE7/U/+gg6qdY5IdvvENu6E5o0V NZBQ== X-Gm-Message-State: AOJu0YwmVq0EuThV83+xC4c3rJQnfg+68SmTsJhFOIp2/+ywqBFJ4HnD CQMO1wJ/y0hEn+hTRKYCF1u/8qcL52YTt6asBoc1r+DfuaLFiDS6h38cc/mXANO7nOqOrRUsrmX o X-Google-Smtp-Source: AGHT+IEfBL0B5Ep8tOzFUAJOp0iROL0I6B4WoNpRD3TGiWJdT2iBzVYXWpekQJNxwQ8FfEMUaddapw== X-Received: by 2002:a17:903:22c8:b0:1eb:1af6:e7ea with SMTP id d9443c01a7336-1f637062db1mr51371935ad.34.1717244713450; Sat, 01 Jun 2024 05:25:13 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f63241d4d9sm31804165ad.296.2024.06.01.05.25.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jun 2024 05:25:13 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 14/21] libarchive: upgrade 3.7.2 -> 3.7.4 Date: Sat, 1 Jun 2024 05:24:40 -0700 Message-Id: <1c789d692e0bbea4c26cfad8c36abf051f54a444.1717243719.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 ; Sat, 01 Jun 2024 12:25:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200110 From: Yogita Urade Changlog: ======== rar: Fix OOB in rar e8 filter zip: Fix out of boundary access 7zip: Limit amount of properties bsdtar: Fix error handling around strtol() usages passphrase: Improve newline handling on Windows passphrase: Never allow empty passwords rar: Fix "File CRC Error" when extracting specific rar4 archives xar: Avoid infinite link loop zip: Update AppleDouble support for directories zstd: Implement core detection PCRE2 support add trailing letter b to bsdtar(1) substitute pattern add support for long options "--group" and "--owner" to tar(1) Fix possible vulnerability in tar error reporting introduced in f27c173 ISO9660: preserve the natural order of links rar5: fix decoding unicode filenames on Windows rar5: fix infinite loop if during rar5 decompression the last block produced no data xz filter: fix incorrect eof at the end of an lzip member zip: fix end-of-data marker processing when decompressing zip archives multiple bsdunzip(1) fixes filetime truncation fix on Windows Adjusted configurehack.patch to align with upgraded version. Signed-off-by: Yogita Urade Signed-off-by: Steve Sakoman --- .../libarchive/libarchive/configurehack.patch | 19 ++++++++++++------- ...ibarchive_3.7.2.bb => libarchive_3.7.4.bb} | 2 +- 2 files changed, 13 insertions(+), 8 deletions(-) rename meta/recipes-extended/libarchive/{libarchive_3.7.2.bb => libarchive_3.7.4.bb} (96%) diff --git a/meta/recipes-extended/libarchive/libarchive/configurehack.patch b/meta/recipes-extended/libarchive/libarchive/configurehack.patch index f3989d99eb..44720fdd53 100644 --- a/meta/recipes-extended/libarchive/libarchive/configurehack.patch +++ b/meta/recipes-extended/libarchive/libarchive/configurehack.patch @@ -2,12 +2,15 @@ To work with autoconf 2.73, tweak the macro ordering in configure.in. Upstream-Status: Pending Signed-off-by: Richard Purdie +--- + configure.ac | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) -Index: libarchive-3.6.2/configure.ac -=================================================================== ---- libarchive-3.6.2.orig/configure.ac -+++ libarchive-3.6.2/configure.ac -@@ -357,6 +357,19 @@ if test "x$with_bz2lib" != "xno"; then +diff --git a/configure.ac b/configure.ac +index 5668d41..7e65e49 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -414,6 +414,19 @@ if test "x$with_bz2lib" != "xno"; then esac fi @@ -27,9 +30,9 @@ Index: libarchive-3.6.2/configure.ac AC_ARG_WITH([libb2], AS_HELP_STRING([--without-libb2], [Don't build support for BLAKE2 through libb2])) -@@ -558,19 +571,6 @@ LDFLAGS=$save_LDFLAGS +@@ -678,19 +691,6 @@ fi - AC_SUBST(GC_SECTIONS) + AC_SUBST(DEAD_CODE_REMOVAL) -# Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST @@ -47,3 +50,5 @@ Index: libarchive-3.6.2/configure.ac # Check for tm_gmtoff in struct tm AC_CHECK_MEMBERS([struct tm.tm_gmtoff, struct tm.__tm_gmtoff],,, [ +-- +2.40.0 diff --git a/meta/recipes-extended/libarchive/libarchive_3.7.2.bb b/meta/recipes-extended/libarchive/libarchive_3.7.4.bb similarity index 96% rename from meta/recipes-extended/libarchive/libarchive_3.7.2.bb rename to meta/recipes-extended/libarchive/libarchive_3.7.4.bb index 91f521fa4d..da85764116 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.7.2.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.7.4.bb @@ -33,7 +33,7 @@ SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz" SRC_URI += "file://configurehack.patch" UPSTREAM_CHECK_URI = "http://libarchive.org/" -SRC_URI[sha256sum] = "df404eb7222cf30b4f8f93828677890a2986b66ff8bf39dac32a804e96ddf104" +SRC_URI[sha256sum] = "7875d49596286055b52439ed42f044bd8ad426aa4cc5aabd96bfe7abb971d5e8" CVE_STATUS[CVE-2023-30571] = "upstream-wontfix: upstream has documented that reported function is not thread-safe" From patchwork Sat Jun 1 12:24:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 44513 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 B29B2C27C54 for ; Sat, 1 Jun 2024 12:25:16 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web10.36165.1717244715756856858 for ; Sat, 01 Jun 2024 05:25:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=y5nzAD3O; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1f6559668e1so2038965ad.3 for ; Sat, 01 Jun 2024 05:25:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1717244715; x=1717849515; 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=oohLTN3WdH/C+MKz7zsiLE5Yi8iOczm1p6obc2Xao/s=; b=y5nzAD3OzhVIr7n99GdjjEq/Enakd7foRPt9RbDghDPJusnDyHvKb4zxpl+ImmuUVH Xc3J+QFc7BvvJ2alPY90dtWy99JIjlhgMUP02OKX4qT6wigZQpe/9Pi3MnBktut26aDf BMotiFOpDbsnU5bIFDmtF/mT8Js+vztHn3k8BeeA03yJSlAOr1UmMM0CV1CCbZIzOq/m IggY8YuOIrgr+Q/CuzcdUCdjGLeKTOCKRDpwQGnHy3Xv4As/JXnH3yELjvYO0aO3cHfp 49XYVbN5qgUHgYEGrRiq6RlI8guOg6wglk6LNbtb187QiPWbc+rG2uA50DLvqcnwOVXV jyXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717244715; x=1717849515; 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=oohLTN3WdH/C+MKz7zsiLE5Yi8iOczm1p6obc2Xao/s=; b=qrMu6Sl5QuG8rjw/cq+6iyKNPk9TKvqUOL4UwhF9Sj/CEyP8oK9tLKfiy5St/rlNiH jJwRc+M2tciVFV6HklfGMr/+FpIwgfPfadYKAnugCb1bWDB0u/wbzvC6mSTK9SEZ2UXw 3wVQqArwTLLTq0+00FkGCzB1oOigQuZmfFCaxaczBUL0if4zyNyyKS5YZzminsVjewZb TKF5duJIauHYPhIg/W2dgZCbT3iceKC+hlLaNQfs+bFAD5rP4h4CETcHLxqc2oNE5mW+ T9KihxklSoUGeIxuqMnToCulI1e0qlQAc23p1Yey1sZUxcT9KzuTaiKB1HtwWnKK30Fn tsrg== X-Gm-Message-State: AOJu0YxyZJaud6e76qmlMvy/t0E/c9SUIlAo9LWhx4hLa2yNey7KJBkg TbD1ZDeQ3b1Ai68DSscmN7L9u4r+gK10zrqmPGYuhLVP1aXziMOQZv4cAk2ZLc+LpDBR+X4FldC M X-Google-Smtp-Source: AGHT+IFsGVwy75K4rSQHlDQPwiksQTiMxWbM+Oj2oxchliNN8YBc6YqavVcznbFNmoZ8pGVmh0iIHA== X-Received: by 2002:a17:902:c20d:b0:1f3:453f:1372 with SMTP id d9443c01a7336-1f637020480mr39873885ad.30.1717244714885; Sat, 01 Jun 2024 05:25:14 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f63241d4d9sm31804165ad.296.2024.06.01.05.25.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jun 2024 05:25:14 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 15/21] devtool: standard: update-recipe/finish: fix update localfile in another layer Date: Sat, 1 Jun 2024 05:24:41 -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 ; Sat, 01 Jun 2024 12:25:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200111 From: Julien Stephan When trying to use devtool update-recipe/finish on another layer, with modified local file we have the following error: Traceback (most recent call last): File "<..>/poky/scripts/devtool", line 350, in ret = main() ^^^^^^ File "<..>/poky/scripts/devtool", line 337, in main ret = args.func(args, config, basepath, workspace) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "<..>/poky/scripts/lib/devtool/standard.py", line 1968, in update_recipe updated, _, _ = _update_recipe(args.recipename, workspace, rd, args.mode, args.append, args.wildcard_version, args.no_remove, args.initial_rev, dry_run_outdir=dry_run_outdir, no_overrides=args.no_overrides, force_patch_refresh=args.force_patch_refresh) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "<..>/poky/scripts/lib/devtool/standard.py", line 1930, in _update_recipe updated, appendf, removed = _update_recipe_patch(recipename, workspace, srctree, crd, appendlayerdir, wildcard_version, no_remove, no_report_remove, initial_rev, dry_run_outdir, force_patch_refresh) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "<..>/poky/scripts/lib/devtool/standard.py", line 1747, in _update_recipe_patch patchdir = param.get('patchdir', ".") ^^^^^^^^^ AttributeError: 'str' object has no attribute 'get' This was introduced when adding support for git submodules. No selftest case exists to catch this, so a selftest will be added in another commit. (From OE-Core rev: de7ca9f800e15e10271502da7e51e3ae08e0c85b) Signed-off-by: Julien Stephan Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie Signed-off-by: Jeff Harris Signed-off-by: Steve Sakoman --- scripts/lib/devtool/standard.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 6674e67267..10d0cd3b7c 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -1452,8 +1452,10 @@ def _export_local_files(srctree, rd, destdir, srctreebase): 1. updated - files that already exist in SRCURI 2. added - new files files that don't exist in SRCURI 3 removed - files that exist in SRCURI but not in exported files - In each dict the key is the 'basepath' of the URI and value is the - absolute path to the existing file in recipe space (if any). + In each dict the key is the 'basepath' of the URI and value is: + - for updated and added dicts, a dict with 1 optionnal key: + - 'path': the absolute path to the existing file in recipe space (if any) + - for removed dict, the absolute path to the existing file in recipe space """ import oe.recipeutils @@ -1535,9 +1537,9 @@ def _export_local_files(srctree, rd, destdir, srctreebase): origpath = existing_files.pop(fname) workpath = os.path.join(local_files_dir, fname) if not filecmp.cmp(origpath, workpath): - updated[fname] = origpath + updated[fname] = {'path' : origpath} elif fname != '.gitignore': - added[fname] = None + added[fname] = {} workdir = rd.getVar('WORKDIR') s = rd.getVar('S') @@ -1554,7 +1556,7 @@ def _export_local_files(srctree, rd, destdir, srctreebase): if os.path.exists(fpath): origpath = existing_files.pop(fname) if not filecmp.cmp(origpath, fpath): - updated[fpath] = origpath + updated[fpath] = {'path' : origpath} removed = existing_files return (updated, added, removed) @@ -1640,7 +1642,8 @@ def _update_recipe_srcrev(recipename, workspace, srctree, rd, appendlayerdir, wi redirect_output=dry_run_outdir) else: files_dir = _determine_files_dir(rd) - for basepath, path in upd_f.items(): + for basepath, param in upd_f.items(): + path = param['path'] logger.info('Updating file %s%s' % (basepath, dry_run_suffix)) if os.path.isabs(basepath): # Original file (probably with subdir pointing inside source tree) @@ -1650,7 +1653,8 @@ def _update_recipe_srcrev(recipename, workspace, srctree, rd, appendlayerdir, wi _move_file(os.path.join(local_files_dir, basepath), path, dry_run_outdir=dry_run_outdir, base_outdir=recipedir) update_srcuri= True - for basepath, path in new_f.items(): + for basepath, param in new_f.items(): + path = param['path'] logger.info('Adding new file %s%s' % (basepath, dry_run_suffix)) _move_file(os.path.join(local_files_dir, basepath), os.path.join(files_dir, basepath), @@ -1772,7 +1776,8 @@ def _update_recipe_patch(recipename, workspace, srctree, rd, appendlayerdir, wil else: # Update existing files files_dir = _determine_files_dir(rd) - for basepath, path in upd_f.items(): + for basepath, param in upd_f.items(): + path = param['path'] logger.info('Updating file %s' % basepath) if os.path.isabs(basepath): # Original file (probably with subdir pointing inside source tree) @@ -1806,7 +1811,7 @@ def _update_recipe_patch(recipename, workspace, srctree, rd, appendlayerdir, wil dry_run_outdir=dry_run_outdir, base_outdir=recipedir) updatefiles = True # Add any new files - for basepath, path in new_f.items(): + for basepath, param in new_f.items(): logger.info('Adding new file %s%s' % (basepath, dry_run_suffix)) _move_file(os.path.join(local_files_dir, basepath), os.path.join(files_dir, basepath), From patchwork Sat Jun 1 12:24:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 44516 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 A3A7CC41513 for ; Sat, 1 Jun 2024 12:25:26 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web11.36115.1717244717096487304 for ; Sat, 01 Jun 2024 05:25:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=w6EoEQ9l; spf=softfail (domain: sakoman.com, ip: 209.85.214.182, mailfrom: steve@sakoman.com) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1f6342c5fa8so12958475ad.1 for ; Sat, 01 Jun 2024 05:25:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1717244716; x=1717849516; 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=JaBaLLQz6oGXBE39SbJ9DQAmeNPfDMG1ZqACeYPf8Ms=; b=w6EoEQ9lWRSp04ub0C7ioE1QWG2jHOREGI1yTbMqRUSOoqlKdIRvx4f4a4ybl0h2gz Mh/dz131ZeVuIy39TOQrIm6f1Oeei41ky5wYa9HTmuhE0paoCPTs5F13HZQcKAIrKhNm 8boq0YGKwumTkMtDH2Gw7QcGmUWl6Jx1mOPF7iOp2oquyRyXg/D8mK1Vz8F6ncfna1sR gbMJtg6MawE0cXEGFm7NSYYlV2+gHQ9taKtBOBjXBN+H7Pk6jIpaQy42A7AmITdXbCP7 5As22Rh1ThPyQ3h4AVFFCx/xkua9XjEw4jxvUkzlxDvNOSmwTvGQh7APMb0D06pT+ykp 8kvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717244716; x=1717849516; 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=JaBaLLQz6oGXBE39SbJ9DQAmeNPfDMG1ZqACeYPf8Ms=; b=CI4Icqb4VY9OHH7c+6XudtNk4x2nEf0Y4n1MJVTvMES9s12M0NEeu8UyTymjhpp0mz kEeeR07L5BOx6kjPbsv7oIiWMgZUBX/M1XhL2G8ULZJr38lt9RQG7zyT8uJRfHaWDN/k JB0INIUz8O4u9YlVFyr/YjnXoia9iWGr+rqLvFjsWYrSnMepEexSHKdgNXSsSIUKSGut W02mM1P3o4VAgjs2v3OUyFyXigXypnUSgPjYvbTyVdJFHC7pKKQJKdLSAxsIX1R27F6f VYWW1ops/HH6dI5jWYOIpnV48fF4PCQrvWUQww/4kKl0O3U8aHNN0W40FtHzXUl/7Sou mlAw== X-Gm-Message-State: AOJu0YxI7sjnFEkt5r5gFlDAV1fY/bLWKzA4gRq+/5SKjCPTAJHjP8VD agFTgtMB7sbFHfFQgUhOVW76eo7Z85J04F2serCaQfZ9m5GuQoEGB76M1Zgzg78i0+xjov2Jtzy s X-Google-Smtp-Source: AGHT+IGQo+Yx+Hlq0ekjfsiso4Be7JZMO7hUZI6wxXt+itvW9tA1qczg9rrhvCEH7qEsrVbtZHDN8A== X-Received: by 2002:a17:902:ebc5:b0:1f3:e41:949c with SMTP id d9443c01a7336-1f637098209mr44917205ad.47.1717244716253; Sat, 01 Jun 2024 05:25:16 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f63241d4d9sm31804165ad.296.2024.06.01.05.25.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jun 2024 05:25:16 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 16/21] oeqa/selftest/devtool: add test for updating local files into another layer Date: Sat, 1 Jun 2024 05:24:42 -0700 Message-Id: <0532a6292edbe68303b6d85017ebcdb36a60886f.1717243719.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 ; Sat, 01 Jun 2024 12:25:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200112 From: Julien Stephan We don't have a test to check if we can correctly devtool update-recipe/finish into another layer. So update the existing test_devtool_update_recipe_local_files to also check the updates into another layer. (From OE-Core rev: bd44c895d36e246a25c7a6e40bf9f4089dc7a297) Signed-off-by: Julien Stephan Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie Signed-off-by: Jeff Harris Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/devtool.py | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index bc1e40ef83..51949e3c93 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -1405,14 +1405,30 @@ class DevtoolUpdateTests(DevtoolBase): runCmd('echo "Bar" > new-file', cwd=tempdir) runCmd('git add new-file', cwd=tempdir) runCmd('git commit -m "Add new file"', cwd=tempdir) - self.add_command_to_tearDown('cd %s; git clean -fd .; git checkout .' % - os.path.dirname(recipefile)) runCmd('devtool update-recipe %s' % testrecipe) expected_status = [(' M', '.*/%s$' % os.path.basename(recipefile)), (' M', '.*/makedevs/makedevs.c$'), ('??', '.*/makedevs/new-local$'), ('??', '.*/makedevs/0001-Add-new-file.patch$')] self._check_repo_status(os.path.dirname(recipefile), expected_status) + # Now try to update recipe in another layer, so first, clean it + runCmd('cd %s; git clean -fd .; git checkout .' % os.path.dirname(recipefile)) + # Create a temporary layer and add it to bblayers.conf + self._create_temp_layer(templayerdir, True, 'templayer') + # Update recipe in templayer + result = runCmd('devtool update-recipe %s -a %s' % (testrecipe, templayerdir)) + self.assertNotIn('WARNING:', result.output) + # Check recipe is still clean + self._check_repo_status(os.path.dirname(recipefile), []) + splitpath = os.path.dirname(recipefile).split(os.sep) + appenddir = os.path.join(templayerdir, splitpath[-2], splitpath[-1]) + bbappendfile = self._check_bbappend(testrecipe, recipefile, appenddir) + patchfile = os.path.join(appenddir, testrecipe, '0001-Add-new-file.patch') + new_local_file = os.path.join(appenddir, testrecipe, 'new_local') + local_file = os.path.join(appenddir, testrecipe, 'makedevs.c') + self.assertExists(patchfile, 'Patch file 0001-Add-new-file.patch not created') + self.assertExists(local_file, 'File makedevs.c not created') + self.assertExists(patchfile, 'File new_local not created') def test_devtool_update_recipe_local_files_2(self): """Check local source files support when oe-local-files is in Git""" From patchwork Sat Jun 1 12:24:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 44520 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 D62D4C27C51 for ; Sat, 1 Jun 2024 12:25:26 +0000 (UTC) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mx.groups.io with SMTP id smtpd.web10.36167.1717244718676266582 for ; Sat, 01 Jun 2024 05:25:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=yqkIMLTe; spf=softfail (domain: sakoman.com, ip: 209.85.210.181, mailfrom: steve@sakoman.com) Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-702548b056aso546796b3a.1 for ; Sat, 01 Jun 2024 05:25:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1717244718; x=1717849518; 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=WcQHhN3rdzFS7YtD/JnWT+kubW/eOOcJUuN4JOG1wRA=; b=yqkIMLTeCyufqL78hHwjBNPhz3661q+MYih0nX1I7XeHGHpjoAOREJqzjBHolGfiQN N94imowPXfqR2il3nUDfvp+2oaiLg0JRVoiW/oMS0U0A44CGhSLMitCXGcnOTiR15GJK m/w3k2D4UqG3QI2DmgsZlV2CT4+IINiCb18SXVfjIsQ/vRWbLMVr7/rCfVLtcgEBsd5x a8UcdQJpGH/Du1cyH4ETg98IRVogrkHjTPiVhkn220CxCQUq9Np/FZV0Htt2kJ3I87eG 5u49rN/gdRNoGpwo93fbu5rjxFk2/gx0H1JMzJ4Mz+GAnf9tHDKlnI9LTOvkBpXnMhPj BZUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717244718; x=1717849518; 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=WcQHhN3rdzFS7YtD/JnWT+kubW/eOOcJUuN4JOG1wRA=; b=Tiu4PhP1zJvy82K+4oOm1r4MhWPi7B6Ww35as8T+rS0LftxKA19WN1kRHNYyemKtO3 etjSe8GVYysrGSI4m/W3A0kOUOBhOfNGqKM5Ps6g93eUQoHU4VnW+Yzflc/IRJlnmK8/ VZFLH3LRzbo/aSbUFIpZV4UIaiz7RzDOropSn59Cr1asYYaGBhJghDNAaVSHiMPe75PS EqtxDTAGeik9H4v+OFM1xkk+uFq0tA6Opzu1xJatGIxHrlvFgx9U7RAxD39dtRVmOV/c LAA5QUh3F4uAQ9XzTuQhv9j5bzb5c9oYm/wmm0cABwe8MihumGWBCy/peX6ihPD5ZxlJ SxFA== X-Gm-Message-State: AOJu0YwT2B98SZO9ui9T5XaZARtUTw7Kvt4HHVSf/SakLRkIOtujh/ii +KrHa54ZqV+FqVM1uRPNEir7ZTR3z76wdvGID9/hDhlQBVpU6DhleIBT5njgiTqsEPXkJ0MgGdd I X-Google-Smtp-Source: AGHT+IFMarXfFUK6c6HlKSge7V1NB/YbCbJ1IU6KGM47VXywZ9sd+A2+PVOptZ/vRzw5am8J06ITXA== X-Received: by 2002:a05:6a20:96ca:b0:1b1:f6a9:6b0a with SMTP id adf61e73a8af0-1b26f275a5fmr3956298637.47.1717244717694; Sat, 01 Jun 2024 05:25:17 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f63241d4d9sm31804165ad.296.2024.06.01.05.25.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jun 2024 05:25:17 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 17/21] gstreamer1.0-plugins-good: Include qttools-native during the build with qt5 PACKAGECONFIG Date: Sat, 1 Jun 2024 05:24:43 -0700 Message-Id: <4e9274f2719eea91de3c98b9f88a7e2ebebcce90.1717243719.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 ; Sat, 01 Jun 2024 12:25:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200113 From: Marek Vasut The qttools provide 'lrelease' tool, which is checked by recent versions of meson build system. Unless the qttools are available in sysroot, meson will fail to detect qt5 installation at build time and the gstreamer build will fail. Fix this by including the qttools-native. Signed-off-by: Marek Vasut Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit ae2ca4af54695003638da38f8548aa8573d18201) Signed-off-by: Steve Sakoman --- .../gstreamer/gstreamer1.0-plugins-good_1.22.11.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.11.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.11.bb index edd8609b7c..85143aa1b9 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.11.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.11.bb @@ -52,7 +52,7 @@ PACKAGECONFIG[libpng] = "-Dpng=enabled,-Dpng=disabled,libpng" PACKAGECONFIG[libv4l2] = "-Dv4l2-libv4l2=enabled,-Dv4l2-libv4l2=disabled,v4l-utils" PACKAGECONFIG[mpg123] = "-Dmpg123=enabled,-Dmpg123=disabled,mpg123" PACKAGECONFIG[pulseaudio] = "-Dpulse=enabled,-Dpulse=disabled,pulseaudio" -PACKAGECONFIG[qt5] = "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative qtbase-native ${QT5WAYLANDDEPENDS}" +PACKAGECONFIG[qt5] = "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative qtbase-native qttools-native ${QT5WAYLANDDEPENDS}" PACKAGECONFIG[soup2] = "-Dsoup=enabled,,libsoup-2.4,,,soup3" PACKAGECONFIG[soup3] = "-Dsoup=enabled,,libsoup,,,soup2" PACKAGECONFIG[speex] = "-Dspeex=enabled,-Dspeex=disabled,speex" From patchwork Sat Jun 1 12:24:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 44515 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 9FD8EC25B76 for ; Sat, 1 Jun 2024 12:25:26 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web10.36169.1717244719834304853 for ; Sat, 01 Jun 2024 05:25:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=zln8C1P7; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1f44b441b08so22904685ad.0 for ; Sat, 01 Jun 2024 05:25:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1717244719; x=1717849519; 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=40bz1Qr7CbXJWTsH74pIn084jkOlHJV7Zkr7sS92aIw=; b=zln8C1P7ExOorNNwX21qWIzG2XXrtyXxtwPLIYmJGApZjcoOKqSbRCaVGKgi7KEKRn Z+h37Qij9zBb/HcMh08m8pjQz0l8iDbTR4NKsVtm5JgLXqKXMBWtCgMrdgZw8zlO5OUU 2Vz5t6x/etevaXFebUPrrse4F7MXJ1DrpWgkx1jgqhEvvOb+a9N0y89GVMMo1I/YHjz8 pBmmAkufgO/v2DPlS2IHBfIWVOg2yjxItt+y/K3rvA9pRBefk9J4gB6jvsPRv0pqX40u VZEJTYw4WCZpzoQISGWPSSHNu+m2DQfd0N0NI0UF3MktAEOUxJBYAHbPTIMvBORpoGUb 2FDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717244719; x=1717849519; 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=40bz1Qr7CbXJWTsH74pIn084jkOlHJV7Zkr7sS92aIw=; b=NrkQ/Wq9WDPVDw+o02ryR8Cjbx2+oQKB/yxYatLFgjLDcCQlMLG5NJiRjJBLRU0JqZ yT/QGdLbob+HjVecemEl9tWBw065PEw6bbi0gCx85FKwRYDhEtuZMyudnX4AJhmThl+D TH+VyEcWp9CfQrrFq3jlxYPkJyZTplarXrQ/TrYJbt9we4qQbVXTvN9AcVqqUtVNl80E 8a340kdowOKZ44SODEBunDU9XPMZbdFOcmbOrvJ7iojJxkfDj7Lt89t6pAL4v4L7ec17 dL2lYETICioM9ArqY+jK4Qj/XG1rWVIyonnU0Lir5cOAsNTilLi7lrc189GuDwAoPTBP R79g== X-Gm-Message-State: AOJu0YyAIZLIuVG8D/rLN98sCt7ok+gFDPqBPpak6Owe8FnuhVufPAP6 MHpBWUidCUSqq3GI8jKO6xXY/c1ABgX5D8jxaCNR6qyK109R0tWhGfA7k74u8a8qzlrx1v0TlG3 a X-Google-Smtp-Source: AGHT+IHpJ07fvOtpzNryRx8rvEuix8u1J16c8paG4rC9Re1E799WQEG/9gboWet7HpdBNG+TWvzfpg== X-Received: by 2002:a17:902:d4cf:b0:1f4:960c:a05f with SMTP id d9443c01a7336-1f637040cccmr53023545ad.31.1717244719070; Sat, 01 Jun 2024 05:25:19 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f63241d4d9sm31804165ad.296.2024.06.01.05.25.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jun 2024 05:25:18 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 18/21] update-rc.d: add +git to PV Date: Sat, 1 Jun 2024 05:24:44 -0700 Message-Id: <54cbf43e55ec3373f8c2612b787166da35028fd3.1717243719.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 ; Sat, 01 Jun 2024 12:25:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200114 From: Peter Marko This hash is ahead of the tag, so adapt PV accordingly. (From OE-Core rev: c94e46019a7d443ccc4763ba16d87e7e97abe977) Signed-off-by: Peter Marko Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- meta/recipes-core/update-rc.d/update-rc.d_0.8.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb b/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb index ba622fe716..27723c88ef 100644 --- a/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb +++ b/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://update-rc.d;beginline=5;endline=15;md5=d40a07c27f5354 SRC_URI = "git://git.yoctoproject.org/update-rc.d;branch=master;protocol=https" SRCREV = "b8f950105010270a768aa12245d6abf166346015" +PV .= "+git" UPSTREAM_CHECK_COMMITS = "1" From patchwork Sat Jun 1 12:24:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 44517 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 AF79BC27C4F for ; Sat, 1 Jun 2024 12:25:26 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web11.36117.1717244721180034925 for ; Sat, 01 Jun 2024 05:25:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=a2OimwGJ; spf=softfail (domain: sakoman.com, ip: 209.85.214.179, mailfrom: steve@sakoman.com) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1f32a3b9491so22068645ad.0 for ; Sat, 01 Jun 2024 05:25:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1717244720; x=1717849520; 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=aYEMku8zcykEZlueturWvIwXH6TnevTrYc8aTUVk4WQ=; b=a2OimwGJAweMzigj/fI+FoiMntSeayXqeZIKLMQQHGwaD6ulx9hhdEVQt+TBBDh31a cLl6n4cYauryStOgVfnL1qBN69xSs+AoAJdEuXWO0t1ZKOF2a+ySFtLQho0+xVMDT6Bc rIjv16HOrMF5KaYW8mxru1WglOTOT9CXNVUJYFaVaiP2EEvRWVJ3mDsLa8j/c65mRuvy qX4PVw6HZzfNGsfLcN+b1oHn/hrO0esDRTiYKBKzfnMNxOB0z1Kv1ZPQy2bPCBVv5npv grO3/8xFTsOOqWcpR8glFmKCwJuxLhIhjtspa9J9poraWIwkQnsMIhCcubKQoX38nbsS uamg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717244720; x=1717849520; 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=aYEMku8zcykEZlueturWvIwXH6TnevTrYc8aTUVk4WQ=; b=dikHBznRVJO4MjXEEHqRa7CgLM2R2aYEkgIlj8w9TB+EGD/zLbXXkTmzhzce8rWRcN /+xwr0fr8mAjZG/zH8IuANY7S9Nt+zf0VuAw8axK84yOTVhuLphZyKQVOvuig6Z3I/L4 P2h21QKu2qehLxElZNFjMQO8nG/FGiYTyi8jP2fLpQjd8l+k3ACyVBf9dfjtmrBq9hrg NHCcDtujlmtfRYimczrMYT8qja/xjtA9hPmDCllvYRecgzDC59otWQPiAozEsuouA26z Ni3qFZ9LkV8bFQXwU1TOZ8DNfTxzOC/AG/3F/QLpxeG+Gg7M/hc1zEyRhWg0melhNIQu xs8A== X-Gm-Message-State: AOJu0YzeExOvhpdB0hLYOOQ+3+/ErVgivJpwGQnEbgjpaP0vdHqNoduJ LPLU6xnysth+JSOScesf2Qjk1Q8sdf044w1lwNNHdorTTx20jTDGAMNP3YwWVruV+zjSYVusJbY x X-Google-Smtp-Source: AGHT+IEUU4J5l9lBO86kIggDL6sP8h3ICJMjWgaBDaULcEBXOIgs4efq1ss69Un8CFTTYO/KFw9x4w== X-Received: by 2002:a17:902:bb87:b0:1f6:3429:69d7 with SMTP id d9443c01a7336-1f63709e4ffmr40382875ad.52.1717244720379; Sat, 01 Jun 2024 05:25:20 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f63241d4d9sm31804165ad.296.2024.06.01.05.25.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jun 2024 05:25:20 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 19/21] lib/package_manager/ipk: Do not hardcode payload compression algorithm Date: Sat, 1 Jun 2024 05:24:45 -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 ; Sat, 01 Jun 2024 12:25:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200115 From: Philip Lorenz The chosen payload compression algorithm can be changed by overriding `OPKGBUILDCMD`. Ensure that package extraction deals with this by globbing for "data.tar.*" to select the actual payload tarball. Signed-off-by: Philip Lorenz Signed-off-by: Richard Purdie (cherry picked from commit 2ad05635a6da403b4fadcc126fe7734067c12c73) Signed-off-by: Steve Sakoman --- meta/lib/oe/package_manager/ipk/__init__.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/lib/oe/package_manager/ipk/__init__.py b/meta/lib/oe/package_manager/ipk/__init__.py index 8cc9953a02..0f0038d00d 100644 --- a/meta/lib/oe/package_manager/ipk/__init__.py +++ b/meta/lib/oe/package_manager/ipk/__init__.py @@ -4,6 +4,7 @@ # SPDX-License-Identifier: GPL-2.0-only # +import glob import re import shutil import subprocess @@ -134,11 +135,16 @@ class OpkgDpkgPM(PackageManager): tmp_dir = tempfile.mkdtemp() current_dir = os.getcwd() os.chdir(tmp_dir) - data_tar = 'data.tar.zst' try: cmd = [ar_cmd, 'x', pkg_path] output = subprocess.check_output(cmd, stderr=subprocess.STDOUT) + data_tar = glob.glob("data.tar.*") + if len(data_tar) != 1: + bb.fatal("Unable to extract %s package. Failed to identify " + "data tarball (found tarballs '%s').", + pkg_path, data_tar) + data_tar = data_tar[0] cmd = [tar_cmd, 'xf', data_tar] output = subprocess.check_output(cmd, stderr=subprocess.STDOUT) except subprocess.CalledProcessError as e: From patchwork Sat Jun 1 12:24: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: 44518 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 B7DC1C27C44 for ; Sat, 1 Jun 2024 12:25:26 +0000 (UTC) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by mx.groups.io with SMTP id smtpd.web10.36170.1717244722540327236 for ; Sat, 01 Jun 2024 05:25:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=ktsZiJL+; spf=softfail (domain: sakoman.com, ip: 209.85.215.176, mailfrom: steve@sakoman.com) Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-6c4926bf9baso1187625a12.2 for ; Sat, 01 Jun 2024 05:25:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1717244722; x=1717849522; 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=HLBZNC9MOCZA818NHSsDITzDvaxmznFPKrebneg9Uu0=; b=ktsZiJL+Dqz+wGXe6NRob0I+dNtyjov4zPQcFT58tbbdLzXqFjh2S0kytnW9im/0eS B+tW+LU+D6KXLFCxNAitFqi/w62/JWEcDNnYtZHzHo2I3wOIWxP04vrOXcOOyR4EC4Zv q2+AZ9QlLX3UcHO8M4xMrQzCuLys6OSFqtxIYyX8WdbzkSiXtt7PtcxemfhECEopVgE3 dVBDvQHoiwuI34gMXmz62tu99GRioL3db1AGrezPPrycuO1Yb9S3t+udy0bTZ1GzWvKV Muc0FPDXlCyK3UScZuLj+RbW4xhutzUkgrFzbMO21rbHnaNCBBtqB70fy7j6B8zr6zfd cXVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717244722; x=1717849522; 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=HLBZNC9MOCZA818NHSsDITzDvaxmznFPKrebneg9Uu0=; b=wggnHd8XSy583NdYPVRU4LzYll1/giaPEGZ0g4+2iXgprSQHJKqzSgp1d9FPRb/5oR KbyoSKb1smF7sA+VbYuUyUopmTOKmqcZlScsZPel8OFOAvgqPjKgcFTvEuLXjxO1m8EX ESJXJG7hYrWPyaoRAv0hJhBH+vpLLZFvtDk0jt2WKNJxXUS02zFP03mXyHBYsE7g1ERH jo4VDqoaMU9GQ/521Xwv4AUxLohr9/H6dVc52wCfiToHI2Of9jX8iGXvv6G7oMJbkuoa +i7J7QNwe3ri81OjOxzxsTDTKgjjXAUBY/2YBmSU84k4WoM/LBZ4wy1rLjmUsfkZlTWF uacg== X-Gm-Message-State: AOJu0YyeMXuALN3Kp3wxfP15lTk8QFXXHydUKkHTevNdUE+iYjr2OPdv QMuij+8Ll7pl1ua5/5/3IRgpyxZI2nY2GHReNNibZZnGjF6Q8imHZjnIPqO7dynW8j/5QX7vINz 1 X-Google-Smtp-Source: AGHT+IFOS1WxlwyTt59c/PjdTvF5Cv+BK+xyEQNFofdIcd9nuFsGSApXKoLrOWBgG1ORdBjLZyrfLA== X-Received: by 2002:a17:902:d548:b0:1f4:a6cb:db3d with SMTP id d9443c01a7336-1f6370cebbamr53734445ad.44.1717244721778; Sat, 01 Jun 2024 05:25:21 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f63241d4d9sm31804165ad.296.2024.06.01.05.25.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jun 2024 05:25:21 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 20/21] ipk: Fix clean up of extracted IPK payload Date: Sat, 1 Jun 2024 05:24:46 -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 ; Sat, 01 Jun 2024 12:25:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200116 From: Philip Lorenz It turns out that the IPK payload tarball was actually cleaned up in the concrete package manager implementation (most likely because at some point Debian and IPK packages used different compression algorithms). Globbing removes this ambiguity so move the removal of the payload into the common extract method. Signed-off-by: Philip Lorenz Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 1e2b02a54f482159e21902eeb997b21e00e9588e) Signed-off-by: Steve Sakoman --- meta/lib/oe/package_manager/ipk/__init__.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/lib/oe/package_manager/ipk/__init__.py b/meta/lib/oe/package_manager/ipk/__init__.py index 0f0038d00d..47e72cc7a6 100644 --- a/meta/lib/oe/package_manager/ipk/__init__.py +++ b/meta/lib/oe/package_manager/ipk/__init__.py @@ -159,6 +159,7 @@ class OpkgDpkgPM(PackageManager): bb.note("Extracted %s to %s" % (pkg_path, tmp_dir)) bb.utils.remove(os.path.join(tmp_dir, "debian-binary")) bb.utils.remove(os.path.join(tmp_dir, "control.tar.gz")) + bb.utils.remove(os.path.join(tmp_dir, data_tar)) os.chdir(current_dir) return tmp_dir @@ -511,7 +512,4 @@ class OpkgPM(OpkgDpkgPM): bb.fatal("Unable to get information for package '%s' while " "trying to extract the package." % pkg) - tmp_dir = super(OpkgPM, self).extract(pkg, pkg_info) - bb.utils.remove(os.path.join(tmp_dir, "data.tar.zst")) - - return tmp_dir + return super(OpkgPM, self).extract(pkg, pkg_info) From patchwork Sat Jun 1 12:24: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: 44519 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 BC561C27C52 for ; Sat, 1 Jun 2024 12:25:26 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web10.36172.1717244724140425824 for ; Sat, 01 Jun 2024 05:25:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=I0wSuEkT; spf=softfail (domain: sakoman.com, ip: 209.85.214.170, mailfrom: steve@sakoman.com) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1f44b42e9a6so23125645ad.0 for ; Sat, 01 Jun 2024 05:25:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1717244723; x=1717849523; 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=NC/1qvevR2tCOgOyY80y2D0ENBAkTgXsH8g7Pvr0A/E=; b=I0wSuEkTGgUd8kFP94nKzbS8J9ZU8crANQSSXMjSI8kXTuyuTdv0HpIA/sr3ehAkUU Kog4WDhuN5tDOtYEupRzorh7eBWwMeQCgCVk5rpQM+zTaEYnOYRxlOiymxEXhDlpCo5V jZp16Tv5H0ASir4j/0yt/4hcNLFtSF7GiZ0PElG0V/8Wp94Lz6D4jptJdvMIrXU6ddDG 5atjOszi9XtsqxYoOPTM//6YpxgubP+21szJouJBqY5Cb7CLgpXX5spS4LJ5lWAq0qSe rCFjXvS6cfp9/lgZjEeOaMlIhTZ3rPXu4w10EKsWMsUIz95ilm5ZRIG/zMPj1L2L/MAZ /wmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717244723; x=1717849523; 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=NC/1qvevR2tCOgOyY80y2D0ENBAkTgXsH8g7Pvr0A/E=; b=STUD5Vswjvg1A44oVr30gJbaeoTE/Jdjv1P/b1OHoUMvUvvKQl7h9zCMx1n6DZWWSI 1pBPnsinOCkpI+9eAIvDdF3ENHcFMb3ADDt8ulIAQYvCx9RKdqpVp5hSqoEP6iQEk1qu y8g1d7gOcjHb8K6mnWQBgQn0KDFF4BqzhlHFfMGTdEIDq6eG6V/Hu/Hwlxa039J+wpBc 5EpFLp0qR60oWrgmWEtnN6HaZCoYQBOwqS8ITvAy0tffMQB4+aVCjXT4zPp7WJEqJIw0 JxfOSXHSEOaTe+aM2YontZ/9ngSID3lb6GOqfS2mz4+lvQPmLJ4hHCFB1Hh++/ctA9kA QFSQ== X-Gm-Message-State: AOJu0YxMV1p3/GT5K0r73eVCB9lRxhYZgDL4dJA13EajTHRibi0ZXI/H Q+WDhmn/KDQFqnOg0Je234hTdcRwTma7BUO2JKlKc/91h9bytio4MImnpfk+OnzbAg02BB0kG3N n X-Google-Smtp-Source: AGHT+IEd7C2iE0PhcQegwPADervEVuOu5P6ti7O045gwri9p14DCdaeZeci99yDLOB//5nVejSBglA== X-Received: by 2002:a17:903:32c6:b0:1f4:962f:6343 with SMTP id d9443c01a7336-1f636fe8771mr48601945ad.3.1717244723142; Sat, 01 Jun 2024 05:25:23 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f63241d4d9sm31804165ad.296.2024.06.01.05.25.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jun 2024 05:25:22 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 21/21] git: set --with-gitconfig=/etc/gitconfig for -native builds Date: Sat, 1 Jun 2024 05:24: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 ; Sat, 01 Jun 2024 12:25:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200117 From: Rasmus Villemoes Commit 6c2ae2346db0 (kern-tools: depend on git-replacement-native) broke our kernel builds. For saving space and time, we have a DL_DIR shared between multiple users/buildbots, not all of which run with the same uid (and with appropriate sticky bits set so that files downloaded by one user become owned by a common group and are readable by others). This works fine also for git sources because the docker images we use all have a /etc/gitconfig with [safe] directory = * But with the mentioned commit, the host's git is no longer used for do_unpack (nor for do_fetch if re-building and sysroot has already been populated by a previous build), causing spurious "fatal: detected dubious ownership..." failures. Currently, the path where the git-native binary searches for system gitconfig is the sysroot from it was built, which obviously doesn't contain a /etc/gitconfig. As for the nativesdk variant, respect the host's /etc/gitconfig if present. Signed-off-by: Rasmus Villemoes Signed-off-by: Richard Purdie (cherry picked from commit 572f511f7ff02fb559ac42d2d5dbd09fec478d97) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/git/git_2.44.0.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/git/git_2.44.0.bb b/meta/recipes-devtools/git/git_2.44.0.bb index 90e555eba7..78b00dd19f 100644 --- a/meta/recipes-devtools/git/git_2.44.0.bb +++ b/meta/recipes-devtools/git/git_2.44.0.bb @@ -40,6 +40,7 @@ EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \ --without-iconv \ " EXTRA_OECONF:append:class-nativesdk = " --with-gitconfig=/etc/gitconfig " +EXTRA_OECONF:append:class-native = " --with-gitconfig=/etc/gitconfig " # Needs brokensep as this doesn't use automake inherit autotools-brokensep perlnative bash-completion manpages