[bug #60424] proposed update to grub 2.06-rc1 to use later gnulib

[Rudi Heitbaum]

URL:
  <https://savannah.gnu.org/bugs/?60424>

                 Summary: proposed update to grub 2.06-rc1 to use later gnulib
                 Project: GNU GRUB
            Submitted by: heitbaum
            Submitted on: Tue 20 Apr 2021 01:26:52 PM UTC
                Category: Compilation
                Severity: Major
                Priority: 5 - Normal
              Item Group: None
                  Status: None
                 Privacy: Public
             Assigned to: None
         Originator Name: 
        Originator Email: 
             Open/Closed: Open
                 Release: 
                 Release: Git master
         Discussion Lock: Any
         Reproducibility: Every Time
         Planned Release: None

    _______________________________________________________

Details:

From: bug-grub
https://lists.gnu.org/archive/html/bug-grub/2021-04/msg00003.html

This patch is a proposed update to grub-2.06-rc1 to use a later gnulib.

update d271f86 (2019-01-04) to ebaa53c (2021-01-02)

This is inline with mainstream linux proposed versions.


--- a/grub-core/lib/gnulib-patches/fix-uninit-structure.patch   2021-03-12 
15:09:51.000000000 +0000
+++ b/grub-core/lib/gnulib-patches/fix-uninit-structure.patch   1970-01-01 
00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
---- a/lib/regcomp.c    2020-10-22 13:49:06.770168928 +0000
-+++ b/lib/regcomp.c    2020-10-22 13:50:37.026528298 +0000
-@@ -3662,7 +3662,7 @@
-   Idx alloc = 0;
- #endif /* not RE_ENABLE_I18N */
-   reg_errcode_t ret;
--  re_token_t br_token;
-+  re_token_t br_token = {0};
-   bin_tree_t *tree;
- 
-   sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1);
--- a/grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch       
2021-03-12 15:09:51.000000000 +0000
+++ b/grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch       
1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
---- a/lib/regcomp.c    2020-11-24 17:06:08.159223858 +0000
-+++ b/lib/regcomp.c    2020-11-24 17:06:15.630253923 +0000
-@@ -3808,11 +3808,7 @@
- create_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right,
-            re_token_type_t type)
- {
--  re_token_t t;
--#if defined GCC_LINT || defined lint
--  memset (&t, 0, sizeof t);
--#endif
--  t.type = type;
-+  re_token_t t = { .type = type };
-   return create_token_tree (dfa, left, right, &t);
- }
- 
--- a/bootstrap.conf    2021-03-12 15:09:51.000000000 +0000
+++ b/bootstrap.conf    2021-04-19 13:22:41.000000000 +0000
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 
-GNULIB_REVISION=d271f868a8df9bbec29049d01e056481b7a1a263
+GNULIB_REVISION=ebaa53c5f1253974c6f23bb1500d8de198e84ab8
 
 # gnulib modules used by this package.
 # mbswidth is used by gnulib-fix-width.diff's changes to argp rather than
@@ -79,8 +79,8 @@
 
 bootstrap_post_import_hook () {
   set -e
-  for patchname in fix-base64 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
+  for patchname in fix-base64 fix-null-deref fix-null-state-deref \
+      fix-regexec-null-deref fix-unused-value fix-width no-abort; do
     patch -d grub-core/lib/gnulib -p2 \
       < "grub-core/lib/gnulib-patches/$patchname.patch"
   done




    _______________________________________________________

Reply to this item at:

  <https://savannah.gnu.org/bugs/?60424>

_______________________________________________
  Message sent via Savannah
  https://savannah.gnu.org/