From patchwork Sun Jan 30 14:39:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 3111 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 52F9CC433FE for ; Sun, 30 Jan 2022 14:39:42 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.19451.1643553580420974488 for ; Sun, 30 Jan 2022 06:39:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=kMCNIgd1; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=90298cce89=yi.zhao@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20UETMJN002529 for ; Sun, 30 Jan 2022 14:39:39 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : subject : date : message-id : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=K/PJEv1AYWy7br12O53BUqk4If61nV4EPhfV+frw1R8=; b=kMCNIgd1u8K+M3fcmGQZeLMkEcxtLxuY6iKNoyYHNDVgjZPQiks5Pl4YeevKqtzHYb/r 1CFuMe5ufNV1EHA24YHDeGTi2tYdjvbhqW3q+e+WwO8FCOJ3xpYyrgt/VlNKksAnyZTU kQY1PY1FFH7KC87LtUJLVd3RmPdDsKEWaMnoDezYxds01gi7/RMqGe3b3eRLGXhXEmVF WPDEub/XgPKi6jHF7SaN/v9iKv5ySD0nh0iuQx8BtY/IooAm02xMQ3xZ+vUvEn+I1/HW cfM0fQilR2qoF+1JSXLkaYvZHv9XW5weYF7YnZ9BUzaKYrowG+e2EnkFJ81tg7KzDh+A sQ== Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2168.outbound.protection.outlook.com [104.47.58.168]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3dvvj6rr75-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 30 Jan 2022 14:39:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DUldJnk0FTPh/ZC8uD86ukJhOl4cnWyO+YRkrC0/zSbZBSrF4pQEBkFyiBw7hsAvxKwlHlSeq0fMwvRk+jxCSrSlz8FJI8CcIPcuv+JtUzzYjoA6Fenv7xymitVLJPUz2DATDSz5jussvvTC48PrH/y+/i2qupelsXK4pE+IMQ7YxyebMxxPX3r5LIRAsNV5tzbYC1cbZyfNawQZFoyI+U8R4gfYcssfi8Bc1ND42ilw5yUQGTPuDaTYQWJ7sDHx/P8jX+2h2H9YyXQ+ODGKT4+5zf/NRKJWIIbBZbUNKXNn/FkrEMUtGrkRJ1udO3RJL5czP0gyl8UFPK5XbKmyYQ== 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=K/PJEv1AYWy7br12O53BUqk4If61nV4EPhfV+frw1R8=; b=ApQsnH8DsZQ74iYZ5V+qtXwyZRKqTbRwnPoPt6O0Z9T5Z6IsinXkfeTXsXywWr0B4BDMy05hdHp33KCQYmoLyFoX6QIaH2f0mC87rMeX6wdAFCXzIY6UdgLYgxTaYgs4smgCWPG68CZb2el/vjdMumVzSKgB0UMsDkVLv2Q+d0SlQWO14EcYdI5IoBtR1YAprvR+fZ+yqNql3NwwhtUebqhsjmYdLSriAZaqfVYWinIdv6WbvzlXNBhh2kdFMfNytsUgb7n7M9kN1FT8Efm3WQOggYxbTUedIepfVBbqeD9DFBUzEDYfk5r2Uy8oW242ubjYfbLDaUP0IqyCYqlfuw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) by BYAPR11MB3256.namprd11.prod.outlook.com (2603:10b6:a03:76::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.17; Sun, 30 Jan 2022 14:39:36 +0000 Received: from CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::1446:8499:7fbb:a706]) by CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::1446:8499:7fbb:a706%7]) with mapi id 15.20.4930.021; Sun, 30 Jan 2022 14:39:35 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 1/2] tcpdump: upgrade 4.99.0 -> 4.99.1 Date: Sun, 30 Jan 2022 22:39:23 +0800 Message-Id: <20220130143924.44775-1-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 X-ClientProxiedBy: HK0PR03CA0104.apcprd03.prod.outlook.com (2603:1096:203:b0::20) To CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b6c87b19-c39e-4ca4-e656-08d9e3fe5601 X-MS-TrafficTypeDiagnostic: BYAPR11MB3256:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gA2RzaQ+vtkjjosw7VheVmfArWyr9Q5bdOgCaeVvtp0j6trI/Yuk533OCT3l9hvaXZOxRfkWCroFukKxYEKTpj2WhjptaGdRcDo3TOueXN7PemQsWf1eCYk9veSuzciD5vzA0mWlmsudJgwu0kELjUrG75pwPd5StCQBre9Isn2K0FKYj2S5J9NeP480t36sfLAKxB5q0lgVjD/msOdQZFVaONnjQ1tICxvt2M8UXvbD72fPicuh7EJS0k3KquJEhRBgdSWT2VW1oJlvXlMhAu3iUdPk05yjM2dPnMV1S7x1zCjn3Idc6sq+aGZS9Z2H3kEhrD3yxKZXG/yjVqqHg9IguSkrMeB3qvoDAWTa1/CTlbnvVNWPGuRbDTr5PiduXFvF4djxmD/bkSUfJXiT2UJSA6V0Q6Ya+ESxERyZxJY3K9HUCaRu054wrV4GmB0czIH65/x/8lIl6ww0xUpKS7w7V2Z6KiqenGexheQBcV3hjg76RcdvOpyPh7jsMY72DNNbuE23a03oeDn5RM2lxS6F+HL34ci4Rs+RUd2Xr8z7lTBdSfWI+ELXd1QfGQDGSUvFEgoX2dQaSK4qaZkhXcK5veXSn/TR/wlICyzaFu1fJRv9I4peFk42qXMCIzOoXZJoX4wyb0EKxMroQEeABTk7jqZYePiIK/V33avxbPKj1mwyFtqfBJvmVuAwL0SbdW1MgwYZUzlzHwwa2MdIQ6DdfT3VeDHhG0HnukISymt0JDJl2HMdZidpkq7XJyKGeIpyQpSzQveN5SYpzjuJFN7qO7bKJKhWEU2z94Jf9Yg= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB4867.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(44832011)(2906002)(83380400001)(38350700002)(38100700002)(36756003)(2616005)(5660300002)(66556008)(966005)(6486002)(6512007)(26005)(1076003)(316002)(6916009)(52116002)(186003)(86362001)(6666004)(6506007)(508600001)(66946007)(8936002)(66476007)(8676002)(20210929001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pZolFzN6H2cCEpjwrkSxV03k9aAYc3TznOVARRh6Hch9U/wgqi7VlvMTbGN+P6dOvbYOODHrJCgjNrunrw3Nm5ElQzxZRKxh10K9ArJ3Cq5uowg319FMb5oCe9gyP4RJSe+1cdGwtO2nhTle9HngMoTTPSpiBPdf9R+/d0w9FCm8zf7QhvnitQzTh8FE8YbrTAKq8qsfti5oal96nvBh05TwdBpl+9Iak64+angOQjA9uVKccigu+6HFC4pouWdz+zW0RGdibx9TBkdz24Ea9AylfOfAeXawTZeUnuO0YjbBbLhKt3ffty9v0zoAgiiiNJAK0h4XhqzOhZcI/lUsWEL4VZYzgbHMwbz4wv7Z2L/I8ZxHxaarZGPDdtJ09eO22vvm2DHP0we5nGNMNXvlw5BpSZmDKAKwWvAZRwA7JbCaXZNbZwwJLNKDi3xKHL6VOTN+uywHDuufFMoHEXQ96NKicLXcMAce6McCUjThHQBZQGHQmz74V+VR3gBI+AZCV8hEox1+WN8WBCf6gH3ilz5SApAdMBdiOVeumKolCkmonGQz4mVZaVCpiNjPViiSeKQzltAJbTIEhbbnE8xGdG/jpEsW0XTJ5qeN7XdHiymaUjSEhBP5BdrJkY/M33xU1ngrIRRcLzysvU80yGKV1YEoPT6Hi3hRKBR6JX5yqASJFuYhTTrUeH4cPiYd1QqM6Flsq3k2dVKUmaMOdWxNkEsl4RdwDAA4KVea5H+kAK/NdJdHs3J9UcQHY3OLkDKREnws2fTjArPeETv5hYnsBD2Pk2B7E+Ou6YtNRjr0gd9b0AbRlID0JILtRfMLWL16sEiFsHL0dLbsTaPArWTuSlnkPhKTUBUvJecvxSueDhsMKPeI8IYJbhBA++YmA2thlfZCXUHw9cchKue6YS/EfYlsARAgfIcqQqbvehUBec8H2COsQgxNdywQspPGFhDuYf/er9T4m+ty5gDswjlYDyv7gH+nW7drj/BxwII+IUo5CTmy0VLSzuAnZA/6hpOj4L+MAo+dtXBu69/YbL7Q8qO1R0sU9gN57V+VBs8EsVHQrwm5ruVinhgX2aObiKtZNientRPrtUcO7w5atoDvWu3z90PSbkMobuHoXyEqm3DC028xk/wWnugeJQiGS5klZqoYv/l+k1e2dOPRwEForEu1B8GgwNsi5bAiO56y92HGHzolpRn5+tPO64LQT2MOAxQG/3UgudsbObV991F+aQgspRxsgTLqnC1IpPmaSjqeO7Nz14A16EyX29ZrfOn/+jnsEmLLFUaTH/Its9J9wHjw5H27RdMHB0+03/ZZhtD24CDaPyGKAmAorJLiqrnr036A89vdNAm3yyyjl5khcvvlFAlR/UfPXqki8FhdINrHvruSjOnavRRf4Y7gxsuI6C2UfikBzlSAmdOo+Gyv3kcKRGL4NKAFR7K41UGsjrgTKfsbj1slpx2rDdGzPSv4HI6juQAtjQGuL8KUwat8hHuDoWvK4JHiVlcg29KKdCParAvyUXrosaHdVdU/lbvyn83eoYQbCOER30x6PTdFOofkVXfaObyrjGbpdAzTwFnu3vaBnMY0hDMuSJFLJsHsO8H2CESxCdtu0VxvUxo6acQsnkZIvp9dVEAmaNkOb18= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: b6c87b19-c39e-4ca4-e656-08d9e3fe5601 X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4867.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2022 14:39:35.5205 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: WfjXWzLjlo3QVDTtqsKovbSVHwA260bfM2rOXYXYswkrWMatywI79g5vH9o42X5kgkJ/PJy5bh6/6iqwOgu98Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3256 X-Proofpoint-ORIG-GUID: -Zv2NZ59r5itr9dDYwutioUK-E7vqYfv X-Proofpoint-GUID: -Zv2NZ59r5itr9dDYwutioUK-E7vqYfv X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-01-30_04,2022-01-28_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 clxscore=1011 impostorscore=0 mlxscore=0 phishscore=0 mlxlogscore=646 malwarescore=0 bulkscore=1 spamscore=0 suspectscore=0 lowpriorityscore=1 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2201300105 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, 30 Jan 2022 14:39:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/95177 * Skip aclocal in do_configure * Inherit pkgconfig then we can drop 0001-aclocal.m4-Skip-checking-for-pcap-config.patch Signed-off-by: Yi Zhao --- ...cal.m4-Skip-checking-for-pcap-config.patch | 33 ------------------- .../{tcpdump_4.99.0.bb => tcpdump_4.99.1.bb} | 18 +++------- 2 files changed, 5 insertions(+), 46 deletions(-) delete mode 100644 meta-networking/recipes-support/tcpdump/tcpdump/0001-aclocal.m4-Skip-checking-for-pcap-config.patch rename meta-networking/recipes-support/tcpdump/{tcpdump_4.99.0.bb => tcpdump_4.99.1.bb} (72%) diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/0001-aclocal.m4-Skip-checking-for-pcap-config.patch b/meta-networking/recipes-support/tcpdump/tcpdump/0001-aclocal.m4-Skip-checking-for-pcap-config.patch deleted file mode 100644 index bb56c4d4c..000000000 --- a/meta-networking/recipes-support/tcpdump/tcpdump/0001-aclocal.m4-Skip-checking-for-pcap-config.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 867bf5c9d0fb64e1b4e64cb13b983674c270a6bf Mon Sep 17 00:00:00 2001 -From: Yi Fan Yu -Date: Fri, 19 Feb 2021 00:52:35 -0500 -Subject: [PATCH] aclocal.m4: Skip checking for pcap-config - -Bitbake triggers an configure error -saying we should look for pkg-config instead. - -Upstream-Status: Inappropriate [OE-Specific] - -Signed-off-by: Yi Fan Yu ---- - aclocal.m4 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/aclocal.m4 b/aclocal.m4 -index bd4e27a5..136cb8ca 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -584,8 +584,8 @@ AC_DEFUN(AC_LBL_LIBPCAP, - # No pkg-config - # Look for an installed pcap-config. - # -- AC_PATH_TOOL(PCAP_CONFIG, pcap-config) -- if test -n "$PCAP_CONFIG" ; then -+ # AC_PATH_TOOL(PCAP_CONFIG, pcap-config) -+ if false; then - # - # Found - use it to get the include flags for - # libpcap and the flags to link with libpcap. --- -2.29.2 - diff --git a/meta-networking/recipes-support/tcpdump/tcpdump_4.99.0.bb b/meta-networking/recipes-support/tcpdump/tcpdump_4.99.1.bb similarity index 72% rename from meta-networking/recipes-support/tcpdump/tcpdump_4.99.0.bb rename to meta-networking/recipes-support/tcpdump/tcpdump_4.99.1.bb index 97a9027af..322a826f0 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump_4.99.0.bb +++ b/meta-networking/recipes-support/tcpdump/tcpdump_4.99.1.bb @@ -24,15 +24,14 @@ SRC_URI = " \ http://www.tcpdump.org/release/${BP}.tar.gz \ file://add-ptest.patch \ file://run-ptest \ - file://0001-aclocal.m4-Skip-checking-for-pcap-config.patch \ " -SRC_URI[md5sum] = "b10aa2f497def7283bc060f626879ce5" -SRC_URI[sha256sum] = "8cf2f17a9528774a7b41060323be8b73f76024f7778f59c34efa65d49d80b842" +SRC_URI[md5sum] = "929a255c71a9933608bd7c31927760f7" +SRC_URI[sha256sum] = "79b36985fb2703146618d87c4acde3e068b91c553fb93f021a337f175fd10ebe" -UPSTREAM_CHECK_REGEX = "tcpdump-(?P\d+(\.(?!99)\d+)+)\.tar" +UPSTREAM_CHECK_REGEX = "tcpdump-(?P\d+(\.\d+)+)\.tar" -inherit autotools-brokensep ptest +inherit autotools-brokensep pkgconfig ptest PACKAGECONFIG ?= "openssl" @@ -42,14 +41,7 @@ PACKAGECONFIG[smi] = "--with-smi,--without-smi,libsmi" # Note: CVE-2018-10103 (SMB - partially fixed, but SMB printing disabled) PACKAGECONFIG[smb] = "--enable-smb,--disable-smb" -EXTRA_AUTORECONF += "-I m4" - -do_configure:prepend() { - mkdir -p ${S}/m4 - if [ -f aclocal.m4 ]; then - mv aclocal.m4 ${S}/m4 - fi -} +EXTRA_AUTORECONF += "--exclude=aclocal" do_install:append() { # make install installs an unneeded extra copy of the tcpdump binary From patchwork Sun Jan 30 14:39:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 3112 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 50DFFC433EF for ; Sun, 30 Jan 2022 14:39:42 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web09.19347.1643553580934264092 for ; Sun, 30 Jan 2022 06:39:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=VHwgpz5p; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=90298cce89=yi.zhao@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20UETMJO002529 for ; Sun, 30 Jan 2022 14:39:40 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=cYXIEtZORCjZsJxzVcoMbVGufEisLShp7pNHmRIv4Rc=; b=VHwgpz5pQHtvdFY5auX84d9HCgtLXolW7dx6/mqFd5FDcyLjTMDAwyERkynL2l8wgXVy p8EfegXTwPQYyf3LNL4zgkjVDCINkfqGox3eXSBjTj4TpKQeIT0HknqSycY9jwrMhsg7 AHbXmk8TGy3moAG/SkFJFd/XcJqKsm/x/r8KOlH+rLiCr22/IxkyrepN/UBpzTloEI0z /yYSm9g0oDB3OWn6vRmoK2bKx4YeKBCckxK9tTzUaI8Y8UDr9ijuEMhzStg9t+t/Ksfv xnADMZSblwsT2z7N+hvmipwDmBpUmZ9LClbsfFhgRDYqXGpe+BCdhVtn9NhpM5EqYsjc 3A== Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2168.outbound.protection.outlook.com [104.47.58.168]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3dvvj6rr75-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 30 Jan 2022 14:39:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aXTO1+mlUohgxxwekUJnKnoP4N8XlUu32zkEUU5uHvZ9XC2y2okX3KBMumx0UOrf39x0ih2dL+Ad2sCNp/I6rYpitio4dikkghinIZhPQMnm1UfAgSN9JJ/9ry9/Xmy/I/ESRrbwPMeUXO9DVLdNdPvoWjhPQ7r9aw2poR2JJcTm1fzlJzzRJrHraMK2K8gQGxT/8lwuTubHQ7EuScsJHN45beRU4omUPHzRYArjAcxzzYa+7YmK/VRTJ7ZBql7SzsDO2Pf9Ea8+avEu+lQMFlJjd4bCTHgdPiTYP8UHRQsJZAfQHweoGucN2n9mYqpEMMZJLuCItYPV31EpzCHmvw== 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=cYXIEtZORCjZsJxzVcoMbVGufEisLShp7pNHmRIv4Rc=; b=e7gvwBdOWr73aN5w7SET0bEH4rZ8AVnnDkvDHZziJn7rdu8/aJXHGMEU3SRSi/cqY8ocRQcKzMZ1bQCpmviunDLKjq7ao8MfXnM2npM8JwNavOrh8Ly9gAvOV9fJsVt/GPCEUeYOgs6G/WKJ4aMUDh4prNP1QhTQvvrtXwBu6yqf6maQAVeQ/6jdYwLTKJjgLXGbkWb5L4y3wSIGJ79tGSOINsjllXNVB6DJSHFckgdNd7Zw9pPkZlz8VYUHH8IPEh9obQ5DcEmkp8UweG4gfMG24A0KOCZ3WylrL4lVBDPemGc5/mhmdtUu220A+gllYhe2hGLLb5G6mK2pFHRs3A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) by BYAPR11MB3256.namprd11.prod.outlook.com (2603:10b6:a03:76::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.17; Sun, 30 Jan 2022 14:39:37 +0000 Received: from CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::1446:8499:7fbb:a706]) by CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::1446:8499:7fbb:a706%7]) with mapi id 15.20.4930.021; Sun, 30 Jan 2022 14:39:37 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 2/2] tcpslice: upgrade 1.2a3 -> 1.5 Date: Sun, 30 Jan 2022 22:39:24 +0800 Message-Id: <20220130143924.44775-2-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220130143924.44775-1-yi.zhao@windriver.com> References: <20220130143924.44775-1-yi.zhao@windriver.com> X-ClientProxiedBy: HK0PR03CA0104.apcprd03.prod.outlook.com (2603:1096:203:b0::20) To CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 43f1542a-6b8c-4af7-75b7-08d9e3fe5698 X-MS-TrafficTypeDiagnostic: BYAPR11MB3256:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2449; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j63LrRoamdVALbSA0unf+/9spr01zwcFWTD4n+aMSbRDU0LPMjWJ0cpvWy9DurqHJ/iMP4RACT3jg59pbhR/TRsEEoL8QRlQcTXAA/1psLU07EyUVb7e35fUhJjjSgROHdwakddP0cVwLjjHxw/NnmdyZeQ6OeH6NaJEdZ5vSHeYio0myIUcRkeCCTQQpJjSiXntmVcMIrZcV+2HM1sxyIF0ufkG2fBYYjYCrmlKhPNrABVno8pnJp+0T2sPfEhkA1hxgEdDknpEqfSjFqLH143svdWzBkmLrCHJl1InboDmsJCqGAiHxYT3tgxZVlhUZnTEOEUR47P9VsUeyW72RhcWUo6ol6Tckd9VQ7H82eywoedP5inKeWqylddRfnKc7BTF9gm1VBU5XJIzySaIIERBaOdBovAwj8WmzRQBgUsQGKdd3vVdZV+ctxdIeNw/0J16ue3Dl4KW3jCDOj1GCznj1wGeb6Fk3AFiqWyerBtTT1eBdOWUj9hlQQp0g3ds1eYhhWm2jiHGNJpQdPxjc4hNd4Z9VIYeq2yfBRSyJejDoXcNpW7XFhb7iVWoqjrPc1DROf9wPEemGAy/f+KI6jJZto4wLX7X/9lER9HEvsQtaKtZd5ZwCDgGKObe7DtN0bnIGX+tg5clPOOsavtxWZ5Q9asIni6md3NEkthpXXO+W5TfuELr8T7hjH/jgwl8w3iFCQqj38Rua4ZjffI6ULfBU0QGdXa2NaheQEsw3Vgd8Bq+6YpHETbxa+Blz8mNOVXCA/No++yk+x8II9SrAw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB4867.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(44832011)(2906002)(83380400001)(38350700002)(38100700002)(36756003)(2616005)(5660300002)(66556008)(6486002)(6512007)(26005)(1076003)(316002)(6916009)(84970400001)(52116002)(186003)(86362001)(6666004)(6506007)(508600001)(66946007)(8936002)(66476007)(8676002)(20210929001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TK2ssRP8ICxvHFVZXtIFDCJOH60LeyajQq82Vo2gaL9jrwILkTKv9VZiDPA14806iDGg+wGGrHiaAdA2yBLXC5PBSB58Wo7AyV/efBUADaTUiLZRlLKoSpeCWmWy2qktoUoSiwgAldSYmf8UcEVmqMU2obnpdfCyGVxk1mSRNI1NDOPpttfmC7DYXMKg+c7A9uY+D1L/C161fYLN/xr0uB67IiCjetJG07iV/dMnwjFIBQQYB+J/rUN2o4R4LRv5a8KLUGWuHhNYkW7Bd3e5tlctqyhlf9fbWuwctTmSLrP6SHtqtDhxEioO6jctIWywp969JQ+paW5qgjyHhZEMUuKRxYhRdNpebZxfPIqek683gY2lweGoRoJL3PGChzNgcJEUvt5xVbRpb8J3bHh2tMwn1kKmEB5+lfkVyQbCbK2JLmWVGPIbrLaA57hyc3p+6nnrEbSD2X5JCxFQfj9Ff9yS259BcuCWffCwwXUioMuQS7XgfBH7s4Cpd+olri0vbhYsVqPI26E4HFkS0U6ooRpgn1DptFtcGi9hBpR+lhOY862kavt1eiKmg8MscDEbAfe86JcZy6Lm5x+c7pqzNcQ6XNmuLWucavqKPLWf6WVou5VGgD0Po1yCFOrXSG5/zlGumWhhRCwXfZq/zFZGl528GdZot33aBVPg6E6S9Sl2MUf3hL+/SjVBweQMINZqld/Ec38g4ekXR5kkcQbT5w4jz861PY4n+4YxbQRf5/LbwGXNJiWptGW5EAQr9HELZ4W5lVvU/XpLwclqHWk5B82R0PmYv7kiy0TpHUC8dKFbnrGUhcqtIpPmFkbS5kDbxyZJxembL3BdJkPH+pJGrWFoIs0YUFKdLmziD6i/+lTBFKJh8I8M+krDVTyWzd3Wj+fex5CEZdrnisY3957h/XW0MvSP2P94EnyKG+UHM3J5irDA/xZ45p2iKZVfVgsSX/+wekvEd031aUKKrIbCjwvUVsiyIKJ1ICK+2lO+OvBteJYYtHACohAozphuF6Bl36oOF/k+XVqwXGXJ+My62UXLLp23oiG+B2InW8NHicYGwvN97j0sKr/WEpzo0bCeqJ8wQKySMqaqtknq09OHKcdUe40Kv7rumuj0Opp7XbI0/xVfMwniAoXyhG3o/CR8AA/MdoLasMrwRz0tCRCvdk9ueHpfyc4vsbuQdUSqyZ5cuO8qaZ/046OK2IRF3jucPLJB+vbrSZsqJnscYzFZpHW+5hPGoWsBnD5by0NQrTEdEMZFrnxRVHIPYpNXAdh022Q7srkFgUt577jXPgvl/JayhJ5ksqVHIjJkgFypTEBUNB6Iv46PvVW85/QOrUM5P7e1CWxTb/okDRzY74CCd5XZ3+/UY8wozGMHh1FlZgyNOrDjQ0ReTDpJEV8ZRk2IuNI285/iZMMKouuNs7rZmCQMr5Mdb70o+c9qort8cJtTxySVBr5HvSrSRtj3WLBWMsYSdJfgxCSdMPUKEMVOAhxaIjPcQP9ctB8edVsDoWK6bbxBBluDcGP0zErzx70eoA98iUgz/edV2ElIbkjrCSLt1sw//Rh7iZ0vaGFNzBdiA1cfP+TcBTAYCGmAgH4+Gy8bsV/Aupz/qGXdNXUshrkFneqUWR9BVmblYqCUH+8= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 43f1542a-6b8c-4af7-75b7-08d9e3fe5698 X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4867.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2022 14:39:36.4976 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: o7V979GDVFvzyyrha4GNxrqkB1YXDna1XcDflD4UKNyzNgnx96iOkZ5zKlk3KOWwKPAXjbmj2A47+8f8N6L7EQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3256 X-Proofpoint-ORIG-GUID: 6A8271_ZllTmI6_WD6m5wUNM-2gSP4Pd X-Proofpoint-GUID: 6A8271_ZllTmI6_WD6m5wUNM-2gSP4Pd X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-01-30_04,2022-01-28_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 clxscore=1015 impostorscore=0 mlxscore=0 phishscore=0 mlxlogscore=846 malwarescore=0 bulkscore=0 spamscore=0 suspectscore=0 lowpriorityscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2201300105 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, 30 Jan 2022 14:39:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/95178 * Update SRC_URI to official download page * Drop patches which had been fixed upstream. * Add UPSTREAM_CHECK_REGEX Signed-off-by: Yi Zhao --- .../tcpslice/tcpslice-1.2a3-time.patch | 75 ------------------- .../tcpslice/tcpslice-CVS.20010207-bpf.patch | 15 ---- .../recipes-support/tcpdump/tcpslice_1.2a3.bb | 36 --------- .../recipes-support/tcpdump/tcpslice_1.5.bb | 25 +++++++ 4 files changed, 25 insertions(+), 126 deletions(-) delete mode 100644 meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-1.2a3-time.patch delete mode 100644 meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-CVS.20010207-bpf.patch delete mode 100644 meta-networking/recipes-support/tcpdump/tcpslice_1.2a3.bb create mode 100644 meta-networking/recipes-support/tcpdump/tcpslice_1.5.bb diff --git a/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-1.2a3-time.patch b/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-1.2a3-time.patch deleted file mode 100644 index 386b7f83a..000000000 --- a/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-1.2a3-time.patch +++ /dev/null @@ -1,75 +0,0 @@ -Upstream-Status: Pending [from tcpdump-4.1.1-1.fc14.src.rpm] - -Signed-off-by: Roy Li - ---- tcpslice-1.2a3.orig/search.c 2000-09-10 10:52:40.000000000 +0200 -+++ tcpslice-1.2a3/search.c 2006-07-28 14:56:55.000000000 +0200 -@@ -53,7 +53,7 @@ - /* Size of a packet header in bytes; easier than typing the sizeof() all - * the time ... - */ --#define PACKET_HDR_LEN (sizeof( struct pcap_pkthdr )) -+#define PACKET_HDR_LEN (sizeof( struct pcap_sf_pkthdr )) - - extern int snaplen; - -@@ -111,16 +111,24 @@ - static void - extract_header( pcap_t *p, u_char *buf, struct pcap_pkthdr *hdr ) - { -- memcpy((char *) hdr, (char *) buf, sizeof(struct pcap_pkthdr)); -+ struct pcap_sf_pkthdr hdri; -+ -+ memcpy((char *) &hdri, (char *) buf, sizeof(struct pcap_sf_pkthdr)); - - if ( pcap_is_swapped( p ) ) - { -- hdr->ts.tv_sec = SWAPLONG(hdr->ts.tv_sec); -- hdr->ts.tv_usec = SWAPLONG(hdr->ts.tv_usec); -- hdr->len = SWAPLONG(hdr->len); -- hdr->caplen = SWAPLONG(hdr->caplen); -+ hdr->ts.tv_sec = SWAPLONG(hdri.ts.tv_sec); -+ hdr->ts.tv_usec = SWAPLONG(hdri.ts.tv_usec); -+ hdr->len = SWAPLONG(hdri.len); -+ hdr->caplen = SWAPLONG(hdri.caplen); -+ } -+ else -+ { -+ hdr->ts.tv_sec = hdri.ts.tv_sec; -+ hdr->ts.tv_usec = hdri.ts.tv_usec; -+ hdr->len = hdri.len; -+ hdr->caplen = hdri.caplen; - } -- - /* - * From bpf/libpcap/savefile.c: - * ---- tcpslice-1.2a3.orig/tcpslice.h 1995-11-02 00:40:53.000000000 +0100 -+++ tcpslice-1.2a3/tcpslice.h 2006-07-28 14:56:55.000000000 +0200 -@@ -20,6 +20,26 @@ - */ - - -+#include -+/* #include */ -+ -+/* -+ * This is a timeval as stored in disk in a dumpfile. -+ * It has to use the same types everywhere, independent of the actual -+ * `struct timeval' -+ */ -+ -+struct pcap_timeval { -+ bpf_int32 tv_sec; /* seconds */ -+ bpf_int32 tv_usec; /* microseconds */ -+}; -+ -+struct pcap_sf_pkthdr { -+ struct pcap_timeval ts; /* time stamp */ -+ bpf_u_int32 caplen; /* length of portion present */ -+ bpf_u_int32 len; /* length this packet (off wire) */ -+}; -+ - time_t gwtm2secs( struct tm *tm ); - - int sf_find_end( struct pcap *p, struct timeval *first_timestamp, diff --git a/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-CVS.20010207-bpf.patch b/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-CVS.20010207-bpf.patch deleted file mode 100644 index 0a7359311..000000000 --- a/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-CVS.20010207-bpf.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Pending [from tcpdump-4.1.1-1.fc14.src.rpm] - -Signed-off-by: Roy Li -diff -ur tcpdump-3.8.1/tcpslice/tcpslice.c tcpdump-3.8.1.new/tcpslice/tcpslice.c ---- tcpslice/tcpslice.c 2004-01-15 17:35:53.000000000 +0100 -+++ tcpslice/tcpslice.c 2004-01-15 16:12:57.000000000 +0100 -@@ -35,7 +35,7 @@ - #include - #include - --#include -+/* #include */ - - #include - #ifdef HAVE_FCNTL_H diff --git a/meta-networking/recipes-support/tcpdump/tcpslice_1.2a3.bb b/meta-networking/recipes-support/tcpdump/tcpslice_1.2a3.bb deleted file mode 100644 index e65739a5c..000000000 --- a/meta-networking/recipes-support/tcpdump/tcpslice_1.2a3.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "tcpslice" -DESCRIPTION = "A tool for extracting parts of a tcpdump packet trace." -HOMEPAGE = "http://www.tcpdump.org/related.html" -SECTION = "net" - -LICENSE = "BSD-4-Clause" -LIC_FILES_CHKSUM = "file://tcpslice.c;endline=20;md5=99519e2e5234d1662a4ce16baa62c64e" - -SRC_URI = "ftp://ftp.ee.lbl.gov/${BP}.tar.gz \ - file://tcpslice-1.2a3-time.patch \ - file://tcpslice-CVS.20010207-bpf.patch \ - " -SRC_URI[md5sum] = "e329cbeb7e589f132d92c3447c477190" -SRC_URI[sha256sum] = "4096e8debc898cfaa16b5306f1c42f8d18b19e30e60da8d4deb781c8f684c840" - -inherit autotools-brokensep - -DEPENDS += "libpcap" - -# We do not want to autoreconf. We must specify srcdir as ".". -# We have to set the ac_cv_* cache variables as well as pass the normal -# cross-compilation options to configure! -# -do_configure () { - oe_runconf \ - --srcdir="." \ - ac_cv_build=${BUILD_SYS} \ - ac_cv_host=${HOST_SYS} \ - ac_cv_target=${HOST_SYS} -} - -do_install () { - mkdir -p ${D}/usr/sbin - install -c -m 555 tcpslice ${D}/usr/sbin -} - diff --git a/meta-networking/recipes-support/tcpdump/tcpslice_1.5.bb b/meta-networking/recipes-support/tcpdump/tcpslice_1.5.bb new file mode 100644 index 000000000..4909acdee --- /dev/null +++ b/meta-networking/recipes-support/tcpdump/tcpslice_1.5.bb @@ -0,0 +1,25 @@ +SUMMARY = "tcpslice" +DESCRIPTION = "A tool for extracting parts of a tcpdump packet trace." +HOMEPAGE = "http://www.tcpdump.org/related.html" +SECTION = "net" + +LICENSE = "BSD-4-Clause" +LIC_FILES_CHKSUM = "file://tcpslice.c;endline=20;md5=99519e2e5234d1662a4ce16baa62c64e" + +SRC_URI = "http://www.tcpdump.org/release/${BP}.tar.gz \ + " +SRC_URI[md5sum] = "8907e60376e629f6e6ce2255988aaf47" +SRC_URI[sha256sum] = "f6935e3e7ca00ef50c515d062fddd410868467ec5b6d8f2eca12066f8d91dda2" + +UPSTREAM_CHECK_REGEX = "tcpslice-(?P\d+(\.\d+)+)\.tar" + +inherit autotools-brokensep pkgconfig + +DEPENDS = "libpcap" + +EXTRA_AUTORECONF += "--exclude=aclocal" + +do_install () { + install -d ${D}${sbindir} + install -m 0755 tcpslice ${D}${sbindir} +}