diff --git a/0010-re-write-.gitignore.patch b/0010-re-write-.gitignore.patch index 3e0b46c..b6fa0be 100644 --- a/0010-re-write-.gitignore.patch +++ b/0010-re-write-.gitignore.patch @@ -4,14 +4,14 @@ Date: Mon, 8 Jul 2019 12:55:29 +0200 Subject: [PATCH] re-write .gitignore --- - .gitignore | 152 ++++++++++++++++++++++++++++++++++++++ + .gitignore | 150 ++++++++++++++++++++++++++++++++++++++ docs/.gitignore | 5 ++ grub-core/.gitignore | 16 ++++ grub-core/lib/.gitignore | 1 + include/grub/gcrypt/.gitignore | 2 + po/.gitignore | 5 ++ util/bash-completion.d/.gitignore | 2 + - 7 files changed, 183 insertions(+) + 7 files changed, 181 insertions(+) create mode 100644 docs/.gitignore create mode 100644 grub-core/.gitignore create mode 100644 grub-core/lib/.gitignore @@ -20,10 +20,10 @@ Subject: [PATCH] re-write .gitignore create mode 100644 util/bash-completion.d/.gitignore diff --git a/.gitignore b/.gitignore -index f6a1bd0517..594d0134d3 100644 +index f6a1bd0517..208d1d2325 100644 --- a/.gitignore +++ b/.gitignore -@@ -275,3 +275,155 @@ widthspec.bin +@@ -275,3 +275,153 @@ widthspec.bin /xfs_test /xzcompress_test /zfs_test @@ -152,8 +152,6 @@ index f6a1bd0517..594d0134d3 100644 +/grub*-reboot.8 +/grub*-render-label +/grub*-render-label.1 -+/grub*-rpm-sort -+/grub*-rpm-sort.8 +/grub*-script-check +/grub*-script-check.1 +/grub*-set-bootflag diff --git a/0033-Make-grub2-mkconfig-construct-titles-that-look-like-.patch b/0032-Make-grub2-mkconfig-construct-titles-that-look-like-.patch similarity index 100% rename from 0033-Make-grub2-mkconfig-construct-titles-that-look-like-.patch rename to 0032-Make-grub2-mkconfig-construct-titles-that-look-like-.patch diff --git a/0032-Use-rpm-s-sort-for-grub2-mkconfig.patch b/0032-Use-rpm-s-sort-for-grub2-mkconfig.patch deleted file mode 100644 index 9463ef8..0000000 --- a/0032-Use-rpm-s-sort-for-grub2-mkconfig.patch +++ /dev/null @@ -1,457 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Robert Marshall -Date: Mon, 16 Mar 2015 14:14:19 -0400 -Subject: [PATCH] Use rpm's sort for grub2-mkconfig - -Add an option for rpm-based systems to use the rpm-sort library to sort -kernels. This avoids problems due to discrepancies between `sort -V` -and rpm. - -Signed-off-by: Robert Marshall -[pjones: fix --enable-rpm-sort configure option] -Signed-off-by: Peter Jones -[thierry.vignaud: fix build with rpm-4.16] -Signed-off-by: Thierry Vignaud -[tim: fix disabling grub-rpm-sort by ./configure] -Signed-off-by: Tim Landscheidt -[javierm: don't check for rpmvercmp in librpm] -Signed-off-by: Javier Martinez Canillas -[rharwood: commit message, migrate to h2m] -Signed-off-by: Robbie Harwood ---- - configure.ac | 36 ++++++ - Makefile.util.def | 17 +++ - util/grub-rpm-sort.c | 281 +++++++++++++++++++++++++++++++++++++++++++++ - docs/man/grub-rpm-sort.h2m | 2 + - util/grub-mkconfig_lib.in | 11 +- - 5 files changed, 346 insertions(+), 1 deletion(-) - create mode 100644 util/grub-rpm-sort.c - create mode 100644 docs/man/grub-rpm-sort.h2m - -diff --git a/configure.ac b/configure.ac -index 8331f95b64..87c8f17393 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -72,6 +72,7 @@ grub_TRANSFORM([grub-mkrelpath]) - grub_TRANSFORM([grub-mkrescue]) - grub_TRANSFORM([grub-probe]) - grub_TRANSFORM([grub-reboot]) -+grub_TRANSFORM([grub-rpm-sort]) - grub_TRANSFORM([grub-script-check]) - grub_TRANSFORM([grub-set-default]) - grub_TRANSFORM([grub-sparc64-setup]) -@@ -1837,6 +1838,35 @@ fi - - AC_SUBST([LIBDEVMAPPER]) - -+AC_ARG_ENABLE([rpm-sort], -+ [AS_HELP_STRING([--enable-rpm-sort], -+ [enable native rpm sorting of kernels in grub (default=guessed)])]) -+if test x"$enable_rpm_sort" = xno ; then -+ rpm_sort_excuse="explicitly disabled" -+else -+ enable_rpm_sort=yes -+fi -+ -+if test x"$rpm_sort_excuse" = x ; then -+ # Check for rpmlib header. -+ AC_CHECK_HEADER([rpm/rpmlib.h], [], -+ [rpm_sort_excuse="need rpm/rpmlib header"]) -+fi -+ -+if test x"$rpm_sort_excuse" = x ; then -+ # Check for rpmio library. -+ AC_CHECK_LIB([rpmio], [rpmvercmp], [], -+ [rpm_sort_excuse="rpmio missing rpmvercmp"]) -+fi -+ -+if test x"$rpm_sort_excuse" = x ; then -+ LIBRPM="-lrpmio"; -+ AC_DEFINE([HAVE_RPMIO], [1], -+ [Define to 1 if you have the rpmio library.]) -+fi -+ -+AC_SUBST([LIBRPM]) -+ - LIBGEOM= - if test x$host_kernel = xkfreebsd; then - AC_CHECK_LIB([geom], [geom_gettree], [], -@@ -2024,6 +2054,7 @@ AM_CONDITIONAL([COND_GRUB_EMU_SDL], [test x$enable_grub_emu_sdl = xyes]) - AM_CONDITIONAL([COND_GRUB_EMU_PCI], [test x$enable_grub_emu_pci = xyes]) - AM_CONDITIONAL([COND_GRUB_MKFONT], [test x$enable_grub_mkfont = xyes]) - AM_CONDITIONAL([COND_GRUB_MOUNT], [test x$enable_grub_mount = xyes]) -+AM_CONDITIONAL([COND_GRUB_RPM_SORT], [test x$enable_rpm_sort = xyes]) - AM_CONDITIONAL([COND_HAVE_FONT_SOURCE], [test x$FONT_SOURCE != x]) - if test x$FONT_SOURCE != x ; then - HAVE_FONT_SOURCE=1 -@@ -2145,6 +2176,11 @@ echo grub-mount: Yes - else - echo grub-mount: No "($grub_mount_excuse)" - fi -+if [ x"$rpm_sort_excuse" = x ]; then -+echo grub-rpm-sort: Yes -+else -+echo grub-rpm-sort: No "($rpm_sort_excuse)" -+fi - if [ x"$starfield_excuse" = x ]; then - echo starfield theme: Yes - echo With DejaVuSans font from $DJVU_FONT_SOURCE -diff --git a/Makefile.util.def b/Makefile.util.def -index 2c9b283a23..bc10cc7972 100644 ---- a/Makefile.util.def -+++ b/Makefile.util.def -@@ -703,6 +703,23 @@ program = { - ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)'; - }; - -+program = { -+ name = grub-rpm-sort; -+ mansection = 8; -+ installdir = sbin; -+ -+ common = grub-core/kern/emu/misc.c; -+ common = grub-core/kern/emu/argp_common.c; -+ common = grub-core/osdep/init.c; -+ common = util/misc.c; -+ common = util/grub-rpm-sort.c; -+ -+ ldadd = libgrubkern.a; -+ ldadd = grub-core/lib/gnulib/libgnu.a; -+ ldadd = '$(LIBDEVMAPPER) $(LIBRPM)'; -+ condition = COND_GRUB_RPM_SORT; -+}; -+ - script = { - name = grub-mkconfig; - common = util/grub-mkconfig.in; -diff --git a/util/grub-rpm-sort.c b/util/grub-rpm-sort.c -new file mode 100644 -index 0000000000..f33bd1ed56 ---- /dev/null -+++ b/util/grub-rpm-sort.c -@@ -0,0 +1,281 @@ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+static size_t -+read_file (const char *input, char **ret) -+{ -+ FILE *in; -+ size_t s; -+ size_t sz = 2048; -+ size_t offset = 0; -+ char *text; -+ -+ if (!strcmp(input, "-")) -+ in = stdin; -+ else -+ in = grub_util_fopen(input, "r"); -+ -+ text = xmalloc (sz); -+ -+ if (!in) -+ grub_util_error (_("cannot open `%s': %s"), input, strerror (errno)); -+ -+ while ((s = fread (text + offset, 1, sz - offset, in)) != 0) -+ { -+ offset += s; -+ if (sz - offset == 0) -+ { -+ sz += 2048; -+ text = xrealloc (text, sz); -+ } -+ } -+ -+ text[offset] = '\0'; -+ *ret = text; -+ -+ if (in != stdin) -+ fclose(in); -+ -+ return offset + 1; -+} -+ -+/* returns name/version/release */ -+/* NULL string pointer returned if nothing found */ -+static void -+split_package_string (char *package_string, char **name, -+ char **version, char **release) -+{ -+ char *package_version, *package_release; -+ -+ /* Release */ -+ package_release = strrchr (package_string, '-'); -+ -+ if (package_release != NULL) -+ *package_release++ = '\0'; -+ -+ *release = package_release; -+ -+ /* Version */ -+ package_version = strrchr(package_string, '-'); -+ -+ if (package_version != NULL) -+ *package_version++ = '\0'; -+ -+ *version = package_version; -+ /* Name */ -+ *name = package_string; -+ -+ /* Bubble up non-null values from release to name */ -+ if (*name == NULL) -+ { -+ *name = (*version == NULL ? *release : *version); -+ *version = *release; -+ *release = NULL; -+ } -+ if (*version == NULL) -+ { -+ *version = *release; -+ *release = NULL; -+ } -+} -+ -+/* -+ * package name-version-release comparator for qsort -+ * expects p, q which are pointers to character strings (char *) -+ * which will not be altered in this function -+ */ -+static int -+package_version_compare (const void *p, const void *q) -+{ -+ char *local_p, *local_q; -+ char *lhs_name, *lhs_version, *lhs_release; -+ char *rhs_name, *rhs_version, *rhs_release; -+ int vercmpflag = 0; -+ -+ local_p = alloca (strlen (*(char * const *)p) + 1); -+ local_q = alloca (strlen (*(char * const *)q) + 1); -+ -+ /* make sure these allocated */ -+ assert (local_p); -+ assert (local_q); -+ -+ strcpy (local_p, *(char * const *)p); -+ strcpy (local_q, *(char * const *)q); -+ -+ split_package_string (local_p, &lhs_name, &lhs_version, &lhs_release); -+ split_package_string (local_q, &rhs_name, &rhs_version, &rhs_release); -+ -+ /* Check Name and return if unequal */ -+ vercmpflag = rpmvercmp ((lhs_name == NULL ? "" : lhs_name), -+ (rhs_name == NULL ? "" : rhs_name)); -+ if (vercmpflag != 0) -+ return vercmpflag; -+ -+ /* Check version and return if unequal */ -+ vercmpflag = rpmvercmp ((lhs_version == NULL ? "" : lhs_version), -+ (rhs_version == NULL ? "" : rhs_version)); -+ if (vercmpflag != 0) -+ return vercmpflag; -+ -+ /* Check release and return the version compare value */ -+ vercmpflag = rpmvercmp ((lhs_release == NULL ? "" : lhs_release), -+ (rhs_release == NULL ? "" : rhs_release)); -+ -+ return vercmpflag; -+} -+ -+static void -+add_input (const char *filename, char ***package_names, size_t *n_package_names) -+{ -+ char *orig_input_buffer = NULL; -+ char *input_buffer; -+ char *position_of_newline; -+ char **names = *package_names; -+ char **new_names = NULL; -+ size_t n_names = *n_package_names; -+ -+ if (!*package_names) -+ new_names = names = xmalloc (sizeof (char *) * 2); -+ -+ if (read_file (filename, &orig_input_buffer) < 2) -+ { -+ if (new_names) -+ free (new_names); -+ if (orig_input_buffer) -+ free (orig_input_buffer); -+ return; -+ } -+ -+ input_buffer = orig_input_buffer; -+ while (input_buffer && *input_buffer && -+ (position_of_newline = strchrnul (input_buffer, '\n'))) -+ { -+ size_t sz = position_of_newline - input_buffer; -+ char *new; -+ -+ if (sz == 0) -+ { -+ input_buffer = position_of_newline + 1; -+ continue; -+ } -+ -+ new = xmalloc (sz+1); -+ strncpy (new, input_buffer, sz); -+ new[sz] = '\0'; -+ -+ names = xrealloc (names, sizeof (char *) * (n_names + 1)); -+ names[n_names] = new; -+ n_names++; -+ -+ /* move buffer ahead to next line */ -+ input_buffer = position_of_newline + 1; -+ if (*position_of_newline == '\0') -+ input_buffer = NULL; -+ } -+ -+ free (orig_input_buffer); -+ -+ *package_names = names; -+ *n_package_names = n_names; -+} -+ -+static char * -+help_filter (int key, const char *text, void *input __attribute__ ((unused))) -+{ -+ return (char *)text; -+} -+ -+static struct argp_option options[] = { -+ { 0, } -+}; -+ -+struct arguments -+{ -+ size_t ninputs; -+ size_t input_max; -+ char **inputs; -+}; -+ -+static error_t -+argp_parser (int key, char *arg, struct argp_state *state) -+{ -+ struct arguments *arguments = state->input; -+ switch (key) -+ { -+ case ARGP_KEY_ARG: -+ assert (arguments->ninputs < arguments->input_max); -+ arguments->inputs[arguments->ninputs++] = xstrdup (arg); -+ break; -+ default: -+ return ARGP_ERR_UNKNOWN; -+ } -+ return 0; -+} -+ -+static struct argp argp = { -+ options, argp_parser, N_("[INPUT_FILES]"), -+ N_("Sort a list of strings in RPM version sort order."), -+ NULL, help_filter, NULL -+}; -+ -+int -+main (int argc, char *argv[]) -+{ -+ struct arguments arguments; -+ char **package_names = NULL; -+ size_t n_package_names = 0; -+ int i; -+ -+ grub_util_host_init (&argc, &argv); -+ -+ memset (&arguments, 0, sizeof (struct arguments)); -+ arguments.input_max = argc+1; -+ arguments.inputs = xmalloc ((arguments.input_max + 1) -+ * sizeof (arguments.inputs[0])); -+ memset (arguments.inputs, 0, (arguments.input_max + 1) -+ * sizeof (arguments.inputs[0])); -+ -+ /* Parse our arguments */ -+ if (argp_parse (&argp, argc, argv, 0, 0, &arguments) != 0) -+ grub_util_error ("%s", _("Error in parsing command line arguments\n")); -+ -+ /* If there's no inputs in argv, add one for stdin */ -+ if (!arguments.ninputs) -+ { -+ arguments.ninputs = 1; -+ arguments.inputs[0] = xmalloc (2); -+ strcpy(arguments.inputs[0], "-"); -+ } -+ -+ for (i = 0; i < arguments.ninputs; i++) -+ add_input(arguments.inputs[i], &package_names, &n_package_names); -+ -+ if (package_names == NULL || n_package_names < 1) -+ grub_util_error ("%s", _("Invalid input\n")); -+ -+ qsort (package_names, n_package_names, sizeof (char *), -+ package_version_compare); -+ -+ /* send sorted list to stdout */ -+ for (i = 0; i < n_package_names; i++) -+ { -+ fprintf (stdout, "%s\n", package_names[i]); -+ free (package_names[i]); -+ } -+ -+ free (package_names); -+ for (i = 0; i < arguments.ninputs; i++) -+ free (arguments.inputs[i]); -+ -+ free (arguments.inputs); -+ -+ return 0; -+} -diff --git a/docs/man/grub-rpm-sort.h2m b/docs/man/grub-rpm-sort.h2m -new file mode 100644 -index 0000000000..fe711ae102 ---- /dev/null -+++ b/docs/man/grub-rpm-sort.h2m -@@ -0,0 +1,2 @@ -+[NAME] -+grub-rpm-sort \- sort input according to RPM version compare -diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in -index 0f6505bf3b..42c2ea9ba5 100644 ---- a/util/grub-mkconfig_lib.in -+++ b/util/grub-mkconfig_lib.in -@@ -33,6 +33,9 @@ fi - if test "x$grub_mkrelpath" = x; then - grub_mkrelpath="${bindir}/@grub_mkrelpath@" - fi -+if test "x$grub_rpm_sort" = x; then -+ grub_rpm_sort="${sbindir}/@grub_rpm_sort@" -+fi - - if command -v gettext >/dev/null; then - : -@@ -218,6 +221,12 @@ version_sort () - esac - } - -+if [ "x$grub_rpm_sort" != x -a -x "$grub_rpm_sort" ]; then -+ kernel_sort="$grub_rpm_sort" -+else -+ kernel_sort=version_sort -+fi -+ - version_test_numeric () - { - version_test_numeric_a="$1" -@@ -234,7 +243,7 @@ version_test_numeric () - version_test_numeric_a="$version_test_numeric_b" - version_test_numeric_b="$version_test_numeric_c" - fi -- if (echo "$version_test_numeric_a" ; echo "$version_test_numeric_b") | version_sort | head -n 1 | grep -qx "$version_test_numeric_b" ; then -+ if (echo "$version_test_numeric_a" ; echo "$version_test_numeric_b") | "$kernel_sort" | head -n 1 | grep -qx "$version_test_numeric_b" ; then - return 0 - else - return 1 diff --git a/0034-Add-friendly-grub2-password-config-tool-985962.patch b/0033-Add-friendly-grub2-password-config-tool-985962.patch similarity index 97% rename from 0034-Add-friendly-grub2-password-config-tool-985962.patch rename to 0033-Add-friendly-grub2-password-config-tool-985962.patch index 49089f9..f430e96 100644 --- a/0034-Add-friendly-grub2-password-config-tool-985962.patch +++ b/0033-Add-friendly-grub2-password-config-tool-985962.patch @@ -14,7 +14,7 @@ Signed-off-by: Robert Marshall Signed-off-by: Peter Jones [luto: fix grub-setpassword -o's output path] Signed-off-by: Andy Lutomirski -[rharwood: migrate man page to h2m] +[rharwood: migrate man page to h2m, context] Signed-off-by: Robbie Harwood --- configure.ac | 1 + @@ -29,7 +29,7 @@ Signed-off-by: Robbie Harwood create mode 100644 util/grub.d/01_users.in diff --git a/configure.ac b/configure.ac -index 87c8f17393..916bede6bf 100644 +index 8331f95b64..7f59ad788f 100644 --- a/configure.ac +++ b/configure.ac @@ -72,6 +72,7 @@ grub_TRANSFORM([grub-mkrelpath]) @@ -37,11 +37,11 @@ index 87c8f17393..916bede6bf 100644 grub_TRANSFORM([grub-probe]) grub_TRANSFORM([grub-reboot]) +grub_TRANSFORM([grub-set-password]) - grub_TRANSFORM([grub-rpm-sort]) grub_TRANSFORM([grub-script-check]) grub_TRANSFORM([grub-set-default]) + grub_TRANSFORM([grub-sparc64-setup]) diff --git a/Makefile.util.def b/Makefile.util.def -index bc10cc7972..8ca4c14f0b 100644 +index 2c9b283a23..4ee22c5daa 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -452,6 +452,12 @@ script = { @@ -57,7 +57,7 @@ index bc10cc7972..8ca4c14f0b 100644 script = { name = '10_windows'; common = util/grub.d/10_windows.in; -@@ -741,6 +747,13 @@ script = { +@@ -724,6 +730,13 @@ script = { installdir = sbin; }; diff --git a/0035-tcp-add-window-scaling-support.patch b/0034-tcp-add-window-scaling-support.patch similarity index 100% rename from 0035-tcp-add-window-scaling-support.patch rename to 0034-tcp-add-window-scaling-support.patch diff --git a/0036-efinet-and-bootp-add-support-for-dhcpv6.patch b/0035-efinet-and-bootp-add-support-for-dhcpv6.patch similarity index 100% rename from 0036-efinet-and-bootp-add-support-for-dhcpv6.patch rename to 0035-efinet-and-bootp-add-support-for-dhcpv6.patch diff --git a/0037-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch b/0036-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch similarity index 98% rename from 0037-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch rename to 0036-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch index b3f5df4..95490cd 100644 --- a/0037-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch +++ b/0036-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch @@ -24,7 +24,7 @@ Resolves: rhbz#1226325 create mode 100644 util/grub-get-kernel-settings.in diff --git a/configure.ac b/configure.ac -index 916bede6bf..4f1676967e 100644 +index 7f59ad788f..0d0e6782a1 100644 --- a/configure.ac +++ b/configure.ac @@ -65,6 +65,7 @@ grub_TRANSFORM([grub-install]) @@ -36,10 +36,10 @@ index 916bede6bf..4f1676967e 100644 grub_TRANSFORM([grub-mklayout]) grub_TRANSFORM([grub-mkpasswd-pbkdf2]) diff --git a/Makefile.util.def b/Makefile.util.def -index 8ca4c14f0b..43a1c7453b 100644 +index 4ee22c5daa..18a9242776 100644 --- a/Makefile.util.def +++ b/Makefile.util.def -@@ -733,6 +733,13 @@ script = { +@@ -716,6 +716,13 @@ script = { installdir = sbin; }; diff --git a/0038-bz1374141-fix-incorrect-mask-for-ppc64.patch b/0037-bz1374141-fix-incorrect-mask-for-ppc64.patch similarity index 100% rename from 0038-bz1374141-fix-incorrect-mask-for-ppc64.patch rename to 0037-bz1374141-fix-incorrect-mask-for-ppc64.patch diff --git a/0039-Make-grub_fatal-also-backtrace.patch b/0038-Make-grub_fatal-also-backtrace.patch similarity index 100% rename from 0039-Make-grub_fatal-also-backtrace.patch rename to 0038-Make-grub_fatal-also-backtrace.patch diff --git a/0040-Make-our-info-pages-say-grub2-where-appropriate.patch b/0039-Make-our-info-pages-say-grub2-where-appropriate.patch similarity index 100% rename from 0040-Make-our-info-pages-say-grub2-where-appropriate.patch rename to 0039-Make-our-info-pages-say-grub2-where-appropriate.patch diff --git a/0041-macos-just-build-chainloader-entries-don-t-try-any-x.patch b/0040-macos-just-build-chainloader-entries-don-t-try-any-x.patch similarity index 100% rename from 0041-macos-just-build-chainloader-entries-don-t-try-any-x.patch rename to 0040-macos-just-build-chainloader-entries-don-t-try-any-x.patch diff --git a/0042-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch b/0041-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch similarity index 100% rename from 0042-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch rename to 0041-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch diff --git a/0043-export-btrfs_subvol-and-btrfs_subvolid.patch b/0042-export-btrfs_subvol-and-btrfs_subvolid.patch similarity index 100% rename from 0043-export-btrfs_subvol-and-btrfs_subvolid.patch rename to 0042-export-btrfs_subvol-and-btrfs_subvolid.patch diff --git a/0044-grub2-btrfs-03-follow_default.patch b/0043-grub2-btrfs-03-follow_default.patch similarity index 100% rename from 0044-grub2-btrfs-03-follow_default.patch rename to 0043-grub2-btrfs-03-follow_default.patch diff --git a/0045-grub2-btrfs-04-grub2-install.patch b/0044-grub2-btrfs-04-grub2-install.patch similarity index 100% rename from 0045-grub2-btrfs-04-grub2-install.patch rename to 0044-grub2-btrfs-04-grub2-install.patch diff --git a/0046-grub2-btrfs-05-grub2-mkconfig.patch b/0045-grub2-btrfs-05-grub2-mkconfig.patch similarity index 98% rename from 0046-grub2-btrfs-05-grub2-mkconfig.patch rename to 0045-grub2-btrfs-05-grub2-mkconfig.patch index 06d15a7..ca3f86b 100644 --- a/0046-grub2-btrfs-05-grub2-mkconfig.patch +++ b/0045-grub2-btrfs-05-grub2-mkconfig.patch @@ -27,10 +27,10 @@ index 005f093809..535c0f0249 100644 if test "x${grub_cfg}" != "x"; then rm -f "${grub_cfg}.new" diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in -index 42c2ea9ba5..fafeac9506 100644 +index 0f6505bf3b..5e96f6cc5d 100644 --- a/util/grub-mkconfig_lib.in +++ b/util/grub-mkconfig_lib.in -@@ -52,7 +52,11 @@ grub_warn () +@@ -49,7 +49,11 @@ grub_warn () make_system_path_relative_to_its_root () { diff --git a/0047-grub2-btrfs-06-subvol-mount.patch b/0046-grub2-btrfs-06-subvol-mount.patch similarity index 100% rename from 0047-grub2-btrfs-06-subvol-mount.patch rename to 0046-grub2-btrfs-06-subvol-mount.patch diff --git a/0048-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch b/0047-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch similarity index 100% rename from 0048-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch rename to 0047-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch diff --git a/0049-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch b/0048-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch similarity index 100% rename from 0049-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch rename to 0048-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch diff --git a/0050-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch b/0049-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch similarity index 100% rename from 0050-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch rename to 0049-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch diff --git a/0051-Use-grub_efi_.-memory-helpers-where-reasonable.patch b/0050-Use-grub_efi_.-memory-helpers-where-reasonable.patch similarity index 100% rename from 0051-Use-grub_efi_.-memory-helpers-where-reasonable.patch rename to 0050-Use-grub_efi_.-memory-helpers-where-reasonable.patch diff --git a/0052-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch b/0051-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch similarity index 100% rename from 0052-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch rename to 0051-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch diff --git a/0053-don-t-use-int-for-efi-status.patch b/0052-don-t-use-int-for-efi-status.patch similarity index 100% rename from 0053-don-t-use-int-for-efi-status.patch rename to 0052-don-t-use-int-for-efi-status.patch diff --git a/0054-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch b/0053-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch similarity index 100% rename from 0054-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch rename to 0053-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch diff --git a/0055-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch b/0054-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch similarity index 100% rename from 0055-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch rename to 0054-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch diff --git a/0056-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch b/0055-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch similarity index 100% rename from 0056-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch rename to 0055-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch diff --git a/0057-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch b/0056-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch similarity index 100% rename from 0057-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch rename to 0056-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch diff --git a/0058-align-struct-efi_variable-better.patch b/0057-align-struct-efi_variable-better.patch similarity index 100% rename from 0058-align-struct-efi_variable-better.patch rename to 0057-align-struct-efi_variable-better.patch diff --git a/0059-Add-BLS-support-to-grub-mkconfig.patch b/0058-Add-BLS-support-to-grub-mkconfig.patch similarity index 97% rename from 0059-Add-BLS-support-to-grub-mkconfig.patch rename to 0058-Add-BLS-support-to-grub-mkconfig.patch index 4c3f56f..3e5b230 100644 --- a/0059-Add-BLS-support-to-grub-mkconfig.patch +++ b/0058-Add-BLS-support-to-grub-mkconfig.patch @@ -24,7 +24,7 @@ Signed-off-by: Peter Jones Signed-off-by: Javier Martinez Canillas [iwienand@redhat.com: skip machine ID check when updating entries] Signed-off-by: Ian Wienand -[rharwood: commit message composits, drop man pages] +[rharwood: use sort(1), commit message composits, drop man pages] Signed-off-by: Robbie Harwood --- util/grub-mkconfig.in | 9 +- @@ -74,7 +74,7 @@ index 535c0f0249..f55339a3f6 100644 if test "x${grub_cfg}" != "x"; then rm -f "${grub_cfg}.new" diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in -index fafeac9506..d8bb406936 100644 +index 5e96f6cc5d..301d8a8a1e 100644 --- a/util/grub-mkconfig_lib.in +++ b/util/grub-mkconfig_lib.in @@ -30,6 +30,9 @@ fi @@ -87,7 +87,7 @@ index fafeac9506..d8bb406936 100644 if test "x$grub_mkrelpath" = x; then grub_mkrelpath="${bindir}/@grub_mkrelpath@" fi -@@ -125,8 +128,19 @@ EOF +@@ -122,8 +125,19 @@ EOF fi } @@ -107,7 +107,7 @@ index fafeac9506..d8bb406936 100644 old_ifs="$IFS" IFS=' ' -@@ -161,18 +175,18 @@ prepare_grub_to_access_device () +@@ -158,18 +172,18 @@ prepare_grub_to_access_device () # otherwise set root as per value in device.map. fs_hint="`"${grub_probe}" --device $@ --target=compatibility_hint`" if [ "x$fs_hint" != x ]; then @@ -131,7 +131,7 @@ index fafeac9506..d8bb406936 100644 fi IFS="$old_ifs" diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 7bb3a211a7..f1548a2605 100644 +index 7bb3a211a7..2851952659 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -82,6 +82,218 @@ case x"$GRUB_FS" in @@ -207,7 +207,7 @@ index 7bb3a211a7..f1548a2605 100644 + bls="${bls%.conf}" + bls="${bls##*/}" + echo "${bls}" -+ done | ${kernel_sort} 2>/dev/null | tac)) || : ++ done | sort -Vr 2>/dev/null)) || : + + echo "${files[@]}" +} diff --git a/0060-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch b/0059-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch similarity index 100% rename from 0060-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch rename to 0059-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch diff --git a/0061-Add-linux-and-initrd-commands-for-grub-emu.patch b/0060-Add-linux-and-initrd-commands-for-grub-emu.patch similarity index 100% rename from 0061-Add-linux-and-initrd-commands-for-grub-emu.patch rename to 0060-Add-linux-and-initrd-commands-for-grub-emu.patch diff --git a/0062-Add-grub2-switch-to-blscfg.patch b/0061-Add-grub2-switch-to-blscfg.patch similarity index 99% rename from 0062-Add-grub2-switch-to-blscfg.patch rename to 0061-Add-grub2-switch-to-blscfg.patch index e3144df..e316116 100644 --- a/0062-Add-grub2-switch-to-blscfg.patch +++ b/0061-Add-grub2-switch-to-blscfg.patch @@ -20,10 +20,10 @@ Signed-off-by: Robbie Harwood create mode 100644 util/grub-switch-to-blscfg.in diff --git a/Makefile.util.def b/Makefile.util.def -index 43a1c7453b..a90879fa9b 100644 +index 18a9242776..88f55e35c4 100644 --- a/Makefile.util.def +++ b/Makefile.util.def -@@ -1365,6 +1365,13 @@ program = { +@@ -1348,6 +1348,13 @@ program = { ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)'; }; @@ -381,7 +381,7 @@ index 0000000000..a851424beb +# Bye. +exit 0 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index f1548a2605..c02c1f0820 100644 +index 2851952659..e490e1a43a 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -138,7 +138,7 @@ blsdir="/boot/loader/entries" diff --git a/0063-make-better-backtraces.patch b/0062-make-better-backtraces.patch similarity index 99% rename from 0063-make-better-backtraces.patch rename to 0062-make-better-backtraces.patch index ffdb895..e6ae4e9 100644 --- a/0063-make-better-backtraces.patch +++ b/0062-make-better-backtraces.patch @@ -38,7 +38,7 @@ Signed-off-by: Peter Jones delete mode 100644 grub-core/lib/i386/backtrace.c diff --git a/Makefile.util.def b/Makefile.util.def -index a90879fa9b..48512bc631 100644 +index 88f55e35c4..bda9fd1211 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -51,6 +51,12 @@ library = { diff --git a/0064-normal-don-t-draw-our-startup-message-if-debug-is-se.patch b/0063-normal-don-t-draw-our-startup-message-if-debug-is-se.patch similarity index 100% rename from 0064-normal-don-t-draw-our-startup-message-if-debug-is-se.patch rename to 0063-normal-don-t-draw-our-startup-message-if-debug-is-se.patch diff --git a/0065-Work-around-some-minor-include-path-weirdnesses.patch b/0064-Work-around-some-minor-include-path-weirdnesses.patch similarity index 100% rename from 0065-Work-around-some-minor-include-path-weirdnesses.patch rename to 0064-Work-around-some-minor-include-path-weirdnesses.patch diff --git a/0066-Make-it-possible-to-enabled-build-id-sha1.patch b/0065-Make-it-possible-to-enabled-build-id-sha1.patch similarity index 95% rename from 0066-Make-it-possible-to-enabled-build-id-sha1.patch rename to 0065-Make-it-possible-to-enabled-build-id-sha1.patch index 592635a..99d8055 100644 --- a/0066-Make-it-possible-to-enabled-build-id-sha1.patch +++ b/0065-Make-it-possible-to-enabled-build-id-sha1.patch @@ -10,10 +10,10 @@ Signed-off-by: Peter Jones 2 files changed, 27 insertions(+) diff --git a/configure.ac b/configure.ac -index 4f1676967e..b809c00784 100644 +index 0d0e6782a1..302300711f 100644 --- a/configure.ac +++ b/configure.ac -@@ -1443,7 +1443,15 @@ grub_PROG_TARGET_CC +@@ -1442,7 +1442,15 @@ grub_PROG_TARGET_CC if test "x$TARGET_APPLE_LINKER" != x1 ; then grub_PROG_OBJCOPY_ABSOLUTE fi diff --git a/0067-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch b/0066-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch similarity index 100% rename from 0067-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch rename to 0066-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch diff --git a/0068-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch b/0067-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch similarity index 100% rename from 0068-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch rename to 0067-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch diff --git a/0069-Fixup-for-newer-compiler.patch b/0068-Fixup-for-newer-compiler.patch similarity index 100% rename from 0069-Fixup-for-newer-compiler.patch rename to 0068-Fixup-for-newer-compiler.patch diff --git a/0070-Don-t-attempt-to-export-the-start-and-_start-symbols.patch b/0069-Don-t-attempt-to-export-the-start-and-_start-symbols.patch similarity index 100% rename from 0070-Don-t-attempt-to-export-the-start-and-_start-symbols.patch rename to 0069-Don-t-attempt-to-export-the-start-and-_start-symbols.patch diff --git a/0071-Fixup-for-newer-compiler.patch b/0070-Fixup-for-newer-compiler.patch similarity index 100% rename from 0071-Fixup-for-newer-compiler.patch rename to 0070-Fixup-for-newer-compiler.patch diff --git a/0072-Add-support-for-non-Ethernet-network-cards.patch b/0071-Add-support-for-non-Ethernet-network-cards.patch similarity index 100% rename from 0072-Add-support-for-non-Ethernet-network-cards.patch rename to 0071-Add-support-for-non-Ethernet-network-cards.patch diff --git a/0073-net-read-bracketed-ipv6-addrs-and-port-numbers.patch b/0072-net-read-bracketed-ipv6-addrs-and-port-numbers.patch similarity index 100% rename from 0073-net-read-bracketed-ipv6-addrs-and-port-numbers.patch rename to 0072-net-read-bracketed-ipv6-addrs-and-port-numbers.patch diff --git a/0074-bootp-New-net_bootp6-command.patch b/0073-bootp-New-net_bootp6-command.patch similarity index 100% rename from 0074-bootp-New-net_bootp6-command.patch rename to 0073-bootp-New-net_bootp6-command.patch diff --git a/0075-efinet-UEFI-IPv6-PXE-support.patch b/0074-efinet-UEFI-IPv6-PXE-support.patch similarity index 100% rename from 0075-efinet-UEFI-IPv6-PXE-support.patch rename to 0074-efinet-UEFI-IPv6-PXE-support.patch diff --git a/0076-grub.texi-Add-net_bootp6-doument.patch b/0075-grub.texi-Add-net_bootp6-doument.patch similarity index 100% rename from 0076-grub.texi-Add-net_bootp6-doument.patch rename to 0075-grub.texi-Add-net_bootp6-doument.patch diff --git a/0077-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch b/0076-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch similarity index 100% rename from 0077-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch rename to 0076-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch diff --git a/0078-efinet-Setting-network-from-UEFI-device-path.patch b/0077-efinet-Setting-network-from-UEFI-device-path.patch similarity index 100% rename from 0078-efinet-Setting-network-from-UEFI-device-path.patch rename to 0077-efinet-Setting-network-from-UEFI-device-path.patch diff --git a/0079-efinet-Setting-DNS-server-from-UEFI-protocol.patch b/0078-efinet-Setting-DNS-server-from-UEFI-protocol.patch similarity index 100% rename from 0079-efinet-Setting-DNS-server-from-UEFI-protocol.patch rename to 0078-efinet-Setting-DNS-server-from-UEFI-protocol.patch diff --git a/0080-Support-UEFI-networking-protocols.patch b/0079-Support-UEFI-networking-protocols.patch similarity index 100% rename from 0080-Support-UEFI-networking-protocols.patch rename to 0079-Support-UEFI-networking-protocols.patch diff --git a/0081-AUDIT-0-http-boot-tracker-bug.patch b/0080-AUDIT-0-http-boot-tracker-bug.patch similarity index 100% rename from 0081-AUDIT-0-http-boot-tracker-bug.patch rename to 0080-AUDIT-0-http-boot-tracker-bug.patch diff --git a/0082-grub-editenv-Add-incr-command-to-increment-integer-v.patch b/0081-grub-editenv-Add-incr-command-to-increment-integer-v.patch similarity index 100% rename from 0082-grub-editenv-Add-incr-command-to-increment-integer-v.patch rename to 0081-grub-editenv-Add-incr-command-to-increment-integer-v.patch diff --git a/0083-Add-auto-hide-menu-support.patch b/0082-Add-auto-hide-menu-support.patch similarity index 99% rename from 0083-Add-auto-hide-menu-support.patch rename to 0082-Add-auto-hide-menu-support.patch index f5aed0e..a4fbe4a 100644 --- a/0083-Add-auto-hide-menu-support.patch +++ b/0082-Add-auto-hide-menu-support.patch @@ -43,7 +43,7 @@ Signed-off-by: Hans de Goede create mode 100644 util/grub.d/01_menu_auto_hide.in diff --git a/Makefile.util.def b/Makefile.util.def -index 48512bc631..314e6f2acf 100644 +index bda9fd1211..cb8e3c3270 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -458,6 +458,12 @@ script = { diff --git a/0084-Add-grub-set-bootflag-utility.patch b/0083-Add-grub-set-bootflag-utility.patch similarity index 99% rename from 0084-Add-grub-set-bootflag-utility.patch rename to 0083-Add-grub-set-bootflag-utility.patch index 4ee43cf..495bb13 100644 --- a/0084-Add-grub-set-bootflag-utility.patch +++ b/0083-Add-grub-set-bootflag-utility.patch @@ -49,10 +49,10 @@ Signed-off-by: Robbie Harwood create mode 100644 docs/man/grub-set-bootflag.h2m diff --git a/Makefile.util.def b/Makefile.util.def -index 314e6f2acf..0b85a7fce4 100644 +index cb8e3c3270..d066652e9b 100644 --- a/Makefile.util.def +++ b/Makefile.util.def -@@ -1446,3 +1446,10 @@ program = { +@@ -1429,3 +1429,10 @@ program = { ldadd = grub-core/lib/gnulib/libgnu.a; ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)'; }; diff --git a/0085-docs-Add-grub-boot-indeterminate.service-example.patch b/0084-docs-Add-grub-boot-indeterminate.service-example.patch similarity index 100% rename from 0085-docs-Add-grub-boot-indeterminate.service-example.patch rename to 0084-docs-Add-grub-boot-indeterminate.service-example.patch diff --git a/0086-gentpl-add-disable-support.patch b/0085-gentpl-add-disable-support.patch similarity index 100% rename from 0086-gentpl-add-disable-support.patch rename to 0085-gentpl-add-disable-support.patch diff --git a/0087-gentpl-add-pc-firmware-type.patch b/0086-gentpl-add-pc-firmware-type.patch similarity index 100% rename from 0087-gentpl-add-pc-firmware-type.patch rename to 0086-gentpl-add-pc-firmware-type.patch diff --git a/0088-efinet-also-use-the-firmware-acceleration-for-http.patch b/0087-efinet-also-use-the-firmware-acceleration-for-http.patch similarity index 100% rename from 0088-efinet-also-use-the-firmware-acceleration-for-http.patch rename to 0087-efinet-also-use-the-firmware-acceleration-for-http.patch diff --git a/0089-efi-http-Make-root_url-reflect-the-protocol-hostname.patch b/0088-efi-http-Make-root_url-reflect-the-protocol-hostname.patch similarity index 100% rename from 0089-efi-http-Make-root_url-reflect-the-protocol-hostname.patch rename to 0088-efi-http-Make-root_url-reflect-the-protocol-hostname.patch diff --git a/0090-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch b/0089-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch similarity index 97% rename from 0090-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch rename to 0089-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch index a2c7136..6d2974f 100644 --- a/0090-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch +++ b/0089-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch @@ -17,10 +17,10 @@ Signed-off-by: Peter Jones 3 files changed, 64 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac -index b809c00784..b1ca894791 100644 +index 302300711f..008f6c273b 100644 --- a/configure.ac +++ b/configure.ac -@@ -850,11 +850,23 @@ if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ) && test "x$p +@@ -849,11 +849,23 @@ if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ) && test "x$p TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow" fi @@ -45,7 +45,7 @@ index b809c00784..b1ca894791 100644 AC_CACHE_CHECK([for options to get soft-float], grub_cv_target_cc_soft_float, [ grub_cv_target_cc_soft_float=no if test "x$target_cpu" = xarm64; then -@@ -1984,6 +1996,41 @@ HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_builddir)/include" +@@ -1954,6 +1966,41 @@ HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_builddir)/include" TARGET_CPPFLAGS="$TARGET_CPPFLAGS -I\$(top_srcdir)/include" TARGET_CPPFLAGS="$TARGET_CPPFLAGS -I\$(top_builddir)/include" diff --git a/0091-module-verifier-make-it-possible-to-run-checkers-on-.patch b/0090-module-verifier-make-it-possible-to-run-checkers-on-.patch similarity index 100% rename from 0091-module-verifier-make-it-possible-to-run-checkers-on-.patch rename to 0090-module-verifier-make-it-possible-to-run-checkers-on-.patch diff --git a/0092-Rework-how-the-fdt-command-builds.patch b/0091-Rework-how-the-fdt-command-builds.patch similarity index 100% rename from 0092-Rework-how-the-fdt-command-builds.patch rename to 0091-Rework-how-the-fdt-command-builds.patch diff --git a/0093-Disable-non-wordsize-allocations-on-arm.patch b/0092-Disable-non-wordsize-allocations-on-arm.patch similarity index 93% rename from 0093-Disable-non-wordsize-allocations-on-arm.patch rename to 0092-Disable-non-wordsize-allocations-on-arm.patch index 7105c7c..ea09b65 100644 --- a/0093-Disable-non-wordsize-allocations-on-arm.patch +++ b/0092-Disable-non-wordsize-allocations-on-arm.patch @@ -9,10 +9,10 @@ Signed-off-by: Peter Jones 1 file changed, 20 insertions(+) diff --git a/configure.ac b/configure.ac -index b1ca894791..f42be65332 100644 +index 008f6c273b..54462e0892 100644 --- a/configure.ac +++ b/configure.ac -@@ -1261,6 +1261,26 @@ if test "x$target_cpu" = xarm; then +@@ -1260,6 +1260,26 @@ if test "x$target_cpu" = xarm; then done ]) diff --git a/0094-Prepend-prefix-when-HTTP-path-is-relative.patch b/0093-Prepend-prefix-when-HTTP-path-is-relative.patch similarity index 100% rename from 0094-Prepend-prefix-when-HTTP-path-is-relative.patch rename to 0093-Prepend-prefix-when-HTTP-path-is-relative.patch diff --git a/0095-Make-grub_error-more-verbose.patch b/0094-Make-grub_error-more-verbose.patch similarity index 100% rename from 0095-Make-grub_error-more-verbose.patch rename to 0094-Make-grub_error-more-verbose.patch diff --git a/0096-Make-reset-an-alias-for-the-reboot-command.patch b/0095-Make-reset-an-alias-for-the-reboot-command.patch similarity index 100% rename from 0096-Make-reset-an-alias-for-the-reboot-command.patch rename to 0095-Make-reset-an-alias-for-the-reboot-command.patch diff --git a/0097-Add-a-version-command.patch b/0096-Add-a-version-command.patch similarity index 98% rename from 0097-Add-a-version-command.patch rename to 0096-Add-a-version-command.patch index 8daad53..10d40b3 100644 --- a/0097-Add-a-version-command.patch +++ b/0096-Add-a-version-command.patch @@ -19,10 +19,10 @@ Signed-off-by: Robbie Harwood create mode 100644 grub-core/commands/version.c diff --git a/configure.ac b/configure.ac -index f42be65332..2af5f23adf 100644 +index 54462e0892..7b4e1854d3 100644 --- a/configure.ac +++ b/configure.ac -@@ -285,6 +285,19 @@ AC_SUBST(target_cpu) +@@ -284,6 +284,19 @@ AC_SUBST(target_cpu) AC_SUBST(platform) # Define default variables diff --git a/0098-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch b/0097-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch similarity index 100% rename from 0098-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch rename to 0097-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch diff --git a/0099-arm-arm64-loader-Better-memory-allocation-and-error-.patch b/0098-arm-arm64-loader-Better-memory-allocation-and-error-.patch similarity index 100% rename from 0099-arm-arm64-loader-Better-memory-allocation-and-error-.patch rename to 0098-arm-arm64-loader-Better-memory-allocation-and-error-.patch diff --git a/0100-Try-to-pick-better-locations-for-kernel-and-initrd.patch b/0099-Try-to-pick-better-locations-for-kernel-and-initrd.patch similarity index 100% rename from 0100-Try-to-pick-better-locations-for-kernel-and-initrd.patch rename to 0099-Try-to-pick-better-locations-for-kernel-and-initrd.patch diff --git a/0101-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch b/0100-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch similarity index 93% rename from 0101-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch rename to 0100-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch index 3ebf4b3..e94df4e 100644 --- a/0101-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch +++ b/0100-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch @@ -14,9 +14,8 @@ Signed-off-by: Peter Jones util/grub-menulst2cfg.c | 2 +- util/grub-mkfont.c | 13 +++++++------ util/grub-probe.c | 2 +- - util/grub-rpm-sort.c | 2 +- util/setup.c | 2 +- - 11 files changed, 18 insertions(+), 17 deletions(-) + 10 files changed, 17 insertions(+), 16 deletions(-) diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c index eeea092752..f08a1bb841 100644 @@ -185,19 +184,6 @@ index c08e46bbb4..c6fac732b4 100644 for (i = PRINT_FS; i < ARRAY_SIZE (targets); i++) if (strcmp (arg, targets[i]) == 0) -diff --git a/util/grub-rpm-sort.c b/util/grub-rpm-sort.c -index f33bd1ed56..8345944105 100644 ---- a/util/grub-rpm-sort.c -+++ b/util/grub-rpm-sort.c -@@ -232,7 +232,7 @@ main (int argc, char *argv[]) - struct arguments arguments; - char **package_names = NULL; - size_t n_package_names = 0; -- int i; -+ unsigned int i; - - grub_util_host_init (&argc, &argv); - diff --git a/util/setup.c b/util/setup.c index da5f2c07f5..8b22bb8cca 100644 --- a/util/setup.c diff --git a/0102-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch b/0101-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch similarity index 93% rename from 0102-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch rename to 0101-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch index 6e18f66..03b4bbf 100644 --- a/0102-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch +++ b/0101-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch @@ -11,10 +11,10 @@ Signed-off-by: Peter Jones 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index 2af5f23adf..091ab32836 100644 +index 7b4e1854d3..490353713a 100644 --- a/configure.ac +++ b/configure.ac -@@ -1453,11 +1453,11 @@ fi +@@ -1452,11 +1452,11 @@ fi # Set them to their new values for the tests below. CC="$TARGET_CC" if test x"$platform" = xemu ; then @@ -29,7 +29,7 @@ index 2af5f23adf..091ab32836 100644 fi CPPFLAGS="$TARGET_CPPFLAGS" -@@ -2020,6 +2020,14 @@ if test x"$enable_werror" != xno ; then +@@ -1990,6 +1990,14 @@ if test x"$enable_werror" != xno ; then HOST_CFLAGS="$HOST_CFLAGS -Werror" fi diff --git a/0103-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch b/0102-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch similarity index 100% rename from 0103-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch rename to 0102-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch diff --git a/0104-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch b/0103-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch similarity index 100% rename from 0104-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch rename to 0103-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch diff --git a/0105-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch b/0104-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch similarity index 100% rename from 0105-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch rename to 0104-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch diff --git a/0106-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch b/0105-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch similarity index 100% rename from 0106-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch rename to 0105-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch diff --git a/0107-Fix-getroot.c-s-trampolines.patch b/0106-Fix-getroot.c-s-trampolines.patch similarity index 100% rename from 0107-Fix-getroot.c-s-trampolines.patch rename to 0106-Fix-getroot.c-s-trampolines.patch diff --git a/0108-Do-not-allow-stack-trampolines-anywhere.patch b/0107-Do-not-allow-stack-trampolines-anywhere.patch similarity index 93% rename from 0108-Do-not-allow-stack-trampolines-anywhere.patch rename to 0107-Do-not-allow-stack-trampolines-anywhere.patch index 08995fc..658c7a4 100644 --- a/0108-Do-not-allow-stack-trampolines-anywhere.patch +++ b/0107-Do-not-allow-stack-trampolines-anywhere.patch @@ -10,10 +10,10 @@ Signed-off-by: Peter Jones 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 091ab32836..de707f7e0b 100644 +index 490353713a..a02d40a05b 100644 --- a/configure.ac +++ b/configure.ac -@@ -2028,6 +2028,9 @@ if test x"$enable_wextra" != xno ; then +@@ -1998,6 +1998,9 @@ if test x"$enable_wextra" != xno ; then HOST_CFLAGS="$HOST_CFLAGS -Wextra" fi diff --git a/0109-Reimplement-boot_counter.patch b/0108-Reimplement-boot_counter.patch similarity index 99% rename from 0109-Reimplement-boot_counter.patch rename to 0108-Reimplement-boot_counter.patch index 22bd4ef..6104b87 100644 --- a/0109-Reimplement-boot_counter.patch +++ b/0108-Reimplement-boot_counter.patch @@ -23,7 +23,7 @@ Signed-off-by: Christian Glombek create mode 100644 util/grub.d/01_fallback_counting.in diff --git a/Makefile.util.def b/Makefile.util.def -index 0b85a7fce4..27a13bc734 100644 +index d066652e9b..e10fe766d1 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -458,6 +458,12 @@ script = { diff --git a/0110-Fix-menu-entry-selection-based-on-ID-and-title.patch b/0109-Fix-menu-entry-selection-based-on-ID-and-title.patch similarity index 100% rename from 0110-Fix-menu-entry-selection-based-on-ID-and-title.patch rename to 0109-Fix-menu-entry-selection-based-on-ID-and-title.patch diff --git a/0111-Make-the-menu-entry-users-option-argument-to-be-opti.patch b/0110-Make-the-menu-entry-users-option-argument-to-be-opti.patch similarity index 100% rename from 0111-Make-the-menu-entry-users-option-argument-to-be-opti.patch rename to 0110-Make-the-menu-entry-users-option-argument-to-be-opti.patch diff --git a/0112-Add-efi-export-env-and-efi-load-env-commands.patch b/0111-Add-efi-export-env-and-efi-load-env-commands.patch similarity index 100% rename from 0112-Add-efi-export-env-and-efi-load-env-commands.patch rename to 0111-Add-efi-export-env-and-efi-load-env-commands.patch diff --git a/0113-Make-it-possible-to-subtract-conditions-from-debug.patch b/0112-Make-it-possible-to-subtract-conditions-from-debug.patch similarity index 100% rename from 0113-Make-it-possible-to-subtract-conditions-from-debug.patch rename to 0112-Make-it-possible-to-subtract-conditions-from-debug.patch diff --git a/0114-Export-all-variables-from-the-initial-context-when-c.patch b/0113-Export-all-variables-from-the-initial-context-when-c.patch similarity index 100% rename from 0114-Export-all-variables-from-the-initial-context-when-c.patch rename to 0113-Export-all-variables-from-the-initial-context-when-c.patch diff --git a/0115-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch b/0114-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch similarity index 99% rename from 0115-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch rename to 0114-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch index 0abe8ed..43e8d16 100644 --- a/0115-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch +++ b/0114-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch @@ -21,7 +21,7 @@ Signed-off-by: Robbie Harwood rename util/grub.d/{01_menu_auto_hide.in => 12_menu_auto_hide.in} (58%) diff --git a/Makefile.util.def b/Makefile.util.def -index 27a13bc734..2e6ad979c3 100644 +index e10fe766d1..b4ce5383b7 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -459,14 +459,14 @@ script = { diff --git a/0116-Fix-systemctl-kexec-exit-status-check.patch b/0115-Fix-systemctl-kexec-exit-status-check.patch similarity index 100% rename from 0116-Fix-systemctl-kexec-exit-status-check.patch rename to 0115-Fix-systemctl-kexec-exit-status-check.patch diff --git a/0117-Print-grub-emu-linux-loader-messages-as-debug.patch b/0116-Print-grub-emu-linux-loader-messages-as-debug.patch similarity index 100% rename from 0117-Print-grub-emu-linux-loader-messages-as-debug.patch rename to 0116-Print-grub-emu-linux-loader-messages-as-debug.patch diff --git a/0118-Don-t-assume-that-boot-commands-will-only-return-on-.patch b/0117-Don-t-assume-that-boot-commands-will-only-return-on-.patch similarity index 100% rename from 0118-Don-t-assume-that-boot-commands-will-only-return-on-.patch rename to 0117-Don-t-assume-that-boot-commands-will-only-return-on-.patch diff --git a/0119-grub-set-bootflag-Update-comment-about-running-as-ro.patch b/0118-grub-set-bootflag-Update-comment-about-running-as-ro.patch similarity index 100% rename from 0119-grub-set-bootflag-Update-comment-about-running-as-ro.patch rename to 0118-grub-set-bootflag-Update-comment-about-running-as-ro.patch diff --git a/0120-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch b/0119-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch similarity index 100% rename from 0120-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch rename to 0119-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch diff --git a/0121-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch b/0120-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch similarity index 100% rename from 0121-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch rename to 0120-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch diff --git a/0122-Add-start-symbol-for-RISC-V.patch b/0121-Add-start-symbol-for-RISC-V.patch similarity index 100% rename from 0122-Add-start-symbol-for-RISC-V.patch rename to 0121-Add-start-symbol-for-RISC-V.patch diff --git a/0123-bootstrap.conf-Force-autogen.sh-to-use-python3.patch b/0122-bootstrap.conf-Force-autogen.sh-to-use-python3.patch similarity index 100% rename from 0123-bootstrap.conf-Force-autogen.sh-to-use-python3.patch rename to 0122-bootstrap.conf-Force-autogen.sh-to-use-python3.patch diff --git a/0124-efi-http-Export-fw-http-_path-variables-to-make-them.patch b/0123-efi-http-Export-fw-http-_path-variables-to-make-them.patch similarity index 100% rename from 0124-efi-http-Export-fw-http-_path-variables-to-make-them.patch rename to 0123-efi-http-Export-fw-http-_path-variables-to-make-them.patch diff --git a/0125-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch b/0124-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch similarity index 100% rename from 0125-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch rename to 0124-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch diff --git a/0126-efi-net-Allow-to-specify-a-port-number-in-addresses.patch b/0125-efi-net-Allow-to-specify-a-port-number-in-addresses.patch similarity index 100% rename from 0126-efi-net-Allow-to-specify-a-port-number-in-addresses.patch rename to 0125-efi-net-Allow-to-specify-a-port-number-in-addresses.patch diff --git a/0127-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch b/0126-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch similarity index 100% rename from 0127-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch rename to 0126-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch diff --git a/0128-efi-net-Print-a-debug-message-if-parsing-the-address.patch b/0127-efi-net-Print-a-debug-message-if-parsing-the-address.patch similarity index 100% rename from 0128-efi-net-Print-a-debug-message-if-parsing-the-address.patch rename to 0127-efi-net-Print-a-debug-message-if-parsing-the-address.patch diff --git a/0129-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch b/0128-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch similarity index 100% rename from 0129-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch rename to 0128-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch diff --git a/0130-efi-Set-image-base-address-before-jumping-to-the-PE-.patch b/0129-efi-Set-image-base-address-before-jumping-to-the-PE-.patch similarity index 100% rename from 0130-efi-Set-image-base-address-before-jumping-to-the-PE-.patch rename to 0129-efi-Set-image-base-address-before-jumping-to-the-PE-.patch diff --git a/0131-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch b/0130-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch similarity index 100% rename from 0131-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch rename to 0130-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch diff --git a/0132-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch b/0131-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch similarity index 100% rename from 0132-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch rename to 0131-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch diff --git a/0133-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch b/0132-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch similarity index 100% rename from 0133-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch rename to 0132-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch diff --git a/0134-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch b/0133-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch similarity index 100% rename from 0134-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch rename to 0133-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch diff --git a/0135-efi-dhcp-fix-some-allocation-error-checking.patch b/0134-efi-dhcp-fix-some-allocation-error-checking.patch similarity index 100% rename from 0135-efi-dhcp-fix-some-allocation-error-checking.patch rename to 0134-efi-dhcp-fix-some-allocation-error-checking.patch diff --git a/0136-efi-http-fix-some-allocation-error-checking.patch b/0135-efi-http-fix-some-allocation-error-checking.patch similarity index 100% rename from 0136-efi-http-fix-some-allocation-error-checking.patch rename to 0135-efi-http-fix-some-allocation-error-checking.patch diff --git a/0137-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch b/0136-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch similarity index 100% rename from 0137-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch rename to 0136-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch diff --git a/0138-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch b/0137-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch similarity index 100% rename from 0138-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch rename to 0137-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch diff --git a/0139-linuxefi-fail-kernel-validation-without-shim-protoco.patch b/0138-linuxefi-fail-kernel-validation-without-shim-protoco.patch similarity index 100% rename from 0139-linuxefi-fail-kernel-validation-without-shim-protoco.patch rename to 0138-linuxefi-fail-kernel-validation-without-shim-protoco.patch diff --git a/0140-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch b/0139-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch similarity index 100% rename from 0140-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch rename to 0139-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch diff --git a/0141-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch b/0140-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch similarity index 100% rename from 0141-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch rename to 0140-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch diff --git a/0142-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch b/0141-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch similarity index 100% rename from 0142-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch rename to 0141-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch diff --git a/0143-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch b/0142-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch similarity index 100% rename from 0143-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch rename to 0142-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch diff --git a/0144-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch b/0143-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch similarity index 100% rename from 0144-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch rename to 0143-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch diff --git a/0145-Add-systemd-integration-scripts-to-make-systemctl-re.patch b/0144-Add-systemd-integration-scripts-to-make-systemctl-re.patch similarity index 99% rename from 0145-Add-systemd-integration-scripts-to-make-systemctl-re.patch rename to 0144-Add-systemd-integration-scripts-to-make-systemctl-re.patch index 9e0fc88..8cf45c3 100644 --- a/0145-Add-systemd-integration-scripts-to-make-systemctl-re.patch +++ b/0144-Add-systemd-integration-scripts-to-make-systemctl-re.patch @@ -65,7 +65,7 @@ Signed-off-by: Hans de Goede create mode 100644 util/systemd/systemd-integration.sh.in diff --git a/Makefile.util.def b/Makefile.util.def -index 2e6ad979c3..9927c2cfd6 100644 +index b4ce5383b7..6366442129 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -470,6 +470,12 @@ script = { diff --git a/0146-systemd-integration.sh-Also-set-old-menu_show_once-g.patch b/0145-systemd-integration.sh-Also-set-old-menu_show_once-g.patch similarity index 100% rename from 0146-systemd-integration.sh-Also-set-old-menu_show_once-g.patch rename to 0145-systemd-integration.sh-Also-set-old-menu_show_once-g.patch diff --git a/0147-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch b/0146-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch similarity index 100% rename from 0147-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch rename to 0146-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch diff --git a/0148-grub-install-disable-support-for-EFI-platforms.patch b/0147-grub-install-disable-support-for-EFI-platforms.patch similarity index 100% rename from 0148-grub-install-disable-support-for-EFI-platforms.patch rename to 0147-grub-install-disable-support-for-EFI-platforms.patch diff --git a/0149-New-with-debug-timestamps-configure-flag-to-prepend-.patch b/0148-New-with-debug-timestamps-configure-flag-to-prepend-.patch similarity index 95% rename from 0149-New-with-debug-timestamps-configure-flag-to-prepend-.patch rename to 0148-New-with-debug-timestamps-configure-flag-to-prepend-.patch index c32be3c..ec5b30b 100644 --- a/0149-New-with-debug-timestamps-configure-flag-to-prepend-.patch +++ b/0148-New-with-debug-timestamps-configure-flag-to-prepend-.patch @@ -15,10 +15,10 @@ Signed-off-by: Renaud Métrich 3 files changed, 39 insertions(+) diff --git a/configure.ac b/configure.ac -index de707f7e0b..f069d84039 100644 +index a02d40a05b..ab0d326f00 100644 --- a/configure.ac +++ b/configure.ac -@@ -1586,6 +1586,17 @@ else +@@ -1585,6 +1585,17 @@ else fi AC_SUBST([BOOT_TIME_STATS]) @@ -36,7 +36,7 @@ index de707f7e0b..f069d84039 100644 AC_ARG_ENABLE([grub-emu-sdl], [AS_HELP_STRING([--enable-grub-emu-sdl], [build and install the `grub-emu' debugging utility with SDL support (default=guessed)])]) -@@ -2167,6 +2178,7 @@ AM_CONDITIONAL([COND_APPLE_LINKER], [test x$TARGET_APPLE_LINKER = x1]) +@@ -2136,6 +2147,7 @@ AM_CONDITIONAL([COND_APPLE_LINKER], [test x$TARGET_APPLE_LINKER = x1]) AM_CONDITIONAL([COND_ENABLE_EFIEMU], [test x$enable_efiemu = xyes]) AM_CONDITIONAL([COND_ENABLE_CACHE_STATS], [test x$DISK_CACHE_STATS = x1]) AM_CONDITIONAL([COND_ENABLE_BOOT_TIME_STATS], [test x$BOOT_TIME_STATS = x1]) @@ -44,7 +44,7 @@ index de707f7e0b..f069d84039 100644 AM_CONDITIONAL([COND_HAVE_CXX], [test x$HAVE_CXX = xyes]) -@@ -2262,6 +2274,12 @@ else +@@ -2231,6 +2243,12 @@ else echo With boot time statistics: No fi diff --git a/0150-Added-debug-statements-to-grub_disk_open-and-grub_di.patch b/0149-Added-debug-statements-to-grub_disk_open-and-grub_di.patch similarity index 100% rename from 0150-Added-debug-statements-to-grub_disk_open-and-grub_di.patch rename to 0149-Added-debug-statements-to-grub_disk_open-and-grub_di.patch diff --git a/0151-Introduce-function-grub_debug_is_enabled-void-return.patch b/0150-Introduce-function-grub_debug_is_enabled-void-return.patch similarity index 100% rename from 0151-Introduce-function-grub_debug_is_enabled-void-return.patch rename to 0150-Introduce-function-grub_debug_is_enabled-void-return.patch diff --git a/0152-Don-t-clear-screen-when-debugging-is-enabled.patch b/0151-Don-t-clear-screen-when-debugging-is-enabled.patch similarity index 100% rename from 0152-Don-t-clear-screen-when-debugging-is-enabled.patch rename to 0151-Don-t-clear-screen-when-debugging-is-enabled.patch diff --git a/0153-grub_file_-instrumentation-new-file-debug-tag.patch b/0152-grub_file_-instrumentation-new-file-debug-tag.patch similarity index 100% rename from 0153-grub_file_-instrumentation-new-file-debug-tag.patch rename to 0152-grub_file_-instrumentation-new-file-debug-tag.patch diff --git a/0154-ieee1275-Avoiding-many-unecessary-open-close.patch b/0153-ieee1275-Avoiding-many-unecessary-open-close.patch similarity index 100% rename from 0154-ieee1275-Avoiding-many-unecessary-open-close.patch rename to 0153-ieee1275-Avoiding-many-unecessary-open-close.patch diff --git a/0155-ieee1275-powerpc-implements-fibre-channel-discovery-.patch b/0154-ieee1275-powerpc-implements-fibre-channel-discovery-.patch similarity index 100% rename from 0155-ieee1275-powerpc-implements-fibre-channel-discovery-.patch rename to 0154-ieee1275-powerpc-implements-fibre-channel-discovery-.patch diff --git a/0156-ieee1275-powerpc-enables-device-mapper-discovery.patch b/0155-ieee1275-powerpc-enables-device-mapper-discovery.patch similarity index 100% rename from 0156-ieee1275-powerpc-enables-device-mapper-discovery.patch rename to 0155-ieee1275-powerpc-enables-device-mapper-discovery.patch diff --git a/0157-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch b/0156-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch similarity index 100% rename from 0157-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch rename to 0156-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch diff --git a/0158-Add-suport-for-signing-grub-with-an-appended-signatu.patch b/0157-Add-suport-for-signing-grub-with-an-appended-signatu.patch similarity index 100% rename from 0158-Add-suport-for-signing-grub-with-an-appended-signatu.patch rename to 0157-Add-suport-for-signing-grub-with-an-appended-signatu.patch diff --git a/0159-docs-grub-Document-signing-grub-under-UEFI.patch b/0158-docs-grub-Document-signing-grub-under-UEFI.patch similarity index 100% rename from 0159-docs-grub-Document-signing-grub-under-UEFI.patch rename to 0158-docs-grub-Document-signing-grub-under-UEFI.patch diff --git a/0160-docs-grub-Document-signing-grub-with-an-appended-sig.patch b/0159-docs-grub-Document-signing-grub-with-an-appended-sig.patch similarity index 100% rename from 0160-docs-grub-Document-signing-grub-with-an-appended-sig.patch rename to 0159-docs-grub-Document-signing-grub-with-an-appended-sig.patch diff --git a/0161-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch b/0160-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch similarity index 100% rename from 0161-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch rename to 0160-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch diff --git a/0162-pgp-factor-out-rsa_pad.patch b/0161-pgp-factor-out-rsa_pad.patch similarity index 100% rename from 0162-pgp-factor-out-rsa_pad.patch rename to 0161-pgp-factor-out-rsa_pad.patch diff --git a/0163-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch b/0162-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch similarity index 100% rename from 0163-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch rename to 0162-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch diff --git a/0164-posix_wrap-tweaks-in-preparation-for-libtasn1.patch b/0163-posix_wrap-tweaks-in-preparation-for-libtasn1.patch similarity index 100% rename from 0164-posix_wrap-tweaks-in-preparation-for-libtasn1.patch rename to 0163-posix_wrap-tweaks-in-preparation-for-libtasn1.patch diff --git a/0165-libtasn1-import-libtasn1-4.16.0.patch b/0164-libtasn1-import-libtasn1-4.16.0.patch similarity index 100% rename from 0165-libtasn1-import-libtasn1-4.16.0.patch rename to 0164-libtasn1-import-libtasn1-4.16.0.patch diff --git a/0166-libtasn1-disable-code-not-needed-in-grub.patch b/0165-libtasn1-disable-code-not-needed-in-grub.patch similarity index 100% rename from 0166-libtasn1-disable-code-not-needed-in-grub.patch rename to 0165-libtasn1-disable-code-not-needed-in-grub.patch diff --git a/0167-libtasn1-changes-for-grub-compatibility.patch b/0166-libtasn1-changes-for-grub-compatibility.patch similarity index 100% rename from 0167-libtasn1-changes-for-grub-compatibility.patch rename to 0166-libtasn1-changes-for-grub-compatibility.patch diff --git a/0168-libtasn1-compile-into-asn1-module.patch b/0167-libtasn1-compile-into-asn1-module.patch similarity index 100% rename from 0168-libtasn1-compile-into-asn1-module.patch rename to 0167-libtasn1-compile-into-asn1-module.patch diff --git a/0169-test_asn1-test-module-for-libtasn1.patch b/0168-test_asn1-test-module-for-libtasn1.patch similarity index 99% rename from 0169-test_asn1-test-module-for-libtasn1.patch rename to 0168-test_asn1-test-module-for-libtasn1.patch index 1588c51..c95a00b 100644 --- a/0169-test_asn1-test-module-for-libtasn1.patch +++ b/0168-test_asn1-test-module-for-libtasn1.patch @@ -51,10 +51,10 @@ Signed-off-by: Daniel Axtens create mode 100644 tests/test_asn1.in diff --git a/Makefile.util.def b/Makefile.util.def -index 9927c2cfd6..3f191aa809 100644 +index 6366442129..d04b3fe68a 100644 --- a/Makefile.util.def +++ b/Makefile.util.def -@@ -1306,6 +1306,12 @@ script = { +@@ -1289,6 +1289,12 @@ script = { common = tests/syslinux_test.in; }; @@ -1426,7 +1426,7 @@ index 0000000000..555e56dd20 + +#endif diff --git a/.gitignore b/.gitignore -index 594d0134d3..856e69bc5c 100644 +index 208d1d2325..1d005887e7 100644 --- a/.gitignore +++ b/.gitignore @@ -264,6 +264,7 @@ widthspec.bin diff --git a/0170-grub-install-support-embedding-x509-certificates.patch b/0169-grub-install-support-embedding-x509-certificates.patch similarity index 100% rename from 0170-grub-install-support-embedding-x509-certificates.patch rename to 0169-grub-install-support-embedding-x509-certificates.patch diff --git a/0171-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch b/0170-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch similarity index 100% rename from 0171-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch rename to 0170-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch diff --git a/0172-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch b/0171-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch similarity index 100% rename from 0172-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch rename to 0171-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch diff --git a/0173-appended-signatures-support-verifying-appended-signa.patch b/0172-appended-signatures-support-verifying-appended-signa.patch similarity index 100% rename from 0173-appended-signatures-support-verifying-appended-signa.patch rename to 0172-appended-signatures-support-verifying-appended-signa.patch diff --git a/0174-appended-signatures-verification-tests.patch b/0173-appended-signatures-verification-tests.patch similarity index 100% rename from 0174-appended-signatures-verification-tests.patch rename to 0173-appended-signatures-verification-tests.patch diff --git a/0175-appended-signatures-documentation.patch b/0174-appended-signatures-documentation.patch similarity index 100% rename from 0175-appended-signatures-documentation.patch rename to 0174-appended-signatures-documentation.patch diff --git a/0176-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch b/0175-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch similarity index 100% rename from 0176-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch rename to 0175-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch diff --git a/0177-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch b/0176-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch similarity index 100% rename from 0177-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch rename to 0176-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch diff --git a/0178-ieee1275-claim-more-memory.patch b/0177-ieee1275-claim-more-memory.patch similarity index 100% rename from 0178-ieee1275-claim-more-memory.patch rename to 0177-ieee1275-claim-more-memory.patch diff --git a/0179-ieee1275-request-memory-with-ibm-client-architecture.patch b/0178-ieee1275-request-memory-with-ibm-client-architecture.patch similarity index 100% rename from 0179-ieee1275-request-memory-with-ibm-client-architecture.patch rename to 0178-ieee1275-request-memory-with-ibm-client-architecture.patch diff --git a/0180-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch b/0179-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch similarity index 100% rename from 0180-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch rename to 0179-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch diff --git a/0181-ieee1275-ofdisk-retry-on-open-failure.patch b/0180-ieee1275-ofdisk-retry-on-open-failure.patch similarity index 100% rename from 0181-ieee1275-ofdisk-retry-on-open-failure.patch rename to 0180-ieee1275-ofdisk-retry-on-open-failure.patch diff --git a/0182-Allow-chainloading-EFI-apps-from-loop-mounts.patch b/0181-Allow-chainloading-EFI-apps-from-loop-mounts.patch similarity index 100% rename from 0182-Allow-chainloading-EFI-apps-from-loop-mounts.patch rename to 0181-Allow-chainloading-EFI-apps-from-loop-mounts.patch diff --git a/0183-efinet-Add-DHCP-proxy-support.patch b/0182-efinet-Add-DHCP-proxy-support.patch similarity index 100% rename from 0183-efinet-Add-DHCP-proxy-support.patch rename to 0182-efinet-Add-DHCP-proxy-support.patch diff --git a/0184-fs-ext2-Ignore-checksum-seed-incompat-feature.patch b/0183-fs-ext2-Ignore-checksum-seed-incompat-feature.patch similarity index 100% rename from 0184-fs-ext2-Ignore-checksum-seed-incompat-feature.patch rename to 0183-fs-ext2-Ignore-checksum-seed-incompat-feature.patch diff --git a/0185-Don-t-update-the-cmdline-when-generating-legacy-menu.patch b/0184-Don-t-update-the-cmdline-when-generating-legacy-menu.patch similarity index 97% rename from 0185-Don-t-update-the-cmdline-when-generating-legacy-menu.patch rename to 0184-Don-t-update-the-cmdline-when-generating-legacy-menu.patch index 1982847..b2783d1 100644 --- a/0185-Don-t-update-the-cmdline-when-generating-legacy-menu.patch +++ b/0184-Don-t-update-the-cmdline-when-generating-legacy-menu.patch @@ -20,7 +20,7 @@ Signed-off-by: Javier Martinez Canillas 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index c02c1f0820..6af84b44e1 100644 +index e490e1a43a..865af3d6c4 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -256,7 +256,9 @@ if [ -z "\${kernelopts}" ]; then diff --git a/0186-Suppress-gettext-error-message.patch b/0185-Suppress-gettext-error-message.patch similarity index 100% rename from 0186-Suppress-gettext-error-message.patch rename to 0185-Suppress-gettext-error-message.patch diff --git a/0187-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch b/0186-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch similarity index 100% rename from 0187-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch rename to 0186-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch diff --git a/0188-templates-Check-for-EFI-at-runtime-instead-of-config.patch b/0187-templates-Check-for-EFI-at-runtime-instead-of-config.patch similarity index 100% rename from 0188-templates-Check-for-EFI-at-runtime-instead-of-config.patch rename to 0187-templates-Check-for-EFI-at-runtime-instead-of-config.patch diff --git a/0189-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch b/0188-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch similarity index 100% rename from 0189-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch rename to 0188-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch diff --git a/0190-arm64-Fix-EFI-loader-kernel-image-allocation.patch b/0189-arm64-Fix-EFI-loader-kernel-image-allocation.patch similarity index 100% rename from 0190-arm64-Fix-EFI-loader-kernel-image-allocation.patch rename to 0189-arm64-Fix-EFI-loader-kernel-image-allocation.patch diff --git a/0191-normal-main-Discover-the-device-to-read-the-config-f.patch b/0190-normal-main-Discover-the-device-to-read-the-config-f.patch similarity index 100% rename from 0191-normal-main-Discover-the-device-to-read-the-config-f.patch rename to 0190-normal-main-Discover-the-device-to-read-the-config-f.patch diff --git a/0192-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch b/0191-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch similarity index 100% rename from 0192-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch rename to 0191-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch diff --git a/0193-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch b/0192-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch similarity index 100% rename from 0193-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch rename to 0192-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch diff --git a/0194-Print-module-name-on-license-check-failure.patch b/0193-Print-module-name-on-license-check-failure.patch similarity index 100% rename from 0194-Print-module-name-on-license-check-failure.patch rename to 0193-Print-module-name-on-license-check-failure.patch diff --git a/0195-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch b/0194-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch similarity index 100% rename from 0195-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch rename to 0194-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch diff --git a/0196-grub-mkconfig-restore-umask-for-grub.cfg.patch b/0195-grub-mkconfig-restore-umask-for-grub.cfg.patch similarity index 100% rename from 0196-grub-mkconfig-restore-umask-for-grub.cfg.patch rename to 0195-grub-mkconfig-restore-umask-for-grub.cfg.patch diff --git a/0197-fs-btrfs-Use-full-btrfs-bootloader-area.patch b/0196-fs-btrfs-Use-full-btrfs-bootloader-area.patch similarity index 100% rename from 0197-fs-btrfs-Use-full-btrfs-bootloader-area.patch rename to 0196-fs-btrfs-Use-full-btrfs-bootloader-area.patch diff --git a/0198-Add-Fedora-location-of-DejaVu-SANS-font.patch b/0197-Add-Fedora-location-of-DejaVu-SANS-font.patch similarity index 95% rename from 0198-Add-Fedora-location-of-DejaVu-SANS-font.patch rename to 0197-Add-Fedora-location-of-DejaVu-SANS-font.patch index c3e45e4..070fc24 100644 --- a/0198-Add-Fedora-location-of-DejaVu-SANS-font.patch +++ b/0197-Add-Fedora-location-of-DejaVu-SANS-font.patch @@ -16,10 +16,10 @@ Signed-off-by: Robbie Harwood 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index f069d84039..88e33e0f0c 100644 +index ab0d326f00..40c4338bce 100644 --- a/configure.ac +++ b/configure.ac -@@ -1785,7 +1785,7 @@ fi +@@ -1784,7 +1784,7 @@ fi if test x"$starfield_excuse" = x; then for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do diff --git a/0199-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch b/0198-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch similarity index 100% rename from 0199-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch rename to 0198-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch diff --git a/0200-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch b/0199-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch similarity index 100% rename from 0200-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch rename to 0199-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch diff --git a/0201-EFI-console-Do-not-set-colorstate-until-the-first-te.patch b/0200-EFI-console-Do-not-set-colorstate-until-the-first-te.patch similarity index 100% rename from 0201-EFI-console-Do-not-set-colorstate-until-the-first-te.patch rename to 0200-EFI-console-Do-not-set-colorstate-until-the-first-te.patch diff --git a/0202-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch b/0201-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch similarity index 100% rename from 0202-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch rename to 0201-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch diff --git a/0203-Use-visual-indentation-in-config.h.in.patch b/0202-Use-visual-indentation-in-config.h.in.patch similarity index 100% rename from 0203-Use-visual-indentation-in-config.h.in.patch rename to 0202-Use-visual-indentation-in-config.h.in.patch diff --git a/0204-Where-present-ensure-config-util.h-precedes-config.h.patch b/0203-Where-present-ensure-config-util.h-precedes-config.h.patch similarity index 100% rename from 0204-Where-present-ensure-config-util.h-precedes-config.h.patch rename to 0203-Where-present-ensure-config-util.h-precedes-config.h.patch diff --git a/0205-Drop-gnulib-fix-base64.patch.patch b/0204-Drop-gnulib-fix-base64.patch.patch similarity index 100% rename from 0205-Drop-gnulib-fix-base64.patch.patch rename to 0204-Drop-gnulib-fix-base64.patch.patch diff --git a/0206-Drop-gnulib-no-abort.patch.patch b/0205-Drop-gnulib-no-abort.patch.patch similarity index 100% rename from 0206-Drop-gnulib-no-abort.patch.patch rename to 0205-Drop-gnulib-no-abort.patch.patch diff --git a/0207-Update-gnulib-version-and-drop-most-gnulib-patches.patch b/0206-Update-gnulib-version-and-drop-most-gnulib-patches.patch similarity index 99% rename from 0207-Update-gnulib-version-and-drop-most-gnulib-patches.patch rename to 0206-Update-gnulib-version-and-drop-most-gnulib-patches.patch index f0e2cc0..f9fa207 100644 --- a/0207-Update-gnulib-version-and-drop-most-gnulib-patches.patch +++ b/0206-Update-gnulib-version-and-drop-most-gnulib-patches.patch @@ -48,7 +48,7 @@ Signed-off-by: Robbie Harwood delete mode 100644 grub-core/lib/gnulib-patches/fix-unused-value.patch diff --git a/configure.ac b/configure.ac -index 88e33e0f0c..871235b91b 100644 +index 40c4338bce..79f45ef1e1 100644 --- a/configure.ac +++ b/configure.ac @@ -49,7 +49,7 @@ AC_CANONICAL_TARGET diff --git a/0208-commands-search-Fix-bug-stopping-iteration-when-no-f.patch b/0207-commands-search-Fix-bug-stopping-iteration-when-no-f.patch similarity index 100% rename from 0208-commands-search-Fix-bug-stopping-iteration-when-no-f.patch rename to 0207-commands-search-Fix-bug-stopping-iteration-when-no-f.patch diff --git a/0209-search-new-efidisk-only-option-on-EFI-systems.patch b/0208-search-new-efidisk-only-option-on-EFI-systems.patch similarity index 100% rename from 0209-search-new-efidisk-only-option-on-EFI-systems.patch rename to 0208-search-new-efidisk-only-option-on-EFI-systems.patch diff --git a/0210-efi-new-connectefi-command.patch b/0209-efi-new-connectefi-command.patch similarity index 100% rename from 0210-efi-new-connectefi-command.patch rename to 0209-efi-new-connectefi-command.patch diff --git a/0211-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch b/0210-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch similarity index 100% rename from 0211-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch rename to 0210-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch diff --git a/0212-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch b/0211-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch similarity index 100% rename from 0212-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch rename to 0211-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch diff --git a/0213-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch b/0212-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch similarity index 100% rename from 0213-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch rename to 0212-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch diff --git a/0214-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch b/0213-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch similarity index 100% rename from 0214-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch rename to 0213-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch diff --git a/0215-powerpc-do-CAS-in-a-more-compatible-way.patch b/0214-powerpc-do-CAS-in-a-more-compatible-way.patch similarity index 100% rename from 0215-powerpc-do-CAS-in-a-more-compatible-way.patch rename to 0214-powerpc-do-CAS-in-a-more-compatible-way.patch diff --git a/0216-powerpc-prefix-detection-support-device-names-with-c.patch b/0215-powerpc-prefix-detection-support-device-names-with-c.patch similarity index 100% rename from 0216-powerpc-prefix-detection-support-device-names-with-c.patch rename to 0215-powerpc-prefix-detection-support-device-names-with-c.patch diff --git a/0217-ibmvtpm-Add-support-for-trusted-boot-using-a-vTPM-2..patch b/0216-ibmvtpm-Add-support-for-trusted-boot-using-a-vTPM-2..patch similarity index 100% rename from 0217-ibmvtpm-Add-support-for-trusted-boot-using-a-vTPM-2..patch rename to 0216-ibmvtpm-Add-support-for-trusted-boot-using-a-vTPM-2..patch diff --git a/0219-make-ofdisk_retries-optional.patch b/0217-make-ofdisk_retries-optional.patch similarity index 100% rename from 0219-make-ofdisk_retries-optional.patch rename to 0217-make-ofdisk_retries-optional.patch diff --git a/0220-loader-efi-chainloader-grub_load_and_start_image-doe.patch b/0218-loader-efi-chainloader-grub_load_and_start_image-doe.patch similarity index 100% rename from 0220-loader-efi-chainloader-grub_load_and_start_image-doe.patch rename to 0218-loader-efi-chainloader-grub_load_and_start_image-doe.patch diff --git a/0218-rpm-sort-add-prereqs-for-declaration-of-strchrnul.patch b/0218-rpm-sort-add-prereqs-for-declaration-of-strchrnul.patch deleted file mode 100644 index d2458d0..0000000 --- a/0218-rpm-sort-add-prereqs-for-declaration-of-strchrnul.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Robbie Harwood -Date: Thu, 5 May 2022 18:01:05 -0400 -Subject: [PATCH] rpm-sort: add prereqs for declaration of strchrnul() - -Signed-off-by: Robbie Harwood ---- - util/grub-rpm-sort.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/util/grub-rpm-sort.c b/util/grub-rpm-sort.c -index 8345944105..71d038bb69 100644 ---- a/util/grub-rpm-sort.c -+++ b/util/grub-rpm-sort.c -@@ -1,13 +1,17 @@ -+#define _GNU_SOURCE 1 -+ - #include -+ -+#include -+#include -+#include - #include - #include -+#include - #include - #include -+#include - #include --#include --#include --#include --#include - - static size_t - read_file (const char *input, char **ret) diff --git a/0221-loader-efi-chainloader-simplify-the-loader-state.patch b/0219-loader-efi-chainloader-simplify-the-loader-state.patch similarity index 100% rename from 0221-loader-efi-chainloader-simplify-the-loader-state.patch rename to 0219-loader-efi-chainloader-simplify-the-loader-state.patch diff --git a/0222-commands-boot-Add-API-to-pass-context-to-loader.patch b/0220-commands-boot-Add-API-to-pass-context-to-loader.patch similarity index 100% rename from 0222-commands-boot-Add-API-to-pass-context-to-loader.patch rename to 0220-commands-boot-Add-API-to-pass-context-to-loader.patch diff --git a/0223-loader-efi-chainloader-Use-grub_loader_set_ex.patch b/0221-loader-efi-chainloader-Use-grub_loader_set_ex.patch similarity index 100% rename from 0223-loader-efi-chainloader-Use-grub_loader_set_ex.patch rename to 0221-loader-efi-chainloader-Use-grub_loader_set_ex.patch diff --git a/0224-loader-i386-efi-linux-Avoid-a-use-after-free-in-the-.patch b/0222-loader-i386-efi-linux-Avoid-a-use-after-free-in-the-.patch similarity index 100% rename from 0224-loader-i386-efi-linux-Avoid-a-use-after-free-in-the-.patch rename to 0222-loader-i386-efi-linux-Avoid-a-use-after-free-in-the-.patch diff --git a/0225-loader-i386-efi-linux-Use-grub_loader_set_ex.patch b/0223-loader-i386-efi-linux-Use-grub_loader_set_ex.patch similarity index 100% rename from 0225-loader-i386-efi-linux-Use-grub_loader_set_ex.patch rename to 0223-loader-i386-efi-linux-Use-grub_loader_set_ex.patch diff --git a/0226-loader-i386-efi-linux-Fix-a-memory-leak-in-the-initr.patch b/0224-loader-i386-efi-linux-Fix-a-memory-leak-in-the-initr.patch similarity index 100% rename from 0226-loader-i386-efi-linux-Fix-a-memory-leak-in-the-initr.patch rename to 0224-loader-i386-efi-linux-Fix-a-memory-leak-in-the-initr.patch diff --git a/0227-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch b/0225-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch similarity index 100% rename from 0227-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch rename to 0225-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch diff --git a/0228-kern-file-Do-not-leak-device_name-on-error-in-grub_f.patch b/0226-kern-file-Do-not-leak-device_name-on-error-in-grub_f.patch similarity index 100% rename from 0228-kern-file-Do-not-leak-device_name-on-error-in-grub_f.patch rename to 0226-kern-file-Do-not-leak-device_name-on-error-in-grub_f.patch diff --git a/0229-video-readers-png-Abort-sooner-if-a-read-operation-f.patch b/0227-video-readers-png-Abort-sooner-if-a-read-operation-f.patch similarity index 100% rename from 0229-video-readers-png-Abort-sooner-if-a-read-operation-f.patch rename to 0227-video-readers-png-Abort-sooner-if-a-read-operation-f.patch diff --git a/0230-video-readers-png-Refuse-to-handle-multiple-image-he.patch b/0228-video-readers-png-Refuse-to-handle-multiple-image-he.patch similarity index 100% rename from 0230-video-readers-png-Refuse-to-handle-multiple-image-he.patch rename to 0228-video-readers-png-Refuse-to-handle-multiple-image-he.patch diff --git a/0231-video-readers-png-Drop-greyscale-support-to-fix-heap.patch b/0229-video-readers-png-Drop-greyscale-support-to-fix-heap.patch similarity index 100% rename from 0231-video-readers-png-Drop-greyscale-support-to-fix-heap.patch rename to 0229-video-readers-png-Drop-greyscale-support-to-fix-heap.patch diff --git a/0232-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch b/0230-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch similarity index 100% rename from 0232-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch rename to 0230-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch diff --git a/0233-video-readers-png-Sanity-check-some-huffman-codes.patch b/0231-video-readers-png-Sanity-check-some-huffman-codes.patch similarity index 100% rename from 0233-video-readers-png-Sanity-check-some-huffman-codes.patch rename to 0231-video-readers-png-Sanity-check-some-huffman-codes.patch diff --git a/0234-video-readers-jpeg-Abort-sooner-if-a-read-operation-.patch b/0232-video-readers-jpeg-Abort-sooner-if-a-read-operation-.patch similarity index 100% rename from 0234-video-readers-jpeg-Abort-sooner-if-a-read-operation-.patch rename to 0232-video-readers-jpeg-Abort-sooner-if-a-read-operation-.patch diff --git a/0235-video-readers-jpeg-Do-not-reallocate-a-given-huff-ta.patch b/0233-video-readers-jpeg-Do-not-reallocate-a-given-huff-ta.patch similarity index 100% rename from 0235-video-readers-jpeg-Do-not-reallocate-a-given-huff-ta.patch rename to 0233-video-readers-jpeg-Do-not-reallocate-a-given-huff-ta.patch diff --git a/0236-video-readers-jpeg-Refuse-to-handle-multiple-start-o.patch b/0234-video-readers-jpeg-Refuse-to-handle-multiple-start-o.patch similarity index 100% rename from 0236-video-readers-jpeg-Refuse-to-handle-multiple-start-o.patch rename to 0234-video-readers-jpeg-Refuse-to-handle-multiple-start-o.patch diff --git a/0237-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch b/0235-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch similarity index 100% rename from 0237-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch rename to 0235-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch diff --git a/0238-normal-charset-Fix-array-out-of-bounds-formatting-un.patch b/0236-normal-charset-Fix-array-out-of-bounds-formatting-un.patch similarity index 100% rename from 0238-normal-charset-Fix-array-out-of-bounds-formatting-un.patch rename to 0236-normal-charset-Fix-array-out-of-bounds-formatting-un.patch diff --git a/0239-net-netbuff-Block-overly-large-netbuff-allocs.patch b/0237-net-netbuff-Block-overly-large-netbuff-allocs.patch similarity index 100% rename from 0239-net-netbuff-Block-overly-large-netbuff-allocs.patch rename to 0237-net-netbuff-Block-overly-large-netbuff-allocs.patch diff --git a/0240-net-ip-Do-IP-fragment-maths-safely.patch b/0238-net-ip-Do-IP-fragment-maths-safely.patch similarity index 100% rename from 0240-net-ip-Do-IP-fragment-maths-safely.patch rename to 0238-net-ip-Do-IP-fragment-maths-safely.patch diff --git a/0241-net-dns-Fix-double-free-addresses-on-corrupt-DNS-res.patch b/0239-net-dns-Fix-double-free-addresses-on-corrupt-DNS-res.patch similarity index 100% rename from 0241-net-dns-Fix-double-free-addresses-on-corrupt-DNS-res.patch rename to 0239-net-dns-Fix-double-free-addresses-on-corrupt-DNS-res.patch diff --git a/0242-net-dns-Don-t-read-past-the-end-of-the-string-we-re-.patch b/0240-net-dns-Don-t-read-past-the-end-of-the-string-we-re-.patch similarity index 100% rename from 0242-net-dns-Don-t-read-past-the-end-of-the-string-we-re-.patch rename to 0240-net-dns-Don-t-read-past-the-end-of-the-string-we-re-.patch diff --git a/0243-net-tftp-Prevent-a-UAF-and-double-free-from-a-failed.patch b/0241-net-tftp-Prevent-a-UAF-and-double-free-from-a-failed.patch similarity index 100% rename from 0243-net-tftp-Prevent-a-UAF-and-double-free-from-a-failed.patch rename to 0241-net-tftp-Prevent-a-UAF-and-double-free-from-a-failed.patch diff --git a/0244-net-tftp-Avoid-a-trivial-UAF.patch b/0242-net-tftp-Avoid-a-trivial-UAF.patch similarity index 100% rename from 0244-net-tftp-Avoid-a-trivial-UAF.patch rename to 0242-net-tftp-Avoid-a-trivial-UAF.patch diff --git a/0245-net-http-Do-not-tear-down-socket-if-it-s-already-bee.patch b/0243-net-http-Do-not-tear-down-socket-if-it-s-already-bee.patch similarity index 100% rename from 0245-net-http-Do-not-tear-down-socket-if-it-s-already-bee.patch rename to 0243-net-http-Do-not-tear-down-socket-if-it-s-already-bee.patch diff --git a/0246-net-http-Fix-OOB-write-for-split-http-headers.patch b/0244-net-http-Fix-OOB-write-for-split-http-headers.patch similarity index 100% rename from 0246-net-http-Fix-OOB-write-for-split-http-headers.patch rename to 0244-net-http-Fix-OOB-write-for-split-http-headers.patch diff --git a/0247-net-http-Error-out-on-headers-with-LF-without-CR.patch b/0245-net-http-Error-out-on-headers-with-LF-without-CR.patch similarity index 100% rename from 0247-net-http-Error-out-on-headers-with-LF-without-CR.patch rename to 0245-net-http-Error-out-on-headers-with-LF-without-CR.patch diff --git a/0248-fs-f2fs-Do-not-read-past-the-end-of-nat-journal-entr.patch b/0246-fs-f2fs-Do-not-read-past-the-end-of-nat-journal-entr.patch similarity index 100% rename from 0248-fs-f2fs-Do-not-read-past-the-end-of-nat-journal-entr.patch rename to 0246-fs-f2fs-Do-not-read-past-the-end-of-nat-journal-entr.patch diff --git a/0249-fs-f2fs-Do-not-read-past-the-end-of-nat-bitmap.patch b/0247-fs-f2fs-Do-not-read-past-the-end-of-nat-bitmap.patch similarity index 100% rename from 0249-fs-f2fs-Do-not-read-past-the-end-of-nat-bitmap.patch rename to 0247-fs-f2fs-Do-not-read-past-the-end-of-nat-bitmap.patch diff --git a/0250-fs-f2fs-Do-not-copy-file-names-that-are-too-long.patch b/0248-fs-f2fs-Do-not-copy-file-names-that-are-too-long.patch similarity index 100% rename from 0250-fs-f2fs-Do-not-copy-file-names-that-are-too-long.patch rename to 0248-fs-f2fs-Do-not-copy-file-names-that-are-too-long.patch diff --git a/0251-fs-btrfs-Fix-several-fuzz-issues-with-invalid-dir-it.patch b/0249-fs-btrfs-Fix-several-fuzz-issues-with-invalid-dir-it.patch similarity index 100% rename from 0251-fs-btrfs-Fix-several-fuzz-issues-with-invalid-dir-it.patch rename to 0249-fs-btrfs-Fix-several-fuzz-issues-with-invalid-dir-it.patch diff --git a/0252-fs-btrfs-Fix-more-ASAN-and-SEGV-issues-found-with-fu.patch b/0250-fs-btrfs-Fix-more-ASAN-and-SEGV-issues-found-with-fu.patch similarity index 100% rename from 0252-fs-btrfs-Fix-more-ASAN-and-SEGV-issues-found-with-fu.patch rename to 0250-fs-btrfs-Fix-more-ASAN-and-SEGV-issues-found-with-fu.patch diff --git a/0253-fs-btrfs-Fix-more-fuzz-issues-related-to-chunks.patch b/0251-fs-btrfs-Fix-more-fuzz-issues-related-to-chunks.patch similarity index 100% rename from 0253-fs-btrfs-Fix-more-fuzz-issues-related-to-chunks.patch rename to 0251-fs-btrfs-Fix-more-fuzz-issues-related-to-chunks.patch diff --git a/0254-misc-Make-grub_min-and-grub_max-more-resilient.patch b/0252-misc-Make-grub_min-and-grub_max-more-resilient.patch similarity index 100% rename from 0254-misc-Make-grub_min-and-grub_max-more-resilient.patch rename to 0252-misc-Make-grub_min-and-grub_max-more-resilient.patch diff --git a/0255-ReiserFS-switch-to-using-grub_min-grub_max.patch b/0253-ReiserFS-switch-to-using-grub_min-grub_max.patch similarity index 100% rename from 0255-ReiserFS-switch-to-using-grub_min-grub_max.patch rename to 0253-ReiserFS-switch-to-using-grub_min-grub_max.patch diff --git a/0256-misc-make-grub_boot_time-also-call-grub_dprintf-boot.patch b/0254-misc-make-grub_boot_time-also-call-grub_dprintf-boot.patch similarity index 100% rename from 0256-misc-make-grub_boot_time-also-call-grub_dprintf-boot.patch rename to 0254-misc-make-grub_boot_time-also-call-grub_dprintf-boot.patch diff --git a/0257-modules-make-.module_license-read-only.patch b/0255-modules-make-.module_license-read-only.patch similarity index 100% rename from 0257-modules-make-.module_license-read-only.patch rename to 0255-modules-make-.module_license-read-only.patch diff --git a/0258-modules-strip-.llvm_addrsig-sections-and-similar.patch b/0256-modules-strip-.llvm_addrsig-sections-and-similar.patch similarity index 100% rename from 0258-modules-strip-.llvm_addrsig-sections-and-similar.patch rename to 0256-modules-strip-.llvm_addrsig-sections-and-similar.patch diff --git a/0259-modules-Don-t-allocate-space-for-non-allocable-secti.patch b/0257-modules-Don-t-allocate-space-for-non-allocable-secti.patch similarity index 100% rename from 0259-modules-Don-t-allocate-space-for-non-allocable-secti.patch rename to 0257-modules-Don-t-allocate-space-for-non-allocable-secti.patch diff --git a/0260-pe-add-the-DOS-header-struct-and-fix-some-bad-naming.patch b/0258-pe-add-the-DOS-header-struct-and-fix-some-bad-naming.patch similarity index 100% rename from 0260-pe-add-the-DOS-header-struct-and-fix-some-bad-naming.patch rename to 0258-pe-add-the-DOS-header-struct-and-fix-some-bad-naming.patch diff --git a/0261-EFI-allocate-kernel-in-EFI_RUNTIME_SERVICES_CODE-ins.patch b/0259-EFI-allocate-kernel-in-EFI_RUNTIME_SERVICES_CODE-ins.patch similarity index 100% rename from 0261-EFI-allocate-kernel-in-EFI_RUNTIME_SERVICES_CODE-ins.patch rename to 0259-EFI-allocate-kernel-in-EFI_RUNTIME_SERVICES_CODE-ins.patch diff --git a/0262-modules-load-module-sections-at-page-aligned-address.patch b/0260-modules-load-module-sections-at-page-aligned-address.patch similarity index 100% rename from 0262-modules-load-module-sections-at-page-aligned-address.patch rename to 0260-modules-load-module-sections-at-page-aligned-address.patch diff --git a/0263-nx-add-memory-attribute-get-set-API.patch b/0261-nx-add-memory-attribute-get-set-API.patch similarity index 100% rename from 0263-nx-add-memory-attribute-get-set-API.patch rename to 0261-nx-add-memory-attribute-get-set-API.patch diff --git a/0264-nx-set-page-permissions-for-loaded-modules.patch b/0262-nx-set-page-permissions-for-loaded-modules.patch similarity index 100% rename from 0264-nx-set-page-permissions-for-loaded-modules.patch rename to 0262-nx-set-page-permissions-for-loaded-modules.patch diff --git a/0265-nx-set-attrs-in-our-kernel-loaders.patch b/0263-nx-set-attrs-in-our-kernel-loaders.patch similarity index 100% rename from 0265-nx-set-attrs-in-our-kernel-loaders.patch rename to 0263-nx-set-attrs-in-our-kernel-loaders.patch diff --git a/0266-nx-set-the-nx-compatible-flag-in-EFI-grub-images.patch b/0264-nx-set-the-nx-compatible-flag-in-EFI-grub-images.patch similarity index 100% rename from 0266-nx-set-the-nx-compatible-flag-in-EFI-grub-images.patch rename to 0264-nx-set-the-nx-compatible-flag-in-EFI-grub-images.patch diff --git a/0267-grub-probe-document-the-behavior-of-multiple-v.patch b/0265-grub-probe-document-the-behavior-of-multiple-v.patch similarity index 100% rename from 0267-grub-probe-document-the-behavior-of-multiple-v.patch rename to 0265-grub-probe-document-the-behavior-of-multiple-v.patch diff --git a/0268-grub_fs_probe-dprint-errors-from-filesystems.patch b/0266-grub_fs_probe-dprint-errors-from-filesystems.patch similarity index 100% rename from 0268-grub_fs_probe-dprint-errors-from-filesystems.patch rename to 0266-grub_fs_probe-dprint-errors-from-filesystems.patch diff --git a/0269-fs-fat-don-t-error-when-mtime-is-0.patch b/0267-fs-fat-don-t-error-when-mtime-is-0.patch similarity index 100% rename from 0269-fs-fat-don-t-error-when-mtime-is-0.patch rename to 0267-fs-fat-don-t-error-when-mtime-is-0.patch diff --git a/0270-Make-debug-file-show-which-file-filters-get-run.patch b/0268-Make-debug-file-show-which-file-filters-get-run.patch similarity index 100% rename from 0270-Make-debug-file-show-which-file-filters-get-run.patch rename to 0268-Make-debug-file-show-which-file-filters-get-run.patch diff --git a/0271-efi-use-enumerated-array-positions-for-our-allocatio.patch b/0269-efi-use-enumerated-array-positions-for-our-allocatio.patch similarity index 100% rename from 0271-efi-use-enumerated-array-positions-for-our-allocatio.patch rename to 0269-efi-use-enumerated-array-positions-for-our-allocatio.patch diff --git a/0272-efi-split-allocation-policy-for-kernel-vs-initrd-mem.patch b/0270-efi-split-allocation-policy-for-kernel-vs-initrd-mem.patch similarity index 100% rename from 0272-efi-split-allocation-policy-for-kernel-vs-initrd-mem.patch rename to 0270-efi-split-allocation-policy-for-kernel-vs-initrd-mem.patch diff --git a/0273-efi-allocate-the-initrd-within-the-bounds-expressed-.patch b/0271-efi-allocate-the-initrd-within-the-bounds-expressed-.patch similarity index 100% rename from 0273-efi-allocate-the-initrd-within-the-bounds-expressed-.patch rename to 0271-efi-allocate-the-initrd-within-the-bounds-expressed-.patch diff --git a/0274-efi-use-EFI_LOADER_-CODE-DATA-for-kernel-and-initrd-.patch b/0272-efi-use-EFI_LOADER_-CODE-DATA-for-kernel-and-initrd-.patch similarity index 100% rename from 0274-efi-use-EFI_LOADER_-CODE-DATA-for-kernel-and-initrd-.patch rename to 0272-efi-use-EFI_LOADER_-CODE-DATA-for-kernel-and-initrd-.patch diff --git a/0275-BLS-create-etc-kernel-cmdline-during-mkconfig.patch b/0273-BLS-create-etc-kernel-cmdline-during-mkconfig.patch similarity index 96% rename from 0275-BLS-create-etc-kernel-cmdline-during-mkconfig.patch rename to 0273-BLS-create-etc-kernel-cmdline-during-mkconfig.patch index 7080b6f..50ba0fb 100644 --- a/0275-BLS-create-etc-kernel-cmdline-during-mkconfig.patch +++ b/0273-BLS-create-etc-kernel-cmdline-during-mkconfig.patch @@ -9,7 +9,7 @@ Signed-off-by: Robbie Harwood 1 file changed, 6 insertions(+) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 6af84b44e1..950a92f5e8 100644 +index 865af3d6c4..9ebff661a9 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -161,6 +161,12 @@ update_bls_cmdline() diff --git a/0276-squish-don-t-dup-rhgb-quiet-check-mtimes.patch b/0274-squish-don-t-dup-rhgb-quiet-check-mtimes.patch similarity index 97% rename from 0276-squish-don-t-dup-rhgb-quiet-check-mtimes.patch rename to 0274-squish-don-t-dup-rhgb-quiet-check-mtimes.patch index 013b915..67073ec 100644 --- a/0276-squish-don-t-dup-rhgb-quiet-check-mtimes.patch +++ b/0274-squish-don-t-dup-rhgb-quiet-check-mtimes.patch @@ -9,7 +9,7 @@ Signed-off-by: Robbie Harwood 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 950a92f5e8..03f091a4dc 100644 +index 9ebff661a9..41c6cb1dc2 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -161,10 +161,16 @@ update_bls_cmdline() diff --git a/0277-squish-give-up-on-rhgb-quiet.patch b/0275-squish-give-up-on-rhgb-quiet.patch similarity index 95% rename from 0277-squish-give-up-on-rhgb-quiet.patch rename to 0275-squish-give-up-on-rhgb-quiet.patch index bbead5e..5858c91 100644 --- a/0277-squish-give-up-on-rhgb-quiet.patch +++ b/0275-squish-give-up-on-rhgb-quiet.patch @@ -9,7 +9,7 @@ Signed-off-by: Robbie Harwood 1 file changed, 4 deletions(-) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 03f091a4dc..5ad624bfec 100644 +index 41c6cb1dc2..5d1fa072f2 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -166,10 +166,6 @@ update_bls_cmdline() diff --git a/0278-squish-BLS-only-write-etc-kernel-cmdline-if-writable.patch b/0276-squish-BLS-only-write-etc-kernel-cmdline-if-writable.patch similarity index 98% rename from 0278-squish-BLS-only-write-etc-kernel-cmdline-if-writable.patch rename to 0276-squish-BLS-only-write-etc-kernel-cmdline-if-writable.patch index ed378b8..d5ac923 100644 --- a/0278-squish-BLS-only-write-etc-kernel-cmdline-if-writable.patch +++ b/0276-squish-BLS-only-write-etc-kernel-cmdline-if-writable.patch @@ -32,7 +32,7 @@ Fixes: https://github.com/fedora-silverblue/issue-tracker/issues/322 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 5ad624bfec..e5e87a6d80 100644 +index 5d1fa072f2..4795a63b4c 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -161,12 +161,13 @@ update_bls_cmdline() diff --git a/0279-ieee1275-implement-vec5-for-cas-negotiation.patch b/0277-ieee1275-implement-vec5-for-cas-negotiation.patch similarity index 100% rename from 0279-ieee1275-implement-vec5-for-cas-negotiation.patch rename to 0277-ieee1275-implement-vec5-for-cas-negotiation.patch diff --git a/0280-blscfg-Don-t-root-device-in-emu-builds.patch b/0278-blscfg-Don-t-root-device-in-emu-builds.patch similarity index 100% rename from 0280-blscfg-Don-t-root-device-in-emu-builds.patch rename to 0278-blscfg-Don-t-root-device-in-emu-builds.patch diff --git a/0281-loader-arm64-linux-Remove-magic-number-header-field-.patch b/0279-loader-arm64-linux-Remove-magic-number-header-field-.patch similarity index 100% rename from 0281-loader-arm64-linux-Remove-magic-number-header-field-.patch rename to 0279-loader-arm64-linux-Remove-magic-number-header-field-.patch diff --git a/0282-Correct-BSS-zeroing-on-aarch64.patch b/0280-Correct-BSS-zeroing-on-aarch64.patch similarity index 100% rename from 0282-Correct-BSS-zeroing-on-aarch64.patch rename to 0280-Correct-BSS-zeroing-on-aarch64.patch diff --git a/0283-linuxefi-Invalidate-i-cache-before-starting-the-kern.patch b/0281-linuxefi-Invalidate-i-cache-before-starting-the-kern.patch similarity index 100% rename from 0283-linuxefi-Invalidate-i-cache-before-starting-the-kern.patch rename to 0281-linuxefi-Invalidate-i-cache-before-starting-the-kern.patch diff --git a/0284-x86-efi-Fix-an-incorrect-array-size-in-kernel-alloca.patch b/0282-x86-efi-Fix-an-incorrect-array-size-in-kernel-alloca.patch similarity index 100% rename from 0284-x86-efi-Fix-an-incorrect-array-size-in-kernel-alloca.patch rename to 0282-x86-efi-Fix-an-incorrect-array-size-in-kernel-alloca.patch diff --git a/0285-commands-efi-tpm-Refine-the-status-of-log-event.patch b/0283-commands-efi-tpm-Refine-the-status-of-log-event.patch similarity index 100% rename from 0285-commands-efi-tpm-Refine-the-status-of-log-event.patch rename to 0283-commands-efi-tpm-Refine-the-status-of-log-event.patch diff --git a/0286-commands-efi-tpm-Use-grub_strcpy-instead-of-grub_mem.patch b/0284-commands-efi-tpm-Use-grub_strcpy-instead-of-grub_mem.patch similarity index 100% rename from 0286-commands-efi-tpm-Use-grub_strcpy-instead-of-grub_mem.patch rename to 0284-commands-efi-tpm-Use-grub_strcpy-instead-of-grub_mem.patch diff --git a/0287-efi-tpm-Add-EFI_CC_MEASUREMENT_PROTOCOL-support.patch b/0285-efi-tpm-Add-EFI_CC_MEASUREMENT_PROTOCOL-support.patch similarity index 100% rename from 0287-efi-tpm-Add-EFI_CC_MEASUREMENT_PROTOCOL-support.patch rename to 0285-efi-tpm-Add-EFI_CC_MEASUREMENT_PROTOCOL-support.patch diff --git a/grub.patches b/grub.patches index ebbd8ac..a90e921 100644 --- a/grub.patches +++ b/grub.patches @@ -29,259 +29,257 @@ Patch0028: 0028-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch Patch0029: 0029-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch Patch0030: 0030-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch Patch0031: 0031-Try-prefix-if-fw_path-doesn-t-work.patch -Patch0032: 0032-Use-rpm-s-sort-for-grub2-mkconfig.patch -Patch0033: 0033-Make-grub2-mkconfig-construct-titles-that-look-like-.patch -Patch0034: 0034-Add-friendly-grub2-password-config-tool-985962.patch -Patch0035: 0035-tcp-add-window-scaling-support.patch -Patch0036: 0036-efinet-and-bootp-add-support-for-dhcpv6.patch -Patch0037: 0037-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch -Patch0038: 0038-bz1374141-fix-incorrect-mask-for-ppc64.patch -Patch0039: 0039-Make-grub_fatal-also-backtrace.patch -Patch0040: 0040-Make-our-info-pages-say-grub2-where-appropriate.patch -Patch0041: 0041-macos-just-build-chainloader-entries-don-t-try-any-x.patch -Patch0042: 0042-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch -Patch0043: 0043-export-btrfs_subvol-and-btrfs_subvolid.patch -Patch0044: 0044-grub2-btrfs-03-follow_default.patch -Patch0045: 0045-grub2-btrfs-04-grub2-install.patch -Patch0046: 0046-grub2-btrfs-05-grub2-mkconfig.patch -Patch0047: 0047-grub2-btrfs-06-subvol-mount.patch -Patch0048: 0048-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch -Patch0049: 0049-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch -Patch0050: 0050-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch -Patch0051: 0051-Use-grub_efi_.-memory-helpers-where-reasonable.patch -Patch0052: 0052-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch -Patch0053: 0053-don-t-use-int-for-efi-status.patch -Patch0054: 0054-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch -Patch0055: 0055-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch -Patch0056: 0056-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch -Patch0057: 0057-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch -Patch0058: 0058-align-struct-efi_variable-better.patch -Patch0059: 0059-Add-BLS-support-to-grub-mkconfig.patch -Patch0060: 0060-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch -Patch0061: 0061-Add-linux-and-initrd-commands-for-grub-emu.patch -Patch0062: 0062-Add-grub2-switch-to-blscfg.patch -Patch0063: 0063-make-better-backtraces.patch -Patch0064: 0064-normal-don-t-draw-our-startup-message-if-debug-is-se.patch -Patch0065: 0065-Work-around-some-minor-include-path-weirdnesses.patch -Patch0066: 0066-Make-it-possible-to-enabled-build-id-sha1.patch -Patch0067: 0067-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch -Patch0068: 0068-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch -Patch0069: 0069-Fixup-for-newer-compiler.patch -Patch0070: 0070-Don-t-attempt-to-export-the-start-and-_start-symbols.patch -Patch0071: 0071-Fixup-for-newer-compiler.patch -Patch0072: 0072-Add-support-for-non-Ethernet-network-cards.patch -Patch0073: 0073-net-read-bracketed-ipv6-addrs-and-port-numbers.patch -Patch0074: 0074-bootp-New-net_bootp6-command.patch -Patch0075: 0075-efinet-UEFI-IPv6-PXE-support.patch -Patch0076: 0076-grub.texi-Add-net_bootp6-doument.patch -Patch0077: 0077-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch -Patch0078: 0078-efinet-Setting-network-from-UEFI-device-path.patch -Patch0079: 0079-efinet-Setting-DNS-server-from-UEFI-protocol.patch -Patch0080: 0080-Support-UEFI-networking-protocols.patch -Patch0081: 0081-AUDIT-0-http-boot-tracker-bug.patch -Patch0082: 0082-grub-editenv-Add-incr-command-to-increment-integer-v.patch -Patch0083: 0083-Add-auto-hide-menu-support.patch -Patch0084: 0084-Add-grub-set-bootflag-utility.patch -Patch0085: 0085-docs-Add-grub-boot-indeterminate.service-example.patch -Patch0086: 0086-gentpl-add-disable-support.patch -Patch0087: 0087-gentpl-add-pc-firmware-type.patch -Patch0088: 0088-efinet-also-use-the-firmware-acceleration-for-http.patch -Patch0089: 0089-efi-http-Make-root_url-reflect-the-protocol-hostname.patch -Patch0090: 0090-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch -Patch0091: 0091-module-verifier-make-it-possible-to-run-checkers-on-.patch -Patch0092: 0092-Rework-how-the-fdt-command-builds.patch -Patch0093: 0093-Disable-non-wordsize-allocations-on-arm.patch -Patch0094: 0094-Prepend-prefix-when-HTTP-path-is-relative.patch -Patch0095: 0095-Make-grub_error-more-verbose.patch -Patch0096: 0096-Make-reset-an-alias-for-the-reboot-command.patch -Patch0097: 0097-Add-a-version-command.patch -Patch0098: 0098-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch -Patch0099: 0099-arm-arm64-loader-Better-memory-allocation-and-error-.patch -Patch0100: 0100-Try-to-pick-better-locations-for-kernel-and-initrd.patch -Patch0101: 0101-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch -Patch0102: 0102-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch -Patch0103: 0103-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch -Patch0104: 0104-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch -Patch0105: 0105-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch -Patch0106: 0106-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch -Patch0107: 0107-Fix-getroot.c-s-trampolines.patch -Patch0108: 0108-Do-not-allow-stack-trampolines-anywhere.patch -Patch0109: 0109-Reimplement-boot_counter.patch -Patch0110: 0110-Fix-menu-entry-selection-based-on-ID-and-title.patch -Patch0111: 0111-Make-the-menu-entry-users-option-argument-to-be-opti.patch -Patch0112: 0112-Add-efi-export-env-and-efi-load-env-commands.patch -Patch0113: 0113-Make-it-possible-to-subtract-conditions-from-debug.patch -Patch0114: 0114-Export-all-variables-from-the-initial-context-when-c.patch -Patch0115: 0115-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch -Patch0116: 0116-Fix-systemctl-kexec-exit-status-check.patch -Patch0117: 0117-Print-grub-emu-linux-loader-messages-as-debug.patch -Patch0118: 0118-Don-t-assume-that-boot-commands-will-only-return-on-.patch -Patch0119: 0119-grub-set-bootflag-Update-comment-about-running-as-ro.patch -Patch0120: 0120-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch -Patch0121: 0121-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch -Patch0122: 0122-Add-start-symbol-for-RISC-V.patch -Patch0123: 0123-bootstrap.conf-Force-autogen.sh-to-use-python3.patch -Patch0124: 0124-efi-http-Export-fw-http-_path-variables-to-make-them.patch -Patch0125: 0125-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch -Patch0126: 0126-efi-net-Allow-to-specify-a-port-number-in-addresses.patch -Patch0127: 0127-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch -Patch0128: 0128-efi-net-Print-a-debug-message-if-parsing-the-address.patch -Patch0129: 0129-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch -Patch0130: 0130-efi-Set-image-base-address-before-jumping-to-the-PE-.patch -Patch0131: 0131-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch -Patch0132: 0132-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch -Patch0133: 0133-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch -Patch0134: 0134-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch -Patch0135: 0135-efi-dhcp-fix-some-allocation-error-checking.patch -Patch0136: 0136-efi-http-fix-some-allocation-error-checking.patch -Patch0137: 0137-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch -Patch0138: 0138-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch -Patch0139: 0139-linuxefi-fail-kernel-validation-without-shim-protoco.patch -Patch0140: 0140-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch -Patch0141: 0141-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch -Patch0142: 0142-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch -Patch0143: 0143-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch -Patch0144: 0144-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch -Patch0145: 0145-Add-systemd-integration-scripts-to-make-systemctl-re.patch -Patch0146: 0146-systemd-integration.sh-Also-set-old-menu_show_once-g.patch -Patch0147: 0147-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch -Patch0148: 0148-grub-install-disable-support-for-EFI-platforms.patch -Patch0149: 0149-New-with-debug-timestamps-configure-flag-to-prepend-.patch -Patch0150: 0150-Added-debug-statements-to-grub_disk_open-and-grub_di.patch -Patch0151: 0151-Introduce-function-grub_debug_is_enabled-void-return.patch -Patch0152: 0152-Don-t-clear-screen-when-debugging-is-enabled.patch -Patch0153: 0153-grub_file_-instrumentation-new-file-debug-tag.patch -Patch0154: 0154-ieee1275-Avoiding-many-unecessary-open-close.patch -Patch0155: 0155-ieee1275-powerpc-implements-fibre-channel-discovery-.patch -Patch0156: 0156-ieee1275-powerpc-enables-device-mapper-discovery.patch -Patch0157: 0157-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch -Patch0158: 0158-Add-suport-for-signing-grub-with-an-appended-signatu.patch -Patch0159: 0159-docs-grub-Document-signing-grub-under-UEFI.patch -Patch0160: 0160-docs-grub-Document-signing-grub-with-an-appended-sig.patch -Patch0161: 0161-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch -Patch0162: 0162-pgp-factor-out-rsa_pad.patch -Patch0163: 0163-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch -Patch0164: 0164-posix_wrap-tweaks-in-preparation-for-libtasn1.patch -Patch0165: 0165-libtasn1-import-libtasn1-4.16.0.patch -Patch0166: 0166-libtasn1-disable-code-not-needed-in-grub.patch -Patch0167: 0167-libtasn1-changes-for-grub-compatibility.patch -Patch0168: 0168-libtasn1-compile-into-asn1-module.patch -Patch0169: 0169-test_asn1-test-module-for-libtasn1.patch -Patch0170: 0170-grub-install-support-embedding-x509-certificates.patch -Patch0171: 0171-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch -Patch0172: 0172-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch -Patch0173: 0173-appended-signatures-support-verifying-appended-signa.patch -Patch0174: 0174-appended-signatures-verification-tests.patch -Patch0175: 0175-appended-signatures-documentation.patch -Patch0176: 0176-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch -Patch0177: 0177-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch -Patch0178: 0178-ieee1275-claim-more-memory.patch -Patch0179: 0179-ieee1275-request-memory-with-ibm-client-architecture.patch -Patch0180: 0180-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch -Patch0181: 0181-ieee1275-ofdisk-retry-on-open-failure.patch -Patch0182: 0182-Allow-chainloading-EFI-apps-from-loop-mounts.patch -Patch0183: 0183-efinet-Add-DHCP-proxy-support.patch -Patch0184: 0184-fs-ext2-Ignore-checksum-seed-incompat-feature.patch -Patch0185: 0185-Don-t-update-the-cmdline-when-generating-legacy-menu.patch -Patch0186: 0186-Suppress-gettext-error-message.patch -Patch0187: 0187-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch -Patch0188: 0188-templates-Check-for-EFI-at-runtime-instead-of-config.patch -Patch0189: 0189-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch -Patch0190: 0190-arm64-Fix-EFI-loader-kernel-image-allocation.patch -Patch0191: 0191-normal-main-Discover-the-device-to-read-the-config-f.patch -Patch0192: 0192-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch -Patch0193: 0193-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch -Patch0194: 0194-Print-module-name-on-license-check-failure.patch -Patch0195: 0195-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch -Patch0196: 0196-grub-mkconfig-restore-umask-for-grub.cfg.patch -Patch0197: 0197-fs-btrfs-Use-full-btrfs-bootloader-area.patch -Patch0198: 0198-Add-Fedora-location-of-DejaVu-SANS-font.patch -Patch0199: 0199-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch -Patch0200: 0200-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch -Patch0201: 0201-EFI-console-Do-not-set-colorstate-until-the-first-te.patch -Patch0202: 0202-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch -Patch0203: 0203-Use-visual-indentation-in-config.h.in.patch -Patch0204: 0204-Where-present-ensure-config-util.h-precedes-config.h.patch -Patch0205: 0205-Drop-gnulib-fix-base64.patch.patch -Patch0206: 0206-Drop-gnulib-no-abort.patch.patch -Patch0207: 0207-Update-gnulib-version-and-drop-most-gnulib-patches.patch -Patch0208: 0208-commands-search-Fix-bug-stopping-iteration-when-no-f.patch -Patch0209: 0209-search-new-efidisk-only-option-on-EFI-systems.patch -Patch0210: 0210-efi-new-connectefi-command.patch -Patch0211: 0211-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch -Patch0212: 0212-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch -Patch0213: 0213-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch -Patch0214: 0214-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch -Patch0215: 0215-powerpc-do-CAS-in-a-more-compatible-way.patch -Patch0216: 0216-powerpc-prefix-detection-support-device-names-with-c.patch -Patch0217: 0217-ibmvtpm-Add-support-for-trusted-boot-using-a-vTPM-2..patch -Patch0218: 0218-rpm-sort-add-prereqs-for-declaration-of-strchrnul.patch -Patch0219: 0219-make-ofdisk_retries-optional.patch -Patch0220: 0220-loader-efi-chainloader-grub_load_and_start_image-doe.patch -Patch0221: 0221-loader-efi-chainloader-simplify-the-loader-state.patch -Patch0222: 0222-commands-boot-Add-API-to-pass-context-to-loader.patch -Patch0223: 0223-loader-efi-chainloader-Use-grub_loader_set_ex.patch -Patch0224: 0224-loader-i386-efi-linux-Avoid-a-use-after-free-in-the-.patch -Patch0225: 0225-loader-i386-efi-linux-Use-grub_loader_set_ex.patch -Patch0226: 0226-loader-i386-efi-linux-Fix-a-memory-leak-in-the-initr.patch -Patch0227: 0227-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch -Patch0228: 0228-kern-file-Do-not-leak-device_name-on-error-in-grub_f.patch -Patch0229: 0229-video-readers-png-Abort-sooner-if-a-read-operation-f.patch -Patch0230: 0230-video-readers-png-Refuse-to-handle-multiple-image-he.patch -Patch0231: 0231-video-readers-png-Drop-greyscale-support-to-fix-heap.patch -Patch0232: 0232-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch -Patch0233: 0233-video-readers-png-Sanity-check-some-huffman-codes.patch -Patch0234: 0234-video-readers-jpeg-Abort-sooner-if-a-read-operation-.patch -Patch0235: 0235-video-readers-jpeg-Do-not-reallocate-a-given-huff-ta.patch -Patch0236: 0236-video-readers-jpeg-Refuse-to-handle-multiple-start-o.patch -Patch0237: 0237-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch -Patch0238: 0238-normal-charset-Fix-array-out-of-bounds-formatting-un.patch -Patch0239: 0239-net-netbuff-Block-overly-large-netbuff-allocs.patch -Patch0240: 0240-net-ip-Do-IP-fragment-maths-safely.patch -Patch0241: 0241-net-dns-Fix-double-free-addresses-on-corrupt-DNS-res.patch -Patch0242: 0242-net-dns-Don-t-read-past-the-end-of-the-string-we-re-.patch -Patch0243: 0243-net-tftp-Prevent-a-UAF-and-double-free-from-a-failed.patch -Patch0244: 0244-net-tftp-Avoid-a-trivial-UAF.patch -Patch0245: 0245-net-http-Do-not-tear-down-socket-if-it-s-already-bee.patch -Patch0246: 0246-net-http-Fix-OOB-write-for-split-http-headers.patch -Patch0247: 0247-net-http-Error-out-on-headers-with-LF-without-CR.patch -Patch0248: 0248-fs-f2fs-Do-not-read-past-the-end-of-nat-journal-entr.patch -Patch0249: 0249-fs-f2fs-Do-not-read-past-the-end-of-nat-bitmap.patch -Patch0250: 0250-fs-f2fs-Do-not-copy-file-names-that-are-too-long.patch -Patch0251: 0251-fs-btrfs-Fix-several-fuzz-issues-with-invalid-dir-it.patch -Patch0252: 0252-fs-btrfs-Fix-more-ASAN-and-SEGV-issues-found-with-fu.patch -Patch0253: 0253-fs-btrfs-Fix-more-fuzz-issues-related-to-chunks.patch -Patch0254: 0254-misc-Make-grub_min-and-grub_max-more-resilient.patch -Patch0255: 0255-ReiserFS-switch-to-using-grub_min-grub_max.patch -Patch0256: 0256-misc-make-grub_boot_time-also-call-grub_dprintf-boot.patch -Patch0257: 0257-modules-make-.module_license-read-only.patch -Patch0258: 0258-modules-strip-.llvm_addrsig-sections-and-similar.patch -Patch0259: 0259-modules-Don-t-allocate-space-for-non-allocable-secti.patch -Patch0260: 0260-pe-add-the-DOS-header-struct-and-fix-some-bad-naming.patch -Patch0261: 0261-EFI-allocate-kernel-in-EFI_RUNTIME_SERVICES_CODE-ins.patch -Patch0262: 0262-modules-load-module-sections-at-page-aligned-address.patch -Patch0263: 0263-nx-add-memory-attribute-get-set-API.patch -Patch0264: 0264-nx-set-page-permissions-for-loaded-modules.patch -Patch0265: 0265-nx-set-attrs-in-our-kernel-loaders.patch -Patch0266: 0266-nx-set-the-nx-compatible-flag-in-EFI-grub-images.patch -Patch0267: 0267-grub-probe-document-the-behavior-of-multiple-v.patch -Patch0268: 0268-grub_fs_probe-dprint-errors-from-filesystems.patch -Patch0269: 0269-fs-fat-don-t-error-when-mtime-is-0.patch -Patch0270: 0270-Make-debug-file-show-which-file-filters-get-run.patch -Patch0271: 0271-efi-use-enumerated-array-positions-for-our-allocatio.patch -Patch0272: 0272-efi-split-allocation-policy-for-kernel-vs-initrd-mem.patch -Patch0273: 0273-efi-allocate-the-initrd-within-the-bounds-expressed-.patch -Patch0274: 0274-efi-use-EFI_LOADER_-CODE-DATA-for-kernel-and-initrd-.patch -Patch0275: 0275-BLS-create-etc-kernel-cmdline-during-mkconfig.patch -Patch0276: 0276-squish-don-t-dup-rhgb-quiet-check-mtimes.patch -Patch0277: 0277-squish-give-up-on-rhgb-quiet.patch -Patch0278: 0278-squish-BLS-only-write-etc-kernel-cmdline-if-writable.patch -Patch0279: 0279-ieee1275-implement-vec5-for-cas-negotiation.patch -Patch0280: 0280-blscfg-Don-t-root-device-in-emu-builds.patch -Patch0281: 0281-loader-arm64-linux-Remove-magic-number-header-field-.patch -Patch0282: 0282-Correct-BSS-zeroing-on-aarch64.patch -Patch0283: 0283-linuxefi-Invalidate-i-cache-before-starting-the-kern.patch -Patch0284: 0284-x86-efi-Fix-an-incorrect-array-size-in-kernel-alloca.patch -Patch0285: 0285-commands-efi-tpm-Refine-the-status-of-log-event.patch -Patch0286: 0286-commands-efi-tpm-Use-grub_strcpy-instead-of-grub_mem.patch -Patch0287: 0287-efi-tpm-Add-EFI_CC_MEASUREMENT_PROTOCOL-support.patch +Patch0032: 0032-Make-grub2-mkconfig-construct-titles-that-look-like-.patch +Patch0033: 0033-Add-friendly-grub2-password-config-tool-985962.patch +Patch0034: 0034-tcp-add-window-scaling-support.patch +Patch0035: 0035-efinet-and-bootp-add-support-for-dhcpv6.patch +Patch0036: 0036-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch +Patch0037: 0037-bz1374141-fix-incorrect-mask-for-ppc64.patch +Patch0038: 0038-Make-grub_fatal-also-backtrace.patch +Patch0039: 0039-Make-our-info-pages-say-grub2-where-appropriate.patch +Patch0040: 0040-macos-just-build-chainloader-entries-don-t-try-any-x.patch +Patch0041: 0041-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch +Patch0042: 0042-export-btrfs_subvol-and-btrfs_subvolid.patch +Patch0043: 0043-grub2-btrfs-03-follow_default.patch +Patch0044: 0044-grub2-btrfs-04-grub2-install.patch +Patch0045: 0045-grub2-btrfs-05-grub2-mkconfig.patch +Patch0046: 0046-grub2-btrfs-06-subvol-mount.patch +Patch0047: 0047-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch +Patch0048: 0048-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch +Patch0049: 0049-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch +Patch0050: 0050-Use-grub_efi_.-memory-helpers-where-reasonable.patch +Patch0051: 0051-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch +Patch0052: 0052-don-t-use-int-for-efi-status.patch +Patch0053: 0053-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch +Patch0054: 0054-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch +Patch0055: 0055-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch +Patch0056: 0056-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch +Patch0057: 0057-align-struct-efi_variable-better.patch +Patch0058: 0058-Add-BLS-support-to-grub-mkconfig.patch +Patch0059: 0059-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch +Patch0060: 0060-Add-linux-and-initrd-commands-for-grub-emu.patch +Patch0061: 0061-Add-grub2-switch-to-blscfg.patch +Patch0062: 0062-make-better-backtraces.patch +Patch0063: 0063-normal-don-t-draw-our-startup-message-if-debug-is-se.patch +Patch0064: 0064-Work-around-some-minor-include-path-weirdnesses.patch +Patch0065: 0065-Make-it-possible-to-enabled-build-id-sha1.patch +Patch0066: 0066-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch +Patch0067: 0067-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch +Patch0068: 0068-Fixup-for-newer-compiler.patch +Patch0069: 0069-Don-t-attempt-to-export-the-start-and-_start-symbols.patch +Patch0070: 0070-Fixup-for-newer-compiler.patch +Patch0071: 0071-Add-support-for-non-Ethernet-network-cards.patch +Patch0072: 0072-net-read-bracketed-ipv6-addrs-and-port-numbers.patch +Patch0073: 0073-bootp-New-net_bootp6-command.patch +Patch0074: 0074-efinet-UEFI-IPv6-PXE-support.patch +Patch0075: 0075-grub.texi-Add-net_bootp6-doument.patch +Patch0076: 0076-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch +Patch0077: 0077-efinet-Setting-network-from-UEFI-device-path.patch +Patch0078: 0078-efinet-Setting-DNS-server-from-UEFI-protocol.patch +Patch0079: 0079-Support-UEFI-networking-protocols.patch +Patch0080: 0080-AUDIT-0-http-boot-tracker-bug.patch +Patch0081: 0081-grub-editenv-Add-incr-command-to-increment-integer-v.patch +Patch0082: 0082-Add-auto-hide-menu-support.patch +Patch0083: 0083-Add-grub-set-bootflag-utility.patch +Patch0084: 0084-docs-Add-grub-boot-indeterminate.service-example.patch +Patch0085: 0085-gentpl-add-disable-support.patch +Patch0086: 0086-gentpl-add-pc-firmware-type.patch +Patch0087: 0087-efinet-also-use-the-firmware-acceleration-for-http.patch +Patch0088: 0088-efi-http-Make-root_url-reflect-the-protocol-hostname.patch +Patch0089: 0089-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch +Patch0090: 0090-module-verifier-make-it-possible-to-run-checkers-on-.patch +Patch0091: 0091-Rework-how-the-fdt-command-builds.patch +Patch0092: 0092-Disable-non-wordsize-allocations-on-arm.patch +Patch0093: 0093-Prepend-prefix-when-HTTP-path-is-relative.patch +Patch0094: 0094-Make-grub_error-more-verbose.patch +Patch0095: 0095-Make-reset-an-alias-for-the-reboot-command.patch +Patch0096: 0096-Add-a-version-command.patch +Patch0097: 0097-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch +Patch0098: 0098-arm-arm64-loader-Better-memory-allocation-and-error-.patch +Patch0099: 0099-Try-to-pick-better-locations-for-kernel-and-initrd.patch +Patch0100: 0100-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch +Patch0101: 0101-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch +Patch0102: 0102-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch +Patch0103: 0103-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch +Patch0104: 0104-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch +Patch0105: 0105-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch +Patch0106: 0106-Fix-getroot.c-s-trampolines.patch +Patch0107: 0107-Do-not-allow-stack-trampolines-anywhere.patch +Patch0108: 0108-Reimplement-boot_counter.patch +Patch0109: 0109-Fix-menu-entry-selection-based-on-ID-and-title.patch +Patch0110: 0110-Make-the-menu-entry-users-option-argument-to-be-opti.patch +Patch0111: 0111-Add-efi-export-env-and-efi-load-env-commands.patch +Patch0112: 0112-Make-it-possible-to-subtract-conditions-from-debug.patch +Patch0113: 0113-Export-all-variables-from-the-initial-context-when-c.patch +Patch0114: 0114-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch +Patch0115: 0115-Fix-systemctl-kexec-exit-status-check.patch +Patch0116: 0116-Print-grub-emu-linux-loader-messages-as-debug.patch +Patch0117: 0117-Don-t-assume-that-boot-commands-will-only-return-on-.patch +Patch0118: 0118-grub-set-bootflag-Update-comment-about-running-as-ro.patch +Patch0119: 0119-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch +Patch0120: 0120-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch +Patch0121: 0121-Add-start-symbol-for-RISC-V.patch +Patch0122: 0122-bootstrap.conf-Force-autogen.sh-to-use-python3.patch +Patch0123: 0123-efi-http-Export-fw-http-_path-variables-to-make-them.patch +Patch0124: 0124-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch +Patch0125: 0125-efi-net-Allow-to-specify-a-port-number-in-addresses.patch +Patch0126: 0126-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch +Patch0127: 0127-efi-net-Print-a-debug-message-if-parsing-the-address.patch +Patch0128: 0128-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch +Patch0129: 0129-efi-Set-image-base-address-before-jumping-to-the-PE-.patch +Patch0130: 0130-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch +Patch0131: 0131-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch +Patch0132: 0132-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch +Patch0133: 0133-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch +Patch0134: 0134-efi-dhcp-fix-some-allocation-error-checking.patch +Patch0135: 0135-efi-http-fix-some-allocation-error-checking.patch +Patch0136: 0136-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch +Patch0137: 0137-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch +Patch0138: 0138-linuxefi-fail-kernel-validation-without-shim-protoco.patch +Patch0139: 0139-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch +Patch0140: 0140-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch +Patch0141: 0141-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch +Patch0142: 0142-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch +Patch0143: 0143-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch +Patch0144: 0144-Add-systemd-integration-scripts-to-make-systemctl-re.patch +Patch0145: 0145-systemd-integration.sh-Also-set-old-menu_show_once-g.patch +Patch0146: 0146-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch +Patch0147: 0147-grub-install-disable-support-for-EFI-platforms.patch +Patch0148: 0148-New-with-debug-timestamps-configure-flag-to-prepend-.patch +Patch0149: 0149-Added-debug-statements-to-grub_disk_open-and-grub_di.patch +Patch0150: 0150-Introduce-function-grub_debug_is_enabled-void-return.patch +Patch0151: 0151-Don-t-clear-screen-when-debugging-is-enabled.patch +Patch0152: 0152-grub_file_-instrumentation-new-file-debug-tag.patch +Patch0153: 0153-ieee1275-Avoiding-many-unecessary-open-close.patch +Patch0154: 0154-ieee1275-powerpc-implements-fibre-channel-discovery-.patch +Patch0155: 0155-ieee1275-powerpc-enables-device-mapper-discovery.patch +Patch0156: 0156-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch +Patch0157: 0157-Add-suport-for-signing-grub-with-an-appended-signatu.patch +Patch0158: 0158-docs-grub-Document-signing-grub-under-UEFI.patch +Patch0159: 0159-docs-grub-Document-signing-grub-with-an-appended-sig.patch +Patch0160: 0160-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch +Patch0161: 0161-pgp-factor-out-rsa_pad.patch +Patch0162: 0162-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch +Patch0163: 0163-posix_wrap-tweaks-in-preparation-for-libtasn1.patch +Patch0164: 0164-libtasn1-import-libtasn1-4.16.0.patch +Patch0165: 0165-libtasn1-disable-code-not-needed-in-grub.patch +Patch0166: 0166-libtasn1-changes-for-grub-compatibility.patch +Patch0167: 0167-libtasn1-compile-into-asn1-module.patch +Patch0168: 0168-test_asn1-test-module-for-libtasn1.patch +Patch0169: 0169-grub-install-support-embedding-x509-certificates.patch +Patch0170: 0170-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch +Patch0171: 0171-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch +Patch0172: 0172-appended-signatures-support-verifying-appended-signa.patch +Patch0173: 0173-appended-signatures-verification-tests.patch +Patch0174: 0174-appended-signatures-documentation.patch +Patch0175: 0175-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch +Patch0176: 0176-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch +Patch0177: 0177-ieee1275-claim-more-memory.patch +Patch0178: 0178-ieee1275-request-memory-with-ibm-client-architecture.patch +Patch0179: 0179-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch +Patch0180: 0180-ieee1275-ofdisk-retry-on-open-failure.patch +Patch0181: 0181-Allow-chainloading-EFI-apps-from-loop-mounts.patch +Patch0182: 0182-efinet-Add-DHCP-proxy-support.patch +Patch0183: 0183-fs-ext2-Ignore-checksum-seed-incompat-feature.patch +Patch0184: 0184-Don-t-update-the-cmdline-when-generating-legacy-menu.patch +Patch0185: 0185-Suppress-gettext-error-message.patch +Patch0186: 0186-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch +Patch0187: 0187-templates-Check-for-EFI-at-runtime-instead-of-config.patch +Patch0188: 0188-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch +Patch0189: 0189-arm64-Fix-EFI-loader-kernel-image-allocation.patch +Patch0190: 0190-normal-main-Discover-the-device-to-read-the-config-f.patch +Patch0191: 0191-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch +Patch0192: 0192-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch +Patch0193: 0193-Print-module-name-on-license-check-failure.patch +Patch0194: 0194-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch +Patch0195: 0195-grub-mkconfig-restore-umask-for-grub.cfg.patch +Patch0196: 0196-fs-btrfs-Use-full-btrfs-bootloader-area.patch +Patch0197: 0197-Add-Fedora-location-of-DejaVu-SANS-font.patch +Patch0198: 0198-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch +Patch0199: 0199-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch +Patch0200: 0200-EFI-console-Do-not-set-colorstate-until-the-first-te.patch +Patch0201: 0201-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch +Patch0202: 0202-Use-visual-indentation-in-config.h.in.patch +Patch0203: 0203-Where-present-ensure-config-util.h-precedes-config.h.patch +Patch0204: 0204-Drop-gnulib-fix-base64.patch.patch +Patch0205: 0205-Drop-gnulib-no-abort.patch.patch +Patch0206: 0206-Update-gnulib-version-and-drop-most-gnulib-patches.patch +Patch0207: 0207-commands-search-Fix-bug-stopping-iteration-when-no-f.patch +Patch0208: 0208-search-new-efidisk-only-option-on-EFI-systems.patch +Patch0209: 0209-efi-new-connectefi-command.patch +Patch0210: 0210-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch +Patch0211: 0211-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch +Patch0212: 0212-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch +Patch0213: 0213-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch +Patch0214: 0214-powerpc-do-CAS-in-a-more-compatible-way.patch +Patch0215: 0215-powerpc-prefix-detection-support-device-names-with-c.patch +Patch0216: 0216-ibmvtpm-Add-support-for-trusted-boot-using-a-vTPM-2..patch +Patch0217: 0217-make-ofdisk_retries-optional.patch +Patch0218: 0218-loader-efi-chainloader-grub_load_and_start_image-doe.patch +Patch0219: 0219-loader-efi-chainloader-simplify-the-loader-state.patch +Patch0220: 0220-commands-boot-Add-API-to-pass-context-to-loader.patch +Patch0221: 0221-loader-efi-chainloader-Use-grub_loader_set_ex.patch +Patch0222: 0222-loader-i386-efi-linux-Avoid-a-use-after-free-in-the-.patch +Patch0223: 0223-loader-i386-efi-linux-Use-grub_loader_set_ex.patch +Patch0224: 0224-loader-i386-efi-linux-Fix-a-memory-leak-in-the-initr.patch +Patch0225: 0225-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch +Patch0226: 0226-kern-file-Do-not-leak-device_name-on-error-in-grub_f.patch +Patch0227: 0227-video-readers-png-Abort-sooner-if-a-read-operation-f.patch +Patch0228: 0228-video-readers-png-Refuse-to-handle-multiple-image-he.patch +Patch0229: 0229-video-readers-png-Drop-greyscale-support-to-fix-heap.patch +Patch0230: 0230-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch +Patch0231: 0231-video-readers-png-Sanity-check-some-huffman-codes.patch +Patch0232: 0232-video-readers-jpeg-Abort-sooner-if-a-read-operation-.patch +Patch0233: 0233-video-readers-jpeg-Do-not-reallocate-a-given-huff-ta.patch +Patch0234: 0234-video-readers-jpeg-Refuse-to-handle-multiple-start-o.patch +Patch0235: 0235-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch +Patch0236: 0236-normal-charset-Fix-array-out-of-bounds-formatting-un.patch +Patch0237: 0237-net-netbuff-Block-overly-large-netbuff-allocs.patch +Patch0238: 0238-net-ip-Do-IP-fragment-maths-safely.patch +Patch0239: 0239-net-dns-Fix-double-free-addresses-on-corrupt-DNS-res.patch +Patch0240: 0240-net-dns-Don-t-read-past-the-end-of-the-string-we-re-.patch +Patch0241: 0241-net-tftp-Prevent-a-UAF-and-double-free-from-a-failed.patch +Patch0242: 0242-net-tftp-Avoid-a-trivial-UAF.patch +Patch0243: 0243-net-http-Do-not-tear-down-socket-if-it-s-already-bee.patch +Patch0244: 0244-net-http-Fix-OOB-write-for-split-http-headers.patch +Patch0245: 0245-net-http-Error-out-on-headers-with-LF-without-CR.patch +Patch0246: 0246-fs-f2fs-Do-not-read-past-the-end-of-nat-journal-entr.patch +Patch0247: 0247-fs-f2fs-Do-not-read-past-the-end-of-nat-bitmap.patch +Patch0248: 0248-fs-f2fs-Do-not-copy-file-names-that-are-too-long.patch +Patch0249: 0249-fs-btrfs-Fix-several-fuzz-issues-with-invalid-dir-it.patch +Patch0250: 0250-fs-btrfs-Fix-more-ASAN-and-SEGV-issues-found-with-fu.patch +Patch0251: 0251-fs-btrfs-Fix-more-fuzz-issues-related-to-chunks.patch +Patch0252: 0252-misc-Make-grub_min-and-grub_max-more-resilient.patch +Patch0253: 0253-ReiserFS-switch-to-using-grub_min-grub_max.patch +Patch0254: 0254-misc-make-grub_boot_time-also-call-grub_dprintf-boot.patch +Patch0255: 0255-modules-make-.module_license-read-only.patch +Patch0256: 0256-modules-strip-.llvm_addrsig-sections-and-similar.patch +Patch0257: 0257-modules-Don-t-allocate-space-for-non-allocable-secti.patch +Patch0258: 0258-pe-add-the-DOS-header-struct-and-fix-some-bad-naming.patch +Patch0259: 0259-EFI-allocate-kernel-in-EFI_RUNTIME_SERVICES_CODE-ins.patch +Patch0260: 0260-modules-load-module-sections-at-page-aligned-address.patch +Patch0261: 0261-nx-add-memory-attribute-get-set-API.patch +Patch0262: 0262-nx-set-page-permissions-for-loaded-modules.patch +Patch0263: 0263-nx-set-attrs-in-our-kernel-loaders.patch +Patch0264: 0264-nx-set-the-nx-compatible-flag-in-EFI-grub-images.patch +Patch0265: 0265-grub-probe-document-the-behavior-of-multiple-v.patch +Patch0266: 0266-grub_fs_probe-dprint-errors-from-filesystems.patch +Patch0267: 0267-fs-fat-don-t-error-when-mtime-is-0.patch +Patch0268: 0268-Make-debug-file-show-which-file-filters-get-run.patch +Patch0269: 0269-efi-use-enumerated-array-positions-for-our-allocatio.patch +Patch0270: 0270-efi-split-allocation-policy-for-kernel-vs-initrd-mem.patch +Patch0271: 0271-efi-allocate-the-initrd-within-the-bounds-expressed-.patch +Patch0272: 0272-efi-use-EFI_LOADER_-CODE-DATA-for-kernel-and-initrd-.patch +Patch0273: 0273-BLS-create-etc-kernel-cmdline-during-mkconfig.patch +Patch0274: 0274-squish-don-t-dup-rhgb-quiet-check-mtimes.patch +Patch0275: 0275-squish-give-up-on-rhgb-quiet.patch +Patch0276: 0276-squish-BLS-only-write-etc-kernel-cmdline-if-writable.patch +Patch0277: 0277-ieee1275-implement-vec5-for-cas-negotiation.patch +Patch0278: 0278-blscfg-Don-t-root-device-in-emu-builds.patch +Patch0279: 0279-loader-arm64-linux-Remove-magic-number-header-field-.patch +Patch0280: 0280-Correct-BSS-zeroing-on-aarch64.patch +Patch0281: 0281-linuxefi-Invalidate-i-cache-before-starting-the-kern.patch +Patch0282: 0282-x86-efi-Fix-an-incorrect-array-size-in-kernel-alloca.patch +Patch0283: 0283-commands-efi-tpm-Refine-the-status-of-log-event.patch +Patch0284: 0284-commands-efi-tpm-Use-grub_strcpy-instead-of-grub_mem.patch +Patch0285: 0285-efi-tpm-Add-EFI_CC_MEASUREMENT_PROTOCOL-support.patch diff --git a/grub2.spec b/grub2.spec index 23c0c55..0e504c2 100644 --- a/grub2.spec +++ b/grub2.spec @@ -17,7 +17,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 61%{?dist} +Release: 62%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -426,7 +426,6 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %{_datarootdir}/bash-completion/completions/grub %{_sbindir}/grub2-mkconfig %{_sbindir}/grub2-switch-to-blscfg -%{_sbindir}/grub2-rpm-sort %{_sbindir}/grub2-reboot %{_bindir}/grub2-file %{_bindir}/grub2-menulst2cfg @@ -530,6 +529,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Tue Nov 01 2022 Robbie Harwood - 1:2.06-62 +- Try dropping custom sort again +- See-also: https://github.com/rpm-software-management/rpm/pull/2249 + * Fri Oct 28 2022 Robbie Harwood - 2.06-61 - TDX measurements to RTMR