From 60c7965fc18cf6ab1085dbfd073593a063a09060d23c2da151ce1da301476520 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Fri, 17 Mar 2017 06:18:41 +0000 Subject: [PATCH] Accepting request 480725 from home:arvidjaar:grub2-next new upstream version 2.02~rc2 OBS-URL: https://build.opensuse.org/request/show/480725 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=264 --- ...nal-NULL-from-File-Path-in-grub_efi_.patch | 41 ------------------- grub-2.02~rc1.tar.xz | 3 -- grub-2.02~rc2.tar.xz | 3 ++ grub2-linguas.sh-no-rsync.patch | 10 ++--- grub2.changes | 10 +++++ grub2.spec | 8 ++-- use-grub2-as-a-package-name.patch | 10 ++--- 7 files changed, 26 insertions(+), 59 deletions(-) delete mode 100644 0001-efi-strip-off-final-NULL-from-File-Path-in-grub_efi_.patch delete mode 100644 grub-2.02~rc1.tar.xz create mode 100644 grub-2.02~rc2.tar.xz diff --git a/0001-efi-strip-off-final-NULL-from-File-Path-in-grub_efi_.patch b/0001-efi-strip-off-final-NULL-from-File-Path-in-grub_efi_.patch deleted file mode 100644 index 101e2ed..0000000 --- a/0001-efi-strip-off-final-NULL-from-File-Path-in-grub_efi_.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 892dfbe113d08c18e51d7c27eee5094f3da530ec Mon Sep 17 00:00:00 2001 -From: Andrei Borzenkov -Date: Sat, 25 Feb 2017 08:39:38 +0300 -Subject: [PATCH] efi: strip off final NULL from File Path in - grub_efi_get_filename - -UEFI 2.6 9.3.6.4 File Path Media Device Path says that Path Name is -"A NULL-terminated Path string including directory and file names". - -Strip final NULL from Path Name in each File Path node when constructing -full path. To be on safe side, strip all of them. - -Fixes failure chainloading grub from grub, when loaded grub truncates -image path and does not find its grub.cfg. - -https://bugzilla.opensuse.org/show_bug.cgi?id=1026344 - -This was triggered by commit ce95549cc54b5d6f494608a7c390dba3aab4fba7; -before it we built Path Name without trailing NULL, and apparently all -other bootloaders use single File Path node, thus not exposing this bug. ---- - grub-core/kern/efi/efi.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index caf9bcc..d467785 100644 ---- a/grub-core/kern/efi/efi.c -+++ b/grub-core/kern/efi/efi.c -@@ -366,6 +366,9 @@ grub_efi_get_filename (grub_efi_device_path_t *dp0) - len = ((GRUB_EFI_DEVICE_PATH_LENGTH (dp) - 4) - / sizeof (grub_efi_char16_t)); - fp = (grub_efi_file_path_device_path_t *) dp; -+ /* According to EFI spec Path Name is NULL terminated */ -+ while (len > 0 && fp->path_name[len - 1] == 0) -+ len--; - - p = (char *) grub_utf16_to_utf8 ((unsigned char *) p, fp->path_name, len); - } --- -2.6.6 - diff --git a/grub-2.02~rc1.tar.xz b/grub-2.02~rc1.tar.xz deleted file mode 100644 index 07fc14c..0000000 --- a/grub-2.02~rc1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:445239e9b96d1143c194c1d37851cf4196b83701c60172e49665e9d453d80278 -size 6051964 diff --git a/grub-2.02~rc2.tar.xz b/grub-2.02~rc2.tar.xz new file mode 100644 index 0000000..4622bd8 --- /dev/null +++ b/grub-2.02~rc2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:053bfcbe366733e4f5a1baf4eb15e1efd977225bdd323b78087ce5fa172fc246 +size 6055836 diff --git a/grub2-linguas.sh-no-rsync.patch b/grub2-linguas.sh-no-rsync.patch index df9f653..8cc702e 100644 --- a/grub2-linguas.sh-no-rsync.patch +++ b/grub2-linguas.sh-no-rsync.patch @@ -4,15 +4,15 @@ Subject: disable rsync to make it possible to use in RPM build We need to create po/LINGUAS to generate message catalogs. Use linguas.sh to ensure we always use the same rules as upstream, but disable rsync. -Index: grub-2.02~beta2/linguas.sh +Index: grub-2.02~rc2/linguas.sh =================================================================== ---- grub-2.02~beta2.orig/linguas.sh 2015-11-02 20:47:03.471686784 +0300 -+++ grub-2.02~beta2/linguas.sh 2015-11-02 20:48:15.707687638 +0300 +--- grub-2.02~rc2.orig/linguas.sh ++++ grub-2.02~rc2/linguas.sh @@ -1,8 +1,8 @@ #!/bin/sh --rsync -Lrtvz --exclude=ko.po translationproject.org::tp/latest/grub/ po -+#rsync -Lrtvz --exclude=ko.po translationproject.org::tp/latest/grub/ po +-rsync -Lrtvz translationproject.org::tp/latest/grub/ po ++#rsync -Lrtvz translationproject.org::tp/latest/grub/ po -autogenerated="en@quot en@hebrew de@hebrew en@cyrillic en@greek en@arabic en@piglatin de_CH" +autogenerated="en@quot" # en@hebrew de@hebrew en@cyrillic en@greek en@arabic en@piglatin de_CH" diff --git a/grub2.changes b/grub2.changes index ac951aa..9b45ab9 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Mar 16 16:32:54 UTC 2017 - arvidjaar@gmail.com + +- new upstream version 2.02~rc2 + * rediff + - use-grub2-as-a-package-name.patch + - grub2-linguas.sh-no-rsync.patch + * drop upstream patches + - 0001-efi-strip-off-final-NULL-from-File-Path-in-grub_efi_.patch + ------------------------------------------------------------------- Mon Mar 6 06:34:01 UTC 2017 - mchang@suse.com diff --git a/grub2.spec b/grub2.spec index 9a2100d..ef6e6bc 100644 --- a/grub2.spec +++ b/grub2.spec @@ -1,7 +1,7 @@ # # spec file for package grub2 # -# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -136,7 +136,7 @@ BuildRequires: update-bootloader-rpm-macros %define only_x86_64 %{nil} %endif -Version: 2.02~rc1 +Version: 2.02~rc2 Release: 0 Summary: Bootloader with support for Linux, Multiboot and more License: GPL-3.0+ @@ -207,7 +207,6 @@ Patch77: grub2-s390x-08-workaround-part-to-disk.patch Patch78: grub2-commands-introduce-read_file-subcommand.patch Patch79: grub2-efi-chainload-harder.patch Patch80: grub2-emu-4-all.patch -Patch81: 0001-efi-strip-off-final-NULL-from-File-Path-in-grub_efi_.patch # Btrfs snapshot booting related patches Patch101: grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch Patch102: grub2-btrfs-02-export-subvolume-envvars.patch @@ -351,9 +350,9 @@ provides support for %{platform} systems. %package %{grubefiarch} Summary: Bootloader with support for Linux, Multiboot and more -Group: System/Boot # Require efibootmgr # Without it grub-install is broken so break the package as well if unavailable +Group: System/Boot Requires: efibootmgr Requires(post): efibootmgr Requires: %{name} = %{version}-%{release} @@ -469,7 +468,6 @@ swap partition while in resuming %patch78 -p1 %patch79 -p1 %patch80 -p1 -%patch81 -p1 %patch101 -p1 %patch102 -p1 %patch103 -p1 diff --git a/use-grub2-as-a-package-name.patch b/use-grub2-as-a-package-name.patch index 890714f..a9f2a03 100644 --- a/use-grub2-as-a-package-name.patch +++ b/use-grub2-as-a-package-name.patch @@ -12,16 +12,16 @@ Signed-off-by: Jiri Slaby configure.ac | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) -Index: grub-2.02~rc1/configure.ac +Index: grub-2.02~rc2/configure.ac =================================================================== ---- grub-2.02~rc1.orig/configure.ac -+++ grub-2.02~rc1/configure.ac +--- grub-2.02~rc2.orig/configure.ac ++++ grub-2.02~rc2/configure.ac @@ -31,7 +31,7 @@ dnl (such as BUILD_CC, BUILD_CFLAGS, etc dnl with the prefix "TARGET_" (such as TARGET_CC, TARGET_CFLAGS, etc.) are dnl used for the target type. See INSTALL for full list of variables. --AC_INIT([GRUB],[2.02~rc1],[bug-grub@gnu.org]) -+AC_INIT([GRUB2],[2.02~rc1],[bug-grub@gnu.org]) +-AC_INIT([GRUB],[2.02~rc2],[bug-grub@gnu.org]) ++AC_INIT([GRUB2],[2.02~rc2],[bug-grub@gnu.org]) AC_CONFIG_AUX_DIR([build-aux])