From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1miEvi-0007yQ-SY for mharc-grub-devel@gnu.org; Wed, 03 Nov 2021 07:59:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miEve-0007m9-Cz for grub-devel@gnu.org; Wed, 03 Nov 2021 07:59:42 -0400 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]:32870) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miEva-0006et-Gp for grub-devel@gnu.org; Wed, 03 Nov 2021 07:59:41 -0400 Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 1A3BOfch009507; Wed, 3 Nov 2021 11:59:33 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : in-reply-to : references : date : message-id : content-type : mime-version; s=corp-2021-07-09; bh=mlI3HI7JJG5MoaWoA4E82HzMkS6Bf35oMVPqwYV1nzg=; b=SaTK5xAyNitMnaCCysx2jFg2AjnlolmwvmjV6EB+PnupFWYj4C8y68YMvZzDXr5AKfJJ 3wDP/dMbSYeA/YoqCm9vIXnEvsqw5Qfxd1FkVz/B7hrzLMpUXAAZt+wKKnCu72npUdOc 4x8Tw1iTUj0V16CvVlDK8LS7jFr+ldqPH9s1qspNCYoAZ6WJhtXLx2aa8N9uoVbCvJex L3CoEiFdWERc3Iki9/yheL/HebKH5abOauKDukb615VKchkxtbaM65ODh6I8gIetM/+1 fXKwF9zugcrs890srl0IevdJhLAEMZSZQzBh3arpf5ulK9qI2BxIsJBTp6PujfgzMwCo Sg== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by mx0b-00069f02.pphosted.com with ESMTP id 3c3n8p1aq3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 03 Nov 2021 11:59:33 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 1A3Bp2jE114468; Wed, 3 Nov 2021 11:59:32 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2173.outbound.protection.outlook.com [104.47.57.173]) by userp3030.oracle.com with ESMTP id 3c27k6wfrg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 03 Nov 2021 11:59:31 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cXBqPOh6j9e/d87Ifdx/cftTif/Oxks8Edr1gz9MwgXQdjfe4W2tuVlS/Obu+EQ6m4Z3BhZS3o0K2tLqUmXG7TATvgiKQwPVQZyHlEK9E0jksNVPTmBvWJq76eXPwYkTLiPpZmkfo1djt2xlEfibRa/F/vsKdP/EjXJkFM8XZbbLNEjCPNsvqlU33Ykam9JZ5MR/xGFPkLHNlPqWZp/aQlxnOkPEdVxVO1aYR9ArxLzjyXoolcgVbIy4al8tQ/NkU8cQJvY178AqgsImqRhYEO8THxVG5V/WG+62lpbWbF5JdfJGlSRWfS5UDrDCbsBOK8ALJ20YrwxkCLLnzFSrPg== 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=mlI3HI7JJG5MoaWoA4E82HzMkS6Bf35oMVPqwYV1nzg=; b=HOkSf2P0ApnEr+ks0iFjQQZo9QaI0knyX6YTL7jXtK/WW9nUyinjs3QSSd4371lf9n6tsZhomzuf9XhUuk29p1UwdNLcQAcWnGZP4zbKEzgivgbh8QITWlU7K+k9iVdmaQr6eQduBr+OkvL/8enVDuT0mzGcReXvdCmsh4SfbcOMAo4xWeD2mzHSgHdbunC0jB7XvqQGcXI6pZ4rikhrIUFuYwaikkPdGhcoMJTMN3FHXXJUMaYuxr0bUNbzlgIr03ZQAHT0rnhfv/NnaxY2v9abUBw5ZSk5/fxVnjsr4cUAp4a+aF+0SbuNA6TrM52/7fcJIq8hMm7fdRLOR6Gkwg== 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=mlI3HI7JJG5MoaWoA4E82HzMkS6Bf35oMVPqwYV1nzg=; b=da78i/RkCOw5YBD90T5Q3vW9Ur7TubMbZ9RPEDMtTVlXElUeIRK+LLS+7UNZqJH8M3i7ZDCvtSyAFGsKOP0DexeEESOHrwlEzjfaWd49BM1eBvb3fx3vrY4yXAHTQipPkl9ltNngBy4HyLB6nOT7/m49syAEVWn2Khq0LveDZpo= Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=none action=none header.from=oracle.com; Received: from BLAPR10MB5138.namprd10.prod.outlook.com (2603:10b6:208:322::8) by MN2PR10MB3966.namprd10.prod.outlook.com (2603:10b6:208:183::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.15; Wed, 3 Nov 2021 11:59:30 +0000 Received: from BLAPR10MB5138.namprd10.prod.outlook.com ([fe80::9418:7fcf:86ec:e0f4]) by BLAPR10MB5138.namprd10.prod.outlook.com ([fe80::9418:7fcf:86ec:e0f4%8]) with mapi id 15.20.4669.011; Wed, 3 Nov 2021 11:59:30 +0000 From: Darren Kenny To: Robbie Harwood , grub-devel@gnu.org Cc: Robbie Harwood Subject: Re: [PATCH] Drop gnulib fix-base64.patch In-Reply-To: <20211028192227.351582-1-rharwood@redhat.com> References: <20211028192227.351582-1-rharwood@redhat.com> Date: Wed, 03 Nov 2021 11:59:24 +0000 Message-ID: Content-Type: text/plain X-ClientProxiedBy: DB6PR0601CA0027.eurprd06.prod.outlook.com (2603:10a6:4:17::13) To BLAPR10MB5138.namprd10.prod.outlook.com (2603:10b6:208:322::8) MIME-Version: 1.0 Received: from oracle.com (46.7.162.180) by DB6PR0601CA0027.eurprd06.prod.outlook.com (2603:10a6:4:17::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10 via Frontend Transport; Wed, 3 Nov 2021 11:59:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 17a80746-743f-4ae2-4065-08d99ec1646c X-MS-TrafficTypeDiagnostic: MN2PR10MB3966: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Lz1gJt9hxRoKOcHocC8VqmjzAEya+30az70Kk5RpVASndanc6pcVVhnVmSRhFP2AGhi6EUoBdBNnq0VnTW7ARd2+OYdKQ1oEJcBLPcP6zWZLM+X4obpZ3L9M24MnEURO55cjziKP7o0TMJvihi2aayxuHa9l06SsK4eCHdZx/U8Q8ZhzC1xHpH/wp1ZwulNprcqss/ZrFtEnmF7TDqhIhBjOzOydEaPm0NhIvS76aVaV9HFo2uQTjXS9zcQQYNUGPATxnD0hKuXwCNi2uD4s59YdRnm38FHw4NUMdGe51Nloe80jEXkTHIMKE6Nvaw2hCoduNwZNhsQxVPWD0mSdTHIJ5+KRr6XmP+xxjXeqPGfwI+xVXrTxOElUKo2t9ALliytD697z41XYf3qZlOljA06eirlu5kG+Aiwb7UAkS2BI4hlZr+CaLMAx7JekSWrztcL5HMikt+VJx1bOD7HGfYuY04D+hBxWI6Q9/Mjig03VtYwhKXJU/ip9Ngd89SxVXtNaxQb6HPHP0GmcihogDFhs5u9IoZdvE1mYqmUg+7Up9qOuJTbdnRhoqQA1GPhVTVZkJpYGrZhabpqZ5wAZfluGsevhr0q8uMgcot1tJ5a23nRtdbPqIduQXvpmsQ8UACODKnIUA1KeqOxpWs8hKZUeV5QXD8PncDXywu6q3xUsVh3yIaL6maAYkNpF38Cq663E6D+YqZwb9ph7uaUlwltJaAvIXpx0AvHeE+9MkKV8iU0NZDNwP9Nh94BmgiilYFtxd+0wsImK6ie5YFGy+GX+sl+mDgNKHk0LVrz8xts= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BLAPR10MB5138.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(2906002)(83380400001)(55016002)(966005)(38100700002)(38350700002)(2616005)(8886007)(86362001)(956004)(4326008)(186003)(8676002)(4001150100001)(26005)(66476007)(316002)(8936002)(44832011)(66946007)(66556008)(52116002)(7696005)(6666004)(508600001)(5660300002)(36756003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bkmSPLgWKn5Gf155s76FoMCSyr6SOK065W7YF9HgS42LA4dUNO/8ZU5dRaMP?= =?us-ascii?Q?mHlHaWHbR+xToc029wfP6fDnwmnjNT64CZUf+nspS3HIsQSt2CWhsxIwevw8?= =?us-ascii?Q?ViVpegIQ2gam5lt7EQnA3IRQF554alQVTk6hx4NTNIJGXptLT33eD3fA49UY?= =?us-ascii?Q?bAhcoKyehicAwMRQxHyNluSe+gOpa0IVLAiJbDflZbkCUu2mzPrqFk7bXW2T?= =?us-ascii?Q?Lpt4PTNeHXSFm9LapE7caY7rsXZ/NXozNfXR98Hu45OoTn8spU9RsqArHEzh?= =?us-ascii?Q?dUqhlzcOUD7EY0wDcNtAO3UbY44IxP223Qgonlv1z3mgZWsBl2wIrWZwfAsZ?= =?us-ascii?Q?xfWCOploUBxF5iJ0N04P8LYGPNQtCEqbebE0tVxYOhhGTE9AmJuFsTPJX44T?= =?us-ascii?Q?uziFVgvqF8mjM0aamfGcVyGCNiawtxDyDDeVkWhanGn66UMOQT/njEovZcl4?= =?us-ascii?Q?TdeoKyM+nEOZlGGfKiKXZ/+wJJLkTt6ngQjqkkZRf9Z+W6Z7bLsb1I4Xk5QN?= =?us-ascii?Q?9paT5r9uSxyBM88eiB53mL0qiwor2AGtXsm0FcHBOkMLmk3kvOs/MrGh92Fp?= =?us-ascii?Q?ZKDBlw1562k6zXxlrGFDbxnjeeyXI6Yd/pWhs0pcEWGZKkSfYwQKVisIHsdw?= =?us-ascii?Q?HuhyGCcQEj8ACHOQP1Grk8PoONN/8etpNu7I8jyXGMLu/SKOw3hDvkYEc26T?= =?us-ascii?Q?BkpeNHZWmaRd+efHtOcnXp1cKaj+GTTsV8nInVpB9OuvvOzpcmQNF8iDtCAq?= =?us-ascii?Q?ue+VF1qOkWLQMUfjWGqbXXQjl2mLfN7skE+HnUfniAK9tINbbr/1Gy+Xl4y2?= =?us-ascii?Q?59/CB40umtSymqIQzMJv9a7mKggKkSno7SNWjfBr73ykz2n6qN+gWO3aq92d?= =?us-ascii?Q?YMOTr7RPgqFW4ZZ1hyjbLlIM+uGMjFcR1ex2iT7+OaCpU1+8AMEaDxXNC+7x?= =?us-ascii?Q?CSgQjgWMYAsxfBBwO3HH7YBiHmmkXIAAegGKfDGgwCzdJhAqASzGMqbzdaCA?= =?us-ascii?Q?KqfwOxPBXHUSoo0QRwgVIGlb0qLst1nD/cNcoOGXCxnOHxUMU1upFdk3b97i?= =?us-ascii?Q?HFPHRAp4RTla69vfV5P4/894/b8cyFI/Ut6OYmjfikqRE+QFt/xfnFyCYCK9?= =?us-ascii?Q?dmzG18O0UTLkxn3aSL631VHcf6WJ+W3mNhId4V1xgJeXy/xiqkM+3GDbccXt?= =?us-ascii?Q?wtwUa/viAum6r+tF4slgC2NbqHku2fZ0p6gEb4Q0nf4ZullAHOn9gcJZT7dt?= =?us-ascii?Q?KSMXjrZ+EVO+sd04JhOMooJe1TNWLDRJneBn94WKquqs1lmSK/NcHxlpinvn?= =?us-ascii?Q?lcnB5Ta5CdJ5yjsYEFvA4O8Au15sKWlwbPcvS4yT0E+HRBPv/8R+43D7j/1e?= =?us-ascii?Q?sx9iqIFRHCm4gKI527kqXBrn3Xp8vpN85G7aMLAj+MSu3FfvghXmH9M3gOQW?= =?us-ascii?Q?P+mCzu2H7TybmPCutoyUnE31DBJSPkn2Suw034wvMzGjVOQ4KRCyBkDIv4xo?= =?us-ascii?Q?3g0XPpWP5Q+wxU8/NzoLYCoKM2+sYq/75TBJ2eJOT3buQ3aJSD9MN3g61VRa?= =?us-ascii?Q?C2zw5wBjWWMw50X5GDPPbvtVWxuYTLIb02l/JHW6okaHETtL9glA4aZkA7au?= =?us-ascii?Q?+KH9VRXFJ05i8jaFcdtYSb4=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 17a80746-743f-4ae2-4065-08d99ec1646c X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5138.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2021 11:59:30.1453 (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: It/0sTJwCOgNhQ4yku9y12chdSLWKD/nMhyP773rHiRm6EZ25fnEj14CFncojEEWVfOkxhPEMANhyn3fvcuj4Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB3966 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10156 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxscore=0 spamscore=0 malwarescore=0 mlxlogscore=999 adultscore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2111030068 X-Proofpoint-ORIG-GUID: IeinVh1Dr8jj6FarqpiLKLzHntoXQs4q X-Proofpoint-GUID: IeinVh1Dr8jj6FarqpiLKLzHntoXQs4q Received-SPF: pass client-ip=205.220.177.32; envelope-from=darren.kenny@oracle.com; helo=mx0b-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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: Wed, 03 Nov 2021 11:59:42 -0000 Hi Robbie, Just tried it in a build, and it works for me. On Thursday, 2021-10-28 at 15:22:27 -04, Robbie Harwood wrote: > Originally added in 9fbdec2f6b4fa8b549daa4d49134d1fe89d95ef9 and > subsequently modified in 552c9fd08122a3036c724ce96dfe68aa2f75705f, > fix-base64.patch handled two problems we have using gnulib, which are > exerciesd by the base64 module but not directly caused by it. > > First, grub2 defines its own bool type, while gnulib expects the > equivalent of stdbool.h to be present. Rather than patching gnulib, > instead use gnulib's stdbool module to provide a bool type if needed. > (Suggested by Simon Josefsson.) > > Second, our config.h doesn't always inherit config-util.h, which is > where gnulib-related options like _GL_ATTRIBUTE_CONST end up. > fix-base64.h worked around this by defining the attribute away, but this > workaround is better placed in config.h itself, not a gnulib patch. > > Signed-off-by: Robbie Harwood Reviewed-by: Darren Kenny Thanks, Darren. > --- > bootstrap.conf | 3 ++- > config.h.in | 3 +++ > grub-core/lib/gnulib-patches/fix-base64.patch | 21 ------------------- > grub-core/lib/posix_wrap/sys/types.h | 7 +++---- > grub-core/lib/xzembed/xz.h | 5 +---- > 5 files changed, 9 insertions(+), 30 deletions(-) > delete mode 100644 grub-core/lib/gnulib-patches/fix-base64.patch > > diff --git a/bootstrap.conf b/bootstrap.conf > index 0dd893c5c..21a8cf15d 100644 > --- a/bootstrap.conf > +++ b/bootstrap.conf > @@ -35,6 +35,7 @@ gnulib_modules=" > realloc-gnu > regex > save-cwd > + stdbool > " > > gnulib_tool_option_extras="\ > @@ -80,7 +81,7 @@ cp -a INSTALL INSTALL.grub > > bootstrap_post_import_hook () { > set -e > - for patchname in fix-base64 fix-null-deref fix-null-state-deref fix-regcomp-uninit-token \ > + for patchname in fix-null-deref fix-null-state-deref fix-regcomp-uninit-token \ > fix-regexec-null-deref fix-uninit-structure fix-unused-value fix-width no-abort; do > patch -d grub-core/lib/gnulib -p2 \ > < "grub-core/lib/gnulib-patches/$patchname.patch" > diff --git a/config.h.in b/config.h.in > index 9e8f9911b..2b65c86c4 100644 > --- a/config.h.in > +++ b/config.h.in > @@ -64,4 +64,7 @@ > > #define _GNU_SOURCE 1 > > +/* For gnulib's base64 code. */ > +#define _GL_ATTRIBUTE_CONST /* empty */ > + > #endif > diff --git a/grub-core/lib/gnulib-patches/fix-base64.patch b/grub-core/lib/gnulib-patches/fix-base64.patch > deleted file mode 100644 > index 985db1279..000000000 > --- a/grub-core/lib/gnulib-patches/fix-base64.patch > +++ /dev/null > @@ -1,21 +0,0 @@ > -diff --git a/lib/base64.h b/lib/base64.h > -index 9cd0183b8..185a2afa1 100644 > ---- a/lib/base64.h > -+++ b/lib/base64.h > -@@ -21,8 +21,14 @@ > - /* Get size_t. */ > - # include > - > --/* Get bool. */ > --# include > -+#ifndef GRUB_POSIX_BOOL_DEFINED > -+typedef enum { false = 0, true = 1 } bool; > -+#define GRUB_POSIX_BOOL_DEFINED 1 > -+#endif > -+ > -+#ifndef _GL_ATTRIBUTE_CONST > -+# define _GL_ATTRIBUTE_CONST /* empty */ > -+#endif > - > - # ifdef __cplusplus > - extern "C" { > diff --git a/grub-core/lib/posix_wrap/sys/types.h b/grub-core/lib/posix_wrap/sys/types.h > index 854eb0122..eeda543c4 100644 > --- a/grub-core/lib/posix_wrap/sys/types.h > +++ b/grub-core/lib/posix_wrap/sys/types.h > @@ -23,11 +23,10 @@ > > #include > > +/* Provided by gnulib if not present. */ > +#include > + > typedef grub_ssize_t ssize_t; > -#ifndef GRUB_POSIX_BOOL_DEFINED > -typedef enum { false = 0, true = 1 } bool; > -#define GRUB_POSIX_BOOL_DEFINED 1 > -#endif > > typedef grub_uint8_t uint8_t; > typedef grub_uint16_t uint16_t; > diff --git a/grub-core/lib/xzembed/xz.h b/grub-core/lib/xzembed/xz.h > index f7b32d800..d1417039a 100644 > --- a/grub-core/lib/xzembed/xz.h > +++ b/grub-core/lib/xzembed/xz.h > @@ -29,10 +29,7 @@ > #include > #include > #include > - > -#ifndef GRUB_POSIX_BOOL_DEFINED > -typedef enum { false = 0, true = 1 } bool; > -#endif > +#include > > /** > * enum xz_ret - Return codes > -- > 2.33.0 > > > _______________________________________________ > Grub-devel mailing list > Grub-devel@gnu.org > https://lists.gnu.org/mailman/listinfo/grub-devel