Remove old build hacks, update patches and defaults.

6 files changed, 59 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 556149049108..8a85c0c1cf6f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = grub-git
 	pkgdesc = GNU GRand Unified Bootloader (2)
-	pkgver = 2.06.rc1.r0.ga53e530f8
+	pkgver = 2.06.r297.g0c6c1aff2
 	pkgrel = 1
 	url = https://www.gnu.org/software/grub/
 	install = grub-git.install
@@ -34,15 +34,16 @@ pkgbase = grub-git
 	source = grub::git+https://git.savannah.gnu.org/git/grub.git
 	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 = add-GRUB_COLOR_variables.patch
-	source = detect-archlinux-initramfs.patch
+	source = 0001-00_header-add-GRUB_COLOR_-variables.patch
+	source = 0002-10_linux-detect-archlinux-initramfs.patch
 	source = grub.default
+	source = sbat.csv
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = 5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab
-	sha256sums = 580a81b00088773d554832b0d74c85bf16fec37728802973c45993bcb97cd7d5
-	sha256sums = 791fadf182edf8d5bee4b45c008b08adce9689a9624971136527891a8f67d206
+	sha256sums = 8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d
+	sha256sums = c17bf255a41103f6b71a1710afc7e9addaebc578bcf51a48845e227b2f651682
+	sha256sums = 98b23d41e223bdc0a6e20bdcb3aa77e642f29b64081b1fd2f575314172fc89df
 
 pkgname = grub-git
-
diff --git a/add-GRUB_COLOR_variables.patch b/0001-00_header-add-GRUB_COLOR_-variables.patch
index 867e8feeb7b9..867e8feeb7b9 100644
--- a/add-GRUB_COLOR_variables.patch
+++ b/0001-00_header-add-GRUB_COLOR_-variables.patch
diff --git a/detect-archlinux-initramfs.patch b/0002-10_linux-detect-archlinux-initramfs.patch
index 0f5568bf219e..5abb5e63dc88 100644
--- a/detect-archlinux-initramfs.patch
+++ b/0002-10_linux-detect-archlinux-initramfs.patch
@@ -1,25 +1,27 @@
-From 058d08a025f9a6ec77d5ddd1fc62c7bd6abe1a52 Mon Sep 17 00:00:00 2001
+From dbc289f59a2b204af19ef7212f3b6b07d3060452 Mon Sep 17 00:00:00 2001
 From: Christian Hesse <mail@eworm.de>
-Date: Wed, 10 Mar 2021 18:40:00 +0100
-Subject: [PATCH] 10_linux: detect archlinux initramfs
+Date: Mon, 26 Apr 2021 11:10:01 +0200
+Subject: [PATCH 1/1] 10_linux: detect archlinux initramfs
 ---
- util/grub.d/10_linux.in | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
+ util/grub.d/10_linux.in | 29 ++++++++++++++++++++++++++++-
+ 1 file changed, 28 insertions(+), 1 deletion(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index e8b01c0d0..e703dcdb0 100644
+index e8b01c0d0..9b60af944 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -93,6 +93,8 @@ linux_entry ()
+@@ -91,6 +91,10 @@ linux_entry ()
+   fi
+   if [ x$type != xsimple ] ; then
        case $type in
- 	  recovery)
- 	      title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;;
++	  booster)
++	      title="$(gettext_printf "%s, with Linux %s (booster initramfs)" "${os}" "${version}")" ;;
 +	  fallback)
 +	      title="$(gettext_printf "%s, with Linux %s (fallback initramfs)" "${os}" "${version}")" ;;
+ 	  recovery)
+ 	      title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;;
  	  *)
- 	      title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
-       esac
-@@ -198,7 +200,7 @@ while [ "x$list" != "x" ] ; do
+@@ -198,7 +202,7 @@ while [ "x$list" != "x" ] ; do
    basename=`basename $linux`
    dirname=`dirname $linux`
    rel_dirname=`make_system_path_relative_to_its_root $dirname`
@@ -28,13 +30,13 @@ index e8b01c0d0..e703dcdb0 100644
    alt_version=`echo $version | sed -e "s,\.old$,,g"`
    linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
  
-@@ -285,6 +287,18 @@ while [ "x$list" != "x" ] ; do
+@@ -285,6 +289,29 @@ while [ "x$list" != "x" ] ; do
  
    linux_entry "${OS}" "${version}" advanced \
                "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
 +
 +  if test -e "${dirname}/initramfs-${version}-fallback.img" ; then
-+    initrd="initramfs-${version}-fallback.img"
++    initrd="${initrd_early} initramfs-${version}-fallback.img"
 +
 +    if test -n "${initrd}" ; then
 +      gettext_printf "Found fallback initrd image(s) in %s:%s\n" "${dirname}" "${initrd_extra} ${initrd}" >&2
@@ -44,6 +46,17 @@ index e8b01c0d0..e703dcdb0 100644
 +                "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
 +  fi
 +
++  if test -e "${dirname}/booster-${version}.img" ; then
++    initrd="${initrd_early} booster-${version}.img"
++
++    if test -n "${initrd}" ; then
++      gettext_printf "Found booster initrd image(s) in %s:%s\n" "${dirname}" "${initrd_extra} ${initrd}" >&2
++    fi
++
++    linux_entry "${OS}" "${version}" booster \
++                "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
++  fi
++
    if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
      linux_entry "${OS}" "${version}" recovery \
                  "single ${GRUB_CMDLINE_LINUX}"
