From patchwork Sun Apr 10 15:31:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Gotthard X-Patchwork-Id: 6505 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 27D69C35273 for ; Mon, 11 Apr 2022 17:17:58 +0000 (UTC) Received: from APC01-PSA-obe.outbound.protection.outlook.com (APC01-PSA-obe.outbound.protection.outlook.com [40.107.255.88]) by mx.groups.io with SMTP id smtpd.web09.18416.1649604688588122823 for ; Sun, 10 Apr 2022 08:31:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@advantech.cz header.s=selector1 header.b=JIaSCSid; spf=pass (domain: advantech.cz, ip: 40.107.255.88, mailfrom: petr.gotthard@advantech.cz) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Nf8l/a2BqR4xGm2Rsg6D9JEP9/GCLPDs4reNvrfmho0LsKM5ilhlSwUk0Ft89w6h0tqmXT7lBrMq66/ZFzSG2PTmZHxH939P5Ji1BBFlgwNHR/QKkVCcvo9AChi13HJNcoNk7jNr1TY4xlkuPXPb2B2G5Zo8Fi0cDnOK5C+WG5CbtRABHUDorCxjy0hCOYEBse3gyE1LNq1SN82og41poZxENoQrxAxxZNfVFhYXbbmyrt4OE30cE8PH659ahrESYa3Ki7lRXLMJii8uSCy9uSkI6l+T+aoSuTRPY5mFr5ThtU5WRhTmI/iCD1R89H/rF7NM7TUooziDW04/zFbLVA== 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=IUsbxelptJRfwCQfcUiPvJOcGjCGy3VoYXp/UBGZfb0=; b=TXxLx4BVPMtFTouvBsYy4hrGhwgbUVZ9n2Sqfg5VTIuPxtZKnf9r3v3zympTfBX/ZNXE9jBocxDMA2UTWsKzZVJBie7z84iu+PlYHY3kaQU5/F0DfJLpZE/vjwuPd88NOddQUfRMOtjEMGA0hutTIXmcoko9rWOHLocOkByoAaPFJTkFA9ID/GW9T+xrf/GMUJ4+xQ+iA2N40Rq1OcW3kr5TnrA+YL2nz1O5pnB+lDcrpEuwpIURciBmTiFHaD4429oP0DInisd+o/tAlenR4h9/p9TICtVEIIhFGgDfcN9c7vXO7Mn7V+EDn4gIVH1eYA4ShJfQwK4tEwbHbsGzjA== 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=IUsbxelptJRfwCQfcUiPvJOcGjCGy3VoYXp/UBGZfb0=; b=JIaSCSidTnfdGfro034XMj/YQLf/Bdnu+ueiVeKDeA8znrYxFB1Qtmd82p7alk1xMPdj6YVI/mZz5YIFPY40bRdKemCoCqQG78tvYKiPK9aggNKYblJipXlxh0d62UE30pRsaiCEpOFD81uTDkHlOPkHjfnWDHjMLwQ9OIDhNWJpPRyvGb7RtZjnLcXHtVCXHl2hpwjvxZ0w0UWnedNgVkYbLnzYZRR/S1apoxIGK4uuXwkqnbpbKo4w6471wDbJvHV408rncrm8kucqIzhVoalYh6lLPLKpTsp5Auh6Ih/8QahkVsxphJtdaf8KrfXn4wTJSas7JA3Bx0cp7J0/gA== Received: from TY2PR02MB3678.apcprd02.prod.outlook.com (2603:1096:404:b7::12) by SEYPR02MB5965.apcprd02.prod.outlook.com (2603:1096:101:84::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.29; Sun, 10 Apr 2022 15:31:25 +0000 Received: from TY2PR02MB3678.apcprd02.prod.outlook.com ([fe80::b46d:269f:591f:7eff]) by TY2PR02MB3678.apcprd02.prod.outlook.com ([fe80::b46d:269f:591f:7eff%6]) with mapi id 15.20.5144.029; Sun, 10 Apr 2022 15:31:25 +0000 From: Petr Gotthard To: "yocto@lists.yoctoproject.org" Subject: [meta-security][PATCH 5/6] tpm2-tss-engine: fix version string and build with openssl 3.0 Thread-Topic: [meta-security][PATCH 5/6] tpm2-tss-engine: fix version string and build with openssl 3.0 Thread-Index: AdhM7IEdNovL4q2qRDu806pa0A8zuA== Date: Sun, 10 Apr 2022 15:31:25 +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-office365-filtering-correlation-id: da96e68e-0af9-4a3d-51e1-08da1b072cbc x-ms-traffictypediagnostic: SEYPR02MB5965:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: weCJbfG6bvY5HgBIWS9ZVcV6G7d2G7jtR7jAjZXgtinxR04XzSYgPqkDTirg/WvVRKWntUIVukV7uwrPOechJcnLVvTwSj7UeW8aJsznstULOffYrYCHET1t90/Uc+q1PEpkgXPPwKjRZ8YnRFR91agEqBVFtL6GJ8PJ/f2G0xvbtyhGh8DkQ2e+jZ6uRNB5xZMQNcNeorxlU/kj45FiyCq1iUt3kDfZe6CAxJkq15u5SL7f2srNoQH7gRfbF1C14YO9lLQYzmG5RkNqzq+9OzYgc0/uFAIzLAJiZ8Mtldnyh+AbKT2kUcg/DD4Vv4F6E7G/RdAnLZoHqdGAniR/T1CCMNgQ3mCMrhY0rjxPE40F8O/pQ7+HelRxTkxlWhX/Nc4B5ZfAEZ/fI+40Fpr9+mmAZp8+GdF2arygAxRt/5JtUwwe+AyB1FJOQ6hAQFI3Nwmbf5Tk+YH5f7PBTKcLwMz6OeyfO0xBzbcJXmHk9wxA3aOk83cOI8GCF64bGQihJ8TaQvLrw9fXHOT7ujtUlOMd3rOSfYL2W7VHPcdqAkKcAinoLRZFI49rBiuQP2Xj2Jw+chP77LO9Dl5c6wveM4Muz1ObIwpP3AhykQgDPFuDMeyvyx2bgZeuG5Bw3Cv3hmuI6wifrBP0+pNH/HWiy7RcGT+LY6A0r4tUtkOeWfhE6SXbEVoDfydrcvoyi2wol66/djnbHTYSQsj/WQi4dhsJ5+46hSIqY2xI2iLfLH91tfX67PNUg409QBchdi8s3l28ePl2xlx/UntNNi7tfKbejrKM563f9e++fCPTd/s= 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:(13230001)(4636009)(366004)(186003)(83380400001)(86362001)(26005)(52536014)(8936002)(9686003)(7696005)(6506007)(508600001)(2906002)(55016003)(5660300002)(8676002)(38070700005)(71200400001)(15650500001)(33656002)(66946007)(66446008)(76116006)(122000001)(38100700002)(44832011)(316002)(66476007)(66556008)(64756008)(6916009);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?CBXvxA9IfZKyDbeVjNVvAM8XhoK+?= =?utf-8?q?kgOTZWOPaJsY5VbamIQujtrpfge0PbZwy689rSYR8kfNotGbfAVpUg7K3SRknheDV?= =?utf-8?q?OvUv5GNN7IL/GK7I7bjC0dsJBRqPxjoswbPAaHRnPERtkSaIQUtqBv7TMt7PxItqt?= =?utf-8?q?gaqSbKepHvR7zG6NFCA0KMO82Fl7hC1S5dwc/9o8GtxPNOlunFCeWWnJGUnOhSV+j?= =?utf-8?q?yEBu+5qGVZL9JcJLs+rGc/YDGO4lkuSZoR0+9RyPiEz2zyE/t9qIurse4mTsRvQtd?= =?utf-8?q?odsi3N1N2AStA3XIOdG0PU5rORnKuaAKcy4q7zHHeCP27Bqp1+PXacmiYAmZoYi1E?= =?utf-8?q?kkDaeeaiM3lwhk35FBVidKxJk8Sf8GOkn5RoBqA9S0INTid6VubY7XMVIAm8X/gb2?= =?utf-8?q?Kq05e5B6Q/lJjORbDy/bb1VWTBANZplNH5MVJ8eIkTCew9ef1M5ZmyiVDebEUSiDZ?= =?utf-8?q?fDQpenwf6mZu1FabSS7zsBD+Xqw6/wJC3tgQGANJwB6jxm0DX/pCSw+2EIFrkcmom?= =?utf-8?q?UWeEfMNOB+Ga4ccygOFhjkp6/djcqau7poPs1YX2iOIXspzcyEPVE99kKErlWPKcm?= =?utf-8?q?7sNX7FFuIJLsD9mnRhSmr4Brht+MSTqbdCjUdwQSIw+rgQjac953nGzRwcRnpzUos?= =?utf-8?q?T4SrzngfnQfhgGykIANhl/nMwn0iTtabUH5ORa7usZIoJgIQLciFMfyPruOXpaZuC?= =?utf-8?q?AqA9+4bRz63GY5wVTpaW1CM+HwxwTuq6tn3XTgPPzrhU59x24rTpKY9BaxG4lcR6G?= =?utf-8?q?Mvunn8YAIwyAnyYMrh+MwAB1SDV56mNouLM/A3RCW0fWo6gxwDqM5mvgx3LCOUlN9?= =?utf-8?q?fkFjB4WmS/kJAocwimKYndebmgHx+fQ2LlBFwJkAhXePBUD3bPDDBmOXNaX0lboRC?= =?utf-8?q?l1FHofb/U4KzsbWgzBCnv4Rq0FbDVAitULzCelZFT0ahuqI5H/eoEyIPEAPcf85G2?= =?utf-8?q?V8hJBblV0U3KSMqbIR0uERNt9Fij28o/qmROwdZF0/Gr3Wteg0HaSDiQ/XBetkXex?= =?utf-8?q?DQu8kNurRawfZuiWBeOMNXy1na/7yR267mlr76eeu8m+Pga0X0jJ71TIWIdi+G1yX?= =?utf-8?q?N0EtTzSBOvIE4qc5Jr14Qp4PjeHsXe3nbn0llaZ/IsxKCAYSaJeyX2l/cQtIqSnEb?= =?utf-8?q?pMsgpLHMwhZA1kXt+6UHgELhxni6AcqqD7UZXvVdx2RHvSvGASHAb3U3jGPKJflYE?= =?utf-8?q?bpAtXrZQ/8SJPJ38QR5zOHqBIcUoEySUpjePIix1wbQ3mFgF+NARGSDTokxJOiTRG?= =?utf-8?q?A6tha0a3hVwg4PS549o5+/7oPXbg42Z+YOVYYVDG5dUYlVUmOsKGOfyOYGumg/XgF?= =?utf-8?q?Pvi3LuKXtrsnC1OpcbLO/PuTpxmejgHKAAlWtrgj3S2IlMRqFIG0qPD/84LweOs2j?= =?utf-8?q?2q8EyBdsAeB+w3dCJqF7o/8hVpPKK39IxHneG6lSDghRX53LEzHPq0OH55gVRfgCp?= =?utf-8?q?WJtwZ4pFHJDKTS+agKPUhyUbA4ITVhv8NjuBFD93gXTkfBYeiZfZS9TbmL4IAAgGs?= =?utf-8?q?pe8VlZStvSXTG2n5ohZVwjM7kC/oYmiXNjMt5IKOYOi9oCwQjg0go6lIfDMg3BPYx?= =?utf-8?q?C2KbFrlsblZo36NLY/2LVkNS/JSEvlhj5cDhaG2OxuSuDANQH2LqxSG44jVcnWnOX?= =?utf-8?q?kAPPEhNNLGW0MElHKhB9g7An81mUfci4cSdJFzazx4fxzFhsDbV4A=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: da96e68e-0af9-4a3d-51e1-08da1b072cbc X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Apr 2022 15:31:25.4825 (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: jyMdT33FyR+6jKtKsmv4BfedVTMwMAmxqoILu4F+j8dX0GkNgTq798azOJmC/hDgoRdSl5G2WgdhsJlQVfbgB4yoArPKjIYvkOFdyGH5x9w= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR02MB5965 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, 11 Apr 2022 17:17:58 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/56708 Calling autoreconf outside git repo causes the version number to be null. This patch makes the version number fixed. Since Yocto now uses OpenSSL 3.0, the file packaging need to be updated. Signed-off-by: Petr Gotthard --- .../tpm2-tss-engine/tpm2-tss-engine_1.1.0.bb | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) -- 2.25.1 diff --git a/meta-tpm/recipes-tpm2/tpm2-tss-engine/tpm2-tss-engine_1.1.0.bb b/meta-tpm/recipes-tpm2/tpm2-tss-engine/tpm2-tss-engine_1.1.0.bb index 4d1f425..efe62a8 100644 --- a/meta-tpm/recipes-tpm2/tpm2-tss-engine/tpm2-tss-engine_1.1.0.bb +++ b/meta-tpm/recipes-tpm2/tpm2-tss-engine/tpm2-tss-engine_1.1.0.bb @@ -8,16 +8,23 @@ SECTION = "security/tpm" DEPENDS = "autoconf-archive-native bash-completion libtss2 libgcrypt openssl" -SRCREV = "6f387a4efe2049f1b4833e8f621c77231bc1eef4" -SRC_URI = "git://github.com/tpm2-software/tpm2-tss-engine.git;branch=v1.1.x;protocol=https" +SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/v${PV}/${BPN}-${PV}.tar.gz" + +SRC_URI[sha256sum] = "ea2941695ac221d23a7f3e1321140e75b1495ae6ade876f2f4c2ed807c65e2a5" inherit autotools-brokensep pkgconfig systemd -S = "${WORKDIR}/git" +# It uses the API deprecated since the OpenSSL 3.0 +CFLAGS:append = ' -Wno-deprecated-declarations -Wno-unused-parameter' + +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 +} PACKAGES += "${PN}-engines ${PN}-engines-staticdev ${PN}-bash-completion" -FILES:${PN}-dev = "${libdir}/engines-1.1/tpm2tss.so ${includedir}/*" -FILES:${PN}-engines = "${libdir}/engines-1.1/lib*.so*" -FILES:${PN}-engines-staticdev = "${libdir}/engines-1.1/libtpm2tss.a" +FILES:${PN}-dev = "${libdir}/engines-3/tpm2tss.so ${includedir}/*" +FILES:${PN}-engines = "${libdir}/engines-3/lib*.so*" +FILES:${PN}-engines-staticdev = "${libdir}/engines-3/libtpm2tss.a" FILES:${PN}-bash-completion += "${datadir}/bash-completion/completions"