From patchwork Sun Jul 31 05:47:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 10812 X-Patchwork-Delegate: akuster808@gmail.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19FBBC3F6B0 for ; Sun, 31 Jul 2022 05:49:49 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web12.10885.1659246582604255999 for ; Sat, 30 Jul 2022 22:49:42 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=hBKqIjLu; spf=pass (domain: gmail.com, ip: 209.85.210.179, mailfrom: akuster808@gmail.com) Received: by mail-pf1-f179.google.com with SMTP id u133so1251420pfc.10 for ; Sat, 30 Jul 2022 22:49:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=+DF+lntxQd5sZfUJi9TPlzHNl26zgnuJRULrGD78w9I=; b=hBKqIjLuTzkZMVlL875Nsfi1dieOP2b+0exxuZmc/cfBCtO1yz89uvfqeO/9j9A3OA RKQIpT5XXUlF9Xm4e0NlbHof7xG5hOHTwgXUrYH4D/tya79oW6eCz006bBzP9lZKQEep c77wPoNuajz0LY0hvSbOF6EXodqqluX4WqFnyQc0djGpEAlDnD6mmKhfHRu63tTBoa1l H820V0LYdpXoy/9pGSZ2AMf2cnJzUQJTLQWvB63C405/QxaWm8hWEoiv2gdmBLOjXHKh Py7o+tb8eRR0Bqyx/vJhVWt/KVI/HMkW/gVBB0QhhqLCYmJuLmFvqI02dljdBNnwqWpA 8BgQ== 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:mime-version :content-transfer-encoding; bh=+DF+lntxQd5sZfUJi9TPlzHNl26zgnuJRULrGD78w9I=; b=dBOZu8y1XhuiGwM27Dh7g+f6Gk7Op8qgIpsERILHE1WMWURH90wu6UdbbL+YOkq5W1 FfQS4JStcGfr3w/TVUaU29V7xFNG1jR2Vmoor+MWTiK9JkRO/CAaMGNpvuFmBQqClqoa Sdbb2wNQoL4DkLlp2oYWgLGxTbNg7ffEZOTWh6AXUbt2ZDLrxqvYM8TasccAN56q7Q0h 7n/zjNTvHjKpbsHUtR1tA5Yoo8NsOjBXrclZaK/Gejrk0XC6/U1if6KlkqjcvU80bZXr 5+3Wg7OrWTreWpL82KDbKbIiMXBxHmLL7i3vro4NLzArd9OoXST41wKFwpH9UdpoC+OR uutQ== X-Gm-Message-State: ACgBeo3c11p8KIXXmULfxHKacqiWDglvyw3lJEn9H9Lc2jheE/z0jhqB NZz/NBqByIj890BvJ5hkfCSMNtH3ca8= X-Google-Smtp-Source: AA6agR7CKDAYrIglIsIeFHR84z/B/15CWY83bYV1KDwjnokgtNG+PKyA7pknIlUKI4WnDr/SJJyT1g== X-Received: by 2002:a05:6a02:11a:b0:41b:c11e:3993 with SMTP id bg26-20020a056a02011a00b0041bc11e3993mr4198508pgb.541.1659246581497; Sat, 30 Jul 2022 22:49:41 -0700 (PDT) Received: from keaua.hsd1.ca.comcast.net (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id az13-20020a17090b028d00b001f30b5bb378sm6039202pjb.15.2022.07.30.22.49.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Jul 2022 22:49:40 -0700 (PDT) From: Armin Kuster To: yocto@lists.yoctoproject.org Subject: [meta-security][PATCH 1/4] ibmtpm2tss: update version format Date: Sat, 30 Jul 2022 22:47:36 -0700 Message-Id: <20220731054739.2199164-1-akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 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, 31 Jul 2022 05:49:49 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/57703 Signed-off-by: Armin Kuster --- .../ibmtpm2tss/{ibmtpm2tss_1.6.0.bb => ibmtpm2tss_1661.bb} | 2 ++ 1 file changed, 2 insertions(+) rename meta-tpm/recipes-tpm2/ibmtpm2tss/{ibmtpm2tss_1.6.0.bb => ibmtpm2tss_1661.bb} (91%) diff --git a/meta-tpm/recipes-tpm2/ibmtpm2tss/ibmtpm2tss_1.6.0.bb b/meta-tpm/recipes-tpm2/ibmtpm2tss/ibmtpm2tss_1661.bb similarity index 91% rename from meta-tpm/recipes-tpm2/ibmtpm2tss/ibmtpm2tss_1.6.0.bb rename to meta-tpm/recipes-tpm2/ibmtpm2tss/ibmtpm2tss_1661.bb index e8a3710..2daca5a 100644 --- a/meta-tpm/recipes-tpm2/ibmtpm2tss/ibmtpm2tss_1.6.0.bb +++ b/meta-tpm/recipes-tpm2/ibmtpm2tss/ibmtpm2tss_1661.bb @@ -23,6 +23,8 @@ SRC_URI = "git://git.code.sf.net/p/ibmtpm20tss/tss;protocol=https;branch=master " UPSTREAM_CHECK_COMMITS = "1" +UPSTREAM_CHECK_URI = "https://git.code.sf.net/p/ibmswtpm2/tpm2" +UPSTREAM_CHECK_GITTAGREGEX = "rev.*)" EXTRA_OECONF = "--disable-tpm-1.2" From patchwork Sun Jul 31 05:47:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 10814 X-Patchwork-Delegate: akuster808@gmail.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2488DC19F2C for ; Sun, 31 Jul 2022 05:49:49 +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.10724.1659246583689221851 for ; Sat, 30 Jul 2022 22:49:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=XJR+YWYx; spf=pass (domain: gmail.com, ip: 209.85.216.45, mailfrom: akuster808@gmail.com) Received: by mail-pj1-f45.google.com with SMTP id o5-20020a17090a3d4500b001ef76490983so8886662pjf.2 for ; Sat, 30 Jul 2022 22:49:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=tWF3Clg8ZUae5aC+FfV0kwprAN/N0GYnXDno5pKP6ac=; b=XJR+YWYxTf9YsOpnVDk50Vis7wi0oEFtEDP9WVy9lVISfJw10OcP1+L5OW5R/5+IOV kN3Wq9pS9/h19sC/bfaM6w0fqKg0CSInoQ/9AjZ53u2xq9261vZPjJZ3QajlRX+FqqoB Gekbnq4OHIhIZwvVxH+0VHbpuuTPy+k4FF//7gPTT00fNX7fUeKLm9GKxy6qBFF3s3cK K0IMD+4aO5WAh6JCuUNBcr3cu5g57w8zJRjasVZM3wqFe+hmkpGVdbmGnPgqVynFbZvM bxif7zJTmq3DQvKayoXhf3cHavGJ2Z7jEfQPxtkmy+LIsTFqSHkJyMWe5Cj/LRJj3jg/ iaig== 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=tWF3Clg8ZUae5aC+FfV0kwprAN/N0GYnXDno5pKP6ac=; b=Y1ByWs+89ipyywNEJaMu1GG5vUmyGkAS+7RXz248cmMIV5Wtw3ACpgzjV/DVe6MNAV c5A9cLV1j5sKYAmwl6bNWpXOqYgR0zehOebhqbyDYt55ZRwLTpLFYca+O7E0EcHlCRxx +lOLAgUwL8NBoxl53qcy4sTG81IXOj5OX1+3Oi8KmzYc0bEtvTKgVE2if/Q4A1683Qig tI0n3m824OFmD7PVnQBSsOYx7+7vP2pn+Vm6NSAR9paYzPpd4ZfitumbpVyd4Nu1Mp+b dKsRbivpr4cy/RwcLYuTh+QzNtrtyKJO8VEwaoV3E4PuBrLNrnNzhipdkUoUpbMuo2R/ YmqQ== X-Gm-Message-State: ACgBeo30LWAu3voSYJuC7KzcY3CahlPJrFojRw+Bbyb+70pt8YXcr5eu RkDGKJxTm2Dm4wigvBHX6w6ONRhp4s8= X-Google-Smtp-Source: AA6agR5GkTcuGQgIpJnduBRTvFbH/SZWndNk8IeyfuhdorT3Gd8iLMJ7RRcxZCY2/o9uahjqQtzMxQ== X-Received: by 2002:a17:90b:4b8c:b0:1f4:d530:8898 with SMTP id lr12-20020a17090b4b8c00b001f4d5308898mr5874854pjb.38.1659246582626; Sat, 30 Jul 2022 22:49:42 -0700 (PDT) Received: from keaua.hsd1.ca.comcast.net (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id az13-20020a17090b028d00b001f30b5bb378sm6039202pjb.15.2022.07.30.22.49.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Jul 2022 22:49:42 -0700 (PDT) From: Armin Kuster To: yocto@lists.yoctoproject.org Subject: [meta-security][PATCH 2/4] ibmswtpm2: fix UPSTREAM_CHECK Date: Sat, 30 Jul 2022 22:47:37 -0700 Message-Id: <20220731054739.2199164-2-akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220731054739.2199164-1-akuster808@gmail.com> References: <20220731054739.2199164-1-akuster808@gmail.com> 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, 31 Jul 2022 05:49:49 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/57704 Signed-off-by: Armin Kuster --- meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1661.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1661.bb b/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1661.bb index 09b652d..c2cdf6a 100644 --- a/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1661.bb +++ b/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1661.bb @@ -21,7 +21,7 @@ SRC_URI = "https://sourceforge.net/projects/ibmswtpm2/files/ibmtpm${PV}.tar.gz \ SRC_URI[sha256sum] = "55145928ad2b24f34be6a0eacf9fb492e10e0ea919b8428c721fa970e85d6147" -UPSTREAM_CHECK_REGEX = "libtpm(?P).tar.gz" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/ibmswtpm2/files/" S = "${WORKDIR}/src" From patchwork Sun Jul 31 05:47:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 10813 X-Patchwork-Delegate: akuster808@gmail.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1AB06C48BEA for ; Sun, 31 Jul 2022 05:49: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.web12.10886.1659246584798998217 for ; Sat, 30 Jul 2022 22:49:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=B7aidyCS; spf=pass (domain: gmail.com, ip: 209.85.216.54, mailfrom: akuster808@gmail.com) Received: by mail-pj1-f54.google.com with SMTP id 15-20020a17090a098f00b001f305b453feso12101345pjo.1 for ; Sat, 30 Jul 2022 22:49:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=sGqXDGzQi6K52NcQTvBZBCb48IKJtZH4+dIPtkVqnqs=; b=B7aidyCSU+Qds2gGDRJWM4pklf9NArFGaOdy9jlj+pfbWWnECMYSzMKnW0ajAB0ZvJ PYQSsOovdsDZmv9KS7dNXxKyXW31xVW+VyZRZyewCsxo9anOfhIYO/0FpS2UWgQP1j6F rW8SaEAcBv+fIxHKwJ7Yzlkg7aYJNjqO81QBIVTJp0hRNqgek/inOtcc/1NsW89ygUA8 aggLah5soaqumw7zSGCP4PPTYIOiAU3GWdC0DPTJIRvF/dyYLge2st8oGnWTxbi57FKE nRNJSZIqzoN/4/xcA/Szn0iaKBQG+NKycOtYYKO5W2DLXrK4sGap7MuJTnOqi73nyZPX +ZkA== 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=sGqXDGzQi6K52NcQTvBZBCb48IKJtZH4+dIPtkVqnqs=; b=xeOtdLKpFz9uGXC1NgDUhsUzlkzqeu8Fq6w58orTP3Sy5N4EL6hiA+BEemaj7XvyeJ 2AqI0B6MgUZcTn40TTQRerHN4EXDVHPajG5RefC5Q43lT3lxCG/A17H08ozYGgMQ1bCG yRZwLxc63i2ycJ/8UTtuJu7eSwsk2offw08l+jJZYqx0c8e7QNyEX2T8DmWykvlUHVIy 9Rs36bZtbwoAY//R3IOIz+PP2f31lOLIrxiapdgXxhP6VnM+Y+rEsDV9qrb4m4khqGuR CyLyXVI+ns04cMBwNsyybg8cVc4Jgg4xQ/yMVzxfwJR2qOcJtzx+orrho8UwppI7C2NA J+QA== X-Gm-Message-State: ACgBeo2F7wBD07m8H4kiSNkxgujQhoxwIfLhExpgY1GndSTJGApe6UiU 7lz0SZUHAG33BAyr2JiL99oc7DKTN/w= X-Google-Smtp-Source: AA6agR4clDEF7NpGNwTv0eau1G0Y+a3f6fm+e/4DG/yWsQEYz6Y5zfWmhAuPL/BKlmmqKLDXMnqVJg== X-Received: by 2002:a17:903:2c7:b0:16c:ebf6:db22 with SMTP id s7-20020a17090302c700b0016cebf6db22mr11100306plk.16.1659246583822; Sat, 30 Jul 2022 22:49:43 -0700 (PDT) Received: from keaua.hsd1.ca.comcast.net (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id az13-20020a17090b028d00b001f30b5bb378sm6039202pjb.15.2022.07.30.22.49.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Jul 2022 22:49:43 -0700 (PDT) From: Armin Kuster To: yocto@lists.yoctoproject.org Subject: [meta-security][PATCH 3/4] ibmswtpm2: update to 1682 Date: Sat, 30 Jul 2022 22:47:38 -0700 Message-Id: <20220731054739.2199164-3-akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220731054739.2199164-1-akuster808@gmail.com> References: <20220731054739.2199164-1-akuster808@gmail.com> 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, 31 Jul 2022 05:49:49 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/57705 fixes openssl 3.0 support Signed-off-by: Armin Kuster --- meta-tpm/recipes-tpm2/ibmswtpm2/files/tune-makefile.patch | 5 +++-- .../ibmswtpm2/{ibmswtpm2_1661.bb => ibmswtpm2_1682.bb} | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) rename meta-tpm/recipes-tpm2/ibmswtpm2/{ibmswtpm2_1661.bb => ibmswtpm2_1682.bb} (93%) diff --git a/meta-tpm/recipes-tpm2/ibmswtpm2/files/tune-makefile.patch b/meta-tpm/recipes-tpm2/ibmswtpm2/files/tune-makefile.patch index eebddb9..962bfc1 100644 --- a/meta-tpm/recipes-tpm2/ibmswtpm2/files/tune-makefile.patch +++ b/meta-tpm/recipes-tpm2/ibmswtpm2/files/tune-makefile.patch @@ -20,7 +20,7 @@ Index: src/makefile =================================================================== --- src.orig/makefile +++ src/makefile -@@ -38,12 +38,10 @@ +@@ -38,13 +38,11 @@ ################################################################################# @@ -29,12 +29,13 @@ Index: src/makefile CCFLAGS = -Wall \ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ -Werror -Wsign-compare \ + -Wno-deprecated-declarations \ - -c -ggdb -O0 \ + -c -ggdb -O \ -DTPM_POSIX \ -D_POSIX_ \ -DTPM_NUVOTON -@@ -79,11 +77,11 @@ +@@ -80,11 +78,11 @@ TcpServerPosix.o : $(HEADERS) .PRECIOUS: %.o tpm_server: $(OBJFILES) diff --git a/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1661.bb b/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1682.bb similarity index 93% rename from meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1661.bb rename to meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1682.bb index c2cdf6a..85fc7e0 100644 --- a/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1661.bb +++ b/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1682.bb @@ -18,8 +18,7 @@ DEPENDS = "openssl" SRC_URI = "https://sourceforge.net/projects/ibmswtpm2/files/ibmtpm${PV}.tar.gz \ file://tune-makefile.patch \ " - -SRC_URI[sha256sum] = "55145928ad2b24f34be6a0eacf9fb492e10e0ea919b8428c721fa970e85d6147" +SRC_URI[sha256sum] = "3cb642f871a17b23d50b046e5f95f449c2287415fc1e7aeb4bdbb8920dbcb38f" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/ibmswtpm2/files/" From patchwork Sun Jul 31 05:47:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 10815 X-Patchwork-Delegate: akuster808@gmail.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 195A2C00140 for ; Sun, 31 Jul 2022 05:49:49 +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.web08.10540.1659246586169844950 for ; Sat, 30 Jul 2022 22:49:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=d9ysj+11; spf=pass (domain: gmail.com, ip: 209.85.214.177, mailfrom: akuster808@gmail.com) Received: by mail-pl1-f177.google.com with SMTP id y15so7824502plp.10 for ; Sat, 30 Jul 2022 22:49:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=5liFDrxM+N649QKbqwAkgliNUpXVIeFXf19v4pwEtEI=; b=d9ysj+116szpsmx29R/KaBNLS6GJFxRd7WeeEFpLguV1FZthsj5JORy+r7UjxEWf5W mcOuE/ay2lUZEtVCEj2OByGzD/By+qHmB2hLgOAyeAmFyIehOmaGTXbY7CebH1sZh3EI YSScO3Ud57rEEiXabMQOTxN9VvbH3PPjbcKtoW269WgKBGbO+5SVMnNFNhDZuvyDoIdE 0fgaQmiI/uijdSwA+UoIHjTo8hirkMt5dgPnapwpHTVPKUSAod4ob8SHZQXWD9fnJxc8 2iPvp9oadVgwFqAQ7L2gz51OpcaBk6zmyelrTmuKyFJ0r2l1/Hm9cBIYyTkzt17F/TG3 7Lmw== 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=5liFDrxM+N649QKbqwAkgliNUpXVIeFXf19v4pwEtEI=; b=YmxuMAYltpW3NQlqkpHYPAF9smaJtmHddY70I5/QG1n6yJHLCI9fONzX04t4Tb0sDh ViYuOiZVLDDAhXk9nq/+58Gzhch/IQu5xRPjv3s1yr4XNLZjcsnSx7ppvo4KXCJq20Ff yZCm/h9vHqHghoNLpbz2E+Gw3Otsr7sdxz/WVSZeXepn0cW+bsJcHaEwF+6KS4swzj4y PdZ5NdP/63C0DFHRd6IQiKHt43Qnnfz+K0sCxPslkZC5wTaEY0wghRnJx3jU3UkLICjB UOJxo0O5FBiTT5swP0NVSsXAbx0bTj/5Gw41+GX03lIYV/uZlvt+cMAGmCFA+PBG7ApJ wtmw== X-Gm-Message-State: ACgBeo3+B3YgisOvUuRBTLJTZUvj11gqYBJFMGb5OzvQixVzwLpG9NjM YITIR/RdSylVHowvXBE0t6OBMFsw0ug= X-Google-Smtp-Source: AA6agR4Hbm0kGLKR36F0r7RrOfivpZeVmDhNXezNPwFu0+Sfe4mDoA53bZyGQjMfyYkFQn3/iFAqKQ== X-Received: by 2002:a17:90b:4f91:b0:1cd:3a73:3a5d with SMTP id qe17-20020a17090b4f9100b001cd3a733a5dmr12325271pjb.98.1659246585153; Sat, 30 Jul 2022 22:49:45 -0700 (PDT) Received: from keaua.hsd1.ca.comcast.net (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id az13-20020a17090b028d00b001f30b5bb378sm6039202pjb.15.2022.07.30.22.49.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Jul 2022 22:49:44 -0700 (PDT) From: Armin Kuster To: yocto@lists.yoctoproject.org Subject: [meta-security][PATCH 4/4] swtpm: update to 0.7.3 Date: Sat, 30 Jul 2022 22:47:39 -0700 Message-Id: <20220731054739.2199164-4-akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220731054739.2199164-1-akuster808@gmail.com> References: <20220731054739.2199164-1-akuster808@gmail.com> 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, 31 Jul 2022 05:49:49 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/57706 drop musl patch.Fix another way Signed-off-by: Armin Kuster --- .../recipes-tpm/swtpm/files/ioctl_h.patch | 22 ------------------- .../swtpm/{swtpm_0.7.1.bb => swtpm_0.7.3.bb} | 3 +-- 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 meta-tpm/recipes-tpm/swtpm/files/ioctl_h.patch rename meta-tpm/recipes-tpm/swtpm/{swtpm_0.7.1.bb => swtpm_0.7.3.bb} (95%) diff --git a/meta-tpm/recipes-tpm/swtpm/files/ioctl_h.patch b/meta-tpm/recipes-tpm/swtpm/files/ioctl_h.patch deleted file mode 100644 index d736bc6..0000000 --- a/meta-tpm/recipes-tpm/swtpm/files/ioctl_h.patch +++ /dev/null @@ -1,22 +0,0 @@ -tpm_ioctl: fix musl for missing ioctl - -tpm_ioctl.c: In function 'ioctl_to_cmd': -tpm_ioctl.c:86:26: error: '_IOC_NRSHIFT' undeclared (first use in this function) - return ((ioctlnum >> _IOC_NRSHIFT) & _IOC_NRMASK) + 1; - - -Upstream-status: -Signed-off-by: Armin Kuster - -Index: git/src/swtpm_ioctl/tpm_ioctl.c -=================================================================== ---- git.orig/src/swtpm_ioctl/tpm_ioctl.c -+++ git/src/swtpm_ioctl/tpm_ioctl.c -@@ -58,6 +58,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/meta-tpm/recipes-tpm/swtpm/swtpm_0.7.1.bb b/meta-tpm/recipes-tpm/swtpm/swtpm_0.7.3.bb similarity index 95% rename from meta-tpm/recipes-tpm/swtpm/swtpm_0.7.1.bb rename to meta-tpm/recipes-tpm/swtpm/swtpm_0.7.3.bb index 03899d8..55d83f9 100644 --- a/meta-tpm/recipes-tpm/swtpm/swtpm_0.7.1.bb +++ b/meta-tpm/recipes-tpm/swtpm/swtpm_0.7.3.bb @@ -6,9 +6,8 @@ SECTION = "apps" # expect-native, socat-native, coreutils-native and net-tools-native are reportedly only required for the tests DEPENDS = "libtasn1 coreutils-native expect-native socat-native glib-2.0 net-tools-native libtpm json-glib" -SRCREV = "92a7035f45d9b08aa7c6b8bd6fa4c6916ef07a9e" +SRCREV = "f2268eebb0d1adf89bad83fa4cf91e37b4e3fa53" SRC_URI = "git://github.com/stefanberger/swtpm.git;branch=stable-0.7-next;protocol=https \ - file://ioctl_h.patch \ " PE = "1"