From patchwork Fri Feb 17 19:02:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Gotthard X-Patchwork-Id: 19704 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 17C67C636D7 for ; Fri, 17 Feb 2023 19:02:25 +0000 (UTC) Received: from APC01-PSA-obe.outbound.protection.outlook.com (APC01-PSA-obe.outbound.protection.outlook.com [40.107.255.74]) by mx.groups.io with SMTP id smtpd.web10.3068.1676660530367641099 for ; Fri, 17 Feb 2023 11:02:17 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@advantech.cz header.s=selector1 header.b=MIKqcfD1; spf=pass (domain: advantech.cz, ip: 40.107.255.74, mailfrom: petr.gotthard@advantech.cz) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K9MM7zZGKsPT92PgDSKbtuGuYpi8G0gglaXbPK6iP3L7QsJDo1F8hCD+EVPz3WzrNFbvUlCSJrdxtZ42nRPZNwiOvS+OcrQncvVob/d+1DjUQq0ZB6bcvcPt0idL1TOpnxjU6zTRpnLGG12asb+iNLI//sGc8cD1iUEaNv8cnwwfDh2xsHd2EvB9v7fDrBb0lSJexmly5IDTOOHHRlbrby+c8SpekmLn+Xs+d2uqFKGb1+mEGuz7I27u8OhysxWc/tOUtb1cMhACvigHlZlefvvaIjOT0ebBFGZ17HenvIea7ZFiIdVKmvJiAo3ql87EhjlhljkKnh8FBXGvOD16kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/LQwEq4+YGxI7TV700VRVSMrE7AdiAyQ57xdONgPU/g=; b=Uc8sB7uXwQyCTxyZXlJvDy8fXSs2oIvEmQ7+Km1TJVWzMT4snEhnynlFdWLBolLzOMpqAw8SzL43HPI8CA2M+RDH0FuEPJ2DwM8vnqalFBvRaE7DdL+xt+Yq1TjffV/DcxPzfUPKLuf/3cW9EPy/MnSoElpvd2CoQ6jmJAA3vKpPR3VJNdJsv4reFi/ACiXblZpMtZA7OZOuafKyVVr4+U89vb5m7uhEQgRHuf9NL0UVI1q7+8hDj/BRLTPBUXtViVNAAa86ZkuejecVHhxQcu+h1PpzHp8Bt/+87Lz0FRbGdE1hdzQjeW2cHb5k96BmzFqWAff05s3Qf7LUQ856IA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=advantech.cz; dmarc=pass action=none header.from=advantech.cz; dkim=pass header.d=advantech.cz; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=advantech.cz; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/LQwEq4+YGxI7TV700VRVSMrE7AdiAyQ57xdONgPU/g=; b=MIKqcfD1WFgRu3o2GntlHT9f96e50jEv1nSAZEmpzGNex4pPg5fuSiSnkeoIoA63k/5RfBcP2PItPpKbEdqMw7fzb7+H6GQY8Cp4X0Wn0oItMf17Ltt71yLUtysQ6l3hfBhyZ8TEk4seKnNDLGYzD1gTbGdbFzIcsY2aZff0eRPr+Ko3BYU+/DHfKhXzDGRQxDvSp3eHn1KWSH627wD2ZG6Y52ZReiefpDZGxGUrZX8hNtCCmRVnl9xKtj+gTDDE6GJebQjLwWBfFBp1omahK4aLm2yVcwtMYbyOf5/Cgx5Zfos88UI0ojcs7yavD3enHoiEdFE9N3BL4XaGRuMJ9A== Received: from TY2PR02MB3678.apcprd02.prod.outlook.com (2603:1096:404:b7::12) by PSAPR02MB5128.apcprd02.prod.outlook.com (2603:1096:301:8e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.17; Fri, 17 Feb 2023 19:02:05 +0000 Received: from TY2PR02MB3678.apcprd02.prod.outlook.com ([fe80::e2f4:d03b:1736:e417]) by TY2PR02MB3678.apcprd02.prod.outlook.com ([fe80::e2f4:d03b:1736:e417%7]) with mapi id 15.20.6111.013; Fri, 17 Feb 2023 19:02:05 +0000 From: Petr Gotthard To: "yocto@lists.yoctoproject.org" Subject: [meta-security][PATCH] tpm2-tss: upgrade 3.2.0 -> 4.0.1 Thread-Topic: [meta-security][PATCH] tpm2-tss: upgrade 3.2.0 -> 4.0.1 Thread-Index: AdlDAe8E5qn+5u8KQEKhiKEZ3CNQbg== Date: Fri, 17 Feb 2023 19:02:04 +0000 Message-ID: Accept-Language: en-US Content-Language: cs-CZ X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=advantech.cz; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: TY2PR02MB3678:EE_|PSAPR02MB5128:EE_ x-ms-office365-filtering-correlation-id: 8ff901ed-f739-4f14-66d6-08db1119758b x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ggvVAgbaqweW64a+G0OWFHLFDaV6CHxviqi1m6+eLg7bbKCJmPU4BSNUcKCiEMWurnCK8xHhP+Y2Rsv2hnPY0AohP5BUzlSvgqilZWhOcdmFPUzVwvHkJ1K4N1iostspJ5fC0GS3NgnnA8hShH0hZHoYP2XXykS5SoMWLYpv7JQ0nqvVNVVqU2i0/wr0YiQNrrAMuYBv7utxxeH9E+37sRvZ8NOywc+r2sN75p26HU2sZ3UW6J9Asi8qouD4f/V1+HoKKG29dWJnthaZqAMc07592lwWx4SRtdI8BnMOib4w3jJa16ig3azedbQXp1xHIFvm8ZHk4DgcLZUGaJjNIuKw0grALDWvYyQSDdafhMPzSQCd1hc8Tf9VUr/rFA/tJxVRKhczF6HLGCsx3F0ovpBBhwn3R3xiOS/QkAqxi9+OD59sPr8P1uV7JovOm3aU0OLKuiW6ydQxP8OxxHMN4WfwRHSxM10nW0q8maNYRNGMfOek72Nk8NuY3raeLMtIY0vzzN0wVmxcJZlmZ5GycS6eN143ra2KnGwGmumm7KefTTp/dIUBXdG/2WkRIerzZC1yXUiKYeylaHNXYmMyAqkxJD6Zx1gwPIMRr98vv3W7fNH0fRzWLQ573b8W08rZM3he2psGFTdH2hmj5CTy0XujfFLay5As85BrQpOvOa6TPHvoj73DgwDBgdcHn/3e x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TY2PR02MB3678.apcprd02.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(4636009)(376002)(366004)(39860400002)(136003)(396003)(346002)(451199018)(186003)(26005)(9686003)(316002)(5660300002)(38070700005)(122000001)(86362001)(55016003)(478600001)(44832011)(38100700002)(41300700001)(6916009)(76116006)(66946007)(64756008)(66556008)(8676002)(66476007)(66446008)(52536014)(33656002)(8936002)(6506007)(71200400001)(83380400001)(2906002)(966005)(7696005)(84970400001);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?jQ1VgGvCnMgbkVF47sQYvaiA7FSD?= =?utf-8?q?naLkI+mk2vkDqyQ0BYCHD3VVcqJYUJJ8M0P+SX/x3YQFfzREhu9zW9AYR/xYHo9sv?= =?utf-8?q?o+H4uryE3oRvBzjyvPMUfAUJQHf9DtrijDWCXqxQLQbooqALmS4IRTNTMPiO8V+MU?= =?utf-8?q?HwDeqBZ9R1ZjtPXGj+om9oFei42usHSOEluPQiYwQS7qINdc/BcejYJDzVQQoLE/+?= =?utf-8?q?ZzLLueV/BtQr+cmVQc9Nq9D7kXJVgs2hTNrCvA3rWsEyJnKOCjh7MVD2UY+eE8mlg?= =?utf-8?q?qxccNEs/D37VAa+SD8NbmCj20wfhNUEALSzvZQnUR/EjOtueKf0PTlYFXJix6ZwR/?= =?utf-8?q?RDD0TBUy+m5sZsWwIC6jM0G2Nzk1IIrtiguQV/jiOg17xOFXuMCH+24qsUzzMz13E?= =?utf-8?q?E5tOojQQFMF7ViFxgZ1j7ht1BIGWyCxIG1+aCBfaG+NY3vvclX52I9XdjOuxmnnsa?= =?utf-8?q?KUGf0slLnF4AZMEGm1g8HHKquz+Bt1yGIzXTH/4tqHn8PX+kIZP0SAga7F7QF/afu?= =?utf-8?q?++rPj3CP4Lz/ThYsKrMB5r7XAl2poDpY6JWo81CeSF3n5YsVnvkv5Vn5d+AtP0uEY?= =?utf-8?q?FhMgxvkT9eCAGLS1CtPBaLUy2dZo02kaJQV+KrXDkRWsvGEF3V4eT2Sba60vzN8cn?= =?utf-8?q?hVR4jKAhpnYzMCmks7F4hocdeC7uWe6cWlBQR9FU5yCQnZJzBYIFQN9sGu6mL4JZj?= =?utf-8?q?fhfcXe5+/eqO4LmOTCG16050PbKqbXZIHZVnlvOTSD6YhnFpdkXO3dkAqAUFbOMED?= =?utf-8?q?bNfnMXaW6liNY+vN+etuLJgsub5Bx7WINfMqtTrX/iZB5W0CwA/77EBc6cS0uw8P/?= =?utf-8?q?uuDjR8i2sHwcGSVG43n47J4iiKJJH/bqMaKGgSb4eYpvhU9G61gg8i08pzp7HgH4Q?= =?utf-8?q?ZSdrgrh0cmw2WsE4bd1nZnfWCV5vY6CoPvT7ybIW9IsDur6pQ1fgmQS+viPUNjLJj?= =?utf-8?q?Nj6akrivD8swWn36e/PJxUHku5623fBZkTpB1j8whSWv88zzEQwxIC6T/hDLXwpg1?= =?utf-8?q?2nb+i8J59W4/Y4g6fpFYklZlWGKoFtW27ThEmP96BU4/0oVhU2I6Si0BpZAJV8qmy?= =?utf-8?q?qeBiJNAp9xRr7c23R27wRRlGYJNi3f4c1LejgW/f9hIQoGkcvncaMiQk1zHzp/rkV?= =?utf-8?q?TuA/KjLPpgrWfTHiMw39lBM5KFIfBzmdra/RchnmxRbKnoKYFxsnr+H/HP1pOp4Qg?= =?utf-8?q?IlrMDiuIFPz97DW6xV8mxEhsD62yuhRkngB9KdBMAP1XthFh8LWSCu+W5ge8agAm3?= =?utf-8?q?3FTPS/+c5VR73BP6nOJn9OQduJJ2wriNWgzWIBabUh0zwrGj//QT7E/j7usU33Pqs?= =?utf-8?q?x8GZ62mQ8huD+fgzwLSpxFi0JXltV6ytcq3nvtW+lmcGaHlwF5Jf3/qucdDf2mH5S?= =?utf-8?q?1Cqbn59NL+rD89NA+kdmNlgslnH3WW2bvzTEmfYuTYU2khDtmboQxcKr8lCEf3TQq?= =?utf-8?q?gUsU4qp1qvo6RemmIoyKNRcMC+qnly4m/+YG908UU9EKjyLAI74NKjgrA9lSXbkaD?= =?utf-8?q?7bxYiMMQp2UcApkGtncrVk+NXv9C0ylcqg=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: advantech.cz X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TY2PR02MB3678.apcprd02.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8ff901ed-f739-4f14-66d6-08db1119758b X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Feb 2023 19:02:04.6669 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a77d40d9-dcba-4dda-b571-5f18e6da853f X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 8+1tb1cpiPcBMI8f5NCbCXvXBYrzo31Eb2Ebc43tNJU1HBB8obDya6Z9t08O1zgMjqylr7P7P2sbS9ti41MfjpewQ87GMpLOGuR5TtGDjUM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PSAPR02MB5128 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 ; Fri, 17 Feb 2023 19:02:25 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/59244 Changelog: https://github.com/tpm2-software/tpm2-tss/blob/4.0.1/CHANGELOG.md Signed-off-by: Petr Gotthard --- .../tpm2-tss/tpm2-tss/fixup_hosttools.patch | 10 +++++----- .../{tpm2-tss_3.2.0.bb => tpm2-tss_4.0.1.bb} | 12 ++++-------- 2 files changed, 9 insertions(+), 13 deletions(-) rename meta-tpm/recipes-tpm2/tpm2-tss/{tpm2-tss_3.2.0.bb => tpm2-tss_4.0.1.bb} (90%) -- 2.34.1 diff --git a/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fixup_hosttools.patch b/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fixup_hosttools.patch index 450698f..04a2964 100644 --- a/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fixup_hosttools.patch +++ b/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fixup_hosttools.patch @@ -5,16 +5,16 @@ Not appropriate for cross build env. Upstream-Status: OE [inappropriate] Signed-off-by: Armin Kuster -Index: tpm2-tss-3.2.0/configure.ac +Index: tpm2-tss-4.0.1/configure.ac =================================================================== ---- tpm2-tss-3.2.0.orig/configure.ac -+++ tpm2-tss-3.2.0/configure.ac -@@ -488,17 +488,6 @@ +--- tpm2-tss-4.0.1.orig/configure.ac ++++ tpm2-tss-4.0.1/configure.ac +@@ -554,17 +554,6 @@ AM_CONDITIONAL(SYSD_SYSUSERS, test "x$systemd_sysusers" = "xyes") AC_CHECK_PROG(systemd_tmpfiles, systemd-tmpfiles, yes) AM_CONDITIONAL(SYSD_TMPFILES, test "x$systemd_tmpfiles" = "xyes") -# Check all tools used by make install --AS_IF([test "$HOSTOS" = "Linux"], +-AS_IF([test "$HOSTOS" = "Linux" && test "x$systemd_sysusers" != "xyes"], - [ AC_CHECK_PROG(useradd, useradd, yes) - AC_CHECK_PROG(groupadd, groupadd, yes) - AC_CHECK_PROG(adduser, adduser, yes) diff --git a/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_3.2.0.bb b/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_4.0.1.bb similarity index 90% rename from meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_3.2.0.bb rename to meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_4.0.1.bb index 1556273..657a2cd 100644 --- a/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_3.2.0.bb +++ b/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_4.0.1.bb @@ -10,15 +10,16 @@ SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN file://fixup_hosttools.patch \ " -SRC_URI[sha256sum] = "48305e4144dcf6d10f3b25b7bccf0189fd2d1186feafd8cd68c6b17ecf0d7912" +SRC_URI[sha256sum] = "532a70133910b6bd842289915b3f9423c0205c0ea009d65294ca18a74087c950" UPSTREAM_CHECK_URI = "https://github.com/tpm2-software/${BPN}/releases" inherit autotools pkgconfig systemd useradd -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "vendor" PACKAGECONFIG[oxygen] = ",--disable-doxygen-doc, " -PACKAGECONFIG[fapi] = "--enable-fapi,--disable-fapi,curl json-c " +PACKAGECONFIG[fapi] = "--enable-fapi,--disable-fapi,curl json-c util-linux-libuuid " +PACKAGECONFIG[policy] = "--enable-policy,--disable-policy,json-c util-linux-libuuid " EXTRA_OECONF += "--enable-static --with-udevrulesdir=${nonarch_base_libdir}/udev/rules.d/" EXTRA_OECONF += "--runstatedir=/run" @@ -28,11 +29,6 @@ USERADD_PACKAGES = "${PN}" GROUPADD_PARAM:${PN} = "--system tss" USERADD_PARAM:${PN} = "--system -M -d /var/lib/tpm -s /bin/false -g tss tss" -do_configure:prepend() { - # do not extract the version number from git - sed -i -e 's/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/' ${S}/configure.ac -} - do_install:append() { # Remove /run as it is created on startup rm -rf ${D}/run