grub-2.00-1.2: fixing outdated gnulib on the source and improving parabola_grub_mkconfig_fixes.patch

2 files changed, 17 insertions, 11 deletions

diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 9b8102a4c..b94aed44c 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -34,7 +34,7 @@ sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b'
           '89290031b974780c6df76893836d2477d4add895'
           'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a'
           'd5ae2efec25616028a9d89e98b6e454f1c4c415f'
-          '790b9bacb11281bdd43a94a6e9a87072feab42c1'
+          'c631ec04d458c60a3ceffe60d2d1806d54554d9c'
           '06b926320cb2add6c157d59d46e553b89dd3aa03'
           'fb69af1ff6c0b7fdf7ce7d42d0f048edc1a50a45'
           'ce35d7ae75cd1b5b677e894e528f96add40e77b9'
@@ -42,6 +42,10 @@ sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b'
 
 _build_grub-common_and_bios() {
 
+	## fix outdated gnulib on the source
+	sed 's|#undef gets|#undef gets\n#if 0|' -i "${srcdir}/grub-${pkgver}/grub-core/gnulib/stdio.in.h"
+	sed 's|use fgets instead");|use fgets instead");\n#endif|' -i "${srcdir}/grub-${pkgver}/grub-core/gnulib/stdio.in.h"
+
 	## copy the source for building the common/bios package
 	cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub_bios-${pkgver}"
 	cd "${srcdir}/grub_bios-${pkgver}"
diff --git a/libre/grub/parabola_grub_mkconfig_fixes.patch b/libre/grub/parabola_grub_mkconfig_fixes.patch
index e34770058..5324afa01 100644
--- a/libre/grub/parabola_grub_mkconfig_fixes.patch
+++ b/libre/grub/parabola_grub_mkconfig_fixes.patch
@@ -31,23 +31,25 @@ index 765bfdc..b148558 100644
  gfxterm=0;
  for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 14402e8..daa353d 100644
+index 14402e8..e85f7d6 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -31,7 +31,11 @@ CLASS="--class gnu-linux --class gnu --class os"
+@@ -31,7 +31,13 @@ CLASS="--class gnu-linux --class gnu --class os"
  if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
    OS=GNU/Linux
  else
 -  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
 +  if [ "${GRUB_DISTRIBUTOR}" = "Parabola" ] ; then
 +      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
++  elif [ "${GRUB_DISTRIBUTOR}" = "parabola" ] ; then
++      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
 +  else
 +      OS="${GRUB_DISTRIBUTOR} GNU/Linux"
 +  fi
    CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
  fi
  
-@@ -87,6 +91,8 @@ linux_entry ()
+@@ -87,6 +93,8 @@ linux_entry ()
        case $type in
  	  recovery)
  	      title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;;
@@ -56,7 +58,7 @@ index 14402e8..daa353d 100644
  	  *)
  	      title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
        esac
-@@ -100,7 +106,7 @@ linux_entry ()
+@@ -100,7 +108,7 @@ linux_entry ()
    else
        echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
    fi      
@@ -65,7 +67,7 @@ index 14402e8..daa353d 100644
        save_default_entry | sed -e "s/^/\t/"
    fi
  
-@@ -132,7 +138,8 @@ linux_entry ()
+@@ -132,7 +140,8 @@ linux_entry ()
      fi
      printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
    fi
@@ -75,7 +77,7 @@ index 14402e8..daa353d 100644
    sed "s/^/$submenu_indentation/" << EOF
  	echo	'$message'
  	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
-@@ -190,7 +197,22 @@ while [ "x$list" != "x" ] ; do
+@@ -190,7 +199,22 @@ while [ "x$list" != "x" ] ; do
    alt_version=`echo $version | sed -e "s,\.old$,,g"`
    linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
  
@@ -98,7 +100,7 @@ index 14402e8..daa353d 100644
    for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
  	   "initrd-${version}" "initramfs-${version}.img" \
  	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
-@@ -198,7 +220,8 @@ while [ "x$list" != "x" ] ; do
+@@ -198,7 +222,8 @@ while [ "x$list" != "x" ] ; do
  	   "initramfs-genkernel-${version}" \
  	   "initramfs-genkernel-${alt_version}" \
  	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
@@ -108,7 +110,7 @@ index 14402e8..daa353d 100644
      if test -e "${dirname}/${i}" ; then
        initrd="$i"
        break
-@@ -226,6 +249,22 @@ while [ "x$list" != "x" ] ; do
+@@ -226,6 +251,22 @@ while [ "x$list" != "x" ] ; do
      linux_root_device_thisversion=${GRUB_DEVICE}
    fi
  
@@ -131,7 +133,7 @@ index 14402e8..daa353d 100644
    if [ "x$is_first_entry" = xtrue ]; then
      linux_entry "${OS}" "${version}" simple \
      "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-@@ -239,8 +278,11 @@ while [ "x$list" != "x" ] ; do
+@@ -239,8 +280,11 @@ while [ "x$list" != "x" ] ; do
      echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {"
    fi
  
@@ -143,7 +145,7 @@ index 14402e8..daa353d 100644
    if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
      linux_entry "${OS}" "${version}" recovery \
                  "single ${GRUB_CMDLINE_LINUX}"
-@@ -252,8 +294,10 @@ done
+@@ -252,8 +296,10 @@ done
  
  # If at least one kernel was found, then we need to
  # add a closing '}' for the submenu command.