From patchwork Fri Jan 14 01:39:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 2412 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 7EEAFC433FE for ; Fri, 14 Jan 2022 01:39:57 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web08.1699.1642124395730044126 for ; Thu, 13 Jan 2022 17:39:56 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=OrZY3GnQ; 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.166.238, mailfrom: prvs=80133a60ff=yi.zhao@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20E1SUwB012691 for ; Thu, 13 Jan 2022 17:39:55 -0800 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=d3zuVCTt98vWeVc+PIKvE6kJpKfSl9RCqFGt361Jdls=; b=OrZY3GnQDnhAgjpDcN7ECOVnHCuPfEtc6ihTIY4wyTDxcge9t9NV3WhSfZg8W0KU+itm TxLmSQU1RAPdB42f14En6g2zO3PPNsxIrrsJ08XH9mZyfHusAcGks56Oc7Zah0CqVAL1 HlMSxWjDVqZFncK4j5bd++2qJYT24pJSqVrdgN75zc9afUyHaz7r+/oqmRoJ4lNIXftb Gq2qyhmXVggkB7pWMyRwSfdZE9Of1/l75fi6FByNGPUCnssOjkDLY0fonWaSSlxbpRUN vqGc8bA5JvmA0MxIm06WkXPSll3sZlVn00qpf4XAKJlolf3CfmEJPkWK76gFyAX1MaZu cA== Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2104.outbound.protection.outlook.com [104.47.55.104]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3dhy079ad6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 13 Jan 2022 17:39:55 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MGtDq9kOJuamIY0lRRKpgeZtgEBhngQUvO08+EqFk+TJrw7HcA4azqpcWQX+2Ot/zaVQVmjtaAWLlgyauojK+C/Nk7Ef0nXSAvw7APDpk9tXP3wSHUH0y7N//J+mSWMWjiT0PUgLbrR0kjvu0rKf4vKHa6KVJm8Yf+iFoFpE9449/fk3kvn/K97qjntqK8NBf4SQXPWTBkYgHDfqm5h+iiYX+D/QlFM8WoaHBBf5DToeVXBLg6F3Lzzhu/v+xVJ9uT9U+UtbuoULoe1pTgiIX9c8OKgpuwsPO7ZxN1CCKSePy/cptQHOZdo2me1O/hg5eu6YLy7zOgM4kMTmH1c4kg== 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=d3zuVCTt98vWeVc+PIKvE6kJpKfSl9RCqFGt361Jdls=; b=g42g67B6kpjAS4351DfmvsHBuyz23dhf86Y6YZ9ml7mioH/PVKi2oPrMxM0+3DECpUTslmj4BSTZdaWgopNWcXxtFS7YovcHaNd1Jc8kgHbwqWHNpwwL3ZSrx/nodyE0tuWVg5zQRgmyvgBB9VHNwAZqolFdSqvC1goDUfHZkaB84GzE7laruKbIoc4JSVjijktrvpXd2uo85ua1y0tkkiKAEdT9G56aq6A0Ah68OkynsC8+H7bYbztio+jFtWzPEg7bBRXbCZ6FoqZx8rMy5pYt4NXNvkMKkHcyiTkyN/uISbBOEfhDgyRWe2PIIOdKXSkli4b9+BO8o1qVzgebtQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from SJ0PR11MB4878.namprd11.prod.outlook.com (2603:10b6:a03:2d8::19) by DM6PR11MB3145.namprd11.prod.outlook.com (2603:10b6:5:6e::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.11; Fri, 14 Jan 2022 01:39:52 +0000 Received: from SJ0PR11MB4878.namprd11.prod.outlook.com ([fe80::687b:9478:2713:459]) by SJ0PR11MB4878.namprd11.prod.outlook.com ([fe80::687b:9478:2713:459%5]) with mapi id 15.20.4888.011; Fri, 14 Jan 2022 01:39:52 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 1/6] nftables: upgrade 1.0.0 -> 1.0.1 Date: Fri, 14 Jan 2022 09:39:36 +0800 Message-Id: <20220114013941.229837-1-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 X-ClientProxiedBy: HK2PR04CA0087.apcprd04.prod.outlook.com (2603:1096:202:15::31) To SJ0PR11MB4878.namprd11.prod.outlook.com (2603:10b6:a03:2d8::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 83753351-5b8a-4745-17d8-08d9d6fec267 X-MS-TrafficTypeDiagnostic: DM6PR11MB3145:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:421; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: z5jwY+vRVGsRYo74tc+GyG15jee0C7rDMxMay31yYN6iHXAJTCnBy3HBkC47eMANjF4iweIBxuL9d1oLh2DYk32LrocJfvj414PfDmX673ivGEtCoEJR/u57NI/OmmYAD9HhRACCaTZelk+7pS1DJocLii0/L+00/UF5FcX684xEFcSQA9rmn6kjlX1iCfj8aWzexoGXBMVKGyHyGJEWCF5+a9vtZEkvJdPBSWooPUPMuWGIsgu7eja5ty+jveLw/7mNeCb2cL0q7l2rIacZRdXsOaptU5D7aMULlK86iSunpemx0W5+Hx1awo9YOTmB6MoGPIyykQDYqcG8a4+3xg3ZBNJ19480gawdUkkRpXO83zv15Nq5IsofQGRlSzf2f5ww+paeSh790nhNMdwyCFqUPPU9faepr1Ep5z+CreBvkVIc1carzGuTt97OJLDncU5r1CPl/oPc0jmmruWbGx/Gmvsd3GSLf+GHKnSD6b1fpOp/N5yROh4ZO5qCg3EY+ECOtoYBzM3g5KvQi8pWId4T1/c4GQvTZBCV3asgP40hkwAtcxLqw9PQ0EJf39wjvCD4oG+iiDYY6OyoHkOyT696Qc0Z6Q7ED7l0TCfVqL1AiU+zdOL8PV6hvlHtZweKXuIEQ9EPib5NVyfFs4Nbd8OoDkSuo3Z8H3W6LB4ZKN9LGdDizy1zNznl8MwwVFlfGpDBxlx56fz3ORDUuGID5W1NqUgOmlKSX+7jZdeJtBuN2OS16Sz0pwEpl4MjEjZkxOgwlR+9Q9D9zheeyGehwKLg/ZVdw/GjrTkhdg1lQZk= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB4878.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(6666004)(6506007)(66556008)(1076003)(66476007)(2906002)(5660300002)(316002)(6916009)(83380400001)(44832011)(66946007)(8936002)(2616005)(8676002)(36756003)(86362001)(52116002)(508600001)(6512007)(26005)(38100700002)(38350700002)(186003)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GsSaHMMLIPB1TRM+Z6vFvVfx7V51yv5BA7dH5+uIdFY4npgD9AIBbW1Ssn1YvhUVQgfz/t4v3n+f5rBO/Y3p6/EsfsPJd2I7rPxYwG7YmCQG7QeFUtq+8LsRo1Oy5ECPYfgX8ya3mhL9kf2G1Rwdi2iuh8ENgyi44soS3JXK8sde2PZAfTfQQpkizbgBG5mn7KDRJRWuFIZdZL/58F4YWG1M7fRifHOYKVp0SKodpAKjHqtV1oSnyZN5csW0vN0MW/O4iOuu6kw2+XptwVMuql3HuzI59kW+1TipatGf5nFDWZJ27IXfTNBvn8yoMNnjHR1VOEgZa60HO96Yxc4MIwwpNalJejNPx/1Z8uwf7uNbo95QDEMZc6BdJ4lUUOqYEK/ba3QLasHMaQuNGcEapmG1XsnmK+YqokFCVyvns9bBZ9TOOz51mTqQZXC/F1t3QJrSMwNkGEDd8oFE7cxl4591ErDA+RjeuM9/9rh4MOtnAef7iHux1+4SDSPmGDe9DH3i5WfQz9s+QWW+bqqr61CBTaZkxcIyGeGFMS9d/0ZPR2uUK+Yz1cREQEx795Pj7nV+/300izvmAMnTlQRV637LZA6b1mu3wx6/LBDP+3XzzEpcUouIdVXbHxBGcCpjwI3tC9YoXscyQbCY5KZ5LV1ziWbOYK/oILooc8HlCzwCI6qN1wq9JxjOcgcbf0slW6j+6Py+9e15N/8lU0EtC1NntVNc140qXZCfy6fEYPzDy4a8yeCMHa6sZbSyiB6fAg5VRFQe+CW2bZix1Fm//ffV/crst0uq7a+vkBYwzusAiFOLxvulIJwmpWEUWucRsn5cFlODpzbouNIr6K8XtFudCGAhBNtiPD2ERFWP3820ErTSvcEQyvbl8mQgMSrDssstqZHJ2V1E3jTf1uuHICa4mN6FMjSId1Yvqy9u/UGsE6VMl1MlNvQIiAA7KadKW/dNnNp17R5PAhCFUAe5YgROsrs64a5gyUC44sgAbUdh5KayV2jlFsuXEAYHWFKVunKId5/4eup8Z8az+ntMTrTxPK7UNZf3yf9Gu9T/I+vdLSTddMsGYN2a4nd7h//gi1W3N6VK17uu4XDxvC6dblrtfcMDoiwX/z+T2LLB2+OcHGBAin4kDO4AL1jq5X9XuKFlf2v/acSQecv+p+ENAi8GZJzoXlloyNAcAtBDTI5WVYWNS/Gp4hmOSlayBk0VfJ6MT3VT4nvDru1ff9wOTjbVMJ2gCmMvhVgLMqaG+FAN4WGtFq/iphUSHmQEJBTBECci80hxrFZYEvMj2vJ15uf/H2RytJwgPiBfE3B24gbe8Uy2uwNVaPOe9po9G4FedgOlCbWuQNMC5/L3KvzPgWsrBNMJteQfetp2St1C8CrU5tQfVy8I/is/PMKyOBbHEyXQSIkr0GtRP5KUEwAii9/Ig/SGFfjOgopkjsYdLInREnExP1EyMxzlm8dv9BFOBiY6e/PDhFaM24+vU+oc66tE6JG5kkGtfs7hpZ8Uy/kPe12CXUtGtT2wpy3s0O1jzI82aR6+5yBXrIJnIhJRE6HHqzFgCPiOHgmQOege6U4kXdn/4I3TyyJLuaDEo7q+mUqIsXlL2SAznM+Pp0gZVqJ/yKQuZ4EWP5CFdPoCzdY= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 83753351-5b8a-4745-17d8-08d9d6fec267 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB4878.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2022 01:39:52.4177 (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: UwCmWBU2GlgFbjXEP0xZz2u5gG8TdyM8CquYLDF0jqxcowMZj8TaS4xvhxTg4AWlhXEfLJoOEymITHab8bTPpw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB3145 X-Proofpoint-GUID: RcYRmXyBeNrDVA6G8VNeTtNG_-SAdpxl X-Proofpoint-ORIG-GUID: RcYRmXyBeNrDVA6G8VNeTtNG_-SAdpxl 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-13_10,2022-01-13_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=810 bulkscore=0 phishscore=0 malwarescore=0 priorityscore=1501 spamscore=0 mlxscore=0 impostorscore=0 clxscore=1015 lowpriorityscore=0 adultscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201140007 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, 14 Jan 2022 01:39:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94815 Signed-off-by: Yi Zhao --- .../nftables/{nftables_1.0.0.bb => nftables_1.0.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-networking/recipes-filter/nftables/{nftables_1.0.0.bb => nftables_1.0.1.bb} (93%) diff --git a/meta-networking/recipes-filter/nftables/nftables_1.0.0.bb b/meta-networking/recipes-filter/nftables/nftables_1.0.1.bb similarity index 93% rename from meta-networking/recipes-filter/nftables/nftables_1.0.0.bb rename to meta-networking/recipes-filter/nftables/nftables_1.0.1.bb index 68409c910..91df1547d 100644 --- a/meta-networking/recipes-filter/nftables/nftables_1.0.0.bb +++ b/meta-networking/recipes-filter/nftables/nftables_1.0.1.bb @@ -10,7 +10,7 @@ DEPENDS = "libmnl libnftnl bison-native \ UPSTREAM_CHECK_REGEX = "nftables-(?P\d+(\.\d+){2,}).tar.bz2" SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2" -SRC_URI[sha256sum] = "58bf547daf967a2b88ecb4f425f126006ebde22711db806b25c1d6cf84fe45f4" +SRC_URI[sha256sum] = "3ceeba625818e81a0be293e9dd486c3ef799ebd92165270f1e57e9a201efa423" inherit autotools manpages pkgconfig From patchwork Fri Jan 14 01:39:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 2411 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 7EE81C433EF for ; Fri, 14 Jan 2022 01:39:57 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web12.1721.1642124396083724687 for ; Thu, 13 Jan 2022 17:39:56 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=LZ8V6+kx; 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.166.238, mailfrom: prvs=80133a60ff=yi.zhao@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20E1SUwC012691 for ; Thu, 13 Jan 2022 17:39:55 -0800 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=9EZM6K1jyCFBeKHD/tjxbyFzd+V7Sx12ql4+dYlpLqM=; b=LZ8V6+kxdoes7+XRkix1OQuwT3V8eV9Ac/kwPedKCFO9Ac8Tttc1V5HdGDWQPL6In9jk jR1Klxh6pPUoxuKpKAcVxGSCuj0B6UVIafDaMufCgDVqtOLNZTSoPsQvLNkgCT1E9Jrc th/qM92zuPKBe7Hj2aV48pliOJ8AfmtgxdPRHvD3qnvbOyRaaQohuKWgoVDIE+b5OdxV pNXpiFxNhMr3MaRY6OJEx1S4nq4WvLn8BZxjcTRVnqmLNdli9YYKoaboUZMylSNGIWlz +592sjCY6QoCkc8f93TCblp8IvjH0rP/h4C/U/3td6sKikSPxZGzG4Z1gWhpRLY5ugE1 Rw== Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2104.outbound.protection.outlook.com [104.47.55.104]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3dhy079ad6-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 13 Jan 2022 17:39:55 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mWD+DkiKWIS1BV7vPHzTKmTlVPYh+WtKa0MdbpVcISuXX+O/QiRmECU478F1Z+g8aHoc+eGa7GzxSkdQQrZ9ZQDpiLkPBOiFDQzP8eOwWYrP07UklOIiKHPCzo8IKAvieCGQQauNw8vsc1tn194Ac94uz6+pOoGZNmGHFApcCchGtrP2mroxxG+v0od4KpM2FHEKORjWxf5lYvh9miHI3YHY8sTpvuIjxqqNqJXY0bDjRfa101f6j719pE3I8K21JsewhUDFjqPW89FwDePJIEi/elR/5oAtxE2d+dPygiO13BRi1Y0VXF/EHgQv47GyHU9kcUJprZJd3YIzYmZZ0A== 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=9EZM6K1jyCFBeKHD/tjxbyFzd+V7Sx12ql4+dYlpLqM=; b=A52uyc0qnO7JrrIOoNe5fHOqqP4mLNFO8lBAWuNOusIsu9YuBb2pErjHapRv83DSETqm4wSAzt83iM29uqiARSf80pK6kc86EWfWpgukRkLTYMEjWTAcExyKKO6VPrK8DQ+ISTNcK5GFx32zdBPJWOMkpGc0l1kjdSAc3R7X3RdzRLtRzfI0LeNvN0GnEpPHd0TUf9BfMv2u+nKMd3zf7KPOAxBC8v/M5fCP5EU2niJQAfPboAqzVV0iU35DFfrKP2OViYgps1Ul3jDnSIuTMf5fvApRv7G8cgG8NtgwUJtJYTqwGBOOoIdJ5K3EXj5MV5bMzYHJ2vE8GUkDh5zCvA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from SJ0PR11MB4878.namprd11.prod.outlook.com (2603:10b6:a03:2d8::19) by DM6PR11MB3145.namprd11.prod.outlook.com (2603:10b6:5:6e::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.11; Fri, 14 Jan 2022 01:39:53 +0000 Received: from SJ0PR11MB4878.namprd11.prod.outlook.com ([fe80::687b:9478:2713:459]) by SJ0PR11MB4878.namprd11.prod.outlook.com ([fe80::687b:9478:2713:459%5]) with mapi id 15.20.4888.011; Fri, 14 Jan 2022 01:39:53 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 2/6] ipset: upgrade 7.11 -> 7.15 Date: Fri, 14 Jan 2022 09:39:37 +0800 Message-Id: <20220114013941.229837-2-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220114013941.229837-1-yi.zhao@windriver.com> References: <20220114013941.229837-1-yi.zhao@windriver.com> X-ClientProxiedBy: HK2PR04CA0087.apcprd04.prod.outlook.com (2603:1096:202:15::31) To SJ0PR11MB4878.namprd11.prod.outlook.com (2603:10b6:a03:2d8::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d706dc3a-ef0b-493b-a4dd-08d9d6fec31c X-MS-TrafficTypeDiagnostic: DM6PR11MB3145:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:421; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zguPbHUNMwCtKFf//omKnFb+KaGA5ROsFk5R6xhEpm7E5Sy3dcnJJygL6mUWXtSvUe+siNQgDB/8p+x+XtVIlNJYyhqwTP5Rjp3AuU42wJURTfDXkAaXtzv3zFWicOBKb6WF+ecxWIQHUllOO9+TffEJTogQRvJQsMYFZDaCdzmTkF4RvwtjnmbjtT3Rh1UjOB8U+pYi91ZfjvHuQD4KL2/8jlHy0GVVG/zG6VE+6QJQOt5kQniw0LVHxJKAz+bD66xwBB8eB5tjVhxs1TgKkMM3qKbr4Ljg60AFEO3Ghy7t4Wj5GRX7j7yfjG92w4NG+Oe7+CaK6yVoonquD4/1/2FDZwnziXM7B6pBlfKQkfgocFv+4LvyLLPnOje5dnpwZeXu82Q6XlM7aqQ/fZ/M+1wW+IyQF/Rgat6wV0a4Z2oItPd3XPScbu9HKYd40M4YdvgQupsEGt3vV4tdrh6IC5kN4U89dfB8NlX67MA1yUKzSBPFQzqG+FNgA7Bk2N5uL/EsAHuv1HTaDUy6efx33qAMA8SjAaQWGWktDcAeXmfQfhBwCNksXc9Ovm2aL3USNALv7zKASW8WmA1ivtOxUNUFfIqQmz1IqguQp5DZtKGEISnq7XaM4flCY5+I33EAJSLBnux8UlkG5hzyViAk9JoMJB3a/Sm45xFnMKC23cRkq3s2yOpmQS1QitUF+CQzR580aWCIRLjcJcfl7Yc1bOLxEmDJHhRkBkN7/TIWsZOytGQdePZ7pyANreN2mdZU5dDvqxVPYuZU5E4ANifGlEQZqoLbHkftmO4DuLrb88k= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB4878.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(6666004)(6506007)(66556008)(1076003)(66476007)(2906002)(5660300002)(316002)(6916009)(83380400001)(44832011)(66946007)(8936002)(2616005)(8676002)(36756003)(86362001)(52116002)(508600001)(6512007)(26005)(38100700002)(38350700002)(186003)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /PQ7jisH31D/4Mj9KK+mNJy+InnfacIu3lvGGNeefaPVDfQx5nQn7L6tU9vAe2f3yhQ7tLgyKg1Eu3ejXQyqRLSVsXVbqDsdgfikFjA2eJpU6xtbAf60Yzr+hrtGQuE6V2zNeHDGlVkwBxEca3rybVPYiy8AIZxvoqTnipzNiFkyypfmlWhGPN9Wv09lokfg5L7jYNKUmVibefzaI3NwS62qmxz1gKqaOdLPJ2dWpQllTfRMplO3XHWxTSuv7OfaQewURTg9B0KwJ2sAI9oTUnZDtTAVwAgKtUZXkKdRoej5h5bQuzn2CqzmH4jcgr+rP3BZQ0zi7X4d6kZUPtwRtVCUSZf6lmQIkUcpFl/nLWRXi8+C/h3ms4qt43HL4gb+DBYp3fDr0XeBDL2sYJP+l7SJVSpcvw63dPT6CqHz3sAWBk0rj7jVUTkDnUwQ6gNptnCW4OUPC/cbRFlhQHCpYIIFNquS9xkB0G77+WZTnqsYPHdkBb+gf7ap7TOh/wNM4X91xupoz51KXg9vFQO44V2SyggeWj+1Qo8SChSjbnAtpd3HhMO6p5J2NPgVyGWZ/4GnhYGEAcP2/VYWbW46L5euTzX9LbTzAOLWXWUP97SyIF1jEwDGXLORtQJ2OhpHfRAeZ62gjMIjCqnEASKE3fw1ta6H5mO1Q6fLcWdwJiItm2doaj5XBGCs3wYx8NKUfm15fx3v+kDL3q2WzA+IymOXUSEo3MhNiAMauhsaV2PFY4/MIqKuJo7wv6kKCEoFfDwm9WdFyZS5UQPdM4wa7IsHUpe2lMUQyGWW/drWkx3GtKlqfbnwGAqajjsvFhlwcNdgO/4GauTdcaFyePKQqYJEbh+6TDXisjPj4AWFnMJj9xC7ukW0xM9FAXd+NvWE2EECmIz+C5H5S55Rlxd1Wfa6kGAkhfOGg2UYrk3iljFhT+lrUuB9HhfBcuDH9LntPJmQdxLfaxaADFJihHRKw/HTqnEgreatEciW6vvw8DTnUp0hYr0uYrMuyD3KO6pZvJp8+RM7wcBHI/4LykmyBSII5p5DntgOONf6JA8RgSAKUJz15cmP6Y4yVhziV/gL/VTtIQKhGPfaEWU/BrT/10AvHXUzOwxg2rliZvhkc/xnr0Mt6XJxBj9+hEGB4o6rvxXcn2WGDXetpYkscCcVPR6j5PnUofYAWiyJKJgQK/DMqklgSctkgJ9zqJ774IcyOqiSYiKOLWKu8IN4ngDttvI+B5qCU8p2/wjypCjkGJXKg/FwBAuiwjbUZuSC9QNlqY9C7/QQnsPKutAD1WkgUP+3otHTbPoRYmVqDhxXBy0xbc7qO59b08OZeqwE/iS0srqUEXkIrmLlpmGWG962co4ar4Gw+DlqHIT6WWH8NCWa9BOW7ObywqL/DYH01AC0hZ1lRhKgXoXNw4W8wTR94xYZ7qAvg/2dxZggE2Pwa6nRDABdjZGxdrKltrnpR8HgytC4XBmOOMapnmcTADCgtFzbSFs5LOl6J6NEK+1ToUArfiL6/aTrQL5sQZpbuo2WOcaoC3vN5/BtKZz106xZjDRINg1cmM5DYZpxF7Son3tX5B/0Iu3OpFzKdZKzYzhI5pohroHGLFHClPXqcM4p1XInSeuRTRz6hKa/87KAWm4= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: d706dc3a-ef0b-493b-a4dd-08d9d6fec31c X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB4878.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2022 01:39:53.6075 (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: zSAqDcTroXHCVsT2QdmVGw+gflIqiUDl3dal2bpo1vOuYpP0Xu8vCht/GIpx8ORto4a2TLXroQrp5ATbELBfAA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB3145 X-Proofpoint-GUID: PE5fXOgA4GjaN2IPasZ_Bi8ifvpNU_tp X-Proofpoint-ORIG-GUID: PE5fXOgA4GjaN2IPasZ_Bi8ifvpNU_tp 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-13_10,2022-01-13_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=812 bulkscore=0 phishscore=0 malwarescore=0 priorityscore=1501 spamscore=0 mlxscore=0 impostorscore=0 clxscore=1015 lowpriorityscore=0 adultscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201140007 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, 14 Jan 2022 01:39:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94816 Signed-off-by: Yi Zhao --- .../recipes-filter/ipset/{ipset_7.11.bb => ipset_7.15.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-networking/recipes-filter/ipset/{ipset_7.11.bb => ipset_7.15.bb} (87%) diff --git a/meta-networking/recipes-filter/ipset/ipset_7.11.bb b/meta-networking/recipes-filter/ipset/ipset_7.15.bb similarity index 87% rename from meta-networking/recipes-filter/ipset/ipset_7.11.bb rename to meta-networking/recipes-filter/ipset/ipset_7.15.bb index 3e64f4159..7af7dea7a 100644 --- a/meta-networking/recipes-filter/ipset/ipset_7.11.bb +++ b/meta-networking/recipes-filter/ipset/ipset_7.15.bb @@ -10,7 +10,7 @@ SECTION = "base" DEPENDS = "libtool libmnl" SRC_URI = "http://ftp.netfilter.org/pub/ipset/${BP}.tar.bz2" -SRC_URI[sha256sum] = "3151baad30f1d9e317b2ab4f2f5aa7a9f7b4dc11fcf8fe73acd0dc0b5dbabf7d" +SRC_URI[sha256sum] = "0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751" inherit autotools pkgconfig module-base From patchwork Fri Jan 14 01:39:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 2415 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 82658C433F5 for ; Fri, 14 Jan 2022 01:39:58 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web10.1660.1642124397977235735 for ; Thu, 13 Jan 2022 17:39:58 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=Cy9lWAT5; 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.166.238, mailfrom: prvs=80133a60ff=yi.zhao@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20E1XUqP020345 for ; Thu, 13 Jan 2022 17:39:57 -0800 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=m1h5bKBcRD8E8IJ/ojaWMfELF+uG1ScCPItv6qBvHgs=; b=Cy9lWAT5zuSOoC7Pb7q4H3I/RkZ/eLVCztxaqQIOOFB7pYw6ZOhei/h9ajm5AE2WSbd8 6INczgJx6o7iDlrC9fP8nTiQfGHq/J27snpDfxyurSkZHMC1CEtq1j1fNCKFNAHU9Ya7 eZXcCXW4jLVAClEJ05HWabNL7QC5WzRjffRFYoEQNviE9PaXI7CXBJaY6poQrNQrynIR 2tDljIKxGq6WZUjkHWK7a9CkFOeFZiHeYV8ubMkbdeV1/pt3jKsCkivRPTu8s8TmCvQS VPF2DQbjTjlN/gbBGvs9I1bJATaasy/qJHmTgd5ypIYeyPaOVkZfYoJ1d0KgWy0OdkaH /g== Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2103.outbound.protection.outlook.com [104.47.55.103]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3dhy079ad7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 13 Jan 2022 17:39:57 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IOmPMLiBRtKpPCLlQiHIa713cROmOp0ZwInH2t3Y7swmXryk0oB4Ddps/u0mgctBfMQYgs4MVBByqPm9YOhwdA2o0FSexB2Rk0spIj1LeDVbrxhWp8sq5vkYCajVs4u7wIjlorufNReLMyM+9g9J879peevZ0Q4Ark9xhW+UxQHzK//T8nsb+T/t4vs4RrHVOAkQRwvLrotTB3j23LI+lwo6rum/2UMfkqI8P4lllYHSlTWMgNl8vRguJFz7do7BXWlUxJcaqpe2QXhNu5kSRarPy/IaCC6IKM/M9lDcJFS83XobkTEL5C+h/v7MFU+t2NANr2cT8q01zGs7VQOFWA== 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=m1h5bKBcRD8E8IJ/ojaWMfELF+uG1ScCPItv6qBvHgs=; b=YmJjBx0oN3gYAV+OTuhf5XNJtIq5CgCPwatOYFJHfEooW8XbbvDU8tFgWkcm/TGsu5zSBRdHhoHiYz/LB52XvKi6DbjmnAsYlCBZLccStuNuW+W4G2iLmXWUJ2qYg4SXy6j1829nGwTBvh+1USKqDS9ziEH3Py8L3UIqR67HnITbgOdPjHCbyd4W/TwHKnRtC7mgjugd1F7QyZB0U7ibMFtSYYMNRdo8ydrRofU9I6r4vKQOGPZ1+icnTfxKbTvCWvfCxrObvbaGUR6bytcCBPU96sN7+yNoFytoH9B5ohpXTDZraKh41uinBkIooT6694bn296b+8TL91HOwSHZ/w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from SJ0PR11MB4878.namprd11.prod.outlook.com (2603:10b6:a03:2d8::19) by DM6PR11MB3145.namprd11.prod.outlook.com (2603:10b6:5:6e::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.11; Fri, 14 Jan 2022 01:39:54 +0000 Received: from SJ0PR11MB4878.namprd11.prod.outlook.com ([fe80::687b:9478:2713:459]) by SJ0PR11MB4878.namprd11.prod.outlook.com ([fe80::687b:9478:2713:459%5]) with mapi id 15.20.4888.011; Fri, 14 Jan 2022 01:39:54 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 3/6] libnetfilter-queue: upgrade 1.0.3 -> 1.0.5 Date: Fri, 14 Jan 2022 09:39:38 +0800 Message-Id: <20220114013941.229837-3-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220114013941.229837-1-yi.zhao@windriver.com> References: <20220114013941.229837-1-yi.zhao@windriver.com> X-ClientProxiedBy: HK2PR04CA0087.apcprd04.prod.outlook.com (2603:1096:202:15::31) To SJ0PR11MB4878.namprd11.prod.outlook.com (2603:10b6:a03:2d8::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 288c0b1a-ee71-40f4-0a3e-08d9d6fec3cd X-MS-TrafficTypeDiagnostic: DM6PR11MB3145:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: e/ccMN8WM8rnI5+7OyNCFNO77pypha4Ku1wjq7+nt7RRxqkSdSuYAD5MnKuBwtgeIJzGjp8SqvplSDo3z06M8mom9+Lxpz2wo19AQQIUO0HkFfdkdSRhIpR1F4hejTYlpab++q7ItFyiRLSYAQe2E2si0fuK9ZHuP3K7sF8sX+Z+dIxMop2PMnh1dkCXCTDus0RoQ7xiwSAF+ScADk0Yj4zwXPBE5CzbsZH3cT7+vHdLGNLuK5+DdNNnSatqtQMdUjXHmKmgL4/DjPZ8Xc5Ovp6GH47dm4lIGCdkD1a/WTDwEXnJwBdmoTp9Y68KODdeNon9csflmuIFGQkN/Q6I+QdjAfv3BBYn+rSjpWJPmyBCRE2cRM4i6nImQFit9kMuwO7/xgIDr537WsqES/+0JHoUQLM0c1xG0aUYpqd3ngByBuTdzf5s5Zegs2Un21uFWONlVzTtNUbBLwC8jGdG8a1DMF81T8sqis3BsOtBBDeROku8TaZYB3i/dWE+Qc/roU+ANk9EgY0y7TOdLYOZ5h+8GPBYHMkI9Ur5S+KG2CMHvtxm+FYnyKUQ6QQChX+5dXS2Vvl+3HoH4j86EX6eknGkZ0Lmyyoi8N2L5YyJpqrfJ+Zo7YssgRFJsP+N3u1XMvWLH3KrPs/nm3Yvz8lngqe6Ni4oJ8RGFTRrpWeScHXEqw31mczjJ4bu5KIpMb4pMetrZZLtKr+2n3yfn9cUWg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB4878.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(6666004)(30864003)(6506007)(66556008)(1076003)(66476007)(2906002)(5660300002)(316002)(6916009)(83380400001)(44832011)(66946007)(8936002)(2616005)(8676002)(36756003)(86362001)(52116002)(508600001)(6512007)(26005)(38100700002)(38350700002)(186003)(6486002)(579004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QzRpJcOEVxPIlZz4C3Xn0k63Zk+uXzYGDtDGq2gntnSEhvpJl27si+/zKVCkPfBPiOfyC7OZixBswrAlXU/Jj2zUKKVEhtZUw5ztmFqE0YXaLiOUS6v4cv9DlIuBVKk/SWPMhAvBtDl1mUbpfvv9MeBZG6mMM6uQtbYRmV/a2Wz8C/vnXQvEM1mjrarjUne16PtlOGxukfvBuVisALRayxWVL8uxr7ncqUW5vKRwdA5iesYUOslogIj9pb7CTQ8ahNnZuhHAhDevZ5IcO0IePPrU0yiuw+sC0N8iBJyIRAK5dut4FHEVcIUdErXO4OFNtZ+r4EPRGkPcFKVmYbMQu6Ubv7Y8UGDmePfKCUVgrf3h32gkDTTD/UhIVHRiBMQ3DW7zfggTTovR6xr+1xotG4wc0zGtt0lSRY9kNQk2yhq1oRqtHnrZ297GUevGWUECz8jEIkrAOUYvR0RlCycS/DUjrMt94H5yi+SGqhDwR+tCGh77PaW/W7Vk53qKxqxjhMd/qAWy59+35WZ2UMt24pDcw5l1+W0MiaHQnym0rft9yefifyjN6X4Oy6KxPM2n/rhoWis+Hy5jmKPBLhXPkiXyL2GidMuNLYa044C2rppM+NMYO+NgBiwT3OLFlKP/gXxAVqyR0KGqEv+VuKk9FuR8B5FSFu0nBY8DeLYCvyeX5JGsQE1qb2DPs1jgvPqSXlOK8+mCnK046wne/2LNOzD6xgZVLfYyTONc/pSR2vJdOB0HeGQodF9t50p6uLBilukEoD0zxpiDc+CzquK3p6G3joLW0bn1l0yBNqz3grH+PmMIB8/fQWCUOpidvl/TBq4AQxO94UbmFUnOaWiwuWTCDXB7NWe+14979OjHV/lXFfkI4zSId5lOrsbFdhhgmT2J1R3yixMZeSTfzNNQi6B1DifaeM3bNjQhix2c9HGoDTjMoUzuXWMyXI/QQnSqef5RPLnkPrePVp+JHaOK2DquheJv9JSQVQ56uXrIiur9HGYeh6pq8MV/Z0ju4fTQttQS5Sww8hur1jlWVcI/9M0MuKfbhzjbZ89srXFtm4FvXouXOkkX2ebjlmoPOinmrT1bKVw9ckYUrhXv1tRZyyJ9REPeuPbjvHliuTybVAv0E8NEzaFwX5U1l2obmRg1Wd7WZjozSCwAI/6X9etAupkMzeS8Y9xyEClQhY3EX++Le8ftrlIk1pQYg+Kr0swzcXjrJAZw3kiT6YWz3TD9pGOytjMsHSLxR2F0NnpLWIcV5egfEmLpvOnkWe8sHCbTAX+P05WQbo2D/dg8f/F0CFDwpxnNMLGcbjXFHpdoGjY7kpYLvt9/kM50KHaRlWAOS0TCynbIBoPXt6dysOu1r92WHDdFZXFgEKnRxZx6FYym3Rn5cVpNjaVyxAaClymIoyt++RAVg2rMqNI8M7fdk8zZOOFl20XnWOjI2Pi8IQiLsVXNcTzrAYxWQ6glxEeafSUa3pfZSVFnW0eO/P+9Q38Wp+/8pwFGzosOM4nBHAl7GWos9Q/Kbpf5OvRP6jHlGMcIKCNEWifQ0j9D0gSe6X5StD8JaMHYUP56dNwYeGlKKcxFiFsHDwKfFPIU0zdQOLO3/qT+00t8sx6DArYqw5x+b3foIqgq9/1Xrg/jowY= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 288c0b1a-ee71-40f4-0a3e-08d9d6fec3cd X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB4878.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2022 01:39:54.7792 (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: y+5cmnTK9WnWLtpr3EJJXlPgel47orl30gEX/6CHZKRWaUumeMG0raEXXy06bJzeQf4vjmPs4F/e6Anz1JGXzg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB3145 X-Proofpoint-GUID: lC7kk7DhHS70UNJRygtFCzmGF3XD0vL8 X-Proofpoint-ORIG-GUID: lC7kk7DhHS70UNJRygtFCzmGF3XD0vL8 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-13_10,2022-01-13_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 bulkscore=0 phishscore=0 malwarescore=0 priorityscore=1501 spamscore=0 mlxscore=0 impostorscore=0 clxscore=1015 lowpriorityscore=0 adultscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201140007 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, 14 Jan 2022 01:39:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94817 Drop 0001-libnetfilter-queue-Declare-the-define-visivility-attribute-together.patch as the clang build issue had been fixed upstream. Signed-off-by: Yi Zhao --- ...define-visivility-attribute-together.patch | 1227 ----------------- ...e_1.0.3.bb => libnetfilter-queue_1.0.5.bb} | 3 +- 2 files changed, 1 insertion(+), 1229 deletions(-) delete mode 100644 meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-queue-Declare-the-define-visivility-attribute-together.patch rename meta-networking/recipes-filter/libnetfilter/{libnetfilter-queue_1.0.3.bb => libnetfilter-queue_1.0.5.bb} (77%) diff --git a/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-queue-Declare-the-define-visivility-attribute-together.patch b/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-queue-Declare-the-define-visivility-attribute-together.patch deleted file mode 100644 index aa9ff09a9..000000000 --- a/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-queue-Declare-the-define-visivility-attribute-together.patch +++ /dev/null @@ -1,1227 +0,0 @@ -From db7eb5f0a4e78c6bd3c4f9cbd8332d909eb82ad6 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 10 Apr 2017 12:09:41 -0700 -Subject: [PATCH] Declare the define visivility attribute together - -clang ignores the visibility attribute if its not -defined before the definition. As a result these -symbols become hidden and consumers of this library -fail to link due to these missing symbols - -Signed-off-by: Khem Raj - ---- - doxygen.cfg.in | 2 +- - src/extra/ipv4.c | 15 ++---- - src/extra/ipv6.c | 9 ++-- - src/extra/pktbuff.c | 42 +++++---------- - src/extra/tcp.c | 21 +++----- - src/extra/udp.c | 21 +++----- - src/internal.h | 5 +- - src/libnetfilter_queue.c | 108 +++++++++++++-------------------------- - src/nlmsg.c | 21 +++----- - 9 files changed, 82 insertions(+), 162 deletions(-) - -diff --git a/doxygen.cfg.in b/doxygen.cfg.in -index a7378ca..659abee 100644 ---- a/doxygen.cfg.in -+++ b/doxygen.cfg.in -@@ -72,7 +72,7 @@ RECURSIVE = YES - EXCLUDE = - EXCLUDE_SYMLINKS = NO - EXCLUDE_PATTERNS = --EXCLUDE_SYMBOLS = EXPORT_SYMBOL -+EXCLUDE_SYMBOLS = - EXAMPLE_PATH = - EXAMPLE_PATTERNS = - EXAMPLE_RECURSIVE = NO -diff --git a/src/extra/ipv4.c b/src/extra/ipv4.c -index a93d113..56d5dc7 100644 ---- a/src/extra/ipv4.c -+++ b/src/extra/ipv4.c -@@ -32,7 +32,7 @@ - * This funcion returns NULL if the IPv4 is malformed or the protocol version - * is not 4. On success, it returns a valid pointer to the IPv4 header. - */ --struct iphdr *nfq_ip_get_hdr(struct pkt_buff *pktb) -+struct iphdr __EXPORTED *nfq_ip_get_hdr(struct pkt_buff *pktb) - { - struct iphdr *iph; - unsigned int pktlen = pktb->tail - pktb->network_header; -@@ -53,14 +53,13 @@ struct iphdr *nfq_ip_get_hdr(struct pkt_buff *pktb) - - return iph; - } --EXPORT_SYMBOL(nfq_ip_get_hdr); - - /** - * nfq_ip_set_transport_header - set transport header - * \param pktb: pointer to network packet buffer - * \param iph: pointer to the IPv4 header - */ --int nfq_ip_set_transport_header(struct pkt_buff *pktb, struct iphdr *iph) -+int __EXPORTED nfq_ip_set_transport_header(struct pkt_buff *pktb, struct iphdr *iph) - { - int doff = iph->ihl * 4; - -@@ -71,7 +70,6 @@ int nfq_ip_set_transport_header(struct pkt_buff *pktb, struct iphdr *iph) - pktb->transport_header = pktb->network_header + doff; - return 0; - } --EXPORT_SYMBOL(nfq_ip_set_transport_header); - - /** - * nfq_ip_set_checksum - set IPv4 checksum -@@ -80,14 +78,13 @@ EXPORT_SYMBOL(nfq_ip_set_transport_header); - * \note Call to this function if you modified the IPv4 header to update the - * checksum. - */ --void nfq_ip_set_checksum(struct iphdr *iph) -+void __EXPORTED nfq_ip_set_checksum(struct iphdr *iph) - { - uint32_t iph_len = iph->ihl * 4; - - iph->check = 0; - iph->check = nfq_checksum(0, (uint16_t *)iph, iph_len); - } --EXPORT_SYMBOL(nfq_ip_set_checksum); - - /** - * nfq_ip_mangle - mangle IPv4 packet buffer -@@ -100,7 +97,7 @@ EXPORT_SYMBOL(nfq_ip_set_checksum); - * - * \note This function recalculates the IPv4 checksum (if needed). - */ --int nfq_ip_mangle(struct pkt_buff *pkt, unsigned int dataoff, -+int __EXPORTED nfq_ip_mangle(struct pkt_buff *pkt, unsigned int dataoff, - unsigned int match_offset, unsigned int match_len, - const char *rep_buffer, unsigned int rep_len) - { -@@ -116,7 +113,6 @@ int nfq_ip_mangle(struct pkt_buff *pkt, unsigned int dataoff, - - return 1; - } --EXPORT_SYMBOL(nfq_ip_mangle); - - /** - * nfq_pkt_snprintf_ip - print IPv4 header into buffer in iptables LOG format -@@ -128,7 +124,7 @@ EXPORT_SYMBOL(nfq_ip_mangle); - * case that there is enough room in the buffer. Read snprintf manpage for more - * information to know more about this strange behaviour. - */ --int nfq_ip_snprintf(char *buf, size_t size, const struct iphdr *iph) -+int __EXPORTED nfq_ip_snprintf(char *buf, size_t size, const struct iphdr *iph) - { - int ret; - struct in_addr src = { iph->saddr }; -@@ -147,7 +143,6 @@ int nfq_ip_snprintf(char *buf, size_t size, const struct iphdr *iph) - - return ret; - } --EXPORT_SYMBOL(nfq_ip_snprintf); - - /** - * @} -diff --git a/src/extra/ipv6.c b/src/extra/ipv6.c -index 7c5dc9b..6641c6b 100644 ---- a/src/extra/ipv6.c -+++ b/src/extra/ipv6.c -@@ -33,7 +33,7 @@ - * This funcion returns NULL if an invalid header is found. On sucess, it - * returns a valid pointer to the header. - */ --struct ip6_hdr *nfq_ip6_get_hdr(struct pkt_buff *pktb) -+struct ip6_hdr __EXPORTED *nfq_ip6_get_hdr(struct pkt_buff *pktb) - { - struct ip6_hdr *ip6h; - unsigned int pktlen = pktb->tail - pktb->network_header; -@@ -50,7 +50,6 @@ struct ip6_hdr *nfq_ip6_get_hdr(struct pkt_buff *pktb) - - return ip6h; - } --EXPORT_SYMBOL(nfq_ip6_get_hdr); - - /** - * nfq_ip6_set_transport_header - set transport header pointer for IPv6 packet -@@ -61,7 +60,7 @@ EXPORT_SYMBOL(nfq_ip6_get_hdr); - * This function returns 1 if the protocol has been found and the transport - * header has been set. Otherwise, it returns 0. - */ --int nfq_ip6_set_transport_header(struct pkt_buff *pktb, struct ip6_hdr *ip6h, -+int __EXPORTED nfq_ip6_set_transport_header(struct pkt_buff *pktb, struct ip6_hdr *ip6h, - uint8_t target) - { - uint8_t nexthdr = ip6h->ip6_nxt; -@@ -115,7 +114,6 @@ int nfq_ip6_set_transport_header(struct pkt_buff *pktb, struct ip6_hdr *ip6h, - pktb->transport_header = cur; - return cur ? 1 : 0; - } --EXPORT_SYMBOL(nfq_ip6_set_transport_header); - - /** - * nfq_ip6_snprintf - print IPv6 header into one buffer in iptables LOG format -@@ -124,7 +122,7 @@ EXPORT_SYMBOL(nfq_ip6_set_transport_header); - * \param ip6_hdr: pointer to a valid IPv6 header. - * - */ --int nfq_ip6_snprintf(char *buf, size_t size, const struct ip6_hdr *ip6h) -+int __EXPORTED nfq_ip6_snprintf(char *buf, size_t size, const struct ip6_hdr *ip6h) - { - int ret; - char src[INET6_ADDRSTRLEN]; -@@ -143,7 +141,6 @@ int nfq_ip6_snprintf(char *buf, size_t size, const struct ip6_hdr *ip6h) - - return ret; - } --EXPORT_SYMBOL(nfq_ip6_snprintf); - - /** - * @} -diff --git a/src/extra/pktbuff.c b/src/extra/pktbuff.c -index 1c15a00..54d8244 100644 ---- a/src/extra/pktbuff.c -+++ b/src/extra/pktbuff.c -@@ -40,7 +40,7 @@ - * - * \return a pointer to a new queue handle or NULL on failure. - */ --struct pkt_buff * -+struct pkt_buff __EXPORTED * - pktb_alloc(int family, void *data, size_t len, size_t extra) - { - struct pkt_buff *pktb; -@@ -84,120 +84,108 @@ pktb_alloc(int family, void *data, size_t len, size_t extra) - } - return pktb; - } --EXPORT_SYMBOL(pktb_alloc); - - /** - * pktb_data - return pointer to the beginning of the packet buffer - * \param pktb Pointer to packet buffer - */ --uint8_t *pktb_data(struct pkt_buff *pktb) -+uint8_t __EXPORTED *pktb_data(struct pkt_buff *pktb) - { - return pktb->data; - } --EXPORT_SYMBOL(pktb_data); - - /** - * pktb_len - return length of the packet buffer - * \param pktb Pointer to packet buffer - */ --uint32_t pktb_len(struct pkt_buff *pktb) -+uint32_t __EXPORTED pktb_len(struct pkt_buff *pktb) - { - return pktb->len; - } --EXPORT_SYMBOL(pktb_len); - - /** - * pktb_free - release packet buffer - * \param pktb Pointer to packet buffer - */ --void pktb_free(struct pkt_buff *pktb) -+void __EXPORTED pktb_free(struct pkt_buff *pktb) - { - free(pktb); - } --EXPORT_SYMBOL(pktb_free); - - /** - * pktb_push - update pointer to the beginning of the packet buffer - * \param pktb Pointer to packet buffer - */ --void pktb_push(struct pkt_buff *pktb, unsigned int len) -+void __EXPORTED pktb_push(struct pkt_buff *pktb, unsigned int len) - { - pktb->data -= len; - pktb->len += len; - } --EXPORT_SYMBOL(pktb_push); - - /** - * pktb_pull - update pointer to the beginning of the packet buffer - * \param pktb Pointer to packet buffer - */ --void pktb_pull(struct pkt_buff *pktb, unsigned int len) -+void __EXPORTED pktb_pull(struct pkt_buff *pktb, unsigned int len) - { - pktb->data += len; - pktb->len -= len; - } --EXPORT_SYMBOL(pktb_pull); - - /** - * pktb_put - add extra bytes to the tail of the packet buffer - * \param pktb Pointer to packet buffer - */ --void pktb_put(struct pkt_buff *pktb, unsigned int len) -+void __EXPORTED pktb_put(struct pkt_buff *pktb, unsigned int len) - { - pktb->tail += len; - pktb->len += len; - } --EXPORT_SYMBOL(pktb_put); - - /** - * pktb_trim - set new length for this packet buffer - * \param pktb Pointer to packet buffer - */ --void pktb_trim(struct pkt_buff *pktb, unsigned int len) -+void __EXPORTED pktb_trim(struct pkt_buff *pktb, unsigned int len) - { - pktb->len = len; - } --EXPORT_SYMBOL(pktb_trim); - - /** - * pktb_tailroom - get room in bytes in the tail of the packet buffer - * \param pktb Pointer to packet buffer - */ --unsigned int pktb_tailroom(struct pkt_buff *pktb) -+unsigned int __EXPORTED pktb_tailroom(struct pkt_buff *pktb) - { - return pktb->data_len - pktb->len; - } --EXPORT_SYMBOL(pktb_tailroom); - - /** - * pktb_mac_header - return pointer to layer 2 header (if any) - * \param pktb Pointer to packet buffer - */ --uint8_t *pktb_mac_header(struct pkt_buff *pktb) -+uint8_t __EXPORTED *pktb_mac_header(struct pkt_buff *pktb) - { - return pktb->mac_header; - } --EXPORT_SYMBOL(pktb_mac_header); - - /** - * pktb_network_header - return pointer to layer 3 header - * \param pktb Pointer to packet buffer - */ --uint8_t *pktb_network_header(struct pkt_buff *pktb) -+uint8_t __EXPORTED *pktb_network_header(struct pkt_buff *pktb) - { - return pktb->network_header; - } --EXPORT_SYMBOL(pktb_network_header); - - /** - * pktb_transport_header - return pointer to layer 4 header (if any) - * \param pktb Pointer to packet buffer - */ --uint8_t *pktb_transport_header(struct pkt_buff *pktb) -+uint8_t __EXPORTED *pktb_transport_header(struct pkt_buff *pktb) - { - return pktb->transport_header; - } --EXPORT_SYMBOL(pktb_transport_header); - - static int pktb_expand_tail(struct pkt_buff *pkt, int extra) - { -@@ -224,7 +212,7 @@ static int enlarge_pkt(struct pkt_buff *pkt, unsigned int extra) - return 1; - } - --int pktb_mangle(struct pkt_buff *pkt, -+int __EXPORTED pktb_mangle(struct pkt_buff *pkt, - unsigned int dataoff, - unsigned int match_offset, - unsigned int match_len, -@@ -258,17 +246,15 @@ int pktb_mangle(struct pkt_buff *pkt, - pkt->mangled = true; - return 1; - } --EXPORT_SYMBOL(pktb_mangle); - - /** - * pktb_mangled - return true if packet has been mangled - * \param pktb Pointer to packet buffer - */ --bool pktb_mangled(const struct pkt_buff *pkt) -+bool __EXPORTED pktb_mangled(const struct pkt_buff *pkt) - { - return pkt->mangled; - } --EXPORT_SYMBOL(pktb_mangled); - - /** - * @} -diff --git a/src/extra/tcp.c b/src/extra/tcp.c -index d1cd79d..8038ce5 100644 ---- a/src/extra/tcp.c -+++ b/src/extra/tcp.c -@@ -40,7 +40,7 @@ - * \note You have to call nfq_ip_set_transport_header or - * nfq_ip6_set_transport_header first to access the TCP header. - */ --struct tcphdr *nfq_tcp_get_hdr(struct pkt_buff *pktb) -+struct tcphdr __EXPORTED *nfq_tcp_get_hdr(struct pkt_buff *pktb) - { - if (pktb->transport_header == NULL) - return NULL; -@@ -51,14 +51,13 @@ struct tcphdr *nfq_tcp_get_hdr(struct pkt_buff *pktb) - - return (struct tcphdr *)pktb->transport_header; - } --EXPORT_SYMBOL(nfq_tcp_get_hdr); - - /** - * nfq_tcp_get_payload - get the TCP packet payload - * \param tcph: pointer to the TCP header - * \param pktb: pointer to user-space network packet buffer - */ --void *nfq_tcp_get_payload(struct tcphdr *tcph, struct pkt_buff *pktb) -+void __EXPORTED *nfq_tcp_get_payload(struct tcphdr *tcph, struct pkt_buff *pktb) - { - unsigned int len = tcph->doff * 4; - -@@ -72,47 +71,43 @@ void *nfq_tcp_get_payload(struct tcphdr *tcph, struct pkt_buff *pktb) - - return pktb->transport_header + len; - } --EXPORT_SYMBOL(nfq_tcp_get_payload); - - /** - * nfq_tcp_get_payload_len - get the tcp packet payload - * \param tcph: pointer to the TCP header - * \param pktb: pointer to user-space network packet buffer - */ --unsigned int -+unsigned int __EXPORTED - nfq_tcp_get_payload_len(struct tcphdr *tcph, struct pkt_buff *pktb) - { - return pktb->tail - pktb->transport_header; - } --EXPORT_SYMBOL(nfq_tcp_get_payload_len); - - /** - * nfq_tcp_set_checksum_ipv4 - computes IPv4/TCP packet checksum - * \param tcph: pointer to the TCP header - * \param iph: pointer to the IPv4 header - */ --void -+void __EXPORTED - nfq_tcp_compute_checksum_ipv4(struct tcphdr *tcph, struct iphdr *iph) - { - /* checksum field in header needs to be zero for calculation. */ - tcph->check = 0; - tcph->check = nfq_checksum_tcpudp_ipv4(iph); - } --EXPORT_SYMBOL(nfq_tcp_compute_checksum_ipv4); - - /** - * nfq_tcp_set_checksum_ipv6 - computes IPv6/TCP packet checksum - * \param tcph: pointer to the TCP header - * \param iph: pointer to the IPv6 header - */ --void -+void __EXPORTED - nfq_tcp_compute_checksum_ipv6(struct tcphdr *tcph, struct ip6_hdr *ip6h) - { - /* checksum field in header needs to be zero for calculation. */ - tcph->check = 0; - tcph->check = nfq_checksum_tcpudp_ipv6(ip6h, tcph); - } --EXPORT_SYMBOL(nfq_tcp_compute_checksum_ipv6); - - /* - * The union cast uses a gcc extension to avoid aliasing problems -@@ -134,7 +129,7 @@ union tcp_word_hdr { - * \param tcp: pointer to a valid tcp header. - * - */ --int nfq_tcp_snprintf(char *buf, size_t size, const struct tcphdr *tcph) -+int __EXPORTED nfq_tcp_snprintf(char *buf, size_t size, const struct tcphdr *tcph) - { - int ret, len = 0; - -@@ -177,7 +172,6 @@ int nfq_tcp_snprintf(char *buf, size_t size, const struct tcphdr *tcph) - - return ret; - } --EXPORT_SYMBOL(nfq_tcp_snprintf); - - /** - * nfq_tcp_mangle_ipv4 - mangle TCP/IPv4 packet buffer -@@ -189,7 +183,7 @@ EXPORT_SYMBOL(nfq_tcp_snprintf); - * - * \note This function recalculates the IPv4 and TCP checksums for you. - */ --int -+int __EXPORTED - nfq_tcp_mangle_ipv4(struct pkt_buff *pkt, - unsigned int match_offset, unsigned int match_len, - const char *rep_buffer, unsigned int rep_len) -@@ -208,7 +202,6 @@ nfq_tcp_mangle_ipv4(struct pkt_buff *pkt, - - return 1; - } --EXPORT_SYMBOL(nfq_tcp_mangle_ipv4); - - /** - * @} -diff --git a/src/extra/udp.c b/src/extra/udp.c -index 8c44a66..99c8faa 100644 ---- a/src/extra/udp.c -+++ b/src/extra/udp.c -@@ -37,7 +37,7 @@ - * This function returns NULL if invalid UDP header is found. On success, - * it returns the UDP header. - */ --struct udphdr *nfq_udp_get_hdr(struct pkt_buff *pktb) -+struct udphdr __EXPORTED *nfq_udp_get_hdr(struct pkt_buff *pktb) - { - if (pktb->transport_header == NULL) - return NULL; -@@ -48,14 +48,13 @@ struct udphdr *nfq_udp_get_hdr(struct pkt_buff *pktb) - - return (struct udphdr *)pktb->transport_header; - } --EXPORT_SYMBOL(nfq_udp_get_hdr); - - /** - * nfq_udp_get_payload - get the UDP packet payload. - * \param udph: the pointer to the UDP header. - * \param tail: pointer to the tail of the packet - */ --void *nfq_udp_get_payload(struct udphdr *udph, struct pkt_buff *pktb) -+void __EXPORTED *nfq_udp_get_payload(struct udphdr *udph, struct pkt_buff *pktb) - { - uint16_t len = ntohs(udph->len); - -@@ -69,17 +68,15 @@ void *nfq_udp_get_payload(struct udphdr *udph, struct pkt_buff *pktb) - - return pktb->transport_header + sizeof(struct udphdr); - } --EXPORT_SYMBOL(nfq_udp_get_payload); - - /** - * nfq_udp_get_payload_len - get the udp packet payload. - * \param udp: the pointer to the udp header. - */ --unsigned int nfq_udp_get_payload_len(struct udphdr *udph, struct pkt_buff *pktb) -+unsigned int __EXPORTED nfq_udp_get_payload_len(struct udphdr *udph, struct pkt_buff *pktb) - { - return pktb->tail - pktb->transport_header; - } --EXPORT_SYMBOL(nfq_udp_get_payload_len); - - /** - * nfq_udp_set_checksum_ipv4 - computes a IPv4/TCP packet's segment -@@ -91,14 +88,13 @@ EXPORT_SYMBOL(nfq_udp_get_payload_len); - * \see nfq_pkt_compute_ip_checksum - * \see nfq_pkt_compute_udp_checksum - */ --void -+void __EXPORTED - nfq_udp_compute_checksum_ipv4(struct udphdr *udph, struct iphdr *iph) - { - /* checksum field in header needs to be zero for calculation. */ - udph->check = 0; - udph->check = nfq_checksum_tcpudp_ipv4(iph); - } --EXPORT_SYMBOL(nfq_udp_compute_checksum_ipv4); - - /** - * nfq_udp_set_checksum_ipv6 - computes a IPv6/TCP packet's segment -@@ -110,14 +106,13 @@ EXPORT_SYMBOL(nfq_udp_compute_checksum_ipv4); - * \see nfq_pkt_compute_ip_checksum - * \see nfq_pkt_compute_udp_checksum - */ --void -+void __EXPORTED - nfq_udp_compute_checksum_ipv6(struct udphdr *udph, struct ip6_hdr *ip6h) - { - /* checksum field in header needs to be zero for calculation. */ - udph->check = 0; - udph->check = nfq_checksum_tcpudp_ipv6(ip6h, udph); - } --EXPORT_SYMBOL(nfq_udp_compute_checksum_ipv6); - - /** - * nfq_tcp_mangle_ipv4 - mangle TCP/IPv4 packet buffer -@@ -129,7 +124,7 @@ EXPORT_SYMBOL(nfq_udp_compute_checksum_ipv6); - * - * \note This function recalculates the IPv4 and TCP checksums for you. - */ --int -+int __EXPORTED - nfq_udp_mangle_ipv4(struct pkt_buff *pkt, - unsigned int match_offset, unsigned int match_len, - const char *rep_buffer, unsigned int rep_len) -@@ -148,7 +143,6 @@ nfq_udp_mangle_ipv4(struct pkt_buff *pkt, - - return 1; - } --EXPORT_SYMBOL(nfq_udp_mangle_ipv4); - - /** - * nfq_pkt_snprintf_udp_hdr - print udp header into one buffer in a humnan -@@ -158,12 +152,11 @@ EXPORT_SYMBOL(nfq_udp_mangle_ipv4); - * \param udp: pointer to a valid udp header. - * - */ --int nfq_udp_snprintf(char *buf, size_t size, const struct udphdr *udph) -+int __EXPORTED nfq_udp_snprintf(char *buf, size_t size, const struct udphdr *udph) - { - return snprintf(buf, size, "SPT=%u DPT=%u ", - htons(udph->source), htons(udph->dest)); - } --EXPORT_SYMBOL(nfq_udp_snprintf); - - /** - * @} -diff --git a/src/internal.h b/src/internal.h -index 558d267..79b0752 100644 ---- a/src/internal.h -+++ b/src/internal.h -@@ -5,10 +5,9 @@ - #include - #include - #ifdef HAVE_VISIBILITY_HIDDEN --# define __visible __attribute__((visibility("default"))) --# define EXPORT_SYMBOL(x) typeof(x) (x) __visible -+# define __EXPORTED __attribute__((visibility("default"))) - #else --# define EXPORT_SYMBOL -+# define __EXPORTED - #endif - - struct iphdr; -diff --git a/src/libnetfilter_queue.c b/src/libnetfilter_queue.c -index 673e3b0..c12f068 100644 ---- a/src/libnetfilter_queue.c -+++ b/src/libnetfilter_queue.c -@@ -133,8 +133,7 @@ struct nfq_data { - struct nfattr **data; - }; - --int nfq_errno; --EXPORT_SYMBOL(nfq_errno); -+int __EXPORTED nfq_errno; - - /*********************************************************************** - * low level stuff -@@ -218,11 +217,10 @@ static int __nfq_rcv_pkt(struct nlmsghdr *nlh, struct nfattr *nfa[], - - /* public interface */ - --struct nfnl_handle *nfq_nfnlh(struct nfq_handle *h) -+struct nfnl_handle __EXPORTED *nfq_nfnlh(struct nfq_handle *h) - { - return h->nfnlh; - } --EXPORT_SYMBOL(nfq_nfnlh); - - /** - * -@@ -294,11 +292,10 @@ EXPORT_SYMBOL(nfq_nfnlh); - * over the netlink connection associated with the given queue connection - * handle. - */ --int nfq_fd(struct nfq_handle *h) -+int __EXPORTED nfq_fd(struct nfq_handle *h) - { - return nfnl_fd(nfq_nfnlh(h)); - } --EXPORT_SYMBOL(nfq_fd); - /** - * @} - */ -@@ -349,7 +346,7 @@ EXPORT_SYMBOL(nfq_fd); - * - * \return a pointer to a new queue handle or NULL on failure. - */ --struct nfq_handle *nfq_open(void) -+struct nfq_handle __EXPORTED *nfq_open(void) - { - struct nfnl_handle *nfnlh = nfnl_open(); - struct nfq_handle *qh; -@@ -366,7 +363,6 @@ struct nfq_handle *nfq_open(void) - - return qh; - } --EXPORT_SYMBOL(nfq_open); - - /** - * @} -@@ -382,7 +378,7 @@ EXPORT_SYMBOL(nfq_open); - * - * \return a pointer to a new queue handle or NULL on failure. - */ --struct nfq_handle *nfq_open_nfnl(struct nfnl_handle *nfnlh) -+struct nfq_handle __EXPORTED *nfq_open_nfnl(struct nfnl_handle *nfnlh) - { - struct nfnl_callback pkt_cb = { - .call = __nfq_rcv_pkt, -@@ -419,7 +415,6 @@ out_free: - free(h); - return NULL; - } --EXPORT_SYMBOL(nfq_open_nfnl); - - /** - * \addtogroup LibrarySetup -@@ -438,7 +433,7 @@ EXPORT_SYMBOL(nfq_open_nfnl); - * - * \return 0 on success, non-zero on failure. - */ --int nfq_close(struct nfq_handle *h) -+int __EXPORTED nfq_close(struct nfq_handle *h) - { - int ret; - -@@ -447,7 +442,6 @@ int nfq_close(struct nfq_handle *h) - free(h); - return ret; - } --EXPORT_SYMBOL(nfq_close); - - /** - * nfq_bind_pf - bind a nfqueue handler to a given protocol family -@@ -460,11 +454,10 @@ EXPORT_SYMBOL(nfq_close); - * - * \return integer inferior to 0 in case of failure - */ --int nfq_bind_pf(struct nfq_handle *h, uint16_t pf) -+int __EXPORTED nfq_bind_pf(struct nfq_handle *h, uint16_t pf) - { - return __build_send_cfg_msg(h, NFQNL_CFG_CMD_PF_BIND, 0, pf); - } --EXPORT_SYMBOL(nfq_bind_pf); - - /** - * nfq_unbind_pf - unbind nfqueue handler from a protocol family -@@ -476,11 +469,10 @@ EXPORT_SYMBOL(nfq_bind_pf); - * - * This call is obsolete, Linux kernels from 3.8 onwards ignore it. - */ --int nfq_unbind_pf(struct nfq_handle *h, uint16_t pf) -+int __EXPORTED nfq_unbind_pf(struct nfq_handle *h, uint16_t pf) - { - return __build_send_cfg_msg(h, NFQNL_CFG_CMD_PF_UNBIND, 0, pf); - } --EXPORT_SYMBOL(nfq_unbind_pf); - - - /** -@@ -524,7 +516,7 @@ typedef int nfq_callback(struct nfq_q_handle *qh, - * The callback should return < 0 to stop processing. - */ - --struct nfq_q_handle *nfq_create_queue(struct nfq_handle *h, -+struct nfq_q_handle __EXPORTED *nfq_create_queue(struct nfq_handle *h, - uint16_t num, - nfq_callback *cb, - void *data) -@@ -555,7 +547,6 @@ struct nfq_q_handle *nfq_create_queue(struct nfq_handle *h, - add_qh(qh); - return qh; - } --EXPORT_SYMBOL(nfq_create_queue); - - /** - * @} -@@ -573,7 +564,7 @@ EXPORT_SYMBOL(nfq_create_queue); - * Removes the binding for the specified queue handle. This call also unbind - * from the nfqueue handler, so you don't have to call nfq_unbind_pf. - */ --int nfq_destroy_queue(struct nfq_q_handle *qh) -+int __EXPORTED nfq_destroy_queue(struct nfq_q_handle *qh) - { - int ret = __build_send_cfg_msg(qh->h, NFQNL_CFG_CMD_UNBIND, qh->id, 0); - if (ret == 0) { -@@ -583,7 +574,6 @@ int nfq_destroy_queue(struct nfq_q_handle *qh) - - return ret; - } --EXPORT_SYMBOL(nfq_destroy_queue); - - /** - * nfq_handle_packet - handle a packet received from the nfqueue subsystem -@@ -597,11 +587,10 @@ EXPORT_SYMBOL(nfq_destroy_queue); - * - * \return 0 on success, non-zero on failure. - */ --int nfq_handle_packet(struct nfq_handle *h, char *buf, int len) -+int __EXPORTED nfq_handle_packet(struct nfq_handle *h, char *buf, int len) - { - return nfnl_handle_packet(h->nfnlh, buf, len); - } --EXPORT_SYMBOL(nfq_handle_packet); - - /** - * nfq_set_mode - set the amount of packet data that nfqueue copies to userspace -@@ -618,7 +607,7 @@ EXPORT_SYMBOL(nfq_handle_packet); - * - * \return -1 on error; >=0 otherwise. - */ --int nfq_set_mode(struct nfq_q_handle *qh, -+int __EXPORTED nfq_set_mode(struct nfq_q_handle *qh, - uint8_t mode, uint32_t range) - { - union { -@@ -638,7 +627,6 @@ int nfq_set_mode(struct nfq_q_handle *qh, - - return nfnl_query(qh->h->nfnlh, &u.nmh); - } --EXPORT_SYMBOL(nfq_set_mode); - - /** - * nfq_set_queue_flags - set flags (options) for the kernel queue -@@ -708,7 +696,7 @@ EXPORT_SYMBOL(nfq_set_mode); - * - * \return -1 on error with errno set appropriately; =0 otherwise. - */ --int nfq_set_queue_flags(struct nfq_q_handle *qh, -+int __EXPORTED nfq_set_queue_flags(struct nfq_q_handle *qh, - uint32_t mask, uint32_t flags) - { - union { -@@ -729,7 +717,6 @@ int nfq_set_queue_flags(struct nfq_q_handle *qh, - - return nfnl_query(qh->h->nfnlh, &u.nmh); - } --EXPORT_SYMBOL(nfq_set_queue_flags); - - /** - * nfq_set_queue_maxlen - Set kernel queue maximum length parameter -@@ -742,7 +729,7 @@ EXPORT_SYMBOL(nfq_set_queue_flags); - * - * \return -1 on error; >=0 otherwise. - */ --int nfq_set_queue_maxlen(struct nfq_q_handle *qh, -+int __EXPORTED nfq_set_queue_maxlen(struct nfq_q_handle *qh, - uint32_t queuelen) - { - union { -@@ -760,7 +747,6 @@ int nfq_set_queue_maxlen(struct nfq_q_handle *qh, - - return nfnl_query(qh->h->nfnlh, &u.nmh); - } --EXPORT_SYMBOL(nfq_set_queue_maxlen); - - /** - * @} -@@ -847,14 +833,13 @@ static int __set_verdict(struct nfq_q_handle *qh, uint32_t id, - * - * \return -1 on error; >= 0 otherwise. - */ --int nfq_set_verdict(struct nfq_q_handle *qh, uint32_t id, -+int __EXPORTED nfq_set_verdict(struct nfq_q_handle *qh, uint32_t id, - uint32_t verdict, uint32_t data_len, - const unsigned char *buf) - { - return __set_verdict(qh, id, verdict, 0, 0, data_len, buf, - NFQNL_MSG_VERDICT); - } --EXPORT_SYMBOL(nfq_set_verdict); - - /** - * nfq_set_verdict2 - like nfq_set_verdict, but you can set the mark. -@@ -865,14 +850,13 @@ EXPORT_SYMBOL(nfq_set_verdict); - * \param data_len number of bytes of data pointed to by #buf - * \param buf the buffer that contains the packet data - */ --int nfq_set_verdict2(struct nfq_q_handle *qh, uint32_t id, -+int __EXPORTED nfq_set_verdict2(struct nfq_q_handle *qh, uint32_t id, - uint32_t verdict, uint32_t mark, - uint32_t data_len, const unsigned char *buf) - { - return __set_verdict(qh, id, verdict, htonl(mark), 1, data_len, - buf, NFQNL_MSG_VERDICT); - } --EXPORT_SYMBOL(nfq_set_verdict2); - - /** - * nfq_set_verdict_batch - issue verdicts on several packets at once -@@ -886,13 +870,12 @@ EXPORT_SYMBOL(nfq_set_verdict2); - * batch support was added in Linux 3.1. - * These functions will fail silently on older kernels. - */ --int nfq_set_verdict_batch(struct nfq_q_handle *qh, uint32_t id, -+int __EXPORTED nfq_set_verdict_batch(struct nfq_q_handle *qh, uint32_t id, - uint32_t verdict) - { - return __set_verdict(qh, id, verdict, 0, 0, 0, NULL, - NFQNL_MSG_VERDICT_BATCH); - } --EXPORT_SYMBOL(nfq_set_verdict_batch); - - /** - * nfq_set_verdict_batch2 - like nfq_set_verdict_batch, but you can set a mark. -@@ -901,13 +884,12 @@ EXPORT_SYMBOL(nfq_set_verdict_batch); - * \param verdict verdict to return to netfilter (NF_ACCEPT, NF_DROP) - * \param mark mark to put on packet - */ --int nfq_set_verdict_batch2(struct nfq_q_handle *qh, uint32_t id, -+int __EXPORTED nfq_set_verdict_batch2(struct nfq_q_handle *qh, uint32_t id, - uint32_t verdict, uint32_t mark) - { - return __set_verdict(qh, id, verdict, htonl(mark), 1, 0, - NULL, NFQNL_MSG_VERDICT_BATCH); - } --EXPORT_SYMBOL(nfq_set_verdict_batch2); - - /** - * nfq_set_verdict_mark - like nfq_set_verdict, but you can set the mark. -@@ -923,14 +905,13 @@ EXPORT_SYMBOL(nfq_set_verdict_batch2); - * This function is deprecated since it is broken, its use is highly - * discouraged. Please, use nfq_set_verdict2 instead. - */ --int nfq_set_verdict_mark(struct nfq_q_handle *qh, uint32_t id, -+int __EXPORTED nfq_set_verdict_mark(struct nfq_q_handle *qh, uint32_t id, - uint32_t verdict, uint32_t mark, - uint32_t data_len, const unsigned char *buf) - { - return __set_verdict(qh, id, verdict, mark, 1, data_len, buf, - NFQNL_MSG_VERDICT); - } --EXPORT_SYMBOL(nfq_set_verdict_mark); - - /** - * @} -@@ -965,12 +946,11 @@ EXPORT_SYMBOL(nfq_set_verdict_mark); - } __attribute__ ((packed)); - \endverbatim - */ --struct nfqnl_msg_packet_hdr *nfq_get_msg_packet_hdr(struct nfq_data *nfad) -+struct nfqnl_msg_packet_hdr __EXPORTED *nfq_get_msg_packet_hdr(struct nfq_data *nfad) - { - return nfnl_get_pointer_to_data(nfad->data, NFQA_PACKET_HDR, - struct nfqnl_msg_packet_hdr); - } --EXPORT_SYMBOL(nfq_get_msg_packet_hdr); - - /** - * nfq_get_nfmark - get the packet mark -@@ -978,11 +958,10 @@ EXPORT_SYMBOL(nfq_get_msg_packet_hdr); - * - * \return the netfilter mark currently assigned to the given queued packet. - */ --uint32_t nfq_get_nfmark(struct nfq_data *nfad) -+uint32_t __EXPORTED nfq_get_nfmark(struct nfq_data *nfad) - { - return ntohl(nfnl_get_data(nfad->data, NFQA_MARK, uint32_t)); - } --EXPORT_SYMBOL(nfq_get_nfmark); - - /** - * nfq_get_timestamp - get the packet timestamp -@@ -993,7 +972,7 @@ EXPORT_SYMBOL(nfq_get_nfmark); - * - * \return 0 on success, non-zero on failure. - */ --int nfq_get_timestamp(struct nfq_data *nfad, struct timeval *tv) -+int __EXPORTED nfq_get_timestamp(struct nfq_data *nfad, struct timeval *tv) - { - struct nfqnl_msg_packet_timestamp *qpt; - qpt = nfnl_get_pointer_to_data(nfad->data, NFQA_TIMESTAMP, -@@ -1006,7 +985,6 @@ int nfq_get_timestamp(struct nfq_data *nfad, struct timeval *tv) - - return 0; - } --EXPORT_SYMBOL(nfq_get_timestamp); - - /** - * nfq_get_indev - get the interface that the packet was received through -@@ -1019,11 +997,10 @@ EXPORT_SYMBOL(nfq_get_timestamp); - * \warning all nfq_get_dev() functions return 0 if not set, since linux - * only allows ifindex >= 1, see net/core/dev.c:2600 (in 2.6.13.1) - */ --uint32_t nfq_get_indev(struct nfq_data *nfad) -+uint32_t __EXPORTED nfq_get_indev(struct nfq_data *nfad) - { - return ntohl(nfnl_get_data(nfad->data, NFQA_IFINDEX_INDEV, uint32_t)); - } --EXPORT_SYMBOL(nfq_get_indev); - - /** - * nfq_get_physindev - get the physical interface that the packet was received -@@ -1033,11 +1010,10 @@ EXPORT_SYMBOL(nfq_get_indev); - * If the returned index is 0, the packet was locally generated or the - * physical input interface is no longer known (ie. POSTROUTING?). - */ --uint32_t nfq_get_physindev(struct nfq_data *nfad) -+uint32_t __EXPORTED nfq_get_physindev(struct nfq_data *nfad) - { - return ntohl(nfnl_get_data(nfad->data, NFQA_IFINDEX_PHYSINDEV, uint32_t)); - } --EXPORT_SYMBOL(nfq_get_physindev); - - /** - * nfq_get_outdev - gets the interface that the packet will be routed out -@@ -1047,11 +1023,10 @@ EXPORT_SYMBOL(nfq_get_physindev); - * returned index is 0, the packet is destined for localhost or the output - * interface is not yet known (ie. PREROUTING?). - */ --uint32_t nfq_get_outdev(struct nfq_data *nfad) -+uint32_t __EXPORTED nfq_get_outdev(struct nfq_data *nfad) - { - return ntohl(nfnl_get_data(nfad->data, NFQA_IFINDEX_OUTDEV, uint32_t)); - } --EXPORT_SYMBOL(nfq_get_outdev); - - /** - * nfq_get_physoutdev - get the physical interface that the packet output -@@ -1063,11 +1038,10 @@ EXPORT_SYMBOL(nfq_get_outdev); - * - * \return The index of physical interface that the packet output will be routed out. - */ --uint32_t nfq_get_physoutdev(struct nfq_data *nfad) -+uint32_t __EXPORTED nfq_get_physoutdev(struct nfq_data *nfad) - { - return ntohl(nfnl_get_data(nfad->data, NFQA_IFINDEX_PHYSOUTDEV, uint32_t)); - } --EXPORT_SYMBOL(nfq_get_physoutdev); - - /** - * nfq_get_indev_name - get the name of the interface the packet -@@ -1107,13 +1081,12 @@ EXPORT_SYMBOL(nfq_get_physoutdev); - \endverbatim - * - */ --int nfq_get_indev_name(struct nlif_handle *nlif_handle, -+int __EXPORTED nfq_get_indev_name(struct nlif_handle *nlif_handle, - struct nfq_data *nfad, char *name) - { - uint32_t ifindex = nfq_get_indev(nfad); - return nlif_index2name(nlif_handle, ifindex, name); - } --EXPORT_SYMBOL(nfq_get_indev_name); - - /** - * nfq_get_physindev_name - get the name of the physical interface the -@@ -1127,13 +1100,12 @@ EXPORT_SYMBOL(nfq_get_indev_name); - * - * \return -1 in case of error, > 0 if it succeed. - */ --int nfq_get_physindev_name(struct nlif_handle *nlif_handle, -+int __EXPORTED nfq_get_physindev_name(struct nlif_handle *nlif_handle, - struct nfq_data *nfad, char *name) - { - uint32_t ifindex = nfq_get_physindev(nfad); - return nlif_index2name(nlif_handle, ifindex, name); - } --EXPORT_SYMBOL(nfq_get_physindev_name); - - /** - * nfq_get_outdev_name - get the name of the physical interface the -@@ -1147,13 +1119,12 @@ EXPORT_SYMBOL(nfq_get_physindev_name); - * - * \return -1 in case of error, > 0 if it succeed. - */ --int nfq_get_outdev_name(struct nlif_handle *nlif_handle, -+int __EXPORTED nfq_get_outdev_name(struct nlif_handle *nlif_handle, - struct nfq_data *nfad, char *name) - { - uint32_t ifindex = nfq_get_outdev(nfad); - return nlif_index2name(nlif_handle, ifindex, name); - } --EXPORT_SYMBOL(nfq_get_outdev_name); - - /** - * nfq_get_physoutdev_name - get the name of the interface the -@@ -1168,13 +1139,12 @@ EXPORT_SYMBOL(nfq_get_outdev_name); - * \return -1 in case of error, > 0 if it succeed. - */ - --int nfq_get_physoutdev_name(struct nlif_handle *nlif_handle, -+int __EXPORTED nfq_get_physoutdev_name(struct nlif_handle *nlif_handle, - struct nfq_data *nfad, char *name) - { - uint32_t ifindex = nfq_get_physoutdev(nfad); - return nlif_index2name(nlif_handle, ifindex, name); - } --EXPORT_SYMBOL(nfq_get_physoutdev_name); - - /** - * nfq_get_packet_hw -@@ -1198,12 +1168,11 @@ EXPORT_SYMBOL(nfq_get_physoutdev_name); - } __attribute__ ((packed)); - \endverbatim - */ --struct nfqnl_msg_packet_hw *nfq_get_packet_hw(struct nfq_data *nfad) -+struct nfqnl_msg_packet_hw __EXPORTED *nfq_get_packet_hw(struct nfq_data *nfad) - { - return nfnl_get_pointer_to_data(nfad->data, NFQA_HWADDR, - struct nfqnl_msg_packet_hw); - } --EXPORT_SYMBOL(nfq_get_packet_hw); - - /** - * nfq_get_uid - get the UID of the user the packet belongs to -@@ -1215,7 +1184,7 @@ EXPORT_SYMBOL(nfq_get_packet_hw); - * - * \return 1 if there is a UID available, 0 otherwise. - */ --int nfq_get_uid(struct nfq_data *nfad, uint32_t *uid) -+int __EXPORTED nfq_get_uid(struct nfq_data *nfad, uint32_t *uid) - { - if (!nfnl_attr_present(nfad->data, NFQA_UID)) - return 0; -@@ -1223,7 +1192,6 @@ int nfq_get_uid(struct nfq_data *nfad, uint32_t *uid) - *uid = ntohl(nfnl_get_data(nfad->data, NFQA_UID, uint32_t)); - return 1; - } --EXPORT_SYMBOL(nfq_get_uid); - - /** - * nfq_get_gid - get the GID of the user the packet belongs to -@@ -1235,7 +1203,7 @@ EXPORT_SYMBOL(nfq_get_uid); - * - * \return 1 if there is a GID available, 0 otherwise. - */ --int nfq_get_gid(struct nfq_data *nfad, uint32_t *gid) -+int __EXPORTED nfq_get_gid(struct nfq_data *nfad, uint32_t *gid) - { - if (!nfnl_attr_present(nfad->data, NFQA_GID)) - return 0; -@@ -1243,7 +1211,6 @@ int nfq_get_gid(struct nfq_data *nfad, uint32_t *gid) - *gid = ntohl(nfnl_get_data(nfad->data, NFQA_GID, uint32_t)); - return 1; - } --EXPORT_SYMBOL(nfq_get_gid); - - /** - * nfq_get_secctx - get the security context for this packet -@@ -1256,7 +1223,7 @@ EXPORT_SYMBOL(nfq_get_gid); - * - * \return -1 on error, otherwise > 0 - */ --int nfq_get_secctx(struct nfq_data *nfad, unsigned char **secdata) -+int __EXPORTED nfq_get_secctx(struct nfq_data *nfad, unsigned char **secdata) - { - if (!nfnl_attr_present(nfad->data, NFQA_SECCTX)) - return -1; -@@ -1269,7 +1236,6 @@ int nfq_get_secctx(struct nfq_data *nfad, unsigned char **secdata) - - return 0; - } --EXPORT_SYMBOL(nfq_get_secctx); - - /** - * nfq_get_payload - get payload -@@ -1282,7 +1248,7 @@ EXPORT_SYMBOL(nfq_get_secctx); - * - * \return -1 on error, otherwise > 0. - */ --int nfq_get_payload(struct nfq_data *nfad, unsigned char **data) -+int __EXPORTED nfq_get_payload(struct nfq_data *nfad, unsigned char **data) - { - *data = (unsigned char *) - nfnl_get_pointer_to_data(nfad->data, NFQA_PAYLOAD, char); -@@ -1291,7 +1257,6 @@ int nfq_get_payload(struct nfq_data *nfad, unsigned char **data) - - return -1; - } --EXPORT_SYMBOL(nfq_get_payload); - - /** - * @} -@@ -1336,7 +1301,7 @@ do { \ - * would have been printed into the buffer (in case that there is enough - * room in it). See snprintf() return value for more information. - */ --int nfq_snprintf_xml(char *buf, size_t rem, struct nfq_data *tb, int flags) -+int __EXPORTED nfq_snprintf_xml(char *buf, size_t rem, struct nfq_data *tb, int flags) - { - struct nfqnl_msg_packet_hdr *ph; - struct nfqnl_msg_packet_hw *hwph; -@@ -1489,7 +1454,6 @@ int nfq_snprintf_xml(char *buf, size_t rem, struct nfq_data *tb, int flags) - - return len; - } --EXPORT_SYMBOL(nfq_snprintf_xml); - - /** - * @} -diff --git a/src/nlmsg.c b/src/nlmsg.c -index ba28c77..5582407 100644 ---- a/src/nlmsg.c -+++ b/src/nlmsg.c -@@ -30,7 +30,7 @@ - * @{ - */ - --void nfq_nlmsg_verdict_put(struct nlmsghdr *nlh, int id, int verdict) -+void __EXPORTED nfq_nlmsg_verdict_put(struct nlmsghdr *nlh, int id, int verdict) - { - struct nfqnl_msg_verdict_hdr vh = { - .verdict = htonl(verdict), -@@ -38,20 +38,17 @@ void nfq_nlmsg_verdict_put(struct nlmsghdr *nlh, int id, int verdict) - }; - mnl_attr_put(nlh, NFQA_VERDICT_HDR, sizeof(vh), &vh); - } --EXPORT_SYMBOL(nfq_nlmsg_verdict_put); - --void nfq_nlmsg_verdict_put_mark(struct nlmsghdr *nlh, uint32_t mark) -+void __EXPORTED nfq_nlmsg_verdict_put_mark(struct nlmsghdr *nlh, uint32_t mark) - { - mnl_attr_put_u32(nlh, NFQA_MARK, htonl(mark)); - } --EXPORT_SYMBOL(nfq_nlmsg_verdict_put_mark); - --void -+void __EXPORTED - nfq_nlmsg_verdict_put_pkt(struct nlmsghdr *nlh, const void *pkt, uint32_t plen) - { - mnl_attr_put(nlh, NFQA_PAYLOAD, plen, pkt); - } --EXPORT_SYMBOL(nfq_nlmsg_verdict_put_pkt); - - /** - * @} -@@ -85,7 +82,7 @@ EXPORT_SYMBOL(nfq_nlmsg_verdict_put_pkt); - * given protocol family. Both commands are ignored by Linux kernel 3.8 and - * later versions. - */ --void nfq_nlmsg_cfg_put_cmd(struct nlmsghdr *nlh, uint16_t pf, uint8_t cmd) -+void __EXPORTED nfq_nlmsg_cfg_put_cmd(struct nlmsghdr *nlh, uint16_t pf, uint8_t cmd) - { - struct nfqnl_msg_config_cmd command = { - .command = cmd, -@@ -93,9 +90,8 @@ void nfq_nlmsg_cfg_put_cmd(struct nlmsghdr *nlh, uint16_t pf, uint8_t cmd) - }; - mnl_attr_put(nlh, NFQA_CFG_CMD, sizeof(command), &command); - } --EXPORT_SYMBOL(nfq_nlmsg_cfg_put_cmd); - --void nfq_nlmsg_cfg_put_params(struct nlmsghdr *nlh, uint8_t mode, int range) -+void __EXPORTED nfq_nlmsg_cfg_put_params(struct nlmsghdr *nlh, uint8_t mode, int range) - { - struct nfqnl_msg_config_params params = { - .copy_range = htonl(range), -@@ -103,13 +99,11 @@ void nfq_nlmsg_cfg_put_params(struct nlmsghdr *nlh, uint8_t mode, int range) - }; - mnl_attr_put(nlh, NFQA_CFG_PARAMS, sizeof(params), ¶ms); - } --EXPORT_SYMBOL(nfq_nlmsg_cfg_put_params); - --void nfq_nlmsg_cfg_put_qmaxlen(struct nlmsghdr *nlh, uint32_t queue_maxlen) -+void __EXPORTED nfq_nlmsg_cfg_put_qmaxlen(struct nlmsghdr *nlh, uint32_t queue_maxlen) - { - mnl_attr_put_u32(nlh, NFQA_CFG_QUEUE_MAXLEN, htonl(queue_maxlen)); - } --EXPORT_SYMBOL(nfq_nlmsg_cfg_put_qmaxlen); - - /** - * @} -@@ -179,12 +173,11 @@ static int nfq_pkt_parse_attr_cb(const struct nlattr *attr, void *data) - * This function returns MNL_CB_ERROR if any error occurs, or MNL_CB_OK on - * success. - */ --int nfq_nlmsg_parse(const struct nlmsghdr *nlh, struct nlattr **attr) -+int __EXPORTED nfq_nlmsg_parse(const struct nlmsghdr *nlh, struct nlattr **attr) - { - return mnl_attr_parse(nlh, sizeof(struct nfgenmsg), - nfq_pkt_parse_attr_cb, attr); - } --EXPORT_SYMBOL(nfq_nlmsg_parse); - - /** - * @} diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.3.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.5.bb similarity index 77% rename from meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.3.bb rename to meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.5.bb index 1bbab6f3c..f806b0747 100644 --- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.3.bb +++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.5.bb @@ -6,10 +6,9 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" DEPENDS = "libnfnetlink libmnl" -SRCREV = "601abd1c71ccdf90753cf294c120ad43fb25dc54" +SRCREV = "2ff321690b8dafeca99ee8e9cafac71e36f292b9" SRC_URI = "git://git.netfilter.org/libnetfilter_queue;branch=master \ - file://0001-libnetfilter-queue-Declare-the-define-visivility-attribute-together.patch \ " S = "${WORKDIR}/git" From patchwork Fri Jan 14 01:39:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 2416 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 81F94C43217 for ; Fri, 14 Jan 2022 01:40:00 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web12.1722.1642124399632159579 for ; Thu, 13 Jan 2022 17:39:59 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=jF1l68zz; 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.166.238, mailfrom: prvs=80133a60ff=yi.zhao@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20E1YZdC007942 for ; Thu, 13 Jan 2022 17:39:59 -0800 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=qUdcHoEarE4mGTrAu5evQglPay0apmfkAcjjuVUsnX4=; b=jF1l68zzHyiDLlyLfxQtbtcgPRe6cBJBtOVYre4QMglpJ0VpU0THZwUyPscxJim0bejA oWyzN3Kud2PCmfTT7+KKB2QJMdCmGavfXaooPvZhD2CkJG7+Rz9yUQDDXQMGis/68yoR RSSWawCIOJgDxzP5M0cLdiQgevjyzyFqb4QBLw8uzR6X9OwIgXi6yUaEveGGwAMK6WMB pML9O8GLFKJuLTHE8cdYCwqgf9h7xxQQ9na7cJ7nifkrOXN4FXifGc/1IL2/S/2a50GJ 4oVUuO+a0kZXo1XpZqVelRX4UWBmm6oXyh17cfcaF17WWOLxfF5O9a+fINLeJgGIOgwv lA== Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2101.outbound.protection.outlook.com [104.47.70.101]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3dhyvth919-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 13 Jan 2022 17:39:59 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Us5BGKejZzCZMd3HAk8lRgbjktM+xyuf9NK5JagbJOvoM6PQTMj5xr2+/YVOycicUHghGPWjgxeisv15sAdbE1l7DjPoGxVq6CUQnJWm95ruafg8ILZjGorBDkLLBCXSUSuiVLtW5XLl8oYFpmS/eHfZ46U9iSpcvgqKjk2kqRKH/nHdBd/9rrmX/YbvRhLmpddUoRX1oCfFY5qdsi4rzIpipwbKRgGjib4vNMaImSP1pGgCi4HwJ3xFfuFsx1IBBcpOri/nQCslCLs1mSmYlUqDYQVoXOBJFlCOkijRXe1twGykkO5lUdsgE0J/UdJQJF+M0o4gtmb1m+gM8k80Bw== 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=qUdcHoEarE4mGTrAu5evQglPay0apmfkAcjjuVUsnX4=; b=VJzxAY0eNNMXN9303w92om8LVZ1MLQHMV3B6hkGtKKlN6i/dddA1/a+iOCH8hLseifHAqmhRL37yXabMeDpxK3UztmeH9+3pRkmlW+rgq5WnZ0TpMeHUnb8UAVEGancZLoBubbQzxPBsRoZEZHHYnQTpTnxBHMgo6BlTq0m2d8mGvfuS8fZhCVT0quysu0hgNjIrSx36g2ANyMHUHgzs0SdVu+sKpfNlc7ib2ffCgXUwNq4yRvvC2l6AHk/6zQD4s5qVGjq5re8eOe7ouHTe7S7H5gRj5uQUoFFDqxxmPU8bLUAt5dDGSP94bGyzbbokBBzrkZylqyGU20zHFLtmig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from SJ0PR11MB4878.namprd11.prod.outlook.com (2603:10b6:a03:2d8::19) by MW3PR11MB4746.namprd11.prod.outlook.com (2603:10b6:303:5f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.11; Fri, 14 Jan 2022 01:39:55 +0000 Received: from SJ0PR11MB4878.namprd11.prod.outlook.com ([fe80::687b:9478:2713:459]) by SJ0PR11MB4878.namprd11.prod.outlook.com ([fe80::687b:9478:2713:459%5]) with mapi id 15.20.4888.011; Fri, 14 Jan 2022 01:39:55 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 4/6] bridge-utils: upgrade 1.7 -> 1.7.1 Date: Fri, 14 Jan 2022 09:39:39 +0800 Message-Id: <20220114013941.229837-4-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220114013941.229837-1-yi.zhao@windriver.com> References: <20220114013941.229837-1-yi.zhao@windriver.com> X-ClientProxiedBy: HK2PR04CA0087.apcprd04.prod.outlook.com (2603:1096:202:15::31) To SJ0PR11MB4878.namprd11.prod.outlook.com (2603:10b6:a03:2d8::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2a445f68-bdd6-4fc4-0716-08d9d6fec480 X-MS-TrafficTypeDiagnostic: MW3PR11MB4746:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:655; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wnpPGnELTP7x6rlGqGZOpm08ngBYWSSSB8PM/4P94mpt/cgheAo8I1OJ3N+YBby1xgJxlDt/fVcFKB51yAdiigm/ZMPVdh5Qlzvt6niLaevYbO76SRiiV6beTf4yUfi/g7ugV3r5ZTQ6LLjLMKKRNxT+QHFvkNEfx5SJHLrNLEDSVvkpJkRSR+oLz03X57uh4RGEI5P7rLZdAGgNGAjzpV1HS5/D73QNMZuAbdnXRWgcYswtPYsXqyROvGo3fYJW0tyjwcSersW7HXwjlsTw9ywN1PfmkzGN3rfHKKp7mKnKCVfsleq7Ewyx8RyyzmjAaoMUm6TeW86ICORYFESDWRph2S1viESmxAjtzdhQNCZNev7PES2OYDn7pF7RTHiR8r+vTPVqS9I1b+ztqXtA9br670xJgnWXtvAgi2MB/OctwgqO1F+TZk9JBfXiizD/iXjPSuT3/wxyq5Ykhd4+F0c2W+PyTp0X2riDXVcRC8Lq2avCUZpOgETktPgbaTjqFxvw0qdPNcodWBqmyr1wIBpM25g9ky3cn8q+Ih6ryCXlSnCmja7R93fRkw2anBnb3bRXbBwhbaJWmnzYY/hKvStDYiNXXfdhgFat8UT54Qu746eiGR/RmuY5FqcHIH4fK2x0i43gHeQaNceicvUPD8C6DB/uTE9AJm3ZqSadnwR/s7o35QaS9SA7VrRYjRAxuroGWtqNw9jdg9gW5LaYAiaHiN5CLJJ0BWYyxhZdbp75gMuEXp85Hk5gcutcq562iFTT9OvtX8gfwZsaLIpQR0cwdDVXgCXGl9K5+VoMFP0= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB4878.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(83380400001)(6916009)(53546011)(6506007)(186003)(5660300002)(26005)(86362001)(316002)(8676002)(52116002)(1076003)(36756003)(45080400002)(6512007)(38350700002)(6666004)(966005)(44832011)(2616005)(66556008)(30864003)(2906002)(508600001)(8936002)(6486002)(66476007)(38100700002)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XIy3FkJghaNDCr8rzZTZlM5kuHycx9cgZC7iahqsgcDdZ+eEmbGn2gVScQ5SlVrAnQ8xYU0DvPqueUzmA2pF1hBlJrJhdM9L/S4LkCQBI5kWTzTM/0o3nImrx/wFAyMVpv9WfB5FFDldKGwJLzZPeco6je1SgXK3ZUfGwBULrVfBRMt6y96lu3vHZlTMqIBoNH/hzffTwHUyZ9woD78TmzN5GQ+UVeAYsJ5ieSTAD13+Z6SMvKy8a9QFZmsWkxm6706SQMa/8zes8T5bxgwMnDB7SJPbeg5qIIiawmGYCB5Grv4ypqbvxS2wxqvwLRyNgW/L4iuVDB8ymOycqNCOCANsP39vW8us49uxtRb6hdhIxUWimd7zjMGqMTuK11/pCwjQabrLX+cn+HTgrKMBWUwNnQgTJZzcWEvQBrxAoKjp1XGKmRokNCAAY2IWFYtjUR+EBqfIyfikeweByJJgGiz8xh8y5lOTiVwsOVh/4lsutENq2wU3cHfXvrLmWDRwDuQvksI5DywFFYS5EAPWi+5/jcdDrWVvM97SA8QrkOjeIcMdIBoH/SFcmanvZ9JPVYKUekpFeJHgonFSX63AC5oF+wCJyD65XKeVFhg2FaP4X1p/9rCNEgYy8l7FSVamAh8crx/gaYJbzq9OGL/L16T7Y9ASG/Gu5h51akaf7qBBJqJPv4C39q06g/BJHuCq3a78blyNY71ZTha/LidRbweIIcYaUcsaR3Gk8QMyOmcYI+D5T0PkqwwTcuFKLpZM4eaQo/Wwpz5wxxFBvj9x44RFhbK9Fenqn2z5KWr1gGR1b9+tY3ucHtJlOE4JhlwoB7/ispJb2tJC8pGWM06rQcaCoGIS7iGmh/UUm2mKCyO8kE2YB/JEz6PHQhfzCZ+/Dn/8tLeMsdcwx5Lbvr87ST/Jtd9bPyesn+FcOeIoy00X5vuTAPUXVqKVoyTJAX2QEBv2zzsz6UOD/aiAJkt9MoAsYpJ8JMY4rhB/EUOhp97OH80CcZ3r4bm0lLdmTnmy0qizgZtC0H0nlkjbu1f+B86/KqzjTkfhHHMpCaqY3UDFvbS4omVHoUc0FAlc9IUqp0zlihzLyJ1oqp5vftZwQ8k1Dr4AIztiLCfi1i+Mo41FqmI+Z36rOfdghwfMx5U3bK4UoSeeSSjQyJNloc6MIxFcd/CbJ0zvWpmGXhS87quegbsX0ob6/+5PqbXpy+iChDlx878itldXvNYmDPOtXLFDlTVXtCBNrmhTJIZxGKBN0PRJiLYX5qo0uUlRil5y+NaeRPTS5tBqtcE1Ee5tDEdAPYEa+EYiBXys5nDA9zyQaiCPLG4DA5dQZ6eIUDoSwQFuac1neMTc2RIR2NZ3RHFjbcChw9JuKyzHYJGw4sFF/xLFXChaYc9QrOymLNNEqJbG3TVE2tXUoN+SqJmxUjGO+C8gl3HujlBTf0jQ9IbEplt66k+yLFwf/PyXO1/j9d+9QsLhCYDKflf2Ve05RNu0pFcsgN2x8PJb6d2nSryWjXfkfyznqCV47N7V9QQ34+niLagjdLZS/v/bITbttaWl2OkcvfrAdS3gIfTpznqukQdur55/ZCfGCMIQVtdDoJiVGrzisSb+NwFCUIAtQbApRUBIHlp0nafNjf20p9g= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2a445f68-bdd6-4fc4-0716-08d9d6fec480 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB4878.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2022 01:39:55.7803 (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: jX8bCfjcD3bCK+4iY0ZVGWalHkFUImpawZN3bP3A96LBffFs8XPA9R93a/jR553Xk28eDqoY2+urincUMfZpdA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4746 X-Proofpoint-ORIG-GUID: MUddn84Y6pSV9dlsn9d1S0tlBv9eeUZD X-Proofpoint-GUID: MUddn84Y6pSV9dlsn9d1S0tlBv9eeUZD 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-13_10,2022-01-13_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 lowpriorityscore=0 mlxscore=0 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 adultscore=0 mlxlogscore=999 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201140007 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, 14 Jan 2022 01:40:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94819 * Update SRC_URI to official git repo per [1] * Refresh patches * Backport a patch to fix build error with musl [1] https://wiki.linuxfoundation.org/networking/bridge Signed-off-by: Yi Zhao --- ... 0001-include-missing-kernel-header.patch} | 6 +- ...on-t-ignore-CFLAGS-from-environment.patch} | 4 +- ...Modifying-the-AR-to-cross-toolchain.patch} | 10 +- .../bridge-utils/0004-cleanup-includes.patch | 149 ++++++++++++++++++ ...dge-utils_1.7.bb => bridge-utils_1.7.1.bb} | 11 +- 5 files changed, 165 insertions(+), 15 deletions(-) rename meta-networking/recipes-support/bridge-utils/bridge-utils/{kernel-headers.patch => 0001-include-missing-kernel-header.patch} (88%) rename meta-networking/recipes-support/bridge-utils/bridge-utils/{0005-build-don-t-ignore-CFLAGS-from-environment.patch => 0002-build-don-t-ignore-CFLAGS-from-environment.patch} (94%) rename meta-networking/recipes-support/bridge-utils/bridge-utils/{0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch => 0003-libbridge-Modifying-the-AR-to-cross-toolchain.patch} (85%) create mode 100644 meta-networking/recipes-support/bridge-utils/bridge-utils/0004-cleanup-includes.patch rename meta-networking/recipes-support/bridge-utils/{bridge-utils_1.7.bb => bridge-utils_1.7.1.bb} (67%) diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils/kernel-headers.patch b/meta-networking/recipes-support/bridge-utils/bridge-utils/0001-include-missing-kernel-header.patch similarity index 88% rename from meta-networking/recipes-support/bridge-utils/bridge-utils/kernel-headers.patch rename to meta-networking/recipes-support/bridge-utils/bridge-utils/0001-include-missing-kernel-header.patch index 8a23a3070..dbd6b18c4 100644 --- a/meta-networking/recipes-support/bridge-utils/bridge-utils/kernel-headers.patch +++ b/meta-networking/recipes-support/bridge-utils/bridge-utils/0001-include-missing-kernel-header.patch @@ -1,4 +1,4 @@ -From 824f838cc9c7b8a44174358446993d61be7bbb3f Mon Sep 17 00:00:00 2001 +From 203801ae47399569868aa468988e711ba3ddfa92 Mon Sep 17 00:00:00 2001 From: Joe MacDonald Date: Mon, 30 Oct 2017 13:18:20 -0400 Subject: [PATCH] include missing kernel header @@ -17,7 +17,7 @@ Signed-off-by: Joe MacDonald 1 file changed, 1 insertion(+) diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h -index c038b92..fd09306 100644 +index 962f316..422ec33 100644 --- a/libbridge/libbridge.h +++ b/libbridge/libbridge.h @@ -24,6 +24,7 @@ @@ -29,5 +29,5 @@ index c038b92..fd09306 100644 #include -- -2.7.4 +2.17.1 diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils/0005-build-don-t-ignore-CFLAGS-from-environment.patch b/meta-networking/recipes-support/bridge-utils/bridge-utils/0002-build-don-t-ignore-CFLAGS-from-environment.patch similarity index 94% rename from meta-networking/recipes-support/bridge-utils/bridge-utils/0005-build-don-t-ignore-CFLAGS-from-environment.patch rename to meta-networking/recipes-support/bridge-utils/bridge-utils/0002-build-don-t-ignore-CFLAGS-from-environment.patch index 0a72c6b2c..5ec563b6b 100644 --- a/meta-networking/recipes-support/bridge-utils/bridge-utils/0005-build-don-t-ignore-CFLAGS-from-environment.patch +++ b/meta-networking/recipes-support/bridge-utils/bridge-utils/0002-build-don-t-ignore-CFLAGS-from-environment.patch @@ -1,4 +1,4 @@ -From 9d63838d12c772dfe33371e2bb8b8191625539f2 Mon Sep 17 00:00:00 2001 +From 0c1a66fc62cc321d307c94f962031283142eea69 Mon Sep 17 00:00:00 2001 From: Joe MacDonald Date: Mon, 30 Oct 2017 13:37:48 -0400 Subject: [PATCH] build: don't ignore CFLAGS from environment @@ -36,5 +36,5 @@ index e1956d6..eff260c 100644 %.o: %.c brctl.h $(CC) $(CFLAGS) $(INCLUDE) -c $< -- -2.7.4 +2.17.1 diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils/0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch b/meta-networking/recipes-support/bridge-utils/bridge-utils/0003-libbridge-Modifying-the-AR-to-cross-toolchain.patch similarity index 85% rename from meta-networking/recipes-support/bridge-utils/bridge-utils/0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch rename to meta-networking/recipes-support/bridge-utils/bridge-utils/0003-libbridge-Modifying-the-AR-to-cross-toolchain.patch index 3f65761f5..586ebfec6 100644 --- a/meta-networking/recipes-support/bridge-utils/bridge-utils/0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch +++ b/meta-networking/recipes-support/bridge-utils/bridge-utils/0003-libbridge-Modifying-the-AR-to-cross-toolchain.patch @@ -1,4 +1,4 @@ -From c924f66743c054d7ebafef90ca1bbebc96732357 Mon Sep 17 00:00:00 2001 +From 99264c688ff98d8f0f237cba6c7098eb4d5a12a7 Mon Sep 17 00:00:00 2001 From: Joe MacDonald Date: Mon, 30 Oct 2017 13:48:33 -0400 Subject: [PATCH] libbridge: Modifying the AR to cross toolchain @@ -14,12 +14,12 @@ Upstream-Status: Pending Signed-off-by: Li Zhou Signed-off-by: Joe MacDonald --- - configure.ac | 1 + + configure.ac | 4 ++++ libbridge/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 8b2e2ea..8426b7c 100644 +index 66817bb..bcc6946 100644 --- a/configure.ac +++ b/configure.ac @@ -12,6 +12,10 @@ dnl Checks for programs. @@ -47,5 +47,5 @@ index 7932bfe..bd55e9b 100644 CC=@CC@ -- -2.7.4 +2.17.1 diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils/0004-cleanup-includes.patch b/meta-networking/recipes-support/bridge-utils/bridge-utils/0004-cleanup-includes.patch new file mode 100644 index 000000000..eb5c53d9e --- /dev/null +++ b/meta-networking/recipes-support/bridge-utils/bridge-utils/0004-cleanup-includes.patch @@ -0,0 +1,149 @@ +From 1763c5b7f8f72d651d62337029c3bdfb269491e4 Mon Sep 17 00:00:00 2001 +From: Stephen Hemminger +Date: Fri, 7 Jan 2022 08:44:19 -0800 +Subject: [PATCH] cleanup includes + +Use IWYU to only include necessary headers. +Should resolve build issues for distros that need limits.h +to find PATH_MAX. + +Upstream-Status: Backport +[https://git.kernel.org/pub/scm/network/bridge/bridge-utils.git/commit/?h=main&id=1763c5b7f8f72d651d62337029c3bdfb269491e4] + +Signed-off-by: Stephen Hemminger +Signed-off-by: Yi Zhao +--- + brctl/brctl.c | 1 - + brctl/brctl_cmd.c | 3 ++- + brctl/brctl_disp.c | 1 - + libbridge/libbridge_devif.c | 5 ++++- + libbridge/libbridge_if.c | 5 +---- + libbridge/libbridge_init.c | 4 +++- + libbridge/libbridge_misc.c | 5 +---- + 7 files changed, 11 insertions(+), 13 deletions(-) + +diff --git a/brctl/brctl.c b/brctl/brctl.c +index 8855234..d2fa005 100644 +--- a/brctl/brctl.c ++++ b/brctl/brctl.c +@@ -17,7 +17,6 @@ + */ + + #include +-#include + #include + #include + #include +diff --git a/brctl/brctl_cmd.c b/brctl/brctl_cmd.c +index 81f7dfa..4167503 100644 +--- a/brctl/brctl_cmd.c ++++ b/brctl/brctl_cmd.c +@@ -18,10 +18,11 @@ + + #include + #include ++#include + #include + #include + #include +-#include ++ + #include "libbridge.h" + #include "brctl.h" + +diff --git a/brctl/brctl_disp.c b/brctl/brctl_disp.c +index 3e81241..f6bf2af 100644 +--- a/brctl/brctl_disp.c ++++ b/brctl/brctl_disp.c +@@ -17,7 +17,6 @@ + */ + + #include +-#include + #include + #include + +diff --git a/libbridge/libbridge_devif.c b/libbridge/libbridge_devif.c +index 8b7d954..3aac0f9 100644 +--- a/libbridge/libbridge_devif.c ++++ b/libbridge/libbridge_devif.c +@@ -18,12 +18,15 @@ + + + #include +-#include + #include + #include + #include + #include + #include ++#include ++ ++#include ++#include + + #include "libbridge.h" + #include "libbridge_private.h" +diff --git a/libbridge/libbridge_if.c b/libbridge/libbridge_if.c +index 5f3aed1..96dda30 100644 +--- a/libbridge/libbridge_if.c ++++ b/libbridge/libbridge_if.c +@@ -16,12 +16,9 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +-#include +-#include + #include +-#include +-#include + #include ++#include + + #include "libbridge.h" + #include "libbridge_private.h" +diff --git a/libbridge/libbridge_init.c b/libbridge/libbridge_init.c +index c914971..d572895 100644 +--- a/libbridge/libbridge_init.c ++++ b/libbridge/libbridge_init.c +@@ -16,14 +16,16 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#include + #include + #include + #include + #include + #include + #include +-#include + #include ++#include ++#include + + #include "libbridge.h" + #include "libbridge_private.h" +diff --git a/libbridge/libbridge_misc.c b/libbridge/libbridge_misc.c +index 9379e93..5b146fd 100644 +--- a/libbridge/libbridge_misc.c ++++ b/libbridge/libbridge_misc.c +@@ -16,14 +16,11 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +-#include + #include + #include +-#include + #include +-#include "libbridge.h" +-#include "libbridge_private.h" + ++#include "libbridge.h" + + static const char *state_names[5] = { + [BR_STATE_DISABLED] = "disabled", +-- +2.17.1 + diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.bb b/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb similarity index 67% rename from meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.bb rename to meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb index b8975dec0..85a7e59d5 100644 --- a/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.bb +++ b/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb @@ -5,13 +5,14 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=f9d20a453221a1b7e32ae84694da2c37" -SRCREV = "ab8a2cc330253321be7bc69dea88bfaa3d48415e" +SRCREV = "75d949b9fae9718201422f0bd3d1103e67dd597c" SRC_URI = "\ - git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/bridge-utils.git;branch=main \ - file://kernel-headers.patch \ - file://0005-build-don-t-ignore-CFLAGS-from-environment.patch \ - file://0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch \ + git://git.kernel.org/pub/scm/network/bridge/bridge-utils.git;branch=main \ + file://0001-include-missing-kernel-header.patch \ + file://0002-build-don-t-ignore-CFLAGS-from-environment.patch \ + file://0003-libbridge-Modifying-the-AR-to-cross-toolchain.patch \ + file://0004-cleanup-includes.patch \ " S = "${WORKDIR}/git" From patchwork Fri Jan 14 01:39:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 2413 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 7CC3BC433EF for ; Fri, 14 Jan 2022 01:39:59 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web08.1700.1642124399039635283 for ; Thu, 13 Jan 2022 17:39:59 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=o9htKKOM; 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.166.238, mailfrom: prvs=80133a60ff=yi.zhao@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20E1YZdB007942 for ; Thu, 13 Jan 2022 17:39:58 -0800 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=JrQLQVtr3v4ztyMnd3Xbd7Q0VRkTiZuvuefrL1J8wto=; b=o9htKKOMvmMfilsobukPaCiCrP3KucN8gwKorI/oblBdb9bXcFvsZO/5ejI26hNQsASV nV4jw7at7A8smncHX1A5Yvq7hPcSPurKsy5GDiGNmE5C5SWzDrzcEBPc1BLHNkI2bhL4 0eZuIA2jofzW3Zw+16V5V8HID7452leGLTO/2clv5S9UFe76jEeRCFIupfJDYkppKaTA SO3A49Pmn+G4MOy6HteWErZgF4C3hJ7NxSEclRHTT2Ssa5+ccAZ/o4fUoSF6XxAvuTI4 nujBY7Ujhx9CZC/z8bc9W75IYVchktu02dpBCk0SMhiRkhnBRnoxwUe5+Vh2rzq+qtZ8 5w== Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2101.outbound.protection.outlook.com [104.47.70.101]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3dhyvth919-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 13 Jan 2022 17:39:58 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TA+4TvuXrI8Ikfcjc/H/DOlsMqPeYccvU4BgY3JAPF7vcZMUl1glE+ecZ1Hz4EDd8NG1/L3Q3my2RPYZR1yIp90FS3viN7fLZX9IMcIT6kwyJoi14DUHTOv9Ovfw3dVKq02D4KW7kRS+HKhuJdq0TRNd3a4DbxDEfN6yH9Tfl6xYRKo7FN7s/xZVrwXe8YHjEvTX9UwfbAPMI5dObRGBkdOCu2nAqknlMs+UWg3njP3B7O2IbxYulrXu4sFVJIer80MitJvnsQub/8QtAd4Vjg8quYfKR56qad17uvN6LXaJHLlXvfTP+k3M0UdAcGglccZmVfKRIEZWNLKJv7y/aQ== 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=JrQLQVtr3v4ztyMnd3Xbd7Q0VRkTiZuvuefrL1J8wto=; b=A0ptcj4cSYxHW3Qx3o0qItVYTBR9A1iUskIVG9B19j3azllR8ehFj4a0jByOd6kqD+Q49SFeYalBKOgvHJwdakur2sxvNkpIK47eB8xA5eKaLNX/twfE8BPT2D18X57WEqnl6KDg3PzbEcGpi/9j4DKpkBbCXer4BmBEfanOROe2wWKTxJJsved3e9Ao04jMtSv6Ks8r+YDsTcthEQ7Ka2A7OoU59RvCUOe3d8/Sx+KOm5JL8diXs9kxcix6mP9FHjghMqCbnI9klW0ffRiAYxJ7EQMd6y0E6PqzjEiG2yr+byVRa9keM0VofUc/RQ26UTiTsqti2fuow285TuEubw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from SJ0PR11MB4878.namprd11.prod.outlook.com (2603:10b6:a03:2d8::19) by MW3PR11MB4746.namprd11.prod.outlook.com (2603:10b6:303:5f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.11; Fri, 14 Jan 2022 01:39:56 +0000 Received: from SJ0PR11MB4878.namprd11.prod.outlook.com ([fe80::687b:9478:2713:459]) by SJ0PR11MB4878.namprd11.prod.outlook.com ([fe80::687b:9478:2713:459%5]) with mapi id 15.20.4888.011; Fri, 14 Jan 2022 01:39:56 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 5/6] tnftp: upgrade 20151004 -> 20210827 Date: Fri, 14 Jan 2022 09:39:40 +0800 Message-Id: <20220114013941.229837-5-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220114013941.229837-1-yi.zhao@windriver.com> References: <20220114013941.229837-1-yi.zhao@windriver.com> X-ClientProxiedBy: HK2PR04CA0087.apcprd04.prod.outlook.com (2603:1096:202:15::31) To SJ0PR11MB4878.namprd11.prod.outlook.com (2603:10b6:a03:2d8::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d8351c45-e1f0-4c5a-f38f-08d9d6fec51a X-MS-TrafficTypeDiagnostic: MW3PR11MB4746:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2089; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OeweqmO8idoV5J6kxADZLCTo3DLA8x6Fl5BJfeUTAaMFJVJlrUFe5JWTb/01ljaIVl9ozegGP75Yv3sc8M7dV94G9UptZ2QrkOl1auZMM++DUo8R7IsGIQtkXvsjmL8RaKy99sFaLkQSpDJCQQXneiX9ua2kCMXPZapgk7yxOzDNkY97NiTlrMyTDJX2/J41Rjm9vBbAw6tL9JsArrTpOJJ7Ws3In4V8h4UvmbSjiKrR0iFYZw4o8W4nqhW0P1vbksSZ4JO7y1XKSqSGZLKZed/ghpfnFSsvi2vNXv87ls2yC48/UaBZTN8IqXJ4oTZN+r4NBS9+cpxoSrBQ+qEHxBhXRChnzGZ9OUca8d/bJ1fyL4dyrPCP7WV5dDrJ1FDKselpxAnZ+Dlg8tzIg8w/wM+h9zOg7/GRR48gbsmDXFuf+u8KFin4BngZMWyY7v09eOrSBEkn0JBTKmMDXhAp77ei5hvctCXsW57C8mmb19zD1uun09Y5HZojNHmPwg/2GGeEaUrgtj4JRpjaxhI783BVDRdnrosGxon21qe9L+Dxv+mrYRsMXs6rE2viT1Lel4HdjzOwcS4FH6TrSYWytPBlqHuVkMNDi7uPuaBoYaYvpH+Jc1+6/2QvROyfCFx4FXtyDU/VdHCw9s6e7v+frsoNrc9FYrhlw3TyhB/A/H9uCzobHZP5xGy6VdpUNhTdibnITvhzOUovSyw3nECANYb1L8TpF77fjygs2EKIBQIpx5/8Hc3FKOvieDv2M7seEpc3/yKlLzo5d0J3zUKAzHqqt2qhQmong2EFL96vwZc= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB4878.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(83380400001)(6916009)(6506007)(186003)(5660300002)(26005)(86362001)(316002)(8676002)(52116002)(1076003)(36756003)(6512007)(38350700002)(6666004)(44832011)(2616005)(66556008)(2906002)(508600001)(8936002)(6486002)(66476007)(38100700002)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: z7DynKm23Tbnm0httG8HUkuBbMBRUSe46S4TBG7IVWF1moD8OwZUYxacPkaIuuhdizHLJNpzplh07M/I3moj4B+4hgrTjyIyA18UKiMCiSVy6EiwZnup3VgxTBM8FKt0AikzMBhA7K26jLitfHHbtrn1NlaP9guuZ77rdIO9zlSsMLpgApc7vnT2v0Wur9ANyu6I5i+EPxeQglu0wtFIhnYJG6Bpc3DJTtJct/W8fWxmOtqe3pDkbR0uYSM755eIGUWORRmUs40iTge+JGBp/6OkRt9F0YuJapyz0KNnK72VRK2pkcmDoZq3iPN8+GJInRg5SZJsdrUkQRjaaFZfnDOvHe9kj6PAR7bMkiqjMleLzeesJWOyD03+jqD0Oure+pDsv/I/m4PVlARCTL9ZgLRyqS9zfhXzx5mg4AntydvNZhTw268HykiWtboAfgP5xFQ6WTpShx243+ANzlXitppfyI9Te9J+yegQH+CyGtjNW4JfQdz7PaoBFEceqYjKOJP/Bi4m0Guy50uuA0kCUVgT6u62Hwn/LuRH2PmvwbIfCII0mAyH0rvJfO3Dii74ztgEp2kSYFWLCDfewtSHfk1s6pIBDYtbnt4qoCPNrKlgX9+kK7ABZ5YC6dOj8kBm8zvXm2ms2Nq5sC1kJbulwu4eMZfoP34C8ykdYmUrL4UXeoYE+0MoVxrDXS5+HJPwjeW2mRZlDX9snR2z+cOE9i0RTooL281g7b5B20FF8hlcuZkaWu02TZRMvFl8LCyj84B4rrdA4nUPvxsLf6hIiZsZP6per7EyEX9rWGwO3doUsLxAWVc831FSKst8HjqydAzhQnqUSl+MEVYEHYuvHy88fOjCKPkxxERicV/+nIzzjY2DAoZo0xKOIbcgEky8XSiAHSXakMP3KKRh8oLAzMp+FvoWmEhPxr0zw3W9ZOMulMEWzWWp/q32JPKu0CH1ffS3GMkfWTy2mMvCI3iMyu9DSOosOkwud+R1GMpqSZcgUK95E1SJNGb8D9+OR64PIqg99OTFPboznzB5gsctVjI7G8t7ccdzIe2NdMNcChJHakkcz0WNmoZFdp9nDq9fjmP0iPiHybIKWR9qlUa/rFkIPxQeIzsf2jhkDQ40cMb7yYkdCvGoy46hQnfOJy7lZQUbEd4pnO3OOPuqi8dvDtiKZ6q777NgoPBGBX0hquokfp7I238ucRnZwxpTfvWoxMeDkOC/JnJGuPM3THINUz9N8PZcpSJPPRHW52tanPOI//lkZLhIu4BVv81mrsThdpkn2JGVgptVdIr3VnPG0jxTsinJT0ZpPP8U1TDq8Wq6KDAgJ9bKjqkPoQy4Am8vVsBNk3U6JbNMAp4b/4f6TSD40N2xF6SNF0JdNQgSBFJ1nO9+y/ZNzYStDhBNjyujzSfHrgds478uB6+48wDrSC2FL4U8tr0wowFgEpir2kwzZCizKgu6eUHrIwDVEim7AyNrM91xFlhmnuR2N1cTkrL8wgRB/BEjwzyvBdfZdCfyimHLFvFfz0Wc6ZBaQ4b30kvfgp+helLaE5w3YOOm2aQLa06Ge/1kcCfkU3wYMT0F3mbFOfJvvN3XoDG0//dlbTMkTjA5I8Rlx24s9f+kMRS+WiF7/Y/lWVpoIeyElbY= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: d8351c45-e1f0-4c5a-f38f-08d9d6fec51a X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB4878.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2022 01:39:56.8113 (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: M4yYhmtG68ntuJyjWIDFpJ6seI+Cx+KFVm8Xv4ca9i/otfLygjyMHtVYT7OME+S1rlBa83F7i4eydeyAcjiuLA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4746 X-Proofpoint-ORIG-GUID: s-5MtlV4whxMLR9vTqlUAm6OsLXyaGBc X-Proofpoint-GUID: s-5MtlV4whxMLR9vTqlUAm6OsLXyaGBc 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-13_10,2022-01-13_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 lowpriorityscore=0 mlxscore=0 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 adultscore=0 mlxlogscore=917 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201140007 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, 14 Jan 2022 01:39:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94818 * License-Update: Update copyright years * Drop tnftp-autotools.patch as the issue had been fixed upstream Signed-off-by: Yi Zhao --- .../tnftp/tnftp/tnftp-autotools.patch | 42 ------------------- .../{tnftp_20151004.bb => tnftp_20210827.bb} | 7 ++-- 2 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch rename meta-networking/recipes-support/tnftp/{tnftp_20151004.bb => tnftp_20210827.bb} (83%) diff --git a/meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch b/meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch deleted file mode 100644 index 1bda576bc..000000000 --- a/meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch +++ /dev/null @@ -1,42 +0,0 @@ -[PATCH] Update configure.ac and Makefile.am to resolve warnings/errors - -Upstream-Status: Pending - -Signed-off-by: Roy Li ---- - configure.ac | 2 ++ - libnetbsd/Makefile.am | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index a96d2ab..b3b3069 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -71,9 +71,11 @@ AH_TEMPLATE([WITH_SSL], - # - # Checks for programs. - # -+AM_PROG_AR() - AC_PROG_CC() - AC_PROG_AWK() - AC_PROG_LIBTOOL() -+AM_PROG_CC_C_O() - - # - # Checks for tool features. -diff --git a/libnetbsd/Makefile.am b/libnetbsd/Makefile.am -index 3e5c3ce..39bb12d 100644 ---- a/libnetbsd/Makefile.am -+++ b/libnetbsd/Makefile.am -@@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libnetbsd.la - libnetbsd_la_SOURCES = - - --CPPFLAGS = \ -+AM_CPPFLAGS = \ - -I$(srcdir) \ - -I$(top_srcdir) \ - -I$(top_builddir) --- -1.7.10.4 - diff --git a/meta-networking/recipes-support/tnftp/tnftp_20151004.bb b/meta-networking/recipes-support/tnftp/tnftp_20210827.bb similarity index 83% rename from meta-networking/recipes-support/tnftp/tnftp_20151004.bb rename to meta-networking/recipes-support/tnftp/tnftp_20210827.bb index 8e03f1bdb..111a63d29 100644 --- a/meta-networking/recipes-support/tnftp/tnftp_20151004.bb +++ b/meta-networking/recipes-support/tnftp/tnftp_20210827.bb @@ -15,7 +15,6 @@ LICENSE = "BSD-4-Clause" DEPENDS = "ncurses" SRC_URI = "ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/${BPN}-${PV}.tar.gz \ - file://tnftp-autotools.patch \ " inherit autotools update-alternatives pkgconfig @@ -28,9 +27,9 @@ ALTERNATIVE_TARGET_${PN} = "${bindir}/tnftp" FILES:${PN} = "${bindir}/tnftp" -LIC_FILES_CHKSUM = "file://COPYING;md5=6d6796cb166a9bb050958241dad9479e" -SRC_URI[md5sum] = "a49fbe752318d5a7893f900046ea00d5" -SRC_URI[sha256sum] = "c94a8a49d3f4aec1965feea831d4d5bf6f90c65fd8381ee0863d11a5029a43a0" +LIC_FILES_CHKSUM = "file://COPYING;md5=b4248c6fb8ecff27f256ba97b25f1a21" +SRC_URI[md5sum] = "fdb6dd1b53dca79148c395b77c6dba5a" +SRC_URI[sha256sum] = "101901e90b656c223ec8106370dd0d783fb63d26aa6f0b2a75f40e86a9f06ea2" PACKAGECONFIG ?= "openssl \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ From patchwork Fri Jan 14 01:39:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 2414 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 7D912C4332F for ; Fri, 14 Jan 2022 01:40:00 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web09.1639.1642124400211894787 for ; Thu, 13 Jan 2022 17:40:00 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@windriver.com header.s=pps06212021 header.b=NFH/G3sG; 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.166.238, mailfrom: prvs=80133a60ff=yi.zhao@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20E1YZdD007942 for ; Thu, 13 Jan 2022 17:40:00 -0800 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-type : content-transfer-encoding : mime-version; s=PPS06212021; bh=i0skX/kqcLRCa/hhZMx4qqYgYAHUwY38RWA1EOk2HcI=; b=NFH/G3sGDcAhUSV7tk4tInJW7pVAGKvBN8caTOSX/pqZyWrhS+NzQaSn3K6Io62t3B+3 FyJ6JaFu4CZPOiMP3Ikwnf02wuFd50q1IK53yvgceH8nPJ75Yq2HiROVq4G2Fx0ygpQx aOiZoK7k9LcOSTO1nqsce6eUvkiPaQi07W2Bq7SOYYZuFZ7wai7p6XyMkcUsRktQC5lE XMKt7YUIuO9luXZm7xibrfdILb/RtVs2QHr+bWfAIuATZc/42/WXZbkSr96LBDmTB2ut pWU+cRMknC6IAKKpG2jzwjRjBh7iJVuwxTq0H2b4h91uHrC8wqhDCb72xDdBDoxP4mX6 eQ== Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2101.outbound.protection.outlook.com [104.47.70.101]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3dhyvth919-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 13 Jan 2022 17:39:59 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kpxb5dc9Z4gVoJBqt/83tvyBt/Lb7/esJ+Vuc6dp8XPQZqQZjHGv6tEpc9z2/dbjAE2s6gP4aVq6sYl5tFBeAuoMN8cbfA7GdhmcYh+4r3q7ZYGZ4ArP7KMnwrdgAg8C6fwleYjFztDGe9V51LIm9+TghZO2A3Zvn8Mgc6pWt3efkpZJT+zWkrrSHMRg5qZRFLR1Mp7J/fXfNEMms+ceLPy0N0dW9wfKQcvrAYUY1T+AQqsTwxa9LkigQRRkVYMgeFmtxoQ6mhnoNU4i9YBDedi4ZjOFwoKi3/+F9hGH5Ia1MdKP9l5+sQcrKLiwHRby6ZXK+X4by/KcxDJ05aPsoA== 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=i0skX/kqcLRCa/hhZMx4qqYgYAHUwY38RWA1EOk2HcI=; b=e355uuiPiqIxOzjIbJglM2lhTV4Ny8N5se82M5TfrcAYv6956rC2oi2BeJP33UPDWWK9DPOJGil/mNX9gF+b9+erjLWt3Hu+XRRFlANKnE/kXzOAWMFP4861VEuv2+c9OjKwXZqszNYsdeVwB1EKjIaHcs2DDfUAXsCK7pEl+5JoZ3aXE2F8V0hZlpE53bscAPplP1O8vqgFpeZW6GCdtMAYLNnOGqHpEh21w18QKXOI3MQ+QG1RnaAJ2YjI2nADDZh4pI+vYOM3DSro+tltadMoUA9E2XqyKQRausEFJoAImQlLCj0odAbfBSO6QM4Xj05Ux696q29EmlV4vgexYA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from SJ0PR11MB4878.namprd11.prod.outlook.com (2603:10b6:a03:2d8::19) by MW3PR11MB4746.namprd11.prod.outlook.com (2603:10b6:303:5f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.11; Fri, 14 Jan 2022 01:39:57 +0000 Received: from SJ0PR11MB4878.namprd11.prod.outlook.com ([fe80::687b:9478:2713:459]) by SJ0PR11MB4878.namprd11.prod.outlook.com ([fe80::687b:9478:2713:459%5]) with mapi id 15.20.4888.011; Fri, 14 Jan 2022 01:39:57 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 6/6] iscsi-initiator-utils: upgrade 2.1.4. -> 2.1.5 Date: Fri, 14 Jan 2022 09:39:41 +0800 Message-Id: <20220114013941.229837-6-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220114013941.229837-1-yi.zhao@windriver.com> References: <20220114013941.229837-1-yi.zhao@windriver.com> X-ClientProxiedBy: HK2PR04CA0087.apcprd04.prod.outlook.com (2603:1096:202:15::31) To SJ0PR11MB4878.namprd11.prod.outlook.com (2603:10b6:a03:2d8::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f87fc525-92b6-4e6f-19e0-08d9d6fec5b6 X-MS-TrafficTypeDiagnostic: MW3PR11MB4746:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1201; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ERVqXvINt/urhkYFCF0AY/HgXxgiawCBYY9YKtGASSuro7Ioh5TfGfGQfsSKU3j+qv5chTEoaGPmGpUyvA7FXMkb2bhHcpGuj7Mqze8RTCvT8gu8DRDR0HZdfau+7l3XVgWKyG65mBr7693DW6MlM0d0Vozvahbv6lSeW9JAd3c5mR+pdGPZsu9Y5OhY8gHoaecINmQ0qxmHXWObKJRb9o/ICEOsmfmS2mSokkP6nR/gB/OfA43650ciS3jRkPiAA9Hat9EGljyrl/OJbZ+zgy12ZZ7Q/DCcBCwXg+AKHWzAnckT5F/rIyfJT87XhrJFnT2O+qq4XUMCvhDEYnAL8Uk471vztMD8DvgNbOvyWH3JzV1+ZcMWYiFhIDvRRSWT5YvwXFDOxs7A02gKKBj0HYzWq/37B2d1ixLDeborzHok5o6l2KYUNUax/oPRvHkcbjfjDVw5qZpULm7w8n9RP+HE+nbz87dGVsdDma+W6FTkikXVEqaKAuXkh0e9tvxRPpAJG6CUcLlpEJIQzB9yWLhGBcO+Bk8WPhxpb4yrcNPACTyHG7ysjWPmZ7Iq/SzxH0eDvMGhMapQnGbMUoAddc14wq8dBaQvDmB9jNUpAaYgMKdqwcdQOub3DosQpCpoCZLaOvEXC2K8rLm5HWb0v+NIJls2AhpkPPHJ8xXOjdIRcfvz0AnSBUj9wR53okPfFrdwZLhs3ROE1aKJ/jdDj2FYU9XvNV80qGbHM/2p+1bDIuFtwctqUiDXLufTidyoX/4uPgTFjSePbJQ9mQhR5gUtD4ImKtyg8e6VxCaKjCU= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB4878.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(83380400001)(6916009)(6506007)(186003)(5660300002)(26005)(86362001)(316002)(8676002)(52116002)(1076003)(36756003)(6512007)(38350700002)(6666004)(44832011)(2616005)(66556008)(2906002)(508600001)(8936002)(6486002)(66476007)(38100700002)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?9cvQep4pFVQqEXTef3y+o8jc4gIK?= =?utf-8?q?y1pLk2exUbe7augZHSObgi9KEDSWlvBQrdJj0umqlHg7LxEVeHZqGpF7QfPwAm7g5?= =?utf-8?q?INZHXUWoAdw2a33koDmSlT33dNEXrRQgd3x1nriMzGZJLPaUARfpXqJSNg4jtqjf8?= =?utf-8?q?lM2DLFU1jZCDnGNtPRpXpjCAW5d5JhT1BO5DRqTIQTUy94hfFg5Zq4ESJBgtraP4A?= =?utf-8?q?K/bJkbdceRnrHNfrlDdl3GceShjDwXZyz5GFneIElMn7UxwsBopkJn0JRJsTG92Ic?= =?utf-8?q?9h57QGGFz/SCAUO8cezUwwJlhRwnMzCwfGfeH3v04rzp6tGiAE2c4kMbeIj06v2Ug?= =?utf-8?q?Hgh1JCfRyYkIVAlh5PtQwzYdk5GiGs4R1Ponjn6syT8WgbeMU3o/NYZOwnK60aT0j?= =?utf-8?q?UZC1zpen37tYnLLIptmG6H1vRX1yijA0RdPNTOoK1jE5yY3IY54yMUL5Zhdj1n4Go?= =?utf-8?q?p4nVxbZBZMN/0tpjiI3RGPyAaHpTJ2HtTmMr/K4c1s+FQJnK4C0ZlXCuUmeorsRag?= =?utf-8?q?0I8QIfZ7PczzznOXqYcfkDqJ8JsZpu3sAh/tkIyAPdJCmcZwSwJ7cWxu36XfG2X4U?= =?utf-8?q?Gbm+abhH2S2wS7DBUCn3lF1VC9gu4hrC4B37QgJq6PA6uBwNjMKSBv9tgtukNGMIG?= =?utf-8?q?YMVNIJr47WyUpxmWvlpiTS4JwwbbGLQcjUXSshHaAdK1fKma5PYES/T9drawRp4cV?= =?utf-8?q?2onBm3byOj74aNG8N3EvgMjOkraRQ/XQqmraC7XUU+r4IpZDPF5UO4WFIVAPbpEKu?= =?utf-8?q?w+fOupqmgcbcJzvgWvXnz0PEsPCHKiTXRiPBD3VFVnP7kAwS7X3ZbwxUGpboC0JKT?= =?utf-8?q?IeDe5iwZmcGOPgHt4+g5HrIxsWHdsl7igILEhfsGU02RT6YTwm/cRgV3sO42DOxX0?= =?utf-8?q?ZRGaWsi+xVrqDFpLs+k0rqe18uoL6JHWzA/tQ9VzUxVh36wZOZ5K4N/dEDi1VUsoM?= =?utf-8?q?kE8PXsTR5SqAibeat7T1e5Ik3VzFrB+YAT4gQzrxrKUIS3hTKDCGzxwJsiQhHNgPf?= =?utf-8?q?bkcpHqfn0Za/HtjtbI8E2LIrSN/9e6aq48ovR18/fdtg7VVD1Fvpdl9oGLb9V4RZQ?= =?utf-8?q?Gf52FNV+wEHp9rOM1d+bxCMqJlzS02T0dtz5uy9zxrrL/XTe45SUE3KXy8IX+CnFY?= =?utf-8?q?OPOOYFlvxZTNmKx4esP7A5M9Sz78+cAfMZ3xtounxzmYuZyWZw1q4sHehLP2qS2ZO?= =?utf-8?q?EeiOzLx8IgVZx8EveaV6xlzKSdZya1FWK1o+sBG0dF/33sdpYWq1p47S+wm28kSho?= =?utf-8?q?pUM/x6x1ZSwDDSyXNvyx+FqszOAxuOviZ3QDWIIEQ/HnM+wVL0S5mYTvfUYMWZ6wJ?= =?utf-8?q?stVsIRlPGJJpM+5aID0oJE2Tcvxxf0MniXJou1DzRLLcbOtXZim3QBVlC74QJ3VTa?= =?utf-8?q?sMYUaI2GHknLWfnZB1SaTdVJkjs1hj1kCoIdaSRb/wwr1cSsGBCpJmr48Evpdq9RT?= =?utf-8?q?2ESLLU75FcVGEctngcGiw7nKFeaIgTG5fj+/WUm9ealeHS0kuQ+6I31UCDH4abXba?= =?utf-8?q?G6kOqCt5QVYp4hEW1cz2VOmXA4M45HTA2xaOQhXjhNjqfS7l7RONvYU=3D?= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: f87fc525-92b6-4e6f-19e0-08d9d6fec5b6 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB4878.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2022 01:39:57.8281 (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: qloqQm+SJGmXYPUFoLhDHLBT43R8DBGPn84UggRMzFUjsal3NIaQ5W9oJjGcgBEmgGC8xtBEBoC3kz2Z8T7eIw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4746 X-Proofpoint-ORIG-GUID: m8qZ5d5CpoLKDZpxi4NrpAqzh9Q0vXmI X-Proofpoint-GUID: m8qZ5d5CpoLKDZpxi4NrpAqzh9Q0vXmI 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-13_10,2022-01-13_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 lowpriorityscore=0 mlxscore=0 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 adultscore=0 mlxlogscore=999 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201140007 X-MIME-Autoconverted: from 8bit to quoted-printable by mx0a-0064b401.pphosted.com id 20E1YZdD007942 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, 14 Jan 2022 01:40:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94820 Backport a patch to fix the build error. Signed-off-by: Yi Zhao --- ...or-introduced-with-recent-IPv6-commi.patch | 43 +++++++++++++++++++ ....1.4.bb => iscsi-initiator-utils_2.1.5.bb} | 3 +- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Fix-compiler-error-introduced-with-recent-IPv6-commi.patch rename meta-networking/recipes-daemons/iscsi-initiator-utils/{iscsi-initiator-utils_2.1.4.bb => iscsi-initiator-utils_2.1.5.bb} (96%) diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Fix-compiler-error-introduced-with-recent-IPv6-commi.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Fix-compiler-error-introduced-with-recent-IPv6-commi.patch new file mode 100644 index 000000000..ba0ca4ca0 --- /dev/null +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Fix-compiler-error-introduced-with-recent-IPv6-commi.patch @@ -0,0 +1,43 @@ +From 424d5967e94f6adf4c0669d390779af8da0bef20 Mon Sep 17 00:00:00 2001 +From: Lee Duncan +Date: Sat, 18 Sep 2021 16:10:50 -0700 +Subject: [PATCH] Fix compiler error introduced with recent IPv6 commit. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Commit 76350316de38 ("Handle IPv6 interfaces correctly.") added +a string copy that creates this gcc-11 error message: + +> gcc-11 -O2 -g -Wall -Werror -Wextra -fvisibility=hidden -fPIC -I/usr/include/kmod -c -o idbm.o idbm.c +> idbm.c: In function ‘_idbm_node_rec_link’: +> idbm.c:999:17: error: ‘strncpy’ specified bound 65 equals destination size [-Werror=stringop-truncation] +> 999 | strncpy((*node).iface.name, iface_name, ISCSI_MAX_IFACE_LEN); +> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +So copy one less character, maximum. + +Upstream-Status: Backport +[https://github.com/open-iscsi/open-iscsi/commit/424d5967e94f6adf4c0669d390779af8da0bef20] + +Signed-off-by: Yi Zhao +--- + libopeniscsiusr/idbm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libopeniscsiusr/idbm.c b/libopeniscsiusr/idbm.c +index b2524ed..6f57e45 100644 +--- a/libopeniscsiusr/idbm.c ++++ b/libopeniscsiusr/idbm.c +@@ -996,7 +996,7 @@ static void _idbm_node_rec_link(struct iscsi_node *node, struct idbm_rec *recs, + + /* use the interface name passed in, if any */ + if (iface_name) +- strncpy((*node).iface.name, iface_name, ISCSI_MAX_IFACE_LEN); ++ strncpy((*node).iface.name, iface_name, ISCSI_MAX_IFACE_LEN-1); + + /* + * Note: because we do not add the iface.iscsi_ifacename to +-- +2.25.1 + diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.4.bb b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.5.bb similarity index 96% rename from meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.4.bb rename to meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.5.bb index 034e6ee9d..26b5b5c34 100644 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.4.bb +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.5.bb @@ -12,10 +12,11 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d) LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV ?= "095f59ca464220eae285de6b5f2ee31185a6a84c" +SRCREV ?= "20d0aa96f2170339b1967f4be81e9c5042bbce03" SRC_URI = "git://github.com/open-iscsi/open-iscsi;branch=master;protocol=https \ file://0001-Makefile-Do-not-set-Werror.patch \ + file://0001-Fix-compiler-error-introduced-with-recent-IPv6-commi.patch \ file://initd.debian \ file://99_iscsi-initiator-utils \ file://iscsi-initiator \