up to 2.06

diff --git a/blscfg.patch b/blscfg.patch
index ada4564e039709e8e7108dd74aeafa57adde6d88..d7749a68ed30af305fef1fbdb9eb1a806216dce0 100644 (file)
--- a/blscfg.patch
+++ b/blscfg.patch
@@ -1301,7 +1301,7 @@ index 2c5363da7f5..9faf2be0f64 100644
 +  grub_dprintf ("menu", "menu_id:\"%s\"\n", menu_id);
  
    /* Save argc, args to pass as parameters to block arg later. */
-   menu_args = grub_malloc (sizeof (char*) * (argc + 1));
+   menu_args = grub_calloc (argc + 1, sizeof (char *));
 @@ -170,8 +173,12 @@ grub_normal_add_menu_entry (int argc, const char **args,
    }
  
@@ -1353,7 +1353,7 @@ index 9ef98481f70..a326b192c89 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
 @@ -20,6 +20,7 @@
- #include <grub/kernel.h>
+ #include <grub/net.h>
  #include <grub/normal.h>
  #include <grub/dl.h>
 +#include <grub/menu.h>
@@ -1476,7 +1476,7 @@ index c9e1d7a73dc..9859ff4cc79 100644
 --- a/include/grub/compiler.h
 +++ b/include/grub/compiler.h
 @@ -48,4 +48,6 @@
- #  define WARN_UNUSED_RESULT
+ #  define CLANG_PREREQ(maj,min) 0
  #endif
  
 +#define UNUSED __attribute__((__unused__))

diff --git a/grub-garbage.patch b/grub-garbage.patch
index 2b6636fc7165e8c4e6a763f31189301bccc7d866..7c6b794e746f662c977c7890c6780bed914a6403 100644 (file)
--- a/grub-garbage.patch
+++ b/grub-garbage.patch
@@ -7,5 +7,5 @@ diff -dur grub-2.00.orig/util/grub-mkconfig_lib.in grub-2.00/util/grub-mkconfig_
        *.rpmsave|*.rpmnew) return 1 ;;
 +      *.bak|*~|.*.swp) return 1 ;;    # backup and swap files from editors
        README*|*/README*)  return 1 ;; # documentation
+       *.sig) return 1 ;; # signatures
      esac
-   else

diff --git a/grub-lvmdevice.patch b/grub-lvmdevice.patch
index 0f9d87fa8f915f7efbdc1793d1ac4048cb7b0065..85ae59694b997c4e33e170a971f1082dc26a7b00 100644 (file)
--- a/grub-lvmdevice.patch
+++ b/grub-lvmdevice.patch
@@ -20,5 +20,5 @@
 +esac
 +
  GRUB_DEVICE_UUID="`${grub_probe} --device ${GRUB_DEVICE} --target=fs_uuid 2> /dev/null`" || true
+ GRUB_DEVICE_PARTUUID="`${grub_probe} --device ${GRUB_DEVICE} --target=partuuid 2> /dev/null`" || true
  
- # Device containing our /boot partition.  Usually the same as GRUB_DEVICE.

diff --git a/grub-mkconfig-diagnostics.patch b/grub-mkconfig-diagnostics.patch
index 9a4e28207244b2803feb54dc5a7deda7309175d3..a10124ab4be7c299c64efc233f4fadb2f9907c11 100644 (file)
--- a/grub-mkconfig-diagnostics.patch
+++ b/grub-mkconfig-diagnostics.patch
@@ -154,8 +154,8 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_netbsd.in grub
 -  gettext_printf "Found NetBSD kernel: %s\n" "$k" >&2
 +  gettext_printf "Found NetBSD kernel: %s\n" "$k" >&3
  
-   if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
-       netbsd_entry "knetbsd"   "$k" simple "${GRUB_CMDLINE_NETBSD_DEFAULT}"
+   # The GRUB_DISABLE_SUBMENU option used to be different than others since it was
+   # mentioned in the documentation that has to be set to 'y' instead of 'true' to
 diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_windows.in grub-2.02~beta2/util/grub.d/10_windows.in
 --- grub-2.02~beta2.orig/util/grub.d/10_windows.in     2013-12-17 18:25:57.000000000 +0100
 +++ grub-2.02~beta2/util/grub.d/10_windows.in  2014-01-04 11:34:50.135240649 +0100
@@ -192,8 +192,8 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/30_os-prober.in g
 --- grub-2.02~beta2.orig/util/grub.d/30_os-prober.in   2014-01-04 10:50:51.000000000 +0100
 +++ grub-2.02~beta2/util/grub.d/30_os-prober.in        2014-01-04 11:34:50.135240649 +0100
 @@ -134,7 +134,7 @@
-     LONGNAME="${LABEL}"
-   fi
+   # os-prober returns text string followed by optional counter
+   CLASS="--class $(echo "${LABEL}" | LC_ALL=C sed 's,[[:digit:]]*$,,' | cut -d' ' -f1 | tr 'A-Z' 'a-z' | LC_ALL=C sed 's,[^[:alnum:]_],_,g')"
  
 -  gettext_printf "Found %s on %s\n" "${LONGNAME}" "${DEVICE}" >&2
 +  gettext_printf "Found %s on %s\n" "${LONGNAME}" "${DEVICE}" >&3

diff --git a/grub2.spec b/grub2.spec
index 8958ac5b3dbab2b82a6b2e3c70261174c02e2cf3..6fdc4b5e2cd8bf20945982f36ed1e388e5d2204a 100644 (file)
--- a/grub2.spec
+++ b/grub2.spec
@@ -46,12 +46,12 @@ Summary(hu.UTF-8):  GRUB2 - rendszerbetöltő x86 és ppc gépekhez
 Summary(pl.UTF-8):     GRUB2 - bootloader dla x86 i ppc
 Summary(pt_BR.UTF-8):  Gerenciador de inicialização GRUB2
 Name:          grub2
