Switch to 15.8 upstream and drop patches

[efi-boot-shim.git] / debian / patches / block-grub-sbat3-debian.patch

diff --git a/debian/patches/block-grub-sbat3-debian.patch b/debian/patches/block-grub-sbat3-debian.patch
deleted file mode 100644 (file)
index 4b0aa39..0000000
--- a/debian/patches/block-grub-sbat3-debian.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/include/sbat_var_defs.h b/include/sbat_var_defs.h
-index 6b01573e..5b1a764f 100644
---- a/include/sbat_var_defs.h
-+++ b/include/sbat_var_defs.h
-@@ -35,8 +35,12 @@
-       SBAT_VAR_SIG SBAT_VAR_VERSION SBAT_VAR_PREVIOUS_DATE "\n" \
-       SBAT_VAR_PREVIOUS_REVOCATIONS
- 
--#define SBAT_VAR_LATEST_DATE "2022111500"
--#define SBAT_VAR_LATEST_REVOCATIONS "shim,2\ngrub,3\n"
-+/*
-+ * Debian's grub.3 update was broken - some binaries included the SBAT
-+ * data update but not the security patches :-(
-+ */
-+#define SBAT_VAR_LATEST_DATE "2023012900"
-+#define SBAT_VAR_LATEST_REVOCATIONS "shim,2\ngrub,3\ngrub.debian,4\n"
- #define SBAT_VAR_LATEST \
-       SBAT_VAR_SIG SBAT_VAR_VERSION SBAT_VAR_LATEST_DATE "\n" \
-       SBAT_VAR_LATEST_REVOCATIONS