From patchwork Tue May 27 04:09:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Chen, Qi" X-Patchwork-Id: 63684 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 5BFB0C54F30 for ; Tue, 27 May 2025 04:09:36 +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.43831.1748318971722554129 for ; Mon, 26 May 2025 21:09:31 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); 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=7242e5e264=qi.chen@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54R49J0V004187 for ; Tue, 27 May 2025 04:09:30 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12on2048.outbound.protection.outlook.com [40.107.243.48]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 46u3b129tv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 27 May 2025 04:09:30 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Yv7zwUJ3ipinPpj8jq0bI6rb6lKV62RgcgRJP8Z4lSa0xpDiUjR+EL4xWLMf+uUEu8sCu1hOPEOw7Wxw6W10x9EWp8olJxcjvc9OlGswGvZt3accOA5Ux+b+NEKJW/gXLSPH5O4wyq6mSxCujIWAPwV6VTwmz7UvVpSNevuZlt6RSQ5Plg5XZBX+i4S7fIblhL+uGwiJKe/KutIfQFdVXARepvlQWNd1qYPMMsnSYp6VI7WHN5c3iXWZhYW9IUCo/nkeZpQQ9S0nP5tXffiOCAP9JQHUd5KcNyQfF2MGjv0rOS0Xa6uDBXexCstpmn6/2Yl9KeTqTS47WwPwr9qB2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=HEsnNB9opmmj5z609gzMdsBcHDsIcP/MNEu8+5m7U2M=; b=ZodZkRgFpA1k8NnFpnxPCb/nYBLsGi5/WBqx7orz3JTe/KpOYR1+zCm8sxTqYoYBfXUT9zndSrg/xNoMRYODogZXXCts15pONgfHfnJPXIYZrmo9O+bqRTeAiKxWDVzwxCKR0xyzz1aVZUSC3QJIuZV+aZXEKbx/Kp3d5Hh6t4N/PWYr9YIQ5j+1tstyyukLH0dQbPTQPuhy6oF50dPc5oW8Pm+NbgRZRBmsVO+xolWLHI5f88vs+vs6Gq5717wDu7hrhZLGuTLSnjS8C2FAayArt04HjATDlN6QZQAIOgF8QggPlR4P0BPjkx0csFGkwi8Py1ca29tHhiLKARQZSw== 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 CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) by DM4PR11MB8092.namprd11.prod.outlook.com (2603:10b6:8:184::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.24; Tue, 27 May 2025 04:09:28 +0000 Received: from CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093]) by CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093%4]) with mapi id 15.20.8769.025; Tue, 27 May 2025 04:09:28 +0000 From: Qi.Chen@windriver.com To: openembedded-core@lists.openembedded.org Subject: [OE-core][PATCH] coreutils: upgrade from 9.6 to 9.7 Date: Tue, 27 May 2025 12:09:12 +0800 Message-Id: <20250527040912.3704461-1-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.34.1 X-ClientProxiedBy: TYCP286CA0131.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b6::13) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|DM4PR11MB8092:EE_ X-MS-Office365-Filtering-Correlation-Id: 4139464a-6ec5-47e2-18dd-08dd9cd445fd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?/TerHgppZkQL26CULOd3ey+nPH17hyr?= =?utf-8?q?lKDS9a3LIEQ4c6IG4niOUzTPDxnXIkm2/idNlWvQMvV2q5Ium8xoZpaa4Vnr+UUN/?= =?utf-8?q?O7SfjqvejjK7wv2flIM92tMLxtUtiKr4RSVbh7wSLcf/ziInZAFQ4bOMW68APqoGd?= =?utf-8?q?2qkzzBA8raQsMDrMFu8gcRCmzlYMnOsZY/Nf9TlTp2CGgQhh1I7FX/ycQej7zK6xu?= =?utf-8?q?hPmac+xH6QeZP7D8DlKGHK0obfLvflzDaIUEr/9Y7JSQYE52gO5S2W+rQlVQ1DDAl?= =?utf-8?q?wsgQNaPXYMPyZya0H85I7b54ijtRNx2jAlLdA+rR6UfXpWnGeq4R9WicALb8n/J3y?= =?utf-8?q?3DoKjS3uKlURwEt2cuwOFoLbRnsyDXncYGMr+Ib11fF9i0jH8o4sNY+mydX3086dW?= =?utf-8?q?P5uMOU3tsKwjLnWidKeBVWLUT0EigHeLZd24TiQmUIAroyHQzwyyHz84KW3NfFCbg?= =?utf-8?q?ehYu4LAtMPDbt1Hd5S7YqUF3gze+CFQH5r4F0/xMtUCTGSQH/GDzwaHEXYscgaubq?= =?utf-8?q?noi+WCKwWppwO0fSiud/hWujM8QAEyr3K1fZJCSVnZcSIP43IEbZrSpFI4pIDuk0q?= =?utf-8?q?9kf/pkWNtGG2Z0Q1FxpPgDr1+rolroAdQyR3gq7ibTLXwoYY1JGwunT54a4xSv1N6?= =?utf-8?q?zw/zO8ZEJIclcbIIzGjPX6Jbzuf84i/Si5urQ+olFTmQj39rwifKYSSy2L9BeuNGk?= =?utf-8?q?RyoQbplteAm//M2Mrxi76zxd3JZwPdgSbzVhKbzkq25ynbBC0nayQ4uuPydUdRUfT?= =?utf-8?q?DBTKwi2o16rITmAGWOzmIHpYFQWSJQonq5KAFwvLXESoR87r8ARy6rz89PJ3dE/AB?= =?utf-8?q?3noSF7hqJEXq51xnA0n6YLNbfbTquMxCHw4O+0Y1dg2pSydVBwCkVI+ZZunjJvcwH?= =?utf-8?q?W8zcxy3cVhADP2gexzfl5M9UubmdasdBRvrS74A9gTboJRJysZKeHk48NrvOin2nf?= =?utf-8?q?TEmenJTyTs0YJMvL7+t8AqLGy5JZIbNH3EojQNVq5CWhGj28hFqdKu5ck7h/E1UMq?= =?utf-8?q?VUplYq1M4y7j40E1uueX4DRowaI2YNGqIC1zU43r+Rqv8tIPJ9EuuL8dvVamyNQ8/?= =?utf-8?q?3QhoPPhpXXXCmXB9Xk/Y4ahmhtL5SeSIxLy85RzQ0xVkwDg1I/gth6YRnlXcxGuFP?= =?utf-8?q?QlzJAZ76h8vUwa2jiA721uZ9c/498pOYeekdWDcznqtLZNJOJe48oU5YGqvzg2YOg?= =?utf-8?q?6LC6Ki3LikdIzVeA3giK+Np+ifOaAtKpC2LJkSyEAlrxgMbIjr4/hVQxTd1S9d07W?= =?utf-8?q?0C3HpBqZk07k7eYQQA+riapuszAOYACr/k/5FqfJjKU0QJh5ZyAksLHFHPzYF9rmE?= =?utf-8?q?GUB77Vzz9EMAWOEmdFhzlGxAg+bRw8ZJ1U4JAjmWTuQHizQ+kPpMqFTPRfl6ryh9x?= =?utf-8?q?cneMkDB8cBi?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO6PR11MB5602.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?rMKfIJGlNQwT8py+oK2/346nSbON?= =?utf-8?q?pgMizncqGpmRH/x7MyF4KcBsXDy9q66ik8gxywmDqo27OA/P7jwrkilF/ot9oP8wG?= =?utf-8?q?TzMVjwqWFtz3gGzWSR3CibF5mnQiKle2vye2B5EXy2i75iGY5FqAkGNTLO4Qlk2NR?= =?utf-8?q?EgKlEI/t//YURR/Ns++1HXok77X0iFnWMFy7TY5C1DEpP93q1TK9NnM7p5gHmd/0z?= =?utf-8?q?YX+++Wh9BISkVI9XufWvicrW+K5+jkp/unoB/ozoc11c5IKCCiyJ6ZsK82BgIkPXw?= =?utf-8?q?gHw142sX4/79cErpV6KSGTvFM0Pum947RZG9LCSsTP72qojEyZjMtIIVDOhVFfY+p?= =?utf-8?q?0EHhxon0jf7T2A6CtsPfukwgGO1KqH35z7bYo1CQ5bRJ/vKc6mXD6TbjF1+J9OFNc?= =?utf-8?q?lvf+NJx/Hvmrqnnyrqqi/n84ErQ+gNs2/swONln5qN2L+rMBbw1F9fNNVGuYC6vK5?= =?utf-8?q?4WZqbp3WZEw5IWKaROHOH8FrORMYU1MA2FP3zxjxlqXLdCiPyug2pBh1OKvHG+RfN?= =?utf-8?q?yRLP/N08Ezp8ZTYggTYXzg+YGscUTlGN2uf6gxmuIR9ajoPl1tS++mGQA+H/VnYc4?= =?utf-8?q?1CV4qgS8n3dz8KAESNpm3Fy3EtSn8/CsBJ/WPwD2S0Z/aVj2L15+tD4NdGdrKGB0v?= =?utf-8?q?wiQoZPuJ+FgZJDWi+bgkaL/MeC0EgjfSPuo0XZ4qRdIPuoBNWVdlJdFozyFU6ORsm?= =?utf-8?q?LH2ordXWoFZs2PTgSI6XQfcYl5+Xar/JxmqNSsyeTIlp79qpgeW+yo0zIcz3+RR/3?= =?utf-8?q?N7AGP0uR9bxakJScfeFqe+etrR5a/hI3OGrT7uynu/LAA59LmcWK4foNw/Dlro/Dr?= =?utf-8?q?ZBrRvU8JFROv4+iqLD4rO4SwJNNAw8ipCk+5UQGzvTO1MlD4FZpfw/2hZ5jo0AjPL?= =?utf-8?q?/WJ3FqauX/O0GR5E3PSVHl8QOiHJQHZmmjHP4DTow+kOh7NxDNc6SAJYdIYiUQrH2?= =?utf-8?q?uZJBhDM4wA2ufXqjVKqDeE/z3aOC7KQxIxE8hDTW4+m7aA8uCAaJZmF5QdUCeTUoh?= =?utf-8?q?xKr1elB1CzSExaUvxVltXKn+FhOFsp4qdJQknmcVhsIWEBk+WKuw3HrFKresezzeu?= =?utf-8?q?d0ZePinoPp4Ck6G2TWf+RtFHtv5hwNpfKQHT9lANd3PZxzmG123iRU4x4DGSHzqH1?= =?utf-8?q?J9rYdi+Qbq8uFPmXbvpjjevV2lSp8d4b0TN8mW64t/V9tn8Gqgkdfv/rxnZnW1nSP?= =?utf-8?q?B7aAjFilOzzz0KJuYXzHU8BLq+NK0qnuOKxhgC6R1L2RzScDN5qrZsi6MCoFssuBd?= =?utf-8?q?4gcmuAp9R6dPw4VvgnWyn5SH4Si6/yN/IiFzU82uGfrxPTryPQcww+woPNy9V19cN?= =?utf-8?q?zf0V96n4xDr9R1n3f4rKkKUKtsiffa6XfoKoYlYvn8JtKa/jEiqkhjSDQ+o2iiHsV?= =?utf-8?q?ZZxlEGR33XkJPLLvVjO7PfFti/WD77mpDthgjwUQeEtar2TMr7hMvsSCCIoPfAOu/?= =?utf-8?q?16quBhg8K9QMTqkFbBSIqUA1+wl40v9BbGXsHOh29JZh/o0xFMSnw3r1cfW9LZTzD?= =?utf-8?q?9SVM4GHzfH8a?= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4139464a-6ec5-47e2-18dd-08dd9cd445fd X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 May 2025 04:09:27.9663 (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: oeNTqrm7VlwaWJPN4npyjIJdxKtZZDXW4wjvEoTjexBZRYTzXCFNxXBj8cy7ztodiT2dIF0ufCs4FgtUFzuDYQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB8092 X-Proofpoint-ORIG-GUID: KgHSMstnoXRs_-O8VEc1bKT313X8hF0o X-Authority-Analysis: v=2.4 cv=VpYjA/2n c=1 sm=1 tr=0 ts=68353afa cx=c_pps a=xMIE5RCmi4zid/p+q/zqlQ==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=mDV3o1hIAAAA:8 a=NEAV23lmAAAA:8 a=t7CeM3EgAAAA:8 a=7CQSdrXTAAAA:8 a=BCVRRYYnAAAA:8 a=ag1SF4gXAAAA:8 a=YjzJuYOIo3LE4T-Tf-YA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=FdTzh2GWekK77mhwV6Dw:22 a=a-qgeE7W1pNrGK8U0ZQC:22 a=Yfo1nd69h7ycsZ8reatu:22 a=Yupwre4RP9_Eg_Bd0iYG:22 X-Proofpoint-GUID: KgHSMstnoXRs_-O8VEc1bKT313X8hF0o X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTI3MDAzMCBTYWx0ZWRfX/aBTsPb4wQUj B+/RMLH7i78PyD4ZppsIGoT17BXW4HJ0OsRwObWsL1zwwcgAy8gVvTpcYA2yvWxS/xWnPOVCaPH 8SDE3K6hoD+bVI5E3cnCfMSIwb6RaakKxP87DHs459tnloCXpSbfDTIAfySil4UTskjYFqyXtyI WMWRdgR1zOdHtsHI18qDH4fYHHgk4n+5iVFKA+5itR/CASh2VPKycJ5JComkF757wUVlcyC6N3T 1Emo3nGVkI0Sr4qr5GVdYmkZG64D2hYiF97SBfaA0BKSA0P9cKrF04NdgSmU7LyXEO5RPjxBFLn SBvOUNLHdCiq2P1oEXv4kU83AXTPDPaiVsWSyPXIGIJrHEtIiiBL0MOGkMcSUo9Vms/S216brEr 1Awu9ti3ljBqCuGfDwxL5Q0a6VGJevEXJuJk+PNW0KYOOe1rKvdZ5DWDHTKu2NMih31H6g92 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-27_02,2025-05-26_02,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxlogscore=999 malwarescore=0 mlxscore=0 lowpriorityscore=0 adultscore=0 suspectscore=0 priorityscore=1501 spamscore=0 bulkscore=0 clxscore=1015 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2505160000 definitions=main-2505270030 X-MIME-Autoconverted: from 8bit to quoted-printable by mx0a-0064b401.pphosted.com id 54R49J0V004187 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 ; Tue, 27 May 2025 04:09:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217280 From: Chen Qi The following patches are dropped as they are merged in new release: - 0001-cksum-port-to-32-bit-uint_fast32_t.patch - 0001-ls-fix-crash-with-context.patch - intermittent-testfailure.patch Signed-off-by: Chen Qi --- ...1-cksum-port-to-32-bit-uint_fast32_t.patch | 47 -------- .../0001-ls-fix-crash-with-context.patch | 101 ------------------ .../coreutils/intermittent-testfailure.patch | 30 ------ .../{coreutils_9.6.bb => coreutils_9.7.bb} | 5 +- 4 files changed, 1 insertion(+), 182 deletions(-) delete mode 100644 meta/recipes-core/coreutils/coreutils/0001-cksum-port-to-32-bit-uint_fast32_t.patch delete mode 100644 meta/recipes-core/coreutils/coreutils/0001-ls-fix-crash-with-context.patch delete mode 100644 meta/recipes-core/coreutils/coreutils/intermittent-testfailure.patch rename meta/recipes-core/coreutils/{coreutils_9.6.bb => coreutils_9.7.bb} (97%) diff --git a/meta/recipes-core/coreutils/coreutils/0001-cksum-port-to-32-bit-uint_fast32_t.patch b/meta/recipes-core/coreutils/coreutils/0001-cksum-port-to-32-bit-uint_fast32_t.patch deleted file mode 100644 index 95d7aca809..0000000000 --- a/meta/recipes-core/coreutils/coreutils/0001-cksum-port-to-32-bit-uint_fast32_t.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 7eada35b4fbb48e7fe430d1b18dae7d191f84f8e Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Mon, 17 Feb 2025 02:27:09 -0800 -Subject: [PATCH 2/2] cksum: port to 32-bit uint_fast32_t -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* src/cksum_vmull.c (cksum_vmull): Don’t assume -uint_fast32_t can hold 64 bits. -Problem reported by Alyssa Ross (Bug#76360). - -Upstream-Status: Backport [7eada35b4fbb48e7fe430d1b18dae7d191f84f8e] -Signed-off-by: Ross Burton ---- - NEWS | 3 +++ - src/cksum_vmull.c | 7 +++++-- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/cksum_vmull.c b/src/cksum_vmull.c -index 7611c4244..0ff81e225 100644 ---- a/src/cksum_vmull.c -+++ b/src/cksum_vmull.c -@@ -92,7 +92,9 @@ cksum_vmull (FILE *fp, uint_fast32_t *crc_out, uintmax_t *length_out) - data = bswap_neon (data); - /* XOR in initial CRC value (for us 0 so no effect), or CRC value - calculated for previous BUFLEN buffer from fread */ -- xor_crc = vcombine_u64 (vcreate_u64 (0), vcreate_u64 (crc << 32)); -+ -+ uint64_t wcrc = crc; -+ xor_crc = vcombine_u64 (vcreate_u64 (0), vcreate_u64 (wcrc << 32)); - crc = 0; - data = veorq_u64 (data, xor_crc); - data3 = vld1q_u64 ((uint64_t *) (datap + 1)); -@@ -193,7 +195,8 @@ cksum_vmull (FILE *fp, uint_fast32_t *crc_out, uintmax_t *length_out) - { - data = vld1q_u64 ((uint64_t *) (datap)); - data = bswap_neon (data); -- xor_crc = vcombine_u64 (vcreate_u64 (0), vcreate_u64 (crc << 32)); -+ uint64_t wcrc = crc; -+ xor_crc = vcombine_u64 (vcreate_u64 (0), vcreate_u64 (wcrc << 32)); - crc = 0; - data = veorq_u64 (data, xor_crc); - while (bytes_read >= 32) --- -2.45.2 - diff --git a/meta/recipes-core/coreutils/coreutils/0001-ls-fix-crash-with-context.patch b/meta/recipes-core/coreutils/coreutils/0001-ls-fix-crash-with-context.patch deleted file mode 100644 index b1a92875a6..0000000000 --- a/meta/recipes-core/coreutils/coreutils/0001-ls-fix-crash-with-context.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 43a63408630e5064317823702518099f0ea652dd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?P=C3=A1draig=20Brady?= -Date: Fri, 17 Jan 2025 17:29:34 +0000 -Subject: [PATCH] ls: fix crash with --context - -* src/ls.c (main): Flag that we need to stat() -if we're going to get security context (call file_has_aclinfo_cache). -(file_has_aclinfo_cache): Be defensive and only lookup the device -for the file if the stat has been performed. -(has_capability_cache): Likewise. -* tests/ls/selinux-segfault.sh: Add a test case. -* NEWS: Mention the bug fix. -Reported by Bruno Haible. - -Upstream-Status: Backport -[https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=915004f403cb25fadb207ddfdbe6a2f43bd44fac] - -Signed-off-by: Yi Zhao ---- - NEWS | 3 +++ - src/ls.c | 10 +++++----- - tests/ls/selinux-segfault.sh | 3 +++ - 3 files changed, 11 insertions(+), 5 deletions(-) - -diff --git a/NEWS b/NEWS -index 3799f75..65867f9 100644 ---- a/NEWS -+++ b/NEWS -@@ -4,6 +4,9 @@ GNU coreutils NEWS -*- outline -*- - - ** Bug fixes - -+ `ls -Z dir` would crash. -+ [bug introduced in coreutils-9.6] -+ - cp fixes support for --update=none-fail, which would have been - rejected as an invalid option. - [bug introduced in coreutils-9.5] -diff --git a/src/ls.c b/src/ls.c -index 3215360..f67167f 100644 ---- a/src/ls.c -+++ b/src/ls.c -@@ -1768,7 +1768,7 @@ main (int argc, char **argv) - - format_needs_stat = ((sort_type == sort_time) | (sort_type == sort_size) - | (format == long_format) -- | print_block_size | print_hyperlink); -+ | print_block_size | print_hyperlink | print_scontext); - format_needs_type = ((! format_needs_stat) - & (recursive | print_with_color | print_scontext - | directories_first -@@ -3309,7 +3309,7 @@ file_has_aclinfo_cache (char const *file, struct fileinfo *f, - static int unsupported_scontext_err; - static dev_t unsupported_device; - -- if (f->stat.st_dev == unsupported_device) -+ if (f->stat_ok && f->stat.st_dev == unsupported_device) - { - ai->buf = ai->u.__gl_acl_ch; - ai->size = 0; -@@ -3322,7 +3322,7 @@ file_has_aclinfo_cache (char const *file, struct fileinfo *f, - errno = 0; - int n = file_has_aclinfo (file, ai, flags); - int err = errno; -- if (n <= 0 && !acl_errno_valid (err)) -+ if (f->stat_ok && n <= 0 && !acl_errno_valid (err)) - { - unsupported_return = n; - unsupported_scontext = ai->scontext; -@@ -3342,14 +3342,14 @@ has_capability_cache (char const *file, struct fileinfo *f) - found that has_capability fails indicating lack of support. */ - static dev_t unsupported_device; - -- if (f->stat.st_dev == unsupported_device) -+ if (f->stat_ok && f->stat.st_dev == unsupported_device) - { - errno = ENOTSUP; - return 0; - } - - bool b = has_capability (file); -- if ( !b && !acl_errno_valid (errno)) -+ if (f->stat_ok && !b && !acl_errno_valid (errno)) - unsupported_device = f->stat.st_dev; - return b; - } -diff --git a/tests/ls/selinux-segfault.sh b/tests/ls/selinux-segfault.sh -index 11623ac..1cac2b5 100755 ---- a/tests/ls/selinux-segfault.sh -+++ b/tests/ls/selinux-segfault.sh -@@ -30,4 +30,7 @@ mkdir sedir || framework_failure_ - ln -sf missing sedir/broken || framework_failure_ - returns_ 1 ls -L -R -Z -m sedir > out || fail=1 - -+# ls 9.6 would segfault with the following -+ls -Z . > out || fail=1 -+ - Exit $fail --- -2.34.1 - diff --git a/meta/recipes-core/coreutils/coreutils/intermittent-testfailure.patch b/meta/recipes-core/coreutils/coreutils/intermittent-testfailure.patch deleted file mode 100644 index 0794532bdf..0000000000 --- a/meta/recipes-core/coreutils/coreutils/intermittent-testfailure.patch +++ /dev/null @@ -1,30 +0,0 @@ -tests/df: Fix intermittent test failure - -The test writes to the disk and means the space used changes. If this -crosses a number boundary, the heading spacing can change: - --Filesystem 1024-blocks Used Available Capacity Mounted on -+Filesystem 1024-blocks Used Available Capacity Mounted on - -The test is to make sure the 1024 blocks element remains the same and -the spacing doesn't matter. Therefore strip any duplicate spaces using tr. - -Submitted: https://github.com/coreutils/coreutils/pull/88 -Upstream-Status: Backport [https://github.com/coreutils/coreutils/commit/c5725c8c4bb21903490a48035286d0f94463642e] -Signed-off-by: Richard Purdie - -Index: coreutils-9.5/tests/df/df-P.sh -=================================================================== ---- coreutils-9.5.orig/tests/df/df-P.sh -+++ coreutils-9.5/tests/df/df-P.sh -@@ -20,8 +20,8 @@ - print_ver_ df - - -- df -P . > t1 || fail=1 --BLOCK_SIZE=1M df -P . > t2 || fail=1 -+ df -P . | tr -s ' ' > t1 || fail=1 -+BLOCK_SIZE=1M df -P . | tr -s ' ' > t2 || fail=1 - - # Since file system utilization may be changing, compare only df's header line. - # That records the block size. E.g., for "1M", it would be: diff --git a/meta/recipes-core/coreutils/coreutils_9.6.bb b/meta/recipes-core/coreutils/coreutils_9.7.bb similarity index 97% rename from meta/recipes-core/coreutils/coreutils_9.6.bb rename to meta/recipes-core/coreutils/coreutils_9.7.bb index a966c4b448..091e1ea2c5 100644 --- a/meta/recipes-core/coreutils/coreutils_9.6.bb +++ b/meta/recipes-core/coreutils/coreutils_9.7.bb @@ -15,12 +15,9 @@ inherit autotools gettext texinfo SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ file://remove-usr-local-lib-from-m4.patch \ - file://intermittent-testfailure.patch \ - file://0001-ls-fix-crash-with-context.patch \ - file://0001-cksum-port-to-32-bit-uint_fast32_t.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "7a0124327b398fd9eb1a6abde583389821422c744ffa10734b24f557610d3283" +SRC_URI[sha256sum] = "e8bb26ad0293f9b5a1fc43fb42ba970e312c66ce92c1b0b16713d7500db251bf" # http://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=v8.27-101-gf5d7c0842 #