bootstrap: Fix patching warnings

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 <daniel.kiper@oracle.com>
Reviewed-by: Alec Brown <alec.r.brown@oracle.com>

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 b2e900023d45eb7cd26a3efc98185e531ddcbf37..62e7623a636271087b24dd0b2182c37ee5d5c4fb 100644 (file)
--- 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;
  }
- 
+ \f
  /* 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;
  }
- 
+ \f
  /* 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 ba51f1bf223d4219c6bc17dac5b3239f49e2418f..b56ab4bb442df1b03f7b1c595ce8bb8a08e9ad52 100644 (file)
--- 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;