From patchwork Fri Feb 24 17:20:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Gotthard X-Patchwork-Id: 20124 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 D2604C6FA8E for ; Fri, 24 Feb 2023 17:20:31 +0000 (UTC) Received: from APC01-PSA-obe.outbound.protection.outlook.com (APC01-PSA-obe.outbound.protection.outlook.com [40.107.255.85]) by mx.groups.io with SMTP id smtpd.web10.24108.1677259220902278317 for ; Fri, 24 Feb 2023 09:20:22 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@advantech.cz header.s=selector1 header.b=KfdZkUkn; spf=pass (domain: advantech.cz, ip: 40.107.255.85, mailfrom: petr.gotthard@advantech.cz) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fj+XFQ3LsrR2jRJQCemVCJ6glMFoh9pQTI/M3GsTA55lWY7w9ME2Q2Jjtbth5GGQvETP+Bot+V7NuxpJiR9FY48ERUStMIDjvh9B33eqm1Hc5gFnVjMOP9CyPVMoaOv4mE9QAfuuWKczhcNb+p3Trz6p9sG9Gr2nBq02K3ka9ot6JgE1Sf1RrDGwRlDoVnScbjtj+FnC633NCshRRY4ptXi7lap3jPOasl3sDHUDoB74I3OfxhI5XpFZsA13oCfDyNniy3e7juTQe3VMsxnfPLSJa3yAxTyUJ5xkohKA4svfwG9n36QGCtIJO7IjVxWya2CMY8msxHxPk/uD4KxaRA== 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=D79R8LBBDjmO6k6yAGpaccGzTZYGwKoUEvveburrt1k=; b=XjvouES+p8k4Fs1h+Y36QjPpZst2LMjtCTFUqWAJE/orGWW4cRBf72lS3MUNQmKqh2JYE1LC0YJxU2oojOBKr9lQPd9Bf5Eoh0v3EwhXC0wzNYOe7XfyIUyJvtlcULqN3Ml/RFG1PMEn76sirpFY9IyMfbSJkMLZQa1EpXHD+CpwjvIac1CYivwTrbgO8WxtUe1UB2EJCMWqTNY+yJ+XdEuyYognifNhsGDI07FVUaUwJdp9i3ZvTNfmaxwb0k0qvzJQX8elsKhpfHfFppFOLe51iYFs/9rTYruFXykXs7pC3hlndcau4HZ7Xw3QbHf14/EMp3iHOntKbzVnYiPO0w== 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=D79R8LBBDjmO6k6yAGpaccGzTZYGwKoUEvveburrt1k=; b=KfdZkUkn6E7meqNOVAJ0vdvaYwR13GxQTARC/bgygOtqbzxUPjv5f+19+QaP/x9rtevViJdDhL9teqL59zEscXR45dBwumoiYvj5vciWl4zrkBwmDGWMwsIdzK7Guwj8UQGQWVMKc6rIg+bVUguD+95T8iwvR+uUFnC6b3+TejFKn2aiWCgDAwC48mspJ63RFl0yLzdxVkD4iZ7s5NfKNKZcGPG28cwc80UVsxP7GnDBPEdKUHIS0Gg3eYQARyECm7wFAknUMTXlqhbQAubw/T4pkLkE3TUaX74deY2rcbbfkpgA/BmgcKE/QeY1WwH4Y1dwnporXh23e5Rz+tJGIg== Received: from TY2PR02MB3678.apcprd02.prod.outlook.com (2603:1096:404:b7::12) by TYZPR02MB5547.apcprd02.prod.outlook.com (2603:1096:400:1c8::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.19; Fri, 24 Feb 2023 17:20:16 +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.6134.021; Fri, 24 Feb 2023 17:20:16 +0000 From: Petr Gotthard To: "openembedded-devel@lists.openembedded.org" Subject: [meta-networking][PATCH] python3-scapy: upgrade 2.4.5 -> 2.5.0 Thread-Topic: [meta-networking][PATCH] python3-scapy: upgrade 2.4.5 -> 2.5.0 Thread-Index: AdlIdDvUUZNSKAU1TWeWBy693rVkHQ== Date: Fri, 24 Feb 2023 17:20:16 +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_|TYZPR02MB5547:EE_ x-ms-office365-filtering-correlation-id: 6e568bdc-d5e7-48b3-4d54-08db168b65de x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Mo2mIfayGeRvENzE+xiN3b2v0oKwIvMjy68V/e6aZCiFNd2HT0kMGor+Nv0Jsc9EvGer3xBQ32X4EwzmNaI+PfvZkVRX9OWSQj7/apv6j+SD2bCSUxnuROo4KcMtnA3fTLwlnYnws+OeUeKTklFBwqGDSvybiX/Qse093GOZc38X9N88I61VyK+K/3/x1joRPbIZGQdECvoe2rKyfspwZr3tS3AnVt6izUGNX7S0d8XSkswA6MXxybCI2+XxT4irlMyNYJJHuME5qXGltnBRuBAqDNuIf76DGMT1vyTzj8OaQ0jPFbAM7v8ADS0d1HjLZY+1JPGpx43eTeBckcpOmXw/B/gYMDICFRcqoKExgMb31Z9n+eC75b2tF+c6ppcwVefdPSBlnthn0HfAjayKN3GvyUa9suq+FsHhZ2iKYSofA7YVgx6g4iBWLuAgFE3W3ArnGa2Fb4zExrLSf8BYBbuIFumegGQsA2u3W1FNtfUdyi0Ydsglg/u2tU0vEpsSJJHhycC4hMbNaM5l1tcYznFeW2I519bwfJrS9tqjTOx8S46MpFsT1vqJRjZ6fNbwXO1tmddqCt7iAbjP2IjWPR+uaRBi0W+89RP/mQJdenS9VznP82b24uiX9WDZtceS+8GBKEDRZp1Lh6pB9PenSODg1DQ6K9RDVYEujXqUbhNlh4Z0tQPNMQg/tF1tmTv6 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)(39860400002)(346002)(136003)(396003)(376002)(366004)(451199018)(38070700005)(33656002)(86362001)(55016003)(7696005)(316002)(83380400001)(478600001)(71200400001)(5660300002)(26005)(186003)(966005)(9686003)(6506007)(8936002)(44832011)(76116006)(66476007)(66556008)(66946007)(122000001)(66446008)(8676002)(41300700001)(2906002)(52536014)(38100700002)(64756008)(6916009);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?ts1GTGmbPfyHksCL/PVceeocooZa?= =?utf-8?q?65+fM7mM+AfQaZA9rE/cY2TimCHE8SuzOc9iv0Rt2T8qVUh+UK1NuPEVbn23XYXKK?= =?utf-8?q?ICsnMMp5rSOsiyeGAjfkSL+ZFDBaNfCE/sJyVkCikrUgZQSnYyzrr6yu2MqsHBI9G?= =?utf-8?q?FrA+YUk4lOC4tlpS3Q0yI5xFuorBDfUaJda0K2o6dVdMznTRwIR0zcbxezETYMjhz?= =?utf-8?q?rTSwNpJEWNTTG4bNFnqaze7zj+jtM/MDThinXvTlirrPIx6/sNbdpHIhCBJB1yOEM?= =?utf-8?q?F7Ru2CVkkUT1cs7uJq/dnILCsPyCdLRiSpb3vMdBRkDp7HsmXYRP7LvfmapQ5Isg8?= =?utf-8?q?ZWlkcJyn/KCDSn+PlwqxiY+Y6kdw+JuXtdiex9M4F09g+LfLP30i7pW4XUYloLpo6?= =?utf-8?q?LUE6qr+KsbbPm9Ki6lkM9Ep+ct3ZRIiqyJffxTGgiD1JJPQxYrueW5EhbohehMGPf?= =?utf-8?q?Fh4gwLYZoUGl3scuEuTQZPESmp4mV5a7lnGsw1MRnV4qsP1hH42L17pAF7h20X4x7?= =?utf-8?q?Fp18MwQpN5Dh5GatB5DtvBRP3FLnSMM1LTai7XANdxkgOqQbqXFPLX+c5RH2LVoQX?= =?utf-8?q?M38U4lUrNX315Fy3rPxTA4ozK9nPiENNVPpNeyAiwjOJ0U5MBHhViXYV2BBmJ2Q8C?= =?utf-8?q?kZE531NyEQUupWuWNHcE2+/EaPc4oOmL5iFY88gBqKbSsIi7aMstYx23srJ6WxmLo?= =?utf-8?q?1EwQg/mE2DuDEHMX1QLVAUjB7OUDTOCjxR5/npa3qvf0dqFGwmd3l5uZTymahsuEh?= =?utf-8?q?Hfha28Ty9zvH9YyXRoXM2TZohyoqcQL7hpoRgeXQ3YYInu02XzEpCAHMzohIfWWLR?= =?utf-8?q?WZ28uz44jq/erhujUBDjfktHvdD+DwSA06tSYDzuvnyhMxSFFkKWJkh1tUYbm6aMw?= =?utf-8?q?+t231oXw0k3Go1JVol9/+6EBhmqDT8iuqa4zGtjlTZxa6+8N2OP38DwdiEDhjYXeM?= =?utf-8?q?GLM0ulXKXH189YQrKyLhWQzDnq5PNqo8oYgsn7Rv5/YdHHiC+dbAB+9hSEpAomcB5?= =?utf-8?q?3KpJIF1rIViExJ5A2psTxBkp9sU66petr36ripa4sj7mJeqhGxkKn6WR4xhwpk3Ek?= =?utf-8?q?7BmcIyNGxlIvWI8DeP9aG3ny5pFZEfzzMFifKCeUOMujd8dCPbBKBRgRowo5EgGmD?= =?utf-8?q?BtnEgOEd7J0YhzJFIzgzz/gW8oICJUWIgtiIEPM1qM2WbFPYUCPx7qa5VjBe5108I?= =?utf-8?q?Of0RY6eMxcZOWn9IumdgdT72owCYqxO/pMphZgNFxXKhzcdEwYjXGiNvT0qffI9dH?= =?utf-8?q?Y0VjEsr04QXrhzXiDSjNmcOgGzfU7AR8MGinzo2CHqx/MIkmBF/shWUCxh8akWNM1?= =?utf-8?q?zQf4VCczIXPtaualu8A5t9sfUSD+wGdFWar3FmDMmEHS7KsVKmONYKXy7adlIQh+t?= =?utf-8?q?3YSucuuH2yP860X4chEf9/1W+oKwhFR98VwUWiylMlNk881HFnDk+n+vxOnlZC6Af?= =?utf-8?q?ME93nFQ69yMw33R3+zg4jPU649Qd/Y6mwuEHx3qCnj0dSJZcF+c6pjo0XV0defqgC?= =?utf-8?q?Jk/GdA6vK0XoRTuD4skxdEm528ORootblw=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: 6e568bdc-d5e7-48b3-4d54-08db168b65de X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Feb 2023 17:20:16.7765 (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: 2giOm1BcjQRpC12nXcr+5iTjYgwZs+BdOJEq88Dzp4Wvm5Fk7esOQPr+tq1Lk0FM6d7z4vi2i9hS4AzzhDRqrQtP6rOiiXuKXifAWs2E4G0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR02MB5547 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, 24 Feb 2023 17:20:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101250 Changelog: https://github.com/secdev/scapy/releases/tag/v2.5.0 Also, in this version the UTscapy wrapper gets no longer installed into /usr/bin, so for ptest we need to install it. Signed-off-by: Petr Gotthard --- .../recipes-devtools/python/python3-scapy/run-ptest | 2 +- .../{python3-scapy_2.4.5.bb => python3-scapy_2.5.0.bb} | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename meta-networking/recipes-devtools/python/{python3-scapy_2.4.5.bb => python3-scapy_2.5.0.bb} (88%) -- 2.34.1 diff --git a/meta-networking/recipes-devtools/python/python3-scapy/run-ptest b/meta-networking/recipes-devtools/python/python3-scapy/run-ptest index 797d8ecf7..417e21053 100644 --- a/meta-networking/recipes-devtools/python/python3-scapy/run-ptest +++ b/meta-networking/recipes-devtools/python/python3-scapy/run-ptest @@ -1,4 +1,4 @@ #!/bin/sh -UTscapy3 -t regression.uts -f text -l -C \ +python3 UTscapy.py -t regression.uts -f text -l -C \ -o @PTEST_PATH@/scapy_ptest_$(date +%Y%m%d-%H%M%S).log \ 2>&1 | sed -e 's/^passed None/PASS:/' -e 's/^failed None/FAIL:/' diff --git a/meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb b/meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb similarity index 88% rename from meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb rename to meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb index 0f66dfd78..cc3f2ee1d 100644 --- a/meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb +++ b/meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb @@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" # If you want ptest support, use the git repo # UTscapy does not exist in the pypi pkg # -SRCREV = "32cd7eb0f620d9adf171c48d55514e8326a538d7" +SRCREV = "9473f77d8b548c8e478e52838bdd4c12f5d4f4ff" SRC_URI = "git://github.com/secdev/scapy.git;branch=master;protocol=https \ file://run-ptest" @@ -28,14 +28,14 @@ inherit setuptools3 ptest do_install:append() { mv ${D}${bindir}/scapy ${D}${bindir}/scapy3 - mv ${D}${bindir}/UTscapy ${D}${bindir}/UTscapy3 } do_install_ptest() { + install -m 0644 ${S}/scapy/tools/UTscapy.py ${D}${PTEST_PATH} install -m 0644 ${S}/test/regression.uts ${D}${PTEST_PATH} sed -i 's,@PTEST_PATH@,${PTEST_PATH},' ${D}${PTEST_PATH}/run-ptest } RDEPENDS:${PN} = "tcpdump ${PYTHON_PN}-compression ${PYTHON_PN}-cryptography ${PYTHON_PN}-netclient \ ${PYTHON_PN}-netserver ${PYTHON_PN}-pydoc ${PYTHON_PN}-pkgutil ${PYTHON_PN}-shell \ - ${PYTHON_PN}-threading ${PYTHON_PN}-numbers" + ${PYTHON_PN}-threading ${PYTHON_PN}-numbers ${PYTHON_PN}-fcntl"