From patchwork Sun Dec 18 16:12:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16885 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 A19AAC4708D for ; Sun, 18 Dec 2022 16:13:19 +0000 (UTC) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mx.groups.io with SMTP id smtpd.web10.32099.1671379995056519891 for ; Sun, 18 Dec 2022 08:13:15 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=PToXrUo0; spf=softfail (domain: sakoman.com, ip: 209.85.216.45, mailfrom: steve@sakoman.com) Received: by mail-pj1-f45.google.com with SMTP id z8-20020a17090abd8800b00219ed30ce47so10730727pjr.3 for ; Sun, 18 Dec 2022 08:13:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=wnbU2gEDNYl51PK3px6KFv8b8z6EzPl2bI5U6ClVwd0=; b=PToXrUo0SEKPtjB+OW+qKAXc/Fiom45+Xa5iG3xMsK2PWm9YpWVRgbE3K6pSBnVkm8 mO7tSaNs612HvgvXkbDJh2DyCmwxTaMUfUPdTrbOaTapf8M4QdoyNslgmH/sLIxDYKpH qfm4vBaSUJpWU/gHEhdISSxQq8DbFa5wyaDa4PG6nj5zRXJYn5RbZwOOLRdheQcjvmvB u1plgTplOrLBJ+cuqDFYdJdlAH7GpKEFehKNDasBm5IVq7EexY9o7R7xM/QCnu40ZJS2 KnGaOSLa+oljHR8EOWcwJctM099zAT2CZFou443mV7HHozTy/v0eavh5w6h6fxLNYodo OJUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=wnbU2gEDNYl51PK3px6KFv8b8z6EzPl2bI5U6ClVwd0=; b=sytCRj4My0w5/3De9x29JhGE97bxPz/wNp7lgh62FrymRfc/PLnjhhus2fAdnJU8az rBgJkLV/KkSrcuqNNhiwMmQGBlyMuQXcRu9UayDSdweKTmk5kiIm+2/Ct0+w+o8uOKxQ 97CKzWvVxDhDFlQqSfSLDNTxlXmvtKgcCJYFK/4vUaCmVqIUwXu/HVGUsYEPCcbTGiH4 n4b07/noiI2l3Fjh1dQ55GbwKmPFrY1YJzyvtfmfKgUmTybX1zADdRVoXBQwVxrxm3jz 4OmXtSWWkCGSK1TkEyslfNeTrVqSAw3cxlsxiul21QImVYYYl67cIxrwYmR1NTu7biCW Kkcw== X-Gm-Message-State: ANoB5pno73fjabwbfikzELR7HHfQcXPD4XBuzcN8pLUKgB+ulDu9yG2i ab6GrRYK19jtsPfqjGo40VnTdChTJv6X+K2y4jM= X-Google-Smtp-Source: AA0mqf444y65LsNVAHZAlYWt9zKaCtoaoctZQ2hk4dQHJJhw1203shKRLDKgeBcGFGLDiMg1QJvEUw== X-Received: by 2002:a17:902:e293:b0:189:6d2f:4bcd with SMTP id o19-20020a170902e29300b001896d2f4bcdmr34793877plc.0.1671379993938; Sun, 18 Dec 2022 08:13:13 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id c7-20020a170902d48700b001896522a23bsm5278763plg.39.2022.12.18.08.13.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Dec 2022 08:13:13 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 01/19] golang: CVE-2022-41715 regexp/syntax: limit memory used by parsing regexps Date: Sun, 18 Dec 2022 06:12:45 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 18 Dec 2022 16:13:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174788 From: Hitendra Prajapati Upstream-Status: Backport from https://github.com/golang/go/commit/e9017c2416ad0ef642f5e0c2eab2dbf3cba4d997 Signed-off-by: Hitendra Prajapati Signed-off-by: Steve Sakoman --- meta/recipes-devtools/go/go-1.17.13.inc | 1 + .../go/go-1.18/CVE-2022-41715.patch | 270 ++++++++++++++++++ 2 files changed, 271 insertions(+) create mode 100644 meta/recipes-devtools/go/go-1.18/CVE-2022-41715.patch diff --git a/meta/recipes-devtools/go/go-1.17.13.inc b/meta/recipes-devtools/go/go-1.17.13.inc index 9c467d63b2..a1942e9f15 100644 --- a/meta/recipes-devtools/go/go-1.17.13.inc +++ b/meta/recipes-devtools/go/go-1.17.13.inc @@ -18,6 +18,7 @@ SRC_URI += "\ file://0001-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ file://CVE-2022-27664.patch \ file://0001-net-http-httputil-avoid-query-parameter-smuggling.patch \ + file://CVE-2022-41715.patch \ " SRC_URI[main.sha256sum] = "a1a48b23afb206f95e7bbaa9b898d965f90826f6f1d1fc0c1d784ada0cd300fd" diff --git a/meta/recipes-devtools/go/go-1.18/CVE-2022-41715.patch b/meta/recipes-devtools/go/go-1.18/CVE-2022-41715.patch new file mode 100644 index 0000000000..994f37aaf3 --- /dev/null +++ b/meta/recipes-devtools/go/go-1.18/CVE-2022-41715.patch @@ -0,0 +1,270 @@ +From e9017c2416ad0ef642f5e0c2eab2dbf3cba4d997 Mon Sep 17 00:00:00 2001 +From: Russ Cox +Date: Wed, 28 Sep 2022 11:18:51 -0400 +Subject: [PATCH] [release-branch.go1.18] regexp: limit size of parsed regexps + +Set a 128 MB limit on the amount of space used by []syntax.Inst +in the compiled form corresponding to a given regexp. + +Also set a 128 MB limit on the rune storage in the *syntax.Regexp +tree itself. + +Thanks to Adam Korczynski (ADA Logics) and OSS-Fuzz for reporting this issue. + +Fixes CVE-2022-41715. +Updates #55949. +Fixes #55950. + +Change-Id: Ia656baed81564436368cf950e1c5409752f28e1b +Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1592136 +TryBot-Result: Security TryBots +Reviewed-by: Damien Neil +Run-TryBot: Roland Shoemaker +Reviewed-by: Julie Qiu +Reviewed-on: https://go-review.googlesource.com/c/go/+/438501 +Run-TryBot: Carlos Amedee +Reviewed-by: Carlos Amedee +Reviewed-by: Dmitri Shuralyov +TryBot-Result: Gopher Robot +Reviewed-by: Dmitri Shuralyov + +Upstream-Status: Backport [https://github.com/golang/go/commit/e9017c2416ad0ef642f5e0c2eab2dbf3cba4d997] +CVE: CVE-2022-41715 +Signed-off-by: Hitendra Prajapati +--- + src/regexp/syntax/parse.go | 145 ++++++++++++++++++++++++++++++-- + src/regexp/syntax/parse_test.go | 13 +-- + 2 files changed, 148 insertions(+), 10 deletions(-) + +diff --git a/src/regexp/syntax/parse.go b/src/regexp/syntax/parse.go +index d7cf2af..3792960 100644 +--- a/src/regexp/syntax/parse.go ++++ b/src/regexp/syntax/parse.go +@@ -90,15 +90,49 @@ const ( + // until we've allocated at least maxHeight Regexp structures. + const maxHeight = 1000 + ++// maxSize is the maximum size of a compiled regexp in Insts. ++// It too is somewhat arbitrarily chosen, but the idea is to be large enough ++// to allow significant regexps while at the same time small enough that ++// the compiled form will not take up too much memory. ++// 128 MB is enough for a 3.3 million Inst structures, which roughly ++// corresponds to a 3.3 MB regexp. ++const ( ++ maxSize = 128 << 20 / instSize ++ instSize = 5 * 8 // byte, 2 uint32, slice is 5 64-bit words ++) ++ ++// maxRunes is the maximum number of runes allowed in a regexp tree ++// counting the runes in all the nodes. ++// Ignoring character classes p.numRunes is always less than the length of the regexp. ++// Character classes can make it much larger: each \pL adds 1292 runes. ++// 128 MB is enough for 32M runes, which is over 26k \pL instances. ++// Note that repetitions do not make copies of the rune slices, ++// so \pL{1000} is only one rune slice, not 1000. ++// We could keep a cache of character classes we've seen, ++// so that all the \pL we see use the same rune list, ++// but that doesn't remove the problem entirely: ++// consider something like [\pL01234][\pL01235][\pL01236]...[\pL^&*()]. ++// And because the Rune slice is exposed directly in the Regexp, ++// there is not an opportunity to change the representation to allow ++// partial sharing between different character classes. ++// So the limit is the best we can do. ++const ( ++ maxRunes = 128 << 20 / runeSize ++ runeSize = 4 // rune is int32 ++) ++ + type parser struct { + flags Flags // parse mode flags + stack []*Regexp // stack of parsed expressions + free *Regexp + numCap int // number of capturing groups seen + wholeRegexp string +- tmpClass []rune // temporary char class work space +- numRegexp int // number of regexps allocated +- height map[*Regexp]int // regexp height for height limit check ++ tmpClass []rune // temporary char class work space ++ numRegexp int // number of regexps allocated ++ numRunes int // number of runes in char classes ++ repeats int64 // product of all repetitions seen ++ height map[*Regexp]int // regexp height, for height limit check ++ size map[*Regexp]int64 // regexp compiled size, for size limit check + } + + func (p *parser) newRegexp(op Op) *Regexp { +@@ -122,6 +156,104 @@ func (p *parser) reuse(re *Regexp) { + p.free = re + } + ++func (p *parser) checkLimits(re *Regexp) { ++ if p.numRunes > maxRunes { ++ panic(ErrInternalError) ++ } ++ p.checkSize(re) ++ p.checkHeight(re) ++} ++ ++func (p *parser) checkSize(re *Regexp) { ++ if p.size == nil { ++ // We haven't started tracking size yet. ++ // Do a relatively cheap check to see if we need to start. ++ // Maintain the product of all the repeats we've seen ++ // and don't track if the total number of regexp nodes ++ // we've seen times the repeat product is in budget. ++ if p.repeats == 0 { ++ p.repeats = 1 ++ } ++ if re.Op == OpRepeat { ++ n := re.Max ++ if n == -1 { ++ n = re.Min ++ } ++ if n <= 0 { ++ n = 1 ++ } ++ if int64(n) > maxSize/p.repeats { ++ p.repeats = maxSize ++ } else { ++ p.repeats *= int64(n) ++ } ++ } ++ if int64(p.numRegexp) < maxSize/p.repeats { ++ return ++ } ++ ++ // We need to start tracking size. ++ // Make the map and belatedly populate it ++ // with info about everything we've constructed so far. ++ p.size = make(map[*Regexp]int64) ++ for _, re := range p.stack { ++ p.checkSize(re) ++ } ++ } ++ ++ if p.calcSize(re, true) > maxSize { ++ panic(ErrInternalError) ++ } ++} ++ ++func (p *parser) calcSize(re *Regexp, force bool) int64 { ++ if !force { ++ if size, ok := p.size[re]; ok { ++ return size ++ } ++ } ++ ++ var size int64 ++ switch re.Op { ++ case OpLiteral: ++ size = int64(len(re.Rune)) ++ case OpCapture, OpStar: ++ // star can be 1+ or 2+; assume 2 pessimistically ++ size = 2 + p.calcSize(re.Sub[0], false) ++ case OpPlus, OpQuest: ++ size = 1 + p.calcSize(re.Sub[0], false) ++ case OpConcat: ++ for _, sub := range re.Sub { ++ size += p.calcSize(sub, false) ++ } ++ case OpAlternate: ++ for _, sub := range re.Sub { ++ size += p.calcSize(sub, false) ++ } ++ if len(re.Sub) > 1 { ++ size += int64(len(re.Sub)) - 1 ++ } ++ case OpRepeat: ++ sub := p.calcSize(re.Sub[0], false) ++ if re.Max == -1 { ++ if re.Min == 0 { ++ size = 2 + sub // x* ++ } else { ++ size = 1 + int64(re.Min)*sub // xxx+ ++ } ++ break ++ } ++ // x{2,5} = xx(x(x(x)?)?)? ++ size = int64(re.Max)*sub + int64(re.Max-re.Min) ++ } ++ ++ if size < 1 { ++ size = 1 ++ } ++ p.size[re] = size ++ return size ++} ++ + func (p *parser) checkHeight(re *Regexp) { + if p.numRegexp < maxHeight { + return +@@ -158,6 +290,7 @@ func (p *parser) calcHeight(re *Regexp, force bool) int { + + // push pushes the regexp re onto the parse stack and returns the regexp. + func (p *parser) push(re *Regexp) *Regexp { ++ p.numRunes += len(re.Rune) + if re.Op == OpCharClass && len(re.Rune) == 2 && re.Rune[0] == re.Rune[1] { + // Single rune. + if p.maybeConcat(re.Rune[0], p.flags&^FoldCase) { +@@ -189,7 +322,7 @@ func (p *parser) push(re *Regexp) *Regexp { + } + + p.stack = append(p.stack, re) +- p.checkHeight(re) ++ p.checkLimits(re) + return re + } + +@@ -299,7 +432,7 @@ func (p *parser) repeat(op Op, min, max int, before, after, lastRepeat string) ( + re.Sub = re.Sub0[:1] + re.Sub[0] = sub + p.stack[n-1] = re +- p.checkHeight(re) ++ p.checkLimits(re) + + if op == OpRepeat && (min >= 2 || max >= 2) && !repeatIsValid(re, 1000) { + return "", &Error{ErrInvalidRepeatSize, before[:len(before)-len(after)]} +@@ -503,6 +636,7 @@ func (p *parser) factor(sub []*Regexp) []*Regexp { + + for j := start; j < i; j++ { + sub[j] = p.removeLeadingString(sub[j], len(str)) ++ p.checkLimits(sub[j]) + } + suffix := p.collapse(sub[start:i], OpAlternate) // recurse + +@@ -560,6 +694,7 @@ func (p *parser) factor(sub []*Regexp) []*Regexp { + for j := start; j < i; j++ { + reuse := j != start // prefix came from sub[start] + sub[j] = p.removeLeadingRegexp(sub[j], reuse) ++ p.checkLimits(sub[j]) + } + suffix := p.collapse(sub[start:i], OpAlternate) // recurse + +diff --git a/src/regexp/syntax/parse_test.go b/src/regexp/syntax/parse_test.go +index 1ef6d8a..67e3c56 100644 +--- a/src/regexp/syntax/parse_test.go ++++ b/src/regexp/syntax/parse_test.go +@@ -484,12 +484,15 @@ var invalidRegexps = []string{ + `(?P<>a)`, + `[a-Z]`, + `(?i)[a-Z]`, +- `a{100000}`, +- `a{100000,}`, +- "((((((((((x{2}){2}){2}){2}){2}){2}){2}){2}){2}){2})", +- strings.Repeat("(", 1000) + strings.Repeat(")", 1000), +- strings.Repeat("(?:", 1000) + strings.Repeat(")*", 1000), + `\Q\E*`, ++ `a{100000}`, // too much repetition ++ `a{100000,}`, // too much repetition ++ "((((((((((x{2}){2}){2}){2}){2}){2}){2}){2}){2}){2})", // too much repetition ++ strings.Repeat("(", 1000) + strings.Repeat(")", 1000), // too deep ++ strings.Repeat("(?:", 1000) + strings.Repeat(")*", 1000), // too deep ++ "(" + strings.Repeat("(xx?)", 1000) + "){1000}", // too long ++ strings.Repeat("(xx?){1000}", 1000), // too long ++ strings.Repeat(`\pL`, 27000), // too many runes + } + + var onlyPerl = []string{ +-- +2.25.1 + From patchwork Sun Dec 18 16:12:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16886 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 A0DF9C46467 for ; Sun, 18 Dec 2022 16:13:19 +0000 (UTC) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mx.groups.io with SMTP id smtpd.web10.32101.1671379997538031804 for ; Sun, 18 Dec 2022 08:13:17 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=tFxhus9H; spf=softfail (domain: sakoman.com, ip: 209.85.216.41, mailfrom: steve@sakoman.com) Received: by mail-pj1-f41.google.com with SMTP id o1-20020a17090a678100b00219cf69e5f0so10749562pjj.2 for ; Sun, 18 Dec 2022 08:13:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=4dyHMkguoEhhbwcEd8zLiN6ug/R6ni8BcprwNg0dwG4=; b=tFxhus9HFOl+3hlwD0tP/f5wEHWpJAL8Q5KPFpVwwCzAWMI6APzpwi3V3TwrbaHFM0 OJHkQka0nnix6oP0es7J5K5WMhgwpG2uTidrwrBHJnE9jlGydjRCVxcAIozjUgfx0SKJ jgEwYef/E0ALCF63xrmWjGnPnoVsC2gW//wrzl0QO9VsrVcaLw9/B/QJ7ROyLiXro5zQ E/OF/KMCMyVGSWcr+BD/Ak8igQ+4nMA3kj3HFsW7lXJnvFlrWABR9m137npdvEnUi+n8 Dqfbabqq/PFzN2iwOE80HlZmv8HmLG3HNLJ/We2jWN99RSzWHIkLTlGXCesZsyUZHAee Qi6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=4dyHMkguoEhhbwcEd8zLiN6ug/R6ni8BcprwNg0dwG4=; b=oaAWIpWHLl2MH/jqypFWWUtTIdpS+oRZzq2Y8ro0PlVUddMl22vxStvFzltnmntHgz zBP8uqySSMY/FjG6M1HI9Gv9evaMnlwTD5rooyq37FiiwJOuB91PI3joV0Y05/FqgJz9 Izo0BV5EfTH/aqHZDanMgEvPoPlHf0cn9B6ZP3S17zzyHIeOgFmXEJJmU38vB8OW55wf P0vh83O6GKEDVlwHVvTcekbsAA4eTki0oTxWMekB9o5VfQuRUMI7Xi96/R9aquZPvO05 h8dyMSf7dv4mSxadlpHE8IV03mFu6k+qhB4VMLWBoi6RnTHILMCZlAb1xCftFTPnXMGZ 6BXg== X-Gm-Message-State: AFqh2ko+eKZ/04yETdwG0m7+j6ro2FLEZM1MOoeo8z1UMfoESNzBNJmz dvA8GpAURS4WJNHCd07CfAmOkfDXOgYneTO5g+8= X-Google-Smtp-Source: AMrXdXvom1BaVD5eg3W9YEb2W4Jc7falwYYwwNb6kyC9EAaj8fNtGfBrg/QhMVcWOly8jbirGZCG5g== X-Received: by 2002:a17:902:968f:b0:186:9850:7af6 with SMTP id n15-20020a170902968f00b0018698507af6mr5569769plp.41.1671379996091; Sun, 18 Dec 2022 08:13:16 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id c7-20020a170902d48700b001896522a23bsm5278763plg.39.2022.12.18.08.13.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Dec 2022 08:13:15 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 02/19] libxml2: Fix CVE-2022-40303 && CVE-2022-40304 Date: Sun, 18 Dec 2022 06:12:46 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 18 Dec 2022 16:13:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174789 From: Hitendra Prajapati Upstream-Status: Backport from https://gitlab.gnome.org/GNOME/libxml2/-/commit/c846986356fc149915a74972bf198abc266bc2c0 && https://gitlab.gnome.org/GNOME/libxml2/-/commit/1b41ec4e9433b05bb0376be4725804c54ef1d80b Signed-off-by: Hitendra Prajapati Signed-off-by: Steve Sakoman --- .../libxml/libxml2/CVE-2022-40303.patch | 624 ++++++++++++++++++ .../libxml/libxml2/CVE-2022-40304.patch | 106 +++ meta/recipes-core/libxml/libxml2_2.9.14.bb | 2 + 3 files changed, 732 insertions(+) create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2022-40303.patch create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2022-40304.patch diff --git a/meta/recipes-core/libxml/libxml2/CVE-2022-40303.patch b/meta/recipes-core/libxml/libxml2/CVE-2022-40303.patch new file mode 100644 index 0000000000..346ec37a9f --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2022-40303.patch @@ -0,0 +1,624 @@ +From 15050f59d2a62b97b34e9cab8b8076a68ef003bd Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer +Date: Thu, 25 Aug 2022 17:43:08 +0200 +Subject: [PATCH] CVE-2022-40303 + +Fix integer overflows with XML_PARSE_HUGE + +Also impose size limits when XML_PARSE_HUGE is set. Limit size of names +to XML_MAX_TEXT_LENGTH (10 million bytes) and other content to +XML_MAX_HUGE_LENGTH (1 billion bytes). + +Move some the length checks to the end of the respective loop to make +them strict. + +xmlParseEntityValue didn't have a length limitation at all. But without +XML_PARSE_HUGE, this should eventually trigger an error in xmlGROW. + +Thanks to Maddie Stone working with Google Project Zero for the report! + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/-/commit/c846986356fc149915a74972bf198abc266bc2c0] +CVE: CVE-2022-40303 +Signed-off-by: Hitendra Prajapati +--- + parser.c | 233 +++++++++++++++++++++++++++++-------------------------- + 1 file changed, 121 insertions(+), 112 deletions(-) + +diff --git a/parser.c b/parser.c +index 1bc3713..0f76577 100644 +--- a/parser.c ++++ b/parser.c +@@ -115,6 +115,8 @@ xmlParseElementEnd(xmlParserCtxtPtr ctxt); + * * + ************************************************************************/ + ++#define XML_MAX_HUGE_LENGTH 1000000000 ++ + #define XML_PARSER_BIG_ENTITY 1000 + #define XML_PARSER_LOT_ENTITY 5000 + +@@ -565,7 +567,7 @@ xmlFatalErr(xmlParserCtxtPtr ctxt, xmlParserErrors error, const char *info) + errmsg = "Malformed declaration expecting version"; + break; + case XML_ERR_NAME_TOO_LONG: +- errmsg = "Name too long use XML_PARSE_HUGE option"; ++ errmsg = "Name too long"; + break; + #if 0 + case: +@@ -3210,6 +3212,9 @@ xmlParseNameComplex(xmlParserCtxtPtr ctxt) { + int len = 0, l; + int c; + int count = 0; ++ int maxLength = (ctxt->options & XML_PARSE_HUGE) ? ++ XML_MAX_TEXT_LENGTH : ++ XML_MAX_NAME_LENGTH; + + #ifdef DEBUG + nbParseNameComplex++; +@@ -3275,7 +3280,8 @@ xmlParseNameComplex(xmlParserCtxtPtr ctxt) { + if (ctxt->instate == XML_PARSER_EOF) + return(NULL); + } +- len += l; ++ if (len <= INT_MAX - l) ++ len += l; + NEXTL(l); + c = CUR_CHAR(l); + } +@@ -3301,13 +3307,13 @@ xmlParseNameComplex(xmlParserCtxtPtr ctxt) { + if (ctxt->instate == XML_PARSER_EOF) + return(NULL); + } +- len += l; ++ if (len <= INT_MAX - l) ++ len += l; + NEXTL(l); + c = CUR_CHAR(l); + } + } +- if ((len > XML_MAX_NAME_LENGTH) && +- ((ctxt->options & XML_PARSE_HUGE) == 0)) { ++ if (len > maxLength) { + xmlFatalErr(ctxt, XML_ERR_NAME_TOO_LONG, "Name"); + return(NULL); + } +@@ -3346,7 +3352,10 @@ const xmlChar * + xmlParseName(xmlParserCtxtPtr ctxt) { + const xmlChar *in; + const xmlChar *ret; +- int count = 0; ++ size_t count = 0; ++ size_t maxLength = (ctxt->options & XML_PARSE_HUGE) ? ++ XML_MAX_TEXT_LENGTH : ++ XML_MAX_NAME_LENGTH; + + GROW; + +@@ -3370,8 +3379,7 @@ xmlParseName(xmlParserCtxtPtr ctxt) { + in++; + if ((*in > 0) && (*in < 0x80)) { + count = in - ctxt->input->cur; +- if ((count > XML_MAX_NAME_LENGTH) && +- ((ctxt->options & XML_PARSE_HUGE) == 0)) { ++ if (count > maxLength) { + xmlFatalErr(ctxt, XML_ERR_NAME_TOO_LONG, "Name"); + return(NULL); + } +@@ -3392,6 +3400,9 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) { + int len = 0, l; + int c; + int count = 0; ++ int maxLength = (ctxt->options & XML_PARSE_HUGE) ? ++ XML_MAX_TEXT_LENGTH : ++ XML_MAX_NAME_LENGTH; + size_t startPosition = 0; + + #ifdef DEBUG +@@ -3412,17 +3423,13 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) { + while ((c != ' ') && (c != '>') && (c != '/') && /* test bigname.xml */ + (xmlIsNameChar(ctxt, c) && (c != ':'))) { + if (count++ > XML_PARSER_CHUNK_SIZE) { +- if ((len > XML_MAX_NAME_LENGTH) && +- ((ctxt->options & XML_PARSE_HUGE) == 0)) { +- xmlFatalErr(ctxt, XML_ERR_NAME_TOO_LONG, "NCName"); +- return(NULL); +- } + count = 0; + GROW; + if (ctxt->instate == XML_PARSER_EOF) + return(NULL); + } +- len += l; ++ if (len <= INT_MAX - l) ++ len += l; + NEXTL(l); + c = CUR_CHAR(l); + if (c == 0) { +@@ -3440,8 +3447,7 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) { + c = CUR_CHAR(l); + } + } +- if ((len > XML_MAX_NAME_LENGTH) && +- ((ctxt->options & XML_PARSE_HUGE) == 0)) { ++ if (len > maxLength) { + xmlFatalErr(ctxt, XML_ERR_NAME_TOO_LONG, "NCName"); + return(NULL); + } +@@ -3467,7 +3473,10 @@ static const xmlChar * + xmlParseNCName(xmlParserCtxtPtr ctxt) { + const xmlChar *in, *e; + const xmlChar *ret; +- int count = 0; ++ size_t count = 0; ++ size_t maxLength = (ctxt->options & XML_PARSE_HUGE) ? ++ XML_MAX_TEXT_LENGTH : ++ XML_MAX_NAME_LENGTH; + + #ifdef DEBUG + nbParseNCName++; +@@ -3492,8 +3501,7 @@ xmlParseNCName(xmlParserCtxtPtr ctxt) { + goto complex; + if ((*in > 0) && (*in < 0x80)) { + count = in - ctxt->input->cur; +- if ((count > XML_MAX_NAME_LENGTH) && +- ((ctxt->options & XML_PARSE_HUGE) == 0)) { ++ if (count > maxLength) { + xmlFatalErr(ctxt, XML_ERR_NAME_TOO_LONG, "NCName"); + return(NULL); + } +@@ -3575,6 +3583,9 @@ xmlParseStringName(xmlParserCtxtPtr ctxt, const xmlChar** str) { + const xmlChar *cur = *str; + int len = 0, l; + int c; ++ int maxLength = (ctxt->options & XML_PARSE_HUGE) ? ++ XML_MAX_TEXT_LENGTH : ++ XML_MAX_NAME_LENGTH; + + #ifdef DEBUG + nbParseStringName++; +@@ -3610,12 +3621,6 @@ xmlParseStringName(xmlParserCtxtPtr ctxt, const xmlChar** str) { + if (len + 10 > max) { + xmlChar *tmp; + +- if ((len > XML_MAX_NAME_LENGTH) && +- ((ctxt->options & XML_PARSE_HUGE) == 0)) { +- xmlFatalErr(ctxt, XML_ERR_NAME_TOO_LONG, "NCName"); +- xmlFree(buffer); +- return(NULL); +- } + max *= 2; + tmp = (xmlChar *) xmlRealloc(buffer, + max * sizeof(xmlChar)); +@@ -3629,14 +3634,18 @@ xmlParseStringName(xmlParserCtxtPtr ctxt, const xmlChar** str) { + COPY_BUF(l,buffer,len,c); + cur += l; + c = CUR_SCHAR(cur, l); ++ if (len > maxLength) { ++ xmlFatalErr(ctxt, XML_ERR_NAME_TOO_LONG, "NCName"); ++ xmlFree(buffer); ++ return(NULL); ++ } + } + buffer[len] = 0; + *str = cur; + return(buffer); + } + } +- if ((len > XML_MAX_NAME_LENGTH) && +- ((ctxt->options & XML_PARSE_HUGE) == 0)) { ++ if (len > maxLength) { + xmlFatalErr(ctxt, XML_ERR_NAME_TOO_LONG, "NCName"); + return(NULL); + } +@@ -3663,6 +3672,9 @@ xmlParseNmtoken(xmlParserCtxtPtr ctxt) { + int len = 0, l; + int c; + int count = 0; ++ int maxLength = (ctxt->options & XML_PARSE_HUGE) ? ++ XML_MAX_TEXT_LENGTH : ++ XML_MAX_NAME_LENGTH; + + #ifdef DEBUG + nbParseNmToken++; +@@ -3714,12 +3726,6 @@ xmlParseNmtoken(xmlParserCtxtPtr ctxt) { + if (len + 10 > max) { + xmlChar *tmp; + +- if ((max > XML_MAX_NAME_LENGTH) && +- ((ctxt->options & XML_PARSE_HUGE) == 0)) { +- xmlFatalErr(ctxt, XML_ERR_NAME_TOO_LONG, "NmToken"); +- xmlFree(buffer); +- return(NULL); +- } + max *= 2; + tmp = (xmlChar *) xmlRealloc(buffer, + max * sizeof(xmlChar)); +@@ -3733,6 +3739,11 @@ xmlParseNmtoken(xmlParserCtxtPtr ctxt) { + COPY_BUF(l,buffer,len,c); + NEXTL(l); + c = CUR_CHAR(l); ++ if (len > maxLength) { ++ xmlFatalErr(ctxt, XML_ERR_NAME_TOO_LONG, "NmToken"); ++ xmlFree(buffer); ++ return(NULL); ++ } + } + buffer[len] = 0; + return(buffer); +@@ -3740,8 +3751,7 @@ xmlParseNmtoken(xmlParserCtxtPtr ctxt) { + } + if (len == 0) + return(NULL); +- if ((len > XML_MAX_NAME_LENGTH) && +- ((ctxt->options & XML_PARSE_HUGE) == 0)) { ++ if (len > maxLength) { + xmlFatalErr(ctxt, XML_ERR_NAME_TOO_LONG, "NmToken"); + return(NULL); + } +@@ -3767,6 +3777,9 @@ xmlParseEntityValue(xmlParserCtxtPtr ctxt, xmlChar **orig) { + int len = 0; + int size = XML_PARSER_BUFFER_SIZE; + int c, l; ++ int maxLength = (ctxt->options & XML_PARSE_HUGE) ? ++ XML_MAX_HUGE_LENGTH : ++ XML_MAX_TEXT_LENGTH; + xmlChar stop; + xmlChar *ret = NULL; + const xmlChar *cur = NULL; +@@ -3826,6 +3839,12 @@ xmlParseEntityValue(xmlParserCtxtPtr ctxt, xmlChar **orig) { + GROW; + c = CUR_CHAR(l); + } ++ ++ if (len > maxLength) { ++ xmlFatalErrMsg(ctxt, XML_ERR_ENTITY_NOT_FINISHED, ++ "entity value too long\n"); ++ goto error; ++ } + } + buf[len] = 0; + if (ctxt->instate == XML_PARSER_EOF) +@@ -3913,6 +3932,9 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) { + xmlChar *rep = NULL; + size_t len = 0; + size_t buf_size = 0; ++ size_t maxLength = (ctxt->options & XML_PARSE_HUGE) ? ++ XML_MAX_HUGE_LENGTH : ++ XML_MAX_TEXT_LENGTH; + int c, l, in_space = 0; + xmlChar *current = NULL; + xmlEntityPtr ent; +@@ -3944,16 +3966,6 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) { + while (((NXT(0) != limit) && /* checked */ + (IS_CHAR(c)) && (c != '<')) && + (ctxt->instate != XML_PARSER_EOF)) { +- /* +- * Impose a reasonable limit on attribute size, unless XML_PARSE_HUGE +- * special option is given +- */ +- if ((len > XML_MAX_TEXT_LENGTH) && +- ((ctxt->options & XML_PARSE_HUGE) == 0)) { +- xmlFatalErrMsg(ctxt, XML_ERR_ATTRIBUTE_NOT_FINISHED, +- "AttValue length too long\n"); +- goto mem_error; +- } + if (c == '&') { + in_space = 0; + if (NXT(1) == '#') { +@@ -4101,6 +4113,11 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) { + } + GROW; + c = CUR_CHAR(l); ++ if (len > maxLength) { ++ xmlFatalErrMsg(ctxt, XML_ERR_ATTRIBUTE_NOT_FINISHED, ++ "AttValue length too long\n"); ++ goto mem_error; ++ } + } + if (ctxt->instate == XML_PARSER_EOF) + goto error; +@@ -4122,16 +4139,6 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) { + } else + NEXT; + +- /* +- * There we potentially risk an overflow, don't allow attribute value of +- * length more than INT_MAX it is a very reasonable assumption ! +- */ +- if (len >= INT_MAX) { +- xmlFatalErrMsg(ctxt, XML_ERR_ATTRIBUTE_NOT_FINISHED, +- "AttValue length too long\n"); +- goto mem_error; +- } +- + if (attlen != NULL) *attlen = (int) len; + return(buf); + +@@ -4202,6 +4209,9 @@ xmlParseSystemLiteral(xmlParserCtxtPtr ctxt) { + int len = 0; + int size = XML_PARSER_BUFFER_SIZE; + int cur, l; ++ int maxLength = (ctxt->options & XML_PARSE_HUGE) ? ++ XML_MAX_TEXT_LENGTH : ++ XML_MAX_NAME_LENGTH; + xmlChar stop; + int state = ctxt->instate; + int count = 0; +@@ -4229,13 +4239,6 @@ xmlParseSystemLiteral(xmlParserCtxtPtr ctxt) { + if (len + 5 >= size) { + xmlChar *tmp; + +- if ((size > XML_MAX_NAME_LENGTH) && +- ((ctxt->options & XML_PARSE_HUGE) == 0)) { +- xmlFatalErr(ctxt, XML_ERR_NAME_TOO_LONG, "SystemLiteral"); +- xmlFree(buf); +- ctxt->instate = (xmlParserInputState) state; +- return(NULL); +- } + size *= 2; + tmp = (xmlChar *) xmlRealloc(buf, size * sizeof(xmlChar)); + if (tmp == NULL) { +@@ -4264,6 +4267,12 @@ xmlParseSystemLiteral(xmlParserCtxtPtr ctxt) { + SHRINK; + cur = CUR_CHAR(l); + } ++ if (len > maxLength) { ++ xmlFatalErr(ctxt, XML_ERR_NAME_TOO_LONG, "SystemLiteral"); ++ xmlFree(buf); ++ ctxt->instate = (xmlParserInputState) state; ++ return(NULL); ++ } + } + buf[len] = 0; + ctxt->instate = (xmlParserInputState) state; +@@ -4291,6 +4300,9 @@ xmlParsePubidLiteral(xmlParserCtxtPtr ctxt) { + xmlChar *buf = NULL; + int len = 0; + int size = XML_PARSER_BUFFER_SIZE; ++ int maxLength = (ctxt->options & XML_PARSE_HUGE) ? ++ XML_MAX_TEXT_LENGTH : ++ XML_MAX_NAME_LENGTH; + xmlChar cur; + xmlChar stop; + int count = 0; +@@ -4318,12 +4330,6 @@ xmlParsePubidLiteral(xmlParserCtxtPtr ctxt) { + if (len + 1 >= size) { + xmlChar *tmp; + +- if ((size > XML_MAX_NAME_LENGTH) && +- ((ctxt->options & XML_PARSE_HUGE) == 0)) { +- xmlFatalErr(ctxt, XML_ERR_NAME_TOO_LONG, "Public ID"); +- xmlFree(buf); +- return(NULL); +- } + size *= 2; + tmp = (xmlChar *) xmlRealloc(buf, size * sizeof(xmlChar)); + if (tmp == NULL) { +@@ -4351,6 +4357,11 @@ xmlParsePubidLiteral(xmlParserCtxtPtr ctxt) { + SHRINK; + cur = CUR; + } ++ if (len > maxLength) { ++ xmlFatalErr(ctxt, XML_ERR_NAME_TOO_LONG, "Public ID"); ++ xmlFree(buf); ++ return(NULL); ++ } + } + buf[len] = 0; + if (cur != stop) { +@@ -4750,6 +4761,9 @@ xmlParseCommentComplex(xmlParserCtxtPtr ctxt, xmlChar *buf, + int r, rl; + int cur, l; + size_t count = 0; ++ size_t maxLength = (ctxt->options & XML_PARSE_HUGE) ? ++ XML_MAX_HUGE_LENGTH : ++ XML_MAX_TEXT_LENGTH; + int inputid; + + inputid = ctxt->input->id; +@@ -4795,13 +4809,6 @@ xmlParseCommentComplex(xmlParserCtxtPtr ctxt, xmlChar *buf, + if ((r == '-') && (q == '-')) { + xmlFatalErr(ctxt, XML_ERR_HYPHEN_IN_COMMENT, NULL); + } +- if ((len > XML_MAX_TEXT_LENGTH) && +- ((ctxt->options & XML_PARSE_HUGE) == 0)) { +- xmlFatalErrMsgStr(ctxt, XML_ERR_COMMENT_NOT_FINISHED, +- "Comment too big found", NULL); +- xmlFree (buf); +- return; +- } + if (len + 5 >= size) { + xmlChar *new_buf; + size_t new_size; +@@ -4839,6 +4846,13 @@ xmlParseCommentComplex(xmlParserCtxtPtr ctxt, xmlChar *buf, + GROW; + cur = CUR_CHAR(l); + } ++ ++ if (len > maxLength) { ++ xmlFatalErrMsgStr(ctxt, XML_ERR_COMMENT_NOT_FINISHED, ++ "Comment too big found", NULL); ++ xmlFree (buf); ++ return; ++ } + } + buf[len] = 0; + if (cur == 0) { +@@ -4883,6 +4897,9 @@ xmlParseComment(xmlParserCtxtPtr ctxt) { + xmlChar *buf = NULL; + size_t size = XML_PARSER_BUFFER_SIZE; + size_t len = 0; ++ size_t maxLength = (ctxt->options & XML_PARSE_HUGE) ? ++ XML_MAX_HUGE_LENGTH : ++ XML_MAX_TEXT_LENGTH; + xmlParserInputState state; + const xmlChar *in; + size_t nbchar = 0; +@@ -4966,8 +4983,7 @@ get_more: + buf[len] = 0; + } + } +- if ((len > XML_MAX_TEXT_LENGTH) && +- ((ctxt->options & XML_PARSE_HUGE) == 0)) { ++ if (len > maxLength) { + xmlFatalErrMsgStr(ctxt, XML_ERR_COMMENT_NOT_FINISHED, + "Comment too big found", NULL); + xmlFree (buf); +@@ -5167,6 +5183,9 @@ xmlParsePI(xmlParserCtxtPtr ctxt) { + xmlChar *buf = NULL; + size_t len = 0; + size_t size = XML_PARSER_BUFFER_SIZE; ++ size_t maxLength = (ctxt->options & XML_PARSE_HUGE) ? ++ XML_MAX_HUGE_LENGTH : ++ XML_MAX_TEXT_LENGTH; + int cur, l; + const xmlChar *target; + xmlParserInputState state; +@@ -5242,14 +5261,6 @@ xmlParsePI(xmlParserCtxtPtr ctxt) { + return; + } + count = 0; +- if ((len > XML_MAX_TEXT_LENGTH) && +- ((ctxt->options & XML_PARSE_HUGE) == 0)) { +- xmlFatalErrMsgStr(ctxt, XML_ERR_PI_NOT_FINISHED, +- "PI %s too big found", target); +- xmlFree(buf); +- ctxt->instate = state; +- return; +- } + } + COPY_BUF(l,buf,len,cur); + NEXTL(l); +@@ -5259,15 +5270,14 @@ xmlParsePI(xmlParserCtxtPtr ctxt) { + GROW; + cur = CUR_CHAR(l); + } ++ if (len > maxLength) { ++ xmlFatalErrMsgStr(ctxt, XML_ERR_PI_NOT_FINISHED, ++ "PI %s too big found", target); ++ xmlFree(buf); ++ ctxt->instate = state; ++ return; ++ } + } +- if ((len > XML_MAX_TEXT_LENGTH) && +- ((ctxt->options & XML_PARSE_HUGE) == 0)) { +- xmlFatalErrMsgStr(ctxt, XML_ERR_PI_NOT_FINISHED, +- "PI %s too big found", target); +- xmlFree(buf); +- ctxt->instate = state; +- return; +- } + buf[len] = 0; + if (cur != '?') { + xmlFatalErrMsgStr(ctxt, XML_ERR_PI_NOT_FINISHED, +@@ -8959,6 +8969,9 @@ xmlParseAttValueInternal(xmlParserCtxtPtr ctxt, int *len, int *alloc, + const xmlChar *in = NULL, *start, *end, *last; + xmlChar *ret = NULL; + int line, col; ++ int maxLength = (ctxt->options & XML_PARSE_HUGE) ? ++ XML_MAX_HUGE_LENGTH : ++ XML_MAX_TEXT_LENGTH; + + GROW; + in = (xmlChar *) CUR_PTR; +@@ -8998,8 +9011,7 @@ xmlParseAttValueInternal(xmlParserCtxtPtr ctxt, int *len, int *alloc, + start = in; + if (in >= end) { + GROW_PARSE_ATT_VALUE_INTERNAL(ctxt, in, start, end) +- if (((in - start) > XML_MAX_TEXT_LENGTH) && +- ((ctxt->options & XML_PARSE_HUGE) == 0)) { ++ if ((in - start) > maxLength) { + xmlFatalErrMsg(ctxt, XML_ERR_ATTRIBUTE_NOT_FINISHED, + "AttValue length too long\n"); + return(NULL); +@@ -9012,8 +9024,7 @@ xmlParseAttValueInternal(xmlParserCtxtPtr ctxt, int *len, int *alloc, + if ((*in++ == 0x20) && (*in == 0x20)) break; + if (in >= end) { + GROW_PARSE_ATT_VALUE_INTERNAL(ctxt, in, start, end) +- if (((in - start) > XML_MAX_TEXT_LENGTH) && +- ((ctxt->options & XML_PARSE_HUGE) == 0)) { ++ if ((in - start) > maxLength) { + xmlFatalErrMsg(ctxt, XML_ERR_ATTRIBUTE_NOT_FINISHED, + "AttValue length too long\n"); + return(NULL); +@@ -9046,16 +9057,14 @@ xmlParseAttValueInternal(xmlParserCtxtPtr ctxt, int *len, int *alloc, + last = last + delta; + } + end = ctxt->input->end; +- if (((in - start) > XML_MAX_TEXT_LENGTH) && +- ((ctxt->options & XML_PARSE_HUGE) == 0)) { ++ if ((in - start) > maxLength) { + xmlFatalErrMsg(ctxt, XML_ERR_ATTRIBUTE_NOT_FINISHED, + "AttValue length too long\n"); + return(NULL); + } + } + } +- if (((in - start) > XML_MAX_TEXT_LENGTH) && +- ((ctxt->options & XML_PARSE_HUGE) == 0)) { ++ if ((in - start) > maxLength) { + xmlFatalErrMsg(ctxt, XML_ERR_ATTRIBUTE_NOT_FINISHED, + "AttValue length too long\n"); + return(NULL); +@@ -9068,8 +9077,7 @@ xmlParseAttValueInternal(xmlParserCtxtPtr ctxt, int *len, int *alloc, + col++; + if (in >= end) { + GROW_PARSE_ATT_VALUE_INTERNAL(ctxt, in, start, end) +- if (((in - start) > XML_MAX_TEXT_LENGTH) && +- ((ctxt->options & XML_PARSE_HUGE) == 0)) { ++ if ((in - start) > maxLength) { + xmlFatalErrMsg(ctxt, XML_ERR_ATTRIBUTE_NOT_FINISHED, + "AttValue length too long\n"); + return(NULL); +@@ -9077,8 +9085,7 @@ xmlParseAttValueInternal(xmlParserCtxtPtr ctxt, int *len, int *alloc, + } + } + last = in; +- if (((in - start) > XML_MAX_TEXT_LENGTH) && +- ((ctxt->options & XML_PARSE_HUGE) == 0)) { ++ if ((in - start) > maxLength) { + xmlFatalErrMsg(ctxt, XML_ERR_ATTRIBUTE_NOT_FINISHED, + "AttValue length too long\n"); + return(NULL); +@@ -9768,6 +9775,9 @@ xmlParseCDSect(xmlParserCtxtPtr ctxt) { + int s, sl; + int cur, l; + int count = 0; ++ int maxLength = (ctxt->options & XML_PARSE_HUGE) ? ++ XML_MAX_HUGE_LENGTH : ++ XML_MAX_TEXT_LENGTH; + + /* Check 2.6.0 was NXT(0) not RAW */ + if (CMP9(CUR_PTR, '<', '!', '[', 'C', 'D', 'A', 'T', 'A', '[')) { +@@ -9801,13 +9811,6 @@ xmlParseCDSect(xmlParserCtxtPtr ctxt) { + if (len + 5 >= size) { + xmlChar *tmp; + +- if ((size > XML_MAX_TEXT_LENGTH) && +- ((ctxt->options & XML_PARSE_HUGE) == 0)) { +- xmlFatalErrMsgStr(ctxt, XML_ERR_CDATA_NOT_FINISHED, +- "CData section too big found", NULL); +- xmlFree (buf); +- return; +- } + tmp = (xmlChar *) xmlRealloc(buf, size * 2 * sizeof(xmlChar)); + if (tmp == NULL) { + xmlFree(buf); +@@ -9834,6 +9837,12 @@ xmlParseCDSect(xmlParserCtxtPtr ctxt) { + } + NEXTL(l); + cur = CUR_CHAR(l); ++ if (len > maxLength) { ++ xmlFatalErrMsg(ctxt, XML_ERR_CDATA_NOT_FINISHED, ++ "CData section too big found\n"); ++ xmlFree(buf); ++ return; ++ } + } + buf[len] = 0; + ctxt->instate = XML_PARSER_CONTENT; +-- +2.25.1 + diff --git a/meta/recipes-core/libxml/libxml2/CVE-2022-40304.patch b/meta/recipes-core/libxml/libxml2/CVE-2022-40304.patch new file mode 100644 index 0000000000..b24be03315 --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2022-40304.patch @@ -0,0 +1,106 @@ +From cde95d801abc9405ca821ad814c7730333328d96 Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer +Date: Wed, 31 Aug 2022 22:11:25 +0200 +Subject: [PATCH] CVE-2022-40304 + +Fix dict corruption caused by entity reference cycles + +When an entity reference cycle is detected, the entity content is +cleared by setting its first byte to zero. But the entity content might +be allocated from a dict. In this case, the dict entry becomes corrupted +leading to all kinds of logic errors, including memory errors like +double-frees. + +Stop storing entity content, orig, ExternalID and SystemID in a dict. +These values are unlikely to occur multiple times in a document, so they +shouldn't have been stored in a dict in the first place. + +Thanks to Ned Williamson and Nathan Wachholz working with Google Project +Zero for the report! + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/-/commit/1b41ec4e9433b05bb0376be4725804c54ef1d80b] +CVE: CVE-2022-40304 +Signed-off-by: Hitendra Prajapati +--- + entities.c | 55 ++++++++++++++++-------------------------------------- + 1 file changed, 16 insertions(+), 39 deletions(-) + +diff --git a/entities.c b/entities.c +index 1a8f86f..ec1b9a7 100644 +--- a/entities.c ++++ b/entities.c +@@ -112,36 +112,19 @@ xmlFreeEntity(xmlEntityPtr entity) + if ((entity->children) && (entity->owner == 1) && + (entity == (xmlEntityPtr) entity->children->parent)) + xmlFreeNodeList(entity->children); +- if (dict != NULL) { +- if ((entity->name != NULL) && (!xmlDictOwns(dict, entity->name))) +- xmlFree((char *) entity->name); +- if ((entity->ExternalID != NULL) && +- (!xmlDictOwns(dict, entity->ExternalID))) +- xmlFree((char *) entity->ExternalID); +- if ((entity->SystemID != NULL) && +- (!xmlDictOwns(dict, entity->SystemID))) +- xmlFree((char *) entity->SystemID); +- if ((entity->URI != NULL) && (!xmlDictOwns(dict, entity->URI))) +- xmlFree((char *) entity->URI); +- if ((entity->content != NULL) +- && (!xmlDictOwns(dict, entity->content))) +- xmlFree((char *) entity->content); +- if ((entity->orig != NULL) && (!xmlDictOwns(dict, entity->orig))) +- xmlFree((char *) entity->orig); +- } else { +- if (entity->name != NULL) +- xmlFree((char *) entity->name); +- if (entity->ExternalID != NULL) +- xmlFree((char *) entity->ExternalID); +- if (entity->SystemID != NULL) +- xmlFree((char *) entity->SystemID); +- if (entity->URI != NULL) +- xmlFree((char *) entity->URI); +- if (entity->content != NULL) +- xmlFree((char *) entity->content); +- if (entity->orig != NULL) +- xmlFree((char *) entity->orig); +- } ++ if ((entity->name != NULL) && ++ ((dict == NULL) || (!xmlDictOwns(dict, entity->name)))) ++ xmlFree((char *) entity->name); ++ if (entity->ExternalID != NULL) ++ xmlFree((char *) entity->ExternalID); ++ if (entity->SystemID != NULL) ++ xmlFree((char *) entity->SystemID); ++ if (entity->URI != NULL) ++ xmlFree((char *) entity->URI); ++ if (entity->content != NULL) ++ xmlFree((char *) entity->content); ++ if (entity->orig != NULL) ++ xmlFree((char *) entity->orig); + xmlFree(entity); + } + +@@ -177,18 +160,12 @@ xmlCreateEntity(xmlDictPtr dict, const xmlChar *name, int type, + ret->SystemID = xmlStrdup(SystemID); + } else { + ret->name = xmlDictLookup(dict, name, -1); +- if (ExternalID != NULL) +- ret->ExternalID = xmlDictLookup(dict, ExternalID, -1); +- if (SystemID != NULL) +- ret->SystemID = xmlDictLookup(dict, SystemID, -1); ++ ret->ExternalID = xmlStrdup(ExternalID); ++ ret->SystemID = xmlStrdup(SystemID); + } + if (content != NULL) { + ret->length = xmlStrlen(content); +- if ((dict != NULL) && (ret->length < 5)) +- ret->content = (xmlChar *) +- xmlDictLookup(dict, content, ret->length); +- else +- ret->content = xmlStrndup(content, ret->length); ++ ret->content = xmlStrndup(content, ret->length); + } else { + ret->length = 0; + ret->content = NULL; +-- +2.25.1 + diff --git a/meta/recipes-core/libxml/libxml2_2.9.14.bb b/meta/recipes-core/libxml/libxml2_2.9.14.bb index 519985bbae..fffe7dda98 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.14.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.14.bb @@ -23,6 +23,8 @@ SRC_URI += "http://www.w3.org/XML/Test/xmlts20080827.tar.gz;subdir=${BP};name=te file://remove-fuzz-from-ptests.patch \ file://libxml-m4-use-pkgconfig.patch \ file://0001-Port-gentest.py-to-Python-3.patch \ + file://CVE-2022-40303.patch \ + file://CVE-2022-40304.patch \ " SRC_URI[archive.sha256sum] = "60d74a257d1ccec0475e749cba2f21559e48139efba6ff28224357c7c798dfee" From patchwork Sun Dec 18 16:12:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16888 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 7D456C4167B for ; Sun, 18 Dec 2022 16:13:29 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web11.32480.1671380001459210334 for ; Sun, 18 Dec 2022 08:13:21 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Fd7Ioysy; spf=softfail (domain: sakoman.com, ip: 209.85.214.172, mailfrom: steve@sakoman.com) Received: by mail-pl1-f172.google.com with SMTP id d15so6868531pls.6 for ; Sun, 18 Dec 2022 08:13:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=DHYtmkq3jtvuWpQvf7pM5SaSr3B6Q8gGbdNQrkzxxPA=; b=Fd7IoysyGMJLUiIGU/VIK2YPxxT+epmQru1VoJQ/0uGE47joNwF7N0QqEyUnwOxbJ0 cy3kKVHSt0tmAbzDNz0Qt2nLXob5E8AV0FDwxeUSWIxhSnXhEp39ubDJI2ysg4eA/9st 5PTrwRr0Rx/aM9a7jVkSaq32sFy7MuKSvDE86cOT7ig1bxPq3L4Urdr9mdY/Jbm7GYH4 uZ44JSw0qzIt7bi8756IQa2EfEZQ2X8VjCqgbV35uATf0wx8fFZW2mMTbTVHud5snZ80 ChiA6h4ERK567t22p+RyBoE6c92UbG9qeGv3Zpo6Eu4BZbTVSiKW/bpz7Ktb/GPpd1LU 9AaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=DHYtmkq3jtvuWpQvf7pM5SaSr3B6Q8gGbdNQrkzxxPA=; b=6bu/mh7uMCeVZLPirlGALSEpGn87cgcioOg/TiZiASoIF11d2lCRtmAnG5sdVlZGIE BQPT+1NTVrgdLy6irUExEri9W/k9uz/Wcz0jR7xzLrGVURxFs1C/LJQ8k4/EbEDGgCS7 WV5iPx+jNubp8sxH0xxPZku8lbUVGLvPQDToxp7Eom/igLF9GkqZB2i1Jg7h7o1ysBZr +v10Zu99EZdttoRyyLV5seW7E/A2Nfb7baIZNGPdkutd0lJPNmagXYZYzDF7Z5Rbt51t 9JjCgfDvFd4Mqr6AE2YBQSy/K4QN+VYC5K1bidXDXcBma07bv5Lm6+saSPo1/X0dsO/t NZsA== X-Gm-Message-State: AFqh2kqMWTlYev4Q5pXCEMjne9Tc5dep1x6XH/N9x6yn+ivsX5zX20eL ZfJWUF1SaYA+MkRZo6zX5shDp8iixTsywMSkgTw= X-Google-Smtp-Source: AMrXdXt7XDmomrV8eWl32Feb7AxdmKVxP7AuuBN9uDDbsvx/xaJ0EDWR3elyh7FXkQhc9whH0xbFKw== X-Received: by 2002:a17:902:d346:b0:189:e909:32e3 with SMTP id l6-20020a170902d34600b00189e90932e3mr5769127plk.40.1671380000539; Sun, 18 Dec 2022 08:13:20 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id c7-20020a170902d48700b001896522a23bsm5278763plg.39.2022.12.18.08.13.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Dec 2022 08:13:20 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 03/19] dbus: Add missing CVE product name Date: Sun, 18 Dec 2022 06:12:47 -1000 Message-Id: <655fc82974478b5986dc58f898d818bba692c2c6.1671379841.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 18 Dec 2022 16:13:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174790 From: Mathieu Dubois-Briand Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Alexandre Belloni (cherry picked from commit 67b2db202834f1213bed3580badda2a67655ab7d) Signed-off-by: Steve Sakoman --- meta/recipes-core/dbus/dbus_1.14.4.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/dbus/dbus_1.14.4.bb b/meta/recipes-core/dbus/dbus_1.14.4.bb index 9684f0c6e2..85db58e214 100644 --- a/meta/recipes-core/dbus/dbus_1.14.4.bb +++ b/meta/recipes-core/dbus/dbus_1.14.4.bb @@ -182,3 +182,5 @@ do_install:class-nativesdk() { rm -rf ${D}${localstatedir}/run } BBCLASSEXTEND = "native nativesdk" + +CVE_PRODUCT += "d-bus_project:d-bus" From patchwork Sun Dec 18 16:12:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16889 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 9E2E6C10F1E for ; Sun, 18 Dec 2022 16:13:29 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web10.32104.1671380003628515572 for ; Sun, 18 Dec 2022 08:13:23 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ryK9UbqV; spf=softfail (domain: sakoman.com, ip: 209.85.216.50, mailfrom: steve@sakoman.com) Received: by mail-pj1-f50.google.com with SMTP id v23so1647957pju.3 for ; Sun, 18 Dec 2022 08:13:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=jRu72vjt9KDVP+ngf5hSWnVQeEQ6R+evNXSEAcB/FM8=; b=ryK9UbqVamXZYnUk5dGn31xQhvIG/8KBAqdpGEFFK48T8iUAzRpUYyYEK3YL/NMqEx drZYE0RApf7g3xV7/PMPCRE/DDQfn6s+3XV/FxZNdRwwi4fFU6XIc5jmPc/XUELqcjov xR8PWBe1jCfQiC9WzO8ok8KseCEzS9JtPWpPXx1UNi+nc7h3DzFB6TLBzkz4jmPAavKO zAMjwgPyq4riEGUXsqC7Jn5fU7l3Q0uST8edbgx+f3zE7aWNc7R+/oZ7JYUZOtmr+3wv FuWS6dV9/lt51QxGedGS21eUXWhI21MtPUq8SsJVw/JVtQqoNrhNwfvqmU16Npk8vcjo H6bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=jRu72vjt9KDVP+ngf5hSWnVQeEQ6R+evNXSEAcB/FM8=; b=K0cWrVgwbD0NRYizW5yGfk8iOMCutLNW2kyyqIEgqqLE+9DChXa42OlcRGD1qfNbyY EvCFFnRbbgUlAAdL/5fBUt3YZ7R2dgmrU0lfbyd1w8Mmi5Cp3jb04V4ymIzl+xkPiO5+ vkVR1dlKowE8M+hHYDEjLIRKwVkB6hyhuDtaDF4KkE+w+8UDRAPZyA5mYuyOXJU5xXjz AiOopdIzw8ezibJfLdWPR29n1ZskUKLSBFP6zaxcIr4qZeS7O2SwDcWE58JOA0X22670 /HToLNi6VLJMKe+IoGz2dExH1FBj8INfHfnc5Ticp/GNfBDqqKa+4wZezPmJ9wbEFfRp mjFw== X-Gm-Message-State: ANoB5pkWHx/mRBodoWki5g+u32Nd9Sn/I9y8QpfoiAxmA5eHP7QHMTc7 eG8Fz97Ub38KSLLY2gRu0C1Ldf0721iau/3seFI= X-Google-Smtp-Source: AA0mqf7u6MOYHHILJOaa5bu+LPspVh3f30zKqL6GeiNyIXFEdGzk+zDf9kmtHUjjkWnaQRlGXzK2jw== X-Received: by 2002:a17:902:a507:b0:189:7cd:6f86 with SMTP id s7-20020a170902a50700b0018907cd6f86mr42588339plq.62.1671380002655; Sun, 18 Dec 2022 08:13:22 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id c7-20020a170902d48700b001896522a23bsm5278763plg.39.2022.12.18.08.13.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Dec 2022 08:13:22 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 04/19] bind: upgrade 9.18.8 -> 9.18.9 Date: Sun, 18 Dec 2022 06:12:48 -1000 Message-Id: <38219ac0617eac1969e4535a7dd22bf4c1fa1463.1671379841.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 18 Dec 2022 16:13:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174791 From: Wang Mingyu Changelog: =========== Fix a crash that could happen when you change a dnssec-policy zone with NSEC3 to start using inline-signing. [GL #3591] Don't trust a placeholder KEYDATA from the managed-keys zone by adding it into secroots. [GL #2895] Fixed a race condition that could cause a crash in dns_zone_synckeyzone(). [GL #3617] Don't enforce the jemalloc use on NetBSD. [GL #3634] Fix an inheritance bug when setting the port on remote servers in configuration. [GL #3627] Fix a resolver prefetch bug when the record's TTL value is equal to the configured prefetch eligibility value, but the record was erroneously not treated as eligible for prefetching. [GL #3603] Always call dns_adb_endudpfetch() after calling dns_adb_beginudpfetch() for UDP queries in resolver.c, in order to adjust back the quota. [GL #3598] Fix a startup issue on Solaris systems with many (reportedly > 510) CPUs. Thanks to Stacey Marshall from Oracle for deep investigation of the problem. [GL #3563] rpz-ip rules could be ineffective in some scenarios with CD=1 queries. [GL #3247] The RecursClients statistics counter could overflow in certain resolution scenarios. [GL #3584] Less ceremonial UNEXPECTED_ERROR() and FATAL_ERROR() reporting macros. [GL !6914] Fix a couple of bugs in cfg_print_duration(), which could result in generating incomplete duration values when printing the configuration using named-checkconf. [GL !6880] Refactor the isc_httpd implementation used in the statistics channel. [GL !6879] Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni (cherry picked from commit e57fe26b3f85ebfabdc8b574caa5c97602e4d771) Signed-off-by: Steve Sakoman --- .../0001-avoid-start-failure-with-bind-user.patch | 0 .../0001-named-lwresd-V-and-start-log-hide-build-options.patch | 0 .../bind-ensure-searching-for-json-headers-searches-sysr.patch | 0 .../bind/{bind-9.18.8 => bind-9.18.9}/bind9 | 0 .../bind/{bind-9.18.8 => bind-9.18.9}/conf.patch | 0 .../bind/{bind-9.18.8 => bind-9.18.9}/generate-rndc-key.sh | 0 .../init.d-add-support-for-read-only-rootfs.patch | 0 .../make-etc-initd-bind-stop-work.patch | 0 .../bind/{bind-9.18.8 => bind-9.18.9}/named.service | 0 .../bind/{bind_9.18.8.bb => bind_9.18.9.bb} | 2 +- 10 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-connectivity/bind/{bind-9.18.8 => bind-9.18.9}/0001-avoid-start-failure-with-bind-user.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.8 => bind-9.18.9}/0001-named-lwresd-V-and-start-log-hide-build-options.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.8 => bind-9.18.9}/bind-ensure-searching-for-json-headers-searches-sysr.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.8 => bind-9.18.9}/bind9 (100%) rename meta/recipes-connectivity/bind/{bind-9.18.8 => bind-9.18.9}/conf.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.8 => bind-9.18.9}/generate-rndc-key.sh (100%) rename meta/recipes-connectivity/bind/{bind-9.18.8 => bind-9.18.9}/init.d-add-support-for-read-only-rootfs.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.8 => bind-9.18.9}/make-etc-initd-bind-stop-work.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.8 => bind-9.18.9}/named.service (100%) rename meta/recipes-connectivity/bind/{bind_9.18.8.bb => bind_9.18.9.bb} (97%) diff --git a/meta/recipes-connectivity/bind/bind-9.18.8/0001-avoid-start-failure-with-bind-user.patch b/meta/recipes-connectivity/bind/bind-9.18.9/0001-avoid-start-failure-with-bind-user.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.8/0001-avoid-start-failure-with-bind-user.patch rename to meta/recipes-connectivity/bind/bind-9.18.9/0001-avoid-start-failure-with-bind-user.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.8/0001-named-lwresd-V-and-start-log-hide-build-options.patch b/meta/recipes-connectivity/bind/bind-9.18.9/0001-named-lwresd-V-and-start-log-hide-build-options.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.8/0001-named-lwresd-V-and-start-log-hide-build-options.patch rename to meta/recipes-connectivity/bind/bind-9.18.9/0001-named-lwresd-V-and-start-log-hide-build-options.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.8/bind-ensure-searching-for-json-headers-searches-sysr.patch b/meta/recipes-connectivity/bind/bind-9.18.9/bind-ensure-searching-for-json-headers-searches-sysr.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.8/bind-ensure-searching-for-json-headers-searches-sysr.patch rename to meta/recipes-connectivity/bind/bind-9.18.9/bind-ensure-searching-for-json-headers-searches-sysr.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.8/bind9 b/meta/recipes-connectivity/bind/bind-9.18.9/bind9 similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.8/bind9 rename to meta/recipes-connectivity/bind/bind-9.18.9/bind9 diff --git a/meta/recipes-connectivity/bind/bind-9.18.8/conf.patch b/meta/recipes-connectivity/bind/bind-9.18.9/conf.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.8/conf.patch rename to meta/recipes-connectivity/bind/bind-9.18.9/conf.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.8/generate-rndc-key.sh b/meta/recipes-connectivity/bind/bind-9.18.9/generate-rndc-key.sh similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.8/generate-rndc-key.sh rename to meta/recipes-connectivity/bind/bind-9.18.9/generate-rndc-key.sh diff --git a/meta/recipes-connectivity/bind/bind-9.18.8/init.d-add-support-for-read-only-rootfs.patch b/meta/recipes-connectivity/bind/bind-9.18.9/init.d-add-support-for-read-only-rootfs.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.8/init.d-add-support-for-read-only-rootfs.patch rename to meta/recipes-connectivity/bind/bind-9.18.9/init.d-add-support-for-read-only-rootfs.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.8/make-etc-initd-bind-stop-work.patch b/meta/recipes-connectivity/bind/bind-9.18.9/make-etc-initd-bind-stop-work.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.8/make-etc-initd-bind-stop-work.patch rename to meta/recipes-connectivity/bind/bind-9.18.9/make-etc-initd-bind-stop-work.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.8/named.service b/meta/recipes-connectivity/bind/bind-9.18.9/named.service similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.8/named.service rename to meta/recipes-connectivity/bind/bind-9.18.9/named.service diff --git a/meta/recipes-connectivity/bind/bind_9.18.8.bb b/meta/recipes-connectivity/bind/bind_9.18.9.bb similarity index 97% rename from meta/recipes-connectivity/bind/bind_9.18.8.bb rename to meta/recipes-connectivity/bind/bind_9.18.9.bb index 2964dc9963..b95b900069 100644 --- a/meta/recipes-connectivity/bind/bind_9.18.8.bb +++ b/meta/recipes-connectivity/bind/bind_9.18.9.bb @@ -20,7 +20,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \ file://0001-avoid-start-failure-with-bind-user.patch \ " -SRC_URI[sha256sum] = "0e3c3ab9378db84ba0f37073d67ba125ae4f2ff8daf366c9db287e3f1b2c35f0" +SRC_URI[sha256sum] = "6a9665998d568604460df0918fc8ccfad7d29388d4d842560c056cc211cbb243" UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" # follow the ESV versions divisible by 2 From patchwork Sun Dec 18 16:12:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16887 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 7D47CC4708D for ; Sun, 18 Dec 2022 16:13:29 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web10.32105.1671380005620702465 for ; Sun, 18 Dec 2022 08:13:25 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=QN5BECDW; spf=softfail (domain: sakoman.com, ip: 209.85.214.175, mailfrom: steve@sakoman.com) Received: by mail-pl1-f175.google.com with SMTP id m4so6876583pls.4 for ; Sun, 18 Dec 2022 08:13:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=VJDw9J7cX0VT/icCCQr6rlXNN++e6HZG1Uz1MFdPeuI=; b=QN5BECDWAZo3GPX9U+6Rdg50wiParcq/O/HQMdPIFq/EzMYf1iw9EewIZJVo350+FP xr325HrKu7jhs9s+JbgviMDAA/9LviIlKn/Z3YBk0N0xpjHeAbCfXPhdNWDXcCc5irYq z1hRk7PULSlChZzIj8wRbVPbic51lpZQH/vvNFrwkSpri0GFPMuOdKfujd0erbZTrl7/ T2ePHBnPHQP5V1fyEsjAov1aDV5YvNoKGru8DkhTiUsJAdhT41apvdFzDrjLFJU86sob Wg6zVGOsAXoi6aLfvbk0Om/SlEjNN98yCY/eMuECa/aGeLS/Qoyw1S5T8e1zRAT8ii8o nqkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=VJDw9J7cX0VT/icCCQr6rlXNN++e6HZG1Uz1MFdPeuI=; b=Cbr5NJxRY8QCknnogx9SoDN8olp/T/5gWiWZFhvieqgNkr0ugOVS7iNZFjpfb+geCQ 5vvnnY76mc4nSoVGTCJtnfqrabTNxiWI2cHqPSCkBGeZ3euBfNzgn2wmymFkDC0HPa+S 92qMtun9AnDObgqFxbdeMgC3NMZNV0JWkF4dKumJoJ+q3np0GunSLrW6e+kONfp9r1pc AkWuOC90jwNJwRHqsXWmNiy4Soxo1vtcgwhDyxFKVV5ZFNWe+AKjak0aoLu9hDSp9/Sz wYpYPl3EY3K2sElpMgYrLmSwyLuyCtqkTT8JrR2Gn8TbHUegae/7mltBzFSJeqCgr5ok ++TA== X-Gm-Message-State: AFqh2kqekrkwws53zryQMnNpZDsqqmdR9iWxAok39hA0PgiJaw5A2WHs 3I80efIAMm7nObH3ns+Uz4ahI8dgf78rbvgQ+S4= X-Google-Smtp-Source: AMrXdXtsHIJbcu3mfBLfgZdP/kx/rbqHGAYW7mlFQs1pdM4hVHgKrk+xcoLCDqH+rDMhSQm3sH2kbw== X-Received: by 2002:a17:902:ea02:b0:187:2f28:bfd6 with SMTP id s2-20020a170902ea0200b001872f28bfd6mr7305147plg.21.1671380004629; Sun, 18 Dec 2022 08:13:24 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id c7-20020a170902d48700b001896522a23bsm5278763plg.39.2022.12.18.08.13.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Dec 2022 08:13:24 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 05/19] mpfr: upgrade 4.1.0 -> 4.1.1 Date: Sun, 18 Dec 2022 06:12:49 -1000 Message-Id: <9977278a12d6bc0b811077fa19c64b80e793a33d.1671379841.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 18 Dec 2022 16:13:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174792 From: Wang Mingyu Changelog: ========= - Bug fixes (see and/or the ChangeLog file), in particular for macros implementing functions. - Improved manual formatting. Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni (cherry picked from commit f733eddc428cf9537f97cb91025b73dd1fdea932) Signed-off-by: Steve Sakoman --- meta/recipes-support/mpfr/{mpfr_4.1.0.bb => mpfr_4.1.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-support/mpfr/{mpfr_4.1.0.bb => mpfr_4.1.1.bb} (91%) diff --git a/meta/recipes-support/mpfr/mpfr_4.1.0.bb b/meta/recipes-support/mpfr/mpfr_4.1.1.bb similarity index 91% rename from meta/recipes-support/mpfr/mpfr_4.1.0.bb rename to meta/recipes-support/mpfr/mpfr_4.1.1.bb index 2121dad57c..f531a88961 100644 --- a/meta/recipes-support/mpfr/mpfr_4.1.0.bb +++ b/meta/recipes-support/mpfr/mpfr_4.1.1.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ DEPENDS = "gmp autoconf-archive" SRC_URI = "https://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.xz" -SRC_URI[sha256sum] = "0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f" +SRC_URI[sha256sum] = "ffd195bd567dbaffc3b98b23fd00aad0537680c9896171e44fe3ff79e28ac33d" UPSTREAM_CHECK_URI = "http://www.mpfr.org/mpfr-current/" From patchwork Sun Dec 18 16:12:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16890 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 7D42CC4332F for ; Sun, 18 Dec 2022 16:13:29 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web10.32107.1671380007449700902 for ; Sun, 18 Dec 2022 08:13:27 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=O/IQZ8MS; spf=softfail (domain: sakoman.com, ip: 209.85.216.50, mailfrom: steve@sakoman.com) Received: by mail-pj1-f50.google.com with SMTP id t11-20020a17090a024b00b0021932afece4so10719635pje.5 for ; Sun, 18 Dec 2022 08:13:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=9QEOsuyEEF19EwlpL9IeMviKQ/BKsKMusxgsSuPIpCM=; b=O/IQZ8MS293bX+lfwte1GdLBhyazmIb21dDnQaZS9yJlwKI2Y9CqRm+BebziL1QBI1 XukzjMjx6GVsCxq2ITO3EyrwpyEaVkbAsDaQrK+/ZAwskCgZoUzcPbf2wC/POxIm/kBn ry75avdHlVeaXr6GE4Vd9WSdo3l4dC7BQSoo8MLjBVEzMlNUc8JnVV21b0uUoaUzbgMs HJgJ1iJ1su6aO8b4cN+1bqH57JH7kpYM4Jo8h+6cBLDBdzPTUYw7LqpBxEoWZn/tZbwd yW8ZnKSm2by4gFR32MMAnzs8tB2+Oupy09s3MhibAyehiThOESOnCBfxliQvgMy+Szzt q9dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=9QEOsuyEEF19EwlpL9IeMviKQ/BKsKMusxgsSuPIpCM=; b=P9YpXpj5eXJoDNHMR9/glvTJZ6qgk22KAKOkqaohPk4MPiv0IqGc8RyZ+uOJ8ofKFD iumbtAny4vBpQAkGYNgutDn7eldexiSzZuqWO3axmxPuGMIqRY7lO1L/U8YEIH2UhO64 CwE00WR+numlnej+xAvx9rOb+I5wbtMxef22CWNhsf5/czBrhv7yBOy1Y9cqUVE+0g5W bRv6kNn899t3gbPbOrNHXbBi9JbjYXNvqi4cnx2ZO1SRZi/7x9rP7aAqUhXMNjM+Bq/Q bK4R5iY9Jv8KoqzkfBcEl2Qfs3JW2vg+uypnMH06pg0CsS8mFicFt7w2uztDYGqw5iWN uVQQ== X-Gm-Message-State: ANoB5pkMOtxXpKmpCmGgan9FdoNAVYlKFGUgNiX6xQ8Kw7oWP7/1i6ww IZQRWUvGaBD8dJ3BtNhKkX9mD4WNZskIXhD2q6E= X-Google-Smtp-Source: AA0mqf5L5z/M5NQ/uCbwDFTmlwkVCfR84q932iD2NDHLLRrgaJj032vBwM+uVtXM2rS2bWdBxFjWUg== X-Received: by 2002:a17:902:c14d:b0:18e:9c19:aa51 with SMTP id 13-20020a170902c14d00b0018e9c19aa51mr35288905plj.58.1671380006490; Sun, 18 Dec 2022 08:13:26 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id c7-20020a170902d48700b001896522a23bsm5278763plg.39.2022.12.18.08.13.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Dec 2022 08:13:26 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 06/19] libxcrypt-compat: upgrade 4.4.30 -> 4.4.33 Date: Sun, 18 Dec 2022 06:12:50 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 18 Dec 2022 16:13:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174793 From: Wang Mingyu Changelog: ========== * Fix -Werror=sign-conversion in lib/alg-yescrypt-platform.c. With commit 894aee75433b4dc8d9724b126da6e79fa5f6814b we introduced some changes to huge page handling, that show this error when building with GCC v12.2.1, and thus need a small fix. Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni (cherry picked from commit 6918477ad121f9c7335c661433a909e948f66d51) Signed-off-by: Steve Sakoman --- .../{libxcrypt-compat_4.4.30.bb => libxcrypt-compat_4.4.33.bb} | 0 meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-core/libxcrypt/{libxcrypt-compat_4.4.30.bb => libxcrypt-compat_4.4.33.bb} (100%) diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.30.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.33.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.30.bb rename to meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.33.bb diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index 2bdedcba6d..61b0381076 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSING;md5=c0a30e2b1502c55a7f37e412cd6c6a4b \ inherit autotools pkgconfig SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https" -SRCREV = "fee2687bad66e351a3dcc963a34ae80125923ff8" +SRCREV = "d7fe1ac04c326dba7e0440868889d1dccb41a175" SRCBRANCH ?= "develop" SRC_URI += "file://fix_cflags_handling.patch" From patchwork Sun Dec 18 16:12:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16895 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 82260C46467 for ; Sun, 18 Dec 2022 16:13:39 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web11.32485.1671380009487240602 for ; Sun, 18 Dec 2022 08:13:29 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=DZoMe0O2; spf=softfail (domain: sakoman.com, ip: 209.85.216.50, mailfrom: steve@sakoman.com) Received: by mail-pj1-f50.google.com with SMTP id 3-20020a17090a098300b00219041dcbe9so6788563pjo.3 for ; Sun, 18 Dec 2022 08:13:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=2kKGDSC5wphcnh/4Ry3+W7XmvNuxuOrxoEGzH32isAc=; b=DZoMe0O2FHCXOUTuQg9YZzHjH/IPBNZMmoL2qBw0IvfE8omyE7MziD1jQ1G6H2nvQ6 0YOGE6TLNKG54TewFDad+syuM/yVywrSM9nGTnFuDh5kRtadBu68mpU1ncj9f02QQnAe /zBd8u8FrpDhebUF2P6DdeE1V0mAO2aghofGsmnjr1t/7hUlADanXCPadXXxY7tKyYQN 4Zw52bbbhbu7ZKA54I1UuY74xkC2NyOfS/5hlupU+9YiSGXFNNkv7atJ4HYWjUXKa/I3 zDLMoVwpxSKv4tnptl9Hsczwp4BAHbtN8jsDKT+ibkQ5ej4EQCQsCGpvPBoNV1FjdZOu bpRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=2kKGDSC5wphcnh/4Ry3+W7XmvNuxuOrxoEGzH32isAc=; b=LP1svBu4K8tOllGRxE+8iiV7lUFf1/+BcA+GOIQXqKN4VhOBg4xxE2ZWAfyGWr7Fa8 IuysYklTPm6KwoVW33FrmcI8clVFWbAREr8kqz3lNVnzi2m8fN2XPlBVCzGBYWo1Hgh4 AICftxL1Juwjd7ilS14pCOwC3zDZ+UJXeTl6wegZSanjl114whUQC79MGLXyj3FEIT09 1u5VVJsfqdsOZdqyYXKQgib0QH7VsEKNUl4xpgGkTg+0XqM3UEOzRDuMq19qg4dDClXY JZ2k2oUNge4rFkJfJPx//6hjMISP2e5l3vtHVvJSMw4cJm9nwwtXcT7TLDisLqgvCOPF BhtQ== X-Gm-Message-State: ANoB5plzqJMr6/TUCGkCahlStITKNiKg28oCullrKL93Hewh7MNNe3z9 1zg/878+1kpHs4EowXNB6vRx01U+n0beYD49Wbo= X-Google-Smtp-Source: AA0mqf6EqB4WrlDhfvX+6SfB8BT+aNoFMSGWrGjAs+Gp9pJncoDOYZRTwjXCiSLKGfnmSV18vWm0dg== X-Received: by 2002:a17:902:8605:b0:186:ab03:45d with SMTP id f5-20020a170902860500b00186ab03045dmr35574104plo.47.1671380008371; Sun, 18 Dec 2022 08:13:28 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id c7-20020a170902d48700b001896522a23bsm5278763plg.39.2022.12.18.08.13.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Dec 2022 08:13:27 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 07/19] python3: upgrade 3.10.8 -> 3.10.9 Date: Sun, 18 Dec 2022 06:12:51 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 18 Dec 2022 16:13:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174794 From: Florin Diaconescu Security and bug fixes. Drop patch for CVE-2022-42919 and CVE-2022-37454 which were merged in 3.10.9 Fixes: * CVE-2022-45061 (gh-98433) https://nvd.nist.gov/vuln/detail/CVE-2022-45061 List of changes: https://docs.python.org/3.10/whatsnew/changelog.html#python-3-10-9-final Signed-off-by: Florin Diaconescu Signed-off-by: Steve Sakoman --- .../python/python3/CVE-2022-42919.patch | 70 ------------ .../python/python3/cve-2022-37454.patch | 108 ------------------ .../{python3_3.10.8.bb => python3_3.10.9.bb} | 3 +- 3 files changed, 1 insertion(+), 180 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3/CVE-2022-42919.patch delete mode 100644 meta/recipes-devtools/python/python3/cve-2022-37454.patch rename meta/recipes-devtools/python/{python3_3.10.8.bb => python3_3.10.9.bb} (99%) diff --git a/meta/recipes-devtools/python/python3/CVE-2022-42919.patch b/meta/recipes-devtools/python/python3/CVE-2022-42919.patch deleted file mode 100644 index 6040724dae..0000000000 --- a/meta/recipes-devtools/python/python3/CVE-2022-42919.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 87ef80926ea0ec960a220af89d8ff4db99417b03 Mon Sep 17 00:00:00 2001 -From: Vivek Kumbhar -Date: Thu, 24 Nov 2022 17:44:18 +0530 -Subject: [PATCH] CVE-2022-42919 - -Upstream-Status: Backport [https://github.com/python/cpython/commit/eae692eed18892309bcc25a2c0f8980038305ea2] -CVE: CVE-2022-42919 -Signed-off-by: Vivek Kumbhar - -[3.10] gh-97514: Don't use Linux abstract sockets for multiprocessing (GH-98501) (GH-98503) - -Linux abstract sockets are insecure as they lack any form of filesystem -permissions so their use allows anyone on the system to inject code into -the process. - -This removes the default preference for abstract sockets in -multiprocessing introduced in Python 3.9+ via -https://github.com/python/cpython/pull/18866 while fixing -https://github.com/python/cpython/issues/84031. - -Explicit use of an abstract socket by a user now generates a -RuntimeWarning. If we choose to keep this warning, it should be -backported to the 3.7 and 3.8 branches. -(cherry picked from commit 49f61068f49747164988ffc5a442d2a63874fc17) ---- - Lib/multiprocessing/connection.py | 5 ----- - .../2022-09-07-10-42-00.gh-issue-97514.Yggdsl.rst | 15 +++++++++++++++ - 2 files changed, 15 insertions(+), 5 deletions(-) - create mode 100644 Misc/NEWS.d/next/Security/2022-09-07-10-42-00.gh-issue-97514.Yggdsl.rst - -diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py -index 510e4b5..8e2facf 100644 ---- a/Lib/multiprocessing/connection.py -+++ b/Lib/multiprocessing/connection.py -@@ -73,11 +73,6 @@ def arbitrary_address(family): - if family == 'AF_INET': - return ('localhost', 0) - elif family == 'AF_UNIX': -- # Prefer abstract sockets if possible to avoid problems with the address -- # size. When coding portable applications, some implementations have -- # sun_path as short as 92 bytes in the sockaddr_un struct. -- if util.abstract_sockets_supported: -- return f"\0listener-{os.getpid()}-{next(_mmap_counter)}" - return tempfile.mktemp(prefix='listener-', dir=util.get_temp_dir()) - elif family == 'AF_PIPE': - return tempfile.mktemp(prefix=r'\\.\pipe\pyc-%d-%d-' % -diff --git a/Misc/NEWS.d/next/Security/2022-09-07-10-42-00.gh-issue-97514.Yggdsl.rst b/Misc/NEWS.d/next/Security/2022-09-07-10-42-00.gh-issue-97514.Yggdsl.rst -new file mode 100644 -index 0000000..02d95b5 ---- /dev/null -+++ b/Misc/NEWS.d/next/Security/2022-09-07-10-42-00.gh-issue-97514.Yggdsl.rst -@@ -0,0 +1,15 @@ -+On Linux the :mod:`multiprocessing` module returns to using filesystem backed -+unix domain sockets for communication with the *forkserver* process instead of -+the Linux abstract socket namespace. Only code that chooses to use the -+:ref:`"forkserver" start method ` is affected. -+ -+Abstract sockets have no permissions and could allow any user on the system in -+the same `network namespace -+`_ (often the -+whole system) to inject code into the multiprocessing *forkserver* process. -+This was a potential privilege escalation. Filesystem based socket permissions -+restrict this to the *forkserver* process user as was the default in Python 3.8 -+and earlier. -+ -+This prevents Linux `CVE-2022-42919 -+`_. --- -2.25.1 - diff --git a/meta/recipes-devtools/python/python3/cve-2022-37454.patch b/meta/recipes-devtools/python/python3/cve-2022-37454.patch deleted file mode 100644 index c019151a64..0000000000 --- a/meta/recipes-devtools/python/python3/cve-2022-37454.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 1f66b714c5f2fef80ec5389456ac31756dbfff0e Mon Sep 17 00:00:00 2001 -From: Theo Buehler -Date: Fri, 21 Oct 2022 21:26:01 +0200 -Subject: [PATCH] gh-98517: Fix buffer overflows in _sha3 module (#98519) - -This is a port of the applicable part of XKCP's fix [1] for -CVE-2022-37454 and avoids the segmentation fault and the infinite -loop in the test cases published in [2]. - -[1]: https://github.com/XKCP/XKCP/commit/fdc6fef075f4e81d6b1bc38364248975e08e340a -[2]: https://mouha.be/sha-3-buffer-overflow/ - -Regression test added by: Gregory P. Smith [Google LLC] ---- - -Patch applied without modification. - -CVE: CVE-2022-37454 - -Upstream-Status: Backport [github.com/cpython/cpython.git 0e4e058602d...] - -Signed-off-by: Joe Slater ---- - Lib/test/test_hashlib.py | 9 +++++++++ - .../2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst | 1 + - Modules/_sha3/kcp/KeccakSponge.inc | 15 ++++++++------- - 3 files changed, 18 insertions(+), 7 deletions(-) - create mode 100644 Misc/NEWS.d/next/Security/2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst - -diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py -index ea31f8b..65330e1 100644 ---- a/Lib/test/test_hashlib.py -+++ b/Lib/test/test_hashlib.py -@@ -491,6 +491,15 @@ class HashLibTestCase(unittest.TestCase): - def test_case_md5_uintmax(self, size): - self.check('md5', b'A'*size, '28138d306ff1b8281f1a9067e1a1a2b3') - -+ @unittest.skipIf(sys.maxsize < _4G - 1, 'test cannot run on 32-bit systems') -+ @bigmemtest(size=_4G - 1, memuse=1, dry_run=False) -+ def test_sha3_update_overflow(self, size): -+ """Regression test for gh-98517 CVE-2022-37454.""" -+ h = hashlib.sha3_224() -+ h.update(b'\x01') -+ h.update(b'\x01'*0xffff_ffff) -+ self.assertEqual(h.hexdigest(), '80762e8ce6700f114fec0f621fd97c4b9c00147fa052215294cceeed') -+ - # use the three examples from Federal Information Processing Standards - # Publication 180-1, Secure Hash Standard, 1995 April 17 - # http://www.itl.nist.gov/div897/pubs/fip180-1.htm -diff --git a/Misc/NEWS.d/next/Security/2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst b/Misc/NEWS.d/next/Security/2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst -new file mode 100644 -index 0000000..2d23a6a ---- /dev/null -+++ b/Misc/NEWS.d/next/Security/2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst -@@ -0,0 +1 @@ -+Port XKCP's fix for the buffer overflows in SHA-3 (CVE-2022-37454). -diff --git a/Modules/_sha3/kcp/KeccakSponge.inc b/Modules/_sha3/kcp/KeccakSponge.inc -index e10739d..cf92e4d 100644 ---- a/Modules/_sha3/kcp/KeccakSponge.inc -+++ b/Modules/_sha3/kcp/KeccakSponge.inc -@@ -171,7 +171,7 @@ int SpongeAbsorb(SpongeInstance *instance, const unsigned char *data, size_t dat - i = 0; - curData = data; - while(i < dataByteLen) { -- if ((instance->byteIOIndex == 0) && (dataByteLen >= (i + rateInBytes))) { -+ if ((instance->byteIOIndex == 0) && (dataByteLen-i >= rateInBytes)) { - #ifdef SnP_FastLoop_Absorb - /* processing full blocks first */ - -@@ -199,10 +199,10 @@ int SpongeAbsorb(SpongeInstance *instance, const unsigned char *data, size_t dat - } - else { - /* normal lane: using the message queue */ -- -- partialBlock = (unsigned int)(dataByteLen - i); -- if (partialBlock+instance->byteIOIndex > rateInBytes) -+ if (dataByteLen-i > rateInBytes-instance->byteIOIndex) - partialBlock = rateInBytes-instance->byteIOIndex; -+ else -+ partialBlock = (unsigned int)(dataByteLen - i); - #ifdef KeccakReference - displayBytes(1, "Block to be absorbed (part)", curData, partialBlock); - #endif -@@ -281,7 +281,7 @@ int SpongeSqueeze(SpongeInstance *instance, unsigned char *data, size_t dataByte - i = 0; - curData = data; - while(i < dataByteLen) { -- if ((instance->byteIOIndex == rateInBytes) && (dataByteLen >= (i + rateInBytes))) { -+ if ((instance->byteIOIndex == rateInBytes) && (dataByteLen-i >= rateInBytes)) { - for(j=dataByteLen-i; j>=rateInBytes; j-=rateInBytes) { - SnP_Permute(instance->state); - SnP_ExtractBytes(instance->state, curData, 0, rateInBytes); -@@ -299,9 +299,10 @@ int SpongeSqueeze(SpongeInstance *instance, unsigned char *data, size_t dataByte - SnP_Permute(instance->state); - instance->byteIOIndex = 0; - } -- partialBlock = (unsigned int)(dataByteLen - i); -- if (partialBlock+instance->byteIOIndex > rateInBytes) -+ if (dataByteLen-i > rateInBytes-instance->byteIOIndex) - partialBlock = rateInBytes-instance->byteIOIndex; -+ else -+ partialBlock = (unsigned int)(dataByteLen - i); - i += partialBlock; - - SnP_ExtractBytes(instance->state, curData, instance->byteIOIndex, partialBlock); --- -2.32.0 - diff --git a/meta/recipes-devtools/python/python3_3.10.8.bb b/meta/recipes-devtools/python/python3_3.10.9.bb similarity index 99% rename from meta/recipes-devtools/python/python3_3.10.8.bb rename to meta/recipes-devtools/python/python3_3.10.9.bb index 8963ce6dd2..d6b7a618c1 100644 --- a/meta/recipes-devtools/python/python3_3.10.8.bb +++ b/meta/recipes-devtools/python/python3_3.10.9.bb @@ -35,7 +35,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-setup.py-Do-not-detect-multiarch-paths-when-cross-co.patch \ file://deterministic_imports.patch \ file://0001-Avoid-shebang-overflow-on-python-config.py.patch \ - file://CVE-2022-42919.patch \ " SRC_URI:append:class-native = " \ @@ -44,7 +43,7 @@ SRC_URI:append:class-native = " \ file://12-distutils-prefix-is-inside-staging-area.patch \ file://0001-Don-t-search-system-for-headers-libraries.patch \ " -SRC_URI[sha256sum] = "6a30ecde59c47048013eb5a658c9b5dec277203d2793667f578df7671f7f03f3" +SRC_URI[sha256sum] = "5ae03e308260164baba39921fdb4dbf8e6d03d8235a939d4582b33f0b5e46a83" # exclude pre-releases for both python 2.x and 3.x UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P\d+(\.\d+)+).tar" From patchwork Sun Dec 18 16:12:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16896 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 9C678C3DA79 for ; Sun, 18 Dec 2022 16:13:39 +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.web11.32486.1671380011180914411 for ; Sun, 18 Dec 2022 08:13:31 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=K6TfWwe+; spf=softfail (domain: sakoman.com, ip: 209.85.214.180, mailfrom: steve@sakoman.com) Received: by mail-pl1-f180.google.com with SMTP id 4so6880634plj.3 for ; Sun, 18 Dec 2022 08:13:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=UU5v1UsCvvSpH/wuq00fPN5OorxwYf6XtzoWzrqOrG4=; b=K6TfWwe+HQpmBOR9oW3/5Yo9QCODoka7mXfB98wCCd9X9G1S58erfZqQ+zUxjPmiEd j65CEt/cOO+WLKUgcL8Fd/RnKOu+r+CgZ3C/H2Zyk0xhqXd8XQ2qM2oN08pt2EzCCboM 9sY7k4S2+fWfMCpgV3g+u90b6wbrreEetYZs9nLldtXwA5Cvm7sLIQkea6C+0R8nWjPR caZK8sRMP0cZLTjIaEgjjJ3onYkEw5uBafHzcN0KcQs/GGzNfZXKogk7TRJqsFhCzYzL 8ZP2zktvnHOeFBDeCKSU4ltMDUk4egzUhN85AumWjqIxV9O4HbLHG3kn3VpejN8qWKGE P6XA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=UU5v1UsCvvSpH/wuq00fPN5OorxwYf6XtzoWzrqOrG4=; b=fROrzvLSYzJKZ79RyvTrU+6qls6AMIfqhlS0PI0knZN+R17VCETGUnMTcM044qSMBg wy711IbKtvllUvph8LOZawxTUwJf15NtGqEffufnSi7uQJ3xtFfEzzyGgoY8DXFpRY+g 9y8EfrehDzplAhYr+PEZn4Kl9gkIFsm+snAPQCQOvQ+LbSpCxW4ebB98433gQ+3vEMHI eMj2J9t4ec/SEBIOIooWMRhvCGiZxMK98RqgPNGiXYKHsuDSw9wdlUVdmCFZERaEv4jz wC8ehocx6jn71y8H9K/E7IXr9GO/LLHM6ftDNNxxNz9u8Fcsv+v5X2TSgniyz8WqRp6Z MlAQ== X-Gm-Message-State: ANoB5pnn9keax1L08e16MjDenNw9eeykSVf6wz/+8pe2bxA2iE6WUaXv QUhC3oghxvsjinOA7HgkZRgk6tRcuPecGm5Ax1o= X-Google-Smtp-Source: AA0mqf6QbsYGmeuSFrlrpTpzqGnXQ1+PR5qJBBG13cWZbYBycWhBcLtUtzgMHpfiPjKTMvilNF2rYw== X-Received: by 2002:a17:903:240d:b0:185:441f:70b1 with SMTP id e13-20020a170903240d00b00185441f70b1mr41122696plo.54.1671380010128; Sun, 18 Dec 2022 08:13:30 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id c7-20020a170902d48700b001896522a23bsm5278763plg.39.2022.12.18.08.13.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Dec 2022 08:13:29 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 08/19] bc: extend to nativesdk Date: Sun, 18 Dec 2022 06:12:52 -1000 Message-Id: <713ebd37cb740ebd1f3f57d14f4448ded8a5fe3c.1671379841.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 18 Dec 2022 16:13:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174795 From: Chen Qi bc is needed for compiling kernel modules, more specifially whenr running `make scripts prepare'. In linux-yocto.inc, we have bc-native in DEPENDS. But we will need nativesdk-bc in case we compile a kernel module inside SDK. Signed-off-by: Chen Qi Signed-off-by: Alexandre Belloni (cherry picked from commit 95b5c89066baccb1e64bfba7d9a66feeeb086da9) Signed-off-by: Steve Sakoman --- meta/recipes-extended/bc/bc_1.07.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/bc/bc_1.07.1.bb b/meta/recipes-extended/bc/bc_1.07.1.bb index 1bec76bb2a..5a03751304 100644 --- a/meta/recipes-extended/bc/bc_1.07.1.bb +++ b/meta/recipes-extended/bc/bc_1.07.1.bb @@ -32,4 +32,4 @@ do_compile:prepend() { ALTERNATIVE:${PN} = "bc dc" ALTERNATIVE_PRIORITY = "100" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" From patchwork Sun Dec 18 16:12:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16894 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 9C6A2C4708D for ; Sun, 18 Dec 2022 16:13:39 +0000 (UTC) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.web11.32487.1671380012791267522 for ; Sun, 18 Dec 2022 08:13:32 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=7UPtXJgI; spf=softfail (domain: sakoman.com, ip: 209.85.216.47, mailfrom: steve@sakoman.com) Received: by mail-pj1-f47.google.com with SMTP id js9so6902010pjb.2 for ; Sun, 18 Dec 2022 08:13:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=gGq3zr3oKEUUZvtA/kvIr8L80NEKFWs2vPvuImFUWNM=; b=7UPtXJgInQDdRWLNU3R+a7NokfEgpH5LiTzdeeZ30KBjIA9nCx6UekFRc3MYuQABvJ pVLYJRT0Flwhbq4lWOUxLi1i9hoRwMrv42yriVRuk3L7OcPCHiTjfJXuMluF6ICmnbIa 9FTqGA4uotQU8P5FVydUP3vuON5pXHh7kw6br0Iss0hpTAVnpq/Q37+jeLVCrBurYBwP +6h1we/xCf0G6IfJT7+0bSq2otwL4CnOKBUHN1CPuvKxoecFsgKChR/HyqxAnoRfo1TC Fxz07oQREW1XQ/tZgrZ39QTVO4bjj7FPyX8HNteJiE4mZZIvp88/YTYYYZ4asv/McN76 kQRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=gGq3zr3oKEUUZvtA/kvIr8L80NEKFWs2vPvuImFUWNM=; b=XI6z9TqCuR/UyrETm25GwX8S72zTAvtzETKo+HfhmMwtkB0LKLpqhiFs0MIxUIUOV/ il2ytDhAQyIs8zxLfdXGePWHhKj9uq6Sja6MrC3fjuCBUMkDef1G9QNEBSUO2hCsDpZ9 lr+DIzAWLoIHSz7stzR0BQ/vZKfDSE+3ZKCGE2iDD04+0qCDJuVxS1R8g3+37Ekmg79m gbUGjy5ur+tvnGnpiK2xM71gCDRZXlEDVBiURvVXIjLNM0iqxgdxOYihn/MaF5Ra6ve1 N/r7ESRG71ba0aR5YRJJXbU48/wEJKqm7WlQMj8f2Cj3BPaFBDVS01VBiYw7D7uZt/dp ZbBQ== X-Gm-Message-State: AFqh2kq54b1XnwAK3McqFTjB43kdGHdVhJuCVRHCYdo6EVHn/4rQ+xPi j7z10f5juskc6FavjYdzPO4D7WkniYivZZ47FCM= X-Google-Smtp-Source: AMrXdXt0iA0D+micy5z06+6jeuTGu2I02X3RTseB79qI5IGYzp3uSCqNm8eKPPxqK3KeLb/q1i7h3w== X-Received: by 2002:a17:902:b48f:b0:191:1fbf:cd4b with SMTP id y15-20020a170902b48f00b001911fbfcd4bmr1261285plr.38.1671380011884; Sun, 18 Dec 2022 08:13:31 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id c7-20020a170902d48700b001896522a23bsm5278763plg.39.2022.12.18.08.13.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Dec 2022 08:13:31 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 09/19] xwayland: libxshmfence is needed when dri3 is enabled Date: Sun, 18 Dec 2022 06:12:53 -1000 Message-Id: <7a27f91670d6978433ecab5d3ef694303d5da79e.1671379841.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 18 Dec 2022 16:13:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174796 From: Carlos Alberto Lopez Perez * The build error happens already at configure time: | meson.build: ERROR: Problem encountered: DRI3 requested, but xshmfence not found Signed-off-by: Carlos Alberto Lopez Perez Signed-off-by: Alexandre Belloni (cherry picked from commit 451fe4a067432b432b9cd38d2fc78072f6ce5421) Signed-off-by: Steve Sakoman --- meta/recipes-graphics/xwayland/xwayland_22.1.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/xwayland/xwayland_22.1.5.bb b/meta/recipes-graphics/xwayland/xwayland_22.1.5.bb index c1c5407dee..51d847a093 100644 --- a/meta/recipes-graphics/xwayland/xwayland_22.1.5.bb +++ b/meta/recipes-graphics/xwayland/xwayland_22.1.5.bb @@ -23,7 +23,7 @@ OPENGL_PKGCONFIGS = "glx glamor dri3" PACKAGECONFIG ??= "${XORG_CRYPTO} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ " -PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false" +PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false,libxshmfence" PACKAGECONFIG[glx] = "-Dglx=true,-Dglx=false,virtual/libgl virtual/libx11" PACKAGECONFIG[glamor] = "-Dglamor=true,-Dglamor=false,libepoxy virtual/libgbm,libegl" PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" From patchwork Sun Dec 18 16:12:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16893 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 9CA7EC4708E for ; Sun, 18 Dec 2022 16:13:39 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web10.32110.1671380014508243184 for ; Sun, 18 Dec 2022 08:13:34 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=46nHmkCO; spf=softfail (domain: sakoman.com, ip: 209.85.214.172, mailfrom: steve@sakoman.com) Received: by mail-pl1-f172.google.com with SMTP id d7so6849829pll.9 for ; Sun, 18 Dec 2022 08:13:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=s5OfujpiMYfcfsJu0Fby1C5lx1tAxT0nk6o8jUabjZI=; b=46nHmkCO8U1Ohch1b+zloyh7AS4rKaQlB2esuJq2awepXQY2ha28geI39a2Lr3Z3MC dYFoXxz/6q33gG2qsQ2bumkXAMVSbcOjAELPVl7g+ybHzLbVN3t7+l5VHTi6gg4obdJA lDrv/bz/TbqoFvn0dQ/UubOqIwfONCvFcn3pOsKYZcgbHqXilGL+y7yP6EJdcervKfmH Z5/upVccZUV3F5HQ2baiA5qK1sNJ2DDh9xgeBVSylIyzH+5lOO03eA62dPOY2X/foSyM rtJatuakyhVeSU9tzxXp+2723cJvDNAY29n+oIQ5qXtCjj2bSphn8KkfD02Bc29XZ7bB i9Ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=s5OfujpiMYfcfsJu0Fby1C5lx1tAxT0nk6o8jUabjZI=; b=Nsp2Bro0QE+xDcVoTpOroi1bYxwHBP9LOypeovSOLxsqaBedZy6eFrOAVfS1kMB++y JJNxnsi4+yeonZe9U06DcxShuQeBvaKoWim0UjgA7kBseG2EfMq7RRREP29WzxFQ8dzY 6LKJiNKusppzKtAgVAjDSF/GwnYQs/TgjsnkaG2i7ZFW9lRlyzi+MwSGcORWQP65tzo9 7juOVjGtEaM47ewcGf7q2VEssXdHne/cNt8nUCq1MPEkgfNxe1OnELFjIXHBheMPkh4M cFM4RLtPjShJmUrvCfM4I8DtvEEh1rTCVLL/MqGYyrNKVhUXhSxAEJ0IbUOFGNTm2pIs AwpQ== X-Gm-Message-State: ANoB5plFaJHhxrgvudM0Y8wXEbreW2W1OlHp0JajEVvF7P5FtmMFDlml /z94q4ySIbjkRl4Vw84IC/uv74xsdo39yJY8tO4= X-Google-Smtp-Source: AA0mqf78UeTbwREiWmNWCCM4OchVLeH82dqNoOztr5RsMmMcGj+GgbKCHu719emuO8Tp+VQ63Lf+0Q== X-Received: by 2002:a17:903:2655:b0:189:d072:18f0 with SMTP id je21-20020a170903265500b00189d07218f0mr37201695plb.25.1671380013608; Sun, 18 Dec 2022 08:13:33 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id c7-20020a170902d48700b001896522a23bsm5278763plg.39.2022.12.18.08.13.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Dec 2022 08:13:33 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 10/19] lsof: add update-alternatives logic Date: Sun, 18 Dec 2022 06:12:54 -1000 Message-Id: <750f4e17f63cf957076c13c53139ddaab1617597.1671379841.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 18 Dec 2022 16:13:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174797 From: Alex Stewart Some distributions (NI LinuxRT) provide both busybox-lsof and full-featured lsof implementations. When users install the full-featured lsof package, the full-binary fails to replace the bbox-binary in PATH, because `lsof` contains no update-alternatives logic. Inherit the update-alternatives bbclass and assert that the full-featured lsof package has higher priority than the busybox implementation. Co-Authored-By: Kyle Roeschley Signed-off-by: Alex Stewart Signed-off-by: Alexandre Belloni (cherry picked from commit e2893fa692a6e91eee09fc04c8c03fe27c718a58) Signed-off-by: Steve Sakoman --- meta/recipes-extended/lsof/lsof_4.94.0.bb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/meta/recipes-extended/lsof/lsof_4.94.0.bb b/meta/recipes-extended/lsof/lsof_4.94.0.bb index c2b8bc839b..62f42975af 100644 --- a/meta/recipes-extended/lsof/lsof_4.94.0.bb +++ b/meta/recipes-extended/lsof/lsof_4.94.0.bb @@ -19,6 +19,15 @@ SRCREV = "005e014e1abdadb2493d8b3ce87b37a2c0a2351d" S = "${WORKDIR}/git" + +inherit update-alternatives + +ALTERNATIVE_${PN} = "lsof" +ALTERNATIVE_LINK_NAME[lsof] = "${sbindir}/lsof" +# Make our priority higher than busybox +ALTERNATIVE_PRIORITY = "100" + + export LSOF_INCLUDE = "${STAGING_INCDIR}" do_configure () { From patchwork Sun Dec 18 16:12:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16892 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 8559AC4167B for ; Sun, 18 Dec 2022 16:13:39 +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.32111.1671380016411414661 for ; Sun, 18 Dec 2022 08:13:36 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=hkTmqZQT; spf=softfail (domain: sakoman.com, ip: 209.85.216.51, mailfrom: steve@sakoman.com) Received: by mail-pj1-f51.google.com with SMTP id n65-20020a17090a2cc700b0021bc5ef7a14so6849009pjd.0 for ; Sun, 18 Dec 2022 08:13:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=TbD6nOFTQoVXAufS5UfOqLYnv+8HPDmaT5SQkKptQcc=; b=hkTmqZQTLs7GQ8tMwta2f06/TUybRitfO62GIbIo3omz0gZWXGEBpexLYyq4uYnhSo MSwXavISbzqqYrzUFyKf7SsrYpBNJ32NYJUhnsGyMg7CWPdoRnQ2c3Lj2yUGfubYhcyb 2uqCyFszNm5wHjOrjfXfh/cFM6IzucUbZEpZbSPsmUdcUBbq9lOzngwM3S6Nl6A6wDgK AEk3YuClcfC5ehlrpVVibbMKGPeRStbenEYLwb7qWziKWy5zemIJZyHonNAIMA05AcNh zl9CwKkAr3xVIZFW61hZuHm1OG1fUo5YzMWI5UlL2JxqKD9kgVII0GdR1CHtJfHVB8Qk ZiEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=TbD6nOFTQoVXAufS5UfOqLYnv+8HPDmaT5SQkKptQcc=; b=eSggL8/BpQnj/bVGC2OcSe3DJwW/kVHVFOPQYBZibdcpVjxAA11w7FVORePBnl7W1d vf8L1QfzXOOL2YjbrBQNfYWKMBU60PMDT/2xROy6SYicZqSt9hzJ/jnqIqFhVt1ISwbn qBbrEakMjsUXsTp4t4OR42i9PFQhKp48fSFffcFH/OVqqpIHzOv0a1yR4t7g11uQAGwd VsXUBMfKglBj7TKlL3bigFneMwo7jyoMUaUOxU/lkg0dn5JW3Djvo0C8yhnKI1WT+mKW WPAHUlMHSJNOKsJEvfbgNFNSB6BQxYQrjI7aYP45/xy26V601W2I+PpB3yQm3W0GRuaH 03Jg== X-Gm-Message-State: AFqh2koC0pfkcMw3iC8/Vh67BKDDkrSs9WEduVDQbGjAyJaV4yj+026p kTmpsdihvXSNWskemgTsTceJ5jjGlIY8Rm12UUs= X-Google-Smtp-Source: AMrXdXvrEx1VLvhVhBvC8YRUoJHeNZmj2K4Z2NJWcbtz2aQhtu/hZaY274teZ4CJrXD8AaID6AYkVg== X-Received: by 2002:a17:902:eb8f:b0:191:1545:a652 with SMTP id q15-20020a170902eb8f00b001911545a652mr4095669plg.31.1671380015382; Sun, 18 Dec 2022 08:13:35 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id c7-20020a170902d48700b001896522a23bsm5278763plg.39.2022.12.18.08.13.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Dec 2022 08:13:35 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 11/19] rm_work: adjust dependency to make do_rm_work_all depend on do_rm_work Date: Sun, 18 Dec 2022 06:12:55 -1000 Message-Id: <2565fe40514ac17d0c97e847bb9ff0ab90410e53.1671379841.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 18 Dec 2022 16:13:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174798 From: Chen Qi For now, if we use rm_work and `bitbake core-image-minimal', some recipes' WORKDIRs are not cleaned up, e.g., makedevs-native. Adjust the dependency to make do_rm_work_all depend on do_rm_work to solve this problem. Below are the detailed explanation of why this would work. Without this patch, the dependency chain is like: [other deps] -> [do_rm_work] -+-> [do_build] | [do_rm_work_all] -------------+ With this patch, the depedency chain is like: [other deps] -> [do_rm_work] -> [do_rm_work_all] -> [do_build] Such dependency chain adjustment fixes the issue because do_rm_work_all now depends on [other deps] and thus the [depends] of these [other deps]. Take core-image-minimal as an example. Before this adjustment, do_rm_work_all does not have any relationship with do_rootfs, and we have do_rootfs[depends] += "makedevs-native:do_populate_sysroot ..." This essentially prevents 'recrdeptask' setting of do_rm_work_all extend to makedevs-native. With this patch, the do_rm_work_all now depends on do_rm_work which in turn depends on do_rootfs, and so do_rm_work_all's recrdeptask could have effect on makedevs-native. With this patch, all built recipes WORKDIR will be cleaned up with a few expected exceptions such as kernel and qemu-helper-native. Signed-off-by: Chen Qi Signed-off-by: Alexandre Belloni (cherry picked from commit b25cc45c9b39f79ba0a03c4556cb2e2431677b4e) Signed-off-by: Steve Sakoman --- meta/classes/rm_work.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass index c2b569903a..8979714e62 100644 --- a/meta/classes/rm_work.bbclass +++ b/meta/classes/rm_work.bbclass @@ -174,7 +174,7 @@ python inject_rm_work() { # other recipes and thus will typically run much later than completion of # work in the recipe itself. # In practice, addtask() here merely updates the dependencies. - bb.build.addtask('do_rm_work', 'do_build', ' '.join(deps), d) + bb.build.addtask('do_rm_work', 'do_rm_work_all do_build', ' '.join(deps), d) # Always update do_build_without_rm_work dependencies. bb.build.addtask('do_build_without_rm_work', '', ' '.join(deps), d) From patchwork Sun Dec 18 16:12:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16891 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 8213FC10F1E for ; Sun, 18 Dec 2022 16:13:39 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web10.32114.1671380018284281254 for ; Sun, 18 Dec 2022 08:13:38 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=xc9YgTx6; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id u5so6870628pjy.5 for ; Sun, 18 Dec 2022 08:13:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=46kAtnQvJU2cXrcnWdDG810eqn8ng7hlCnF4S/Eu0Zo=; b=xc9YgTx6rW9lwKBAcS9mY96tI18YG3NdmaTHA89NdsEFLOxh/czFpcRn+CSfc7BT6m JkiOF7qYVdp7lEpvhvbNSxLod2Yk3uQJKtd3aWRuzankFO6nMvb5ATanPAnZDHhcQCmh YV6BqVvyGWDEx9xYG8EnJbJc6OQDJd2hSjXHDt+TP2I+F+QzFgNCIUDPjb1Wr+HpjAOP DxEX+snnHrr4i9K7IDf7d7bUEiWqIW05iZc0etDsFHrEi8KmsGJPoPwD5EqnGdFuahC4 ot5j6Su+swmH4RS8elDqBy4rfJM8qV0/i01huL7A0jumkQ7rTIJKJWyBJ70MVbS1WCb/ YB8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=46kAtnQvJU2cXrcnWdDG810eqn8ng7hlCnF4S/Eu0Zo=; b=OQHcjMYBkzqBc52zCzKFcIeC1CGclIqHCYe++NCbtaUsqDjWqyhcD5JKwKfZIGcJ/z QuNvXn7TwRhzLpUhtC3fJCqCSjeCDRuk9A+RPY2lGvpOUmOZO3vEO39kW9YeUPr/pSxR dd1fwTj8uOUs7pDhlMfFl48gu0YLYJyu5OqiCvyhIT23HXnK2H4bfC+NZ97CQ+VqnwTA FWPVA7CE2Eacc8qvZb8yjALm7mMhxePpHi5LfGyGlm2sK/nKn4wyVHdqQj2/f7usCwuv dnzPWBJaHyuDbDmjhs7an+B4SbbfrRLjES5CxZFdNPofg2IyJ5K/Q2JRdUW7SySm/GpK GHVA== X-Gm-Message-State: AFqh2kqj9G8H0ih2uEKOad17/Sj0ocPYMy94t0eAqVRckO4X0gjpkAp6 bH1QYgrMBEoXqLUjur2KmibFUbFDy1aylfP1DEQ= X-Google-Smtp-Source: AMrXdXuAjZ/yKFLsGAh+BzsAJuEE1PLnuDpXBRKmP/ED8kMTQpqOyK0usp186r+qCQ12VbF+vJrmkQ== X-Received: by 2002:a17:902:e949:b0:190:cb4a:47ed with SMTP id b9-20020a170902e94900b00190cb4a47edmr6075899pll.47.1671380017326; Sun, 18 Dec 2022 08:13:37 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id c7-20020a170902d48700b001896522a23bsm5278763plg.39.2022.12.18.08.13.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Dec 2022 08:13:36 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 12/19] lib/buildstats: fix parsing of trees with reduced_proc_pressure directories Date: Sun, 18 Dec 2022 06:12:56 -1000 Message-Id: <96cf8b322f4cdec31175cc2c1082e9e3bc488118.1671379841.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 18 Dec 2022 16:13:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174799 From: Ross Burton The /proc/pressure support in buildstats is creating directories in the buildstats tree called reduced_proc_pressure, which confuses the parsing logic as that cannot be parsed as a name-epoc-version-revision tuple. Explicitly skip this directory to solve the problem. Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni (cherry picked from commit 24f0331f0b7e51161b1fa43d4592b491d2037fe9) Signed-off-by: Steve Sakoman --- scripts/lib/buildstats.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/lib/buildstats.py b/scripts/lib/buildstats.py index c69b5bf4d7..3b76286ba5 100644 --- a/scripts/lib/buildstats.py +++ b/scripts/lib/buildstats.py @@ -8,7 +8,7 @@ import json import logging import os import re -from collections import namedtuple,OrderedDict +from collections import namedtuple from statistics import mean @@ -238,7 +238,7 @@ class BuildStats(dict): subdirs = os.listdir(path) for dirname in subdirs: recipe_dir = os.path.join(path, dirname) - if not os.path.isdir(recipe_dir): + if dirname == "reduced_proc_pressure" or not os.path.isdir(recipe_dir): continue name, epoch, version, revision = cls.split_nevr(dirname) bsrecipe = BSRecipe(name, epoch, version, revision) From patchwork Sun Dec 18 16:12:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16898 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 7E92BC4332F for ; Sun, 18 Dec 2022 16:13:49 +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.32116.1671380020258117908 for ; Sun, 18 Dec 2022 08:13:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=AaT5Kbqz; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id 17so6926306pll.0 for ; Sun, 18 Dec 2022 08:13:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=EnoFRnLshTDK5azenxv5Ns1rRq+bTH5nJWrxZeIwS44=; b=AaT5Kbqz75iIPKOjP+MDiV+jWvZntch9yGoqkhJDBcreVyoc/8Oh4YKiAthjhRjlqR AuxUiFK68H+gR9VHuzPwX98Dn1dPN1PojFw/4ymVjyc7Oe2srFF/KR+QRT6G9p0PggSx ydVrmDhW/zg5rtnaDINRUwjDveWvZ62WIlN+TSgegcjPfoweWVCWxby2kWIJ7uqDUJBr 7grNaZTmxt2bANOvZQ+4w58nDaPZFeQdXoYvGvB16TgEsfeSxmcw2NDpGUHFfEZOeAze tqrYRHpEbCy5jO0qwQ/dPf2DmPDhGXWHo5+Y2pp/8T2tnH7Sr/S4NQZ7FH2DByA/8zeu xqMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=EnoFRnLshTDK5azenxv5Ns1rRq+bTH5nJWrxZeIwS44=; b=JI1nXUQqftx++QDx7GARxWs2z6wDq+G6adjyyeyXbMSanrHBKPQ2KJyyOM/BBbcp8L Di8iF05e1O+zeNnH3FZvlqueV2U/ECNtk7Qfd0G0DNfXPiEty5FwEtxcM5h+u2aj73qw jdx1jf63Ck6n1E77Mu2xf9ytf+eKpOkDczlH7c3cqDaZ/LSiDcTgNdzgyUY+QT6JIhdK QWaotK+0XkuLFY3YAysDjnAQrK2F3arrldxhUpUviWdzRZzY3pdQ1YpxPwRM5cLaA9Wz mHaBpZ8MpgziIhFm+cQ+OvBqw+py567Xplq6z5ouiuge5Ec4wAQO/eXkQjfuqMQ29u/d sc+g== X-Gm-Message-State: ANoB5pkwt3o8OyuqFrznoF23pu6nKIzTDW2hJfxzpxdkotGkjALEJHAk a/gDKJZQX8HTqJGFHobmWe4G+/IUUvymuqeWtas= X-Google-Smtp-Source: AA0mqf6c4zq7FGdfH5Qal9z6f7oQgai6PVFhUP3zh/ozQFUMxSXdpIpzGRcTEryUnFvQnwOsmoqJ1g== X-Received: by 2002:a17:903:22cf:b0:189:ad19:dd11 with SMTP id y15-20020a17090322cf00b00189ad19dd11mr55935713plg.46.1671380019189; Sun, 18 Dec 2022 08:13:39 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id c7-20020a170902d48700b001896522a23bsm5278763plg.39.2022.12.18.08.13.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Dec 2022 08:13:38 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 13/19] externalsrc: fix lookup for .gitmodules Date: Sun, 18 Dec 2022 06:12:57 -1000 Message-Id: <1f3b39c4d6828940934a341e9f8b73214dc67fdf.1671379841.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 18 Dec 2022 16:13:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174800 From: Peter Marko Commit 0533edac277080e1bd130c14df0cbac61ba01a0c broke bitbake parsing when bitbake is executed from directory with existing .gitmodules and the recipe in externalsrc does not have .gitmodules The check needs to search for .gitmodules in sources path, not cwd. iParsing recipes...ERROR: ExpansionError during parsing ... bb.data_smart.ExpansionError: Failure expanding variable do_compile[file-checksums], expression was ${@srctree_hash_files(d)} which triggered exception CalledProcessError: Command '['git', 'config', '--file', '.gitmodules', '--get-regexp', 'path']' returned non-zero exit status 1. Signed-off-by: Peter Marko Signed-off-by: Alexandre Belloni (cherry picked from commit 66ff3d1f65cd2e7f5319e98fa41f47a59b714c72) Signed-off-by: Steve Sakoman --- meta/classes/externalsrc.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass index a6a8ca6318..57135f2e4c 100644 --- a/meta/classes/externalsrc.bbclass +++ b/meta/classes/externalsrc.bbclass @@ -229,7 +229,7 @@ def srctree_hash_files(d, srcdir=None): env['GIT_INDEX_FILE'] = tmp_index.name subprocess.check_output(['git', 'add', '-A', '.'], cwd=s_dir, env=env) git_sha1 = subprocess.check_output(['git', 'write-tree'], cwd=s_dir, env=env).decode("utf-8") - if os.path.exists(".gitmodules"): + if os.path.exists(os.path.join(s_dir, ".gitmodules")): submodule_helper = subprocess.check_output(["git", "config", "--file", ".gitmodules", "--get-regexp", "path"], cwd=s_dir, env=env).decode("utf-8") for line in submodule_helper.splitlines(): module_dir = os.path.join(s_dir, line.rsplit(maxsplit=1)[1]) From patchwork Sun Dec 18 16:12:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16901 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 8A822C10F1E for ; Sun, 18 Dec 2022 16:13:49 +0000 (UTC) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mx.groups.io with SMTP id smtpd.web11.32491.1671380022330272187 for ; Sun, 18 Dec 2022 08:13:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=2rvGQiBl; spf=softfail (domain: sakoman.com, ip: 209.85.216.54, mailfrom: steve@sakoman.com) Received: by mail-pj1-f54.google.com with SMTP id hd14-20020a17090b458e00b0021909875bccso12086121pjb.1 for ; Sun, 18 Dec 2022 08:13:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=Ar86LaAF3BpUFetRwPtcv4ZJbB4PML4ZD8H0ZnjrTm0=; b=2rvGQiBl1SV+IFS0xh/vra5wY4wdBrGyxYoIKwRX5g/GJHaNJeo+bvHw7orrl6xhWT tqZdOTRs8stOdyk+vv8XhwTVSCf/mzZXOFEAc3u9Z37N0ZJKzk7HX1Wdi3WXu/Hz4XQ6 yjhxboPZm3ZnNf4Vh852qEyoiGvb5hlQzPF1t8K0wphyN9z81s/odJkEfP2gSoYgAs1h +++rfJ7cp81/R13eH2NH57luBeDaGeLQNg0Vhc1KjBG3YJWvy6nTWUmWGAOWgiHe+Y3w NelNP2uRvOOeiUfnm+vCq+96s3+UdYdFUIGiiF5Taisi4jq3Sui+WTM2PXR0U952BYBz EBig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=Ar86LaAF3BpUFetRwPtcv4ZJbB4PML4ZD8H0ZnjrTm0=; b=hZDKzLXMjIFOU90VlUubUo8DGqd64SXoWzOIK2VxOEVGzTpx1WQ+OED3vEvQEDZirI kMo7jYcgpKxBqR3bR3U3NzqhOQz9G1OxAe5gLdpeATaMFFFnj0ZkpiCwU3VjIpGJ9S+q c4cVlZ9xiBwx476pYbRWRyFmLul7U2IPceaCPLAs0te38Dlk7AA3v6OgjHNMyMOuaadB NychUPkXBiMYFirE4fGSxxT+CAOWXfKW7H/YLN6rKwzfJ1RrA+h/siB2OxVWSnXO9E2x Xnnkdg290PkADZMX5jxtwGhkehlum/IStPlCL9tYkUX+RiY+grCbYj6Vubw80ZGtrgHz JztQ== X-Gm-Message-State: ANoB5pmgTSydVEEtXKLy+VkQPUgR0re70l0s8l50m2VI4TE9jPhLOYVI mJWooOUiLkhtE2k/SgiUTjYnep7p42XlVymYlb0= X-Google-Smtp-Source: AA0mqf7MxgBKUJDWcrt3xigLLNA01lXmgY8cBxUt9cbG/OwD8JALymAXAxuPAOjqWYQeWnmvwS/0cg== X-Received: by 2002:a17:902:bc88:b0:186:748e:9383 with SMTP id bb8-20020a170902bc8800b00186748e9383mr35700218plb.46.1671380021365; Sun, 18 Dec 2022 08:13:41 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id c7-20020a170902d48700b001896522a23bsm5278763plg.39.2022.12.18.08.13.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Dec 2022 08:13:40 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 14/19] oeqa/selftest/externalsrc: add test for srctree_hash_files Date: Sun, 18 Dec 2022 06:12:58 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 18 Dec 2022 16:13:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174801 From: Peter Marko Signed-off-by: Peter Marko Signed-off-by: Alexandre Belloni (cherry picked from commit 7b9728e5b8bdf1193c1304ec3beeca4b5bf8d2da) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/externalsrc.py | 44 +++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 meta/lib/oeqa/selftest/cases/externalsrc.py diff --git a/meta/lib/oeqa/selftest/cases/externalsrc.py b/meta/lib/oeqa/selftest/cases/externalsrc.py new file mode 100644 index 0000000000..1d800dc82c --- /dev/null +++ b/meta/lib/oeqa/selftest/cases/externalsrc.py @@ -0,0 +1,44 @@ +# +# Copyright OpenEmbedded Contributors +# +# SPDX-License-Identifier: MIT +# + +import os +import shutil +import tempfile + +from oeqa.selftest.case import OESelftestTestCase +from oeqa.utils.commands import get_bb_var, runCmd + +class ExternalSrc(OESelftestTestCase): + # test that srctree_hash_files does not crash + # we should be actually checking do_compile[file-checksums] but oeqa currently does not support it + # so we check only that a recipe with externalsrc can be parsed + def test_externalsrc_srctree_hash_files(self): + test_recipe = "git-submodule-test" + git_url = "git://git.yoctoproject.org/git-submodule-test" + externalsrc_dir = tempfile.TemporaryDirectory(prefix="externalsrc").name + + self.write_config( + """ +INHERIT += "externalsrc" +EXTERNALSRC:pn-%s = "%s" +""" % (test_recipe, externalsrc_dir) + ) + + # test with git without submodules + runCmd('git clone %s %s' % (git_url, externalsrc_dir)) + os.unlink(externalsrc_dir + "/.gitmodules") + open(".gitmodules", 'w').close() # local file .gitmodules in cwd should not affect externalsrc parsing + self.assertEqual(get_bb_var("S", test_recipe), externalsrc_dir, msg = "S does not equal to EXTERNALSRC") + os.unlink(".gitmodules") + + # test with git with submodules + runCmd('git checkout .gitmodules', cwd=externalsrc_dir) + runCmd('git submodule update --init --recursive', cwd=externalsrc_dir) + self.assertEqual(get_bb_var("S", test_recipe), externalsrc_dir, msg = "S does not equal to EXTERNALSRC") + + # test without git + shutil.rmtree(os.path.join(externalsrc_dir, ".git")) + self.assertEqual(get_bb_var("S", test_recipe), externalsrc_dir, msg = "S does not equal to EXTERNALSRC") From patchwork Sun Dec 18 16:12:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16899 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 8A866C4708E for ; Sun, 18 Dec 2022 16:13:49 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web10.32107.1671380007449700902 for ; Sun, 18 Dec 2022 08:13:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=kv9XjbGe; spf=softfail (domain: sakoman.com, ip: 209.85.216.50, mailfrom: steve@sakoman.com) Received: by mail-pj1-f50.google.com with SMTP id t11-20020a17090a024b00b0021932afece4so10719961pje.5 for ; Sun, 18 Dec 2022 08:13:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=oPbG6El2UBo6Z7Nf4YQOoSSBZXuUF9oRLLtJboaiEpM=; b=kv9XjbGeJBUkKoyH+IwrN48dfM/7XgvODu8h6T9adXNguQGRunCdn8yQkI2VMjxcJz SEa2AJn5644FTHakZQaJQEw0ov6dmtLGLg3Sc92Q1utOeZmaEseIuTiq9LghkIKZVJQV OEHSkSNyNwp0Qohmn3f5WyfTyxV6fq/sh9xbRlO07SFn4PhmwdreElnAx6LZqyFzjPyC 2VMtAW7A7ymCAJvXWsfxMZXxVKp6TiyMGpZrk8aY5q2yFGAeUtrWNRLKro3kFzcdvdGF ut8PC8cXYbWU9opjFRwSJhW5MuaRiEmblRViuOHzf//0ENKkM8SIs1naUog5wqX9d8h9 atEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=oPbG6El2UBo6Z7Nf4YQOoSSBZXuUF9oRLLtJboaiEpM=; b=GY55CGVacL3zfDNrCd1SjiSZHtDEsIApuoZRdZckm55CAgDIzPfSLgN6RgjR0FmAhm RWUOuSb5fTG+pFGiqz2Dlt/gAkmZKsp0ZYshbAbKohTPPkvUDjEUXeBfnArXBXNxHkuO GGamOimirHLoVtUjgSOHUoPFfCWItRC8YI5RmS1j3i45wVjRYqIqmAmn2OxO5ub0CGpw wJmQMtwl8FsZ0gj09R5XfPxW7YY3lraD/qKbHtUT6mSFknJQcNRkehbRYF81DnY9gRQt 1ZicThZ64VdPNs+jsU3o/FoNhDSk5KwmC7QMYRKwarK/ktMwfYX6wmnn/B0t9U0LwXZF Ba1w== X-Gm-Message-State: ANoB5plEjliP70kYfqx1l/90sTYshOtBm+qTo2MZYOBFyTdvjcwU3nc0 l5WZAOn/IETSORTBaKsvZ31Ln3nLegX47ytOCgQ= X-Google-Smtp-Source: AA0mqf6OcoaXebtS41RNEQRqcdB2IwZxkTxPqAYf1Cq6eGk9mbUVVrIsnaYwaISTHX1wJN80/TtSbA== X-Received: by 2002:a17:902:f602:b0:187:4920:3a3c with SMTP id n2-20020a170902f60200b0018749203a3cmr42214117plg.33.1671380023300; Sun, 18 Dec 2022 08:13:43 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id c7-20020a170902d48700b001896522a23bsm5278763plg.39.2022.12.18.08.13.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Dec 2022 08:13:42 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 15/19] combo-layer: remove unused import Date: Sun, 18 Dec 2022 06:12:59 -1000 Message-Id: <240c7dcad2f2e25efa269618c3bd6c549289207e.1671379841.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 18 Dec 2022 16:13:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174802 From: Ross Burton Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit ebfab6c3034d41252d19c6e1a0ba79072aa51146) Signed-off-by: Steve Sakoman --- scripts/combo-layer | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/combo-layer b/scripts/combo-layer index 045de65642..c122f4b5e4 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -21,7 +21,6 @@ import re import copy import pipes import shutil -from collections import OrderedDict from string import Template from functools import reduce From patchwork Sun Dec 18 16:13:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16897 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 7E987C4708D for ; Sun, 18 Dec 2022 16:13:49 +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.web11.32486.1671380011180914411 for ; Sun, 18 Dec 2022 08:13:46 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=VQRISahr; spf=softfail (domain: sakoman.com, ip: 209.85.214.180, mailfrom: steve@sakoman.com) Received: by mail-pl1-f180.google.com with SMTP id 4so6880984plj.3 for ; Sun, 18 Dec 2022 08:13:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=QMO3yIlwJOjEklpYqcrnXlxur5eI2rkELwy2YrMJ9PM=; b=VQRISahrzG0LPmSSGzYj/bD43zm1QAu72l/X6fO7XBLEkHfdH8cFWhWkk2Hj8ibOiV i2HZ+u5+hKPG2cormF6hIwmqS+xu3xKwrs1j7cY3vOHp8nbHNjgoptnY01WtfSzFqaBE PwApmFpiBCPNFnOT1jk5Nt7TCd4JYQpKMn9fBMPoW2i9OdLuC6zs/851ThOMjPQLMEco lJ2/aQsvvp7peB/i2iiyLuYprrcFiXLFJkUOR0NzPOj0URL4Iqq0cD53lVOlAHRIP+v6 erLpEh2wZpUvo/hgaHXWdtToob5Ijn1nMEC2l2ZwyBalzdlciOEXZvxl5hktUnq+drFV iTQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=QMO3yIlwJOjEklpYqcrnXlxur5eI2rkELwy2YrMJ9PM=; b=YOSTwUMMAzEh/sy7mlCYMKQ3uZs2nXw2AxpGFaknmElXWSk3YZwLIkplgfxYigNDFp EVQzMPzfFQWLa/NFU/zWV/Lgg0K+Rdy7c9mWZqS8KBY96EfyUhBQsrvdfQDr8Ph5+c/y SjbH718gRq1jGTdAEXYinGYoIELvrOVUGQqb2ICDVLFJGaYvOrGWGJCIVCd25VCHybw2 kFkTJ0C6C0uub4y6U70klbj5SiM71wZWXkYr4mN6O0fZ7JkvIL81cRGvO8mrC0MrwlWX vwTiBwS1Vl1kAwFZ4x1uCl+RZMusGEguP0Jljv5S89mrLw1Je9RSCoq0e9IA8qnfoFlg KTLA== X-Gm-Message-State: ANoB5pmXGfvTJY/+i/+bpo76CmGViJjw2PZ0wrttumF2+rLu6mD7f13K K9J2Ws6ID4V+W5dzFrX8/IbfOgS/0k4Bxw1AQeM= X-Google-Smtp-Source: AA0mqf7gx6qYhFSqYnzeRTRg58QlrS9y0PijB1M5+/Tnw0wKII2al2RvhbcUX3aepG7tGmdw7Y9QCg== X-Received: by 2002:a17:902:e20c:b0:189:a934:ee33 with SMTP id u12-20020a170902e20c00b00189a934ee33mr35236388plb.58.1671380025232; Sun, 18 Dec 2022 08:13:45 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id c7-20020a170902d48700b001896522a23bsm5278763plg.39.2022.12.18.08.13.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Dec 2022 08:13:44 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 16/19] combo-layer: dont use bb.utils.rename Date: Sun, 18 Dec 2022 06:13:00 -1000 Message-Id: <87543ed6550f7e78b3ddcfed0ef088bea932ba57.1671379841.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 18 Dec 2022 16:13:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174803 From: Ross Burton Bitbake may not be configured, and bb isn't imported anyway. Instead just use os.rename(), and take the filename from the file object instead of duplicating logic. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 528f4fb3683d048537604e4562ea758968060d62) Signed-off-by: Steve Sakoman --- scripts/combo-layer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/combo-layer b/scripts/combo-layer index c122f4b5e4..e467f390c1 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -507,7 +507,7 @@ def check_patch(patchfile): f.close() if of: of.close() - bb.utils.rename(patchfile + '.tmp', patchfile) + os.rename(of.name, patchfile) def drop_to_shell(workdir=None): if not sys.stdin.isatty(): From patchwork Sun Dec 18 16:13:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16900 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 7E957C4167B for ; Sun, 18 Dec 2022 16:13:49 +0000 (UTC) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mx.groups.io with SMTP id smtpd.web10.32119.1671380028315478027 for ; Sun, 18 Dec 2022 08:13:48 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=zW09ZTbl; spf=softfail (domain: sakoman.com, ip: 209.85.216.42, mailfrom: steve@sakoman.com) Received: by mail-pj1-f42.google.com with SMTP id fa4-20020a17090af0c400b002198d1328a0so12354580pjb.0 for ; Sun, 18 Dec 2022 08:13:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=3KcD1dMWsiDajC8BK/vr3ezOCC8BWL15oMjGCa6+4IU=; b=zW09ZTblshR3Vkobv+4gNrelbyAYOa/pj0IdMv8jjqUl267senVbtiEGksbZaMIvVj SC9gbygo7Z+d/XEo0mFHrgVU3OJjHrQh1tBhHnQ95jhIpeKnONxVN7qhIW+KS7gc+YfR e7epKLV7bHpakGkHs3NMtXlKFoYw4nLkhN15SecWnRGFXkCRcb4e4PG07h+HpohdDBe0 5L66jg+5qxce7j8I+6coezFcLbEuqRfN1TSbjboYsyVYpkGUCK5jwJgnIeN9WpOyxcst 73KVmSeG9WNbJFbREd4TPj/J0xbya/CkbowG5mYHap94GU9bgfv5RjlFxxJgWeBpm0nt QCxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=3KcD1dMWsiDajC8BK/vr3ezOCC8BWL15oMjGCa6+4IU=; b=p8do2Ew1YaEJpAwrOOC1aRoeCTFIlrdYM0hG9iWGmK9PfNgVSGOCo9cCvvswaDzBRT P8XCVPiHhWtVljElPET02QOBAD94Z/IbrfY30mA69RucJNB2HHqGQi4ljdUjN+QwB7ia GwrATt5lUi8ZYXzuH+aqMRg/aF43J9YeBwTsgrt0Twr7080WhbwVfiEZKfrNhdehBCOe z6SSJsfGs25KkHf011pcmWMiY5QTuTA3jVX3sf2kuv5TFHjAE68IJyDPjANHfaBTi2Ru m/s2aa070XMOc8LoJ7aAppBOvNnasnqucTioZRv9FX+lxTsp4WfQWCQj8bYnERi5gbq+ 4rfw== X-Gm-Message-State: ANoB5pmz9wZRi7+DPYQSiSq4wQKJYtqwfefudKFBTjVS74GMwxnzWED6 XMMi+lDM8W8WSKit9Ij5RvVDEYkcJIXkJbMOj3g= X-Google-Smtp-Source: AA0mqf6X/mDZCL7vOKK3gDCwy/JSz8pIoPNuZhdvJq3BIvXlulzdFM2nqsrwyR7Tek6sIOfMPSZREg== X-Received: by 2002:a17:902:8ec1:b0:189:2276:30c5 with SMTP id x1-20020a1709028ec100b00189227630c5mr36171887plo.0.1671380027340; Sun, 18 Dec 2022 08:13:47 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id c7-20020a170902d48700b001896522a23bsm5278763plg.39.2022.12.18.08.13.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Dec 2022 08:13:46 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 17/19] combo-layer: add sync-revs command Date: Sun, 18 Dec 2022 06:13:01 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 18 Dec 2022 16:13:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174804 From: Ross Burton When starting to use combo-layer, or if someone else is using it too, the local last_revision may be incorrect. This command will forcibly update the last_revision config values to the latest SHA on the remote branch that is tracked. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 2bb5d12ecd1b0273983f7c05699f34dd64b11c25) Signed-off-by: Steve Sakoman --- scripts/combo-layer | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/scripts/combo-layer b/scripts/combo-layer index e467f390c1..7f2020fca7 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -191,6 +191,23 @@ def runcmd(cmd,destdir=None,printerr=True,out=None,env=None): logger.debug("output: %s" % output.replace(chr(0), '\\0')) return output +def action_sync_revs(conf, args): + """ + Update the last_revision config option for each repo with the latest + revision in the remote's branch. Useful if multiple people are using + combo-layer. + """ + repos = get_repos(conf, args[1:]) + + for name in repos: + repo = conf.repos[name] + ldir = repo['local_repo_dir'] + branch = repo.get('branch', "master") + runcmd("git fetch", ldir) + lastrev = runcmd('git rev-parse origin/%s' % branch, ldir).strip() + print("Updating %s to %s" % (name, lastrev)) + conf.update(name, "last_revision", lastrev) + def action_init(conf, args): """ Clone component repositories @@ -1301,6 +1318,7 @@ actions = { "update": action_update, "pull": action_pull, "splitpatch": action_splitpatch, + "sync-revs": action_sync_revs, } def main(): @@ -1311,10 +1329,11 @@ def main(): Create and update a combination layer repository from multiple component repositories. Action: - init initialise the combo layer repo - update [components] get patches from component repos and apply them to the combo repo - pull [components] just pull component repos only - splitpatch [commit] generate commit patch and split per component, default commit is HEAD""") + init initialise the combo layer repo + update [components] get patches from component repos and apply them to the combo repo + pull [components] just pull component repos only + sync-revs [components] update the config file's last_revision for each repository + splitpatch [commit] generate commit patch and split per component, default commit is HEAD""") parser.add_option("-c", "--conf", help = "specify the config file (conf/combo-layer.conf is the default).", action = "store", dest = "conffile", default = "conf/combo-layer.conf") From patchwork Sun Dec 18 16:13:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16903 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 7E104C10F1E for ; Sun, 18 Dec 2022 16:13:59 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mx.groups.io with SMTP id smtpd.web10.32120.1671380030474010780 for ; Sun, 18 Dec 2022 08:13:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=2vKwI/0n; spf=softfail (domain: sakoman.com, ip: 209.85.216.53, mailfrom: steve@sakoman.com) Received: by mail-pj1-f53.google.com with SMTP id o12so6876077pjo.4 for ; Sun, 18 Dec 2022 08:13:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=E1iIXzY9CdRSKSgVDQ9K+19DSuFnmnJrx/HFMd/6f2w=; b=2vKwI/0nOBPm3KgdZRFkfGZ/ii0OpvS05d5hh4nkWrzjT7IHLU0Gqt+GjrMO0Kx6gS GNZfAu2PGetZcRZP/dnkA3jXcogO7hO/KsP632sdr6suTqvo7M5diTZhA5KNnMalj+rD oJZUTRlTlPR4VkKzEzWnKzMo+bBlmfd8YZKn3cQnRiU9OJLc7021FyapYN8J/+MIimPG weHpDjpHbgVn5jANhPV5/hB5Ks0eo6JP9BTHRw1aTUS7WkjZy8nuonBZuq42lQhbjx3c N7hULp+q1UVVZRAoT6QSJMpnd+rnOW+cJVrNkA8OEvSPN1RTZE02ai6MslJCHNB6Eni5 MU7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=E1iIXzY9CdRSKSgVDQ9K+19DSuFnmnJrx/HFMd/6f2w=; b=dhjU+kVM+DIgrzyGITZtFMnrrwi2Zy3iwx/KXRXAwUH7xWPFnBW2XoVqx63jz6fn0X kzbPP0gGmjT+OocMHgd/ZB4iUe9wGXXeJJ2gLXirzH1P3mcbNfUeHmMVMxyaGeJnw/bI ehap0vlDHhcWCYwqkitoFiIyTRuhdnokCF9fSML4iGI2ed9ty81s4uEdHdC6nf4xXKYj s67CaHX5hKvLQA3JU0zlISmxhBhJXsx/wXDk/j/Sjyyju9IFJB5DTNU5Jeb2IcSZCyH6 qV5LNBLYbqZcN6HCkoQ8/JWczt8gNEUJ1srIzFAfD1R9Cnw0749RJQ/8DHAzGNeSlNfR b+3A== X-Gm-Message-State: AFqh2kq/cuEh8A+xB86aTh3JhxDi+Mcd1HH0GeqyIs+Y4S7LBmbWDqXr R/Qyj9ObiwLgS8Y01CRBIzbcPeaz4dddx4zfMdU= X-Google-Smtp-Source: AMrXdXueOVtIr7Vx9eWjz2kNdfUjM/8UTSzExO7vE49/9uPBVZtu+jno4FSRrebvp8gH/E5LXrdt/Q== X-Received: by 2002:a17:902:b591:b0:18f:aa25:46d with SMTP id a17-20020a170902b59100b0018faa25046dmr5887596pls.38.1671380029144; Sun, 18 Dec 2022 08:13:49 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id c7-20020a170902d48700b001896522a23bsm5278763plg.39.2022.12.18.08.13.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Dec 2022 08:13:48 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 18/19] yocto-check-layer: Allow OE-Core to be tested Date: Sun, 18 Dec 2022 06:13:02 -1000 Message-Id: <2d0641df27196ad029d95c52fb790122b2db3f9f.1671379841.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 18 Dec 2022 16:13:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174805 From: Richard Purdie For unknown reasons we've never seemingly run the check layer script against OE-Core itself. This isn't entirely straightforward as the core layer is a bit of a special case, we can't for example compare signatures against ourselve and we can't remove core from bblayers.conf. Core does have distro, machine and software components too, in the case of distro, our fallback default settings. Whilst the qemu machines could be split into a seperate layer directory, core wouldn't then parse at all standalone due to the lack of any machine so it seems a bit pointless to do that. These changes tweak the script to handle core's special cases, specifically to allow distro and machine directories and to account for the README placed a directory level higher than other layers. Signed-off-by: Richard Purdie Signed-off-by: Alexandre Belloni Signed-off-by: Steve Sakoman --- scripts/lib/checklayer/__init__.py | 11 ++++++++--- scripts/lib/checklayer/cases/bsp.py | 2 +- scripts/lib/checklayer/cases/common.py | 3 +++ scripts/lib/checklayer/cases/distro.py | 2 +- scripts/yocto-check-layer | 5 ++--- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/scripts/lib/checklayer/__init__.py b/scripts/lib/checklayer/__init__.py index aa946f3036..938805289e 100644 --- a/scripts/lib/checklayer/__init__.py +++ b/scripts/lib/checklayer/__init__.py @@ -16,6 +16,7 @@ class LayerType(Enum): BSP = 0 DISTRO = 1 SOFTWARE = 2 + CORE = 3 ERROR_NO_LAYER_CONF = 98 ERROR_BSP_DISTRO = 99 @@ -106,7 +107,13 @@ def _detect_layer(layer_path): if distros: is_distro = True - if is_bsp and is_distro: + layer['collections'] = _get_layer_collections(layer['path']) + + if layer_name == "meta" and "core" in layer['collections']: + layer['type'] = LayerType.CORE + layer['conf']['machines'] = machines + layer['conf']['distros'] = distros + elif is_bsp and is_distro: layer['type'] = LayerType.ERROR_BSP_DISTRO elif is_bsp: layer['type'] = LayerType.BSP @@ -117,8 +124,6 @@ def _detect_layer(layer_path): else: layer['type'] = LayerType.SOFTWARE - layer['collections'] = _get_layer_collections(layer['path']) - return layer def detect_layers(layer_directories, no_auto): diff --git a/scripts/lib/checklayer/cases/bsp.py b/scripts/lib/checklayer/cases/bsp.py index a80a5844da..b76163fb56 100644 --- a/scripts/lib/checklayer/cases/bsp.py +++ b/scripts/lib/checklayer/cases/bsp.py @@ -11,7 +11,7 @@ from checklayer.case import OECheckLayerTestCase class BSPCheckLayer(OECheckLayerTestCase): @classmethod def setUpClass(self): - if self.tc.layer['type'] != LayerType.BSP: + if self.tc.layer['type'] not in (LayerType.BSP, LayerType.CORE): raise unittest.SkipTest("BSPCheckLayer: Layer %s isn't BSP one." %\ self.tc.layer['name']) diff --git a/scripts/lib/checklayer/cases/common.py b/scripts/lib/checklayer/cases/common.py index 491a13953c..722d3cf638 100644 --- a/scripts/lib/checklayer/cases/common.py +++ b/scripts/lib/checklayer/cases/common.py @@ -12,6 +12,9 @@ from checklayer.case import OECheckLayerTestCase class CommonCheckLayer(OECheckLayerTestCase): def test_readme(self): + if self.tc.layer['type'] == LayerType.CORE: + raise unittest.SkipTest("Core layer's README is top level") + # The top-level README file may have a suffix (like README.rst or README.txt). readme_files = glob.glob(os.path.join(self.tc.layer['path'], '[Rr][Ee][Aa][Dd][Mm][Ee]*')) self.assertTrue(len(readme_files) > 0, diff --git a/scripts/lib/checklayer/cases/distro.py b/scripts/lib/checklayer/cases/distro.py index f0bee5493c..a35332451c 100644 --- a/scripts/lib/checklayer/cases/distro.py +++ b/scripts/lib/checklayer/cases/distro.py @@ -11,7 +11,7 @@ from checklayer.case import OECheckLayerTestCase class DistroCheckLayer(OECheckLayerTestCase): @classmethod def setUpClass(self): - if self.tc.layer['type'] != LayerType.DISTRO: + if self.tc.layer['type'] not in (LayerType.DISTRO, LayerType.CORE): raise unittest.SkipTest("DistroCheckLayer: Layer %s isn't Distro one." %\ self.tc.layer['name']) diff --git a/scripts/yocto-check-layer b/scripts/yocto-check-layer index 0e5b75b1f7..67cc71950f 100755 --- a/scripts/yocto-check-layer +++ b/scripts/yocto-check-layer @@ -168,14 +168,13 @@ def main(): layers_tested = 0 for layer in layers: - if layer['type'] == LayerType.ERROR_NO_LAYER_CONF or \ - layer['type'] == LayerType.ERROR_BSP_DISTRO: + if layer['type'] in (LayerType.ERROR_NO_LAYER_CONF, LayerType.ERROR_BSP_DISTRO): continue # Reset to a clean backup copy for each run shutil.copyfile(bblayersconf + '.backup', bblayersconf) - if check_bblayers(bblayersconf, layer['path'], logger): + if layer['type'] not in (LayerType.CORE, ) and check_bblayers(bblayersconf, layer['path'], logger): logger.info("%s already in %s. To capture initial signatures, layer under test should not present " "in BBLAYERS. Please remove %s from BBLAYERS." % (layer['name'], bblayersconf, layer['name'])) results[layer['name']] = None From patchwork Sun Dec 18 16:13:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16902 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 79F7DC4332F for ; Sun, 18 Dec 2022 16:13:59 +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.32121.1671380032504987863 for ; Sun, 18 Dec 2022 08:13:52 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=z4UNhTDy; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id a9so6858556pld.7 for ; Sun, 18 Dec 2022 08:13:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=cq+YbvNerxAwNIdhgDRIMnynx5/ik04pD5s/JXQACfQ=; b=z4UNhTDyd73M55bAsTUv7+8VtGgKQUG7WXsVZw/hpvvyVBrFJsBQiDw9b5UhxXaZOB XMSlqijFvKYfh5JLKMFhmd9TvxU5IBUjTuOXL8T68wKWJyHLAmsThCgo0kD8iz+zTSBJ rIPrFaV/o605NbLVwtuM8TWRkMxYf8Y5XB47phmx8G+ANGXe60Qw9QIAo7xMUO1AgpCS 1hhn/pV3I49okjvRnElZBIdoP4JwlG/5uID9/fa/mGI3+Y2LAmCzquSe0lL3uxBsRD2W wXRlyPoBQc5CPFegASRsNzePlol3aQ36L+3uHQxhUNPfbcdh1JdKHKtEZluHBzp2/6Z6 XcgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=cq+YbvNerxAwNIdhgDRIMnynx5/ik04pD5s/JXQACfQ=; b=y0zg5tba2MBH2et81vlMbzg6CKagRSznc2Jw3vbwufTiMJe3WTIzNYf3GaPpSG72+Y tHEoZyU+kBlY5duAF1u6ReJGY5nu0EBY5thL6uCHqa7SEexH396ivZCMfe33l7iVm1hI GO14I5Wb+9QpB9WX7tZiIfez1jVw+9RUWibdQNnmmUxCbN1jNervUhimwbmgkPiLznaA m6dgXmU4QgrQaUPd2DGp9F7WI8KF15TjPWVJoA0sN1+uvZ1BF19hder6RnsEnWPRWahL 9KhyNFIvcRjgr6qy3g30skmfdGRKylWQWd6U0bNkdnEWv0Jtax11T+ng1CnB7RoDq55Y pq0w== X-Gm-Message-State: ANoB5pkkBPMSJeV7vCWYtDH1/tRJQjouA4gAgku1PgBB7GwHABok8tYV 9gDYSTeO9Fb1fCEYCcYdilxW1H0nm1Scl1dD40w= X-Google-Smtp-Source: AA0mqf5lvjLyTbt8bGkw9kw1+3u17XjW98XapMZUfTTvishlZepenykn/IUEL7Q4FLyjUQ2R+WxLaw== X-Received: by 2002:a05:6a20:6f06:b0:a2:bc99:ab98 with SMTP id gt6-20020a056a206f0600b000a2bc99ab98mr44349017pzb.28.1671380031524; Sun, 18 Dec 2022 08:13:51 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id c7-20020a170902d48700b001896522a23bsm5278763plg.39.2022.12.18.08.13.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Dec 2022 08:13:51 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 19/19] efibootmgr: update compilation with musl Date: Sun, 18 Dec 2022 06:13:03 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 18 Dec 2022 16:13:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174806 From: Marta Rybczynska Since the commit 005b6aba89eaf1b79fdd7565dd028fdd9bbfcc7d (efivar: add musl libc compatibility) efibootmgr compiles with musl too. Update the variable to take that into account. Signed-off-by: Marta Rybczynska Signed-off-by: Steve Sakoman --- meta/recipes-bsp/efibootmgr/efibootmgr_17.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb b/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb index 11d8b9061d..be6571b3fa 100644 --- a/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb +++ b/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb @@ -34,6 +34,4 @@ do_install () { } CLEANBROKEN = "1" -# https://github.com/rhboot/efivar/issues/202 -COMPATIBLE_HOST:libc-musl = 'null'