From patchwork Sat Apr 16 19:14:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6743 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 DD054C636FC for ; Mon, 18 Apr 2022 14:25:58 +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.web12.21683.1650136492790467660 for ; Sat, 16 Apr 2022 12:14:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=C7+oVIDQ; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id v12so9522381plv.4 for ; Sat, 16 Apr 2022 12:14:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=7jECRAY97mIRcco6zbUwLMSDQpkJoUxLkVnhypviwlg=; b=C7+oVIDQaueaCwx3oLXVtkdqkV199cvH90+q3/nQl4WknrnUBWsA5eKiPBwh6HO6qB IszkK5AgREsVZ/gJxBnBLvjx9DsUePI3B39uXmHuOLAgiFH45NlkCebnmvFHUA5ZRVLZ cPpgcI5RQE4STokGP2k/iRP4eAvWY68Mdvr2DROwQhztqFPxXlFwje+W8kdF5AggaSd8 Z/JnL5wqIcafagRVWDcX7NWc1GOn8FdpQgbMk3J8cuKQFO3GYJQV9wjojM4QNwpNpNhy XfdrnuLu4xDksDxGxkBAx7ZyouqLuQNcvSfKbkbjnUS4+n8Uv27qX7dbo+Ctrwz2cvRs iUtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7jECRAY97mIRcco6zbUwLMSDQpkJoUxLkVnhypviwlg=; b=qYJ1rZ6fd7aIbiNSqEUJvpyBrh+dBCQmPGhktgiGwguGG4cvS35zv/8FvfMbzsaemr b9lWxv3Cp9P2vqYEElC49pK/c/6kzsc0rGZ0b+uTWO1+HQL5Gmu6npdDrvywzFydT71W exQfewyqTXalcjMeUpwz7XiILCU37q8QQXA495u9NdyHcx4cWunvgaPKzP0dBtqf4mB1 lhOAfbcjoEYOHnqok4w49Vl+FztDFCiLkV9qdRIKw9UNVLPhSo7DAmhzJqArbqIR0nHi vYzwcvcKkwG5Ei6pR8jpn7mUwTLhLSRSE3YWkCXy53/iph+72C9t4Rb7H2DdfKnk52kP zX+w== X-Gm-Message-State: AOAM533zYNLzI98R5cFAxvWyoECbQ3U2mAlDUdVmz3P7klBkJNGr+dW5 ps0ZFP2vHKBG77OJZufM7pOp9KXwqt6YuAFDi8I= X-Google-Smtp-Source: ABdhPJwlo+v5ecKp762fXldpMQGxWFb+Ji+3wDV+DBm8XCfxciCbRIz7oVFS54H0KwdS8VXT1ZBZMg== X-Received: by 2002:a17:902:e886:b0:158:cefc:c041 with SMTP id w6-20020a170902e88600b00158cefcc041mr4658224plg.51.1650136491706; Sat, 16 Apr 2022 12:14:51 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id h2-20020a62b402000000b0050a62e582e5sm430004pfn.37.2022.04.16.12.14.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Apr 2022 12:14:51 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 01/11] vim: Upgrade 8.2.4524 -> 8.2.4681 Date: Sat, 16 Apr 2022 09:14:19 -1000 Message-Id: <1c68d33f4742df9bcec7d1032dab61d676f86371.1650131192.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 ; Mon, 18 Apr 2022 14:25:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164547 From: Richard Purdie License change is a date in the license file only. This includes a fix for CVE-2022-0943. Signed-off-by: Richard Purdie Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 69bc2f37d6ca7fa4823237b45dd698b8debca0a9) Signed-off-by: Steve Sakoman --- meta/recipes-support/vim/vim.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index b3c471225e..5f01fc3bca 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -11,7 +11,7 @@ RSUGGESTS_${PN} = "diffutils" LICENSE = "vim" LIC_FILES_CHKSUM = "file://LICENSE;md5=6b30ea4fa660c483b619924bc709ef99 \ - file://runtime/doc/uganda.txt;md5=a3f193c20c6faff93c69185d5d070535" + file://runtime/doc/uganda.txt;md5=daf48235bb824c77fe8ae88d5f575f74" SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://disable_acl_header_check.patch \ @@ -21,8 +21,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://racefix.patch \ " -PV .= ".4524" -SRCREV = "d8f8629b1bf566e1dada7515e9b146c69e5d9757" +PV .= ".4681" +SRCREV = "15f74fab653a784548d5d966644926b47ba2cfa7" # Remove when 8.3 is out UPSTREAM_VERSION_UNKNOWN = "1" From patchwork Sat Apr 16 19:14:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6746 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 F25EBC636FE for ; Mon, 18 Apr 2022 14:25:58 +0000 (UTC) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by mx.groups.io with SMTP id smtpd.web10.22060.1650136494838317566 for ; Sat, 16 Apr 2022 12:14:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=or5M6Cly; spf=softfail (domain: sakoman.com, ip: 209.85.216.46, mailfrom: steve@sakoman.com) Received: by mail-pj1-f46.google.com with SMTP id 2so10044456pjw.2 for ; Sat, 16 Apr 2022 12:14:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=BWxV0WTVkWWC3igS4DKtR6VeFxB8T/VEVxV6c3kpa1c=; b=or5M6ClyG3dU/n1q2RODlijBCO7GGwgyfzmhcC6wdAH2EAxRBx+8y/CShO6mrdU//S hIocUvmodeW2T96u1pcjoDXLCsfkuB97PreKw7XRWt1EsclcyK0VIMwF0BL8U1lfn0zB 6Ghe4mi41tUY9XezGIx6vs0c6s2UUL+jWU8nxQgoakMBq9o+/2fZ6I3leN84PZiT10er +dGVA3kAmo347QaAS0kCMprTAVXqZxCRuKnl1TEmn9rQftuhoJLarGxzK5yWcXv9WxZL EMUeNdrij0zw1qV115DR66ed9LOe3wtkRmjUtdLcH2neRRx4wkr+QuYq9x/2AZsP6gFL E8gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BWxV0WTVkWWC3igS4DKtR6VeFxB8T/VEVxV6c3kpa1c=; b=rgD3FKBT4EjwlHAbsXs57IEjJtK2JKhUxQ3XtJVMT1w7Tdfc8zW+J5qlw/9K3C7hTx qT/W1dQeZxcoSg9OJduNvlWCSSdcWl01n5poJ9xhbfZ5/QHzNAJ/DenjqtJWHp6B0Fv0 FO9RoEFv5Sirw8FGCH1DBlcwFRG1ytuQgDJYkWg+xr4FtQf1NEIHHpGRzIxdfaBc+cGt ZaFydAXxE0z0F7viBLunCSqEn11JC7FvGgazZeT/s89Gn9aOu8UGiHRKBFkZyVabtlOp D6/tWJCkU8dSsYSs/Cl05J2Ot/pfOMQnBfKR+CRjj45ClR3MLT1fIzsevdkHJKmZ4NHD AmgA== X-Gm-Message-State: AOAM531esspV1q480XIxC5VoA74rmLgtxPGHiO1UiNZp2sR4UzJVZtlC ixWa65/FyajsqOupEhTiCr1v7+3sPnz620X/w6s= X-Google-Smtp-Source: ABdhPJy2NsWo2D6giP3dZeZ4UjVvTAgmvRngAQcxd4gCqL5V53WB61X2maNubmjPU5MzeA4VYOHIew== X-Received: by 2002:a17:902:9309:b0:156:983d:2193 with SMTP id bc9-20020a170902930900b00156983d2193mr4480034plb.158.1650136493866; Sat, 16 Apr 2022 12:14:53 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id h2-20020a62b402000000b0050a62e582e5sm430004pfn.37.2022.04.16.12.14.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Apr 2022 12:14:53 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 02/11] gzip: fix CVE-2022-1271 Date: Sat, 16 Apr 2022 09:14:20 -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 ; Mon, 18 Apr 2022 14:25:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164548 From: Ralph Siemsen zgrep applied to a crafted file name with two or more newlines can no longer overwrite an arbitrary, attacker-selected file. Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/gzip.git/commit/?id=dc9740df61e575e8c3148b7bd3c147a81ea00c7c] CVE: CVE-2022-1271 Signed-off-by: Ralph Siemsen Signed-off-by: Steve Sakoman --- .../gzip/gzip-1.10/CVE-2022-1271.patch | 45 +++++++++++++++++++ meta/recipes-extended/gzip/gzip_1.10.bb | 1 + 2 files changed, 46 insertions(+) create mode 100644 meta/recipes-extended/gzip/gzip-1.10/CVE-2022-1271.patch diff --git a/meta/recipes-extended/gzip/gzip-1.10/CVE-2022-1271.patch b/meta/recipes-extended/gzip/gzip-1.10/CVE-2022-1271.patch new file mode 100644 index 0000000000..046c95df47 --- /dev/null +++ b/meta/recipes-extended/gzip/gzip-1.10/CVE-2022-1271.patch @@ -0,0 +1,45 @@ +From 7073a366ee71639a1902eefb7500e14acb920f64 Mon Sep 17 00:00:00 2001 +From: Lasse Collin +Date: Mon, 4 Apr 2022 23:52:49 -0700 +Subject: [PATCH] zgrep: avoid exploit via multi-newline file names + +* zgrep.in: The issue with the old code is that with multiple +newlines, the N-command will read the second line of input, +then the s-commands will be skipped because it's not the end +of the file yet, then a new sed cycle starts and the pattern +space is printed and emptied. So only the last line or two get +escaped. This patch makes sed read all lines into the pattern +space and then do the escaping. + +This vulnerability was discovered by: +cleemy desu wayo working with Trend Micro Zero Day Initiative + +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/gzip.git/commit/?id=dc9740df61e575e8c3148b7bd3c147a81ea00c7c] +CVE: CVE-2022-1271 + +Signed-off-by: Ralph Siemsen +--- + zgrep.in | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/zgrep.in b/zgrep.in +index 3efdb52..d391291 100644 +--- a/zgrep.in ++++ b/zgrep.in +@@ -222,9 +222,13 @@ do + '* | *'&'* | *'\'* | *'|'*) + i=$(printf '%s\n' "$i" | + sed ' +- $!N +- $s/[&\|]/\\&/g +- $s/\n/\\n/g ++ :start ++ $!{ ++ N ++ b start ++ } ++ s/[&\|]/\\&/g ++ s/\n/\\n/g + ');; + esac + sed_script="s|^|$i:|" diff --git a/meta/recipes-extended/gzip/gzip_1.10.bb b/meta/recipes-extended/gzip/gzip_1.10.bb index 9778e687e1..c558c21f10 100644 --- a/meta/recipes-extended/gzip/gzip_1.10.bb +++ b/meta/recipes-extended/gzip/gzip_1.10.bb @@ -4,6 +4,7 @@ LICENSE = "GPLv3+" SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz \ file://run-ptest \ + file://CVE-2022-1271.patch \ " SRC_URI_append_class-target = " file://wrong-path-fix.patch" From patchwork Sat Apr 16 19:14:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6751 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 DCE9EC636FB for ; Mon, 18 Apr 2022 14:25:58 +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.web12.21684.1650136497324589629 for ; Sat, 16 Apr 2022 12:14:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=HW2wYNZJ; spf=softfail (domain: sakoman.com, ip: 209.85.216.50, mailfrom: steve@sakoman.com) Received: by mail-pj1-f50.google.com with SMTP id md4so10031240pjb.4 for ; Sat, 16 Apr 2022 12:14:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Wlw27wM5LS2mbjnkmwB2MfCKi2xNQNiJ8DRzIEdfMe0=; b=HW2wYNZJtN6tSEmix7rxEI0qvl2EXzb3ojZVDJS6qyO7yIvskmv+uXFfGPtOYc9UZM yC0juW5EikIpK6tVpoz/t85x9KLUOO/L4Nc7RGuX5WzaBmJIUFargPsqfP3Y7i4esU9s gUeSXRvBClb1/o7JVzBDwP7fdfnCUbGswlkkmHbWGL2STUmcpcP5sk0YBxy82iiqp2K0 naIk2zG+21CY4XVqBg7PKyNv5Gj2LfnVQU9SgwPdfZO/xCynpOYvl6ZWravh/vxpHm2f t/FyqMON1s/nkY+W4PvISvaxzVOLGmcl3nwDi83TuoW5X/+yLdxzdz7eXvkmx5zP67Vp 5+rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Wlw27wM5LS2mbjnkmwB2MfCKi2xNQNiJ8DRzIEdfMe0=; b=fBHdqHN6Ca4INtIbshGLVR4GQwzWclX2l7xVeFgUK3bv8ETNfWl9QuSEjZ7Dcl2J9x OWzk3ej2JdL1ohB+4eqAKIekalztc87r9BAWGyzxD3IcHJh6oU8s2Halnm7uZctymuJo sCq4L2/hcpRHy9nGVptcnb/n0V31nW47V3gLgntPeu4//rten7AJIM/2WA60dSLTVnbu vhKELRmR2TSnCVpKrOTJl5OusObZcxuif07svj2xAvLhWVHKCVaQzdAK1HGeAoQT+XXK 7x2rZ0lLAF9Il6dhA7cQ/VYhIQLZR65XZGm4zBq65mCA/eCZYzTGTPZqYlQEdWaXVA6D gEnA== X-Gm-Message-State: AOAM532btcdIgIpciEiWXymqUyvrjco5yJyMAOUPA1vA7NaXplAOKYEt h0EhlqBaeNwbN9ZDA9BCwAckyHlS6pPVw5mtjx0= X-Google-Smtp-Source: ABdhPJwKgnOsTHWD7RQtCma8aPKuot+pJARJzN+DCCjo450Wh1gj7YukySgoGxf+3NXZjZ2Lb4EWWA== X-Received: by 2002:a17:90b:4b45:b0:1d2:713b:637e with SMTP id mi5-20020a17090b4b4500b001d2713b637emr2342224pjb.38.1650136496103; Sat, 16 Apr 2022 12:14:56 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id h2-20020a62b402000000b0050a62e582e5sm430004pfn.37.2022.04.16.12.14.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Apr 2022 12:14:55 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 03/11] zlib: backport the fix for CVE-2018-25032 Date: Sat, 16 Apr 2022 09:14:21 -1000 Message-Id: <27385658aa552b287c4f8f4585f9c783db834123.1650131192.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 ; Mon, 18 Apr 2022 14:25:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164549 From: Ross Burton Signed-off-by: Ross Burton Signed-off-by: Steve Sakoman --- .../zlib/zlib/CVE-2018-25032.patch | 347 ++++++++++++++++++ meta/recipes-core/zlib/zlib_1.2.11.bb | 1 + 2 files changed, 348 insertions(+) create mode 100644 meta/recipes-core/zlib/zlib/CVE-2018-25032.patch diff --git a/meta/recipes-core/zlib/zlib/CVE-2018-25032.patch b/meta/recipes-core/zlib/zlib/CVE-2018-25032.patch new file mode 100644 index 0000000000..5cb6183641 --- /dev/null +++ b/meta/recipes-core/zlib/zlib/CVE-2018-25032.patch @@ -0,0 +1,347 @@ +CVE: CVE-2018-25032 +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 5c44459c3b28a9bd3283aaceab7c615f8020c531 Mon Sep 17 00:00:00 2001 +From: Mark Adler +Date: Tue, 17 Apr 2018 22:09:22 -0700 +Subject: [PATCH] Fix a bug that can crash deflate on some input when using + Z_FIXED. + +This bug was reported by Danilo Ramos of Eideticom, Inc. It has +lain in wait 13 years before being found! The bug was introduced +in zlib 1.2.2.2, with the addition of the Z_FIXED option. That +option forces the use of fixed Huffman codes. For rare inputs with +a large number of distant matches, the pending buffer into which +the compressed data is written can overwrite the distance symbol +table which it overlays. That results in corrupted output due to +invalid distances, and can result in out-of-bound accesses, +crashing the application. + +The fix here combines the distance buffer and literal/length +buffers into a single symbol buffer. Now three bytes of pending +buffer space are opened up for each literal or length/distance +pair consumed, instead of the previous two bytes. This assures +that the pending buffer cannot overwrite the symbol table, since +the maximum fixed code compressed length/distance is 31 bits, and +since there are four bytes of pending space for every three bytes +of symbol space. +--- + deflate.c | 74 ++++++++++++++++++++++++++++++++++++++++--------------- + deflate.h | 25 +++++++++---------- + trees.c | 50 +++++++++++-------------------------- + 3 files changed, 79 insertions(+), 70 deletions(-) + +diff --git a/deflate.c b/deflate.c +index 425babc00..19cba873a 100644 +--- a/deflate.c ++++ b/deflate.c +@@ -255,11 +255,6 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, + int wrap = 1; + static const char my_version[] = ZLIB_VERSION; + +- ushf *overlay; +- /* We overlay pending_buf and d_buf+l_buf. This works since the average +- * output size for (length,distance) codes is <= 24 bits. +- */ +- + if (version == Z_NULL || version[0] != my_version[0] || + stream_size != sizeof(z_stream)) { + return Z_VERSION_ERROR; +@@ -329,9 +324,47 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, + + s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */ + +- overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2); +- s->pending_buf = (uchf *) overlay; +- s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L); ++ /* We overlay pending_buf and sym_buf. This works since the average size ++ * for length/distance pairs over any compressed block is assured to be 31 ++ * bits or less. ++ * ++ * Analysis: The longest fixed codes are a length code of 8 bits plus 5 ++ * extra bits, for lengths 131 to 257. The longest fixed distance codes are ++ * 5 bits plus 13 extra bits, for distances 16385 to 32768. The longest ++ * possible fixed-codes length/distance pair is then 31 bits total. ++ * ++ * sym_buf starts one-fourth of the way into pending_buf. So there are ++ * three bytes in sym_buf for every four bytes in pending_buf. Each symbol ++ * in sym_buf is three bytes -- two for the distance and one for the ++ * literal/length. As each symbol is consumed, the pointer to the next ++ * sym_buf value to read moves forward three bytes. From that symbol, up to ++ * 31 bits are written to pending_buf. The closest the written pending_buf ++ * bits gets to the next sym_buf symbol to read is just before the last ++ * code is written. At that time, 31*(n-2) bits have been written, just ++ * after 24*(n-2) bits have been consumed from sym_buf. sym_buf starts at ++ * 8*n bits into pending_buf. (Note that the symbol buffer fills when n-1 ++ * symbols are written.) The closest the writing gets to what is unread is ++ * then n+14 bits. Here n is lit_bufsize, which is 16384 by default, and ++ * can range from 128 to 32768. ++ * ++ * Therefore, at a minimum, there are 142 bits of space between what is ++ * written and what is read in the overlain buffers, so the symbols cannot ++ * be overwritten by the compressed data. That space is actually 139 bits, ++ * due to the three-bit fixed-code block header. ++ * ++ * That covers the case where either Z_FIXED is specified, forcing fixed ++ * codes, or when the use of fixed codes is chosen, because that choice ++ * results in a smaller compressed block than dynamic codes. That latter ++ * condition then assures that the above analysis also covers all dynamic ++ * blocks. A dynamic-code block will only be chosen to be emitted if it has ++ * fewer bits than a fixed-code block would for the same set of symbols. ++ * Therefore its average symbol length is assured to be less than 31. So ++ * the compressed data for a dynamic block also cannot overwrite the ++ * symbols from which it is being constructed. ++ */ ++ ++ s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 4); ++ s->pending_buf_size = (ulg)s->lit_bufsize * 4; + + if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL || + s->pending_buf == Z_NULL) { +@@ -340,8 +373,12 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, + deflateEnd (strm); + return Z_MEM_ERROR; + } +- s->d_buf = overlay + s->lit_bufsize/sizeof(ush); +- s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize; ++ s->sym_buf = s->pending_buf + s->lit_bufsize; ++ s->sym_end = (s->lit_bufsize - 1) * 3; ++ /* We avoid equality with lit_bufsize*3 because of wraparound at 64K ++ * on 16 bit machines and because stored blocks are restricted to ++ * 64K-1 bytes. ++ */ + + s->level = level; + s->strategy = strategy; +@@ -552,7 +589,7 @@ int ZEXPORT deflatePrime (strm, bits, value) + + if (deflateStateCheck(strm)) return Z_STREAM_ERROR; + s = strm->state; +- if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3)) ++ if (s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3)) + return Z_BUF_ERROR; + do { + put = Buf_size - s->bi_valid; +@@ -1113,7 +1150,6 @@ int ZEXPORT deflateCopy (dest, source) + #else + deflate_state *ds; + deflate_state *ss; +- ushf *overlay; + + + if (deflateStateCheck(source) || dest == Z_NULL) { +@@ -1133,8 +1169,7 @@ int ZEXPORT deflateCopy (dest, source) + ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte)); + ds->prev = (Posf *) ZALLOC(dest, ds->w_size, sizeof(Pos)); + ds->head = (Posf *) ZALLOC(dest, ds->hash_size, sizeof(Pos)); +- overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2); +- ds->pending_buf = (uchf *) overlay; ++ ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, 4); + + if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL || + ds->pending_buf == Z_NULL) { +@@ -1148,8 +1183,7 @@ int ZEXPORT deflateCopy (dest, source) + zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size); + + ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf); +- ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush); +- ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize; ++ ds->sym_buf = ds->pending_buf + ds->lit_bufsize; + + ds->l_desc.dyn_tree = ds->dyn_ltree; + ds->d_desc.dyn_tree = ds->dyn_dtree; +@@ -1925,7 +1959,7 @@ local block_state deflate_fast(s, flush) + FLUSH_BLOCK(s, 1); + return finish_done; + } +- if (s->last_lit) ++ if (s->sym_next) + FLUSH_BLOCK(s, 0); + return block_done; + } +@@ -2056,7 +2090,7 @@ local block_state deflate_slow(s, flush) + FLUSH_BLOCK(s, 1); + return finish_done; + } +- if (s->last_lit) ++ if (s->sym_next) + FLUSH_BLOCK(s, 0); + return block_done; + } +@@ -2131,7 +2165,7 @@ local block_state deflate_rle(s, flush) + FLUSH_BLOCK(s, 1); + return finish_done; + } +- if (s->last_lit) ++ if (s->sym_next) + FLUSH_BLOCK(s, 0); + return block_done; + } +@@ -2170,7 +2204,7 @@ local block_state deflate_huff(s, flush) + FLUSH_BLOCK(s, 1); + return finish_done; + } +- if (s->last_lit) ++ if (s->sym_next) + FLUSH_BLOCK(s, 0); + return block_done; + } +diff --git a/deflate.h b/deflate.h +index 23ecdd312..d4cf1a98b 100644 +--- a/deflate.h ++++ b/deflate.h +@@ -217,7 +217,7 @@ typedef struct internal_state { + /* Depth of each subtree used as tie breaker for trees of equal frequency + */ + +- uchf *l_buf; /* buffer for literals or lengths */ ++ uchf *sym_buf; /* buffer for distances and literals/lengths */ + + uInt lit_bufsize; + /* Size of match buffer for literals/lengths. There are 4 reasons for +@@ -239,13 +239,8 @@ typedef struct internal_state { + * - I can't count above 4 + */ + +- uInt last_lit; /* running index in l_buf */ +- +- ushf *d_buf; +- /* Buffer for distances. To simplify the code, d_buf and l_buf have +- * the same number of elements. To use different lengths, an extra flag +- * array would be necessary. +- */ ++ uInt sym_next; /* running index in sym_buf */ ++ uInt sym_end; /* symbol table full when sym_next reaches this */ + + ulg opt_len; /* bit length of current block with optimal trees */ + ulg static_len; /* bit length of current block with static trees */ +@@ -325,20 +320,22 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf, + + # define _tr_tally_lit(s, c, flush) \ + { uch cc = (c); \ +- s->d_buf[s->last_lit] = 0; \ +- s->l_buf[s->last_lit++] = cc; \ ++ s->sym_buf[s->sym_next++] = 0; \ ++ s->sym_buf[s->sym_next++] = 0; \ ++ s->sym_buf[s->sym_next++] = cc; \ + s->dyn_ltree[cc].Freq++; \ +- flush = (s->last_lit == s->lit_bufsize-1); \ ++ flush = (s->sym_next == s->sym_end); \ + } + # define _tr_tally_dist(s, distance, length, flush) \ + { uch len = (uch)(length); \ + ush dist = (ush)(distance); \ +- s->d_buf[s->last_lit] = dist; \ +- s->l_buf[s->last_lit++] = len; \ ++ s->sym_buf[s->sym_next++] = dist; \ ++ s->sym_buf[s->sym_next++] = dist >> 8; \ ++ s->sym_buf[s->sym_next++] = len; \ + dist--; \ + s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \ + s->dyn_dtree[d_code(dist)].Freq++; \ +- flush = (s->last_lit == s->lit_bufsize-1); \ ++ flush = (s->sym_next == s->sym_end); \ + } + #else + # define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c) +diff --git a/trees.c b/trees.c +index 4f4a65011..decaeb7c3 100644 +--- a/trees.c ++++ b/trees.c +@@ -416,7 +416,7 @@ local void init_block(s) + + s->dyn_ltree[END_BLOCK].Freq = 1; + s->opt_len = s->static_len = 0L; +- s->last_lit = s->matches = 0; ++ s->sym_next = s->matches = 0; + } + + #define SMALLEST 1 +@@ -948,7 +948,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) + + Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ", + opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len, +- s->last_lit)); ++ s->sym_next / 3)); + + if (static_lenb <= opt_lenb) opt_lenb = static_lenb; + +@@ -1017,8 +1017,9 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc) + unsigned dist; /* distance of matched string */ + unsigned lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */ + { +- s->d_buf[s->last_lit] = (ush)dist; +- s->l_buf[s->last_lit++] = (uch)lc; ++ s->sym_buf[s->sym_next++] = dist; ++ s->sym_buf[s->sym_next++] = dist >> 8; ++ s->sym_buf[s->sym_next++] = lc; + if (dist == 0) { + /* lc is the unmatched char */ + s->dyn_ltree[lc].Freq++; +@@ -1033,30 +1034,7 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc) + s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++; + s->dyn_dtree[d_code(dist)].Freq++; + } +- +-#ifdef TRUNCATE_BLOCK +- /* Try to guess if it is profitable to stop the current block here */ +- if ((s->last_lit & 0x1fff) == 0 && s->level > 2) { +- /* Compute an upper bound for the compressed length */ +- ulg out_length = (ulg)s->last_lit*8L; +- ulg in_length = (ulg)((long)s->strstart - s->block_start); +- int dcode; +- for (dcode = 0; dcode < D_CODES; dcode++) { +- out_length += (ulg)s->dyn_dtree[dcode].Freq * +- (5L+extra_dbits[dcode]); +- } +- out_length >>= 3; +- Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ", +- s->last_lit, in_length, out_length, +- 100L - out_length*100L/in_length)); +- if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1; +- } +-#endif +- return (s->last_lit == s->lit_bufsize-1); +- /* We avoid equality with lit_bufsize because of wraparound at 64K +- * on 16 bit machines and because stored blocks are restricted to +- * 64K-1 bytes. +- */ ++ return (s->sym_next == s->sym_end); + } + + /* =========================================================================== +@@ -1069,13 +1047,14 @@ local void compress_block(s, ltree, dtree) + { + unsigned dist; /* distance of matched string */ + int lc; /* match length or unmatched char (if dist == 0) */ +- unsigned lx = 0; /* running index in l_buf */ ++ unsigned sx = 0; /* running index in sym_buf */ + unsigned code; /* the code to send */ + int extra; /* number of extra bits to send */ + +- if (s->last_lit != 0) do { +- dist = s->d_buf[lx]; +- lc = s->l_buf[lx++]; ++ if (s->sym_next != 0) do { ++ dist = s->sym_buf[sx++] & 0xff; ++ dist += (unsigned)(s->sym_buf[sx++] & 0xff) << 8; ++ lc = s->sym_buf[sx++]; + if (dist == 0) { + send_code(s, lc, ltree); /* send a literal byte */ + Tracecv(isgraph(lc), (stderr," '%c' ", lc)); +@@ -1100,11 +1079,10 @@ local void compress_block(s, ltree, dtree) + } + } /* literal or match pair ? */ + +- /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */ +- Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx, +- "pendingBuf overflow"); ++ /* Check that the overlay between pending_buf and sym_buf is ok: */ ++ Assert(s->pending < s->lit_bufsize + sx, "pendingBuf overflow"); + +- } while (lx < s->last_lit); ++ } while (sx < s->sym_next); + + send_code(s, END_BLOCK, ltree); + } diff --git a/meta/recipes-core/zlib/zlib_1.2.11.bb b/meta/recipes-core/zlib/zlib_1.2.11.bb index ef9431ae47..bc42cd64e9 100644 --- a/meta/recipes-core/zlib/zlib_1.2.11.bb +++ b/meta/recipes-core/zlib/zlib_1.2.11.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://zlib.h;beginline=6;endline=23;md5=5377232268e952e9ef6 SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/${BPN}/${PV}/${BPN}-${PV}.tar.xz \ file://ldflags-tests.patch \ + file://CVE-2018-25032.patch \ file://run-ptest \ " UPSTREAM_CHECK_URI = "http://zlib.net/" From patchwork Sat Apr 16 19:14:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6747 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 04D0DC63700 for ; Mon, 18 Apr 2022 14:25:59 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mx.groups.io with SMTP id smtpd.web09.21639.1650136499672871247 for ; Sat, 16 Apr 2022 12:14:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=DPIxiesY; spf=softfail (domain: sakoman.com, ip: 209.85.215.182, mailfrom: steve@sakoman.com) Received: by mail-pg1-f182.google.com with SMTP id k62so5862612pgd.2 for ; Sat, 16 Apr 2022 12:14:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ica1BFGeeMFK5BB1HNkuxuk7JLlB9xAcJvw1JA5XqSg=; b=DPIxiesYf0PdoDxfRl+VcpbAiYCJW6TThWoh3ftK5Oi472/yq/Gt1zhfQlhGGt5o0x fEEB0INdhgWQc5CZ35ZlnLK9IkrA/lfN9MBqXEhToZPpH4mIHQVVk3gM02LFISjT5weJ BOVn0TwKaOv8v/tHuTFZFe8Eqkt3Sgm70t1y9NUpqEukfcLxxfS4tdg2MgpzYzE6lYg0 qrRMHVRPuUsikhod6wReLYlt/Byi80iD2QjHNpewxRJFoJ+5zOLhbXfbm9420IajjCzH qml1a6qjPnkFZA0yaFJLGyCynIYjy7A1WfQmNnp8X4xQEwFALAydm3TQyFj0B/66U3Hd nJMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ica1BFGeeMFK5BB1HNkuxuk7JLlB9xAcJvw1JA5XqSg=; b=sSj5KEOsl6/qJ6KL/5lfGGDIhiQl9y7pytfSpMpiYKLAw+5ahY50YWCs01jIR3Oiqi FAjtjAo+D4m7pmALAqrfTUyBcolkGNr+xP4lh0MaQAgq96UbOMCKyHWSFNkbc7J/SC8C GActqTJxFXw0iqJqrWZ8z0HY/0WyZeeVWAovCse3VenWtZBwmhgvV5mqbyEVhcRkOW9g 7wnef/hPpOLHrG8RvW0Je8xZrmt7cNQ7l1iJXMtQztmRLFU/6CT22vTgbS6P7QzSepHO Ix7sMhPR6Dx460bKDmH3emjUNY6QVa3sj9eH6JuQea3O9+pLAO8rCLoXa11TZCJUJEVi vMMA== X-Gm-Message-State: AOAM53143VDdf5u49lyeZHHpQz7EAVUo88mGOeHl4nmQoIy/7g7PJplb ZAabWZLxKZOSvvfTog7McSuS8o2GwGxkKnTY19k= X-Google-Smtp-Source: ABdhPJzMIv6QVdNFFfXkTvrKm+rhd4vJE2rLbxM8SZae91ThDWIurIZR5wCvL2BiNGFWrI6jlltUvQ== X-Received: by 2002:aa7:96db:0:b0:506:1fcc:75a8 with SMTP id h27-20020aa796db000000b005061fcc75a8mr4624476pfq.12.1650136498321; Sat, 16 Apr 2022 12:14:58 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id h2-20020a62b402000000b0050a62e582e5sm430004pfn.37.2022.04.16.12.14.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Apr 2022 12:14:57 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 04/11] xz: fix CVE-2022-1271 Date: Sat, 16 Apr 2022 09:14:22 -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 ; Mon, 18 Apr 2022 14:25:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164550 From: Ralph Siemsen Malicious filenames can make xzgrep to write to arbitrary files or (with a GNU sed extension) lead to arbitrary code execution. Upstream-Status: Backport [https://tukaani.org/xz/xzgrep-ZDI-CAN-16587.patch] CVE: CVE-2022-1271 Signed-off-by: Ralph Siemsen Signed-off-by: Steve Sakoman --- .../xz/xz/CVE-2022-1271.patch | 96 +++++++++++++++++++ meta/recipes-extended/xz/xz_5.2.4.bb | 4 +- 2 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/xz/xz/CVE-2022-1271.patch diff --git a/meta/recipes-extended/xz/xz/CVE-2022-1271.patch b/meta/recipes-extended/xz/xz/CVE-2022-1271.patch new file mode 100644 index 0000000000..7841a534d3 --- /dev/null +++ b/meta/recipes-extended/xz/xz/CVE-2022-1271.patch @@ -0,0 +1,96 @@ +From 6bb2369742f9ff0451c245e8ca9b9dfac0cc88ba Mon Sep 17 00:00:00 2001 +From: Lasse Collin +Date: Tue, 29 Mar 2022 19:19:12 +0300 +Subject: [PATCH] xzgrep: Fix escaping of malicious filenames (ZDI-CAN-16587). + +Malicious filenames can make xzgrep to write to arbitrary files +or (with a GNU sed extension) lead to arbitrary code execution. + +xzgrep from XZ Utils versions up to and including 5.2.5 are +affected. 5.3.1alpha and 5.3.2alpha are affected as well. +This patch works for all of them. + +This bug was inherited from gzip's zgrep. gzip 1.12 includes +a fix for zgrep. + +The issue with the old sed script is that with multiple newlines, +the N-command will read the second line of input, then the +s-commands will be skipped because it's not the end of the +file yet, then a new sed cycle starts and the pattern space +is printed and emptied. So only the last line or two get escaped. + +One way to fix this would be to read all lines into the pattern +space first. However, the included fix is even simpler: All lines +except the last line get a backslash appended at the end. To ensure +that shell command substitution doesn't eat a possible trailing +newline, a colon is appended to the filename before escaping. +The colon is later used to separate the filename from the grep +output so it is fine to add it here instead of a few lines later. + +The old code also wasn't POSIX compliant as it used \n in the +replacement section of the s-command. Using \ is the +POSIX compatible method. + +LC_ALL=C was added to the two critical sed commands. POSIX sed +manual recommends it when using sed to manipulate pathnames +because in other locales invalid multibyte sequences might +cause issues with some sed implementations. In case of GNU sed, +these particular sed scripts wouldn't have such problems but some +other scripts could have, see: + + info '(sed)Locale Considerations' + +This vulnerability was discovered by: +cleemy desu wayo working with Trend Micro Zero Day Initiative + +Thanks to Jim Meyering and Paul Eggert discussing the different +ways to fix this and for coordinating the patch release schedule +with gzip. + +Upstream-Status: Backport [https://tukaani.org/xz/xzgrep-ZDI-CAN-16587.patch] +CVE: CVE-2022-1271 + +Signed-off-by: Ralph Siemsen +--- + src/scripts/xzgrep.in | 20 ++++++++++++-------- + 1 file changed, 12 insertions(+), 8 deletions(-) + +diff --git a/src/scripts/xzgrep.in b/src/scripts/xzgrep.in +index a1fd19c..da1e65b 100644 +--- a/src/scripts/xzgrep.in ++++ b/src/scripts/xzgrep.in +@@ -178,22 +178,26 @@ for i; do + { test $# -eq 1 || test $no_filename -eq 1; }; then + eval "$grep" + else ++ # Append a colon so that the last character will never be a newline ++ # which would otherwise get lost in shell command substitution. ++ i="$i:" ++ ++ # Escape & \ | and newlines only if such characters are present ++ # (speed optimization). + case $i in + (*' + '* | *'&'* | *'\'* | *'|'*) +- i=$(printf '%s\n' "$i" | +- sed ' +- $!N +- $s/[&\|]/\\&/g +- $s/\n/\\n/g +- ');; ++ i=$(printf '%s\n' "$i" | LC_ALL=C sed 's/[&\|]/\\&/g; $!s/$/\\/');; + esac +- sed_script="s|^|$i:|" ++ ++ # $i already ends with a colon so don't add it here. ++ sed_script="s|^|$i|" + + # Fail if grep or sed fails. + r=$( + exec 4>&1 +- (eval "$grep" 4>&-; echo $? >&4) 3>&- | sed "$sed_script" >&3 4>&- ++ (eval "$grep" 4>&-; echo $? >&4) 3>&- | ++ LC_ALL=C sed "$sed_script" >&3 4>&- + ) || r=2 + exit $r + fi >&3 5>&- diff --git a/meta/recipes-extended/xz/xz_5.2.4.bb b/meta/recipes-extended/xz/xz_5.2.4.bb index 67a6cbd569..6d80a4f2e9 100644 --- a/meta/recipes-extended/xz/xz_5.2.4.bb +++ b/meta/recipes-extended/xz/xz_5.2.4.bb @@ -23,7 +23,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=97d554a32881fee0aa283d96e47cb24a \ file://lib/getopt.c;endline=23;md5=2069b0ee710572c03bb3114e4532cd84 \ " -SRC_URI = "https://tukaani.org/xz/xz-${PV}.tar.gz" +SRC_URI = "https://tukaani.org/xz/xz-${PV}.tar.gz \ + file://CVE-2022-1271.patch \ + " SRC_URI[md5sum] = "5ace3264bdd00c65eeec2891346f65e6" SRC_URI[sha256sum] = "b512f3b726d3b37b6dc4c8570e137b9311e7552e8ccbab4d39d47ce5f4177145" UPSTREAM_CHECK_REGEX = "xz-(?P\d+(\.\d+)+)\.tar" From patchwork Sat Apr 16 19:14:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6744 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 004ECC636FF for ; Mon, 18 Apr 2022 14:25:59 +0000 (UTC) Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by mx.groups.io with SMTP id smtpd.web09.21640.1650136501123672050 for ; Sat, 16 Apr 2022 12:15:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=grjRhMEA; spf=softfail (domain: sakoman.com, ip: 209.85.215.178, mailfrom: steve@sakoman.com) Received: by mail-pg1-f178.google.com with SMTP id q19so11945592pgm.6 for ; Sat, 16 Apr 2022 12:15:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Y5DxtvoLagAj/AXW1g/EdP34GBYxQwJk2LT07r2nqGg=; b=grjRhMEAk8rgltJ3QeVobc91H3cZFvsFZjGQIeHfbJcAhLBp3RQ29bk6m4x0jTMxk3 T7PuYWVx4pTKB0GUqmjmKpLyKWcGUv8cUE2oYUWzaSoXkpziI+HyHnDcQXfXF7hOr1Kr VCDmgJesN5t2fTFQwaFRYNFZTFgDekfGG0iUq0Trhixcq2yKcPjKB0ODQB8QRAngUKQu sFBz+c4n1geAx2bOj8/zKiG2arbkLVPb0aqTtlcNITDvU1BsRPF4zueY0z8rxOT7HftW mwNtmi0qcF8jKGefAShjpSJvsPpv8HWt8/F0o88DxODikU4BAwttkTHJxkrlp3G0puMQ Ogcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Y5DxtvoLagAj/AXW1g/EdP34GBYxQwJk2LT07r2nqGg=; b=nqXlVIwJk+nQLIvhpeIBKrDDaKpv1VJ6eINmKCG9PpfLp02IjTLbqEmrRY3XatcwLQ 8WV1w8VMz3V1Rny5x1cPlbrO54M7okLCVbgQ5mY2dAgW2s3GQoac+wetA/juj2Grq0E9 08uqMeLxlLPdrcR49ttax8elCBnarLxbC/0Fc4v0inUT6HDUvN7krjMYRKsI9KkblGL+ Pa/nLH/bjBPoU9xL8iNljn6QqOWeAUtsSthb+7C8sD0XQtNFGCBOEFCxU9OlWfygXwLG 4pVLrPjtO/q7Bj4FwFDJqR9ceexMqOdv7mvXo6/YQ0TM7HxtNBmgM8syKO0Obrwh/mvf k7OA== X-Gm-Message-State: AOAM531nBDENws2C7PUvNbWhkzvhe3kVkqjtBBTeBD7wSYrOPzFowfCI a1HtluW5WmZUsK8q18VSqH9rk6ZtCWCv3/4CYaE= X-Google-Smtp-Source: ABdhPJxjn+MFT3xLiyOePrILlodUMINoohU+tPx3m5n0a+2E6MObDJB66xGBJ3fhVChiXm9GK4nSvA== X-Received: by 2002:aa7:9283:0:b0:505:fe1e:f6b with SMTP id j3-20020aa79283000000b00505fe1e0f6bmr4627205pfa.29.1650136500311; Sat, 16 Apr 2022 12:15:00 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id h2-20020a62b402000000b0050a62e582e5sm430004pfn.37.2022.04.16.12.14.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Apr 2022 12:14:59 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 05/11] git: Ignore CVE-2022-24975 Date: Sat, 16 Apr 2022 09:14:23 -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 ; Mon, 18 Apr 2022 14:25:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164551 From: Richard Purdie Everyone I've talked to doesn't see this as a major issue. The CVE asks for a documentation improvement on the --mirror option to git clone as deleted content could be leaked into a mirror. For OE's general users/use cases, we wouldn't build or ship docs so this wouldn't affect us. Signed-off-by: Richard Purdie (cherry picked from commit 5dfe2dd5482c9a446f8e722fe51903d205e6770d) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/git/git.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index a89dd42e8b..ffbae145cf 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc @@ -20,6 +20,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1" CVE_PRODUCT = "git-scm:git" +# This is about a manpage not mentioning --mirror may "leak" information +# in mirrored git repos. Most OE users wouldn't build the docs and +# we don't see this as a major issue for our general users/usecases. +CVE_CHECK_IGNORE += "CVE-2022-24975" + PACKAGECONFIG ??= "" PACKAGECONFIG[cvsserver] = "" PACKAGECONFIG[svn] = "" From patchwork Sat Apr 16 19:14:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6748 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 0E6E5C636FA for ; Mon, 18 Apr 2022 14:25:59 +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.web12.21687.1650136504260653609 for ; Sat, 16 Apr 2022 12:15:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=d/KfVvay; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id i24-20020a17090adc1800b001cd5529465aso9526935pjv.0 for ; Sat, 16 Apr 2022 12:15:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=UIOiC6kQAWSJoTB0wZ07OolBqYr5Xj0UlUlE1+ECyWw=; b=d/KfVvayiSvWW+/kJdR3ic4CzZBmsOajXtn4xcCQHnAhQOjY6QTfqWyjO6K24FEKCI ZWHMyWGC+vPsFC0mxXfzlxsUhn9juvtauQpFhxcv5q0q2R7JKKn0ixwYd+xuni6B2Dme 8G13WQt5XD/lxFfBfhgmQyi3HrnvA4KIQ+FypDMtcwf/5dWurIkWvPfGbiO+byU5gPsv 43K3uM/qq05oDlEiZ+LvLOaAOsizt2Y3ojckO94i1kasUKtpXYnjXOJDUM40J3Z3ixc3 JIJwc7ArQGsyqu9FtjUnBwfc1s5s0zXixfZzEn7y1Jxot7RzjfLDPND4rrY5US3uPfsY sbUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UIOiC6kQAWSJoTB0wZ07OolBqYr5Xj0UlUlE1+ECyWw=; b=aMrtimusbBr9zo/pMAEmbwERFU8OsU1pfrSCnm08EgiXgc03iXgfylBuxfOkdw81Xq fpLoP67xt4IB96ohT2Yy2C+Jq3puuLbWkcdEKGgR0uatr3IEu74XmeF3cSus3zlU32OX Gz6IGTu5KxqTyg5qzmKwESAorGKmsKUTpnw1WzTm9rJl+ELMQgUqH8A8AQsj+oGB/LGV I9mFtem6FS0KTWH4Nu+v3YRYy6k+h+TuTdvjVZigaFaTvOQzV8dqZHlXVNJObIqurPbu bQnASiddT/60mWSdsxO9vY0lD455nhgFxQOMh18qPJ7SmmuMdWWV7qx88ML7sjs/TzF6 8pag== X-Gm-Message-State: AOAM5310LdlocG2/P31ABxvi6njbaKVMpp1edYIGyM6jtmG9/wOoF6Io 86E/41zQhTAZofW7lE471SD4E54a/mkBraqPKsU= X-Google-Smtp-Source: ABdhPJzEAZz0jngH/9T0/uxS+ezUFov7Qt3NKI5NzB0EY2uMfCU9Dz3V1XcJLHvAuhcki5NwRYfsYQ== X-Received: by 2002:a17:902:ec8c:b0:154:2e86:dd51 with SMTP id x12-20020a170902ec8c00b001542e86dd51mr4478759plg.99.1650136502332; Sat, 16 Apr 2022 12:15:02 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id h2-20020a62b402000000b0050a62e582e5sm430004pfn.37.2022.04.16.12.15.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Apr 2022 12:15:01 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 06/11] pseudo: Add patch to workaround paths with crazy lengths Date: Sat, 16 Apr 2022 09:14:24 -1000 Message-Id: <5cac1e855e397b58c3c2b251a9794f3d480c8ad6.1650131192.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 ; Mon, 18 Apr 2022 14:25:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164552 From: Richard Purdie Update to a version of pseudo which includes a workaround for crazy long paths, as shown by the libfm failures from the libtool upgrade. Signed-off-by: Richard Purdie (cherry picked from commit 67dfa32d82b8862e6e543c37315f211aba3ec28b) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/pseudo/pseudo_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb index 1a5d230c69..35240f1616 100644 --- a/meta/recipes-devtools/pseudo/pseudo_git.bb +++ b/meta/recipes-devtools/pseudo/pseudo_git.bb @@ -13,7 +13,7 @@ SRC_URI:append:class-nativesdk = " \ file://older-glibc-symbols.patch" SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa" -SRCREV = "d34f2f6cedccf8488730001bcbde6bb7499f8814" +SRCREV = "df1d1321fb093283485c387e3c933d2d264e509c" S = "${WORKDIR}/git" PV = "1.9.0+git${SRCPV}" From patchwork Sat Apr 16 19:14:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6749 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 14A6AC63701 for ; Mon, 18 Apr 2022 14:25:59 +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.web09.21645.1650136505676758706 for ; Sat, 16 Apr 2022 12:15:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Lm1uAnEd; spf=softfail (domain: sakoman.com, ip: 209.85.216.45, mailfrom: steve@sakoman.com) Received: by mail-pj1-f45.google.com with SMTP id j8-20020a17090a060800b001cd4fb60dccso10874756pjj.2 for ; Sat, 16 Apr 2022 12:15:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=pOwL1f8UnJ94x9fgEvXKv1kx3wVcKsECC0wJltkqMYw=; b=Lm1uAnEdUz2D37EM61dv1LrlKaZURymxvDJ/+Ruyt8SziGmB0GV05ZVnFT25qbZtZU UcHrXRSzXqcWp+iERsPAnk9D66TO8t+VmUbbvINsnvt990zrxwY0RHjtwQe0Vrdog97B 268qdTBuCwxx0m9oD9FdX4zs71fDa+5BfxLseW3CzSOpgoGEDVDuXHdDl2KRzIf4AjdC Hs9qPl190JGD8Vk5MNx6Au+BX7BsXSv4nRQDs88O5eTaxJLj63RDHgHSz3vg5HtXIi+y PeOxGdq/rRqbBcAhBrgFB2V6NqBhgnObySIfscPnYYIIownXLfnh65pOb0T/A6YsJaR1 ktSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pOwL1f8UnJ94x9fgEvXKv1kx3wVcKsECC0wJltkqMYw=; b=71hs0M1qaTBq+77GaFT8C6Fa9uKGcut2M0Qr7tP+MHPnegPQubV87W0Cf//Jo2n0/M uacCFVXR3N3Btw0Iz4mkONyCsE6NeAay71D/3ixGlp/9CfIQCGGOxOKX9E7arIo9BwhF 6Lq4d3GtrMe80jfxnrdUCWqB2niSg29yZiloQRH6TK/Z4Ks2WlyYfdyZ/HyF30BjHzMw gUpQSxh9/8nWdr0jTvW04WkC+SnjKVJlsiCgalb294l50fF+DWY+TJ+cQQSJKj7G7D+w jdCkYwVdSPrT/eu9ZNhRBF4hi0EtSV6YP171IyFTfpNETTLw6gmjUhw9T5RIzz8+MHqO PGGQ== X-Gm-Message-State: AOAM533jSA1fTSmALs/sj1Z2vzR/Erqy0QRq058g66iLlHmfxaLfvRxQ DoHCGM5TEqFPBjEyhhH54lErJVC81D2zkzidmjY= X-Google-Smtp-Source: ABdhPJwcJqxjb2V8oj/mYmGIKoaWAj12TMWrmCdZE9abnoxqUDOQ02y9E9A3gb1aJ87/EBm7qg/mmA== X-Received: by 2002:a17:90a:b28c:b0:1ca:a055:12ac with SMTP id c12-20020a17090ab28c00b001caa05512acmr10387836pjr.215.1650136504826; Sat, 16 Apr 2022 12:15:04 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id h2-20020a62b402000000b0050a62e582e5sm430004pfn.37.2022.04.16.12.15.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Apr 2022 12:15:03 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 07/11] pseudo: Fix handling of absolute links Date: Sat, 16 Apr 2022 09:14:25 -1000 Message-Id: <4e79b3fa07d6b8d044f2fb21e691ff3683aee1ea.1650131192.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 ; Mon, 18 Apr 2022 14:25:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164553 From: Alexandre Belloni Update to a version of pseudo which has a fix for absolute links, evaluating them from the chroot path. Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 33147b89bc3c9e9bdd53a942a5551d8a1d06130c) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/pseudo/pseudo_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb index 35240f1616..b5da3f0e29 100644 --- a/meta/recipes-devtools/pseudo/pseudo_git.bb +++ b/meta/recipes-devtools/pseudo/pseudo_git.bb @@ -13,7 +13,7 @@ SRC_URI:append:class-nativesdk = " \ file://older-glibc-symbols.patch" SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa" -SRCREV = "df1d1321fb093283485c387e3c933d2d264e509c" +SRCREV = "2b4b88eb513335b0ece55fe51854693d9b20de35" S = "${WORKDIR}/git" PV = "1.9.0+git${SRCPV}" From patchwork Sat Apr 16 19:14:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6753 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 1A1ECC63702 for ; Mon, 18 Apr 2022 14:25:59 +0000 (UTC) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mx.groups.io with SMTP id smtpd.web12.21689.1650136507823067322 for ; Sat, 16 Apr 2022 12:15:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=RlyVhbrT; spf=softfail (domain: sakoman.com, ip: 209.85.215.171, mailfrom: steve@sakoman.com) Received: by mail-pg1-f171.google.com with SMTP id t4so11951824pgc.1 for ; Sat, 16 Apr 2022 12:15:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=KKPILMfSaettxrcdvjHl4HxdaSiZuHM42d21K3gOFp0=; b=RlyVhbrT3ohkIpwjpUUS8RNTIqc8MbtmTdmg1LdUdJsoaxHuQ6cRgcKDwSfQbCBQBg NW34ddqI31x4a/zg39oXpRVlm/mFRonxUU4Wg8cpvkYVVehFL9VZ44utbfVZlsEVjANy 6FQpXy6kTfdNb6cj68AHuGItT6pR7kgSoOUcrvs+bP5a0VlWLdvWIbbmNZFkyhE3uDv/ E0b9MJiMztlpEdIA8mra+tkGV5VyKmySlvu52KzyH0hsTa0qFOnMdY8tbE/TMGix4rF/ 69sO479pVZPA5gbSUrsk5qZgr4XCRsSp6DqvvYyukIGPNFdRkRLZ0+QcmuGwaCEhY1vw wuzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KKPILMfSaettxrcdvjHl4HxdaSiZuHM42d21K3gOFp0=; b=lxreFRIu8WMTCR9bgE6iU7T2dBUheUKip4lx9TLAHKCAhC4QSr3FUvzLoQE8LkZjXq nHuLc+6N6hLdslT2Tv2Eu5yspvSEwg4vtpEZdTFbZ13DMDe77hGI3HOtBNJ/HH5AJ+np GUZqMXK46UzD9BUah3bzjlIHPtb47mP6sYhMu5fxxipWNnvGh16VBlf/LKuh/F+YTcRq 5vbvB+oJAGdiAfpw5v3vBLrpMGDMZSED7bhB1NdpH5Xh5FI1Q+B1DWcToWOgTpEEQ+qa BmHCU8wk2aKsCYZPcIGktCazY9z6C+EPl7+SrMyQoLl6+IgKRrLpslCak+VpO7J3PfzP N0LQ== X-Gm-Message-State: AOAM532Cx5XijfvDh9m3jz0NzObyG0TdolwIMLGLQWPBDSHgvIr3zf5M DKtMXREnt938Hx7vLIaojYavx4QaNTYotEoFjtk= X-Google-Smtp-Source: ABdhPJyLgkjxxgDl5TidfsGfJRuAUZoIWlXv5PF8gbQ9sTJ76fiI9t13uK2RAIRB2RPLF/EpCixGJA== X-Received: by 2002:a63:5b0d:0:b0:39c:c393:7e7f with SMTP id p13-20020a635b0d000000b0039cc3937e7fmr4015080pgb.16.1650136506970; Sat, 16 Apr 2022 12:15:06 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id h2-20020a62b402000000b0050a62e582e5sm430004pfn.37.2022.04.16.12.15.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Apr 2022 12:15:06 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 08/11] license_image.bbclass: close package.manifest file Date: Sat, 16 Apr 2022 09:14:26 -1000 Message-Id: <3e88c663e65fbc1b2e77a8616af4371224ed0ca5.1650131192.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 ; Mon, 18 Apr 2022 14:25:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164554 From: Martin Jansa * fixes: NOTE: Executing write_package_manifest ... DEBUG: Executing python function write_package_manifest /OE/build/oe-core/openembedded-core/meta/classes/license_image.bbclass:23: ResourceWarning: unclosed file <_io.TextIOWrapper name='/OE/build/oe-core/tmp-glibc/deploy/licenses/core-image-minimal-qemux86-64/package.manifest' mode='w+' encoding='UTF-8'> 'w+').write(output) ResourceWarning: Enable tracemalloc to get the object allocation traceback DEBUG: Python function write_package_manifest finished [YOCTO #14772] Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie (cherry picked from commit b3114d5d438b7a63a276b4e825b62f3b1ebceed6) Signed-off-by: Steve Sakoman --- meta/classes/license_image.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/license_image.bbclass b/meta/classes/license_image.bbclass index 1396a95f47..9f3a0c3727 100644 --- a/meta/classes/license_image.bbclass +++ b/meta/classes/license_image.bbclass @@ -9,8 +9,8 @@ python write_package_manifest() { pkgs = image_list_installed_packages(d) output = format_pkg_list(pkgs) - open(os.path.join(license_image_dir, 'package.manifest'), - 'w+').write(output) + with open(os.path.join(license_image_dir, 'package.manifest'), "w+") as package_manifest: + package_manifest.write(output) } python license_create_manifest() { From patchwork Sat Apr 16 19:14:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6750 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 1D561C63703 for ; Mon, 18 Apr 2022 14:25:59 +0000 (UTC) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mx.groups.io with SMTP id smtpd.web12.21691.1650136510149266632 for ; Sat, 16 Apr 2022 12:15:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=lEEkEO0q; spf=softfail (domain: sakoman.com, ip: 209.85.215.174, mailfrom: steve@sakoman.com) Received: by mail-pg1-f174.google.com with SMTP id 125so11929999pgc.11 for ; Sat, 16 Apr 2022 12:15:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ljdgFxOtRM5rrvMBrVS3wfqb0jc0dz3EZJNETiSBQmY=; b=lEEkEO0qunJdqY565nlsYe/lnMovOAoQxoqoJPyL7qG86UeZXjIQ6m3ICwHPtFl+sc RVsy12d2CC9Ppb4pMrNdyPR7waoCDIDUXLaCqEFen7YI2rKljTKkLD61Z9pbSkepnVVX RDz3liVMBHjSzHXxfBO6VbLldjQTFG0WxhyONJkSXC9vtX5BbGZSaTmtq/ERmISa0nOe JaUti4cHTwPp2udUYBHKVHMLkdUlAdRkZhtPghw6NWNa0Ot0f7r9oTpOJxMPN/35L/A+ nwCaGcXy5S4825PqsYbUT+XVw/xcBm3mq1T12zHuulwPrsdHPPeqf+E+szBWQsylysJT fzog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ljdgFxOtRM5rrvMBrVS3wfqb0jc0dz3EZJNETiSBQmY=; b=na1fm9R4l/Uo0Rdg5bu2Jhub1M0RmCTD5y8lL+kNCdzm4ubEk9eJvRNK7L2duOFv9l GUZbqGd909R2M5ZEiYr7kw2hUEv886nzsyU2rSkPTZH59KXTF8y7x5toqfIWfSLwfxPW GThsk0XTKnO6GXSZ9bjj2wVk3FhB+Y6BYIKnkaV8eTGdnPWHiRde6EVLs15BDAIdhfmC GRffwazuZJj7HFWNoJ+6XeR/pMG+7Oyab9UYGhdH1IjPadHQ3gHNh7i65IfyUVPWMVzg +M1oVEUF1EY71oUzwcYhKGWAow2ED38BqjuQctpuH/I0SNbOOpGf6vEjK5jS+nUQp9MF Pauw== X-Gm-Message-State: AOAM53385DODwg+q6pbtkZ8OFTb/8Iy5didYietUpnHPJO8ZZXhnvP1g rwRFX9zkG7hDl9HM6lHSZczezfx5hzySq6DdCu4= X-Google-Smtp-Source: ABdhPJwZJ4K90N7IID7WE+4ubww0DmidxQE6x9FbiYJQSpGnbopSYxbPRAYrnVOc0ahIKIJkyGPxJw== X-Received: by 2002:a05:6a00:2403:b0:4fd:e84a:4563 with SMTP id z3-20020a056a00240300b004fde84a4563mr4701932pfh.60.1650136508945; Sat, 16 Apr 2022 12:15:08 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id h2-20020a62b402000000b0050a62e582e5sm430004pfn.37.2022.04.16.12.15.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Apr 2022 12:15:08 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 09/11] apt: add -fno-strict-aliasing to CXXFLAGS to fix SHA256 bug Date: Sat, 16 Apr 2022 09:14:27 -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 ; Mon, 18 Apr 2022 14:25:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164555 From: Ralph Siemsen Recently we've begun seeing issues with apt SHA256 generation/checking on some distros (fedora 35, alma 8). The version of apt in dunfell uses its own SHA256 code, not a standard library. Investigation reveals that the issue is related to -fstrict-aliasing enabled by -O2 optimization, so turn it off with -fno-strict-aliasing Signed-off-by: Ralph Siemsen Signed-off-by: Steve Sakoman --- meta/recipes-devtools/apt/apt.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-devtools/apt/apt.inc b/meta/recipes-devtools/apt/apt.inc index ba827848a7..251795eeca 100644 --- a/meta/recipes-devtools/apt/apt.inc +++ b/meta/recipes-devtools/apt/apt.inc @@ -37,5 +37,9 @@ do_configure_prepend() { rm -rf ${S}/buildlib/config.guess } +# there are code generation issues with some compilers in the SHA256 implementation +# turn off strict-aliasing to avoid these issues +CXXFLAGS:append = " -fno-strict-aliasing" + USERADD_PACKAGES = "${PN}" USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /nonexistent --shell /bin/false --user-group _apt" From patchwork Sat Apr 16 19:14:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6752 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 273A2C63704 for ; Mon, 18 Apr 2022 14:25:59 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web11.21838.1650136511988211921 for ; Sat, 16 Apr 2022 12:15:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=IS2K+gyn; spf=softfail (domain: sakoman.com, ip: 209.85.214.169, mailfrom: steve@sakoman.com) Received: by mail-pl1-f169.google.com with SMTP id v12so9522776plv.4 for ; Sat, 16 Apr 2022 12:15:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=YoPLADLpG1SpeRUV4MoyMGE6LFf0GADtmRf9eJG3NCw=; b=IS2K+gyniA4AfxOaL9IVFglg2KZ3Jh4HaDuKHLOLpkm9rEbmrbJ2pls8IWgtH1h/ar +ZeCBXHy7/DiFJuI8XxkXyU7K0Xkr2Pkrn8JnwTetnTgb+Z2Ks4G/UTgFWRUk8VWYBLV cxLRFcRvmauQ1OT7RcKHLo88C4ldY5ZzCG7wa/U7qfg5S2HPxnQkvQHhdX+/nAkSVZwk 4Eo0zI8eyOqqze1wRYOEw7pN7nXvSJwIicmhky7VvapoKLdiipOb0RP48LUnBfnYSyO4 dBUYZRYufdVUeT4uEfCutFWZPuftcrK0rRiDA682h08xKUAoMteR7ytPvfGxxlEwMiS2 VRmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YoPLADLpG1SpeRUV4MoyMGE6LFf0GADtmRf9eJG3NCw=; b=46m6PF69IC1n1PaXWL8lANpGk3/lR4h+SIR6Jy1LmRkabr92iWp0RShTuucvf55+xh BCa++Ovljim/rl40IkvxRqn6TAqT2qGC1H5YXmt9zU0vIL+d2BJntGKujaJjwAOGs6zt MiJ3lgOtR6VLtUqE4drLW2xtClesIJbvHAIVLvT1kqOtSKEB4WUNkdUL8hyIhszEAOji T96zfGeYqNLrM0jWe920yEpSSV2W8cE9j6FDT0gm+w+eI80ZSIFfdA26p7Vv5oRQ3BWX NenQfIwKHN/BMygdKtUxL9Z64qQ4qTbhktSHkjJXpXFL3aas2j3HyJsomVz9AmvbgP9I EsSQ== X-Gm-Message-State: AOAM531UGUw6GqPAKZcTBpJUMOl5YJCsK1Olma7sDoAmf84dQZ+lOYXE rJ7SJudnOTL/13x/gDF2XgxiQNDAkbU3WxqQD0k= X-Google-Smtp-Source: ABdhPJw8GzYjsLlA1yl2VPlvMEUHM6zb86ewkHodZ/zk6PAZ57HFjuaY3cSRy+1qyuT3KSwuXYWWXg== X-Received: by 2002:a17:902:8f94:b0:14f:d9b3:52c2 with SMTP id z20-20020a1709028f9400b0014fd9b352c2mr4363173plo.103.1650136511106; Sat, 16 Apr 2022 12:15:11 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id h2-20020a62b402000000b0050a62e582e5sm430004pfn.37.2022.04.16.12.15.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Apr 2022 12:15:10 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 10/11] metadata_scm.bbclass: Use immediate expansion for the METADATA_* variables Date: Sat, 16 Apr 2022 09:14:28 -1000 Message-Id: <6f4a6940b647ecc77f653c7605397be067d415f3.1650131192.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 ; Mon, 18 Apr 2022 14:25:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164556 From: Peter Kjellerstedt Define METADATA_BRANCH and METADATA_REVISION using immediate expansion. This avoids running `git rev-parse HEAD` multiple times during recipe parsing. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie (cherry picked from commit 34e1841ec14c545c73fbe03a9f946d43d65ab326) Signed-off-by: Steve Sakoman --- meta/classes/metadata_scm.bbclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/classes/metadata_scm.bbclass b/meta/classes/metadata_scm.bbclass index 2608a7ef7b..47cb969b8d 100644 --- a/meta/classes/metadata_scm.bbclass +++ b/meta/classes/metadata_scm.bbclass @@ -1,8 +1,3 @@ -METADATA_BRANCH ?= "${@base_detect_branch(d)}" -METADATA_BRANCH[vardepvalue] = "${METADATA_BRANCH}" -METADATA_REVISION ?= "${@base_detect_revision(d)}" -METADATA_REVISION[vardepvalue] = "${METADATA_REVISION}" - def base_detect_revision(d): path = base_get_scmbasepath(d) return base_get_metadata_git_revision(path, d) @@ -42,3 +37,8 @@ def base_get_metadata_git_revision(path, d): except bb.process.ExecutionError: rev = '' return rev.strip() + +METADATA_BRANCH := "${@base_detect_branch(d)}" +METADATA_BRANCH[vardepvalue] = "${METADATA_BRANCH}" +METADATA_REVISION := "${@base_detect_revision(d)}" +METADATA_REVISION[vardepvalue] = "${METADATA_REVISION}" From patchwork Sat Apr 16 19:14:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6754 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 2C6C0C63706 for ; Mon, 18 Apr 2022 14:25:59 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web12.21694.1650136514243805715 for ; Sat, 16 Apr 2022 12:15:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=PCgOS53z; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id y13so59127plg.2 for ; Sat, 16 Apr 2022 12:15:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=2BOIuEjbvcjy8I90jMraZMPy/7K9YY/mP2p85t77rOg=; b=PCgOS53zlmNwlEnhfAMhKkxo/1daMXqovnKQvlKeIIRUWsKJxoVvMil1fW5UODRYlp U8oG9YxkUtGDyVOm+k/6MXPL2JoixLLuM9o7Lqo7NgmKOZcPkifdI/6z1i8qHeX6ie67 eh299kl2SvUCqBCFK6XpUhoUyXjMHVSzSg+rhRAmtJvSCu3AfSBckfr172PgLGHVxfTA gQ4v/fzRPoRRRbM2hja1vRQ/r69fD3zwf5VccvstZfMJdQndVJj828HLq+6C1Ud1iTkq F2m20uYzwZP9t9tGqEasgFQAN/nvT2o0DE7J2cE49FqHaaGMsAR4LaETu3SPFxzmLY3u irVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2BOIuEjbvcjy8I90jMraZMPy/7K9YY/mP2p85t77rOg=; b=tXU8t45+QisO5rgTcJoYmU8GF26no4qO/Eh5fQsoWNrhoC6qHY6MXu9mUvm+0Ebs/9 QvwONui0WB7HCQeokJkaqT6i/y5SFZku2XgSz0uXPXNCaUQC1N8jxWWOB2uQW/G2iiDE OAqknVueH+WYL8D+833NuCHrgiUAR/SR/q+rOGF7Nclfrtv5xtuM9t7dcHusI3up4jFk sMZ5+f9llEv6STZGq4D+W1PcS7s0rk6YPTEvDC8GHQCqRZHv3Cux5aVSHN0+cKSFMl1o Vji218B7ia0TtGjK4jiN1C3TVbDj4j18Csq/+EUfEYLgDJmpJos6ieggFTlD8M5eWfI6 5lww== X-Gm-Message-State: AOAM532E2NpV90LkLIv7oU6wo6i5q2+6wLkKFQLiEuualSqPSI9Iy+me Efujh1aKR1djkwWZ0HxVvo40Ca5bIPNB9FOPrJA= X-Google-Smtp-Source: ABdhPJx1ppKouXz7Nf9gGbI5E7JIIPbXiI0QZnywub+qyfmzFeqgWiThUh9EvZ6q8syFpgboPrrjwg== X-Received: by 2002:a17:902:a714:b0:154:6dfe:bba9 with SMTP id w20-20020a170902a71400b001546dfebba9mr4536451plq.124.1650136513270; Sat, 16 Apr 2022 12:15:13 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id h2-20020a62b402000000b0050a62e582e5sm430004pfn.37.2022.04.16.12.15.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Apr 2022 12:15:12 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 11/11] libxshmfence: Correct LICENSE to HPND Date: Sat, 16 Apr 2022 09:14:29 -1000 Message-Id: <2919306cee24c79b8523a2108326db970c37f83a.1650131192.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 ; Mon, 18 Apr 2022 14:25:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164557 From: Richard Purdie The license in this code is listed as MIT and whilst it is compatible with and usable as MIT, it actually looks like HPND. Clarify the license field accordingly. (From OE-Core master rev: 922b645f443c33060a8990d32e6b7b62ea5497c3) Signed-off-by: Richard Purdie Signed-off-by: Robert Yang Signed-off-by: Steve Sakoman --- meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb | 2 +- meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb b/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb index 0cd0494da8..fd113b5ec5 100644 --- a/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb +++ b/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb @@ -2,7 +2,7 @@ SUMMARY = "Test recipe for recipeutils.patch_recipe()" require recipeutils-test.inc -LICENSE = "Proprietary" +LICENSE = "HPND" LIC_FILES_CHKSUM = "file://${WORKDIR}/somefile;md5=d41d8cd98f00b204e9800998ecf8427e" DEPENDS += "zlib" diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb index cc45696530..38cab99bbe 100644 --- a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb @@ -6,7 +6,7 @@ using file descriptor passing." require xorg-lib-common.inc -LICENSE = "MIT-style" +LICENSE = "HPND" LIC_FILES_CHKSUM = "file://COPYING;md5=47e508ca280fde97906eacb77892c3ac" DEPENDS += "virtual/libx11"