-Version:       2.04
+Version:       2.06
 Release:       1
 License:       GPL v2
 Group:         Base
 Source0:       ftp://ftp.gnu.org/gnu/grub/grub-%{version}.tar.xz
-# Source0-md5: 5aaca6713b47ca2456d8324a58755ac7
+# Source0-md5: cf0fd928b1e5479c8108ee52cb114363
 Source1:       update-grub
 Source2:       update-grub.8
 Source3:       grub.sysconfig
@@ -70,7 +70,7 @@ Patch12:      %{name}-cfg.patch
 Patch13:       efi-net-fix.patch
 Patch14:       blscfg.patch
 URL:           http://www.gnu.org/software/grub/
-BuildRequires: autoconf >= 2.53
+BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.11.1-1
 BuildRequires: bison
 BuildRequires: device-mapper-devel
@@ -79,15 +79,16 @@ BuildRequires:      fonts-TTF-DejaVu
 BuildRequires: freetype-devel >= 2
 BuildRequires: gawk
 BuildRequires: gcc >= 5:3.4
-BuildRequires: gettext-tools
+BuildRequires: gettext-tools >= 0.18.3
 BuildRequires: glibc-localedb-all
 BuildRequires: glibc-static
 BuildRequires: help2man
 BuildRequires: libfuse-devel
 BuildRequires: libtool
 BuildRequires: ncurses-devel
-BuildRequires: python
-BuildRequires: python-modules
+BuildRequires: pkgconfig
+BuildRequires: python >= 2.6
+BuildRequires: python-modules >= 2.6
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.213
 BuildRequires: sed >= 4.0
@@ -564,6 +565,7 @@ fi
 %if %{with efi}
 %files platform-efi
 %defattr(644,root,root,755)
+%attr(755,root,root) /lib/grub.d/30_uefi-firmware
 %dir %{_libexecdir}/*-efi
 %{_libexecdir}/*-efi/modinfo.sh
 %{_libexecdir}/*-efi/*.exec

diff --git a/pld-mkconfigdir.patch b/pld-mkconfigdir.patch
index 5d6943e60a6ee16e9a53ef674abdd2c1d2493cb7..d87133e80551b1a93dd0b8d078d05f2c5558b649 100644 (file)
--- a/pld-mkconfigdir.patch
+++ b/pld-mkconfigdir.patch
@@ -14,8 +14,8 @@ diff -dur grub-2.00.orig/util/grub-mkconfig.in grub-2.00/util/grub-mkconfig.in
 --- grub-2.00.orig/util/grub-mkconfig.in       2012-10-27 15:05:15.000000000 +0200
 +++ grub-2.00/util/grub-mkconfig.in    2012-10-27 15:06:40.696227008 +0200
 @@ -35,7 +35,7 @@
-     pkgdatadir="${datadir}/@PACKAGE@"
- fi
+ export pkgdatadir
+ 
  grub_cfg=""
 -grub_mkconfig_dir="${sysconfdir}"/grub.d
 +grub_mkconfig_dir=/lib/grub.d

diff --git a/pld-sysconfdir.patch b/pld-sysconfdir.patch
index f53f128fb471fa30bb62dacead87b8f8b34d28e3..a02176fea4ad6e1db04b8816687c977025fac6f5 100644 (file)
--- a/pld-sysconfdir.patch
+++ b/pld-sysconfdir.patch
@@ -2,8 +2,8 @@ diff -dur grub-2.00.orig/util/grub-mkconfig.in grub-2.00/util/grub-mkconfig.in
 --- grub-2.00.orig/util/grub-mkconfig.in       2012-04-05 19:41:07.000000000 +0200
 +++ grub-2.00/util/grub-mkconfig.in    2012-10-27 14:53:33.483981202 +0200
 @@ -140,8 +140,8 @@
- # choosing Hurd filesystem module.
- GRUB_FS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2> /dev/null || echo unknown`"
+       GRUB_EARLY_INITRD_LINUX_STOCK="intel-uc.img intel-ucode.img amd-uc.img amd-ucode.img early_ucode.cpio microcode.cpio"
+ fi
  
 -if test -f ${sysconfdir}/default/grub ; then
 -  . ${sysconfdir}/default/grub
@@ -11,7 +11,7 @@ diff -dur grub-2.00.orig/util/grub-mkconfig.in grub-2.00/util/grub-mkconfig.in
 +  . ${sysconfdir}/sysconfig/grub
  fi
  
- # XXX: should this be deprecated at some point?
+ if [ "x${GRUB_DISABLE_UUID}" = "xtrue" ]; then
 @@ -232,7 +232,7 @@
  # DO NOT EDIT THIS FILE
  #
@@ -29,7 +29,7 @@ diff -dur grub-2.00.orig/util/grub-mkconfig.in grub-2.00/util/grub-mkconfig.in
 +Ensure that there are no errors in /etc/sysconfig/grub
  and /etc/grub.d/* files or please file a bug report with
  %s file attached." "${grub_cfg}.new" >&2
-   else
+     echo >&2
 diff -dur grub-2.00.orig/util/grub.d/README grub-2.00/util/grub.d/README
 --- grub-2.00.orig/util/grub.d/README  2010-12-01 15:45:43.000000000 +0100
 +++ grub-2.00/util/grub.d/README       2012-10-27 14:52:54.046709588 +0200