Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1q9oFv-0006jG-6J for mharc-grub-devel@gnu.org; Thu, 15 Jun 2023 10:47:23 -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 1q9oFt-0006it-4W for grub-devel@gnu.org; Thu, 15 Jun 2023 10:47:21 -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 1q9oFr-0006uc-FO for grub-devel@gnu.org; Thu, 15 Jun 2023 10:47:20 -0400 Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 35FEOIRR027837; Thu, 15 Jun 2023 14:47:17 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : content-type : mime-version; s=corp-2023-03-30; bh=iwZmjYGYO7W8i+Wk4T/5NFU3e+jTd6HWdLIkIS+3ads=; b=t5iY9lGuXlwhSlhN9ueEEH4luS+Yu280M10GJlgJa4PJNTgNKGipw5QvGQfTpqzpBxOM LF5yUHRgcdrIcPFE37OegtvfPHJ6kXLqnOOnvW2T3vCHIuwEVC1PV+Qqd30e1IF6SFKy gzmWGNPEHKZIcEQp7zOqp5jlQTUc7TdkBYME+5n9AGNDy09bYb09sS8EItyswZTc7Vcp bnwdkWe3DxsEs4Y56qYzacnI3U3Gmcee0EbVTYeTNDnA5V6+JaMTTZBzBuLYr1zjn7Sp qqZTTpeuLkYLJHGaC2U5kT5Z+z46oUhU4VMzhSMCkRWtzHfZowlFOLWcRJRt127HjHA0 HA== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3r4h2at54x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 15 Jun 2023 14:47:16 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 35FDQF79040575; Thu, 15 Jun 2023 14:47:16 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2107.outbound.protection.outlook.com [104.47.55.107]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3r4fm6rkjp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 15 Jun 2023 14:47:15 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZnoiHGPxX2qnaQUKHLPkJm887iqk/yF0VZWpJ9OyqDBGnZqszme0AyBadeS/w8BggZzdK0sMuCr2gIqmL9RMJB2+NYNYUo9YlggPQ15IV/KuFW7ujQIZQ/ZxVrU0GP0LpljunP8AFGp2mhGl9eBVdp12dACjC+XyGQfsOoOMIutH0gRacjPRKfaJzgLUe7RYt4pJGfXENvyv9mh69nSIMfmHPRch3ksSVapI5UugSQfLQQckuKe9irbXkgmjEtAxuRAJ8vmPx4bu/LbLNdbuO7ne22ONTESmWQW9U+8Pgb+r1CMFO8pG5M43nQyp+K7oVbpyoocNKnzbhWMPT0Ur8A== 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=iwZmjYGYO7W8i+Wk4T/5NFU3e+jTd6HWdLIkIS+3ads=; b=i8gFUAvfHVYfKt5pTvHBvEautWdvkkooHfc5uQGrfAH89MM4pVjxmoeUu44uxCezFEGu/he7RH9cN4OQgQwYlVTNYRevrxq8jSHibvpk3CjDqOdWKFvK3QV4jqA1HlIoLXSTSNyyOEIpCXiGan95g04T9Ua+wxozYLw4YlT3GlKs0Ner2/1Jc8BheX0z3JL9n+UHbw23SO0CPzzKykjADteJknGJGH3z5z7VzGADMciq0189Q3fBo8a7eNIqTB5gZBFydn+8J56Sq/pDOzyVck+vl9IPhRBHJVt1SQ/K5aTjkZ0LkPDs+cOMs+wVBaNTYg8hIV3FcDJTFUDajwgRBA== 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=iwZmjYGYO7W8i+Wk4T/5NFU3e+jTd6HWdLIkIS+3ads=; b=MvJ0w0aqTkZP86tX/By8FTs4/5fWPLhFza/S3k1UgIAb8MbL5Uyyk0zIeWHnBVmuUDJ9C1rihDo/Ccis7FepnjMSiLxLA8oEyG+PC69gSLwVkHEAjKs+P6hm3c2VkoeVrAUcuuuPafCmgQM3G0jtQZMy21vT0GFd4Eu9NiqgWFs= Received: from BN0PR10MB4822.namprd10.prod.outlook.com (2603:10b6:408:124::13) by IA1PR10MB7214.namprd10.prod.outlook.com (2603:10b6:208:3f3::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.27; Thu, 15 Jun 2023 14:47:13 +0000 Received: from BN0PR10MB4822.namprd10.prod.outlook.com ([fe80::86ed:de25:a973:cae6]) by BN0PR10MB4822.namprd10.prod.outlook.com ([fe80::86ed:de25:a973:cae6%2]) with mapi id 15.20.6500.026; Thu, 15 Jun 2023 14:47:13 +0000 From: Daniel Kiper To: grub-devel@gnu.org Cc: alec.r.brown@oracle.com, development@efficientek.com Subject: [PATCH] bootstrap: Fix patching warnings Date: Thu, 15 Jun 2023 16:47:09 +0200 Message-Id: <20230615144709.13102-1-daniel.kiper@oracle.com> X-Mailer: git-send-email 2.11.0 Content-Type: text/plain X-ClientProxiedBy: BE1P281CA0171.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:66::14) To BN0PR10MB4822.namprd10.prod.outlook.com (2603:10b6:408:124::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN0PR10MB4822:EE_|IA1PR10MB7214:EE_ X-MS-Office365-Filtering-Correlation-Id: 9d392839-4352-44a8-274b-08db6daf680f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lMJQH5yYfbh/B6nc3K+y62dHzny56ksi0BPZC9+Wyxa8I0dC1fRj0tJj9ZmwHcm/N/xQ/d91oZNmrSl2DJ2GtgqN9ig4Vd8jyKnxEbmK5oN2MjCVTXMt4LSwuaI4RCHNgYs1T18TKfE0ReLn2rTkTJQnjQi2GZlBh770urVYxMEwdj4d25BEI+SAaGuq3aB9aNx2OVNgDTTS5Du4jcM1lB4Nd3y3vTE3Op60lUSZQo9F4Uc2gtjnkgO2yAoqsA8FIs7zl0vlAw+Qdr5PdfDgNkDb4nPg+8wje/nZZf5BBvmyZVqkFRVfj5V2IXERmnojeTAMt3BA1JnBjYBGPwy9R7Jfb0aBc1KCUD1eF41hF6AQkNFEPwRE6Fq5vLjr5G6+Eb/1E57mmzHv2P9sCp0uSjvLmataGDv0BoJR8ZUJVUHSoTowkBj+osn8QWDW8nObn5u6o2q1fgmTa9EG0+2DcygWnfrHELHEn0pretXz/N3RCqnMvIzb8RT8Uyt60MNBALP1foqvQNh8BKDY7E+4DNDj1S9MLwWCKIty3xcu9Dt9rjX+01xUq9gAEUCYKH+y X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BN0PR10MB4822.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(376002)(346002)(136003)(39860400002)(366004)(396003)(451199021)(5660300002)(38100700002)(2616005)(83380400001)(6506007)(1076003)(186003)(2906002)(26005)(6512007)(44832011)(478600001)(66556008)(6916009)(66946007)(66476007)(316002)(6666004)(8936002)(6486002)(8676002)(41300700001)(86362001)(36756003)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?GMHtVWPmLGAzYTCHD/sn2YDpown5AirZyzHe6urH4PGn/VAxj2/8mAboL19N?= =?us-ascii?Q?3qEZJqBuCGrjXVxHPooOLbz8Ymwrg+mKQodLzZuqkApzDVs46jWuTFP0FJkG?= =?us-ascii?Q?X46+LMAM+MjUAZJrCL2JqnDbxuEImwI9VY98bfbzYf6NEA7k1xgCiFIWAcK0?= =?us-ascii?Q?QScNWuv+sdUtYfflSMCNg+EB+h588zTfZHAquL+rB4DQ0g/LcxRepQVJL3KG?= =?us-ascii?Q?hREx9jf+sdNl7uHUiKwl+qPVJFQIzeieKZXi9TZjnKph4/Rxhwn3+rbWxT9B?= =?us-ascii?Q?f4kcVL7ZFEqup+23qNOa9ef1Pn0YswmbwxsTUFMUVfZWrqZI9KZeg9xhG4XY?= =?us-ascii?Q?bzXSSQdZahfYo7Mgp6YEqSdB9Rz1m3hqBYnnIa8pn3P2U7L8hoKQj140UFBR?= =?us-ascii?Q?NIVukqLZd+Xd44+iTt+Zrjio7qzBXDTeWtIX2ryTF2ymWo46wHaFddI6vyVV?= =?us-ascii?Q?8eAb+7Zcvk2J372zDdeSNzk5ixYcKm/yae/VWH7nGP8/bqbsoiy/zZ3j8sDU?= =?us-ascii?Q?+MTnlr6Ck4+YvoKgNCQNuCqkLsKcVjKO8e9fL1fDHhO1ywuG9fmwRn5+EoQh?= =?us-ascii?Q?mRGh5oIbFvggUpqNE+fBEQNekeEo3moW/6Ww1JIvItDlXFsdl+NYs8nAvW7/?= =?us-ascii?Q?odDBhGWkVTAwPxXgzyaqQZVM/IVoT1kCx81cO8Ico+ERCueHHfvphgT5/HkH?= =?us-ascii?Q?ueba5vCamlB7qvpkgJVhbSAZF5NJonTIB9OCD2+7OsGvEWddPnuIBdlxXT7/?= =?us-ascii?Q?Tl/kCzwQ11+jGJYEPQkychvjyONtSaXh4hhK21Ga89rgNqUIBEQLb/QOfTo1?= =?us-ascii?Q?COrdplP4KNsInssRxVYhsbWdjFO83QPpXDlDVkyXf2f2p1Xi7ohEZkLr0hio?= =?us-ascii?Q?fKWWj0Xy2Err1YeJjk4RMdrsaFLLxTqwRbHwnDTr7MDD4tJ79Dfzao4Kg/4g?= =?us-ascii?Q?7Nrgj1YLZ5U56C1u8+Da10kwwPJSj79Iz3dxIWbBUoEeKH9VbhVp8eKmUUYc?= =?us-ascii?Q?+/0u22f2TXWked1boi29Fmrc8lz3RYf6rlCZoqM0tmcALzfatwTxfmJ2yHMa?= =?us-ascii?Q?PRuSTNQqM0HoJpw/OMb8IeGhzHvjF5ZlVw5K5VOL6ys1FUuYU6hSGWKNzA0i?= =?us-ascii?Q?+p8AvelgFCr4A5RwXxAf1+XM1paL16VjJ42R9h0i0z0RD3zmL2aDK/PBDQDQ?= =?us-ascii?Q?ePM4ErBzyD69ekry5KaMlTaSNr9EQhS4VK3inZ+/C8Wd/6qiDacTHbejxD+2?= =?us-ascii?Q?u9nkGopG1x66R1IBRZZG8V1bTr0bg3bjjdsyF0+l3kDJeINzQ2NkaYOW4Jim?= =?us-ascii?Q?InffbB8LB3i96pwReNvju/MqeMhAQAAZScIqth/NBHPe8rWYm093wgjWZ2Hx?= =?us-ascii?Q?dho4H25fqqgzy3dradH+L5tOVLUn4g8ng4uxL8Mg7Zj6dyhvNsk3ICYnQ92t?= =?us-ascii?Q?nTxdcx0mEul4lxYTFHnha00u50H3vE9yY5u3OfJPKdu10LcOQNvWHHqforSn?= =?us-ascii?Q?5bOUuaBgPF4p2+pEvLAl8WJqaiTuqNjluuo4gIHwNisy/WSA0uvxGvrxS3xI?= =?us-ascii?Q?EUr7dpfsiIAieGrfTnpReMrgwrJoTWbK3JIT0rCW?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 4trnmtm7TYPaCqf82VK4q4dIU9yQ2Do6OrlkaVfMEFaJgsKJTvwI8n+CtDfWuXPRcoy97rdMHieakCXSVZV5m1LbBChhyJ/A9c5T85S7ql+cizCFNjfowYSrYECeXyw+BTYEcesqugJuhnYXxTTnTYa/Qbz+mY63bhsPD/lDcOt2Fy+2UZWY+jN0Yy4uaJacYvaVf/HdGXsUp0WVa8EkNBzL8h0SKuqK25+EUHcc3WODKx/q08eeu5/C8z+SLYC8f39UaJr1l+a2GdizAmF9LCF5tGfoVbIHNdFP/7s9EjpBtHGpWdaD/u3DrLPNCrs/f/1WH3hBIs4DiI2bWGXkWRWD5EcufG97y7mTC8lsJjMyoNi2J/BKllbMLQ66Aio2NKqnE0K92OBxVZDcXr3IPeGjsiotXddvUGsvl8EsrmR9kAiShj7L2s+4ILJEyfWTur03nm9wVmKrCQ9aIPz+L1gomW/SUnneoXGgVV2kUOw/mXiOfsL1bO7Krwx0OFijeXZFikVEP726qIclgBleHTxic371FpXMSDxDAuHzeDKapx3h5mECy/KdPoy1CsGGeQkXDzER/qoFeNr//N4aXYdi3IaHv86OoQH6iyf6ysWs2PTK5OPuJJ+RTUHuyI7KjmkbN+61VVp8awlN/7sIsmLqZyqY17wRK2f/eTPxAomI6AfUdK1Z+PYn/ICRlezOPBUYYUsEN6+/nh47NfIG+s/fNh5cK+RUXF3tP1OODxQ5XNUds+FSs5JOwct7X1DZ5df4TwyDpdQJBFaUTlHQTerh5T6RYpjk0zUoG+0g8qU= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9d392839-4352-44a8-274b-08db6daf680f X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB4822.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2023 14:47:13.7433 (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: UnVRpgP34lPOPBJLwSL2YUTgYEUGvXI2Vt9eU7Gx/xzMeRnib6DYvjpzhqK494Y1eUxytlLEBDTr7z4PA3/fAg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB7214 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-15_11,2023-06-15_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 malwarescore=0 suspectscore=0 mlxlogscore=999 mlxscore=0 phishscore=0 spamscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2306150129 X-Proofpoint-ORIG-GUID: 8aMwd3I_5u5wBl5RyGzehOyBnGsVl840 X-Proofpoint-GUID: 8aMwd3I_5u5wBl5RyGzehOyBnGsVl840 Received-SPF: pass client-ip=205.220.165.32; envelope-from=daniel.kiper@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, 15 Jun 2023 14:47:21 -0000 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 --- 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