From patchwork Mon Mar 6 11:02:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 20501 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 9001EC678D4 for ; Mon, 6 Mar 2023 11:03:23 +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.30524.1678100595341486122 for ; Mon, 06 Mar 2023 03:03:15 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=plX7B/19; 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=2429e4d58b=yi.zhao@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3269qQfx003556 for ; Mon, 6 Mar 2023 03:03:15 -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=qyWnw7H6ImJI3SK1JUNhql5R0h+I1wIa3xJcG9mB3us=; b=plX7B/19g0vRzyOWqWRYf3QUCLYo0a2281d6bWJ8dTOMX5y8uKzC6Ker/rQfBfoPJxz6 BAhTlhEQvghgBaY78M8hL04PUj4sVmbnTw4/vmtEbYVOKAnMhYbeDl5XPTrWuCVVKptL fLsPbRH1khMltLxRF/J5pJS5O6FcUR1w8w0VvupSYaHdB8VPM8q6kDe7BlYoFm7762XE DHkY5hPnX09NK0Zm40p1OXn5rJvnWnLlFDGILyOBcdOEAlShSLbfx255Ytk62sD00ApG 9TIefaPWL7Q5WuytelmiySNRTxlD2X/cMZHt6ZRhWLRXMdXahYetBQ0gXAEvAzI09a2o Rw== Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2172.outbound.protection.outlook.com [104.47.55.172]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3p46crhfsw-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 06 Mar 2023 03:03:14 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ra5FrMtGlXtm5rDeo4hY0GmlpeUpx454lIC/3KNhOkR2w52uU5+gtIGYWRUR/xbFJZJt5MjNXGm/5dgk0I+jbqTV0bQvaRX8ycjODrcrNJkG+fD2bF7TIpDe2dhNFQIuNfx8Wjr1iGkdW6rjVS3UU/jJufmEz5THvlAxcaF21+V8dHN2T8hZxFX4NtFVQa1eLRdKOxphIlB1ORkWO8b9fZp2PeMD6Vn2P4SN0WjbCGsEeAcPoUUoLLC7dIgPX6fUqpZo24/RWLmuPx8h+olZQ2bh9td4q8y8HnA66TbCufjHkx0aHHde8DliHGXdxkrsdtWZkdrWYQ4LBNtlkNQvfQ== 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=qyWnw7H6ImJI3SK1JUNhql5R0h+I1wIa3xJcG9mB3us=; b=NS9U4XnUROtHZDCQi9VlS5AEO5okWv83zY2qZ7VmXL2spBGT3/JE74ESDwczkkJf2I2EHv5sA5IcFBJaeB27gRqn0dCnSOvzFfcz3NZov1cnEK9v24ceMm4df72cCkWTFe7TRKM4eKnhwljePLSDkb7AEiV72Ojogk7PdvKsynyBKTO9uTqB8D2iH44xKiggI4x1r/78OvN3lle8XLzosxDcwZ1vs+mXBykwEz2koof6YVDs2N85Jp5FCMVJCX2ksT8wFsvkye38S6e8K7tol8B5iLybZUJvpTL0Lm6PBkYAeyTSOUD2fcC9Kiymd1+9KWln5EC9/hNdT0OYLvIzbg== 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 CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) by PH8PR11MB8257.namprd11.prod.outlook.com (2603:10b6:510:1c0::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.28; Mon, 6 Mar 2023 11:03:13 +0000 Received: from CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::3cb7:edf3:7304:982e]) by CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::3cb7:edf3:7304:982e%2]) with mapi id 15.20.6156.028; Mon, 6 Mar 2023 11:03:12 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 1/6] strongswan: 5.9.9 -> 5.9.10 Date: Mon, 6 Mar 2023 19:02:56 +0800 Message-Id: <20230306110301.75991-2-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230306110301.75991-1-yi.zhao@windriver.com> References: <20230306110301.75991-1-yi.zhao@windriver.com> X-ClientProxiedBy: PH7PR13CA0007.namprd13.prod.outlook.com (2603:10b6:510:174::17) To CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PR11MB4867:EE_|PH8PR11MB8257:EE_ X-MS-Office365-Filtering-Correlation-Id: d8568480-8bd0-4ad2-1c5e-08db1e3260e7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vHnt+tuNn6OBngXIiCFAuuDMZm9e2KdP6g6fnDNw8tweTKszsqzFwIFV/yRxHSafBIVsSB30QvqWqN/06n+iIKhgx+7yiuDK9jYO6NZaZ+hb5WbvH/F2urcizcqlxM5EwWqDR3HVEXhTNV9TJD1Y2JhsiNg36ATAoud/z83HgkhVTmuxBeQOc7kM99Pz4M6fGp4dk8o+3SQmVqKlfen5BAG7AjSbh86qq+znBTCVJjBRNQTq9iQcYz/GbN7H0AVARylMmkMCrCcH82hA0uYAWpcF+GFKiXfBxAGuesI/BtRunLduNp2rM1yTvX6PLxQx4h3VE0G9FDiiiKVkig+/JQNUxcOkbxUYcNwYC3CigUIV5S9YmXihrudGleY4Cdlk/JrcQeFaoavE9j7P1r8KAnwbVy3bFvXn+u9qj/Du313E0th+c87g5IOkb8TcbF/hRq0btO8fsmmC9w8MUBCsga21dNKUUbA2jLXK9TbhmuaXOJ612JZwK1TTn+UdQ2bvWEDahJa+wuWo5s0tkWlpGsDY4TVdFN6JVmytmTH73SsRXwHb4tS/0ELshxjbaacOYm/PIrhdM7nBxsupyWtXhCElzZ0fJ2vbvyN5aFVUYMiJMmvIRpwyJvxd+AzK1GD9CvKEP+RO6mBB1V2mlJaegHMQ4/oiXXvWHMX/YUWvqtb+tP9uOjDswci7i9RnBiXo X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB4867.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(4636009)(376002)(346002)(136003)(366004)(396003)(39850400004)(451199018)(83380400001)(36756003)(478600001)(316002)(38350700002)(38100700002)(2616005)(966005)(6486002)(6506007)(6512007)(6666004)(1076003)(52116002)(186003)(26005)(41300700001)(5660300002)(44832011)(66476007)(66556008)(66946007)(8936002)(8676002)(6916009)(86362001)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: N0SNzOOokRlM0HevNefOo96naV46EXTlPXZ/HyzwVYsH1tibTtcPv2fpXTKe7BlrY4OBNyeD/BEJEFQOJRFkXnvDJWS5o+g6Bn9l+9mCRhJPbdPfXlG9yjQ8hBlBPXkANIh3xftCcX3kzdUpCDzBlxuZipRCC25V80ZAbTBzwXEUB9e+Iqn03oaKwvgM/NEhV/7gEmmfSLyYtsxCXYevbbcSSuOovNhdOk3/2GLdNPFT2CBS/fARMhfp2vBXpz1SUK7v0vmc9Q/IM//OpUggmjNR5nJt13L3WdrOuusA7h2oJEmeo4ds8MHx3mEgPR8coMKjt1rA9QkSTa0Pj5KH2cs4aUXCB0xx8s1/dlCRt4VNVI6afAXGnY8lS/ziMIlBTE571+ewq/ss0U1i+7QHw/TrYUev865hMZ+o0JaeXqWYP5CwYUyF7yCsv+FTRATmelHMZE/y67D3/ZEufXEY4HhVpFsXsz5ZDHvj0+KIaDEVaBWOxYEEHBQSeSaxo2GZK0pVNsBzFKOPBGjIe+BZruSMoB4KQfTTV3qr//1wZNV7hV0QaOo2gYY71FiSZBn0f5JD2R9KifSKh3NrsZWZDMKZ3rtut6nknDlKJDOt7x9nfiagO26zyhoC2BnjX6JTeW6PypaNzXAJUz8Ooiu8Vvq54d9f7ojpwlxNEbKx+o7fCBfbOcdtFlZLYgU/fGJ1b2/UwLUmB4V5QuCyLp/GA1bmVqPZw744JzLPzpOiJg2HhHTzSaAKFms6Q7R96YURpcm3Ipe2Psv3lzCxm2AbaY3gQkWgbxUPBH8Ydu67doNvbQIkBD3+jl6wkvl4g4whrPUXT7wpHjIU+cXUhsfEBz3RuPR/Ox6cobufrxv+Hp9KglTQs46f6CUXi23AC3U8UR5YoTlE3l9nDYct7X01hpU/Bm32leY9dxhkrqk0H0e1Kqm8DsdQtZh9k3lbSRbJOh/qCIL5kZF94hUrUjEl8JCH2H9zvypQ2EQ4GZtMJbSTqOhwxHGZmi0IXo5nyq2Iy2uuiFP36EnWTvRon5bZgG09VjBfkpF90Y/jmbIPvmFx6PJFT/FSWZoupTTLp8ZdgWv3jm3V325vtTo5mr7wxJDQhSKx2tDctP/UA/FwM1GhjS4ODmmCoP6H9b84RSx7Ne6Mwg6il81/lXTMqdUOvVZaoF29Yzv/XgmGMjD3glitR9TcyJCm//kOrPTvcAR+aMdq9sUx8CD4RtyRLl9gVCTUDEBpVIyUsYmsi5LvbC+rxYXWO8MzmPR23RJkkdHH23i8Kk88BowSsOtuOB1tsyCAwGUZ9NHPhkSoti3q8mVNm7iTysoc2vJXO6aY8KLC5Be1H6zXjxlQ/LNYTbrrf6M3PlpKMmRq7qRMeMMO3N4GcBhwRKRE/CO5OqjZN8u8kLjEXi3vzfUrueXr7j1QzYuAVpK01CEN4gAMgJPc4o93nqEv3Jh/ng1/1wh3O01LZcdwsJNUlzNqol4cP2bn3EhEBaU05j308Qf30DnUj5KiKT5XBNyGZ1/6uTT+Gde1psqcurt4HmzGN21yBmeGVOoP/6YH3feDsK3Yi7oD53TSMZG0+nfgGAFcazEwjQ4M X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: d8568480-8bd0-4ad2-1c5e-08db1e3260e7 X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4867.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Mar 2023 11:03:12.8826 (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: co15gzt0ZKHra3IYk5bFC0ERQgt2mrL35PuHQPNcTfYVksu61y/S1q5yhzqDUHI3oPCltkY8ia0iYiD1VxV4KA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR11MB8257 X-Proofpoint-GUID: R100Almvc4kazaZB20PWQJjgV1eukfdo X-Proofpoint-ORIG-GUID: R100Almvc4kazaZB20PWQJjgV1eukfdo X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-06_03,2023-03-06_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=895 impostorscore=0 lowpriorityscore=0 clxscore=1015 suspectscore=0 phishscore=0 priorityscore=1501 bulkscore=0 malwarescore=0 spamscore=0 mlxscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2303060095 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 06 Mar 2023 11:03:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101394 Changelog: https://github.com/strongswan/strongswan/releases/tag/5.9.10 Signed-off-by: Yi Zhao --- .../{strongswan_5.9.9.bb => strongswan_5.9.10.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-networking/recipes-support/strongswan/{strongswan_5.9.9.bb => strongswan_5.9.10.bb} (98%) diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.9.9.bb b/meta-networking/recipes-support/strongswan/strongswan_5.9.10.bb similarity index 98% rename from meta-networking/recipes-support/strongswan/strongswan_5.9.9.bb rename to meta-networking/recipes-support/strongswan/strongswan_5.9.10.bb index a11cd5a6c..9caa248fb 100644 --- a/meta-networking/recipes-support/strongswan/strongswan_5.9.9.bb +++ b/meta-networking/recipes-support/strongswan/strongswan_5.9.10.bb @@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "flex-native flex bison-native" DEPENDS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', ' tpm2-tss', '', d)}" -SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \ - " +SRC_URI = "https://download.strongswan.org/strongswan-${PV}.tar.bz2 \ + " -SRC_URI[sha256sum] = "5e16580998834658c17cebfb31dd637e728669cf2fdd325460234a4643b8d81d" +SRC_URI[sha256sum] = "3b72789e243c9fa6f0a01ccaf4f83766eba96a5e5b1e071d36e997572cf34654" UPSTREAM_CHECK_REGEX = "strongswan-(?P\d+(\.\d+)+)\.tar" From patchwork Mon Mar 6 11:02:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 20507 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 A6A10C6FD1A for ; Mon, 6 Mar 2023 11:03:23 +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.30525.1678100597741945973 for ; Mon, 06 Mar 2023 03:03:17 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=N8JJ7Dkk; 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=2429e4d58b=yi.zhao@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 326AeiL0016794 for ; Mon, 6 Mar 2023 03:03:17 -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=+WygSy3Vi+6qNXWXVk7mFs27+w3m9+KuC1Nu+SLCAdg=; b=N8JJ7Dkkf7lvpAzdq3GrSC+X31g229Bp+iukNkR+r+HVwu/rqYpL3hncJiF3hCYaopRl KAL2ju9BfYrTviIpEApxupL4aSqyCLZyj+JrjdHqqWluaJEUzlLhXDpaE79bOvLEwKb5 zlrf13tR4b/WdFXZEFw1FDokQlSFPxYSmhsg3xvc804uXUfvdQBn6IIBgNvcAX6Isda6 1rT23i7mwF03TSSXzCgpmdOdscpNslP3c/gZH9zXwUZ3CiXaa67qlTQRWHcExcwRI+Al 28d9duthAvVsANoEwHavy4Q+PPfd1jhzFlgC/Si+ggDAoZZK3qvcktdP3FSc+Em6ZDGc Vw== Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2170.outbound.protection.outlook.com [104.47.55.170]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3p4258sp5a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 06 Mar 2023 03:03:17 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c2ZfsUCKFuWTq6hGWSt/fQU+yvN1nfvNALKGxWMZXnePgKHDsyt0TeTgZqR4ghkRVJKR6JVgigvA/97m4SNkMQxzFEYVmrXD6PyFhcCCHwIToOseLxxMOuEm76BauAwsEH0t4gchTDLMax4hTp/PyrGUF4Ac+34/43jkGDZ+Ul4MXzI41DE1S7ROmTtFYe2k0v5MgZO528AfdeZVz+ktUS42Br37P3iZDafkEiVQv3/Yq/4NBNy4m3KrChC+sSKkjQofFt6IEtnZo8C6ZYQ+1ugtyC3dM3F23CWgG6RAXNKOLAa1wOFzWvn2R0dl6kNDWxue3/IUjB7Xanzt3OdbXg== 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=+WygSy3Vi+6qNXWXVk7mFs27+w3m9+KuC1Nu+SLCAdg=; b=EBNkU3skIKAxGGXlIhcryHPKusHo0tthv8DZj21mPLbI7eCnyKqmJwPmclvKtZ+5qLRK3dkDQd6PAjpj6Cdi60XdeGXHBFPjxyYhsClEGOulXjcV/RqxkILxasOGGbpzkzIPKeFxQjan1MPO41Q53/jcLqQJWO89g02ixqvYY14WuWRiynU7Dsjn+FvZLtmyfzwA0q38rk5G9YmY8LA/6fCbWl1XPTtyHbsgDUWG0V+BLpij6Si9hUc583B6IEdkrFD63iCkv9s4DgNvhQowf5KV1cA9uaePWwc2ivJE6BAAmRuinc+o2y2BqdMz/ybDXE/iDCJSZMKsWK2/fk6yIw== 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 CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) by PH8PR11MB8257.namprd11.prod.outlook.com (2603:10b6:510:1c0::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.28; Mon, 6 Mar 2023 11:03:14 +0000 Received: from CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::3cb7:edf3:7304:982e]) by CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::3cb7:edf3:7304:982e%2]) with mapi id 15.20.6156.028; Mon, 6 Mar 2023 11:03:14 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 2/6] libnfnetlink: upgrade 1.0.1 -> 1.0.2 Date: Mon, 6 Mar 2023 19:02:57 +0800 Message-Id: <20230306110301.75991-3-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230306110301.75991-1-yi.zhao@windriver.com> References: <20230306110301.75991-1-yi.zhao@windriver.com> X-ClientProxiedBy: PH7PR13CA0007.namprd13.prod.outlook.com (2603:10b6:510:174::17) To CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PR11MB4867:EE_|PH8PR11MB8257:EE_ X-MS-Office365-Filtering-Correlation-Id: 604aef61-7c6a-4a8e-bbb6-08db1e3261a4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: k30xweS9yqx7tb1DMfuQl6YIQV1K7HsY6ofaLc5MRwJCMTQiyELH4qWw7uaMEnJPtcSvuPzJIZD7P1NjBkOq98GbxnUdAsow/DNqaTsBPiNhPqZJLiHY9plDtwHupju5fJJG4COs4wHct50enk4+HY92A9j9G3CRr/H5JD2QCF3e0dMmZlf0jbMCpWwm+jJ1UyAj4vYnzLBHH+5+2vrVwx3aWsx/jwXjGDn/EbB4T5u2HAB3FRODU2DFLFJmkOwJPSegcAld1LxJLGvhEBDtTweQgV168tg85Ec+oFIXhBzMD2uPgOD9aRmbmR6OiW8ZCtvxMToL2A0We3vvLARn/7Kj6B9uV+WUmOFATa8/68TR5ApB6LBx1AzPkG0OouXLnWub0oGQGKwqMh+sH7JTz6dizn+T/hGKvW56rKVsJGwtbTdiiBlrSQZlAQ5dPH5lqcYtgwEf/rFUPjCOLhNGcTgQrjdhU3c+fIBpZk+/f4DFP/nsuCtPd72NCcojye8RngdXjXRToIFd8GXNAJbIyD+byNJ3amtUAM6d/45BQ47BTxbXc2mHAwUPgAEjgNPc85YcSIyN1su12/VvI9j2KIULC5aQDYKDAzPNGaFvbDp0NCpRuM7wPvnGN/8TB2tHHswnSM143X/zOyK8W+wrGLp7cYkTaGzElzww1RPqG3G5XZavWdfOJhqAjtzKghrHjHZUlmk5tdbtpRs+rQSzfB5AFI4/rY1Wz0oaE/t1U8RGqd1kB9lsUC1JSU7ApeA9UGyoAKZIjB2codQAmQbo661CGi+wDq7rcWSL/OIQCbI= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB4867.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(4636009)(376002)(346002)(136003)(366004)(396003)(39850400004)(451199018)(83380400001)(36756003)(478600001)(316002)(38350700002)(38100700002)(2616005)(6486002)(6506007)(6512007)(6666004)(1076003)(52116002)(186003)(26005)(41300700001)(5660300002)(44832011)(30864003)(66476007)(66556008)(66946007)(8936002)(19273905006)(8676002)(6916009)(86362001)(2906002)(21314003)(2004002)(563064011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pM3ILAozQhSB8Mt/adOVAWUYEa39RB4T3SxdRs7uOsbd/hGnevxlRSx5nDa/iZ8B+IXnj2k0RRxd6EmT4+cXNY8RcDgFFGdbLKQ46igP0hvXuYYSMYueXRRu1ARqsCVUrBLK2pDSVpY6omhlKeKe4MiNf1ayArWkPs/nhCsyaPFeiCbnG/ZuJM83bNRAi0zRyUISulPeNJR3Kdetf4CtSHHa7yEXLAROq+ggB85t68/1QwcpTS8pvEeix2N4rB0HQJq2dRcf0n5MRkBgmo0pdLedsyouhxQPl8TmRTnynDuLVKau0/DHsrOvMcdWliqe6j78PVLs3M0iQknWVVLwnz7ZOAI0NPNjLOHl0ZptLbgzGylASi0ygn7eN5ass/La+XD6gedvUZw+twIOo9fvce/1ecdclnX7u+wrsOd3Q/DW9bK7qmlHRvQct8tc+LU9sSnbT+eJhs1+WZp1CLXHvLBAkffauu0K/8SjAn/rRGMpYmabXIsH+LEsZONXQ3PnRmk40GNVm4wMgQ0Z8pqEY2d391kZsyHe7HkaQ0pQ8z9YxJKu6oopbnlkVSCV99hxMJcQnTQQXV5TaXSTWP2YbRpFAUgGbJbmZvdf5JU2VzhC3D6VUmGy8wngkKPxCq8PUS0xB/I7dgClo5LR4XjLvXjobTh5G5JfiNKYGUOzGIzZfKhRna0+bFuDPA19OJpfbN3nE2k2LCc3/yzGLP8yxIygEPtXo8pxsB0vQz/KbQpCV0IhFtKfjxB1bKylX+LiIPMOMGLD/CVJnq6BBfv4wyD56ULFdezL8YjKx6G3Gheko16aOnsPmDwRSBaMRYEaGtVs650AN/kqyap3OqPzIyk7PAlu8PbvSL/RLdKSUEjzDC86TsGTofeXN/J1HTVLyrlEsa0ZC3k4bDKy1nRDG4xrWa5dfFhpKxmLgCQDVHOQXLJfVr4UgaULznvytTWdRwTSWys0k+oV3AJoQGBY9f3BhSVC6J7idzwXx99iGwsg3uhOhJ3yVq79Vxc94SvqrRf862KkAo5Xb8wJEwIg79zotrK2BsQbNT2/yT+7ce2k2xTgD6ggE8YOVmzlbzh+6MK4DTCvLbAzFveNY4IhJ1knzIBJPMAcC5X4r0VBmz/jQEIIQiY1ACNUE/lC1SFmU5LXXY16qtgxMDYI51rpCGgymDYv/4j2LDCwXYpmmRRMNNUwyQh4y4vec5GLN8QP82cv3xiQ9jjlNexFbni90ALsID/Fsc7za6s0TrVo9rt6LHrpnYC03t8ZlbyuAy+Rhyd1oK/4sxg9b0CI+zd+HC3bPPTIDSF2etBjTj7fe2SUSUoSinPvRP2l5dk1VU3Vmxd9nK5VcUrs5CbFtWHkpeftYV1BRJ+n9ifFaNXMDomlIs7xsKqh9mhh6iMKr2MdgKJqSN7waj6FmiMbDt8rgRBxp6BDOvWOz5fSjba26FReFRh6WYns8r08HuUfaEUBYNyo+G3vrG2qI3oJCnGf4e3pvG2SdBHG7qnjQqFH6FuyLrU+rSni6DVlko0RNtDzc7PQvpE8IO+BEVETNOj8m9aMJmp5ILt0bMPN9VZrScc+gEELWyLgi9CVxUkr7wpPZ/BB+HTuwWpimlRvgj8E3Q== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 604aef61-7c6a-4a8e-bbb6-08db1e3261a4 X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4867.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Mar 2023 11:03:14.3032 (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: bWUrMupKoKwpHSsTtWshvI9R15cX+qLjZC7NmsIp93CWE6daDITi4aNaVmyNjEIuNK3HohabXutaEyn87e5PVA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR11MB8257 X-Proofpoint-GUID: Ev_ohGiCacFKu7jDnND-ockZ9pkj-DK1 X-Proofpoint-ORIG-GUID: Ev_ohGiCacFKu7jDnND-ockZ9pkj-DK1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-06_03,2023-03-06_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 bulkscore=0 impostorscore=0 mlxscore=0 mlxlogscore=999 spamscore=0 priorityscore=1501 adultscore=0 malwarescore=0 clxscore=1015 suspectscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2303060095 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 06 Mar 2023 11:03:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101395 Drop backport patches. Signed-off-by: Yi Zhao --- ...build-resolve-automake-1.12-warnings.patch | 28 -- ...ode-license-header-in-sync-with-curr.patch | 49 --- ...0003-configure-uclinux-is-also-linux.patch | 27 -- ...tialize-attribute-padding-to-resolve.patch | 39 -- ...005-include-Sync-with-kernel-headers.patch | 110 ----- ...0006-src-Use-stdint-types-everywhere.patch | 403 ------------------ .../libnfnetlink/libnfnetlink_1.0.1.bb | 25 -- .../libnfnetlink/libnfnetlink_1.0.2.bb | 20 + 8 files changed, 20 insertions(+), 681 deletions(-) delete mode 100644 meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch delete mode 100644 meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch delete mode 100644 meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch delete mode 100644 meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch delete mode 100644 meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch delete mode 100644 meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch delete mode 100644 meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb create mode 100644 meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.2.bb diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch deleted file mode 100644 index 00d95cd79..000000000 --- a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2e5f2b81fb8cbe0d1cd33e58caa19ac308e1f847 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Tue, 9 Oct 2012 15:59:48 +0200 -Subject: [PATCH 1/6] build: resolve automake-1.12 warnings - -am/ltlibrary.am: warning: 'libnfnetlink.la': linking libtool libraries -using a non-POSIX archiver requires 'AM_PROG_AR' in 'configure.ac' - -Signed-off-by: Jan Engelhardt ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index ed549df..0926a1c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -7,6 +7,7 @@ AC_CANONICAL_HOST - - AM_INIT_AUTOMAKE([-Wall foreign subdir-objects - tar-pax no-dist-gzip dist-bzip2 1.6]) -+m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) - - dnl kernel style compile messages - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) --- -2.12.1 - diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch deleted file mode 100644 index c2fb5e05a..000000000 --- a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 5e6b6e23a8b04475c5a9de7eddb4c18103932fe5 Mon Sep 17 00:00:00 2001 -From: Pablo Neira Ayuso -Date: Wed, 7 Aug 2013 20:53:57 +0200 -Subject: [PATCH 2/6] src: get source code license header in sync with current - licensing terms - -Since (3956761 license: upgrade to GPLv2+), we upgraded to GPLv2+, -propagate that changes to src/iftable.c and src/rtnl.c - -Reported-by: Thomas Woerner -Signed-off-by: Pablo Neira Ayuso ---- - src/iftable.c | 2 +- - src/rtnl.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/iftable.c b/src/iftable.c -index 0325335..5976ed8 100644 ---- a/src/iftable.c -+++ b/src/iftable.c -@@ -3,7 +3,7 @@ - * (C) 2004 by Astaro AG, written by Harald Welte - * (C) 2008 by Pablo Neira Ayuso - * -- * This software is Free Software and licensed under GNU GPLv2. -+ * This software is Free Software and licensed under GNU GPLv2+. - */ - - /* IFINDEX handling */ -diff --git a/src/rtnl.c b/src/rtnl.c -index 5ccb272..7b4ac7d 100644 ---- a/src/rtnl.c -+++ b/src/rtnl.c -@@ -1,10 +1,10 @@ - /* rtnl - rtnetlink utility functions - * - * (C) 2004 by Astaro AG, written by Harald Welte -- * -+ * - * Adapted to nfnetlink by Eric Leblond - * -- * This software is free software and licensed under GNU GPLv2. -+ * This software is free software and licensed under GNU GPLv2+. - * - */ - --- -2.12.1 - diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch deleted file mode 100644 index 6cb7ed6fa..000000000 --- a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b259fe13826414c1bd5328a25c8d6d60e20e65f2 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 10 Sep 2013 16:23:29 -0300 -Subject: [PATCH 3/6] configure: uclinux is also linux - -Signed-off-by: Gustavo Zacarias -Signed-off-by: Pablo Neira Ayuso ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 0926a1c..b979772 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -18,7 +18,7 @@ AC_DISABLE_STATIC - AM_PROG_LIBTOOL - - case "$host" in --*-*-linux*) ;; -+*-*-linux* | *-*-uclinux*) ;; - *) AC_MSG_ERROR([Linux only, dude!]);; - esac - --- -2.12.1 - diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch deleted file mode 100644 index cf3a84135..000000000 --- a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b142da8d2c9e2e2dfbe4e89e680dd124f6064ac8 Mon Sep 17 00:00:00 2001 -From: Pablo Neira Ayuso -Date: Mon, 3 Feb 2014 12:09:29 +0100 -Subject: [PATCH 4/6] libnfnetlink: initialize attribute padding to resolve - valgrind warnings - -==12195== Syscall param socketcall.sendto(msg) points to uninitialised byte(s) -==12195== at 0x51209C3: __sendto_nocancel (syscall-template.S:81) -==12195== by 0x53E4D12: nfnl_send (libnfnetlink.c:391) -==12195== by 0x53E6952: nfnl_query (libnfnetlink.c:1569) -==12195== by 0x4E344AF: __build_send_cfg_msg.isra.1 (libnetfilter_log.c:143) -==12195== by 0x4E34710: nflog_bind_group (libnetfilter_log.c:413) -==12195== by 0x400CB1: main (nfulnl_test.c:77) -==12195== Address 0x7fefff3e9 is on thread 1's stack - -This patch sets to zero the padding that is included to align the -attribute payload. - -Reported-by: Ivan Homoliak -Signed-off-by: Pablo Neira Ayuso ---- - src/libnfnetlink.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/libnfnetlink.c b/src/libnfnetlink.c -index 4b2bcd0..398b7d7 100644 ---- a/src/libnfnetlink.c -+++ b/src/libnfnetlink.c -@@ -809,6 +809,7 @@ int nfnl_addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data, - nfa->nfa_type = type; - nfa->nfa_len = len; - memcpy(NFA_DATA(nfa), data, alen); -+ memset((uint8_t *)nfa + nfa->nfa_len, 0, NFA_ALIGN(alen) - alen); - n->nlmsg_len = (NLMSG_ALIGN(n->nlmsg_len) + NFA_ALIGN(len)); - return 0; - } --- -2.12.1 - diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch deleted file mode 100644 index 383f0e8b3..000000000 --- a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch +++ /dev/null @@ -1,110 +0,0 @@ -From b10c90a61a5fc46f2be5aeecb9c96e84178f7717 Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Sat, 16 May 2015 14:49:07 +0200 -Subject: [PATCH 5/6] include: Sync with kernel headers - -Signed-off-by: Felix Janda -Signed-off-by: Pablo Neira Ayuso ---- - include/libnfnetlink/linux_nfnetlink.h | 44 ++++----------------------- - include/libnfnetlink/linux_nfnetlink_compat.h | 12 ++++---- - 2 files changed, 12 insertions(+), 44 deletions(-) - -diff --git a/include/libnfnetlink/linux_nfnetlink.h b/include/libnfnetlink/linux_nfnetlink.h -index 76a8550..44a38d6 100644 ---- a/include/libnfnetlink/linux_nfnetlink.h -+++ b/include/libnfnetlink/linux_nfnetlink.h -@@ -25,9 +25,9 @@ enum nfnetlink_groups { - /* General form of address family dependent message. - */ - struct nfgenmsg { -- u_int8_t nfgen_family; /* AF_xxx */ -- u_int8_t version; /* nfnetlink version */ -- u_int16_t res_id; /* resource id */ -+ __u8 nfgen_family; /* AF_xxx */ -+ __u8 version; /* nfnetlink version */ -+ __be16 res_id; /* resource id */ - }; - - #define NFNETLINK_V0 0 -@@ -46,40 +46,8 @@ struct nfgenmsg { - #define NFNL_SUBSYS_CTNETLINK_EXP 2 - #define NFNL_SUBSYS_QUEUE 3 - #define NFNL_SUBSYS_ULOG 4 --#define NFNL_SUBSYS_COUNT 5 -+#define NFNL_SUBSYS_OSF 5 -+#define NFNL_SUBSYS_IPSET 6 -+#define NFNL_SUBSYS_COUNT 7 - --#ifdef __KERNEL__ -- --#include --#include --#include -- --struct nfnl_callback --{ -- int (*call)(struct sock *nl, struct sk_buff *skb, -- struct nlmsghdr *nlh, struct nlattr *cda[]); -- const struct nla_policy *policy; /* netlink attribute policy */ -- const u_int16_t attr_count; /* number of nlattr's */ --}; -- --struct nfnetlink_subsystem --{ -- const char *name; -- __u8 subsys_id; /* nfnetlink subsystem ID */ -- __u8 cb_count; /* number of callbacks */ -- const struct nfnl_callback *cb; /* callback for individual types */ --}; -- --extern int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n); --extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n); -- --extern int nfnetlink_has_listeners(unsigned int group); --extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, -- int echo); --extern int nfnetlink_unicast(struct sk_buff *skb, u_int32_t pid, int flags); -- --#define MODULE_ALIAS_NFNL_SUBSYS(subsys) \ -- MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys)) -- --#endif /* __KERNEL__ */ - #endif /* _NFNETLINK_H */ -diff --git a/include/libnfnetlink/linux_nfnetlink_compat.h b/include/libnfnetlink/linux_nfnetlink_compat.h -index e145176..74b9e55 100644 ---- a/include/libnfnetlink/linux_nfnetlink_compat.h -+++ b/include/libnfnetlink/linux_nfnetlink_compat.h -@@ -1,6 +1,8 @@ - #ifndef _NFNETLINK_COMPAT_H - #define _NFNETLINK_COMPAT_H --#ifndef __KERNEL__ -+ -+#include -+ - /* Old nfnetlink macros for userspace */ - - /* nfnetlink groups: Up to 32 maximum */ -@@ -18,10 +20,9 @@ - * ! nfnetlink use the same attributes methods. - J. Schulist. - */ - --struct nfattr --{ -- u_int16_t nfa_len; -- u_int16_t nfa_type; /* we use 15 bits for the type, and the highest -+struct nfattr { -+ __u16 nfa_len; -+ __u16 nfa_type; /* we use 15 bits for the type, and the highest - * bit to indicate whether the payload is nested */ - }; - -@@ -57,5 +58,4 @@ struct nfattr - + NLMSG_ALIGN(sizeof(struct nfgenmsg)))) - #define NFM_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct nfgenmsg)) - --#endif /* ! __KERNEL__ */ - #endif /* _NFNETLINK_COMPAT_H */ --- -2.12.1 - diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch deleted file mode 100644 index 72c9987d1..000000000 --- a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch +++ /dev/null @@ -1,403 +0,0 @@ -From 5cb589e246c91331ee6b3926b15f5e6cfc8ad95e Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Sat, 16 May 2015 14:59:57 +0200 -Subject: [PATCH 6/6] src: Use stdint types everywhere - -Signed-off-by: Felix Janda -Signed-off-by: Pablo Neira Ayuso ---- - include/libnfnetlink/libnfnetlink.h | 25 ++++++------- - src/iftable.c | 8 ++--- - src/iftable.h | 4 +-- - src/libnfnetlink.c | 72 ++++++++++++++++++------------------- - src/rtnl.c | 4 +-- - src/rtnl.h | 2 +- - 6 files changed, 58 insertions(+), 57 deletions(-) - -diff --git a/include/libnfnetlink/libnfnetlink.h b/include/libnfnetlink/libnfnetlink.h -index 1d8c49d..cd0be3d 100644 ---- a/include/libnfnetlink/libnfnetlink.h -+++ b/include/libnfnetlink/libnfnetlink.h -@@ -15,6 +15,7 @@ - #define aligned_u64 unsigned long long __attribute__((aligned(8))) - #endif - -+#include - #include /* for sa_family_t */ - #include - #include -@@ -55,7 +56,7 @@ struct nfnlhdr { - struct nfnl_callback { - int (*call)(struct nlmsghdr *nlh, struct nfattr *nfa[], void *data); - void *data; -- u_int16_t attr_count; -+ uint16_t attr_count; - }; - - struct nfnl_handle; -@@ -69,7 +70,7 @@ extern struct nfnl_handle *nfnl_open(void); - extern int nfnl_close(struct nfnl_handle *); - - extern struct nfnl_subsys_handle *nfnl_subsys_open(struct nfnl_handle *, -- u_int8_t, u_int8_t, -+ uint8_t, uint8_t, - unsigned int); - extern void nfnl_subsys_close(struct nfnl_subsys_handle *); - -@@ -88,8 +89,8 @@ extern int nfnl_sendiov(const struct nfnl_handle *nfnlh, - const struct iovec *iov, unsigned int num, - unsigned int flags); - extern void nfnl_fill_hdr(struct nfnl_subsys_handle *, struct nlmsghdr *, -- unsigned int, u_int8_t, u_int16_t, u_int16_t, -- u_int16_t); -+ unsigned int, uint8_t, uint16_t, uint16_t, -+ uint16_t); - extern __attribute__((deprecated)) int - nfnl_talk(struct nfnl_handle *, struct nlmsghdr *, pid_t, - unsigned, struct nlmsghdr *, -@@ -103,8 +104,8 @@ nfnl_listen(struct nfnl_handle *, - /* receiving */ - extern ssize_t nfnl_recv(const struct nfnl_handle *h, unsigned char *buf, size_t len); - extern int nfnl_callback_register(struct nfnl_subsys_handle *, -- u_int8_t type, struct nfnl_callback *cb); --extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, u_int8_t type); -+ uint8_t type, struct nfnl_callback *cb); -+extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, uint8_t type); - extern int nfnl_handle_packet(struct nfnl_handle *, char *buf, int len); - - /* parsing */ -@@ -180,12 +181,12 @@ extern int nfnl_query(struct nfnl_handle *h, struct nlmsghdr *nlh); - - /* nfnl attribute handling functions */ - extern int nfnl_addattr_l(struct nlmsghdr *, int, int, const void *, int); --extern int nfnl_addattr8(struct nlmsghdr *, int, int, u_int8_t); --extern int nfnl_addattr16(struct nlmsghdr *, int, int, u_int16_t); --extern int nfnl_addattr32(struct nlmsghdr *, int, int, u_int32_t); -+extern int nfnl_addattr8(struct nlmsghdr *, int, int, uint8_t); -+extern int nfnl_addattr16(struct nlmsghdr *, int, int, uint16_t); -+extern int nfnl_addattr32(struct nlmsghdr *, int, int, uint32_t); - extern int nfnl_nfa_addattr_l(struct nfattr *, int, int, const void *, int); --extern int nfnl_nfa_addattr16(struct nfattr *, int, int, u_int16_t); --extern int nfnl_nfa_addattr32(struct nfattr *, int, int, u_int32_t); -+extern int nfnl_nfa_addattr16(struct nfattr *, int, int, uint16_t); -+extern int nfnl_nfa_addattr32(struct nfattr *, int, int, uint32_t); - extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int); - #define nfnl_parse_nested(tb, max, nfa) \ - nfnl_parse_attr((tb), (max), NFA_DATA((nfa)), NFA_PAYLOAD((nfa))) -@@ -197,7 +198,7 @@ extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int); - ({ (tail)->nfa_len = (void *) NLMSG_TAIL(nlh) - (void *) tail; }) - - extern void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, -- u_int16_t type, u_int32_t len, -+ uint16_t type, uint32_t len, - unsigned char *val); - extern unsigned int nfnl_rcvbufsiz(const struct nfnl_handle *h, - unsigned int size); -diff --git a/src/iftable.c b/src/iftable.c -index 5976ed8..157f97b 100644 ---- a/src/iftable.c -+++ b/src/iftable.c -@@ -27,10 +27,10 @@ - struct ifindex_node { - struct list_head head; - -- u_int32_t index; -- u_int32_t type; -- u_int32_t alen; -- u_int32_t flags; -+ uint32_t index; -+ uint32_t type; -+ uint32_t alen; -+ uint32_t flags; - char addr[8]; - char name[16]; - }; -diff --git a/src/iftable.h b/src/iftable.h -index 8df7f24..655df6b 100644 ---- a/src/iftable.h -+++ b/src/iftable.h -@@ -1,8 +1,8 @@ - #ifndef _IFTABLE_H - #define _IFTABLE_H - --int iftable_delete(u_int32_t dst, u_int32_t mask, u_int32_t gw, u_int32_t oif); --int iftable_insert(u_int32_t dst, u_int32_t mask, u_int32_t gw, u_int32_t oif); -+int iftable_delete(uint32_t dst, uint32_t mask, uint32_t gw, uint32_t oif); -+int iftable_insert(uint32_t dst, uint32_t mask, uint32_t gw, uint32_t oif); - - int iftable_init(void); - void iftable_fini(void); -diff --git a/src/libnfnetlink.c b/src/libnfnetlink.c -index 398b7d7..df57533 100644 ---- a/src/libnfnetlink.c -+++ b/src/libnfnetlink.c -@@ -72,9 +72,9 @@ - - struct nfnl_subsys_handle { - struct nfnl_handle *nfnlh; -- u_int32_t subscriptions; -- u_int8_t subsys_id; -- u_int8_t cb_count; -+ uint32_t subscriptions; -+ uint8_t subsys_id; -+ uint8_t cb_count; - struct nfnl_callback *cb; /* array of callbacks */ - }; - -@@ -86,11 +86,11 @@ struct nfnl_handle { - int fd; - struct sockaddr_nl local; - struct sockaddr_nl peer; -- u_int32_t subscriptions; -- u_int32_t seq; -- u_int32_t dump; -- u_int32_t rcv_buffer_size; /* for nfnl_catch */ -- u_int32_t flags; -+ uint32_t subscriptions; -+ uint32_t seq; -+ uint32_t dump; -+ uint32_t rcv_buffer_size; /* for nfnl_catch */ -+ uint32_t flags; - struct nlmsghdr *last_nlhdr; - struct nfnl_subsys_handle subsys[NFNL_MAX_SUBSYS+1]; - }; -@@ -145,7 +145,7 @@ unsigned int nfnl_portid(const struct nfnl_handle *h) - static int recalc_rebind_subscriptions(struct nfnl_handle *nfnlh) - { - int i, err; -- u_int32_t new_subscriptions = nfnlh->subscriptions; -+ uint32_t new_subscriptions = nfnlh->subscriptions; - - for (i = 0; i < NFNL_MAX_SUBSYS; i++) - new_subscriptions |= nfnlh->subsys[i].subscriptions; -@@ -273,8 +273,8 @@ void nfnl_set_rcv_buffer_size(struct nfnl_handle *h, unsigned int size) - * a valid address that points to a nfnl_subsys_handle structure is returned. - */ - struct nfnl_subsys_handle * --nfnl_subsys_open(struct nfnl_handle *nfnlh, u_int8_t subsys_id, -- u_int8_t cb_count, u_int32_t subscriptions) -+nfnl_subsys_open(struct nfnl_handle *nfnlh, uint8_t subsys_id, -+ uint8_t cb_count, uint32_t subscriptions) - { - struct nfnl_subsys_handle *ssh; - -@@ -435,10 +435,10 @@ int nfnl_sendiov(const struct nfnl_handle *nfnlh, const struct iovec *iov, - */ - void nfnl_fill_hdr(struct nfnl_subsys_handle *ssh, - struct nlmsghdr *nlh, unsigned int len, -- u_int8_t family, -- u_int16_t res_id, -- u_int16_t msg_type, -- u_int16_t msg_flags) -+ uint8_t family, -+ uint16_t res_id, -+ uint16_t msg_type, -+ uint16_t msg_flags) - { - assert(ssh); - assert(nlh); -@@ -815,7 +815,7 @@ int nfnl_addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data, - } - - /** -- * nfnl_nfa_addattr_l - Add variable length attribute to struct nfattr -+ * nfnl_nfa_addattr_l - Add variable length attribute to struct nfattr - * - * @nfa: struct nfattr - * @maxlen: maximal length of nfattr buffer -@@ -849,14 +849,14 @@ int nfnl_nfa_addattr_l(struct nfattr *nfa, int maxlen, int type, - } - - /** -- * nfnl_addattr8 - Add u_int8_t attribute to nlmsghdr -+ * nfnl_addattr8 - Add uint8_t attribute to nlmsghdr - * - * @n: netlink message header to which attribute is to be added - * @maxlen: maximum length of netlink message header - * @type: type of new attribute - * @data: content of new attribute - */ --int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) -+int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, uint8_t data) - { - assert(n); - assert(maxlen > 0); -@@ -866,7 +866,7 @@ int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) - } - - /** -- * nfnl_nfa_addattr16 - Add u_int16_t attribute to struct nfattr -+ * nfnl_nfa_addattr16 - Add uint16_t attribute to struct nfattr - * - * @nfa: struct nfattr - * @maxlen: maximal length of nfattr buffer -@@ -875,7 +875,7 @@ int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) - * - */ - int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, -- u_int16_t data) -+ uint16_t data) - { - assert(nfa); - assert(maxlen > 0); -@@ -885,7 +885,7 @@ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, - } - - /** -- * nfnl_addattr16 - Add u_int16_t attribute to nlmsghdr -+ * nfnl_addattr16 - Add uint16_t attribute to nlmsghdr - * - * @n: netlink message header to which attribute is to be added - * @maxlen: maximum length of netlink message header -@@ -894,7 +894,7 @@ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, - * - */ - int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, -- u_int16_t data) -+ uint16_t data) - { - assert(n); - assert(maxlen > 0); -@@ -904,7 +904,7 @@ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, - } - - /** -- * nfnl_nfa_addattr32 - Add u_int32_t attribute to struct nfattr -+ * nfnl_nfa_addattr32 - Add uint32_t attribute to struct nfattr - * - * @nfa: struct nfattr - * @maxlen: maximal length of nfattr buffer -@@ -913,7 +913,7 @@ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, - * - */ - int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, -- u_int32_t data) -+ uint32_t data) - { - assert(nfa); - assert(maxlen > 0); -@@ -923,7 +923,7 @@ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, - } - - /** -- * nfnl_addattr32 - Add u_int32_t attribute to nlmsghdr -+ * nfnl_addattr32 - Add uint32_t attribute to nlmsghdr - * - * @n: netlink message header to which attribute is to be added - * @maxlen: maximum length of netlink message header -@@ -932,7 +932,7 @@ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, - * - */ - int nfnl_addattr32(struct nlmsghdr *n, int maxlen, int type, -- u_int32_t data) -+ uint32_t data) - { - assert(n); - assert(maxlen > 0); -@@ -980,7 +980,7 @@ int nfnl_parse_attr(struct nfattr *tb[], int max, struct nfattr *nfa, int len) - * - */ - void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, -- u_int16_t type, u_int32_t len, unsigned char *val) -+ uint16_t type, uint32_t len, unsigned char *val) - { - assert(iov); - assert(nfa); -@@ -1115,7 +1115,7 @@ struct nlmsghdr *nfnl_get_msg_next(struct nfnl_handle *h, - * appropiately. - */ - int nfnl_callback_register(struct nfnl_subsys_handle *ssh, -- u_int8_t type, struct nfnl_callback *cb) -+ uint8_t type, struct nfnl_callback *cb) - { - assert(ssh); - assert(cb); -@@ -1138,7 +1138,7 @@ int nfnl_callback_register(struct nfnl_subsys_handle *ssh, - * On sucess, 0 is returned. On error, -1 is returned and errno is - * set appropiately. - */ --int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, u_int8_t type) -+int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, uint8_t type) - { - assert(ssh); - -@@ -1161,8 +1161,8 @@ int nfnl_check_attributes(const struct nfnl_handle *h, - assert(nfa); - - int min_len; -- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); -+ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -+ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); - const struct nfnl_subsys_handle *ssh; - struct nfnl_callback *cb; - -@@ -1212,8 +1212,8 @@ static int __nfnl_handle_msg(struct nfnl_handle *h, struct nlmsghdr *nlh, - int len) - { - struct nfnl_subsys_handle *ssh; -- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); -+ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -+ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); - int err = 0; - - if (subsys_id > NFNL_MAX_SUBSYS) -@@ -1243,7 +1243,7 @@ int nfnl_handle_packet(struct nfnl_handle *h, char *buf, int len) - { - - while (len >= NLMSG_SPACE(0)) { -- u_int32_t rlen; -+ uint32_t rlen; - struct nlmsghdr *nlh = (struct nlmsghdr *)buf; - - if (nlh->nlmsg_len < sizeof(struct nlmsghdr) -@@ -1285,8 +1285,8 @@ static int nfnl_is_error(struct nfnl_handle *h, struct nlmsghdr *nlh) - static int nfnl_step(struct nfnl_handle *h, struct nlmsghdr *nlh) - { - struct nfnl_subsys_handle *ssh; -- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); -+ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -+ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); - - /* Is this an error message? */ - if (nfnl_is_error(h, nlh)) { -diff --git a/src/rtnl.c b/src/rtnl.c -index 7b4ac7d..284eecd 100644 ---- a/src/rtnl.c -+++ b/src/rtnl.c -@@ -30,7 +30,7 @@ - #define rtnl_log(x, ...) - - static inline struct rtnl_handler * --find_handler(struct rtnl_handle *rtnl_handle, u_int16_t type) -+find_handler(struct rtnl_handle *rtnl_handle, uint16_t type) - { - struct rtnl_handler *h; - for (h = rtnl_handle->handlers; h; h = h->next) { -@@ -41,7 +41,7 @@ find_handler(struct rtnl_handle *rtnl_handle, u_int16_t type) - } - - static int call_handler(struct rtnl_handle *rtnl_handle, -- u_int16_t type, -+ uint16_t type, - struct nlmsghdr *hdr) - { - struct rtnl_handler *h = find_handler(rtnl_handle, type); -diff --git a/src/rtnl.h b/src/rtnl.h -index 0c403dc..2cb22a8 100644 ---- a/src/rtnl.h -+++ b/src/rtnl.h -@@ -7,7 +7,7 @@ - struct rtnl_handler { - struct rtnl_handler *next; - -- u_int16_t nlmsg_type; -+ uint16_t nlmsg_type; - int (*handlefn)(struct nlmsghdr *h, void *arg); - void *arg; - }; --- -2.12.1 - diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb deleted file mode 100644 index 64271c74d..000000000 --- a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Low-level library for netfilter related kernel/userspace communication" -DESCRIPTION = "libnfnetlink is the low-level library for netfilter related \ -kernel/userspace communication. It provides a generic messaging \ -infrastructure for in-kernel netfilter subsystems (such as nfnetlink_log, \ -nfnetlink_queue, nfnetlink_conntrack) and their respective users and/or \ -management tools in userspace." -HOMEPAGE = "http://www.netfilter.org/projects/libnfnetlink/index.html" -SECTION = "libs" -LICENSE = "GPL-2.0-or-later" - - -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" - -SRC_URI = "http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-${PV}.tar.bz2;name=tar \ - file://0001-build-resolve-automake-1.12-warnings.patch \ - file://0002-src-get-source-code-license-header-in-sync-with-curr.patch \ - file://0003-configure-uclinux-is-also-linux.patch \ - file://0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch \ - file://0005-include-Sync-with-kernel-headers.patch \ - file://0006-src-Use-stdint-types-everywhere.patch \ - " -SRC_URI[tar.md5sum] = "98927583d2016a9fb1936fed992e2c5e" -SRC_URI[tar.sha256sum] = "f270e19de9127642d2a11589ef2ec97ef90a649a74f56cf9a96306b04817b51a" - -inherit autotools pkgconfig diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.2.bb b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.2.bb new file mode 100644 index 000000000..a43c345d5 --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.2.bb @@ -0,0 +1,20 @@ +SUMMARY = "Low-level library for netfilter related kernel/userspace communication" +DESCRIPTION = "libnfnetlink is the low-level library for netfilter related \ +kernel/userspace communication. It provides a generic messaging \ +infrastructure for in-kernel netfilter subsystems (such as nfnetlink_log, \ +nfnetlink_queue, nfnetlink_conntrack) and their respective users and/or \ +management tools in userspace." +HOMEPAGE = "https://www.netfilter.org/projects/libnfnetlink/index.html" +SECTION = "libs" +LICENSE = "GPL-2.0-or-later" + + +LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" + +SRC_URI = "https://www.netfilter.org/projects/libnfnetlink/files/${BPN}-${PV}.tar.bz2 \ + " + +SRC_URI[md5sum] = "39d65185e2990562c64de05a08de8771" +SRC_URI[sha256sum] = "b064c7c3d426efb4786e60a8e6859b82ee2f2c5e49ffeea640cfe4fe33cbc376" + +inherit autotools pkgconfig From patchwork Mon Mar 6 11:02:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 20506 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 A5240C6FD1C for ; Mon, 6 Mar 2023 11:03:23 +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.30526.1678100598334038464 for ; Mon, 06 Mar 2023 03:03:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=bZq1cZGB; 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=2429e4d58b=yi.zhao@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 326AeiL1016794 for ; Mon, 6 Mar 2023 03:03:18 -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=XALk8xOHG5smdYQGd3KSBXNEFv7mzsX+pqzleUsXDUs=; b=bZq1cZGB0STjRZo+nV0e5oBch37U0HuUsfoPJKDHFGFVmk7rLgz3sVnrGRbt/oiv/8kO 9v1At4Jnj+U94amTiP9Xxbn7NUZrq0WEcgSMW5ytW37+631TPuEAkO6HvyRM+dLkHEDH D+QeLhjsqhzQqGAwSFi4UY9lyvoEDifoXh1IsNIKPgMy9Ika3KsHB7KokM5MLXrwf2fu 8D/rICk94WvRcnqJ3xC3QawYCJb0mpGmSeYF2GezO83HecUWOg0nDVZuFUinazHv12Tb lxUdpBShSr7i4ltgreTQmSZpix4MvP4n/uWKm+qDZlvE+nBScL7RMLci5nLJKCbiPtfg 9A== Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2170.outbound.protection.outlook.com [104.47.55.170]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3p4258sp5a-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 06 Mar 2023 03:03:17 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ok2iBZ7XxFTnG7ZGzOximR4xT9pJDIEdzILSh7fiN/0AEs4Qmxcfe8xvZh5Z46n0nGsSZEaEIbMdCavKxTa/nN3/U9F9xzr1+KefDV7QtlrPa+gP3aLRYSOKvg4sGgV3VlZf3TrG77dShBrRBZSgGCkOhL1laZgbGJvfkBe9N4HLCaYIYJgp33rN6g4iOxF1YEk4511jXY+leJztTzjstYZMJmbs4zlOQcVpW35dK+IPifVsB04r80tob3ypjyzzNgS1G5oqTHqKR1FOjue2rENp9DclDt5tl+3UWuKA024eRIfM0vhzNvIBNU7gOy53bYGj1KsQbR5q5klSdSPb+g== 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=XALk8xOHG5smdYQGd3KSBXNEFv7mzsX+pqzleUsXDUs=; b=MDrB0Q5rdD+Eu69O6dvAuoKjurU39XtOH1/9CnKXPsYfnyrrBHf1b4DwFeofqDj2vGVoGL5inJJhBX1xxv4fin/XuBTIzRcbSVfKAnodJw7kWlFKOTMp45fIakPy+lquL6YcEXogLFUiYGZe2IWdCkPEqkJgIPkZYYMZPJsQjDIreh/XK9ZpMwDoPN9b4AVmAKqsFeg6Efv4aQ+5gP4Uvn/PQPu2Yn6SUyDZ/LxEGPBRQH0g76cc45c/WCBM1nTWAEIjlKzEbBQJe8Uad9bX1NXvpOkvEdAOPkfrIaHiOzKoWN3mxNBPsi19A08TqHE0l7MkPViiQq8rgkN7qT1ZHg== 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 CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) by PH8PR11MB8257.namprd11.prod.outlook.com (2603:10b6:510:1c0::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.28; Mon, 6 Mar 2023 11:03:15 +0000 Received: from CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::3cb7:edf3:7304:982e]) by CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::3cb7:edf3:7304:982e%2]) with mapi id 15.20.6156.028; Mon, 6 Mar 2023 11:03:15 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 3/6] libnetfilter-cthelper: upgrade 1.0.0 -> 1.0.1 Date: Mon, 6 Mar 2023 19:02:58 +0800 Message-Id: <20230306110301.75991-4-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230306110301.75991-1-yi.zhao@windriver.com> References: <20230306110301.75991-1-yi.zhao@windriver.com> X-ClientProxiedBy: PH7PR13CA0007.namprd13.prod.outlook.com (2603:10b6:510:174::17) To CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PR11MB4867:EE_|PH8PR11MB8257:EE_ X-MS-Office365-Filtering-Correlation-Id: 41d0bf19-fa91-494b-a61d-08db1e32627c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8CtK4gBCGFCKLzXIKR9SJa5jcDLHeWqKrA9y+AiBdL3gAuuS/SUWVY9AwuwDcQNZ2kO+XRAkFSXst2LfECf0+OJX28bps5E7Nd70vQ8DcQqD3hZn6WljU5q8a0MbvIP4uhS4L66ouFEgAJXXlVZz2+LFseCoXGRp7R6uma6KpYPaz7gufKluYewbldhTmkAIZFLj3Ejxps4GRwAq++VyoC1ewlwAG4WkXKXIo2pPOCA/V7LM4JPHkmXA1NSzdNYfNS81b8pYUREuVdKCkbhc76BtTJEMY7g6NMWc56VG/3VHBuMmOVLSZcDAaqAmSlr/6JOclJnwQ9PvSYWH5LKv4aDj7mYYm2izHjxO2h6YEQuJHU5UK9XSYhGc8hL71Wy5XkyqGur8++RDDW8Y/wpawkaYUJ2+xzqsXbh5KqixwCZFYjhXU6VVEbs5s8fA98rnppieaM5bxW01WbcG1WJFSzHxpAWKYjYgvETOgVhhMI13sQOiL0YBEJI43BZC0XVdHAPTY4gxiPuIWkoRrXaGY6VE0TzycR3XgHM6kSVdMD8z9xT7whiNHVcPc2RX/ApWBuP46NWGW/yrah1lN+92kamOruduuuBMwIkHlopN+NH4P4SZLBCHIglaf82JcVr+pA3pHUrIUnPxSxSy1ILv6jR5hbcjPCAybSSXDwfn/1HL5RZNv3NiPt5Z27Q37M0a9RtYg4PVofF9mpiF1bZJMdtoPFszN64PHyYpRxKQXPw= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB4867.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(4636009)(376002)(346002)(136003)(366004)(396003)(39850400004)(451199018)(83380400001)(36756003)(478600001)(316002)(38350700002)(38100700002)(2616005)(6486002)(6506007)(6512007)(6666004)(1076003)(52116002)(186003)(26005)(41300700001)(5660300002)(44832011)(30864003)(66476007)(66556008)(66946007)(8936002)(8676002)(6916009)(86362001)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DBkm+WnDIk1FsVTRNa3I3zypaLI0P8ztZKRRHU9q/xuMy8HsEnqK+Mw4UP1UWrpzqtiQGTyyDfUnxOk0e9AfbaS5iA6/GSb6hAcXlRp3PPb5/W8GVnZhWTOQ0qdCgJjCict8mNsDI5Y/23cLuWotmnw1uBXUC+GsoTjXPeGKThJCyc2Z8CbGWl4p22bpvuneJwxCmUpZnHnRQ+OKJr0hYJXWaozLpCRFX89XrkMFWfKQMzveAmAT6vx6hxMzrUjjjgWhBaUXOiKYm5J3F4qHtje5l7J0k0G1OMPkmgsgZmBxBFaG6aBqAj/WvkoQnlf128OM5e5TnnjYbaGEBtMOSMlzZqsdxvWtrBw+Hy0U4a8RbxpLbKtxUBTWv5T2e1tzy4CKiXZdg0nHcFQgxlXXJ+igV3PsWkRIbbnT0SY6qgtQpzYB3T6RCvjfs6j77g1ycFYsbG6thWyA0yM8eun0qGng2o/Qe6PGZQvkrjZ/jl8f3x1htHlKrlIpK4l4/HmzNX2nNYvHYoIOfoWupVmD9z6GZtAlAazh9D/dRhWE00XmQGxsoQdlI6Sv2VKKK7nLVwgBDnx5VgvVCKKIpa5VRnHHzcfzRwSv22g+/kJMz9s6VeyZSJ61dbN8gbMBF5Vz/Dqef7zvsTLpZGt1vAy41CEGy6CgeB5jm/bQFVKw5FhWA7x5yn4E3fSjHUShfx+pQKG8a8p0D0G6k8Q52zZFatv8YVpdSAwexB44i4cpYl/k85VihU0tnb4R5rE05wU+WgQsxgBOs2QqQjaT8fl8d/OLSGmxwh+Me9NxlGlofzDlNSEPxvsoVkQ4O01uaZpbxHhD9i4uNLgG0Vmdyca+hqcMc3T2r/hCKz9vl6mThtjK6Tg9iW4SFf6AXk8DcLbm+aF+se16Uls1va78sTDmA5lF2W0CwQQ18QJ3F4Mh/xiwfezDnBPwprdm1KU69yRCaRvHPYX7aqJ0U1qV+hrgrInKKP3rOuuBzyUtTvqO9CtKfLTbwhhu6qKpezhanUF+cA8xhdWHTkje1zk2Yd4nlvBNjUueae+8IkWjAuoXzCiPD1GMJkLYSqr/WBpKLowcV4XHnxXx+OzlFBVPSSTGJxB5ymCbNnkeA+3SkOJ7u78fCKDcGyTrRuC6xGGogji0yprW3AqiTjJk8sV3Y4X5CCBesPZqHlGtx8Pe87QNOfrFuDxGOQMd1q4x2cbBL+wEqVqSL1PqiHre6SHwHfuAt9RizJuFHBQWvvtwBZecsBj+swMtxUJ30E9P3+GbUGow99Stdn+K2JdDrC49CC2U2ZHefwVQJIlUedStSGxYrM119bx7Z/OAZ0IgPUOY5NmoMKZO//89TbfVdkDnG14IRuch7srLL7VxJUlo5nxnfM5pLxcRuQpMkfqySCLik2dHjA9eQAaw91+TX6G+g+pLEJHhEVtaSzwTi2c38SKHm0VWRHjyKjlDIZBkT7Y0McWRlFcvV6bDuw+d/RpojpWtumZQQb/t7RxJvXH+4xTWoNJV03Vq67BG2wVH9AyCSzC2EABXg0huxZguxJvGZOs07szDXJ8PuWDY2V3RBRKM/2t9pEhVKZr6kxtpBDU1kaU3u2OXamnbcUHi5gKBF5a2XA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 41d0bf19-fa91-494b-a61d-08db1e32627c X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4867.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Mar 2023 11:03:15.5559 (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: LUrqrHmLnUQ2xu67vuvRV2G10zzwajVQgQD71VcffPSmx+x6PMYFiYIW+8OMX4yJhOnT67jK2p6x8PKCOqzRQw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR11MB8257 X-Proofpoint-GUID: mAJ2KwBUj74OxPZ9easUVhVnHXCSCKc9 X-Proofpoint-ORIG-GUID: mAJ2KwBUj74OxPZ9easUVhVnHXCSCKc9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-06_03,2023-03-06_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 bulkscore=0 impostorscore=0 mlxscore=0 mlxlogscore=999 spamscore=0 priorityscore=1501 adultscore=0 malwarescore=0 clxscore=1015 suspectscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2303060095 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 06 Mar 2023 11:03:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101396 Drop backport patch. Signed-off-by: Yi Zhao --- ...netfilter-cthelper-visibility-hidden.patch | 382 ------------------ .../libnetfilter-cthelper_1.0.0.bb | 17 - .../libnetfilter-cthelper_1.0.1.bb | 17 + 3 files changed, 17 insertions(+), 399 deletions(-) delete mode 100644 meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cthelper-visibility-hidden.patch delete mode 100644 meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.0.bb create mode 100644 meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.1.bb diff --git a/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cthelper-visibility-hidden.patch b/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cthelper-visibility-hidden.patch deleted file mode 100644 index e717d5b0e..000000000 --- a/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cthelper-visibility-hidden.patch +++ /dev/null @@ -1,382 +0,0 @@ -From f58c5b09fb59baf07c942d373fc4d522b27e73c6 Mon Sep 17 00:00:00 2001 -From: Kevin Cernekee -Date: Wed, 4 Jan 2017 14:30:26 -0800 -Subject: Use __EXPORTED rather than EXPORT_SYMBOL - -clang is sensitive to the ordering of -__attribute__((visibility("default"))) relative to the function -body. gcc is not. So if we try to re-declare an existing function -with default visibility, clang prints a warning and generates -a broken .so file in which nfct_helper_* are not exported to library -callers. - -Move the attribute up into the function definition to make clang happy. - -Signed-off-by: Kevin Cernekee -Signed-off-by: Pablo Neira Ayuso ---- - doxygen.cfg.in | 2 +- - src/internal.h | 5 ++- - src/libnetfilter_cthelper.c | 83 ++++++++++++++++++--------------------------- - 3 files changed, 36 insertions(+), 54 deletions(-) - -Index: libnetfilter_cthelper-1.0.0/doxygen.cfg.in -=================================================================== ---- libnetfilter_cthelper-1.0.0.orig/doxygen.cfg.in -+++ libnetfilter_cthelper-1.0.0/doxygen.cfg.in -@@ -72,7 +72,7 @@ RECURSIVE = YES - EXCLUDE = - EXCLUDE_SYMLINKS = NO - EXCLUDE_PATTERNS = */.git/* .*.d --EXCLUDE_SYMBOLS = EXPORT_SYMBOL -+EXCLUDE_SYMBOLS = - EXAMPLE_PATH = - EXAMPLE_PATTERNS = - EXAMPLE_RECURSIVE = NO -Index: libnetfilter_cthelper-1.0.0/src/internal.h -=================================================================== ---- libnetfilter_cthelper-1.0.0.orig/src/internal.h -+++ libnetfilter_cthelper-1.0.0/src/internal.h -@@ -3,10 +3,9 @@ - - #include "config.h" - #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 - - #endif -Index: libnetfilter_cthelper-1.0.0/src/libnetfilter_cthelper.c -=================================================================== ---- libnetfilter_cthelper-1.0.0.orig/src/libnetfilter_cthelper.c -+++ libnetfilter_cthelper-1.0.0/src/libnetfilter_cthelper.c -@@ -99,17 +99,16 @@ struct nfct_helper { - * In case of success, this function returns a valid pointer, otherwise NULL - * s returned and errno is appropriately set. - */ --struct nfct_helper *nfct_helper_alloc(void) -+struct nfct_helper __EXPORTED *nfct_helper_alloc(void) - { - return calloc(1, sizeof(struct nfct_helper)); - } --EXPORT_SYMBOL(nfct_helper_alloc); - - /** - * nfct_helper_free - release one helper object - * \param nfct_helper pointer to the helper object - */ --void nfct_helper_free(struct nfct_helper *h) -+void __EXPORTED nfct_helper_free(struct nfct_helper *h) - { - int i; - -@@ -119,7 +118,6 @@ void nfct_helper_free(struct nfct_helper - free(h->expect_policy[i]); - } - } --EXPORT_SYMBOL(nfct_helper_free); - - /** - * nfct_helper_policy_alloc - allocate a new helper policy object -@@ -127,21 +125,19 @@ EXPORT_SYMBOL(nfct_helper_free); - * In case of success, this function returns a valid pointer, otherwise NULL - * s returned and errno is appropriately set. - */ --struct nfct_helper_policy *nfct_helper_policy_alloc(void) -+struct nfct_helper_policy __EXPORTED *nfct_helper_policy_alloc(void) - { - return calloc(1, sizeof(struct nfct_helper_policy)); - } --EXPORT_SYMBOL(nfct_helper_policy_alloc); - - /** - * nfct_helper_free - release one helper policy object - * \param nfct_helper pointer to the helper object - */ --void nfct_helper_policy_free(struct nfct_helper_policy *p) -+void __EXPORTED nfct_helper_policy_free(struct nfct_helper_policy *p) - { - free(p); - } --EXPORT_SYMBOL(nfct_helper_policy_free); - - /** - * nfct_helper_policy_attr_set - set one attribute of the helper object -@@ -149,7 +145,7 @@ EXPORT_SYMBOL(nfct_helper_policy_free); - * \param type attribute type you want to set - * \param data pointer to data that will be used to set this attribute - */ --void -+void __EXPORTED - nfct_helper_policy_attr_set(struct nfct_helper_policy *p, - enum nfct_helper_policy_attr_type type, - const void *data) -@@ -170,7 +166,6 @@ nfct_helper_policy_attr_set(struct nfct_ - break; - } - } --EXPORT_SYMBOL(nfct_helper_policy_attr_set); - - /** - * nfct_helper_attr_set_str - set one attribute the helper object -@@ -178,23 +173,21 @@ EXPORT_SYMBOL(nfct_helper_policy_attr_se - * \param type attribute type you want to set - * \param name string that will be used to set this attribute - */ --void -+void __EXPORTED - nfct_helper_policy_attr_set_str(struct nfct_helper_policy *p, - enum nfct_helper_policy_attr_type type, - const char *name) - { - nfct_helper_policy_attr_set(p, type, name); - } --EXPORT_SYMBOL(nfct_helper_policy_attr_set_str); - --void -+void __EXPORTED - nfct_helper_policy_attr_set_u32(struct nfct_helper_policy *p, - enum nfct_helper_policy_attr_type type, - uint32_t value) - { - nfct_helper_policy_attr_set(p, type, &value); - } --EXPORT_SYMBOL(nfct_helper_policy_attr_set_u32); - - /** - * nfct_helper_attr_set - set one attribute of the helper object -@@ -202,7 +195,7 @@ EXPORT_SYMBOL(nfct_helper_policy_attr_se - * \param type attribute type you want to set - * \param data pointer to data that will be used to set this attribute - */ --void -+void __EXPORTED - nfct_helper_attr_set(struct nfct_helper *h, - enum nfct_helper_attr_type type, const void *data) - { -@@ -250,7 +243,6 @@ nfct_helper_attr_set(struct nfct_helper - break; - } - } --EXPORT_SYMBOL(nfct_helper_attr_set); - - /** - * nfct_helper_attr_set_str - set one attribute the helper object -@@ -258,44 +250,40 @@ EXPORT_SYMBOL(nfct_helper_attr_set); - * \param type attribute type you want to set - * \param name string that will be used to set this attribute - */ --void -+void __EXPORTED - nfct_helper_attr_set_str(struct nfct_helper *nfct_helper, enum nfct_helper_attr_type type, - const char *name) - { - nfct_helper_attr_set(nfct_helper, type, name); - } --EXPORT_SYMBOL(nfct_helper_attr_set_str); - --void -+void __EXPORTED - nfct_helper_attr_set_u8(struct nfct_helper *nfct_helper, - enum nfct_helper_attr_type type, uint8_t value) - { - nfct_helper_attr_set(nfct_helper, type, &value); - } --EXPORT_SYMBOL(nfct_helper_attr_set_u8); - --void -+void __EXPORTED - nfct_helper_attr_set_u16(struct nfct_helper *nfct_helper, - enum nfct_helper_attr_type type, uint16_t value) - { - nfct_helper_attr_set(nfct_helper, type, &value); - } --EXPORT_SYMBOL(nfct_helper_attr_set_u16); - --void -+void __EXPORTED - nfct_helper_attr_set_u32(struct nfct_helper *nfct_helper, - enum nfct_helper_attr_type type, uint32_t value) - { - nfct_helper_attr_set(nfct_helper, type, &value); - } --EXPORT_SYMBOL(nfct_helper_attr_set_u32); - - /** - * nfct_helper_attr_unset - unset one attribute the helper object - * \param nfct_helper pointer to the helper object - * \param type attribute type you want to set - */ --void -+void __EXPORTED - nfct_helper_attr_unset(struct nfct_helper *nfct_helper, enum nfct_helper_attr_type type) - { - switch(type) { -@@ -307,7 +295,6 @@ nfct_helper_attr_unset(struct nfct_helpe - break; - } - } --EXPORT_SYMBOL(nfct_helper_attr_unset); - - /** - * nfct_helper_attr_get - get one attribute the helper object -@@ -317,8 +304,9 @@ EXPORT_SYMBOL(nfct_helper_attr_unset); - * This function returns a valid pointer to the attribute data. If a - * unsupported attribute is used, this returns NULL. - */ --const void *nfct_helper_attr_get(struct nfct_helper *helper, -- enum nfct_helper_attr_type type) -+const void __EXPORTED * -+nfct_helper_attr_get(struct nfct_helper *helper, -+ enum nfct_helper_attr_type type) - { - const void *ret = NULL; - -@@ -358,7 +346,6 @@ const void *nfct_helper_attr_get(struct - } - return ret; - } --EXPORT_SYMBOL(nfct_helper_attr_get); - - /** - * nfct_helper_attr_get_str - get one attribute the helper object -@@ -368,13 +355,12 @@ EXPORT_SYMBOL(nfct_helper_attr_get); - * This function returns a valid pointer to the beginning of the string. - * If the attribute is unsupported, this returns NULL. - */ --const char * -+const char __EXPORTED * - nfct_helper_attr_get_str(struct nfct_helper *nfct_helper, - enum nfct_helper_attr_type type) - { - return (const char *)nfct_helper_attr_get(nfct_helper, type); - } --EXPORT_SYMBOL(nfct_helper_attr_get_str); - - /** - * nfct_helper_attr_get_u8 - get one attribute the helper object -@@ -384,12 +370,12 @@ EXPORT_SYMBOL(nfct_helper_attr_get_str); - * This function returns a unsigned 8-bits integer. If the attribute is - * unsupported, this returns NULL. - */ --uint8_t nfct_helper_attr_get_u8(struct nfct_helper *nfct_helper, -- enum nfct_helper_attr_type type) -+uint8_t __EXPORTED -+nfct_helper_attr_get_u8(struct nfct_helper *nfct_helper, -+ enum nfct_helper_attr_type type) - { - return *((uint8_t *)nfct_helper_attr_get(nfct_helper, type)); - } --EXPORT_SYMBOL(nfct_helper_attr_get_u8); - - /** - * nfct_helper_attr_get_u16 - get one attribute the helper object -@@ -399,12 +385,12 @@ EXPORT_SYMBOL(nfct_helper_attr_get_u8); - * This function returns a unsigned 16-bits integer. If the attribute is - * unsupported, this returns NULL. - */ --uint16_t nfct_helper_attr_get_u16(struct nfct_helper *nfct_helper, -- enum nfct_helper_attr_type type) -+uint16_t __EXPORTED -+nfct_helper_attr_get_u16(struct nfct_helper *nfct_helper, -+ enum nfct_helper_attr_type type) - { - return *((uint16_t *)nfct_helper_attr_get(nfct_helper, type)); - } --EXPORT_SYMBOL(nfct_helper_attr_get_u16); - - /** - * nfct_helper_attr_get_u32 - get one attribute the helper object -@@ -414,12 +400,12 @@ EXPORT_SYMBOL(nfct_helper_attr_get_u16); - * This function returns a unsigned 32-bits integer. If the attribute is - * unsupported, this returns NULL. - */ --uint32_t nfct_helper_attr_get_u32(struct nfct_helper *nfct_helper, -- enum nfct_helper_attr_type type) -+uint32_t __EXPORTED -+nfct_helper_attr_get_u32(struct nfct_helper *nfct_helper, -+ enum nfct_helper_attr_type type) - { - return *((uint32_t *)nfct_helper_attr_get(nfct_helper, type)); - } --EXPORT_SYMBOL(nfct_helper_attr_get_u32); - - /** - * nfct_helper_snprintf - print helper object into one buffer -@@ -431,9 +417,10 @@ EXPORT_SYMBOL(nfct_helper_attr_get_u32); - * This function returns -1 in case that some mandatory attributes are - * missing. On sucess, it returns 0. - */ --int nfct_helper_snprintf(char *buf, size_t size, -- struct nfct_helper *helper, -- unsigned int type, unsigned int flags) -+int __EXPORTED -+nfct_helper_snprintf(char *buf, size_t size, -+ struct nfct_helper *helper, -+ unsigned int type, unsigned int flags) - { - int ret; - -@@ -454,7 +441,6 @@ int nfct_helper_snprintf(char *buf, size - - return ret; - } --EXPORT_SYMBOL(nfct_helper_snprintf); - - /** - * @} -@@ -490,7 +476,7 @@ EXPORT_SYMBOL(nfct_helper_snprintf); - * - Command NFNL_MSG_ACCT_DEL, to delete one specific nfct_helper object (if - * unused, otherwise you hit EBUSY). - */ --struct nlmsghdr * -+struct nlmsghdr __EXPORTED * - nfct_helper_nlmsg_build_hdr(char *buf, uint8_t cmd, - uint16_t flags, uint32_t seq) - { -@@ -509,7 +495,6 @@ nfct_helper_nlmsg_build_hdr(char *buf, u - - return nlh; - } --EXPORT_SYMBOL(nfct_helper_nlmsg_build_hdr); - - static void - nfct_helper_nlmsg_build_policy(struct nlmsghdr *nlh, -@@ -530,7 +515,7 @@ nfct_helper_nlmsg_build_policy(struct nl - * \param nlh: netlink message that you want to use to add the payload. - * \param nfct_helper: pointer to a helper object - */ --void -+void __EXPORTED - nfct_helper_nlmsg_build_payload(struct nlmsghdr *nlh, struct nfct_helper *h) - { - struct nlattr *nest; -@@ -593,7 +578,6 @@ nfct_helper_nlmsg_build_payload(struct n - if (h->bitset & (1 << NFCTH_ATTR_STATUS)) - mnl_attr_put_u32(nlh, NFCTH_STATUS, ntohl(h->status)); - } --EXPORT_SYMBOL(nfct_helper_nlmsg_build_payload); - - static int - nfct_helper_nlmsg_parse_tuple_cb(const struct nlattr *attr, void *data) -@@ -795,7 +779,7 @@ nfct_helper_nlmsg_parse_attr_cb(const st - * This function returns -1 in case that some mandatory attributes are - * missing. On sucess, it returns 0. - */ --int -+int __EXPORTED - nfct_helper_nlmsg_parse_payload(const struct nlmsghdr *nlh, - struct nfct_helper *h) - { -@@ -832,7 +816,6 @@ nfct_helper_nlmsg_parse_payload(const st - } - return 0; - } --EXPORT_SYMBOL(nfct_helper_nlmsg_parse_payload); - - /** - * @} diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.0.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.0.bb deleted file mode 100644 index fea520d43..000000000 --- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Netfilter connection tracking helper library" -DESCRIPTION = "Userspace library providing a programming interface (API) to the Linux kernel netfilter user-space helper infrastructure" -HOMEPAGE = "http://www.netfilter.org/projects/libnetfilter_cthelper/index.html" -SECTION = "libs" -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -DEPENDS = "libmnl" - -SRC_URI = "http://www.netfilter.org/projects/libnetfilter_cthelper/files/libnetfilter_cthelper-${PV}.tar.bz2;name=tar \ - file://libnetfilter-cthelper-visibility-hidden.patch \ -" -SRC_URI[tar.md5sum] = "b2efab1a3a198a5add448960ba011acd" -SRC_URI[tar.sha256sum] = "07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d" - -S = "${WORKDIR}/libnetfilter_cthelper-${PV}" - -inherit autotools pkgconfig diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.1.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.1.bb new file mode 100644 index 000000000..ebb0eb232 --- /dev/null +++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.1.bb @@ -0,0 +1,17 @@ +SUMMARY = "Netfilter connection tracking helper library" +DESCRIPTION = "Userspace library providing a programming interface (API) to the Linux kernel netfilter user-space helper infrastructure" +HOMEPAGE = "https://www.netfilter.org/projects/libnetfilter_cthelper/index.html" +SECTION = "libs" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" +DEPENDS = "libmnl" + +SRC_URI = "https://www.netfilter.org/projects/libnetfilter_cthelper/files/libnetfilter_cthelper-${PV}.tar.bz2 \ + " + +SRC_URI[md5sum] = "e59279645fe65d40dd7dfc82a797ca5b" +SRC_URI[sha256sum] = "14073d5487233897355d3ff04ddc1c8d03cc5ba8d2356236aa88161a9f2dc912" + +S = "${WORKDIR}/libnetfilter_cthelper-${PV}" + +inherit autotools pkgconfig From patchwork Mon Mar 6 11:02:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 20502 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 A506EC61DA4 for ; Mon, 6 Mar 2023 11:03:23 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web11.30599.1678100598822097122 for ; Mon, 06 Mar 2023 03:03:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=pVS+9XqI; 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=2429e4d58b=yi.zhao@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 326AeiL2016794 for ; Mon, 6 Mar 2023 03:03:18 -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=4tq3drBK8+A+yqiusRsLcau9fjGsRa+4Ptdwflj0Z0M=; b=pVS+9XqIWPX7PO17rrtfZDtaEgJj9KTP/x/ZWtWZ4PdqC0UxaxUCKFKaUH28/GdrD2i7 Dj5qxt7Hko4u8qp9Bbdkt17U5yqJsjrMJRegGWbyUeO7Qyc7TlL9vR/uRwpeRxVuDH3p Hz9ysA/nJu572eHG94Tt59EnnrKS7r2H5/NTdPKloyFvvfbo/Vst08lWK1EbsvThYDRY Twp2LZ4XPxsCT3aDRTAIOQsJ+vYl7RX7ucbmA8ahr1HSQVm62m4I+OYj8jWM5bxaD9N3 NQRjEwnr3kjzH36SUJc+mpKuu1nPwIHbpUKI5s1tGnw+Uiu866XHLQHMKOHlg7lP6tHT sw== Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2170.outbound.protection.outlook.com [104.47.55.170]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3p4258sp5a-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 06 Mar 2023 03:03:18 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jXVfajlGACpMEtbDdQ2JS4qJfezxUNjPNkPQLqh1J27loIQrvrpsToAZcmaLuJx1aOAB1v5xwphqm0UjvzTHyM0ZLMbhTztPn4Z8pcdwT6tXYJwvlaegBTqdrY+vf1gNv2T5kzByR8ol0TC9Fn3ehC8OCkwsCvhp6dy9GX3mZOKHys6YeBbLGTTGyaW0uW253Ol9GGVO40l/qek31DSkz6R5YS8CydXrgxf81Ulx3hv047bTBp7Urb9wC287j6iRLLNg3MxX1AdEceziFC4w6Ea/YjeMh/Os0J7+IO+S7GyLQHLz6MGS1rFFuHpbxQvPfdBwkC6SjVe9ep3H9nBuqg== 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=4tq3drBK8+A+yqiusRsLcau9fjGsRa+4Ptdwflj0Z0M=; b=MgDqmkd9zhZ5dfZCCWVLHBaCsjX1g/MuP22hHvnysQXUtEel7L8Sj6Si2NcUFyuQWyS/ivoyLee4bY7pa8kSSCx12rJEZ3h9UEtAjDPXhAyuoyeIgxaRuRp3+Ub6FauORm7CRyIfLtq8JoTVH14JYJIJQ3RH4Id7Jaz1XxVRnKvFzqmwOmul1iBUU4T3vlDV6tYHpt1hxLtqiYMzAjG195Va7X2pMhA0PGH00ip0xxJoEidE3EgYJQii14lwLq0bFCLCsCeRW9lcEZprhiJHTV1KaivVlImhZUedZvdsWOMtc1Q9occZjmQE5RFu/vwqcCdTzEeU5ip4Gc1Y4zej8A== 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 CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) by PH8PR11MB8257.namprd11.prod.outlook.com (2603:10b6:510:1c0::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.28; Mon, 6 Mar 2023 11:03:16 +0000 Received: from CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::3cb7:edf3:7304:982e]) by CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::3cb7:edf3:7304:982e%2]) with mapi id 15.20.6156.028; Mon, 6 Mar 2023 11:03:16 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 4/6] libnetfilter-cttimeout: upgrade 1.0.0 -> 1.0.1 Date: Mon, 6 Mar 2023 19:02:59 +0800 Message-Id: <20230306110301.75991-5-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230306110301.75991-1-yi.zhao@windriver.com> References: <20230306110301.75991-1-yi.zhao@windriver.com> X-ClientProxiedBy: PH7PR13CA0007.namprd13.prod.outlook.com (2603:10b6:510:174::17) To CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PR11MB4867:EE_|PH8PR11MB8257:EE_ X-MS-Office365-Filtering-Correlation-Id: 7a265057-555e-4f52-b814-08db1e32633a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 04qR2zuVQ/CnnfOWR+IUFZXl7umajtCBWCOo23e+xxurs1DPrdW8FGdSsEbuYAs/xHI5pxikXaZYZBJ6wo2U9WlzSKEQRlEuTSncOqHbz23JCxecanvnGQwwDRhBcP+QoSrcU9x9O9bM7RIaQGM5+tRXDiIdRwUG2nxnVzhwW41eAQ62JhJZ1dI/9cxooxo38UHNBsVqjQsn75V4zwdDD0IJFKklwtUr46/jL2RpePRj3QT/aGrwRU5VyEi/MjRT6vh06NsyQqbOe4vSr7WBoS+XGpImhLKG1UF9GjB4k+A6E+UuzUlLJ6g2TJtu+Lvq4LhcA++rhK4YEvYe+At0wR5sJJn+cDREWT5vINgfa83aOQzJrJwGB00ZtkxPO3Xqy6NfI6jFIpd1+lYdFlKM4uHXCL3+APtKP6DmO/u6saczKIG2sl7PIUdjj7kF0xk5EBI6o6AywwwG+ZuTQovyrFvlYhUCP0RgFHld4SU6ALvRvi6FeHHb2Pf1n91AK5TPZmkFonwiKXks8mqstFk2lDq+V++x5QuFRjCWe24PvZwK8h96OHxoeWoX4XXXCauiydF5Nux17t1042VZQBzvAgdea/sFQfcoLcs+hRO6plCXKpKGA1+D/XQOBUx4L0HIiu7tfpV0MR+t4I1KVYNdcaj892vGetjCwKOo+QPBGFJZ9qdXGyF3kGPP9NxolF0D X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB4867.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(4636009)(376002)(346002)(136003)(366004)(396003)(39850400004)(451199018)(83380400001)(36756003)(478600001)(316002)(38350700002)(38100700002)(2616005)(6486002)(6506007)(6512007)(6666004)(1076003)(52116002)(186003)(26005)(41300700001)(5660300002)(44832011)(30864003)(66476007)(66556008)(66946007)(8936002)(8676002)(6916009)(86362001)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6whHpdG65eeml5J5QIQWAjcxl50gYcxi416XNJ5K5r9Sd1GcMg75w4AJV5xoH9FXJq5gbI5P/oJelIfjw6Kxo2HsMvmeMJimI7k5PNh5hFMIuEyaqSPilHKenAP+4ws4AweaQQLQq0ifso/ftCvdmB8F7/V847gjKUQ6bZyU1bHsd1grdYMTdvf6rXQNVMNtZ90bptDF3mhtHuyxwf95YufZ0uJu/XqrSKNfoPKGzV7ZCs6OMYC3/vkhFlS0TcWqLl56tuj8R2qjvzHn+QfUh4aBvzadV6u++61uNOmTwYNjryfmkQn1XLc1I2PLy3yf1Bl49L043ufPuclUaLtkYKt9b/O7ftEmFFA0WSjt+KfAyWjc/pcp9XwJtPfcXiYKBRNIVAictWMwpea/Jy96hjnDidiFmKl1TBFfs55OskbY035Lx4Eqf2BPKR0EdE2FTTlPBjCsYYFuRPrkHS6fp2XRXRJUGSzzz/sIuB919qGjyqLkVQhoGTFsaw5oaF6OpgCZvjwPx0SD+w+A3yd/g4pjkFwRmtAD21uLqD/qa3R5tqkHVtzHP0rCY/fEY97okbP+MDhOWjG7waBEm6SUoC++fyVxlPBoJsklb+dg6ltGK442mnnPr0NYukEj+5clx4aJWTMQT6SjHiz7OhGXHb2xO+NMz7iTwnvA4h4/uvFVhijwzBci/M5JQY93OXNnsDIwMAS1RBVXoR4E4/8tTIzf2bEnwonsFi8lTSKPGT4cNSMR0MqGN9unA77KZye5wAzTwfRP0kzmOoPrdcK1WdP3wMRtZowdRpg7GEbmb3cRbRyK2gvQ2CR1yvGSh2rO81qbaqbCuGmmgBpEvLHlLduubj6c9w7YAinnQXTF+jqnKLQbRpVNb9ByU9WNRlum+o3OU6suiF71gZjnn5fSTHkiFeBbc0fh+UyMhMlnA5tB/f9scB3kZC7Eozo1JCbC3/Bz+uJc/bkQlaQLq8JQpTY+eLBlTcO68UDeNrrHaUi+ucdERxFoMyVKBURvewSLQsjtypu2s9l4/xUPtZcJ8ELXPLzn9KrZCXM4YHxGDTzskZjTzflIVB7eUsXIWr9NDjVeKPzCh1keEOG2XK+vaU0w5Na2JI2kCBNT7YQudZPK2qkiA3IpkAMrjF+dz2TpKfhsjWP1TGNCGnzToLvcrtjtCeIOcA6oEwhJL+7qBDImLd/oPhVz2+onrLnB67ZQY2G9oh+MW3nFpkCgh6T/F9oBhSyydJYpk8WGtD6+xPAzBugf4qET04Vt6Sp5f4zr7ZdVCZXdq3l0OHy1USajKcaq2072OiZ5nD9iLIpFOnYoGR92LcaDkeuwOGByqn19Z8wClsU/jmvTPUyBFZCcpWrgxGcoxqXadgFXkgDqg7XHPE0tzj/7BBKZBjc0HJzIqWJYL1+kdzI4UxcRt8FsxNtCTc97xT7QaMwfay8yH01bFK0ZiArUVRVw/2W1gu+rEMtMqCO1ftRC26uItS8YQXkrB/WGfrF0DByVthDakx6Wf+N5okuKB3HFXG7N4Hw/mjvWNtPEHOClPF4yaInbxo+g+Knb7C2tesi3780gbtcox1bvSFnkrRpKAvCEa+DWeCzLbOC2i9wYTGNq25RzhA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7a265057-555e-4f52-b814-08db1e32633a X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4867.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Mar 2023 11:03:16.7859 (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: euFZSEgHx0PlznFAsp7UBdKwDa4ir9uTL1/ypS/ZoldHmxaMUFkzIrqyZiaGy5QPx0fS3SoZ5TATkU4oYjKfew== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR11MB8257 X-Proofpoint-GUID: yeLAUdEzaNibn9SX9ort59FgtemvaaQg X-Proofpoint-ORIG-GUID: yeLAUdEzaNibn9SX9ort59FgtemvaaQg X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-06_03,2023-03-06_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 bulkscore=0 impostorscore=0 mlxscore=0 mlxlogscore=999 spamscore=0 priorityscore=1501 adultscore=0 malwarescore=0 clxscore=1015 suspectscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2303060095 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 06 Mar 2023 11:03:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101397 Drop backport patch. Signed-off-by: Yi Zhao --- ...etfilter-cttimeout-visibility-hidden.patch | 264 ------------------ ...0.0.bb => libnetfilter-cttimeout_1.0.1.bb} | 10 +- 2 files changed, 5 insertions(+), 269 deletions(-) delete mode 100644 meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cttimeout-visibility-hidden.patch rename meta-networking/recipes-filter/libnetfilter/{libnetfilter-cttimeout_1.0.0.bb => libnetfilter-cttimeout_1.0.1.bb} (55%) diff --git a/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cttimeout-visibility-hidden.patch b/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cttimeout-visibility-hidden.patch deleted file mode 100644 index 2c606c832..000000000 --- a/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cttimeout-visibility-hidden.patch +++ /dev/null @@ -1,264 +0,0 @@ -From d0c4e39d12f903e06db262656cff2e24d267bed7 Mon Sep 17 00:00:00 2001 -From: Kevin Cernekee -Date: Wed, 4 Jan 2017 14:30:25 -0800 -Subject: Use __EXPORTED rather than EXPORT_SYMBOL - -clang is sensitive to the ordering of -__attribute__((visibility("default"))) relative to the function -body. gcc is not. So if we try to re-declare an existing function -with default visibility, clang prints a warning and generates -a broken .so file in which nfct_timeout_* are not exported to library -callers. - -Move the attribute up into the function definition to make clang happy. - -Signed-off-by: Kevin Cernekee -Signed-off-by: Pablo Neira Ayuso ---- - doxygen.cfg.in | 2 +- - src/internal.h | 5 ++--- - src/libnetfilter_cttimeout.c | 44 +++++++++++++++++--------------------------- - 3 files changed, 20 insertions(+), 31 deletions(-) - -diff --git a/doxygen.cfg.in b/doxygen.cfg.in -index 8e5d449..09c3ce0 100644 ---- a/doxygen.cfg.in -+++ b/doxygen.cfg.in -@@ -72,7 +72,7 @@ RECURSIVE = YES - EXCLUDE = - EXCLUDE_SYMLINKS = NO - EXCLUDE_PATTERNS = */.git/* .*.d --EXCLUDE_SYMBOLS = EXPORT_SYMBOL nfct_timeout _container_policy_cb -+EXCLUDE_SYMBOLS = nfct_timeout _container_policy_cb - EXAMPLE_PATH = - EXAMPLE_PATTERNS = - EXAMPLE_RECURSIVE = NO -diff --git a/src/internal.h b/src/internal.h -index 3a88d1a..5d78171 100644 ---- a/src/internal.h -+++ b/src/internal.h -@@ -3,10 +3,9 @@ - - #include "config.h" - #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 - - #endif -diff --git a/src/libnetfilter_cttimeout.c b/src/libnetfilter_cttimeout.c -index 7844a1f..a0a7185 100644 ---- a/src/libnetfilter_cttimeout.c -+++ b/src/libnetfilter_cttimeout.c -@@ -187,7 +187,7 @@ struct nfct_timeout { - * In case of success, this function returns a valid pointer, otherwise NULL - * s returned and errno is appropriately set. - */ --struct nfct_timeout *nfct_timeout_alloc(void) -+struct nfct_timeout __EXPORTED *nfct_timeout_alloc(void) - { - struct nfct_timeout *t; - -@@ -197,19 +197,17 @@ struct nfct_timeout *nfct_timeout_alloc(void) - - return t; - } --EXPORT_SYMBOL(nfct_timeout_alloc); - - /** - * nfct_timeout_free - release one conntrack timeout object - * \param t pointer to the conntrack timeout object - */ --void nfct_timeout_free(struct nfct_timeout *t) -+void __EXPORTED nfct_timeout_free(struct nfct_timeout *t) - { - if (t->timeout) - free(t->timeout); - free(t); - } --EXPORT_SYMBOL(nfct_timeout_free); - - /** - * nfct_timeout_attr_set - set one attribute of the conntrack timeout object -@@ -217,7 +215,7 @@ EXPORT_SYMBOL(nfct_timeout_free); - * \param type attribute type you want to set - * \param data pointer to data that will be used to set this attribute - */ --int -+int __EXPORTED - nfct_timeout_attr_set(struct nfct_timeout *t, uint32_t type, const void *data) - { - switch(type) { -@@ -236,7 +234,6 @@ nfct_timeout_attr_set(struct nfct_timeout *t, uint32_t type, const void *data) - t->attrset |= (1 << type); - return 0; - } --EXPORT_SYMBOL(nfct_timeout_attr_set); - - /** - * nfct_timeout_attr_set_u8 - set one attribute of the conntrack timeout object -@@ -244,12 +241,11 @@ EXPORT_SYMBOL(nfct_timeout_attr_set); - * \param type attribute type you want to set - * \param data pointer to data that will be used to set this attribute - */ --int -+int __EXPORTED - nfct_timeout_attr_set_u8(struct nfct_timeout *t, uint32_t type, uint8_t data) - { - return nfct_timeout_attr_set(t, type, &data); - } --EXPORT_SYMBOL(nfct_timeout_attr_set_u8); - - /** - * nfct_timeout_attr_set_u16 - set one attribute of the conntrack timeout object -@@ -257,23 +253,21 @@ EXPORT_SYMBOL(nfct_timeout_attr_set_u8); - * \param type attribute type you want to set - * \param data pointer to data that will be used to set this attribute - */ --int -+int __EXPORTED - nfct_timeout_attr_set_u16(struct nfct_timeout *t, uint32_t type, uint16_t data) - { - return nfct_timeout_attr_set(t, type, &data); - } --EXPORT_SYMBOL(nfct_timeout_attr_set_u16); - - /** - * nfct_timeout_attr_unset - unset one attribute of the conntrack timeout object - * \param t pointer to the conntrack timeout object - * \param type attribute type you want to set - */ --void nfct_timeout_attr_unset(struct nfct_timeout *t, uint32_t type) -+void __EXPORTED nfct_timeout_attr_unset(struct nfct_timeout *t, uint32_t type) - { - t->attrset &= ~(1 << type); - } --EXPORT_SYMBOL(nfct_timeout_attr_unset); - - /** - * nfct_timeout_policy_attr_set_u32 - set one attribute of the policy -@@ -281,7 +275,7 @@ EXPORT_SYMBOL(nfct_timeout_attr_unset); - * \param type attribute type you want to set - * \param data data that will be used to set this attribute - */ --int -+int __EXPORTED - nfct_timeout_policy_attr_set_u32(struct nfct_timeout *t, - uint32_t type, uint32_t data) - { -@@ -319,18 +313,17 @@ nfct_timeout_policy_attr_set_u32(struct nfct_timeout *t, - - return 0; - } --EXPORT_SYMBOL(nfct_timeout_policy_attr_set_u32); - - /** - * nfct_timeout_policy_attr_unset - unset one attribute of the policy - * \param t pointer to the conntrack timeout object - * \param type attribute type you want to set - */ --void nfct_timeout_policy_attr_unset(struct nfct_timeout *t, uint32_t type) -+void __EXPORTED -+nfct_timeout_policy_attr_unset(struct nfct_timeout *t, uint32_t type) - { - t->attrset &= ~(1 << type); - } --EXPORT_SYMBOL(nfct_timeout_policy_attr_unset); - - /** - * nfct_timeout_policy_attr_to_name - get state name from protocol state number -@@ -340,7 +333,8 @@ EXPORT_SYMBOL(nfct_timeout_policy_attr_unset); - * This function returns NULL if unsupported protocol or state number is passed. - * Otherwise, a pointer to valid string is returned. - */ --const char *nfct_timeout_policy_attr_to_name(uint8_t l4proto, uint32_t state) -+const char __EXPORTED * -+nfct_timeout_policy_attr_to_name(uint8_t l4proto, uint32_t state) - { - if (timeout_protocol[l4proto].state_to_name == NULL) { - printf("no array state name\n"); -@@ -354,7 +348,6 @@ const char *nfct_timeout_policy_attr_to_name(uint8_t l4proto, uint32_t state) - - return timeout_protocol[l4proto].state_to_name[state]; - } --EXPORT_SYMBOL(nfct_timeout_policy_attr_to_name); - - /** - * @} -@@ -438,8 +431,9 @@ nfct_timeout_snprintf_default(char *buf, size_t size, - * This function returns -1 in case that some mandatory attributes are - * missing. On sucess, it returns 0. - */ --int nfct_timeout_snprintf(char *buf, size_t size, const struct nfct_timeout *t, -- unsigned int type, unsigned int flags) -+int __EXPORTED -+nfct_timeout_snprintf(char *buf, size_t size, const struct nfct_timeout *t, -+ unsigned int type, unsigned int flags) - { - int ret = 0; - -@@ -454,7 +448,6 @@ int nfct_timeout_snprintf(char *buf, size_t size, const struct nfct_timeout *t, - - return ret; - } --EXPORT_SYMBOL(nfct_timeout_snprintf); - - /** - * @} -@@ -477,7 +470,7 @@ EXPORT_SYMBOL(nfct_timeout_snprintf); - * - CTNL_MSG_TIMEOUT_GET: get conntrack timeout object. - * - CTNL_MSG_TIMEOUT_DEL: delete conntrack timeout object. - */ --struct nlmsghdr * -+struct nlmsghdr __EXPORTED * - nfct_timeout_nlmsg_build_hdr(char *buf, uint8_t cmd, - uint16_t flags, uint32_t seq) - { -@@ -496,14 +489,13 @@ nfct_timeout_nlmsg_build_hdr(char *buf, uint8_t cmd, - - return nlh; - } --EXPORT_SYMBOL(nfct_timeout_nlmsg_build_hdr); - - /** - * nfct_timeout_nlmsg_build_payload - build payload from ct timeout object - * \param nlh: netlink message that you want to use to add the payload. - * \param t: pointer to a conntrack timeout object - */ --void -+void __EXPORTED - nfct_timeout_nlmsg_build_payload(struct nlmsghdr *nlh, - const struct nfct_timeout *t) - { -@@ -532,7 +524,6 @@ nfct_timeout_nlmsg_build_payload(struct nlmsghdr *nlh, - } - - } --EXPORT_SYMBOL(nfct_timeout_nlmsg_build_payload); - - static int - timeout_nlmsg_parse_attr_cb(const struct nlattr *attr, void *data) -@@ -629,7 +620,7 @@ timeout_parse_attr_data(struct nfct_timeout *t, const struct nlattr *nest) - * This function returns -1 in case that some mandatory attributes are - * missing. On sucess, it returns 0. - */ --int -+int __EXPORTED - nfct_timeout_nlmsg_parse_payload(const struct nlmsghdr *nlh, - struct nfct_timeout *t) - { -@@ -654,7 +645,6 @@ nfct_timeout_nlmsg_parse_payload(const struct nlmsghdr *nlh, - } - return 0; - } --EXPORT_SYMBOL(nfct_timeout_nlmsg_parse_payload); - - /** - * @} --- -cgit v1.1 - diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.0.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.1.bb similarity index 55% rename from meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.0.bb rename to meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.1.bb index dc87d9b12..5349e6e4b 100644 --- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.0.bb +++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.1.bb @@ -5,11 +5,11 @@ LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" DEPENDS = "libmnl" -SRC_URI = "http://www.netfilter.org/projects/libnetfilter_cttimeout/files/libnetfilter_cttimeout-${PV}.tar.bz2;name=tar \ - file://libnetfilter-cttimeout-visibility-hidden.patch \ -" -SRC_URI[tar.md5sum] = "7697437fc9ebb6f6b83df56a633db7f9" -SRC_URI[tar.sha256sum] = "aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba" +SRC_URI = "https://www.netfilter.org/projects/libnetfilter_cttimeout/files/libnetfilter_cttimeout-${PV}.tar.bz2 \ + " + +SRC_URI[md5sum] = "ac64b55952b79cb9910db95ce8883940" +SRC_URI[sha256sum] = "0b59da2f3204e1c80cb85d1f6d72285fc07b01a2f5678abf5dccfbbefd650325" S = "${WORKDIR}/libnetfilter_cttimeout-${PV}" From patchwork Mon Mar 6 11:03:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 20505 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 C8D86C6FD1F for ; Mon, 6 Mar 2023 11:03:23 +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.30529.1678100600301581123 for ; Mon, 06 Mar 2023 03:03:20 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=atJTbSqh; 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=2429e4d58b=yi.zhao@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3269mAbR018975 for ; Mon, 6 Mar 2023 03:03:20 -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=DtxZ/J9YUYNTlx+l8HZ7ps8q8Dl/qnLLGIBlHNJJRPM=; b=atJTbSqhBRo8KkX0QFmlDz0oOewkOxO1gesxZXhyvpycGpoNYYwHV/SKMy2AkgOotbMf kJGbOqcGgSO9hGHtHN87WtUjSo5iC9jjRn0eZLXuwHGyO4tJVuO9TdhsV4mmNCq6q/HV IcxWGJaYdtHvxKBjYViNts0djSr4rTLuVNQ8sNC8g4gHNYvMOH6PwxFT7IkUtQtT1MTi YOUnvMqeqvp+HodbkK9KEgS6a5Le6sJQQ3tl0tuLA6e9VQOITqVm0Pf4oljmbBfT6bGN h40tfgfnHmF5WCQ07IAlYm8EtL297e2yVtlOmCWepX3pA/0PdT/fWWqZqM0dw2NrO4VM 1A== Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2174.outbound.protection.outlook.com [104.47.55.174]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3p4258sp5d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 06 Mar 2023 03:03:19 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ax98Llim0q1w3gPg/wqVJlsciNBGOiZ5ac0nY1Cr0Ry+G/WSW5pDUBX0wtEClFlHi3MDh6qEsm2+aohdqC7cQ1fNiK2dRbLLgOtD7P002FK69M3Lufs8Lk3wBerMUGyAbq6PdC82jHbOyq/HRAQG1ZMeuGRXaTU2y7Z9HWILRKVpqm/VnL6vDSjWeKyHNVb6lMbrf27baubOtQkLMW4GaOpUTIcwiU/T+4djk4pHNeVcF4ZkIZMKmQlCpPVgUdzFOF6TSIAk1gdPsw01Exq55RqlXuL5+HZ9HHNkd/Zr8zQBq2K7baoP0ZEInoA9JVQOXyIhTB2sxwaA3f4vKudMwQ== 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=DtxZ/J9YUYNTlx+l8HZ7ps8q8Dl/qnLLGIBlHNJJRPM=; b=iB12G01sqc4Ub86VwMhc4YmKMesDO2su8GkBQIYTYKrADtWxJ47/OVF46pxa67Dcatif0BgaRo/+UN33iIEXnXuVn3NIo7z2ZloQoQjkBdt1vtjuJp8afnG4nULvRdJwyCK3ekgPfo7m5E+6lWxMiZ5DP+SOSVpZhviRUET3RGw8wVyJtcmvDeQSeXFqTM0/MqLRu9ydBoroDDVrqxtUH5WxTsHj9ZZDST7jxd2HdGl1NW50/vAm8OoU6nRX1DZ3ItaAWWX0NurXUWjnbSdwdjrs7FcHFrXc3z4VZfYgdDlGsAVU500x1LzmtvgrDaDnKlmG/cxBWvZap453n85YlA== 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 CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) by PH8PR11MB8257.namprd11.prod.outlook.com (2603:10b6:510:1c0::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.28; Mon, 6 Mar 2023 11:03:18 +0000 Received: from CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::3cb7:edf3:7304:982e]) by CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::3cb7:edf3:7304:982e%2]) with mapi id 15.20.6156.028; Mon, 6 Mar 2023 11:03:18 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 5/6] traceroute: upgrade 2.1.1 -> 2.1.2 Date: Mon, 6 Mar 2023 19:03:00 +0800 Message-Id: <20230306110301.75991-6-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230306110301.75991-1-yi.zhao@windriver.com> References: <20230306110301.75991-1-yi.zhao@windriver.com> X-ClientProxiedBy: PH7PR13CA0007.namprd13.prod.outlook.com (2603:10b6:510:174::17) To CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PR11MB4867:EE_|PH8PR11MB8257:EE_ X-MS-Office365-Filtering-Correlation-Id: eaedfddc-6a26-452f-d738-08db1e3263f4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YJbwAW7Y6VGuy22rZFx+GJzuFy84sq8uPnBueUVx+poMjNebSX+7fScNq9WAbPQDFU+uhjjuDzO2Q9bbjYXxAv9bhSjQHQt6RT9QTMCDxH2YiEIiefch9EAaIb1eZWiKMIxObZBv4//yZsSB11+j0bav/lfcNkjSIqqvkdUPZm1EK0HCwoj7ttEVkrLZN2p8YZLUoWNwI8HOYp+coltQYlhyZxysbrzvLfIbS6Gr901BgS8V/UM247KT40oMOZpsD4mrzGNUzMt1Tn0NOm85p8fS3pHSmNub61W/ndDz0rwlm+a4r/2VPU83IWggelcUFb0XubU2udL+YVXeWOObPJj/X7uFrCNMwgNUhevU+Ew/+ZJng75a34/eHpSJs30X2h/9hnWIrjEohJ/KhxvGbNbodjTu/qvU5yjPd/weu1sFhc08vgo3CFoAjwF/zzq/nAQSYCg1h6KtXFFuMuyf+ZfuGXvYvb1+xAC14F8hLd1Bqfxj96Lx8cN3o+Yfr7wnKH0tEYQrXHkYlQ7elhBBert00J+ByQLcFDd/I7MRaQBhMn50nXwuCb3KB1AODHkyOPIum/n37VNaOrUKjMljbWdnZLZ1zYTH7GgrrNFJCA5vK0ACAKPNfnTlavToikl2LBOEf9PRY9+ZI0NH25KwVbRFQcfBKyR/RCTiIalxLx/760CNpEKYLHLjKeib1wKw X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB4867.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(4636009)(376002)(346002)(136003)(366004)(396003)(39850400004)(451199018)(83380400001)(36756003)(478600001)(316002)(38350700002)(38100700002)(2616005)(6486002)(6506007)(6512007)(6666004)(1076003)(52116002)(186003)(26005)(41300700001)(5660300002)(44832011)(66476007)(66556008)(66946007)(8936002)(8676002)(6916009)(86362001)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: smgyQDwi3BQHHsRj3qtO2JWwr31Wwtmff2kaX8YHGKePC5HlJWQn44KBmzx1iMvWsfWwk0yg70+VTcbeXwMkjAfB/qrQ121Sky4npBD31sJTvjwcm6PRQyfHHZQdr559fr1dr1ys8GHYIsUThXazsNn/F+ppP8wSbeX5vd57Ksdy107Zc8xtKKaqlv2vE4XvNg/G0t/IFjkXR2ZCnvxKeI0MXZ8q37WxhIfvAuZvre5N4HsHWyz739X2W/Ktbtx8kk3GmeB3EqdJiwM84ql+OIAP8vVGdUbyFKRez/awUZqxDXxzeMNpzWHJNY2ye+NyiPlDDLyBL6WMR4fqQbbFl7oX3Ea2w81EU4ug6v6srXyECaOSmz6I8geckDh4Tlc5FvNk6YZ0lqPfeKWG98Ru6EHHiprV2qBGYHQYTsDFXjVgwiX/suHd3YrPRSiK09aoyumhWzTKYIThLDlZoN9wOcNRLlDOjRGL55iCfu4+WkBW/fN1TrWtjlxuI1Wvo2cs4KXWAXXtbOP5F7pvkNBgQnJIx60IDt1LqiiWq/tNvLB/m9/AEHNraky32K8HDwSnLfwyPEFEnEQKgoepkOtGSPMPXmwpc4ogcaWjz/RB25aTamsnOS59QS/FtCkr64bOl4zsFjldr5QuiMlfVi/4aylOOyrH7b6MEKgnJ0Pllq6hvL0coez/q9kKGE0lvc4sqqnoG7L0Ab7FSwNOUnjVmqpFgTf7kHH5adHTA+JwgnWJgFgucaXE2LyC+AOioHSyM/ZGAkQGR9mkR4tlDXGBWFn8pOmPdQk4Vnf9MeBgKgHdb9R+ys3DJ5NhzsUHP0vWGS+lPaz/Hzr7hOFBofIfFbpG/PXmQL4FSAwMG6DU2VVPsxH8IAval541vobcZR43veLKJxOJSWvX1RtPoxDOdB2u8h8gz+arcbaMe1KXL5JLEsOJoi/qHql+jnbtDxhGCskyw+SbSpXWIp+mJ95cdBnpeAgHJjXEcjReXGrk1OSaPBjm0kwT7DDzqp4yrSC7jABYWkM5roxim3AWOzQQQnb7VVvYbRgYX7yJLD/VpXd11HJvA9dEi7sP7wjEczbFZQ0UKYppTx0qktSUGSB5ElpaO4WhIt02z15FJMU99pT15Jjj0ValpG6cxyS1CyTQvt5l/HY8eeRbgixpUyj8gtEKLevJ5tEC60jMW38858BuNjItILrgt5xBz5ZWSKPsZL1hcFPy5Z9nRcKtdNxcmTq7+4UL6z7OlDT694hoOy2zpf+mK33M4jEPDsFb66CjqrrthInxKwzTX53v+eBarL9MEhfcqdamt4c0FfBm7fsBDwUUOJSE9ub/0RUjg+1uQpYfYNcbYXgO0Ifq1DMSw5/cSsQCgtkjjYb0VIwD8lmwuTgV+ijCmmjfR+DTyuzTz3fc+ZsL7tGFe9v9taABjXMPq6buGDPHZLZwdrob4/V83tqvWPWcw+ZcSKQQGmStpoIbZxxxw+7uXe4fY9VnisfUOvMB8Oxtpy9iHGf3IZ+3asaqh6aOBKEcawyj7R/Od0b2T2ksgvVF2LLh2G9agRtpRJphuMqUzupEN+KQnn1/MIitAN4KZb9PzeoTTQbA5NUpZFs2XsaRpSqxsavEiA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: eaedfddc-6a26-452f-d738-08db1e3263f4 X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4867.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Mar 2023 11:03:17.9901 (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: 8wRbBoLqQfYdpVN/Rr2ZuxlntOdVi2qLVADruZMQuTkiRNwdzD09otXLWiVkNW8apBy1Zq36oIDHN9UDx2d2Nw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR11MB8257 X-Proofpoint-GUID: p9O0aOr4rd0c56bHsu7XU0aes5jcVayh X-Proofpoint-ORIG-GUID: p9O0aOr4rd0c56bHsu7XU0aes5jcVayh X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-06_03,2023-03-06_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 bulkscore=0 impostorscore=0 mlxscore=0 mlxlogscore=737 spamscore=0 priorityscore=1501 adultscore=0 malwarescore=0 clxscore=1015 suspectscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2303060095 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 06 Mar 2023 11:03:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101398 Changes in 2.1.2: * Fix unprivileged ICMP tracerouting with Linux kernel >= 6.1 (Eric Dumazet, SF bug #14) Signed-off-by: Yi Zhao --- .../traceroute/{traceroute_2.1.1.bb => traceroute_2.1.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-networking/recipes-support/traceroute/{traceroute_2.1.1.bb => traceroute_2.1.2.bb} (94%) diff --git a/meta-networking/recipes-support/traceroute/traceroute_2.1.1.bb b/meta-networking/recipes-support/traceroute/traceroute_2.1.2.bb similarity index 94% rename from meta-networking/recipes-support/traceroute/traceroute_2.1.1.bb rename to meta-networking/recipes-support/traceroute/traceroute_2.1.2.bb index 3892a0e21..51b581a4c 100644 --- a/meta-networking/recipes-support/traceroute/traceroute_2.1.1.bb +++ b/meta-networking/recipes-support/traceroute/traceroute_2.1.2.bb @@ -17,7 +17,7 @@ UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/traceroute/files/tracerou SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/${BP}/${BP}.tar.gz \ " -SRC_URI[sha256sum] = "8fc8d5046e855d7588607bb319f5b82e3ba13e91d5d4636863262e6386bbaf76" +SRC_URI[sha256sum] = "507c268f2977b4e218ce73e7ebed45ba0d970a8ca4995dd9cbb1ffe8e99b5b1f" EXTRA_OEMAKE = "VPATH=${STAGING_LIBDIR}" LTOEXTRA += "-flto-partition=none" From patchwork Mon Mar 6 11:03:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 20504 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 C7896C6FD1E for ; Mon, 6 Mar 2023 11:03:23 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web11.30601.1678100600802964958 for ; Mon, 06 Mar 2023 03:03:20 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=N9Suogxp; 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=2429e4d58b=yi.zhao@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3269mAbS018975 for ; Mon, 6 Mar 2023 03:03:20 -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=aM/aeWimJ/YjWJ+ttb2gco9e/gzj9MylYtlBmQga6o0=; b=N9SuogxpPxuf7Uf06+0wzsQkPHpVkVtLybPEqulGshD5bZZZ+P23kSciYnRP/9KJO4AY 5h+NF7ZTdGVfCmS6CMY9iUx/MaD6pR0M1v05yBlgh9JFwBGvJKuB44DLTdjxcdoI24t+ 0DryxR0K5uVnhkMuDWMJ2jar9UCHVkmAIRsMZM+C0K3y8OaYNJk2/TlUJZGL8gQxOqmV zVmBw7YGObYG5MhKUpoPVMPKZcnRQNCD48VG6uiDi783FqXCQGF61PFfe/IA+h0V+Wel AeTEwlKApkvgx07omPhm2Iwo6yZpQJ5MckOgvj7wgqFCzerrEwXs+N9oyZBUv71jk9+K +g== Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2174.outbound.protection.outlook.com [104.47.55.174]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3p4258sp5d-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 06 Mar 2023 03:03:20 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ALyGs63SssuMHiJpwtQnceSTf/uLkdjFzshgkRaX0YAi79pLslTYww4GRk2yzlPqF8FhPNsLPPn7CD8PwHily945tQRmLVOayPpqSBt5P+pHRw1jeLuST/7q1VuWtTiOzgzzTwZ5+ah9IDGu55NdjkJvl0CS6MBfqOF4U7kg8PrzowBrpCG8aEPHlKeNbDh9E5kegpf1O95eoZxRnK7Iw9wCsOLlWUVJFci1WWrOwIO/xnJImtONsUJaLABgVxRFy5UQVYVSIBE1Na78C6IaEKHqjaK91KOta8toqfwX57GwlU/JBZkR11UKkXg/lYRWdLGH2oIGovEbMW33kSIPaQ== 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=aM/aeWimJ/YjWJ+ttb2gco9e/gzj9MylYtlBmQga6o0=; b=VrkSPIuUrixZvnuED0GyhAP6KrkombAOAWK2ijyyb/cEhkRv/zKgHxsmu0BvoP9xTITv4TXv4gigT1/gZchiFXn4I1ueIk/BPJaoCqxrFL4T+YqAk5lNOerKvX0dUmT29qfFVuyiOBvFcxiHy7JSfQysUUzC38E6Gptyi1UplG7Zk0mo55Hm178Ce5HUdTg6HkzF6Qp0TiwOMu2+vv2jTngdIv8zy0VWIbLMw5Mec1NO5d55lRxlppLnpa1Q+C8B6GsIKzCxg4yFzVNqBdE+Bvk7AkoNKXcHnZImR5CQXy/z5xwauitTnpBgG3yWw+vyU3U8aMfEEwvKDZWp1E8SYA== 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 CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) by PH8PR11MB8257.namprd11.prod.outlook.com (2603:10b6:510:1c0::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.28; Mon, 6 Mar 2023 11:03:19 +0000 Received: from CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::3cb7:edf3:7304:982e]) by CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::3cb7:edf3:7304:982e%2]) with mapi id 15.20.6156.028; Mon, 6 Mar 2023 11:03:19 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 6/6] freeradius: add UPSTREAM_CHECK_GITTAGREGEX Date: Mon, 6 Mar 2023 19:03:01 +0800 Message-Id: <20230306110301.75991-7-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230306110301.75991-1-yi.zhao@windriver.com> References: <20230306110301.75991-1-yi.zhao@windriver.com> X-ClientProxiedBy: PH7PR13CA0007.namprd13.prod.outlook.com (2603:10b6:510:174::17) To CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PR11MB4867:EE_|PH8PR11MB8257:EE_ X-MS-Office365-Filtering-Correlation-Id: 3e1836f9-546e-43d6-7566-08db1e3264ae X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EIzkkh7+b+BxLstHjLfRb9fzVHrk5L8wYWQgliHDK9b5FLVvSInnQodab0dlhd58clTr30scuE0EVhAh4j0xur/SRiNB0Nnr2POWKwtTsC1SPwAOyvJ1SzlvV8gnzbJT7JvnVcYelJdghIjUpkoLNRixY4TBaGQoMFGQZX6mpBzMCfLTXKtw7jk5Exg5UQcv/q2zrtLe/W7+6EOWmIxaCFj9Idj8FsAv06EpWzn1uP/PWQNP9zHGoEdx5xMtIy6FOaa2FSGsO636UHH45Z2fYfo8q8JhQOJFhZxHOJSyVDBWO10Mcn81ZNxTj/zJ7jxUEqk0SaCyR7X5ynBDRa/mfdmBi+1ZRb6xjJaDKJbHqlDa1N++vOYeEq8Bq5vOeJAxRUSGdWUqbzbFPfoEc3daYEET2hJRHGQFZVfxm7eADDdtK+8lQ7b4swUvjPjMufjCnsjeAXNQfVU0qiiSX4YBILbNU78ZCLvG/xEbWElusJfYb771wVR+ZSROU3mttO5nyCygk0n/mQ6xXDHAHaVDPqfnEEnZSFYQp2POUW21529j+Ym8CfQ4c9CnxCGkBaa0fa4CY5nq3zgvh4q6dy0DxWpHibmIZrD8Nq9txL8t6qnrVpK+eNFRCqhvKBFLyGOMK46+LtSZQ5lJMy/fFARGiW3f2my5VZVe7Osd6j1EToU6yOPRNQbHtxLXzhO40Wht X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB4867.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(4636009)(376002)(346002)(136003)(366004)(396003)(39850400004)(451199018)(36756003)(478600001)(316002)(38350700002)(38100700002)(2616005)(966005)(6486002)(6506007)(6512007)(6666004)(1076003)(52116002)(186003)(26005)(41300700001)(5660300002)(44832011)(66476007)(66556008)(66946007)(8936002)(8676002)(6916009)(86362001)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bGyaUyUGyBnAv0l0HXCjrisiKfzOsd1GP0T0kSqNFUVQDVOXZXJn/csrXFXOlULhv6FbzuIym30oKcGSEXxxn+9dLtUs+xHzRUYmmg6+1lfsTBmcD4zr+pGByvj/cdecWLzZPs7rX7UjKbsAKircOdS4309iZC3ewZjp8nF1Rko+Q6Mp5AyEbYvtEkKxoKle2Bkqj1jJ4/V7ioRYE9tJTYufdWiXgRWvIeg6OUXg2Ed5YscAa7IEn4nDmNE79u7w05zCAvIjgZIoAYTwbRTnw8DGR5dc7wJsTrK10DQZ5TpCVCGwiP33tt+fZ85rjfWHoLMca7IESHj0N6Hhi5qH0HanvM4gFoKvZSjwP0FLEvKCapcBow06nX3jxEaZMF3iGazCXDPCB0orBtrrTyeIthCP7TjG7Kxhs7pbeYi3Zksc/Hp/JGoQ2eAxucGyygFHO+kvyW0P5zxv9Fd4blTe1pozWehnU7qUMg0UjXIz0Uh1i/oGZAIpD295fLX978twxtxEVwtzZhst3d+qdsnrSQGFeascNLbnir7sL8oiXcukwOjfMQOKd1lXptMe59W/V74rZPwo4Er7Ojy4R0l4VBr74I09l8pQQ8eAOHfTH8C4cetofsT09zZqzMMEwjBZufDzA2Zhq6jGJfOzHA3AK+0acIG7GVe+79+FOQa/mBzz+h2t1YLglOdHCtA9hqDfhDBWLZ7VpivfsvVXKxzpZ6zS4Fk9/+ZHcS8bydTclp+uGm+dDIJc7lb9hUC5lwEtc2HC7D/YV5MWLvNROTHHIkUT/Z3q9Coy4ZYBvvJGZYeX9//kr06MtYb3GKe7q5gD2iF/Zl3PLrkPNbpA/uSBqBvbXwJ8/xjO0EYb6rBFYttR8NN1KJ7MuKDiudDstQ7nGA6ioWN+E14dzC6ye1jLvbIqZlnG2bJNRdbtG4WFtjiHw/T8tJpjM4N0qH/UQSEW/DhGu+zBLjHFUdk8tqP9oA+5vg8TNQhHq2pVWfy2srtcmRihkI9H+ARFE3f7pKW2i1/eqH7Y1enTZ9MdvKe6Vcqf9Vg8AG7nnPB/gsbIZNL1VVsBG2oKdF/SY3INkkoOTlyr9NKYVu7D5mK8is91lhstFJod1NV8/SD6gW2Vj4+cvEVfpyq+LXt5mWL82CHKVAaSwSvIZ5u9wx8HmoXqTxEe/wPhpckb52ZZCcVKBfaJjbbVXnNIJJBUuVWkDVZs0qJUuyvBOqtiFMWRMqc+YVBAD3G1rLWyaQCCyqslrWhwgRD+qqNmmWuJt0q5JIEbhQwP40/umHcwzISm/xPI6XK0ucVf0zbiBm5GlGJDhe4epPuLQbpN8vRLY1XZe5fyKTLf7Dp8Th+EaRMWfTwvE0TxkacX5d16oMiNN4gKMhwZQ4F6F3YDyDvAUOWQpiHyhCumd+S81Z4AUl4/I7A9+8W+Gm2/7F7A5rovx2FoB9ffUUi2auNAHo+8Gvk1xPA1uY11v8LMk1ghCFdyTysMWtgCjU3WdohB6XO18dqOs1Ja39cOWbIDpJL4BT6kTyLWNv0X0UA87ydudba4LdQPT4lh+MmYNGy7kTsHlMaew6+gBym0Y//hgpzzk7arZGrPRYt/7PHSFMJI/1zVQeE86g== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3e1836f9-546e-43d6-7566-08db1e3264ae X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4867.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Mar 2023 11:03:19.2222 (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: eoa2fSy+kPhgNaP6d9hse1kfQEIkcnx48Qn5g4W6pQFidBDpuXNj0FSVLBbfq6TB4UwmI637fW9sISZoxdVScw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR11MB8257 X-Proofpoint-GUID: DSgi-a9DN7Lwc2x-b7IgvYorGQt3-vYt X-Proofpoint-ORIG-GUID: DSgi-a9DN7Lwc2x-b7IgvYorGQt3-vYt X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-06_03,2023-03-06_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 bulkscore=0 impostorscore=0 mlxscore=0 mlxlogscore=789 spamscore=0 priorityscore=1501 adultscore=0 malwarescore=0 clxscore=1015 suspectscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2303060095 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 06 Mar 2023 11:03:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101399 Add UPSTREAM_CHECK_GITTAGREGEX to check the correct latest stable verison. Before the patch: $ devtool latest-version freeradius INFO: Current version: 3.0.26 INFO: Latest version: 4.0.0 INFO: Latest version's commit: 8b5bff2d8a2cd2be1da58a417787d907c7a5d8f1 4.0.0 is not a stable version tag[1]. After the patch: $ devtool latest-version freeradius INFO: Current version: 3.0.26 INFO: Latest version: 3.2.2 INFO: Latest version's commit: b9ed73ef2d2628fa6e2a6d15a7782f8217966be0 [1] https://github.com/FreeRADIUS/freeradius-server/tags Signed-off-by: Yi Zhao --- .../recipes-connectivity/freeradius/freeradius_3.0.26.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.26.bb b/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.26.bb index 4a23c9d90..9a2bbab39 100644 --- a/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.26.bb +++ b/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.26.bb @@ -41,6 +41,8 @@ raddbdir = "${sysconfdir}/${MLPREFIX}raddb" SRCREV = "d956f683d37ea40e7977cc5907361f3e6988a439" +UPSTREAM_CHECK_GITTAGREGEX = "release_(?P\d+(\_\d+)+)" + CVE_CHECK_IGNORE = "\ CVE-2002-0318 \ CVE-2011-4966 \