diff --git a/0298-blscfg-add-a-space-char-when-appending-fields-for-va.patch b/0298-blscfg-add-a-space-char-when-appending-fields-for-va.patch deleted file mode 100644 index b1149bb..0000000 --- a/0298-blscfg-add-a-space-char-when-appending-fields-for-va.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Tue, 26 Nov 2019 09:51:41 +0100 -Subject: [PATCH] blscfg: add a space char when appending fields for variable - expansion - -The GRUB variables are expanded and replaced by their values before adding -menu entries, but they didn't include space characters after the values so -the result was not correct. - -For the common case this wasn't a problem but it is if there are variables -that are part of the values of other variables. - -Resolves: rhbz#1669252 - -Signed-off-by: Javier Martinez Canillas ---- - grub-core/commands/blscfg.c | 19 +++++++++---------- - 1 file changed, 9 insertions(+), 10 deletions(-) - -diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c -index 8c6dd91be10..f1dc1f8e808 100644 ---- a/grub-core/commands/blscfg.c -+++ b/grub-core/commands/blscfg.c -@@ -602,17 +602,16 @@ static char *field_append(bool is_var, char *buffer, char *start, char *end) - return buffer; - } - -- if (!buffer) { -- buffer = grub_strdup(field); -- if (!buffer) -- return NULL; -- } else { -- buffer = grub_realloc (buffer, grub_strlen(buffer) + grub_strlen(field)); -- if (!buffer) -- return NULL; -+ if (!buffer) -+ buffer = grub_zalloc (grub_strlen(field) + 1); -+ else -+ buffer = grub_realloc (buffer, grub_strlen(buffer) + grub_strlen(field) + 1); - -- grub_stpcpy (buffer + grub_strlen(buffer), field); -- } -+ if (!buffer) -+ return NULL; -+ -+ grub_stpcpy (buffer + grub_strlen(buffer), field); -+ grub_stpcpy (buffer + grub_strlen(buffer), " "); - - return buffer; - } diff --git a/0299-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch b/0298-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch similarity index 100% rename from 0299-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch rename to 0298-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch diff --git a/grub.patches b/grub.patches index 74b4db6..46dbafc 100644 --- a/grub.patches +++ b/grub.patches @@ -295,5 +295,4 @@ Patch0294: 0294-blscfg-Don-t-leave-grub_errno-set-to-an-error-if-the.patch Patch0295: 0295-blscfg-Fix-typo-for-gfxpayload-variable-name.patch Patch0296: 0296-grub-set-bootflag-Update-comment-about-running-as-ro.patch Patch0297: 0297-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch -Patch0298: 0298-blscfg-add-a-space-char-when-appending-fields-for-va.patch -Patch0299: 0299-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch +Patch0298: 0298-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch diff --git a/grub2.spec b/grub2.spec index d625ce9..66f8c7d 100644 --- a/grub2.spec +++ b/grub2.spec @@ -7,7 +7,7 @@ Name: grub2 Epoch: 1 Version: 2.02 -Release: 86%{?dist} +Release: 87%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -476,6 +476,10 @@ rm -r /boot/grub2.tmp/ || : %endif %changelog +* Thu Dec 05 2019 Javier Martinez Canillas - 2.02-87 +- Drop patch fixing a corner case in BLS variable expansion + Related: rhbz#1779611 + * Wed Nov 27 2019 Javier Martinez Canillas - 2.02-86 - blscfg: add a space char when appending fields for variable expansion - grub.d: Fix boot_indeterminate getting set on boot_success=0 boot