diff -Nru grub2-unsigned-2.04/debian/changelog grub2-unsigned-2.04/debian/changelog --- grub2-unsigned-2.04/debian/changelog 2021-07-16 13:01:31.000000000 +0000 +++ grub2-unsigned-2.04/debian/changelog 2021-09-02 12:37:43.000000000 +0000 @@ -1,4 +1,10 @@ -grub2-unsigned (2.04-1ubuntu46) impish; urgency=medium +grub2-unsigned (2.04-1ubuntu47) impish; urgency=medium + + * Drop grub.cfg-400.patch (LP: #1933826) + + -- Julian Andres Klode Thu, 02 Sep 2021 14:37:43 +0200 + +grub2 (2.04-1ubuntu46) impish; urgency=medium * debian/grub-common.service: change type to oneshot, add wantedby sleep.target, after sleep.target. The service will now start after diff -Nru grub2-unsigned-2.04/debian/patches/default-grub-d.patch grub2-unsigned-2.04/debian/patches/default-grub-d.patch --- grub2-unsigned-2.04/debian/patches/default-grub-d.patch 2021-07-16 13:01:31.000000000 +0000 +++ grub2-unsigned-2.04/debian/patches/default-grub-d.patch 2021-09-02 12:36:52.000000000 +0000 @@ -177,7 +177,7 @@ + free (cfgdir); } diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index b506d63..d18bf97 100644 +index 5d29aa4..e7ef32e 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -164,6 +164,11 @@ fi diff -Nru grub2-unsigned-2.04/debian/patches/grub.cfg-400.patch grub2-unsigned-2.04/debian/patches/grub.cfg-400.patch --- grub2-unsigned-2.04/debian/patches/grub.cfg-400.patch 2021-07-16 13:01:31.000000000 +0000 +++ grub2-unsigned-2.04/debian/patches/grub.cfg-400.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -From: Colin Watson -Date: Mon, 13 Jan 2014 12:12:55 +0000 -Subject: Make grub.cfg world-readable if it contains no passwords - -Patch-Name: grub.cfg-400.patch ---- - util/grub-mkconfig.in | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 9f477ff..45cd4cc 100644 ---- a/util/grub-mkconfig.in -+++ b/util/grub-mkconfig.in -@@ -276,6 +276,10 @@ for i in "${grub_mkconfig_dir}"/* ; do - esac - done - -+if [ "x${grub_cfg}" != "x" ] && ! grep "^password" ${grub_cfg}.new >/dev/null; then -+ chmod 444 ${grub_cfg}.new || true -+fi -+ - if test "x${grub_cfg}" != "x" ; then - if ! ${grub_script_check} ${grub_cfg}.new; then - # TRANSLATORS: %s is replaced by filename diff -Nru grub2-unsigned-2.04/debian/patches/mkconfig-mid-upgrade.patch grub2-unsigned-2.04/debian/patches/mkconfig-mid-upgrade.patch --- grub2-unsigned-2.04/debian/patches/mkconfig-mid-upgrade.patch 2021-07-16 13:01:31.000000000 +0000 +++ grub2-unsigned-2.04/debian/patches/mkconfig-mid-upgrade.patch 2021-09-02 12:36:52.000000000 +0000 @@ -19,7 +19,7 @@ 1 file changed, 7 insertions(+) diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 45cd4cc..b506d63 100644 +index 9f477ff..5d29aa4 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -102,6 +102,13 @@ do diff -Nru grub2-unsigned-2.04/debian/patches/mkconfig-recovery-title.patch grub2-unsigned-2.04/debian/patches/mkconfig-recovery-title.patch --- grub2-unsigned-2.04/debian/patches/mkconfig-recovery-title.patch 2021-07-16 13:01:31.000000000 +0000 +++ grub2-unsigned-2.04/debian/patches/mkconfig-recovery-title.patch 2021-09-02 12:36:52.000000000 +0000 @@ -37,7 +37,7 @@ The following options are still accepted for compatibility with existing diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 3072143..9c1da64 100644 +index f4ef79b..aaef3ab 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -196,6 +196,10 @@ GRUB_ACTUAL_DEFAULT="$GRUB_DEFAULT" diff -Nru grub2-unsigned-2.04/debian/patches/quick-boot.patch grub2-unsigned-2.04/debian/patches/quick-boot.patch --- grub2-unsigned-2.04/debian/patches/quick-boot.patch 2021-07-16 13:01:31.000000000 +0000 +++ grub2-unsigned-2.04/debian/patches/quick-boot.patch 2021-09-02 12:36:52.000000000 +0000 @@ -115,7 +115,7 @@ { pos = grub_term_save_pos (); diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index d18bf97..3072143 100644 +index e7ef32e..f4ef79b 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -250,7 +250,8 @@ export GRUB_DEFAULT \ diff -Nru grub2-unsigned-2.04/debian/patches/series grub2-unsigned-2.04/debian/patches/series --- grub2-unsigned-2.04/debian/patches/series 2021-07-16 13:01:31.000000000 +0000 +++ grub2-unsigned-2.04/debian/patches/series 2021-09-02 12:36:55.000000000 +0000 @@ -3,7 +3,6 @@ dpkg-version-comparison.patch grub-legacy-0-based-partitions.patch disable-floppies.patch -grub.cfg-400.patch ubuntu-zfs-enhance-support.patch gfxpayload-keep-default.patch install-stage2-confusion.patch diff -Nru grub2-unsigned-2.04/debian/patches/ubuntu-flavour-order.patch grub2-unsigned-2.04/debian/patches/ubuntu-flavour-order.patch --- grub2-unsigned-2.04/debian/patches/ubuntu-flavour-order.patch 2021-07-16 13:01:31.000000000 +0000 +++ grub2-unsigned-2.04/debian/patches/ubuntu-flavour-order.patch 2021-09-02 12:36:53.000000000 +0000 @@ -19,7 +19,7 @@ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 72f1e25..6c8988f 100644 +index 9942123..0f3da9d 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -260,7 +260,8 @@ export GRUB_DEFAULT \ diff -Nru grub2-unsigned-2.04/debian/patches/ubuntu-mkconfig-leave-breadcrumbs.patch grub2-unsigned-2.04/debian/patches/ubuntu-mkconfig-leave-breadcrumbs.patch --- grub2-unsigned-2.04/debian/patches/ubuntu-mkconfig-leave-breadcrumbs.patch 2021-07-16 13:01:31.000000000 +0000 +++ grub2-unsigned-2.04/debian/patches/ubuntu-mkconfig-leave-breadcrumbs.patch 2021-09-02 12:36:53.000000000 +0000 @@ -10,7 +10,7 @@ 1 file changed, 2 insertions(+) diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 29bdad0..72f1e25 100644 +index 26c5c89..9942123 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -162,10 +162,12 @@ if [ "x${GRUB_EARLY_INITRD_LINUX_STOCK}" = "x" ]; then diff -Nru grub2-unsigned-2.04/debian/patches/ubuntu-support-initrd-less-boot.patch grub2-unsigned-2.04/debian/patches/ubuntu-support-initrd-less-boot.patch --- grub2-unsigned-2.04/debian/patches/ubuntu-support-initrd-less-boot.patch 2021-07-16 13:01:31.000000000 +0000 +++ grub2-unsigned-2.04/debian/patches/ubuntu-support-initrd-less-boot.patch 2021-09-02 12:36:53.000000000 +0000 @@ -65,7 +65,7 @@ The following options are still accepted for compatibility with existing diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 9c1da64..29bdad0 100644 +index aaef3ab..26c5c89 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -256,7 +256,9 @@ export GRUB_DEFAULT \