Update patches to account for upstream changes

4 files changed, 42 insertions, 107 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3fb8a7f95a6f..bb82e86cdd11 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = grub-improved-luks2-git
 	pkgdesc = GNU GRand Unified Bootloader (2) with Argon2 and better LUKS2 support
-	pkgver = 2.06.r109.ga9c225776
-	pkgrel = 2
+	pkgver = 2.06.r110.gbe257de00
+	pkgrel = 1
 	url = https://www.gnu.org/software/grub/
 	install = grub-improved-luks2-git.install
 	arch = x86_64
@@ -29,7 +29,7 @@ pkgbase = grub-improved-luks2-git
 	conflicts = grub
 	backup = etc/default/grub
 	backup = etc/grub.d/40_custom
-	source = grub::git+https://git.savannah.gnu.org/git/grub.git
+	source = grub::git+https://git.savannah.gnu.org/git/grub.git#commit=be257de00c
 	source = grub-extras::git+https://git.savannah.gnu.org/git/grub-extras.git
 	source = gnulib::git+https://git.savannah.gnu.org/git/gnulib.git
 	source = argon_1.patch
diff --git a/PKGBUILD b/PKGBUILD
index 1b1b0291298b..404e98e52fed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,8 +20,8 @@ _build_platforms="x86_64-efi"
 
 _pkgname="grub"
 pkgname="${_pkgname}-improved-luks2-git"
-pkgver=2.06.r109.ga9c225776
-pkgrel=2
+pkgver=2.06.r110.gbe257de00
+pkgrel=1
 pkgdesc="GNU GRand Unified Bootloader (2) with Argon2 and better LUKS2 support"
 arch=('x86_64')
 url="https://www.gnu.org/software/grub/"
@@ -41,7 +41,7 @@ conflicts=("${_pkgname}")
 backup=('etc/default/grub'
         'etc/grub.d/40_custom')
 install="${pkgname}.install"
