From patchwork Wed Apr 5 02:29:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 22249 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 81BAEC6FD1D for ; Wed, 5 Apr 2023 02:30:05 +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.121137.1680661795828023824 for ; Tue, 04 Apr 2023 19:29:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=WjPp/Iya; spf=softfail (domain: sakoman.com, ip: 209.85.214.178, mailfrom: steve@sakoman.com) Received: by mail-pl1-f178.google.com with SMTP id o2so33120268plg.4 for ; Tue, 04 Apr 2023 19:29:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680661795; x=1683253795; 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=erP271RrNrndfhS1ADv8X15ChINLDSTjok8dxskNUe0=; b=WjPp/IyaMBgTkj5IB+wOxhUdN4zFt7CWoQG1CUv7eITfHvjqCs3v3Po6Gi7gvq45hZ uON9NCoH8jA7U+DaKIfk0DgOFlDXnY08k8oJA9vEYlcTXiRbsZ/t93aZIjwb8g5qPZdX 4uJsvQhp/sIsTVRLVPTk0bDEUckErfOCJH7CTBHiYIZfWMfLlrk3NO28Nc8dXdFYEcxg qV96HkzEqPj6hFfudO9J9lQzbrKMQq8ulqgPtA65fVFTaS0ygBFN7e8GO2b+G73pfTbc vyeg9UUxSZONEPlLdavFmae9zQ6cS+4NGZAiwenVZhCooQVcXeX0qUeCCkMghRNd3Z9E E3sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680661795; x=1683253795; 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=erP271RrNrndfhS1ADv8X15ChINLDSTjok8dxskNUe0=; b=pF7jn+0WsvKT/nsUmQgJjSFqzhqSlR2dUK0CMP6wcsZ6qH8Jj+81nxgQpZ3O2Eu5Fs WW8zaLYphLZ6EL5N5qVZIfBBnSxrpe7VffKujB2B9PLijPbOOgvutNOXx9gA1V/B9WpF XZYjHf6U1E7fbuERkCI6U6qNseU9rLumujMCRGX6q18A43QUVAFhSCJYoUbJhj3Cbebb RzL0bEeYaMAX+Om63nFXxK+LAvtvMrDiF/QxBRfNMt2sHjLxfPXsVejwMtz4FTu1Lkwj mKwTPjM6hikYlNk4sDuqDHj8RpEtH98vSWMqhThzfYgXlEG2SeVd8h+hw2J9ik6s7zPN qYvg== X-Gm-Message-State: AAQBX9cdCqv8gcQiyAr9U9lpo7qsBOlO0lHZuvu5mfBlKcLBQMzzOV2q xeFqxrdRHXhZnySzuxZ59NrcLyNIxtk6vbWOrIo= X-Google-Smtp-Source: AKy350b9utWigf6SgtRANJDwIjZfTrETzOGsGDeRnwwzjhVKgPYZRCVMm5UBTSna+dQt0J3ewGHQdA== X-Received: by 2002:a17:902:e392:b0:1a1:c83c:ba5c with SMTP id g18-20020a170902e39200b001a1c83cba5cmr4156951ple.13.1680661794838; Tue, 04 Apr 2023 19:29:54 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id a17-20020a170902ee9100b001a24cded097sm8937702pld.236.2023.04.04.19.29.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 19:29:54 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 1/6] go-runtime: Security fix for CVE-2022-41723 Date: Tue, 4 Apr 2023 16:29:29 -1000 Message-Id: <7440ebac50813e5df73da2d660a50fa97de650de.1680661617.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 ; Wed, 05 Apr 2023 02:30:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179714 From: Shubham Kulkarni Disable cmd/internal/moddeps test, since this update includes PRIVATE track fixes. Backport from https://github.com/golang/go/commit/5c3e11bd0b5c0a86e5beffcd4339b86a902b21c3 Signed-off-by: Shubham Kulkarni Signed-off-by: Steve Sakoman --- meta/recipes-devtools/go/go-1.17.13.inc | 1 + .../go/go-1.18/CVE-2022-41723.patch | 156 ++++++++++++++++++ 2 files changed, 157 insertions(+) create mode 100644 meta/recipes-devtools/go/go-1.18/CVE-2022-41723.patch diff --git a/meta/recipes-devtools/go/go-1.17.13.inc b/meta/recipes-devtools/go/go-1.17.13.inc index 856c14de40..14d58932dc 100644 --- a/meta/recipes-devtools/go/go-1.17.13.inc +++ b/meta/recipes-devtools/go/go-1.17.13.inc @@ -22,6 +22,7 @@ SRC_URI += "\ file://CVE-2022-41717.patch \ file://CVE-2022-2879.patch \ file://CVE-2022-41720.patch \ + file://CVE-2022-41723.patch \ " SRC_URI[main.sha256sum] = "a1a48b23afb206f95e7bbaa9b898d965f90826f6f1d1fc0c1d784ada0cd300fd" diff --git a/meta/recipes-devtools/go/go-1.18/CVE-2022-41723.patch b/meta/recipes-devtools/go/go-1.18/CVE-2022-41723.patch new file mode 100644 index 0000000000..a93fa31dcd --- /dev/null +++ b/meta/recipes-devtools/go/go-1.18/CVE-2022-41723.patch @@ -0,0 +1,156 @@ +From 451766789f646617157c725e20c955d4a9a70d4e Mon Sep 17 00:00:00 2001 +From: Roland Shoemaker +Date: Mon, 6 Feb 2023 10:03:44 -0800 +Subject: [PATCH] net/http: update bundled golang.org/x/net/http2 + +Disable cmd/internal/moddeps test, since this update includes PRIVATE +track fixes. + +Fixes CVE-2022-41723 +Fixes #58355 +Updates #57855 + +Change-Id: Ie870562a6f6e44e4e8f57db6a0dde1a41a2b090c +Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1728939 +Reviewed-by: Damien Neil +Reviewed-by: Julie Qiu +Reviewed-by: Tatiana Bradley +Run-TryBot: Roland Shoemaker +Reviewed-on: https://go-review.googlesource.com/c/go/+/468118 +TryBot-Result: Gopher Robot +Run-TryBot: Michael Pratt +Auto-Submit: Michael Pratt +Reviewed-by: Than McIntosh + +Upstream-Status: Backport [https://github.com/golang/go/commit/5c3e11bd0b5c0a86e5beffcd4339b86a902b21c3] +CVE: CVE-2022-41723 +Signed-off-by: Shubham Kulkarni +--- + src/vendor/golang.org/x/net/http2/hpack/hpack.go | 79 +++++++++++++++--------- + 1 file changed, 49 insertions(+), 30 deletions(-) + +diff --git a/src/vendor/golang.org/x/net/http2/hpack/hpack.go b/src/vendor/golang.org/x/net/http2/hpack/hpack.go +index 85f18a2..02e80e3 100644 +--- a/src/vendor/golang.org/x/net/http2/hpack/hpack.go ++++ b/src/vendor/golang.org/x/net/http2/hpack/hpack.go +@@ -359,6 +359,7 @@ func (d *Decoder) parseFieldLiteral(n uint8, it indexType) error { + + var hf HeaderField + wantStr := d.emitEnabled || it.indexed() ++ var undecodedName undecodedString + if nameIdx > 0 { + ihf, ok := d.at(nameIdx) + if !ok { +@@ -366,15 +367,27 @@ func (d *Decoder) parseFieldLiteral(n uint8, it indexType) error { + } + hf.Name = ihf.Name + } else { +- hf.Name, buf, err = d.readString(buf, wantStr) ++ undecodedName, buf, err = d.readString(buf) + if err != nil { + return err + } + } +- hf.Value, buf, err = d.readString(buf, wantStr) ++ undecodedValue, buf, err := d.readString(buf) + if err != nil { + return err + } ++ if wantStr { ++ if nameIdx <= 0 { ++ hf.Name, err = d.decodeString(undecodedName) ++ if err != nil { ++ return err ++ } ++ } ++ hf.Value, err = d.decodeString(undecodedValue) ++ if err != nil { ++ return err ++ } ++ } + d.buf = buf + if it.indexed() { + d.dynTab.add(hf) +@@ -459,46 +472,52 @@ func readVarInt(n byte, p []byte) (i uint64, remain []byte, err error) { + return 0, origP, errNeedMore + } + +-// readString decodes an hpack string from p. ++// readString reads an hpack string from p. + // +-// wantStr is whether s will be used. If false, decompression and +-// []byte->string garbage are skipped if s will be ignored +-// anyway. This does mean that huffman decoding errors for non-indexed +-// strings past the MAX_HEADER_LIST_SIZE are ignored, but the server +-// is returning an error anyway, and because they're not indexed, the error +-// won't affect the decoding state. +-func (d *Decoder) readString(p []byte, wantStr bool) (s string, remain []byte, err error) { ++// It returns a reference to the encoded string data to permit deferring decode costs ++// until after the caller verifies all data is present. ++func (d *Decoder) readString(p []byte) (u undecodedString, remain []byte, err error) { + if len(p) == 0 { +- return "", p, errNeedMore ++ return u, p, errNeedMore + } + isHuff := p[0]&128 != 0 + strLen, p, err := readVarInt(7, p) + if err != nil { +- return "", p, err ++ return u, p, err + } + if d.maxStrLen != 0 && strLen > uint64(d.maxStrLen) { +- return "", nil, ErrStringLength ++ // Returning an error here means Huffman decoding errors ++ // for non-indexed strings past the maximum string length ++ // are ignored, but the server is returning an error anyway ++ // and because the string is not indexed the error will not ++ // affect the decoding state. ++ return u, nil, ErrStringLength + } + if uint64(len(p)) < strLen { +- return "", p, errNeedMore +- } +- if !isHuff { +- if wantStr { +- s = string(p[:strLen]) +- } +- return s, p[strLen:], nil ++ return u, p, errNeedMore + } ++ u.isHuff = isHuff ++ u.b = p[:strLen] ++ return u, p[strLen:], nil ++} + +- if wantStr { +- buf := bufPool.Get().(*bytes.Buffer) +- buf.Reset() // don't trust others +- defer bufPool.Put(buf) +- if err := huffmanDecode(buf, d.maxStrLen, p[:strLen]); err != nil { +- buf.Reset() +- return "", nil, err +- } ++type undecodedString struct { ++ isHuff bool ++ b []byte ++} ++ ++func (d *Decoder) decodeString(u undecodedString) (string, error) { ++ if !u.isHuff { ++ return string(u.b), nil ++ } ++ buf := bufPool.Get().(*bytes.Buffer) ++ buf.Reset() // don't trust others ++ var s string ++ err := huffmanDecode(buf, d.maxStrLen, u.b) ++ if err == nil { + s = buf.String() +- buf.Reset() // be nice to GC + } +- return s, p[strLen:], nil ++ buf.Reset() // be nice to GC ++ bufPool.Put(buf) ++ return s, err + } +-- +2.7.4 From patchwork Wed Apr 5 02:29:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 22246 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 81C3AC761A6 for ; Wed, 5 Apr 2023 02:30:05 +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.web11.121230.1680661797851132312 for ; Tue, 04 Apr 2023 19:29:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ncH1M6wX; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id kq3so33083940plb.13 for ; Tue, 04 Apr 2023 19:29:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680661797; x=1683253797; 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=RE2fb2zbDFEa/g62mIUMsjur3A9RGoTav2bw4cn5FGo=; b=ncH1M6wXW5IugVTUHx77yTx3AIJr3XeZD5D/g/2DwXLpYEIVBEDiuNuQ7eTuFk8ZYp pkCjkPvQreRDSTnU6Qlp7MA6sq3OOEiLvKd3BU2B837AaVdc+xb/2zrl+1OdmdUityKF dsyE2wDM9Qg6/7RCB75t0OeUESYJxTJXdX6cHp0rN5o671sf91rjDFlraKrYH3l2UJgs X2c7prLzPU/u8YW3jguPXnn5dxiceAb4GiUEIihJANqw3npS5JcsXwX42H+BlCDKdIoW rQbnCLBOtOfSGi8pcB5Kus9lIi2acR2i5LxGWmdvg96SPBbCT6tuOVjLhL9BofTA5Anl oPrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680661797; x=1683253797; 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=RE2fb2zbDFEa/g62mIUMsjur3A9RGoTav2bw4cn5FGo=; b=CQQcNGMh2Ck8j2Uk+O3X3j6c2q6M5GUXzjraIy7PMpFvIC5XyO8yvjuXSKhRJQptfS rXY559+sHdJa4YxjaAkwr0lZ1o9Saay8lko6dP79xAgCQLYtveqh7SZyCzInplAfNnXf hT/i0JzH5Gyhfnlk7dnAQ5OspwI9bh26Jju5hzaoMJfBfnFsmHoOJfiPIgwTNxHbyXCi k1iMWLK0NmWPP/bhWxpY2h1/8heMpttpfV1ktTasQ/6Qbb5agEabR/OYgeNDEMLk+sVl /tRxXIEkeIbpejyLCqOTa5a+lJRnDLSOkNwE2qsicIbMc+Nh12EiYZNOst/BGnMjxjJb GJrg== X-Gm-Message-State: AAQBX9d7kDvZ9g1SUYpdjzvjqq6ONU154GPRhN4aY54PnB4szNrbjxrW v+Bq2DDJE9CmPB2APEwn0NKwqVSjFFPzDVDTHgE= X-Google-Smtp-Source: AKy350YhQnLYq7QhUK22ZHqHgFv/DiuLymM8fysFk4oLxoadx02jyzQWAnpy9ZI2HlcVBs3X0VYT2g== X-Received: by 2002:a17:902:e84b:b0:19e:8076:9bd2 with SMTP id t11-20020a170902e84b00b0019e80769bd2mr5339152plg.17.1680661796788; Tue, 04 Apr 2023 19:29:56 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id a17-20020a170902ee9100b001a24cded097sm8937702pld.236.2023.04.04.19.29.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 19:29:56 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 2/6] curl: Add fix for CVE-2023-23916 Date: Tue, 4 Apr 2023 16:29:30 -1000 Message-Id: <1b10502deb6a542acfb9dc62dbd916e8299314da.1680661617.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 ; Wed, 05 Apr 2023 02:30:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179715 From: pawan Add below patch to fix CVE-2023-23916 CVE-2023-23916.patch Link: https://curl.se/docs/CVE-2023-23916.html Signed-off-by: pawan Signed-off-by: Steve Sakoman --- .../curl/curl/CVE-2023-23916.patch | 219 ++++++++++++++++++ meta/recipes-support/curl/curl_7.82.0.bb | 1 + 2 files changed, 220 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2023-23916.patch diff --git a/meta/recipes-support/curl/curl/CVE-2023-23916.patch b/meta/recipes-support/curl/curl/CVE-2023-23916.patch new file mode 100644 index 0000000000..a57d275902 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2023-23916.patch @@ -0,0 +1,219 @@ +From 119fb187192a9ea13dc90d9d20c215fc82799ab9 Mon Sep 17 00:00:00 2001 +From: Patrick Monnerat +Date: Mon, 13 Feb 2023 08:33:09 +0100 +Subject: [PATCH] content_encoding: do not reset stage counter for each header + +Test 418 verifies + +Closes #10492 + +CVE: CVE-2023-23916 +Upstream-Status: Backport [https://github.com/curl/curl/commit/119fb187192a9ea13dc.patch] +Signed-off-by: Pawan Badganchi +--- + lib/content_encoding.c | 7 +- + lib/urldata.h | 1 + + tests/data/Makefile.inc | 2 +- + tests/data/test387 | 2 +- + tests/data/test418 | 152 ++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 158 insertions(+), 6 deletions(-) + create mode 100644 tests/data/test418 + +--- a/lib/content_encoding.c ++++ b/lib/content_encoding.c +@@ -1037,7 +1037,6 @@ CURLcode Curl_build_unencoding_stack(str + const char *enclist, int maybechunked) + { + struct SingleRequest *k = &data->req; +- int counter = 0; + + do { + const char *name; +@@ -1072,9 +1071,9 @@ CURLcode Curl_build_unencoding_stack(str + if(!encoding) + encoding = &error_encoding; /* Defer error at stack use. */ + +- if(++counter >= MAX_ENCODE_STACK) { +- failf(data, "Reject response due to %u content encodings", +- counter); ++ if(k->writer_stack_depth++ >= MAX_ENCODE_STACK) { ++ failf(data, "Reject response due to more than %u content encodings", ++ MAX_ENCODE_STACK); + return CURLE_BAD_CONTENT_ENCODING; + } + /* Stack the unencoding stage. */ +--- a/lib/urldata.h ++++ b/lib/urldata.h +@@ -682,6 +682,7 @@ struct SingleRequest { + struct dohdata *doh; /* DoH specific data for this request */ + #endif + unsigned char setcookies; ++ unsigned char writer_stack_depth; /* Unencoding stack depth. */ + BIT(header); /* incoming data has HTTP header */ + BIT(content_range); /* set TRUE if Content-Range: was found */ + BIT(upload_done); /* set to TRUE when doing chunked transfer-encoding +--- a/tests/data/Makefile.inc ++++ b/tests/data/Makefile.inc +@@ -69,6 +69,7 @@ + \ + test400 test401 test402 test403 test404 test405 test406 test407 test408 \ + test409 test410 \ ++test418 \ + \ + test430 test431 test432 test433 test434 test435 test436 \ + \ +--- /dev/null ++++ b/tests/data/test418 +@@ -0,0 +1,152 @@ ++ ++ ++ ++HTTP ++gzip ++ ++ ++ ++# ++# Server-side ++ ++ ++HTTP/1.1 200 OK ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++Transfer-Encoding: gzip ++ ++-foo- ++ ++ ++ ++# ++# Client-side ++ ++ ++http ++ ++ ++Response with multiple Transfer-Encoding headers ++ ++ ++http://%HOSTIP:%HTTPPORT/%TESTNUMBER -sS ++ ++ ++ ++# ++# Verify data after the test has been "shot" ++ ++ ++GET /%TESTNUMBER HTTP/1.1 ++Host: %HOSTIP:%HTTPPORT ++User-Agent: curl/%VERSION ++Accept: */* ++ ++ ++ ++# CURLE_BAD_CONTENT_ENCODING is 61 ++ ++61 ++ ++ ++curl: (61) Reject response due to more than 5 content encodings ++ ++ ++ diff --git a/meta/recipes-support/curl/curl_7.82.0.bb b/meta/recipes-support/curl/curl_7.82.0.bb index b583060889..945745cdde 100644 --- a/meta/recipes-support/curl/curl_7.82.0.bb +++ b/meta/recipes-support/curl/curl_7.82.0.bb @@ -39,6 +39,7 @@ SRC_URI = "https://curl.se/download/${BP}.tar.xz \ file://CVE-2023-23914_5-3.patch \ file://CVE-2023-23914_5-4.patch \ file://CVE-2023-23914_5-5.patch \ + file://CVE-2023-23916.patch \ " SRC_URI[sha256sum] = "0aaa12d7bd04b0966254f2703ce80dd5c38dbbd76af0297d3d690cdce58a583c" From patchwork Wed Apr 5 02:29:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 22248 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 9074FC761AF for ; Wed, 5 Apr 2023 02:30:05 +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.web11.121231.1680661799998490271 for ; Tue, 04 Apr 2023 19:30:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=VpHtwhRe; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id f22so28994590plr.0 for ; Tue, 04 Apr 2023 19:29:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680661799; x=1683253799; 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=XW2jZYLN0F7OuoIm2I92pnB4BoATWmpbEOx/MyG2Mvc=; b=VpHtwhRebFeD3s8vyrhVYiKB3HsgVlGEbnibwWOCofO3DDCM+02i/CmKDRL4XyFfA6 uzO1LfVbN2EXz1JFKkr2eDxEWu1ohxuaJJGbkQn9a2We/5jT3V92DwcowqXUz3qQ+zrq s2d2krVe1E9tcHXac+qpZl6V8It6rrIfs1yKZ+YXQGUx5eHYxmmB+5zbir7B0v6D34kg +dkkJW4VfTlKt6JQf5iYbwkPV/p3mnXCAvvi+E7k++GRLDlT3tPAPRlvd6X0gQfhP2SW tg/NcS4MJbAbVPnaB/U5lE196hW3Qi6d50auAYVs8bLbSgoErD1CPiIHfUm6k9QTRqjs O0pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680661799; x=1683253799; 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=XW2jZYLN0F7OuoIm2I92pnB4BoATWmpbEOx/MyG2Mvc=; b=TwslmgipKMCdwwpxTA5lqxUxv863iR23hCyIXCBjCGNsU05Of1Dey9woRVDDi6if8d 4dlM8yImYEr99W+fQ9Usll/6xuqX8KJt5Yq2alfQ4fvt/kn1ZNeNGeyc9hPbrQYApEwg 6nvA5AsZCA6Y/5XC6Sj2Puu6wOAANwHbZn4wXVqjY4SGNFcL5b7FjnxueBvr/1nes5ze wuHs7EV04lh4BS8k7oCgRmoqTasL/L9LDN198nQHUvMTp0Hyf7VCz4I+5kOq5t6deBfp nyDZzAc1l2lNmi1yY56s0xogs6q4Ry5jVViJQw55V+h0dHjBEjn/9TYcxiRfM3NWlc9j 9yEA== X-Gm-Message-State: AAQBX9dZk9DRjWUEC/RMeodtNzjwR2reGffxeqgHSjsA6R+CMJDRzX1E 6uatCslW8YtiyWGPYJi//sHyU1hryYOhkFYOdJY= X-Google-Smtp-Source: AKy350Z56cWWO2xGgyf9LS6oo0qxdXsIQEEBInztKfckabWMIqjl9x3kgE6jl1JUzzFFmU/5LtnsQA== X-Received: by 2002:a17:90a:195a:b0:23f:962e:825d with SMTP id 26-20020a17090a195a00b0023f962e825dmr1142268pjh.1.1680661798761; Tue, 04 Apr 2023 19:29:58 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id a17-20020a170902ee9100b001a24cded097sm8937702pld.236.2023.04.04.19.29.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 19:29:58 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 3/6] json-c: Add ptest for json-c Date: Tue, 4 Apr 2023 16:29:31 -1000 Message-Id: <7d588d0727d49dcf04d7c3d8a4ec23ca2f6cc56d.1680661617.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 ; Wed, 05 Apr 2023 02:30:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179716 From: Simone Weiss Adapt json-c recipe to compile and deploy a ptest for json-c. Also add a small script for executing the tests. All tests were successful on a trial and took around 20 seconds. Signed-off-by: Simone Weiß Signed-off-by: Kai Tomerius Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 757a5fbdeed58573c40d6e21475cc516aa49fd1c) Signed-off-by: Steve Sakoman --- .../distro/include/ptest-packagelists.inc | 1 + meta/recipes-devtools/json-c/json-c/run-ptest | 20 +++++++++++++++++++ meta/recipes-devtools/json-c/json-c_0.15.bb | 16 +++++++++++++-- 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-devtools/json-c/json-c/run-ptest diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index a65c048984..5bcff83093 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -22,6 +22,7 @@ PTESTS_FAST = "\ gettext-ptest \ glib-networking-ptest \ gzip-ptest \ + json-c-ptest \ json-glib-ptest \ libconvert-asn1-perl-ptest \ liberror-perl-ptest \ diff --git a/meta/recipes-devtools/json-c/json-c/run-ptest b/meta/recipes-devtools/json-c/json-c/run-ptest new file mode 100644 index 0000000000..9ee6095ea2 --- /dev/null +++ b/meta/recipes-devtools/json-c/json-c/run-ptest @@ -0,0 +1,20 @@ +#!/bin/sh + +# This script is used to run json-c test suites +cd tests + +ret_val=0 +for i in test*.test; do + # test_basic is not an own testcase, just + # contains common code of other tests + if [ "$i" != "test_basic.test" ]; then + if ./$i > json-c_test.log 2>&1 ; then + echo PASS: $i + else + ret_val=1 + echo FAIL: $i + fi + fi +done + +exit $ret_val diff --git a/meta/recipes-devtools/json-c/json-c_0.15.bb b/meta/recipes-devtools/json-c/json-c_0.15.bb index a4673a2f0e..7cbed55b3b 100644 --- a/meta/recipes-devtools/json-c/json-c_0.15.bb +++ b/meta/recipes-devtools/json-c/json-c_0.15.bb @@ -4,7 +4,10 @@ HOMEPAGE = "https://github.com/json-c/json-c/wiki" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2" -SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz" +SRC_URI = " \ + https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz \ + file://run-ptest \ +" SRC_URI[sha256sum] = "b8d80a1ddb718b3ba7492916237bbf86609e9709fb007e7f7d4322f02341a4c6" @@ -13,6 +16,15 @@ UPSTREAM_CHECK_REGEX = "json-c-(?P\d+(\.\d+)+)-\d+" RPROVIDES:${PN} = "libjson" -inherit cmake +inherit cmake ptest + +do_install_ptest() { + install -d ${D}/${PTEST_PATH}/tests + install ${B}/tests/test* ${D}/${PTEST_PATH}/tests + install ${S}/tests/*.test ${D}/${PTEST_PATH}/tests + install ${S}/tests/*.expected ${D}/${PTEST_PATH}/tests + install ${S}/tests/test-defs.sh ${D}/${PTEST_PATH}/tests + install ${S}/tests/valid*json ${D}/${PTEST_PATH}/tests +} BBCLASSEXTEND = "native nativesdk" From patchwork Wed Apr 5 02:29:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 22247 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 91811C77B6E for ; Wed, 5 Apr 2023 02:30:05 +0000 (UTC) Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by mx.groups.io with SMTP id smtpd.web10.121139.1680661801667223232 for ; Tue, 04 Apr 2023 19:30:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=YGKf/cQz; spf=softfail (domain: sakoman.com, ip: 209.85.216.51, mailfrom: steve@sakoman.com) Received: by mail-pj1-f51.google.com with SMTP id x15so32527081pjk.2 for ; Tue, 04 Apr 2023 19:30:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680661801; x=1683253801; 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=kZFNn9zUf3+CMx6K4CnTpey3mTQBXhfJ1cykNz34n+A=; b=YGKf/cQzA0Cwl1ekC7KJ7O3Fq1wD9wWy9SpGFE1pNZVf7vS3HbHLBeM5zyUpeycisa NncHBKll1ZgRmO4cm+7tgEMyF0k7Pc2WtrNzCbewUJfV8dBTb0GAbN4MV7wY6Ez10syd /2a12i7TDA1gjnr7vWCt8EykTg6bBbzNhtlNFIUn1Xwx8XmR+AFfAHWu499vjOyT96Lb i+kMWA8910B9A+g0xaMVgxh698hSfcmf8nvNIumv2VGIFLdLWFZceKO28hht/cEFUYUR mesS6Gz1CVy9itxpwBWb70STP74itLvVtHUhVfYictZuKH19om1QWWQLIA8EumOEm5y4 PDeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680661801; x=1683253801; 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=kZFNn9zUf3+CMx6K4CnTpey3mTQBXhfJ1cykNz34n+A=; b=FFwLTxRQOOI/ju01PCL8vQS5oPCuB4HFXUK6L6yvRf7beWeqp+bh+C58V5hQzvaT43 lkwhBQ2pfnRrVkMLiQOK8PQB/R33qzC7ccpjtN5cer57Tlb6iOBO8ZCit4FU6DS2EV/d EdbS7fE2r+7qD/loh200VICqGU2kAa/PQsOascnVRFR/g7DiXULr7lJY8G2cMm4jHS+k inVeAeYQy3xFT8EFv16SMJxn+g7bIJY0GcfWJ320SXfPFeaC9HAVox4K5AiLHOMeEbKL yp9Jw2d2iRlPijT0/GZGUTgC16DzRC3R8gi4pU/GOBjxN12qQfyM/EKdDkjdpaViIua6 5jLQ== X-Gm-Message-State: AAQBX9eabVXOqbdkii9JYB9qoHxcnlIeSUalSJtmKyKLP/nRPrezB4Op /R3otbOwrkbtb1J4+2c2H7Ffvi90EuWScWJipI4= X-Google-Smtp-Source: AKy350aw+e2ZSLxhIMAQujH8DuQeBgtYzD83lfRUybnYBTDzTyRs7YZzK61BQwg12hCiWZO2QPt2Cw== X-Received: by 2002:a17:90a:d583:b0:234:d42:1628 with SMTP id v3-20020a17090ad58300b002340d421628mr5088706pju.10.1680661800692; Tue, 04 Apr 2023 19:30:00 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id a17-20020a170902ee9100b001a24cded097sm8937702pld.236.2023.04.04.19.29.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 19:30:00 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 4/6] patchelf: replace a rejected patch with an equivalent uninative.bbclass tweak Date: Tue, 4 Apr 2023 16:29:32 -1000 Message-Id: <163e2d5defebab262a5ec6fa9885deedace538f2.1680661617.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 ; Wed, 05 Apr 2023 02:30:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179717 From: Alexander Kanavin This was the original reason to add the patch: https://git.openembedded.org/openembedded-core/commit/?id=18efcbcb896239c64fedd009ce57f3f0c668cbc0 and this is the upstream discussion which suggests handling read-only files explicitly outside of patchelf: https://github.com/NixOS/patchelf/pull/89 Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- meta/classes/uninative.bbclass | 2 + .../patchelf/handle-read-only-files.patch | 65 ------------------- .../patchelf/patchelf_0.14.5.bb | 1 - 3 files changed, 2 insertions(+), 66 deletions(-) delete mode 100644 meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass index 6a9e862bcd..7f0591d49a 100644 --- a/meta/classes/uninative.bbclass +++ b/meta/classes/uninative.bbclass @@ -167,5 +167,7 @@ python uninative_changeinterp () { if not elf.isDynamic(): continue + os.chmod(f, s[stat.ST_MODE] | stat.S_IWUSR) subprocess.check_output(("patchelf-uninative", "--set-interpreter", d.getVar("UNINATIVE_LOADER"), f), stderr=subprocess.STDOUT) + os.chmod(f, s[stat.ST_MODE]) } diff --git a/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch b/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch deleted file mode 100644 index b755a263a4..0000000000 --- a/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 682fb48c137b687477008b68863c2a0b73ed47d1 Mon Sep 17 00:00:00 2001 -From: Fabio Berton -Date: Fri, 9 Sep 2016 16:00:42 -0300 -Subject: [PATCH] handle read-only files - -Patch from: -https://github.com/darealshinji/patchelf/commit/40e66392bc4b96e9b4eda496827d26348a503509 - -Upstream-Status: Denied [https://github.com/NixOS/patchelf/pull/89] - -Signed-off-by: Fabio Berton - ---- - src/patchelf.cc | 16 +++++++++++++++- - 1 file changed, 15 insertions(+), 1 deletion(-) - -Index: git/src/patchelf.cc -=================================================================== ---- git.orig/src/patchelf.cc -+++ git/src/patchelf.cc -@@ -534,9 +534,19 @@ void ElfFile::sortShd - - static void writeFile(const std::string & fileName, const FileContents & contents) - { -+ struct stat st; -+ int fd; -+ - debug("writing %s\n", fileName.c_str()); - -- int fd = open(fileName.c_str(), O_CREAT | O_TRUNC | O_WRONLY, 0777); -+ if (stat(fileName.c_str(), &st) != 0) -+ error("stat"); -+ -+ if (chmod(fileName.c_str(), 0600) != 0) -+ error("chmod"); -+ -+ fd = open(fileName.c_str(), O_CREAT | O_TRUNC | O_WRONLY, 0777); -+ - if (fd == -1) - error("open"); - -@@ -551,8 +561,6 @@ static void writeFile(const std::string - bytesWritten += portion; - } - -- if (close(fd) >= 0) -- return; - /* - * Just ignore EINTR; a retry loop is the wrong thing to do. - * -@@ -561,9 +569,11 @@ static void writeFile(const std::string - * http://utcc.utoronto.ca/~cks/space/blog/unix/CloseEINTR - * https://sites.google.com/site/michaelsafyan/software-engineering/checkforeintrwheninvokingclosethinkagain - */ -- if (errno == EINTR) -- return; -- error("close"); -+ if ((close(fd) < 0) && errno != EINTR) -+ error("close"); -+ -+ if (chmod(fileName.c_str(), st.st_mode) != 0) -+ error("chmod"); - } - - diff --git a/meta/recipes-devtools/patchelf/patchelf_0.14.5.bb b/meta/recipes-devtools/patchelf/patchelf_0.14.5.bb index 0fa2c00f1d..82c7e807ac 100644 --- a/meta/recipes-devtools/patchelf/patchelf_0.14.5.bb +++ b/meta/recipes-devtools/patchelf/patchelf_0.14.5.bb @@ -5,7 +5,6 @@ HOMEPAGE = "https://github.com/NixOS/patchelf" LICENSE = "GPL-3.0-only" SRC_URI = "git://github.com/NixOS/patchelf;protocol=https;branch=master \ - file://handle-read-only-files.patch \ " SRCREV = "a35054504293f9ff64539850d1ed0bfd2f5399f2" From patchwork Wed Apr 5 02:29:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 22245 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 849FFC76188 for ; Wed, 5 Apr 2023 02:30:05 +0000 (UTC) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web10.121142.1680661803427752932 for ; Tue, 04 Apr 2023 19:30:03 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=awovqEAh; spf=softfail (domain: sakoman.com, ip: 209.85.214.180, mailfrom: steve@sakoman.com) Received: by mail-pl1-f180.google.com with SMTP id le6so33091345plb.12 for ; Tue, 04 Apr 2023 19:30:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680661802; x=1683253802; 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=7vvVRqvC7jgHP0G0D6lLd9oe0furQGXQJvOFGnqMNbQ=; b=awovqEAhA1BiDQDHN85Jxc9xzJ1l6qHi6yvgWok1Q+obyagPlJavZyUh4UFrv1hWlc 4oVgiPNdymVybqcGouMx7yvdqMXdlGu6YKn8ew5QuoZt4EgA6Tismt4xp/fDF3lLfZ// Ll//Dv0JzEi1sQNkEjjfMQM3WgxlWkgty5Vob0MP7ztm6Bi4HouHSwRcBDgRBIems9GZ k0b5Llju5hfjCmOG7oaCHlLqtOFWzJvCjB0v1OKsbRU19xVMPZ6xqgjCavKriUdUG0gO 99dRyMNJ1dBdPvcn/LDXvVWDS4qkO68dg6DLtZ91ydZCvCNyKYTJw+XHKsRGZfGtn5Y7 8+GA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680661802; x=1683253802; 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=7vvVRqvC7jgHP0G0D6lLd9oe0furQGXQJvOFGnqMNbQ=; b=pTGfJVjE6dGaZYkuau9gdr7oCRKaFS4UQsmVxvcT2sIATfm1YhFxVsWFmUyNrg+Rzl yLQZcPUaBOWW4MvVBD/U57P6JXcC5Paw1n960HL2PCNl2FkabCB4Ik2y4ozuNDYQRwWK 9zVSsXwwAnjyL3k01A87Yk8bkslR0Y8OXPMY6z7/KjO/Jtf3T8e+wJl4qiXRLJmXEEJD 9d7c+NOL8Nk8LdB/jSdCbtirJZF9aGLBiRnQVD9uTdl+D8cL53hSqMpmQKmwohLrvQsc RbrmgGazZYGdT6avHEo+uc6PU0+jRRcis+U95JEiHIeHQBLqPxMBFojLaEKu9oDh4Sqo dzcQ== X-Gm-Message-State: AAQBX9fEMC/gvwfellU7to9PbUaX90h9YakMFRHHjNEdnhHMnpjP+qoV nC1XepD04SzH7oSgpIewvSWHKcJr/anMAXczgiQ= X-Google-Smtp-Source: AKy350aAxtHGHQHd7tums9xjm/V7+DTTTkHWz1LGmM0Prh/pzbqwWEc0lLEXs9PoJVrFaVUPuvd4ow== X-Received: by 2002:a17:903:1c6:b0:1a1:cb18:7f99 with SMTP id e6-20020a17090301c600b001a1cb187f99mr985980plh.30.1680661802538; Tue, 04 Apr 2023 19:30:02 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id a17-20020a170902ee9100b001a24cded097sm8937702pld.236.2023.04.04.19.30.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 19:30:02 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 5/6] uninative: Upgrade to 3.8.1 to include libgcc Date: Tue, 4 Apr 2023 16:29:33 -1000 Message-Id: <6c58a2a36d9f39c219503ed921f42063727164db.1680661617.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 ; Wed, 05 Apr 2023 02:30:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179718 From: Michael Halstead Including libgcc solves issues with libpthread. Signed-off-by: Michael Halstead Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- meta/conf/distro/include/yocto-uninative.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/conf/distro/include/yocto-uninative.inc b/meta/conf/distro/include/yocto-uninative.inc index 7012db441b..51c0cdee43 100644 --- a/meta/conf/distro/include/yocto-uninative.inc +++ b/meta/conf/distro/include/yocto-uninative.inc @@ -7,9 +7,9 @@ # UNINATIVE_MAXGLIBCVERSION = "2.36" -UNINATIVE_VERSION = "3.7" +UNINATIVE_VERSION = "3.8.1" UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/${UNINATIVE_VERSION}/" -UNINATIVE_CHECKSUM[aarch64] ?= "6a29bcae4b5b716d2d520e18800b33943b65f8a835eac1ff8793fc5ee65b4be6" -UNINATIVE_CHECKSUM[i686] ?= "3f6d52e64996570c716108d49f8108baccf499a283bbefae438c7266b7a93305" -UNINATIVE_CHECKSUM[x86_64] ?= "b110bf2e10fe420f5ca2f3ec55f048ee5f0a54c7e34856a3594e51eb2aea0570" +UNINATIVE_CHECKSUM[aarch64] ?= "3f15d420049b21854bd7a8843da0f42f17064559492c8b752d7a6f998ff5ea65" +UNINATIVE_CHECKSUM[i686] ?= "a6dcf316d738ade2e5e463bd3b33a270b4bfc25bba41770ad5cbdc3b0e24044c" +UNINATIVE_CHECKSUM[x86_64] ?= "5fab9a5c97fc73a21134e5a81f74498cbaecda75d56aab971c934e0b803bcc00" From patchwork Wed Apr 5 02:29:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 22250 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 753DAC76188 for ; Wed, 5 Apr 2023 02:30:15 +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.121137.1680661795828023824 for ; Tue, 04 Apr 2023 19:30:07 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=4o6TTYfx; spf=softfail (domain: sakoman.com, ip: 209.85.214.178, mailfrom: steve@sakoman.com) Received: by mail-pl1-f178.google.com with SMTP id o2so33120609plg.4 for ; Tue, 04 Apr 2023 19:30:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1680661806; x=1683253806; 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=EqHsZdI+56VguszBP+3kQ0EH/f89RdfyP19rdBlNR64=; b=4o6TTYfxex0yBjhgCgoIAt8vr2KjM5rHwdsog1w8orVzP+gEJLi2lA2q3mtnpOr9v4 U9d/SnjPhKGOPGG/bWUGG6VnuBHgWAMOk9vzluPBkrYmQJoF6HsDwJBpHgowwvHc/tfb Y/k/+6GEfnHnEc22PkrZh2eSDIw2cFhuwh7ZUTo9u7Qibny05af+RBZBScFJ7X6AjgXt gpzU2iT4yZkEWZdd+jPAvn7DigRXwnLvlxAbSVqIqfsgJ9x+juM1kkLh+VSxwy6O85ZA arA0Qd6bWW0u1t4pW+yyStYdsxgPTQLkWSNK3zXxhhkZn4EDqWv/6nIdbGoa37BQ9gzJ 7hmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680661806; x=1683253806; 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=EqHsZdI+56VguszBP+3kQ0EH/f89RdfyP19rdBlNR64=; b=8Be3a/XB3summNtC2crC/o/gXIwbSfy41Gu3zAPRWdlBSyhLqHQIEJcytfzqcnC8gz K+ZjAuQTY8jpadlpWtQlWqd+LBFyIJLgrh6Lg14hLlPIzyOdWv7mbiKTkjHtHNRJZim/ sQ6D7MhVnd3lcpqIU4t1qCaH/Fho65MR+zNsq6403Su2R4++aRKIMTX/x8ZbHYUewtap 44Lae9ySUkP8HnRh5ddwOp11pSiI+mLrMGB8xYmRtgr+0GlTuraW0JEbRJlRhe+7KK5S Cb8hajH6HZVVIyS7UJ6O9mxrf6CqL6G8LpYIqogFPp+x1WkUiZoxDBJJ6sv+Uj5KTP69 kM1A== X-Gm-Message-State: AAQBX9dWc9/teXy2NmWfFy6cqR2AveA+pKf+LV/WPgPIng8rt+XLF2l0 smf3KGFWvOMXDgjenDKmYSvaVj+30AWhfym8R0I= X-Google-Smtp-Source: AKy350bL2/AhM8oyoztjmitSbnj/QazKEtvsEpoCWVy0m6sCz45pJkZB03twwcodWrpkX2ItsAFpLw== X-Received: by 2002:a17:902:dac1:b0:1a2:a904:c42e with SMTP id q1-20020a170902dac100b001a2a904c42emr1041031plx.24.1680661806597; Tue, 04 Apr 2023 19:30:06 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id a17-20020a170902ee9100b001a24cded097sm8937702pld.236.2023.04.04.19.30.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 19:30:06 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 6/6] uninative: Upgrade to 3.9 to include glibc 2.37 Date: Tue, 4 Apr 2023 16:29:34 -1000 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 ; Wed, 05 Apr 2023 02:30:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179719 From: Michael Halstead Update uninative to work with the new glibc 2.37. Signed-off-by: Michael Halstead Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- meta/conf/distro/include/yocto-uninative.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/conf/distro/include/yocto-uninative.inc b/meta/conf/distro/include/yocto-uninative.inc index 51c0cdee43..8a5cab5360 100644 --- a/meta/conf/distro/include/yocto-uninative.inc +++ b/meta/conf/distro/include/yocto-uninative.inc @@ -6,10 +6,10 @@ # to the distro running on the build machine. # -UNINATIVE_MAXGLIBCVERSION = "2.36" -UNINATIVE_VERSION = "3.8.1" +UNINATIVE_MAXGLIBCVERSION = "2.37" +UNINATIVE_VERSION = "3.9" UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/${UNINATIVE_VERSION}/" -UNINATIVE_CHECKSUM[aarch64] ?= "3f15d420049b21854bd7a8843da0f42f17064559492c8b752d7a6f998ff5ea65" -UNINATIVE_CHECKSUM[i686] ?= "a6dcf316d738ade2e5e463bd3b33a270b4bfc25bba41770ad5cbdc3b0e24044c" -UNINATIVE_CHECKSUM[x86_64] ?= "5fab9a5c97fc73a21134e5a81f74498cbaecda75d56aab971c934e0b803bcc00" +UNINATIVE_CHECKSUM[aarch64] ?= "de35708c95c34573af140da910132c3291ba4fd26ebf7b74b755ada432cdf07b" +UNINATIVE_CHECKSUM[i686] ?= "adac07b08adb88eb26fc7fd87fee0cec9d5be167bf7c5ffd3a549a2a6699c29c" +UNINATIVE_CHECKSUM[x86_64] ?= "3dd82c3fbdb59e87bf091c3eef555a05fae528eeda3083828f76cd4deaceca8b"