Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1qCNpL-0007RW-MV for mharc-grub-devel@gnu.org; Thu, 22 Jun 2023 13:10:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qCNpJ-0007QF-Ne for grub-devel@gnu.org; Thu, 22 Jun 2023 13:10:34 -0400 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qCNpH-0003aW-Mf for grub-devel@gnu.org; Thu, 22 Jun 2023 13:10:33 -0400 Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 35MGPIEX025422; Thu, 22 Jun 2023 17:10:26 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : references : content-type : in-reply-to : mime-version; s=corp-2023-03-30; bh=REtLky/ogM6YJRZNA3SGHQEwGpp/1FBHTUYjm17Z71w=; b=Z7A4FnoC8vc8CrbYGRt9RQC4pByHhYdNWnlkyukMCOXth6tFkQE0UyRqkAnRpoAfKvN0 YGDhQzxcFfbODQesASOnaxxuPHEM55OCIgdAoHCFdPgB3swyzFg/Rs4Ouo6R3owO3Kbs NL5S0+wMvQVZcVdS96WHrowHtGjFU+1IWZijZekiWZ4ZPpBllau6edACQGkdd3WYqTXU uBV0/o7HO3z/3GO6rSu7l25A/oi/ymRsH8Eih+JpKCsDvCv115T4zxgp1NSc515Tct4J oZ2hC8OoWRF+G1emgH7tqFmamYSpKeT+9SAIqknlGFQz21DEZKJgnpbFpQMH5hu7+LBC uw== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3r95cu28w3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Jun 2023 17:10:26 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 35MFoR3e029599; Thu, 22 Jun 2023 17:10:24 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2172.outbound.protection.outlook.com [104.47.57.172]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3r939dvgp2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Jun 2023 17:10:24 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WHLpZIZbIHMcXNCVcqsadBukdsbYaISVcPur7niIQ43FWGjP50RGGs/MWNfRhbk2fkYkHRG+OvRc9IcEcs56DSpnpaztaoAPgpg/hciNRfqNdFZPAB4Oa29Ou+9oGQfW6us110bjJk0nD7h0adXIL34+ooSM6DoxnVVt9a+LqJI25iVoTjXiIiJyv/N4CbZ7ufKVPGU6gfyjDuCcv/6MgfDX1Rg0BA1+ZHHV08IJ2lr89hElDCJngQuv3ohPmqE6l2Zn4baSIDDp95ansQW7I9VvUpmDzgWucFGs7ZVP710k68ZtAA/f1rv345SNI8F+9IsUyyDv6o4YWuxt/HU1kg== 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=REtLky/ogM6YJRZNA3SGHQEwGpp/1FBHTUYjm17Z71w=; b=CzoEWiQMxi7IatuwmgHQFhGJzg/p/HLwPIM0HboS6yDOLWeuMhjbtq5c2+wSkjLemvUSqAVdIHNpjzzYg8W7+EgISj8LAHlNPX3fID8XTeZzpGaB8ij1yDMOdqSaRviS1vp9UL9/LO5xPxmkV/Z8Kmy3VFTpCM8hXleC6ePk/Xd1ii9dtNf8WZ3kATSDATORNINBf7mgf8u40UkAzHHPQPGoRizp7XRXWXdWKjZoOU/5IhM50ulZsRKlSA0pLVS/6W5fAlFgqt+IByA6Y1fesxOJdLQk+STJsJMXj/U9aimeGCBr/YEZtBaoON6WQcz2l2xF5hleSzNYNfEqXofMOA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=REtLky/ogM6YJRZNA3SGHQEwGpp/1FBHTUYjm17Z71w=; b=aw+FKTuUzjSlPNI/tcO4h5iRwQl1C2K1OgF0U7GbOPbr3ctrUb1vbwwBKn86tnvbDv0/0HpsjGRSqvTFWGYUCgxHMgk5TVWWsQcMIq81S0Dlgxj0juc2w7HghXICyNOAlbEM8Yve0jIUYT/M+QxeQqzPgKdLzwWuAqQOjH4ksr0= Received: from DS7PR10MB5974.namprd10.prod.outlook.com (2603:10b6:8:9e::10) by DS0PR10MB7090.namprd10.prod.outlook.com (2603:10b6:8:141::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.23; Thu, 22 Jun 2023 17:10:23 +0000 Received: from DS7PR10MB5974.namprd10.prod.outlook.com ([fe80::5f73:d40d:7c42:4a76]) by DS7PR10MB5974.namprd10.prod.outlook.com ([fe80::5f73:d40d:7c42:4a76%4]) with mapi id 15.20.6521.023; Thu, 22 Jun 2023 17:10:23 +0000 Date: Thu, 22 Jun 2023 13:15:05 -0400 From: Alec Brown To: Daniel Kiper Cc: grub-devel@gnu.org, development@efficientek.com Subject: Re: [PATCH] bootstrap: Fix patching warnings Message-ID: References: <20230615144709.13102-1-daniel.kiper@oracle.com> Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230615144709.13102-1-daniel.kiper@oracle.com> X-ClientProxiedBy: DS7PR03CA0100.namprd03.prod.outlook.com (2603:10b6:5:3b7::15) To DS7PR10MB5974.namprd10.prod.outlook.com (2603:10b6:8:9e::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS7PR10MB5974:EE_|DS0PR10MB7090:EE_ X-MS-Office365-Filtering-Correlation-Id: 3d9deb1f-0aab-45d3-fbf3-08db7343908f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mLRxRH8R1cxnLj5olXmhNAQBRapu8e8DOb8K5y8MFayZr/Ve+u+pFBopj2t3xcbOycTLhVGooLW63HLFfCq6zf/laGD9N2EMGOODGhAs6pJIFfUk5FY/oTjJSa53WwQxK6pl6fESRFEvdyaOZlmino1RP/0aoF3abACtuSlWJPfGtHhkT7ZGcZ2RPqkNYs/9kSzAXoydKeU1DrsBxrDXqulwpvEDHJWzLv79HAaaWvCYAI+Ljiw4MkNZ9yiEMEploBbsyCq9OPECkfgAEz8fzBak9aVkvZoPil0xS0XOft8zmDPHAdP4BEdPWBRDN7h06mbZVyFmgS+IC2d4MxbuPdxG0g/ozhnvQI4fnceTgm0krN0ieBiQ0CUEQgeFTXhNj8rU+AnEEM9xZn7+uehUxUZtQE3M6XdCv9KVxpUfe9HVYf83SOyTSi0Q++HUXtaOKyh2LQHV9ol0M1eiur7xs7DgK2tFzbXCAe6EWlu/a0xfh1u+ELbvhH5CIfN73DiEcWgnscPnH+bOW6adPVpZRUk7I32sb2On0vPDJ9p2m1/E+v+rwSbJW72qdhDQbWLUgtb3YDIrwqhDCophyVvKHTKZwyw0X5mmWBeWowEMc+4= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DS7PR10MB5974.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(7916004)(39860400002)(376002)(136003)(366004)(396003)(346002)(451199021)(2906002)(33716001)(66946007)(6486002)(66476007)(66556008)(4326008)(478600001)(6666004)(6636002)(316002)(86362001)(186003)(6512007)(83380400001)(26005)(6506007)(38100700002)(9686003)(6862004)(5660300002)(8936002)(41300700001)(8676002)(67856001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VfzcDNFgo521eF9dbny7XtWa21BRc48rb6nMM3/D5FioXzuZdTsT/kuwwY1u?= =?us-ascii?Q?ADaMAeSU/T5HvPfNDtk9cRtQT7p6MpZkBuqtBo8rvrMHHtP+vaHKW0tqjIDF?= =?us-ascii?Q?sRIS5HaLbzX7AWL4L6Cx1NkNppBi1EIxCqYnyEHmfCdaZC1154xnFrHrWUnx?= =?us-ascii?Q?CNs6A7DkUjZkwF7G2ZriAB9zB1Wy3s1fn4CE63gWt/wfkUNv8n9a4L4/6wdH?= =?us-ascii?Q?/yxXjM4Lj5XH6wpaCy4szTP16pfrhDiKuUuO1LIZnm+M1CB2X7QGqKb6c5pM?= =?us-ascii?Q?0kw7+0z2B5L473nc683Ty0twj08qZA95flYDaeRtwUeeVBR3ckSlAAeeXNqC?= =?us-ascii?Q?Z9fpiI7t5AkxHv0qoXauwMiI2XO5lS9FK0gImhHCCa3jwFxjaZNITp1EWqnj?= =?us-ascii?Q?ltxkPM01Zz05h4kiZedz0JhXusy5sg5ODQCuisXYqh9m+4+O21pilv0oj1JJ?= =?us-ascii?Q?oZXZwqJw0adWo/hV+dPK9vE8t8yzNWtue8oC1MRbZYdZ2k5s80YI4Z94j4+R?= =?us-ascii?Q?QFTG85bXChQm1XXKiCHD7SGr9GQWy20qxs/MkHGwaftIac2IJBXJ/QwFxSyt?= =?us-ascii?Q?0A3bib09CLtztiFksVQ5k+SEQ1g7FLZST3mvh9O4hEMKULiHyXa5k9trShs6?= =?us-ascii?Q?aWhVhHGjf3Nrimt8fO4eEb9+IVDiBoS6nW92iZS5kDr4V9HwvKJ8VAJJY9rp?= =?us-ascii?Q?f+3uyp5AsY3T98T2KxvTowgmVOABWIpjJutwm6MjonMtfrmhbp10neciBLd9?= =?us-ascii?Q?96LBDPxD6/O2rViKVJ3zNusK6C85Hjz6zFUozazmDXiEVMTjnydjYr5eFi4Y?= =?us-ascii?Q?zcyYcbPAdfZPIcx6B1xAB3vI30nyDUiEDhXk4yhgXH/kGeFY8s5N7T9c1QU6?= =?us-ascii?Q?a7jrXbI5Sm/iOXKvOwNudd+GTiszI9U7i8Fo/l6B8lmBE/rNbDT+D/nOB/9l?= =?us-ascii?Q?3kuS5QGmAM1zro99K6W15hMiXfKdLzyA4VzC0GAnADb/wgNcPWhaUZF1lJ8o?= =?us-ascii?Q?I/Ipl93PdrF9m11OFPFBTSptGjn/XcidKqu8FCbxLLB3XrtiDOH+Ll/cglFT?= =?us-ascii?Q?YKvsIWXLLMh5qv/t1YcYu3jxGDkV8Pb1yZCRQbWZrQlpF8VV6JlK3CYcUulU?= =?us-ascii?Q?18zDntOacBV50SijsUy029o7ItyG/TSNtyShQT09BC0hgPFm0Bzj4aSDf8hX?= =?us-ascii?Q?7gPJTiFS+qGEhc66XSas0thIMYuAyrky58e75oDmTvX+AJpzijxBZPGI6Ow/?= =?us-ascii?Q?+8FFuiWr9HJeetQIbuLTYwd7teabXjbyTzOopiA4rstKMDJJDyjZ9ERmaHMP?= =?us-ascii?Q?ToObyUvVys2OVu7fgPSeEHDdRaDhlXoPO4LI7akxfoHiAzmtYgBZSyAfLc89?= =?us-ascii?Q?Q1oFkgkhpWL5S6649G9brlCXCQFb4MD0SnnvzBizHZ2j7RP6kViJ8VvVJcB+?= =?us-ascii?Q?LqFtPJkIvBZq3NQOzdKF+qRqJ51Wvv053guq4LQz5l6a/Nn0VPVrYeiA8oJR?= =?us-ascii?Q?gOLUlvf+dE6HUw9gjvnd34XdKYwFxXUd26zv0/v6sNdC7YKlAoHFeAKYc4jU?= =?us-ascii?Q?K7RCB5VdN+6xV2x1C+yP5e9T3aaYMUhYUfRpVWeV?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Ae0sFIyNYVyNhPVnXNiKZg9Nm4J7kIFefT6HSwh2ZUA07QcPdecfz2nTxUadnS97mMmIqm0MttApUkGfUGJVFOTaYLnyjlJpWHRzFf7s873V1HZVC6qhME7gI6ff1iCfkfp8QLDi5oAMP0Dplo5w1MOnN6Wr783fm+VMWOGbzY63pPBlaY0VIk0CaJR2p6YHZ1I2o1yyrGJuR0wEnCCM/L1hlKW3cSDYjXk5yDx9WErV4hhIGmRtp+AbPRwkQYonkcct76a3twTEDYZR6pJ+sLxWivSWsWADqEqd8gGFvpKtvjkFXNJn4Jl12el3w8hWQF0g1yZMhNAfFMC5IFi4/0f4FfOF59DuS4rh8kdSVI9pFVcnpvs2qJVAser4Q1XpEJqMMNoGJyObxI6DQQAy5MylQKErvOGJ4Jd3zPg5YkQgpLOlYsCE8tebiigIneObmA2LG98o/Uw3RFxrFBk1RpSfAuXMcbRS89kFNpyp1IjNrtBKDeSZqem+5ctDvtF7Ns1N/ztAuA22V0LS6e+VEloP6oYF3p5l3tvADP19n014sfcIJlibtxJXSNBX/OrsRg74QlwSF1mIbi8Nm0Mqwpr7lOPjejOK3hmZ3q7pamKRpigYAWD0fb8oQZVbgRQpt8e3BJm+njBD+JLoYr0YxpE3u+Ny/MQxjfWEdkX613gf48NEr8NZ6DCnFLEcs9nBjTE/6nJnFQGxVp/qbnPjzzUjy/Q93v2xS1QJsvju102ntVTV48GsJSDSTeYAB3hV3RqYy76H0s/1uvZMfzTiBDykpVTiUi2kY0201qhtZ+c= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d9deb1f-0aab-45d3-fbf3-08db7343908f X-MS-Exchange-CrossTenant-AuthSource: DS7PR10MB5974.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jun 2023 17:10:23.0101 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: w/E7+iPVDT05dwQgjGRmMhPAe/ZCXrXrliQ3BObHaGdvejAB5EgrX1hO0Xoloymp0TTmytAKyOnw4h61fgsc0A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB7090 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-06-22_12,2023-06-22_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 malwarescore=0 mlxlogscore=999 suspectscore=0 spamscore=0 adultscore=0 phishscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2306220146 X-Proofpoint-GUID: JvirgSMYowwOx3o41WeLNfzXU_QnMotX X-Proofpoint-ORIG-GUID: JvirgSMYowwOx3o41WeLNfzXU_QnMotX Received-SPF: pass client-ip=205.220.165.32; envelope-from=alec.r.brown@oracle.com; helo=mx0a-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jun 2023 17:10:35 -0000 On Thu, Jun 15, 2023 at 04:47:09PM +0200, Daniel Kiper wrote: > Currently bootstrap complains in the following way when > patching gnulib files: > > patching file argp-help.c > Hunk #1 succeeded at 52 (offset 1 line). > Hunk #2 succeeded at 1548 (offset 115 lines). > patching file mbswidth.c > patching file mbswidth.h > Hunk #1 succeeded at 40 (offset -5 lines). > > Let's fix it by amending line numbers in the patch. > > Signed-off-by: Daniel Kiper Looks good to me! Reviewed-by: Alec Brown > --- > grub-core/lib/gnulib-patches/fix-width.patch | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/grub-core/lib/gnulib-patches/fix-width.patch b/grub-core/lib/gnulib-patches/fix-width.patch > index 0a208ad08..15f091c0d 100644 > --- a/grub-core/lib/gnulib-patches/fix-width.patch > +++ b/grub-core/lib/gnulib-patches/fix-width.patch > @@ -143,7 +143,7 @@ diff --git a/lib/argp-help.c b/lib/argp-help.c > index e5375a0f0..5d8f451ec 100644 > --- a/lib/argp-help.c > +++ b/lib/argp-help.c > -@@ -51,6 +51,7 @@ > +@@ -52,6 +52,7 @@ > #include "argp.h" > #include "argp-fmtstream.h" > #include "argp-namefrob.h" > @@ -151,7 +151,7 @@ index e5375a0f0..5d8f451ec 100644 > > #ifndef SIZE_MAX > # define SIZE_MAX ((size_t) -1) > -@@ -1432,7 +1433,7 @@ argp_args_usage (const struct argp *argp, const struct argp_state *state, > +@@ -1547,7 +1548,7 @@ argp_args_usage (const struct argp *argp, const struct argp_state *state, > > /* Manually do line wrapping so that it (probably) won't get wrapped at > any embedded spaces. */ > @@ -204,7 +204,7 @@ diff --git a/lib/mbswidth.h b/lib/mbswidth.h > index 2b5c53c37..45a123e63 100644 > --- a/lib/mbswidth.h > +++ b/lib/mbswidth.h > -@@ -45,6 +45,10 @@ extern "C" { > +@@ -40,6 +40,10 @@ extern "C" { > control characters and 1 otherwise. */ > #define MBSW_REJECT_UNPRINTABLE 2 > > -- > 2.11.0 >