diff --git a/PKGBUILD b/PKGBUILD
index ddc8e9fc6787..26926ae55ff5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,15 +17,14 @@ _build_platforms="i386-pc ${_target_arch}-efi"
 [[ "${_grub_emu_build}" == "1" ]] && _build_platforms+=" ${_target_arch}-emu"
 
 pkgname="grub-git"
-pkgver=2.06.rc1.r0.ga53e530f8
+pkgver=2.06.r297.g0c6c1aff2
 pkgrel=1
 pkgdesc="GNU GRand Unified Bootloader (2)"
 arch=('x86_64' 'i686')
 url="https://www.gnu.org/software/grub/"
 license=('GPL3')
 depends=('device-mapper' 'freetype2' 'fuse2' 'gettext')
-makedepends=('autogen' 'bdf-unifont' 'git' 'help2man'
-             'python' 'rsync' 'texinfo' 'ttf-dejavu')
+makedepends=('autogen' 'bdf-unifont' 'git' 'help2man' 'python' 'rsync' 'texinfo' 'ttf-dejavu')
 optdepends=('dosfstools: For grub-mkrescue FAT FS and EFI support'
             'efibootmgr: For grub-install EFI support'
             'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue'
@@ -46,25 +45,27 @@ install="${pkgname}.install"
 source=("grub::git+https://git.savannah.gnu.org/git/grub.git"
         "grub-extras::git+https://git.savannah.gnu.org/git/grub-extras.git"
         "gnulib::git+https://git.savannah.gnu.org/git/gnulib.git"
-        'add-GRUB_COLOR_variables.patch'
-        'detect-archlinux-initramfs.patch'
-        'grub.default')
+        '0001-00_header-add-GRUB_COLOR_-variables.patch'
+        '0002-10_linux-detect-archlinux-initramfs.patch'
+        'grub.default'
+        'sbat.csv')
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             '5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab'
-            '580a81b00088773d554832b0d74c85bf16fec37728802973c45993bcb97cd7d5'
-            '791fadf182edf8d5bee4b45c008b08adce9689a9624971136527891a8f67d206')
+            '8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d'
+            'c17bf255a41103f6b71a1710afc7e9addaebc578bcf51a48845e227b2f651682'
+            '98b23d41e223bdc0a6e20bdcb3aa77e642f29b64081b1fd2f575314172fc89df')
  
 prepare() {
     cd grub
 
     # Patch to enable GRUB_COLOR_* variables in grub-mkconfig.
     # Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html
-    patch -Np1 -i "$srcdir"/add-GRUB_COLOR_variables.patch
+    patch -Np1 -i "${srcdir}/0001-00_header-add-GRUB_COLOR_-variables.patch"
 
     # Patch grub-mkconfig to detect Arch Linux initramfs images.
-    patch -Np1 -i "$srcdir"/detect-archlinux-initramfs.patch
+    patch -Np1 -i "${srcdir}/0002-10_linux-detect-archlinux-initramfs.patch"
 
     # Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme.
     sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac"
@@ -102,11 +103,8 @@ build() {
         mkdir "$srcdir"/grub/build_"$_arch"
         cd "$srcdir"/grub/build_"$_arch"
 
-        # * _FORTIFY_SOURCE requires compiling with optimization warnings
-        #   become errors due to a -Werror added during ./configure tests.
-        #   This results in an incorrect configuration and only by adding -O2
-        #   to CPPFLAGS does this problem seem to be worked around.
-        ../configure --with-platform="${_arch##*-}" \
+       ../configure PACKAGE_VERSION="${pkgver}-${pkgrel}" \
+                --with-platform="${_arch##*-}" \
                 --target="${_arch%%-*}"  \
                 --prefix="/usr" \
                 --sbindir="/usr/bin" \
@@ -119,8 +117,7 @@ build() {
                 --enable-mm-debug \
                 --enable-nls \
                 --disable-silent-rules \
-                --disable-werror \
-                CPPFLAGS="$CPPFLAGS -O2" 
+                --disable-werror
         make
     done
 }
@@ -136,6 +133,8 @@ package() {
     # Install /etc/default/grub (used by grub-mkconfig)
     install -D -m0644 "$srcdir"/grub.default "$pkgdir"/etc/default/grub
 
+   sed -e "s/%PKGVER%/${pkgver}-${pkgrel}/" < "${srcdir}/sbat.csv" > "${pkgdir}/usr/share/grub/sbat.csv"
+
     # Tidy up
     find "$pkgdir"/usr/lib/grub \( -name '*.module' -o \
                                    -name '*.image' -o \
diff --git a/grub.default b/grub.default
index 6fd21c7fd223..ba1076eff4c9 100644
--- a/grub.default
+++ b/grub.default
@@ -55,3 +55,9 @@ GRUB_DISABLE_RECOVERY=true
 
 # Uncomment to disable submenus in boot menu
 #GRUB_DISABLE_SUBMENU=y
+
+# Probing for other operating systems is disabled for security reasons. Read
+# documentation on GRUB_DISABLE_OS_PROBER, if still want to enable this
+# functionality install os-prober and uncomment to detect and include other
+# operating systems.
+#GRUB_DISABLE_OS_PROBER=false
diff --git a/sbat.csv b/sbat.csv
new file mode 100644
index 000000000000..c170e07c44f0
--- /dev/null
+++ b/sbat.csv
@@ -0,0 +1,3 @@
+sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
+grub,1,Free Software Foundation,grub,%PKGVER%,https//www.gnu.org/software/grub/
+grub.arch,1,Arch Linux,grub,%PKGVER%,https://archlinux.org/packages/core/x86_64/grub/