-source=("grub::git+https://git.savannah.gnu.org/git/grub.git"
+source=("grub::git+https://git.savannah.gnu.org/git/grub.git#commit=be257de00c"
         "grub-extras::git+https://git.savannah.gnu.org/git/grub-extras.git"
         "gnulib::git+https://git.savannah.gnu.org/git/gnulib.git"
         'argon_1.patch'
diff --git a/mm_4.patch b/mm_4.patch
index 6a141025b67f..a9e08202fe8b 100644
--- a/mm_4.patch
+++ b/mm_4.patch
@@ -1,24 +1,9 @@
----
- grub-core/kern/efi/mm.c | 23 ++++++++++++++++-------
- 1 file changed, 16 insertions(+), 7 deletions(-)
-
-diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
-index 4d276bc87..cfc6a67fc 100644
---- a/grub-core/kern/efi/mm.c
-+++ b/grub-core/kern/efi/mm.c
-@@ -504,7 +504,7 @@ add_memory_regions (grub_efi_memory_descriptor_t *memory_map,
- 
-       addr = grub_efi_allocate_pages_real (start, pages,
- 					   GRUB_EFI_ALLOCATE_ADDRESS,
--					   GRUB_EFI_LOADER_CODE);      
-+					   GRUB_EFI_LOADER_CODE);
-       if (! addr)
- 	grub_fatal ("cannot allocate conventional memory %p with %u pages",
- 		    (void *) ((grub_addr_t) start),
-@@ -556,8 +556,8 @@ print_memory_map (grub_efi_memory_descriptor_t *memory_map,
+--- a/grub-core/kern/efi/mm.c	2022-03-26 23:38:30.898320806 +0100
++++ b/grub-core/kern/efi/mm.c	2022-03-26 23:42:11.696424298 +0100
+@@ -556,8 +556,8 @@
  }
  #endif
- 
+
 -void
 -grub_efi_mm_init (void)
 +static grub_err_t
@@ -26,42 +11,42 @@ index 4d276bc87..cfc6a67fc 100644
  {
    grub_efi_memory_descriptor_t *memory_map;
    grub_efi_memory_descriptor_t *memory_map_end;
-@@ -570,7 +570,7 @@ grub_efi_mm_init (void)
+@@ -570,7 +570,7 @@
    /* Prepare a memory region to store two memory maps.  */
    memory_map = grub_efi_allocate_any_pages (2 * BYTES_TO_PAGES (MEMORY_MAP_SIZE));
    if (! memory_map)
 -    grub_fatal ("cannot allocate memory");
 +    return grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot allocate memory");
- 
+
    /* Obtain descriptors for available memory.  */
    map_size = MEMORY_MAP_SIZE;
-@@ -588,14 +588,14 @@ grub_efi_mm_init (void)
- 
+@@ -588,14 +588,14 @@
+
        memory_map = grub_efi_allocate_any_pages (2 * BYTES_TO_PAGES (map_size));
        if (! memory_map)
 -	grub_fatal ("cannot allocate memory");
-+	return grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot allocate memory");
- 
++  return grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot allocate memory");
+
        mm_status = grub_efi_get_memory_map (&map_size, memory_map, 0,
  					   &desc_size, 0);
      }
- 
+
    if (mm_status < 0)
 -    grub_fatal ("cannot get memory map");
 +    return grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot get memory map");
- 
+
    memory_map_end = NEXT_MEMORY_DESCRIPTOR (memory_map, map_size);
- 
-@@ -610,7 +610,7 @@ grub_efi_mm_init (void)
- 
+
+@@ -610,7 +610,7 @@
+
    /* Allocate memory regions for GRUB's memory management.  */
    add_memory_regions (filtered_memory_map, desc_size,
 -		      filtered_memory_map_end, BYTES_TO_PAGES (DEFAULT_HEAP_SIZE));
 +		      filtered_memory_map_end, BYTES_TO_PAGES (required_bytes));
- 
+
  #if 0
    /* For debug.  */
-@@ -628,6 +628,15 @@ grub_efi_mm_init (void)
+@@ -628,6 +628,15 @@
    /* Release the memory maps.  */
    grub_efi_free_pages ((grub_addr_t) memory_map,
  		       2 * BYTES_TO_PAGES (MEMORY_MAP_SIZE));
@@ -75,27 +60,5 @@ index 4d276bc87..cfc6a67fc 100644
 +  if (grub_efi_mm_add_regions (DEFAULT_HEAP_SIZE) != GRUB_ERR_NONE)
 +    grub_fatal ("%s", grub_errmsg);
  }
- 
- #if defined (__aarch64__) || defined (__arm__) || defined (__riscv)
--- 
-2.32.0
-
-
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAmEY9eEACgkQVbJhu7ck
-PpToNRAAmgY8k/pUck1W5suQpoJ3Ck6Kxuh6IUodllFPZskfgMAsddwHnGZCyqMA
-rQhxvAizZyS8yoeuQyNeWZQT1QA66XgZNJ7V1jO2Yr3o1fZ4SkNs7pszZbgdfU91
-1koyjg070O7CsdJZsOstCw9BbfuJxb6cfICZzcJjKC1ecOPKsHUzbH8V03IImnes
-dBM/VGoGXvazBg7eEVA6O6OvtpCtftHrhokdTDDL0dfhRNf9ps/FDI1sddmycmex
-0GBljoPIT7ymCxJ0UxSHotwMExm/odh86jfihcfhWGh16MeAYTaMJIl6Q6RaK9jr
-Gzdn65ZHHB7kUAt3JEi72oYw7tnaBOX8wcWe/vgp4XJ8d63T5E44svzUxetS+BvQ
-hvuASM2hciIo4Pj33v96rzs9cth549DsBswra3yJlrTKZzyIcDLbGyuCs+cpa1Ek
-02I0vlTbZLTAh86vGHESKmLaANDIxzh505fY8unQ61xe4SgLNa6B3Nf/KkwQh0uY
-ceClslAq1WgLwoDMeyvCIGO4W7FGvoirH36CXgfOYVGiL4SsZ58FsGNO+7SS7FM7
-68DpuvpzxMUPTD4YOpNE7VIZV59S0/9g3+yL+fcn229jaCzbo48PvBfOUUyYBqw3
-onAqs5TQhn0KS+5zrm1ORnGjN5IXjxu8c+FPm9JGYLw+o6DcwBE=
-=8bqP
------END PGP SIGNATURE-----
-
 
+ #if defined (__aarch64__) || defined (__arm__) || defined (__riscv)
diff --git a/mm_5.patch b/mm_5.patch
index 06ecaefab503..7a9ea62e19f2 100644
--- a/mm_5.patch
+++ b/mm_5.patch
@@ -1,55 +1,49 @@
----
- grub-core/kern/efi/mm.c | 20 +++++++++++++-------
- 1 file changed, 13 insertions(+), 7 deletions(-)
-
-diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
-index cfc6a67fc..ced3ee5e7 100644
---- a/grub-core/kern/efi/mm.c
-+++ b/grub-core/kern/efi/mm.c
-@@ -478,7 +478,7 @@ filter_memory_map (grub_efi_memory_descriptor_t *memory_map,
+--- a/grub-core/kern/efi/mm.c	2022-03-26 23:51:18.575479411 +0100
++++ b/grub-core/kern/efi/mm.c	2022-03-26 23:55:01.813184231 +0100
+@@ -478,7 +478,7 @@
  }
- 
+
  /* Add memory regions.  */
 -static void
 +static grub_err_t
  add_memory_regions (grub_efi_memory_descriptor_t *memory_map,
  		    grub_efi_uintn_t desc_size,
  		    grub_efi_memory_descriptor_t *memory_map_end,
-@@ -506,9 +506,9 @@ add_memory_regions (grub_efi_memory_descriptor_t *memory_map,
+@@ -506,9 +506,9 @@
  					   GRUB_EFI_ALLOCATE_ADDRESS,
  					   GRUB_EFI_LOADER_CODE);
        if (! addr)
 -	grub_fatal ("cannot allocate conventional memory %p with %u pages",
 -		    (void *) ((grub_addr_t) start),
 -		    (unsigned) pages);
-+	return grub_error (GRUB_ERR_OUT_OF_MEMORY,
-+			    "cannot allocate conventional memory %p with %u pages",
-+			    (void *) ((grub_addr_t) start), (unsigned) pages);
- 
++ 	return grub_error (GRUB_ERR_OUT_OF_MEMORY,
++ 			    "cannot allocate conventional memory %p with %u pages",
++ 			    (void *) ((grub_addr_t) start), (unsigned) pages);
+
        grub_mm_init_region (addr, PAGES_TO_BYTES (pages));
- 
-@@ -518,7 +518,9 @@ add_memory_regions (grub_efi_memory_descriptor_t *memory_map,
+
+@@ -518,7 +518,9 @@
      }
- 
+
    if (required_pages > 0)
 -    grub_fatal ("too little memory");
 +    return grub_error (GRUB_ERR_OUT_OF_MEMORY, "too little memory");
 +
 +  return GRUB_ERR_NONE;
  }
- 
+
  void
-@@ -565,6 +567,7 @@ grub_efi_mm_add_regions (grub_efi_uint64_t required_bytes)
+@@ -565,6 +567,7 @@
    grub_efi_memory_descriptor_t *filtered_memory_map_end;
    grub_efi_uintn_t map_size;
    grub_efi_uintn_t desc_size;
 +  grub_err_t err;
    int mm_status;
- 
+
    /* Prepare a memory region to store two memory maps.  */
-@@ -609,8 +612,11 @@ grub_efi_mm_add_regions (grub_efi_uint64_t required_bytes)
+@@ -609,8 +612,11 @@
    sort_memory_map (filtered_memory_map, desc_size, filtered_memory_map_end);
- 
+
    /* Allocate memory regions for GRUB's memory management.  */
 -  add_memory_regions (filtered_memory_map, desc_size,
 -		      filtered_memory_map_end, BYTES_TO_PAGES (required_bytes));
@@ -58,28 +52,6 @@ index cfc6a67fc..ced3ee5e7 100644
 +			    BYTES_TO_PAGES (required_bytes));
 +  if (err != GRUB_ERR_NONE)
 +    return err;
