Import Debian changes 2.04-20parrot1

grub2 (2.04-20parrot1) lts-updates; urgency=medium
.
  * Import new Debian release.
.
grub2 (2.04-20) unstable; urgency=medium
.
  [ Mathieu Trudel-Lapierre ]
  * tpm: Pass unknown error as non-fatal, but debug print the error we got
    (closes: #940911, LP: #1848892).

debian/.git-dpm

 # see git-dpm(1) from git-dpm package
-639560699ce7cc2cd77b872dea9ac091cb9cc3d2
-639560699ce7cc2cd77b872dea9ac091cb9cc3d2
+41fd55afdc80897b91f7145d77347d634042b2f5
+41fd55afdc80897b91f7145d77347d634042b2f5
 578bb115fbd47e1c464696f1f8d6183e5443975d
 578bb115fbd47e1c464696f1f8d6183e5443975d
 grub2_2.04.orig.tar.xz

debian/changelog

+grub2 (2.04-20parrot1) lts-updates; urgency=medium
+
+  * Import new Debian release.
+
+ -- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>  Mon, 16 Aug 2021 04:28:53 +0200
+
+grub2 (2.04-20) unstable; urgency=medium
+
+  [ Mathieu Trudel-Lapierre ]
+  * tpm: Pass unknown error as non-fatal, but debug print the error we got
+    (closes: #940911, LP: #1848892).
+
+ -- Colin Watson <cjwatson@debian.org>  Sun, 11 Jul 2021 00:37:36 +0100
+
 grub2 (2.04-19parrot1) rolling; urgency=medium
 
   * Import new Debian release.

debian/gbp.conf

@@ -8,4 +8,5 @@ patch-numbers = False
 multimaint-merge = True
 
 [import-dsc]
+debian-branch = debian
 debian-tag = debian/%(version)s

debian/kali-ci.yml

+include:
+  - https://gitlab.com/kalilinux/tools/kali-ci-pipeline/raw/master/recipes/kali.yml
+
+# disable lintian: we fork the package from Debian, the errors come from
+# the Debian packaging. We don't want to differ too much from the Debian
+# package.
+variables:
+  SALSA_CI_DISABLE_LINTIAN: 1

debian/patches/add-failsafe-boot-options.patch

+Description: Add failsafe options for acpi and nouveau on boot screen
+Author: Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>
+Last-Update: 2019-03-20
+
+--- grub2-2.02+dfsg1.orig/util/grub.d/10_linux.in
++++ grub2-2.02+dfsg1/util/grub.d/10_linux.in
+@@ -17,6 +17,8 @@ set -e
+ # You should have received a copy of the GNU General Public License
+ # along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ 
++
++
+ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ datarootdir="@datarootdir@"
+@@ -120,6 +122,10 @@ linux_entry ()
+ 	      title="$(gettext_printf "%s, with Linux %s (%s)" "${os}" "${version}" "$(gettext "${GRUB_RECOVERY_TITLE}")")" ;;
+ 	  init-*)
+ 	      title="$(gettext_printf "%s, with Linux %s (%s)" "${os}" "${version}" "${type#init-}")" ;;
++	  nouveau-off)
++	      title="$(gettext_printf "%s, with Linux %s (%s)" "${os}" "${version}" "$(gettext "Nouveau/Nvidia Off")")" ;;
++          acpi-off)
++              title="$(gettext_printf "%s, with Linux %s (%s)" "${os}" "${version}" "$(gettext "ACPI Off")")" ;;
+ 	  *)
+ 	      title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
+       esac
+@@ -334,6 +340,11 @@ while [ "x$list" != "x" ] ; do
+   if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
+     linux_entry "${OS}" "${version}" simple \
+     "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
++    
++  linux_entry "${OS}" "${version}" nouveau-off \
++              "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} nouveau.modeset=0"
++  linux_entry "${OS}" "${version}" acpi-off \
++              "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} acpi=off"
+ 
+     submenu_indentation="$grub_tab"
+     
+
+

debian/patches/series

@@ -218,3 +218,5 @@ pc-verifiers-module.patch
 enable_shim_lock_i386_efi.patch
 debug_verifiers.patch
 mkimage-fix-section-sizes.patch
+tpm-unknown-error-non-fatal.patch
+add-failsafe-boot-options.patch

debian/patches/tpm-unknown-error-non-fatal.patch

+From 41fd55afdc80897b91f7145d77347d634042b2f5 Mon Sep 17 00:00:00 2001
+From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
+Date: Sat, 10 Jul 2021 22:32:00 +0100
+Subject: tpm: Pass unknown error as non-fatal, but debug print the error we
+ got
+
+Signed-off-by: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
+
+Bug-Debian: https://bugs.debian.org/940911
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/1848892
+
+Patch-Name: tpm-unknown-error-non-fatal.patch
+---
+ grub-core/commands/efi/tpm.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/grub-core/commands/efi/tpm.c b/grub-core/commands/efi/tpm.c
+index 32909c192..2defddbea 100644
+--- a/grub-core/commands/efi/tpm.c
++++ b/grub-core/commands/efi/tpm.c
+@@ -155,7 +155,8 @@ grub_tpm1_execute (grub_efi_handle_t tpm_handle,
+     case GRUB_EFI_NOT_FOUND:
+       return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("TPM unavailable"));
+     default:
+-      return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("Unknown TPM error"));
++      grub_dprintf ("tpm", "Unknown TPM error: %" PRIdGRUB_SSIZE, status);
++      return 0;
+     }
+ }
+ 
+@@ -195,7 +196,8 @@ grub_tpm2_execute (grub_efi_handle_t tpm_handle,
+     case GRUB_EFI_NOT_FOUND:
+       return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("TPM unavailable"));
+     default:
+-      return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("Unknown TPM error"));
++      grub_dprintf ("tpm", "Unknown TPM error: %" PRIdGRUB_SSIZE, status);
++      return 0;
+     }
+ }
+ 
+@@ -262,7 +264,8 @@ grub_tpm1_log_event (grub_efi_handle_t tpm_handle, unsigned char *buf,
+     case GRUB_EFI_NOT_FOUND:
+       return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("TPM unavailable"));
+     default:
+-      return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("Unknown TPM error"));
++      grub_dprintf ("tpm", "Unknown TPM error: %" PRIdGRUB_SSIZE, status);
++      return 0;
+     }
+ }
+ 
+@@ -312,7 +315,8 @@ grub_tpm2_log_event (grub_efi_handle_t tpm_handle, unsigned char *buf,
+     case GRUB_EFI_NOT_FOUND:
+       return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("TPM unavailable"));
+     default:
+-      return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("Unknown TPM error"));
++      grub_dprintf ("tpm", "Unknown TPM error: %" PRIdGRUB_SSIZE, status);
++      return 0;
+     }
+ }
+