From patchwork Thu Oct 12 11:56:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 32021 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 8C496CDB46E for ; Thu, 12 Oct 2023 11:56:31 +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.9278.1697111791301847616 for ; Thu, 12 Oct 2023 04:56:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=ZZzTK2ZW; 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=86490ded89=yi.zhao@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.22/8.17.1.22) with ESMTP id 39CBBcCC013736 for ; Thu, 12 Oct 2023 04:56:31 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from:to:subject:date:message-id:content-transfer-encoding :content-type:mime-version; s=PPS06212021; bh=nJ+H85RmMaDW9gv6Zv zSSR+REnKK1yWFx0vlVoQxGIY=; b=ZZzTK2ZWTkNKPbmBS5JjrBd3Q3FtNJHnTo K8oc3ZrFdCyjpjfC7i31d3KHK4zLfP9Q090RdHmm7x9Ovcqe6dbaY5yZTyIA+dhN vfFqVweMVofhCsfevZ0Yh7cqsQZnCNbAZARlCjnnq8RekAgnwKx7UBNobWWBNsFU kt7DniKzQpb65FOuRtBSG/1M1wG5hxyGobpuqVNtI7Pu6PgUXwY586g5DfpLefLP vJ5zrRnaR/z4P/Fuk1Z/IUw1qbp0H+AVimM25SAqAq/WXcOhJzfOG6Bai1Q+VcnB fZNYC31U4i+gXJZz1v7zpoWa98cKVQ6smRQPEzibzHbtwieTwwSg== Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2100.outbound.protection.outlook.com [104.47.55.100]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3tnhq4scca-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 12 Oct 2023 04:56:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YhVeJAGx28u8/DxPJc02mzEwzBMwNqqtRjTm33EXJP6Awbur8cCuF/tQs9eNsNilyml2BPufG82a7G7IRWsVjrgNUce8QlkOrArJx8JbN+c0jD98Gom774RX8VZFClXQBI83YFFvPexhIqQ6q3Jj/++QVyQWYTqc1RLwRdybRtknaJHsKqLNJW2ZMFq5JXv1OkErpytmvBGLdBWVeCLwpg6IKTGcz2eKTdVP8jET6iqk+qAw9xAlPj+AAIzrQmZaT2YPGQvd8rNau3w24RtjHAphjJkzSKLFAyfL70N7GhQ2EHDNBnQwyclrrnqGBAEfde24HcE0NCTybWEqiy98lw== 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=nJ+H85RmMaDW9gv6ZvzSSR+REnKK1yWFx0vlVoQxGIY=; b=fKXCmVWcRyCudwve5EhCtYFFrBxRgnfNyLEImcPaPgfUcybruVl2rlVNQ8hlQXvO4FyCJmDJ0cht5EdLmmu1ga9Ff9dR6ji9LbXfCiVcqEAvdxJrhizjoGvX5BtDTdkqRQdwEz/ZLZKFAUtzzrdYfio8Pr5DZVT7AFXg88rSqu2NzDdeDX6h3r5sg9Z6OkSfwUptpviv1ABZxhYFy55vxAUt9Upt/F5A+nwMPry/H7tAo9JQj3/MWYSbEbTMjtSQ7N7zIGXsWg2JmHNUlI5y0RLYaAd9sJKHjvqEESOygMxZeOXNDzjm/wvYtuqrov5QZJ+5bsDOVB13UItJqtlSrg== 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 MN0PR11MB5964.namprd11.prod.outlook.com (2603:10b6:208:373::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.38; Thu, 12 Oct 2023 11:56:28 +0000 Received: from CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::96db:9814:2d71:a957]) by CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::96db:9814:2d71:a957%6]) with mapi id 15.20.6863.043; Thu, 12 Oct 2023 11:56:28 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 1/4] samba: upgrade 4.18.6 -> 4.18.8 Date: Thu, 12 Oct 2023 19:56:11 +0800 Message-Id: <20231012115614.3133797-1-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 X-ClientProxiedBy: SG2PR02CA0002.apcprd02.prod.outlook.com (2603:1096:3:17::14) To CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PR11MB4867:EE_|MN0PR11MB5964:EE_ X-MS-Office365-Filtering-Correlation-Id: e8073e80-ede5-44b4-97d8-08dbcb1a4421 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3LFrthiEReQ6src4pJxsqoCtAEac5tWMT6byJHw/nE1sAOMetoYqZxyCFHWgoGa+7NeZ8HWkEAaUXWgjwBPuEzh0mk23wD+8vhTU0ZSRyG4juYswtqtiKo4hGqo3zMeSwTi25fi/sQAyvVzgZ6fXYqLUeWDGoW5WbubI6ibGLbjguPZQJ2h3APwERyfeAFJPSTEuYKISBvegVQvucU776xhWQ6CV7sdX0ieoAJEkOZ+NP5LDjqD+X14SyXUZDmHiflH6x7P/GcgCeO3i3iyiWHtE9WdXAXWXBUxmtAb40A7i5MSu2K8ZPbGAYxrbKYdZeyGd4yacICKX5qH99Hj9A25Xi8rV6f1LH3MYjlag4PI+TtQoY2gwN3mcwXkgWykZfVUR+XAjmNHCHdhU3FUVZJWtnKqC8LsvkULwe1vnrcie4HKKNkZLxoJZLcrz5aNW/KEfbXW3GmbSEXFhQKx4MI7qGr2Ad02w1gBBA+C4QW3eP+/6C+C6ao9PTaLy0fh/NdRSmc4EqEoNDejuIVCoSLIxOm+mqthrFuMiUDPrPD4wGx3fWWtFMotC4d+farGIgMIwyfKfQsOBnrOIgVkSwx+Zm+e9JJkjvU8lqqJLTmk= 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:(13230031)(39840400004)(366004)(136003)(376002)(396003)(346002)(230922051799003)(1800799009)(186009)(64100799003)(451199024)(1076003)(2616005)(83380400001)(26005)(6512007)(5660300002)(44832011)(66476007)(66556008)(316002)(38100700002)(6916009)(8936002)(8676002)(66946007)(2906002)(6666004)(41300700001)(38350700002)(478600001)(52116002)(6506007)(36756003)(86362001)(6486002)(966005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZdtKdtcwOTUX2BzPr5tnweG/h9yMKZkDsn2zqOfPj6wA5dd79BB/dGc4hIoTgUEgB4JS1U7xzB8AR4i+1HxK3FKwbHwriCW9Rk8eHidPR0AlgR2mbzd3LVqBDqOQ09+8++ZO1968YlLkwySKDSuhRdlCLRKjYw/LKgKJ3E137lNyGKnpNoKi5jVMboS4noxqxXBB03HDIJRV5loFPSBs51xSzs/ch3biH9KYI6hzMv1W1exn5ypTWtooWSJvCK8lP7+X3Z02xnEz3CCymJ+GjAhvCWe++lATZEt5ZzAh/dZBVGtCMiEpa7UH9oqUO7Fx4FRyyRAwxzY/y+JrBjtZnDx3w7nyYvXv8uKFzzqRz6+RCo8abhOw+XQjVV03X59O1otU4GP5IF+wtGVa8urUlC6h6/IVNXiDk9VNC60zJF2ugt7NFyZ/Y4jpjpxtjGBbRDE3s8e395hoaW0AL2220QdoCoGrnvpbaxbFGpSytYnoBhDIClgxckA1+bPg7cZ2dymg8ITuC05arLEmpaShZxCxifVXmXKnVG5z6aToRSANecb87ELxLyMSjcZWxUaYxfa55RAJCj24sqDcUbfFPZdKcnLTHczRxJTs5cIhlHranubPXaKFYxvMI0rjgL5ygfmMEMOOdYzzEKQViCYhDznigEMoYxVeKsPheaUjFy9cVdS/Qxk533/uWjcvZZv7OlA7iaPMUFkHDStnImFyHQV+nQoSKDzEwSReW4aUkpsK+TnEYn6Ay9pTWYCTqPhngOz1xWRpsuH1pcX7oFlA0g3XU/p0Gq6hEBk4tj3/SRScJhnY3DM+PSHmdbE+zk8sVnmoZy2fgSxts01r0LxpQrZ2iEzWQA9VX/sJBFyd8ZFNt9rnk9qTrkGvztADZ/ozxNBXKtygsASmffvvUvjgXiQZzJf3kh/tqrDftx3WduGtHrigVhGhlT2PDV/QYeBh8P29NbQhP11AF55S17iJTYdvAsk8sm717eWwsyAJUnT7aiKpkgLUm2cvfqqoEAyAqoSfQbssA8Wxs6my4ImC5+QdwXEmjpuiO9u9QRn6UHtHzxHwZny829vxxA+eJjBK0xVuOR9dIb+Iig+75U0LlpV78+Y7djaDogBFUNQiLssWwuFi8GAIjlpifZTeI4BwouypG8+9mSGCNNUyAoHYGlUR3L9oQLyEcrSz1Kz5P6dmYOjIXaU+m0vHPcTuF5z/NRp810+df6XsNRSvcC8zuDbFWF0XIaxlp/FfRLx5N0pq3TQX569EEjgVtZ8GokHmkjeM0VSjEyKRZCs6Dztd712C88XhTyTUbwNMLVp5yZzBTOMdBhBbaAmtqkfWeC841/5+L+mRwZ9I76HwyfrrA+EO4yUZVwH47NU+ieX9EwRVu3WA5gL67RJYMitqR2d8rBm4l4DvAPsYbz9FUfvRDuzEUdCmRF+isI4drfPFUqE7w9e2d3GfQhATl+J0BC4tMWXGtXLhuDheBSZojxe9SJ7pDp6YJDNg5QaDp/7nR8elpaI78r3auckpC7QT9g+UHj7ppyYnNHi82SmGvlopwRrCbWOJgHqATs+W5yPxarvYTaSRISBlLrwYC40D2wxi X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: e8073e80-ede5-44b4-97d8-08dbcb1a4421 X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4867.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2023 11:56:27.9878 (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: FthETddwnHBtZ7YpFVEXYtsfF3FOcU2Q5hkCLc3iEk2kj1NJVOtR4nrNrZhix9WD+ViN/Og95x6NMvKHP/Owzg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR11MB5964 X-Proofpoint-GUID: FTr0DJou22LQq6kKsJklEstIRm65cyPx X-Proofpoint-ORIG-GUID: FTr0DJou22LQq6kKsJklEstIRm65cyPx X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-12_05,2023-10-12_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 spamscore=0 malwarescore=0 lowpriorityscore=0 priorityscore=1501 phishscore=0 mlxlogscore=999 impostorscore=0 adultscore=0 suspectscore=0 clxscore=1015 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2309180000 definitions=main-2310120098 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 ; Thu, 12 Oct 2023 11:56:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105445 This is a security release in order to address the following defects: CVE-2023-3961: Unsanitized pipe names allow SMB clients to connect as root to existing unix domain sockets on the file system. https://www.samba.org/samba/security/CVE-2023-3961.html CVE-2023-4091: SMB client can truncate files to 0 bytes by opening files with OVERWRITE disposition when using the acl_xattr Samba VFS module with the smb.conf setting "acl_xattr:ignore system acls = yes" https://www.samba.org/samba/security/CVE-2023-4091.html CVE-2023-4154: An RODC and a user with the GET_CHANGES right can view all attributes, including secrets and passwords. Additionally, the access check fails open on error conditions. https://www.samba.org/samba/security/CVE-2023-4154.html CVE-2023-42669: Calls to the rpcecho server on the AD DC can request that the server block for a user-defined amount of time, denying service. https://www.samba.org/samba/security/CVE-2023-42669.html CVE-2023-42670: Samba can be made to start multiple incompatible RPC listeners, disrupting service on the AD DC. https://www.samba.org/samba/security/CVE-2023-42670.html Release Notes: https://www.samba.org/samba/history/samba-4.18.8.html Signed-off-by: Yi Zhao --- .../samba/{samba_4.18.6.bb => samba_4.18.8.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-networking/recipes-connectivity/samba/{samba_4.18.6.bb => samba_4.18.8.bb} (99%) diff --git a/meta-networking/recipes-connectivity/samba/samba_4.18.6.bb b/meta-networking/recipes-connectivity/samba/samba_4.18.8.bb similarity index 99% rename from meta-networking/recipes-connectivity/samba/samba_4.18.6.bb rename to meta-networking/recipes-connectivity/samba/samba_4.18.8.bb index c40e10224..1ded9fe5e 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.18.6.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.18.8.bb @@ -32,7 +32,7 @@ SRC_URI:append:libc-musl = " \ file://cmocka-uintptr_t.patch \ " -SRC_URI[sha256sum] = "284c8a994ce989c87cd6808c390fcb9d00c36b21a0dc1a8a75474b67c9e715e7" +SRC_URI[sha256sum] = "4fb87bceaeb01d832a59046c197a044b7e8e8000581548b5d577a6cda03344d1" UPSTREAM_CHECK_REGEX = "samba\-(?P4\.18(\.\d+)+).tar.gz" From patchwork Thu Oct 12 11:56:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 32022 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 91D7EC46CA1 for ; Thu, 12 Oct 2023 11:56:41 +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.9202.1697111791804017456 for ; Thu, 12 Oct 2023 04:56:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=En6ofQIo; 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=86490ded89=yi.zhao@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.22/8.17.1.22) with ESMTP id 39CBBcCD013736 for ; Thu, 12 Oct 2023 04:56:31 -0700 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=ZtYD3/ni1ltVtbFtOK+vL1049l/QObVx79ifKxbfpGM=; b= En6ofQIocTaBb8pfIOtwpUN4ayxVLWpEyJ6BTBtNS1+jFVbaJT8uXcSS+0sq3vyP WqE+KonTopPRJKdnlxbkjtZuoDJ1WR5Xju5xi6jEkQGvxvAn0Fqf7tW+a94d0MCl Aj0Ucun1tR6v2aqs+N+dqekRaCdh4QTEPPL65WwfQDom33RB0z+hJoutNCtpvUgz fg4mwMuf7u1CorXo6A1Q4OUc4541pA1WFNt/eCvc8eJTU7RddUKldpEj2p1F+LsS CD4Pe++dVrcjWEDCgm3xbkRbVezM2+At+lLn+Z1xS9Mn1IHaA5UAG9E/Ao8+Cjnb c6ceuH6MojApThJ2mmSS6w== Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2100.outbound.protection.outlook.com [104.47.55.100]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3tnhq4scca-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 12 Oct 2023 04:56:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=acCvZlvF5TW2CGCTWVyYdLcK+zfR8of/Ulj7hFZl1b9o2KaymlVJu2E81v/k8XPqHlDcPJ1w04WqW1MxIT3ZNtuMdIe9eVzJmYmDO0ktdU+oK7yXuEna27a4smjnlMRUm18l0fYylROCZTTshRVJOzIMh5aDBBsNiJKRWgHZ2mGbhXrLiXrjzxNkrjiGEKoA7/idcLJpDAs4cl2RdqoFoDgCAt+MM3pJcwVUdCoBvbb2IyG1CaGFP5v9tsCYbzTdvW6UD2K4IHMIYxSavkpDjF0Bt9CN0X/5m8CkPEfh9qhWVRG4MqsAqj65Coe9/Q+2QGvuLL/Aeuj3tPZm3Y3Tdg== 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=ZtYD3/ni1ltVtbFtOK+vL1049l/QObVx79ifKxbfpGM=; b=IMc3PM7azHub1yP+dfTTL+ARooqV2UkPUNWlYRjZhV5QTTRiB2yydf6LcNcWhJ70bQ/bZTjP78XzktUlQ6iz4DRXUkAKcJdJT3fE3ROLJxhGBfXGE3aJJYvDMtpgDldSfAZbTxQtTTm4l+3HeIptfxI8/YI62afXRT/Uc4ILDlE46O4nJWE7OboHa8I7NiIbju7S/wJYFbKPpXn0JcZTB1ygneGTVN/fQ4h/nK9yfK3suRQUa+R2k01gYvwz/vB0Osd++SAuhDVES4fbnle58IcEqCkSCyup0detYt0u66M3Yb1AM6N0rQFbhAGtnyZ6c5Atal7llb9skYHK7SRUEQ== 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 MN0PR11MB5964.namprd11.prod.outlook.com (2603:10b6:208:373::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.38; Thu, 12 Oct 2023 11:56:29 +0000 Received: from CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::96db:9814:2d71:a957]) by CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::96db:9814:2d71:a957%6]) with mapi id 15.20.6863.043; Thu, 12 Oct 2023 11:56:29 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 2/4] samba: use external cmocka instead of bundled cmocka Date: Thu, 12 Oct 2023 19:56:12 +0800 Message-Id: <20231012115614.3133797-2-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231012115614.3133797-1-yi.zhao@windriver.com> References: <20231012115614.3133797-1-yi.zhao@windriver.com> X-ClientProxiedBy: SG2PR02CA0002.apcprd02.prod.outlook.com (2603:1096:3:17::14) To CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PR11MB4867:EE_|MN0PR11MB5964:EE_ X-MS-Office365-Filtering-Correlation-Id: c3214ee4-6bd5-44aa-e56d-08dbcb1a44fc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cody39VvsbBp7k0X8AY2ObE2/MkUvFgt/AuypPjEtK9Zskqb3JgW+qe+LG7ZR2TCPmRrSnVmb41xLevC3LjxhQhvJIZEqnjY76V2ZK7RZCuEXdwoq8KMmW+GirAgUqyziSZfaX9wizPm7O3pL6uY/BZ4wgJV8Qro3vs+zxJLNeRTWcEwSEgT86pcNT1nxezZJh/K52Yn5G4YFNhiWipDqovxhOvaa8O+r09IRPhbMiWH2iaYuGBpznsC1rZnPDGYepAM+rhGT7fLrAvhrOEMMz6QXb4LhAUVa9+pLwnUc+ZvePLGs6/w5lfDhPFK2AEWR3uTUGVYwEzmxZ7nXgUrW+lWIwbiYDg90yj213F3TyoS3rdUuqanRQuwn+XxS5Qzau4lb4qCm6raCf/bVEdyGUxzrMHkmFtYLMqypjMWpAv1zCkViktnrDeQ6Op+6lGJbaTVOtoTk34iLzchjgDNi6uzSyAkvW0y1HZhNoLFaFzZuwfVERSF3oFVXTc0qgEVJc0A8jWbtUvkoE/XzLI1jAolCrbn5TYKbZn64+B6WeFnqofFk+/DW3OhrDBKBqEOYRJryj4yDoJWnRr5AuiuzG1GApz10spalLprtAHx62ioipvkuqXQwI/oWDwix9MG 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:(13230031)(39840400004)(366004)(136003)(376002)(396003)(346002)(230922051799003)(1800799009)(186009)(64100799003)(451199024)(1076003)(2616005)(83380400001)(26005)(6512007)(5660300002)(44832011)(66476007)(66556008)(316002)(38100700002)(6916009)(8936002)(8676002)(66946007)(2906002)(6666004)(41300700001)(38350700002)(478600001)(52116002)(6506007)(36756003)(86362001)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7UXjcNS+35UsLQwKOeNSu2T9uFkV85DQcBv2GzktZzJEy3Va5fLAcErtzQ2nA10fxbGYVcXXZEK99iel/Kt2Wr4OWJFriVP9qej2bPXgkROz9pbDS1t0kU9HGjr1tF+rEKoOsA5laR94cwO8xN+49oLznruQWhm18WU/3tw5BM9vvuFQ3ni2/Ak1vJAMAje+Li7XV8hSYcEqO8uwRC3P7QsGIQycKxXY2szRe5At2ViMnRvCknWQ8cfTo9uBjyesWXTTVILi2h+ByzT+aRye8sIZ54FIcWLRcrb5qiz6b3rPGFwR4QhGDz4PurzvJxYWI74TjNG+bsOPuwy6mvgepiGubL/JfZs9nKS1AdiR13yCC9J3LrMKsgEu9dFbA4xE29LdavQxnCtCJoZDqPBdzqq3dj2XMpJ1qZeCdo1aT9auC4ydkGZdPXB/WBrn99mcUsPS9d5JGKTJIDAbRYCkbiRbN57oAE+qb/ER3+Zy+6iPxx2eSLaV3NODMHYDvex9h6vJ/iUt4tgh9DrQ/03LEcJl2WGWRdrvj7GFiJjYow3geekXzJWoCzVI79QmsiSHPmX8evmtVr0khrB/3Li0ekgRzP+eCBdw2wH9wmXLylkkuJPe6dNuihfo5R7GZIe5gcFKfVcyl47bL8MV3oKlC2eWBLPaYLNNQsnzjKHukGeHiddG1lFONERKKxDVWPtAyTT9JySoLKRoi3fhUL/v8j2G4/svd6EutTSk4MUuCxaZwBiu2I5SSx+NnUTQ8JV2kO413fgmDaWmqr53skRO+JCxXS1l2LdEBOtI54AHs19BRd4fi/c8OLGv9gY+FgXstkSklw1JOR67EjmLtbx0jcp+4skgTU66NWtjBtmCPboSHzWreJwZ2liBjOsKfpYFd/VsQV17LOaSWpVLn0gvu4Tb4hm0oF4QH8wS1vYQSFaf+kBaqFffqPUfe4qYlLLidBmvLqIA2skDqgZ8KkdD5eFBLtBkRoptXeQyV68XmroDfPG1woYGfMGgJjefsKiK8KHvx2az6ySzZXozucnSXuBTyKaPdwM7D8da/M17tGusD8pO8z81Frw6+qy94d3RuiB3xowylCXeyGwGIdsE85KI3wYVp9lRTTnBD1zMexFjgbOMQmiQEJz9KRCd5DKW86T00gRvxNvnvaMapQDy0UdW7gPsr3VXI6zgN/927ZJY2EuB/RxzhX24JWF0QVJH4Fui1O6l61hexYOzMu1M/TsujXsSg7w4koXpuWJTRS6QJUmdcpPqLpH8SFgFFjXmTLOiAekkK3kfLdjARUyo0KPGRs8BqMMoAVlOOL1IjDM3U/Gb0++mJAZX96U0DFe2BmwHrqI9MFRhixn83DEgmJHEYyTaF/9oO3kiRzrLxGuWA1Go5Vjy+5OP3KyNeGd6HaqqwKEHRijZdAxdR+lZueQ4nllyG0Pu0xBNGnwX/jl6uwQ77oNx1c0LTmdgbzk3Pg6fkATLzxMuQsVK6cvMBvOg/HKY5xonrUj3ml0OihaNI3VRLRo501f6reIfvzkduAilSHZoOkVCmGL3BGdNZHbvMIyeLOPsz5oxPgUY0SVQscZDOwKhhjIrzWymm2G9 X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: c3214ee4-6bd5-44aa-e56d-08dbcb1a44fc X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4867.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2023 11:56:29.1824 (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: YIM0Ho7f4YWtsoVlea0pvW5NZS3yt/1HskQVFAIauQNDh8G0NBn3jQiMuZSQgI34RYmAytlnucMq40X/N83W1w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR11MB5964 X-Proofpoint-GUID: WyJG-q4a9oZqdxqANH82ePxhGYq878uO X-Proofpoint-ORIG-GUID: WyJG-q4a9oZqdxqANH82ePxhGYq878uO X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-12_05,2023-10-12_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 spamscore=0 malwarescore=0 lowpriorityscore=0 priorityscore=1501 phishscore=0 mlxlogscore=818 impostorscore=0 adultscore=0 suspectscore=0 clxscore=1015 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2309180000 definitions=main-2310120098 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 ; Thu, 12 Oct 2023 11:56:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105446 Do not use bundled cmocka to get rid of bundled library libcmocka-samba4.so. Signed-off-by: Yi Zhao --- .../samba/samba/cmocka-uintptr_t.patch | 51 ------------------- .../samba/samba_4.18.8.bb | 5 +- 2 files changed, 2 insertions(+), 54 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/samba/samba/cmocka-uintptr_t.patch diff --git a/meta-networking/recipes-connectivity/samba/samba/cmocka-uintptr_t.patch b/meta-networking/recipes-connectivity/samba/samba/cmocka-uintptr_t.patch deleted file mode 100644 index e6e878433..000000000 --- a/meta-networking/recipes-connectivity/samba/samba/cmocka-uintptr_t.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 14f8ee7cd1318567b00e52217d57f0a528fd2cf7 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Wed, 25 Jul 2018 09:55:25 +0800 -Subject: [PATCH] samba: cmocka.h: fix musl libc conflicting types error - -Fix build on qemumips64(el) - -taken from: -[PATCH] libldb: fix musl libc conflicting types error - -/third_party/cmocka/cmocka.h:126:28: error: conflicting types for 'uintptr_t' - typedef unsigned int uintptr_t; - ^~~~~~~~~ -use __DEFINED_uintptr_t in alltypes.h to check if uintptr already defined - -Upstream-Status: Pending - -Signed-off-by: Changqing Li -Signed-off-by: Andrea Adami ---- - third_party/cmocka/cmocka.h | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/third_party/cmocka/cmocka.h b/third_party/cmocka/cmocka.h -index e6861c8..238201d 100644 ---- a/third_party/cmocka/cmocka.h -+++ b/third_party/cmocka/cmocka.h -@@ -111,7 +111,7 @@ typedef uintmax_t LargestIntegralType; - ((LargestIntegralType)(value)) - - /* Smallest integral type capable of holding a pointer. */ --#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) -+#if !defined(__DEFINED_uintptr_t) - # if defined(_WIN32) - /* WIN32 is an ILP32 platform */ - typedef unsigned int uintptr_t; -@@ -135,9 +135,8 @@ typedef uintmax_t LargestIntegralType; - # endif /* __WORDSIZE */ - # endif /* _WIN32 */ - --# define _UINTPTR_T --# define _UINTPTR_T_DEFINED --#endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */ -+# define __DEFINED_uintptr_t -+#endif /* !defined(__DEFINED_uintptr_t) */ - - /* Perform an unsigned cast to uintptr_t. */ - #define cast_to_pointer_integral_type(value) \ --- -2.25.1 - diff --git a/meta-networking/recipes-connectivity/samba/samba_4.18.8.bb b/meta-networking/recipes-connectivity/samba/samba_4.18.8.bb index 1ded9fe5e..dc9bc1a7f 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.18.8.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.18.8.bb @@ -29,7 +29,6 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ SRC_URI:append:libc-musl = " \ file://samba-pam.patch \ file://samba-4.3.9-remove-getpwent_r.patch \ - file://cmocka-uintptr_t.patch \ " SRC_URI[sha256sum] = "4fb87bceaeb01d832a59046c197a044b7e8e8000581548b5d577a6cda03344d1" @@ -43,7 +42,7 @@ CVE_STATUS[CVE-2011-2411] = "not-applicable-platform: vulnerable only on HP NonS # remove default added RDEPENDS on perl RDEPENDS:${PN}:remove = "perl" -DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libaio libpam libtasn1 jansson libparse-yapp-perl-native gnutls" +DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libaio libpam libtasn1 libtasn1-native jansson libparse-yapp-perl-native gnutls cmocka" inherit features_check REQUIRED_DISTRO_FEATURES = "pam" @@ -105,7 +104,7 @@ SAMBA4_MODULES="${SAMBA4_IDMAP_MODULES},${SAMBA4_PDB_MODULES},${SAMBA4_AUTH_MODU # .so files so there will not be a conflict. This is not done consistantly, so be very careful # when adding to this list. # -SAMBA4_LIBS="heimdal,cmocka,NONE" +SAMBA4_LIBS="heimdal,NONE" EXTRA_OECONF += "--enable-fhs \ --with-piddir=/run \ From patchwork Thu Oct 12 11:56:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 32023 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 918A0CDB46E for ; Thu, 12 Oct 2023 11:56:41 +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.9203.1697111794554135209 for ; Thu, 12 Oct 2023 04:56:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=bc/UvUxp; 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=86490ded89=yi.zhao@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.22/8.17.1.22) with ESMTP id 39C9sH2e027166 for ; Thu, 12 Oct 2023 04:56:34 -0700 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=J0epU2kt4Xnu4lJt2XzP/B5rqFb3i/GJJLNlY90+gz8=; b= bc/UvUxpxiWwmIRgrs+WAeQTriIzVdm/adqnP2WNt4351nixuLaXYjk9mPcfAW2r ySJocKSX/sESStwkPdNMfXJUUKEWopsp8krt2JoDP/6Nx5qVMgf9bHVQjo3jOQvH SehY0oSMgVl+sAktOZ4ISb0Ubz/6YktAWy96aYK70IXHbcEEogmXiCatBHzOKwt2 7whpYwb2NuE8+DTs/v7fe2wx3mQigr7Kn3SYvTH5OdUViJ3HD0Sf0fQ+ZdpE3TTe uTh5wtqYn19hhMegwcy4FaENgNOpiskD4ZLvcuW/OphZ9uffyWZuz1av+SwQY6mK iqnB4n199UDnZkGjFTz5Qg== Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2101.outbound.protection.outlook.com [104.47.55.101]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3tnhq4scce-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 12 Oct 2023 04:56:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EKYmO2S0738VGV3h0cFyFvkeG6lUyk1xOsUm9VuLxYxR2YUc2hXvD11MCXYJ8xGjEpO0+nmxyqAJ9zeDffcW0+qWzq0iBY2deyxWwkYWuL3zGQASe46K+35jECgbSfPuFKfNZ4V72Qi/8bcogkgy7JxHXqJUkOpzmGtdNehY6fGOTJUhAL0yDwYJWIdciKlNfKdf+7XZ1GC0M0kIwKZNefkQ3R5Ms7epK9tBjKgKx48r5N7OQX8p2dy3sSdAOeBK1/Si1bnbQmvstl+BAEeyC75ngEOqAt4YGDv1wlNez1HwkSjdkwYpRite6Q5f8063b2ku4KhxgzTTq1kVdI+A6g== 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=J0epU2kt4Xnu4lJt2XzP/B5rqFb3i/GJJLNlY90+gz8=; b=hdcztavCOqlFJdhz0dhE53DLB4hzJxkIZfitkPY/3EesXVlLrJHFJ8xIKx8scoCiw6Eh9gqEFXPp9Cgw3BC/n1rK/DTAZCdboxpwwYkDDTna1vZMFHRjqlkI7B9b+7YJ5nUjOPS593JTUYAJlf1KcWVxgVz7gQG9AxSTPNNlC7y0YMtj6dIVUzKxgpgns7c3RD869yq/QH5SmfZwzwWPc9LtGHuKn2MYB2Dh8TDoDitx/pb7XQYKqDcIuy7/TNocHwyvvDIqyYcX5DI3l+3zXz6TEl65lz+4MioVBc6OqDEQOhe1DsTI/G3va+I3gX6AeX+Ud66mTdLzzz7fHYw1ww== 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 MN0PR11MB5964.namprd11.prod.outlook.com (2603:10b6:208:373::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.38; Thu, 12 Oct 2023 11:56:30 +0000 Received: from CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::96db:9814:2d71:a957]) by CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::96db:9814:2d71:a957%6]) with mapi id 15.20.6863.043; Thu, 12 Oct 2023 11:56:30 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 3/4] libtevent: fix ptest Date: Thu, 12 Oct 2023 19:56:13 +0800 Message-Id: <20231012115614.3133797-3-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231012115614.3133797-1-yi.zhao@windriver.com> References: <20231012115614.3133797-1-yi.zhao@windriver.com> X-ClientProxiedBy: SG2PR02CA0002.apcprd02.prod.outlook.com (2603:1096:3:17::14) To CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PR11MB4867:EE_|MN0PR11MB5964:EE_ X-MS-Office365-Filtering-Correlation-Id: 4bcb61fb-f002-4012-718c-08dbcb1a45b4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rEsEvy5Pe0oaSEFfiqoUA2kDZPtYmVggbPRwh5CzRLH425/tO7SiSifCPSOaFdTCnbtTwrdJdwR65VAm1CXLR1VJ2sjRscrvzftcPxVNHEjTVhUZiq+8Xsxv5+W1LFhyqvOLL+6m+6N+e+pqXHTh9yeJ4QZpCUxiWyj5WJI14/CtIW8nNYTEostmKCmZQTH/nJeXMXsoYqED7XiZ2sfwDi9D8nx0B/DR3QuEQtDp48GSJW4+XqV5+PPJt7j7SzNAPJmgNIYt/Drh8X0NNCaEDYNnogeOwqG9v3xKyCE+12rgXBaGoiVBnAbHPwHnC8fL0PN9zmjafpO+gAiV+mIC7X1CIqu5Jcn8gVUjiiacf6KzLbT9IEh5gO7nA9qYuhXRZsp0xeMUUUiGIKzirSEOLD6f+wFkSen8G4WajRa17q5T4VCGcM71F+hSXYt+u3QcenbpD7vBKa1dzYBMZKYIHe8LQL2VZXsCJNjB7udUYpovtUuP1lDmqnJDY0Qk4MWGkef+/Hl+fg3EBdB3qSkzZAcVXgrhX7pjbAzZHvNb22B0hX/MdalQDGWU9I4jEc5rgtlIoxivkT9krP+B2mF9X2Pa5DKRIi13lxQZ9PT6MWA= 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:(13230031)(39840400004)(366004)(136003)(376002)(396003)(346002)(230922051799003)(1800799009)(186009)(64100799003)(451199024)(1076003)(2616005)(83380400001)(26005)(6512007)(5660300002)(44832011)(66476007)(66556008)(316002)(38100700002)(6916009)(8936002)(8676002)(66946007)(2906002)(6666004)(41300700001)(38350700002)(478600001)(52116002)(6506007)(36756003)(86362001)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8dUU4TFiDANOUU0+1jJcHL2MZyi3A4pHUgNwmtNr5eIgv42E8hDlTsU5xa9FPUz3+3ijpDho+wMHcLoWEN9IrtNzMFrwf2lSdYL8ofxbl1xYSMjnuejhhFa5J6SPTqu5ovVZAIcOaYdbIZOW+WWOesb/rSiHGF6vC68N+eyM+4Z5eSuAyygVWFLyNV5/mz/PPunQkL5HLpYlUFl9yfYWAvGg3rnLD10nkNa42rGnJpzmqaQzjnExJ9kUByOMHPzMkanDsgS9Bi6b2XxU5lbkLQ9322fNzm/BVQIszAV1iyAHA2be7WPUwILEr7I8/uD021Hk6s4zbz7dR+aqET1ZxpE32sgItv+YVZot6lt3WpTorsNYfEdWbMqdr4j4P7V0wzOk2bqyzXKhSgJHoAkVe8nwMfrcSf579rVzQu2Ka+mz16EbmhazWhPis0k4ydDuYXnvahw/V/siy5k+65o2N0TyRY2osokoklGQf1d6YjRolOEHtzsaKmsbpBy3M+TKR40zjV/fE3Ou9xyEHyl8cyK8o5jXAjg8fRs8XG+CQRLaDdtUl4edc75I2Twm1y18/M3KdSsqRPpUZH3QbM/brtzfnDiQQiYC/0wuHo2rgppxbfBuZ2owq4RuuOiTKU96Wuxg5/nAB7UPBl8tRR8ASWFPXs7E7QUkEyNqdXtWRhvzgWaGGDfQAhmQ14D5PWOq4Ev4mszCO/ySI1Nqb7sJkGQXi+UOrUJvf41mIUAi86BEur16A53R56NWdodAakpfFW5mWYfzdtK2u+/3OmuOfIkdeoegQKOjHvnbkasik5ONJflZ2CaxisI8qmbxkyv1upW+fxu4fsjuUxYvXxCcQoPE17GMpd6rk1iDMxAAAO6xXuYoKHfheAytlzoRqVuRS34sq8B5sXrf8pxFNLYXc/4+2/faVtNrB/QstujUuafh6ay08xBEv6/4BxwTJef/zKqmgdfyzX/q34NTQeto8R+qfg77PJ0IETZXycJLLnM/zR1auuhAD3M7nTetr8QG5ByhUmbkvOSw5J+0R9zKCC/vdR5cwsJPqLGP0Zzl5rwtPdjrqBFyyyx5bwveh3I8jt08odfcnWmpuKFh1uPW4XkYCUN3zD30sSKLaMuYkbj96ch6Q2YOVeyakrAE1w+HVVnCXiNQxBmKdJ/wQfUSR3Sc2RL10mRpVF9gxQd70Jp1Yrl0oEPRqbsM8A3Ca/bELYDGncXM8WkiDA95/PaS6x6Q9HhMSl+6r3uRWz5+krG/e4lqa99BSp5WlEu2u/cNXAFNp66VmEDh3iMugszjpj6ICu+BbhMXfvquhd5/Dbe+sftRN8QJc+1EsFo5F2J6uc8bv8bW/CLlShklYhs57w2BLnMJG21/YMNLh5LpaUezyR+vsl3J8+7AiRKSPteEsE7Noll2A10JRp09k3QhM5IEjQCVmZj+nycRZufqlWWlepFIF3GhFRQIOKekICnT9qSmoHTgQNhskGRMx5A3dcaLRnjTTzLy8DLZAMdIf92/TWvDJbkzh74aKi5EJer3NnAJEhjw+inr38SAGCK/nkT++Xc8/6U+e7XBFEjwH/LAzqgtZMkrbX3+UgNyN+fy X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4bcb61fb-f002-4012-718c-08dbcb1a45b4 X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4867.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2023 11:56:30.3570 (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: cxnz/RYIas7QRLU7mZ9eCk02wV5z1wnL3hcMkyeGzjT/O1+cFUeNkj5TzeuGLnh1Vuub5BLqtv7JjsxzSCJ8mw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR11MB5964 X-Proofpoint-GUID: BRgciVGroxW4AX0au7VzSYHW_KsFm2ot X-Proofpoint-ORIG-GUID: BRgciVGroxW4AX0au7VzSYHW_KsFm2ot X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-12_05,2023-10-12_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 spamscore=0 malwarescore=0 lowpriorityscore=0 priorityscore=1501 phishscore=0 mlxlogscore=980 impostorscore=0 adultscore=0 suspectscore=0 clxscore=1015 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2309180000 definitions=main-2310120098 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 ; Thu, 12 Oct 2023 11:56:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105447 * use external cmocka instead of bundled cmocka * add run-ptest script Ptest results: $ ./run-ptest PASS: replace_testsuite PASS: test_tevent_tag PASS: test_tevent_trace Signed-off-by: Yi Zhao --- ...ix-musl-libc-conflicting-types-error.patch | 45 ------------------- .../libtevent/libtevent/run-ptest | 17 +++++++ .../libtevent/libtevent_0.14.1.bb | 20 +++------ 3 files changed, 24 insertions(+), 58 deletions(-) delete mode 100644 meta-networking/recipes-support/libtevent/libtevent/cmocka-fix-musl-libc-conflicting-types-error.patch create mode 100644 meta-networking/recipes-support/libtevent/libtevent/run-ptest diff --git a/meta-networking/recipes-support/libtevent/libtevent/cmocka-fix-musl-libc-conflicting-types-error.patch b/meta-networking/recipes-support/libtevent/libtevent/cmocka-fix-musl-libc-conflicting-types-error.patch deleted file mode 100644 index 5795ff3bd..000000000 --- a/meta-networking/recipes-support/libtevent/libtevent/cmocka-fix-musl-libc-conflicting-types-error.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 1d4dedab5039bb671f44566d8573ee3532ba7176 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Wed, 25 Jul 2018 09:55:25 +0800 -Subject: [PATCH] cmocka: fix musl libc conflicting types error - -/third_party/cmocka/cmocka.h:126:28: error: conflicting types for 'uintptr_t' - typedef unsigned int uintptr_t; - ^~~~~~~~~ -use __DEFINED_uintptr_t in alltypes.h to check if uintptr already defined - -Upstream-Status: Pending - -Signed-off-by: Changqing Li ---- - third_party/cmocka/cmocka.h | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/third_party/cmocka/cmocka.h b/third_party/cmocka/cmocka.h -index e6861c8..238201d 100644 ---- a/third_party/cmocka/cmocka.h -+++ b/third_party/cmocka/cmocka.h -@@ -111,7 +111,7 @@ typedef uintmax_t LargestIntegralType; - ((LargestIntegralType)(value)) - - /* Smallest integral type capable of holding a pointer. */ --#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) -+#if !defined(__DEFINED_uintptr_t) - # if defined(_WIN32) - /* WIN32 is an ILP32 platform */ - typedef unsigned int uintptr_t; -@@ -135,9 +135,8 @@ typedef uintmax_t LargestIntegralType; - # endif /* __WORDSIZE */ - # endif /* _WIN32 */ - --# define _UINTPTR_T --# define _UINTPTR_T_DEFINED --#endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */ -+# define __DEFINED_uintptr_t -+#endif /* !defined(__DEFINED_uintptr_t) */ - - /* Perform an unsigned cast to uintptr_t. */ - #define cast_to_pointer_integral_type(value) \ --- -2.25.1 - diff --git a/meta-networking/recipes-support/libtevent/libtevent/run-ptest b/meta-networking/recipes-support/libtevent/libtevent/run-ptest new file mode 100644 index 000000000..19f7a4a3a --- /dev/null +++ b/meta-networking/recipes-support/libtevent/libtevent/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +ptestdir=$(dirname "$(readlink -f "$0")") +cd "$ptestdir"/tests || exit + +tests="replace_testsuite test_tevent_tag test_tevent_trace" + +for f in $tests +do + if test -x ./"$f"; then + if ./"$f" > ./"$f".out 2> ./"$f".err; then + echo "PASS: $f" + else + echo "FAIL: $f" + fi + fi +done diff --git a/meta-networking/recipes-support/libtevent/libtevent_0.14.1.bb b/meta-networking/recipes-support/libtevent/libtevent_0.14.1.bb index b34c186ca..9a2b5ede2 100644 --- a/meta-networking/recipes-support/libtevent/libtevent_0.14.1.bb +++ b/meta-networking/recipes-support/libtevent/libtevent_0.14.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://tevent.samba.org" SECTION = "libs" LICENSE = "LGPL-3.0-or-later" -DEPENDS += "libtalloc libtirpc" +DEPENDS += "libtalloc libtirpc cmocka" RDEPENDS:python3-tevent = "python3" export PYTHONHASHSEED="1" @@ -11,10 +11,9 @@ export PYTHONHASHSEED="1" SRC_URI = "https://samba.org/ftp/tevent/tevent-${PV}.tar.gz \ file://0001-Add-configure-options-for-packages.patch \ file://0002-Fix-pyext_PATTERN-for-cross-compilation.patch \ + file://run-ptest \ " -SRC_URI:append:libc-musl = " file://cmocka-fix-musl-libc-conflicting-types-error.patch" - LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=47386b7c539bf2706b7ce52dc9341681" SRC_URI[sha256sum] = "ef85fcaa80ffd2351036ba4b347630fef2a1ac3da964a7f1820466bad03cd00d" @@ -42,27 +41,22 @@ export WAF_NO_PREFORK="yes" EXTRA_OECONF += "--disable-rpath \ --disable-rpath-install \ - --bundled-libraries=cmocka \ + --bundled-libraries=NONE \ --builtin-libraries=replace \ --with-libiconv=${STAGING_DIR_HOST}${prefix}\ --without-gettext \ " -do_install:append() { - install -Dm 0755 ${B}/bin/test_tevent_trace ${D}${bindir}/test_tevent_trace - install -Dm 0755 ${B}/bin/test_tevent_tag ${D}${bindir}/test_tevent_tag - install -Dm 0755 ${B}/bin/replace_testsuite ${D}${bindir}/replace_testsuite +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/bin/test_tevent_* ${D}${PTEST_PATH}/tests/ + install -m 0755 ${B}/bin/replace_testsuite ${D}${PTEST_PATH}/tests/ } PACKAGES += "python3-tevent" RPROVIDES:${PN}-dbg += "python3-tevent-dbg" -FILES:${PN} += "${libdir}/tevent/*" -FILES:${PN}-ptest += "${bindir}/replace_testsuite \ - ${bindir}/test_tevent_tag \ - ${bindir}/test_tevent_trace \ - ${libdir}/libcmocka-tevent.so" FILES:python3-tevent = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" INSANE_SKIP:${MLPREFIX}python3-tevent = "dev-so" From patchwork Thu Oct 12 11:56:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 32024 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 A23DCCDB47E for ; Thu, 12 Oct 2023 11:56:41 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web11.9282.1697111798607293854 for ; Thu, 12 Oct 2023 04:56:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=aFbDi5KY; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=86490ded89=yi.zhao@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.22/8.17.1.22) with ESMTP id 39CAUnfs011211 for ; Thu, 12 Oct 2023 11:56:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from:to:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= PPS06212021; bh=qttNHbSECqw5cGbB3YXB4XgTocFiTOWZg6vNtOwWZ5o=; b= aFbDi5KY2jCVc4jccDPGt3whjuSn7zSWVI+s6OEnhMOktl4D5qKevZ2osVrRTUo5 vNFu6yFY2feuC74stkzdx6Fm6JEzCH3zT4vQ66A8HyjlcJGptD9ZJc5RTK0iO46S 4klkP8tEO83kn3QF8Yr+vJZMu42rdHQMLJN3+hF8D7ziUhSr/mVZZU3XB6iDhRyX ZLpKE4l0/swdqc4+9f6s5K3WFUSYWKUTNjzih0A5GM5gZqqOuq+DhlJ5bVSu4R9y btwo1UANbOCezJrnHOtbSsdZujqoLmB1mX4RnhLfkShAQoLj9P6t2GeDx0hd8tDH qFde7cn4aaWgfVM90gHgzw== Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2169.outbound.protection.outlook.com [104.47.55.169]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3tnhuehcf7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 12 Oct 2023 11:56:37 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KBs13shOXdEqO/DVJUMVtO0wUleUgzcmyJIJP1pnSlg2BRJVxk6Qg0yiVkXaAU7XqgHaePCE9TQErk6dz9baV8AYrqSZNTLqGKLrO0P9m4Fx1s+WBo0CMvIfoxFFlgxokX2z9lOEmAFIfHH0ZnCvEwzJmIjhEXSeeEtDrRu3iaiGBNPpxApzg6ZOw/TAsS+0SHQxr/SbUl0b7STO4Cb/EP2XeR5qyfAqMnY0Ip13QMI9ZLQui8kugTtCrTEnxFA1rIbwcmM9UPpswralx/MkZsh6q7oa/Ik9ZF0kRhB6AJAk5VaLsjO+fThKinS5NwmPf+VRYbtunR+r2BJH7hdZug== 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=qttNHbSECqw5cGbB3YXB4XgTocFiTOWZg6vNtOwWZ5o=; b=QK0b6yyzx4FbfkG+hlpJkeGIl56jgcYp4XlFzeE+gHO/Tw3Nm4dkK+XY7G5CmlqmJsfkAHYw7c+o0UaBX+l63NaJ8SSkPfYm0BEJa8dwpKMMBZXKlWGlxaYwUgJdRu6HLNAROGJgFxTwylczjBoFSie9yexFqZIBKjORu8qbvdF4Ek0AqXO9ogroSLJXmfQZS9wSg0/zCcRqJhToNeKz0oGs+8EhUEJl68UgkNW0lh1xP8l+sjkwcbzQDYe70XFoQt5SfqB04jAmlzoq5o4AMvEAYJmiiFHRhQRXhW2YeZay+eYKuqDyqyjOi7EWO+LJUIj6oQuqMKkKkFK0mDW5rA== 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 MN6PR11MB8218.namprd11.prod.outlook.com (2603:10b6:208:47c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.44; Thu, 12 Oct 2023 11:56:34 +0000 Received: from CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::96db:9814:2d71:a957]) by CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::96db:9814:2d71:a957%6]) with mapi id 15.20.6863.043; Thu, 12 Oct 2023 11:56:32 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 4/4] libldb: add ptest Date: Thu, 12 Oct 2023 19:56:14 +0800 Message-Id: <20231012115614.3133797-4-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231012115614.3133797-1-yi.zhao@windriver.com> References: <20231012115614.3133797-1-yi.zhao@windriver.com> X-ClientProxiedBy: SG2PR02CA0002.apcprd02.prod.outlook.com (2603:1096:3:17::14) To CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PR11MB4867:EE_|MN6PR11MB8218:EE_ X-MS-Office365-Filtering-Correlation-Id: b23c6db6-81f5-4da5-d6ea-08dbcb1a4664 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /cBPVxaTzsDIueSAAp0Y2DaGcfuZeLCy81iBS/tlIS8dhX86rtsWWN9uz00Me7NHkwJffpN131PLZvto75kdYpn0KWFtctrFS7v1rXZWA/qrTFgFjn8ggzXCZ2c5Cigm51SkwodOo5/U2Az8jCw/bdJtuqjVoVsxL8M5VGJFv46B5qLJoP6CM44VNnFgpY+Fher4yWpy/kRSb+tHoasyqKxO0mpR9+DI1/Eu/s7ftJur239KtlZpaUxPRDkNe9Fe+fNIof2Ynzd4L94A0Nw9e1W01rrX/mKBVnx+y8QYJC6TQXw7dLKNSDo+n225/NTm+Yt8rlPsgx5H4nEsU11eHYGxe+rbnUetUAOnJblzPYlyKPg98RX0MmDXL7GciHPfrE/gk+J3bffwtU4dh/d1qPfNrLGLiM8GcGbSZkQQ1qUIRF5pisIInb/gtgXyyw2TDiUKSZYY4y4G89OyjSqZLVcxGAM+hvxonNLBXSNdKLeM2dCZbnqHoxOlKJsBMjdO0qXa4Y9evHRuy/A8h1W+hSB0NCEjfF5SzpfHL/rZdSagN5Mb/tK3Fs3AYU8iFpfsniWyxMQtz4jUjg1aZeJwsbmRJsvFA9szegflQTJ2USI= 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:(13230031)(376002)(136003)(396003)(366004)(39850400004)(346002)(230922051799003)(1800799009)(451199024)(64100799003)(186009)(26005)(66946007)(66556008)(66476007)(83380400001)(316002)(6916009)(2616005)(1076003)(44832011)(5660300002)(478600001)(86362001)(6506007)(52116002)(6666004)(6486002)(8936002)(8676002)(2906002)(38350700002)(38100700002)(6512007)(41300700001)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: H4GdB1OXReRW8lWjqEGT1wZC6RnXsbHqV2SyUaY9EEPzvSZpG+LeJP3eKCFdjEv//XNPO7Z7yCsFKbE0msG38YTBMlXHIiQMdMSLPfwuuI7VwDRIzplMupUAiYW6Bic7/QSDfOpvOxoVv2uGYwxSOCbqZPEJPVf8ypK/Prkxao7v60edR4MK391VhqOQ0fTS59+OQxE+F0iuTeAImwSdpQmDdvKyw1B9Jh3H6T9fMjASZsbHeSdS/JTZs9LbN+NzusKFk8+fRflBqjn7BoaQfnrmjY9HSbrdgQuChHhjHIAxzU3emjAOVdh8V1Yhju6UUPIw3wEnYc5jx7SoVD8lDHLeB9w++YFk1QvgYIKWkGbcKMet6iJNUoVRY7lcA243dz4H+QAyaQE1LV1LHrBQiL1Lro5SBTnL8mY0C8PjrOb9FlmqzyZ/sl1+XzBQHoSdqEfr508CzWvGXSk0N5ifzdtQuHNwkZ9T7R5EF1SKKUJosOzgK5dfb/5n+PoVmwIT+f3sUxBNdDnqWAn8PHNNnK6pzNjoWKSrRAbQDAi2903VHutwJiG5TuwZi8/07QWDK0mxUqm04qnUizTpJKe+nrtUsKJcjvMeyubUgdEg2R8ifie9jz08UdhiWavxe5azOvPvCO/OFgTiGBv4kNA80kWDVoAXgxmPTcuV+VyIsny9HMxDhy5hEL+Opffn9tKI5LK9oWex1OOEZCIU0HuZZ0ZxQ7cR2AyfR42WD0cjKMhSbaHiFTNLU2uQWv9w8i94gMsaKNhSe+JyO9E7LU98jA8TpIMF+MbI4titGfcy7TJBFMYq1XXDnfB548EinKHghkSnH9IOy2Hbobg6z/imMIHwrh9wL6pxcGy0FXq01T66l7jDJRCCDeWHEQCzlOKRPB30Ev92Wfh5CHCcpwDBRB8fP6Y/ve6Jr9QJwviDjdDmbOhx5NQ3I5QwL1MudHXGN1Mr6WvlLb31kBarmQwwSP3X7PLUGTutvf+ZNRlAXTCNBrfEWK68IA7oqRMq4zinEjgbEAWJcHUsvDXaGumyQRHfifpp3nncKlT/FYy2syYvW3sy2VnpxAE2OQhnm6x/rbDjqLeeYl/I3npyFyC+1d+OASH8vwTmEJXDRWbSFq4m3/KCKsHPDaOdrA+eEVfE1gzE+v4Rg88mmdDfhTa9DfHmG//rn+6yRDYhWEYxX6aAG5pR6QkEkxiX1Hykzv1/vMFaHuDYoIGIAsGcTpQi4HQNQE6f1HrdLbLivUCuag4Xjbj26ERXQ5N8j6cEdcc/CrZmQ1ySrPB/WXfWpZ5L3/7adu0V4mpn9dt+liGdXk668/J7QyBlq9AiW/bbV+Z8UQxAYf/3S4B2ZG9qwgSgBJqmKZTBBa1wZPVfXUgzHQUZDBCqnxgyLzoXqZ9c4YbLFS2vle2B+3JivMy9tj3xcbWvp43A+6V5woyLM3HbdA2gRW33scIHS60GYFIZcPsX6UiLlxbkbFByQlLZP99qrWKttKxzq+BIEk9Nin2P6UQD1WvxlSXyVEUaYgx8Z0V1gh1/bzpCYqW1ittkYOCdRsD9acIaPGJ+sfrxxWBqfg3GrclHQ1/sRFEhR9BymiMp X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: b23c6db6-81f5-4da5-d6ea-08dbcb1a4664 X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4867.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2023 11:56:31.5037 (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: tWGA6MuZyIj2sNWFBcG5r5xTdAsiOWgXHKEaHHedBH2EEKZ1Bk7D7hwzJprluGuXoq7DEMjuGClwAHTpES8nRA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN6PR11MB8218 X-Proofpoint-GUID: UzfNByXckFWEi81M1o5DmPcO0XievK0G X-Proofpoint-ORIG-GUID: UzfNByXckFWEi81M1o5DmPcO0XievK0G X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-12_05,2023-10-12_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 impostorscore=0 adultscore=0 spamscore=0 mlxlogscore=999 mlxscore=0 bulkscore=0 phishscore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2309180000 definitions=main-2310120098 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 ; Thu, 12 Oct 2023 11:56:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105448 * use external cmocka instead of bundled cmocka * add run-ptest script Ptest results: $ ptest-runner libldb START: ptest-runner 2023-10-12T11:49 BEGIN: /usr/lib/libldb/ptest PASS: test_ldb_dn PASS: test_ldb_qsort DURATION: 0 END: /usr/lib/libldb/ptest 2023-10-12T11:49 STOP: ptest-runner TOTAL: 1 FAIL: 0 Signed-off-by: Yi Zhao --- ...ix-musl-libc-conflicting-types-error.patch | 45 ------------------- .../recipes-support/libldb/libldb/run-ptest | 17 +++++++ .../recipes-support/libldb/libldb_2.7.2.bb | 14 +++--- 3 files changed, 26 insertions(+), 50 deletions(-) delete mode 100644 meta-networking/recipes-support/libldb/libldb/cmocka-fix-musl-libc-conflicting-types-error.patch create mode 100644 meta-networking/recipes-support/libldb/libldb/run-ptest diff --git a/meta-networking/recipes-support/libldb/libldb/cmocka-fix-musl-libc-conflicting-types-error.patch b/meta-networking/recipes-support/libldb/libldb/cmocka-fix-musl-libc-conflicting-types-error.patch deleted file mode 100644 index 8e756d8d3..000000000 --- a/meta-networking/recipes-support/libldb/libldb/cmocka-fix-musl-libc-conflicting-types-error.patch +++ /dev/null @@ -1,45 +0,0 @@ -From a37eb0a46669592e32ed4e004abb2698ee4f90c5 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Wed, 25 Jul 2018 09:55:25 +0800 -Subject: [PATCH] cmocka: fix musl libc conflicting types error - -/third_party/cmocka/cmocka.h:126:28: error: conflicting types for 'uintptr_t' - typedef unsigned int uintptr_t; - ^~~~~~~~~ -use __DEFINED_uintptr_t in alltypes.h to check if uintptr already defined - -Upstream-Status: Pending - -Signed-off-by: Changqing Li ---- - third_party/cmocka/cmocka.h | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/third_party/cmocka/cmocka.h b/third_party/cmocka/cmocka.h -index e6861c8..238201d 100644 ---- a/third_party/cmocka/cmocka.h -+++ b/third_party/cmocka/cmocka.h -@@ -111,7 +111,7 @@ typedef uintmax_t LargestIntegralType; - ((LargestIntegralType)(value)) - - /* Smallest integral type capable of holding a pointer. */ --#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) -+#if !defined(__DEFINED_uintptr_t) - # if defined(_WIN32) - /* WIN32 is an ILP32 platform */ - typedef unsigned int uintptr_t; -@@ -135,9 +135,8 @@ typedef uintmax_t LargestIntegralType; - # endif /* __WORDSIZE */ - # endif /* _WIN32 */ - --# define _UINTPTR_T --# define _UINTPTR_T_DEFINED --#endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */ -+# define __DEFINED_uintptr_t -+#endif /* !defined(__DEFINED_uintptr_t) */ - - /* Perform an unsigned cast to uintptr_t. */ - #define cast_to_pointer_integral_type(value) \ --- -2.25.1 - diff --git a/meta-networking/recipes-support/libldb/libldb/run-ptest b/meta-networking/recipes-support/libldb/libldb/run-ptest new file mode 100644 index 000000000..f0de0578c --- /dev/null +++ b/meta-networking/recipes-support/libldb/libldb/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +ptestdir=$(dirname "$(readlink -f "$0")") +cd "$ptestdir"/tests || exit + +tests="test_ldb_dn test_ldb_qsort" + +for f in $tests +do + if test -x ./"$f"; then + if ./"$f" > ./"$f".out 2> ./"$f".err; then + echo "PASS: $f" + else + echo "FAIL: $f" + fi + fi +done diff --git a/meta-networking/recipes-support/libldb/libldb_2.7.2.bb b/meta-networking/recipes-support/libldb/libldb_2.7.2.bb index daf0f73b8..c4b7602bf 100644 --- a/meta-networking/recipes-support/libldb/libldb_2.7.2.bb +++ b/meta-networking/recipes-support/libldb/libldb_2.7.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://ldb.samba.org" SECTION = "libs" LICENSE = "LGPL-3.0-or-later & LGPL-2.1-or-later & GPL-3.0-or-later" -DEPENDS += "libtdb libtalloc libtevent popt" +DEPENDS += "libtdb libtalloc libtevent popt cmocka" RDEPENDS:pyldb += "python3" export PYTHONHASHSEED="1" @@ -12,10 +12,9 @@ SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ file://0001-do-not-import-target-module-while-cross-compile.patch \ file://0002-ldb-Add-configure-options-for-packages.patch \ file://0003-Fix-pyext_PATTERN-for-cross-compilation.patch \ + file://run-ptest \ " -SRC_URI:append:libc-musl = " file://cmocka-fix-musl-libc-conflicting-types-error.patch" - PACKAGECONFIG ??= "\ ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ @@ -37,7 +36,7 @@ LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9ada SRC_URI[sha256sum] = "26ee72d647854e662d99643eb2b2d341655abf31f4990838d6650fb5cf9209c8" -inherit pkgconfig waf-samba +inherit pkgconfig waf-samba ptest S = "${WORKDIR}/ldb-${PV}" @@ -47,7 +46,7 @@ export WAF_NO_PREFORK="yes" EXTRA_OECONF += "--disable-rpath \ --disable-rpath-install \ - --bundled-libraries=cmocka \ + --bundled-libraries=NONE \ --builtin-libraries=replace \ --with-modulesdir=${libdir}/ldb/modules \ --with-privatelibdir=${libdir}/ldb \ @@ -81,3 +80,8 @@ do_configure:prepend() { # For a clean rebuild rm -fr bin/ } + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/bin/test_ldb_* ${D}${PTEST_PATH}/tests/ +}