- 
+
  #if 0
    /* For debug.  */
--- 
-2.32.0
-
-
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAmEY9eYACgkQVbJhu7ck
-PpQ8oA//VdC2Bv1hz/RkaRrhMM2vg/MSOeCer4RUrDhXWh8Kvt8koc1D7ZoE9MO7
-p8h1wkIsEEOrxkF5rwf+D0ZTg6joJcAmXPU/A2BY3oXuMSbKgOY/9/vJfDJio2dt
-UNeduTlAJ9YuFtEHEfGEGRVq5egajEoHlas91ScsiYKRqdQmHgkfXeEKGGTr3XMo
-RE/FI1duWhmqgzS9kjDq0dbvTtXEBKRndcDPVxyXpFbl1GE+swJzAUsVRNW7PZe8
-IYopqz3+6wlp7jo80REtV6ndIw2/N1nvScCF/Mfn5VHf/ObDoWw4cnZvgI/5YEnZ
-48v1gMPft95CBjijnoD+F29jFBB6zmK8lFUN4FNY+edoGtlNrmEoZB0FkQJLXWNp
-TS6y4EEx9pJzPuxf2VAF5+eMBzqU6f8qZDoty3NMDPNTDXMr0SjeiSJGMfDdU1Qg
-Ouk9/I7XOLi91QzbyJP4dpfsI78002rzyibOim8jZ8JFv4InKG1krj1JU2BnVj0h
-+7OYIfmDkGZs5ZvZ5PdFgpzqqmlH6wXWZYUMaYHlK2c/mOnJ3ty4NV14cWb8YqrF
-VQ3U5EUzUL+8sTQAxwGGCDuC+E6ZuqZ7qVx0O1c5OeOxVh7o3rPLQ24D9a+6J0iv
-eGvcgaHX+abwi/1fVL2ItovrGiGtfLtxd8y9G0zctgDBrpqVfvU=
-=u8uk
------END PGP SIGNATURE-----
-
-