Hello community,
here is the log from the commit of package grub2 for openSUSE:Factory checked
in at 2020-10-21 12:34:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
and /work/SRC/openSUSE:Factory/.grub2.new.3486 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2"
Wed Oct 21 12:34:45 2020 rev:229 rq: version:2.04
Changes:
--------
--- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2020-10-20
16:00:06.365717026 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new.3486/grub2.changes 2020-10-21
12:34:47.405982559 +0200
@@ -2,21 +1,0 @@
-Wed Oct 14 08:46:46 UTC 2020 - Michael Chang <mch...@suse.com>
-
-- Fix https boot interrupted by unrecognised network address error message
- (bsc#1172952)
- * 0001-add-support-for-UEFI-network-protocols.patch
-
--------------------------------------------------------------------
-Tue Oct 13 08:54:10 UTC 2020 - Michael Chang <mch...@suse.com>
-
-- grub2.spec: Fix bare words used as string in expression which is no longer
- allowed in rpm 4.16
-
--------------------------------------------------------------------
-Fri Sep 25 07:13:27 UTC 2020 - Michael Chang <mch...@suse.com>
-
-- Improve the error handling when grub2-install fails with short mbr gap
- (bsc#1176062)
- * 0001-Warn-if-MBR-gap-is-small-and-user-uses-advanced-modu.patch
- * 0002-grub-install-Avoid-incompleted-install-on-i386-pc.patch
-
--------------------------------------------------------------------
Old:
----
0001-Warn-if-MBR-gap-is-small-and-user-uses-advanced-modu.patch
0002-grub-install-Avoid-incompleted-install-on-i386-pc.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grub2.spec ++++++
--- /var/tmp/diff_new_pack.Fk3511/_old 2020-10-21 12:34:49.745982643 +0200
+++ /var/tmp/diff_new_pack.Fk3511/_new 2020-10-21 12:34:49.749982642 +0200
@@ -138,7 +138,7 @@
%define grubxenarch x86_64-xen
%endif
-%if "%{platform}" == "emu"
+%if %{platform} == emu
# force %%{emu} to 1, e.g. for s390
%define emu 1
%endif
@@ -332,10 +332,6 @@
Patch719: 0001-Unify-the-check-to-enable-btrfs-relative-path.patch
Patch720: 0001-shim_lock-Disable-GRUB_VERIFY_FLAGS_DEFER_AUTH-if-se.patch
Patch721: 0001-efi-linux-provide-linux-command.patch
-# Improve the error handling when grub2-install fails with short mbr gap
-# (bsc#1176062)
-Patch722: 0001-Warn-if-MBR-gap-is-small-and-user-uses-advanced-modu.patch
-Patch723: 0002-grub-install-Avoid-incompleted-install-on-i386-pc.patch
Requires: gettext-runtime
%if 0%{?suse_version} >= 1140
@@ -403,7 +399,7 @@
Summary: Bootloader with support for Linux, Multiboot and more
Group: System/Boot
-%if "%{platform}" != "emu"
+%if %{platform} != emu
BuildArch: noarch
%endif
Requires: %{name} = %{version}
@@ -424,7 +420,7 @@
%package %{grubarch}-debug
Summary: Debug symbols for %{grubarch}
Group: System/Boot
-%if "%{platform}" != "emu"
+%if %{platform} != emu
BuildArch: noarch
%endif
Requires: %{name}-%{grubarch} = %{version}
@@ -468,7 +464,7 @@
%package %{grubefiarch}-debug
Summary: Debug symbols for %{grubefiarch}
Group: System/Boot
-%if "%{platform}" != "emu"
+%if %{platform} != emu
BuildArch: noarch
%endif
Requires: %{name}-%{grubefiarch} = %{version}
@@ -659,8 +655,6 @@
%patch719 -p1
%patch720 -p1
%patch721 -p1
-%patch722 -p1
-%patch723 -p1
%build
# collect evidence to debug spurious build failure on SLE15
@@ -817,7 +811,7 @@
%define _target_platform i386-%{_vendor}-%{_target_os}%{?_gnu}
%endif
-%if "%{platform}" != "emu"
+%if %{platform} != "emu"
%define arch_specific --enable-device-mapper
TLFLAGS="-static"
++++++ 0001-add-support-for-UEFI-network-protocols.patch ++++++
--- /var/tmp/diff_new_pack.Fk3511/_old 2020-10-21 12:34:49.785982644 +0200
+++ /var/tmp/diff_new_pack.Fk3511/_new 2020-10-21 12:34:49.785982644 +0200
@@ -33,11 +33,6 @@
* Use grub_calloc for overflow check and return NULL when it would
occur.
-V6:
- * Don't force grub_print_error if no best route found as boot process
- could be interrupted by logged error. The default interface will be
- used as fallback in this case
-
---
grub-core/Makefile.core.def | 18 +
grub-core/io/bufio.c | 2 +-
@@ -1995,7 +1990,7 @@
===================================================================
--- /dev/null
+++ grub-2.04/grub-core/net/efi/net.c
-@@ -0,0 +1,1440 @@
+@@ -0,0 +1,1437 @@
+#include <grub/net.h>
+#include <grub/env.h>
+#include <grub/mm.h>
@@ -2797,16 +2792,13 @@
+ grub_efi_net_interface_t *inf;
+ int is_ip6 = 0;
+
-+ grub_error_push ();
+ err = grub_efi_net_parse_address (server, &ip4, &ip6, &is_ip6, 0);
+
+ if (err)
+ {
-+ grub_dprintf ("efinetfs", "error in matching route : %s\n",
grub_errmsg);
-+ grub_error_pop ();
++ grub_print_error ();
+ return NULL;
+ }
-+ grub_error_pop ();
+
+ if (is_ip6)
+ {
