Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2015-11-04 15:31:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2" Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2015-10-22 12:58:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2015-11-04 15:31:41.000000000 +0100 @@ -1,0 +2,20 @@ +Mon Nov 1 21:30:02 UTC 2015 - [email protected] + +- Modify grub2-linguas.sh-no-rsync.patch to re-enable en@quot catalog + (boo#953022). Other autogenerated catalogs still fail to build due + to missing C.UTF-8 locale. + +------------------------------------------------------------------- +Fri Oct 30 10:09:02 UTC 2015 - [email protected] + +- Allow to execute menuentry unrestricted as default (fate#318574) + * added grub2-menu-unrestricted.patch + +------------------------------------------------------------------- +Thu Oct 29 04:17:08 UTC 2015 - [email protected] + +- Add missing quoting for linuxefi (bsc#951962) + * modified grub2-secureboot-use-linuxefi-on-uefi.patch + * refreshed grub2-secureboot-provide-linuxefi-config.patch + +------------------------------------------------------------------- New: ---- grub2-menu-unrestricted.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.hQDxBM/_old 2015-11-04 15:31:44.000000000 +0100 +++ /var/tmp/diff_new_pack.hQDxBM/_new 2015-11-04 15:31:44.000000000 +0100 @@ -205,6 +205,7 @@ Patch68: grub2-btrfs-fix-get_root-key-comparison-failures-due-to-en.patch Patch69: grub2-getroot-fix-get-btrfs-fs-prefix-big-endian.patch Patch70: grub2-default-distributor.patch +Patch71: grub2-menu-unrestricted.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 @@ -477,6 +478,7 @@ %patch68 -p1 %patch69 -p1 %patch70 -p1 +%patch71 -p1 %patch101 -p1 %patch102 -p1 %patch103 -p1 ++++++ grub2-linguas.sh-no-rsync.patch ++++++ --- /var/tmp/diff_new_pack.hQDxBM/_old 2015-11-04 15:31:45.000000000 +0100 +++ /var/tmp/diff_new_pack.hQDxBM/_new 2015-11-04 15:31:45.000000000 +0100 @@ -4,24 +4,18 @@ 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.00/linguas.sh +Index: grub-2.02~beta2/linguas.sh =================================================================== ---- grub-2.00.orig/linguas.sh -+++ grub-2.00/linguas.sh -@@ -1,6 +1,6 @@ +--- 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 +@@ -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 - 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" ++autogenerated="en@quot" # en@hebrew de@hebrew en@cyrillic en@greek en@arabic en@piglatin de_CH" -@@ -14,7 +14,7 @@ done - ( - cd po && ls *.po| cut -d. -f1 - for x in $autogenerated; do -- echo "$x"; -+ : echo "$x"; - done - ) | sort | uniq | xargs - ) >po/LINGUAS + + for x in $autogenerated; do ++++++ grub2-menu-unrestricted.patch ++++++ Index: grub-2.02~beta2/grub-core/normal/menu.c =================================================================== --- grub-2.02~beta2.orig/grub-core/normal/menu.c +++ grub-2.02~beta2/grub-core/normal/menu.c @@ -213,7 +213,17 @@ grub_menu_execute_entry(grub_menu_entry_ grub_size_t sz = 0; if (entry->restricted) - err = grub_auth_check_authentication (entry->users); + { + int auth_check = 1; + if (entry->users && entry->users[0] == 0) + { + const char *unr = grub_env_get ("unrestricted_menu"); + if (unr && (unr[0] == '1' || unr[0] == 'y')) + auth_check = 0; + } + if (auth_check) + err = grub_auth_check_authentication (entry->users); + } if (err) { ++++++ grub2-secureboot-provide-linuxefi-config.patch ++++++ --- /var/tmp/diff_new_pack.hQDxBM/_old 2015-11-04 15:31:45.000000000 +0100 +++ /var/tmp/diff_new_pack.hQDxBM/_new 2015-11-04 15:31:45.000000000 +0100 @@ -50,7 +50,7 @@ - if [ -d /sys/firmware/efi ]; then + if [ -d /sys/firmware/efi ] && [ "x${GRUB_USE_LINUXEFI}" = "xtrue" ]; then sed "s/^/$submenu_indentation/" << EOF - echo '$message' + echo '$(echo "$message" | grub_quote)' linuxefi ${rel_dirname}/${basename} ${root_device} ${args} @@ -147,7 +147,7 @@ EOF if test -n "${initrd}" ; then @@ -59,5 +59,5 @@ - if [ -d /sys/firmware/efi ]; then + if [ -d /sys/firmware/efi ] && [ "x${GRUB_USE_LINUXEFI}" = "xtrue" ]; then sed "s/^/$submenu_indentation/" << EOF - echo '$message' + echo '$(echo "$message" | grub_quote)' initrdefi ${rel_dirname}/${initrd} ++++++ grub2-secureboot-use-linuxefi-on-uefi.patch ++++++ --- /var/tmp/diff_new_pack.hQDxBM/_old 2015-11-04 15:31:45.000000000 +0100 +++ /var/tmp/diff_new_pack.hQDxBM/_new 2015-11-04 15:31:45.000000000 +0100 @@ -22,7 +22,7 @@ - sed "s/^/$submenu_indentation/" << EOF + if [ -d /sys/firmware/efi ]; then + sed "s/^/$submenu_indentation/" << EOF -+ echo '$message' ++ echo '$(echo "$message" | grub_quote)' + linuxefi ${rel_dirname}/${basename} ${root_device} ${args} +EOF + else @@ -37,7 +37,7 @@ - sed "s/^/$submenu_indentation/" << EOF + if [ -d /sys/firmware/efi ]; then + sed "s/^/$submenu_indentation/" << EOF -+ echo '$message' ++ echo '$(echo "$message" | grub_quote)' + initrdefi ${rel_dirname}/${initrd} +EOF + else
