Looks good to me, thank you. Reviewed-by: Andrew Hamilton <[email protected]>
On Fri, Oct 24, 2025 at 3:58 PM Daniel Kiper via Grub-devel <[email protected]> wrote: > > Currently bootstrap complains in the following way when > patching gnulib files: > > patching file regcomp.c > Hunk #2 succeeded at 1029 with fuzz 2. > Hunk #5 succeeded at 1716 with fuzz 2. > patching file regexec.c > patching file base64.c > patching file regexec.c > Hunk #1 succeeded at 807 (offset -21 lines). > > Let's fix it by adding missing "\f" and amending line > numbers in the patches. > > Signed-off-by: Daniel Kiper <[email protected]> > --- > grub-core/lib/gnulib-patches/fix-regcomp-resource-leak.patch | 4 ++-- > grub-core/lib/gnulib-patches/fix-unused-value.patch | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/grub-core/lib/gnulib-patches/fix-regcomp-resource-leak.patch > b/grub-core/lib/gnulib-patches/fix-regcomp-resource-leak.patch > index b2e900023..62e7623a6 100644 > --- a/grub-core/lib/gnulib-patches/fix-regcomp-resource-leak.patch > +++ b/grub-core/lib/gnulib-patches/fix-regcomp-resource-leak.patch > @@ -50,7 +50,7 @@ > - return REG_NOERROR; > + return err; > } > - > + > /* If it is possible to do searching in single byte encoding instead of > UTF-8 > @@ -1677,12 +1677,11 @@ calc_eclosure_iter (re_node_set *new_set, re_dfa_t > *dfa, Idx node, bool root) > { > @@ -106,5 +106,5 @@ > + > + return err; > } > - > + > /* Functions for token which are used in the parser. */ > diff --git a/grub-core/lib/gnulib-patches/fix-unused-value.patch > b/grub-core/lib/gnulib-patches/fix-unused-value.patch > index ba51f1bf2..b56ab4bb4 100644 > --- a/grub-core/lib/gnulib-patches/fix-unused-value.patch > +++ b/grub-core/lib/gnulib-patches/fix-unused-value.patch > @@ -1,6 +1,6 @@ > --- a/lib/regexec.c 2020-10-21 14:25:35.310195912 +0000 > +++ b/lib/regexec.c 2020-10-21 14:32:07.961765604 +0000 > -@@ -828,7 +828,11 @@ > +@@ -807,7 +807,11 @@ > break; > if (__glibc_unlikely (err != REG_NOMATCH)) > goto free_return; > -- > 2.11.0 > > > _______________________________________________ > Grub-devel mailing list > [email protected] > https://lists.gnu.org/mailman/listinfo/grub-devel _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
