Update minilzo to 2.08 for CVE-2014-4607

Resolves: rhbz#1131793

Signed-off-by: Peter Jones <pjones@redhat.com>

0154-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch

@@ -15,13 +15,14 @@ diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
 index 9f955ab..908a09d 100644
 --- a/util/grub.d/30_os-prober.in
 +++ b/util/grub.d/30_os-prober.in
-@@ -135,6 +135,28 @@ for OS in ${OSPROBED} ; do
+@@ -135,6 +135,29 @@ for OS in ${OSPROBED} ; do
      LONGNAME="${LABEL}"
    fi
  
 +  sixteenbit=""
 +  linuxefi="linux"
 +  initrdefi="initrd"
++  machine=`uname -m`
 +  case "$machine" in
 +    i?86|x86_64)
 +      sixteenbit="16"
@@ -44,7 +45,7 @@ index 9f955ab..908a09d 100644
    gettext_printf "Found %s on %s\n" "${LONGNAME}" "${DEVICE}" >&2
  
    case ${BOOT} in
-@@ -235,11 +257,11 @@ EOF
+@@ -235,11 +258,11 @@ EOF
  	    save_default_entry | grub_add_tab
  	    printf '%s\n' "${prepare_boot_cache}"
  	    cat <<  EOF
@@ -58,7 +59,7 @@ index 9f955ab..908a09d 100644
  EOF
              fi
          cat << EOF
-@@ -255,11 +277,11 @@ EOF
+@@ -255,11 +278,11 @@ EOF
  	save_default_entry | sed -e "s/^/$grub_tab$grub_tab/"
  	printf '%s\n' "${prepare_boot_cache}" | grub_add_tab
  	cat <<  EOF

grub2.spec

@@ -47,7 +47,7 @@
 Name:           grub2
 Epoch:          1
 Version:        2.02
-Release:        0.10%{?dist}
+Release:        0.13%{?dist}
 Summary:        Bootloader with support for Linux, Multiboot and more
 
 Group:          System Environment/Base
@@ -214,6 +214,7 @@ Patch0151: 0151-Initialized-initrd_ctx-so-we-don-t-free-a-random-poi.patch
 Patch0152: 0152-Load-arm-with-SB-enabled.patch
 Patch0153: 0153-Try-prefix-if-fw_path-doesn-t-work.patch
 Patch0154: 0154-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch
+Patch0155: 0001-Update-to-minilzo-2.08.patch
 
 BuildRequires:  flex bison binutils python
 BuildRequires:  ncurses-devel xz-devel bzip2-devel
@@ -328,11 +329,14 @@ cd grub-%{tarversion}
 cp %{SOURCE4} unifont.pcf.gz
 cp %{SOURCE6} .gitignore
 git init
-git config user.email "grub2-owner@fedoraproject.org"
+git config user.email "%{name}-owner@fedoraproject.org"
 git config user.name "Fedora Ninjas"
+git config gc.auto 0
 git add .
 git commit -a -q -m "%{tarversion} baseline."
-git am %{patches}
+git am %{patches} </dev/null
+git config --unset user.email
+git config --unset user.name
 %endif
 
 %build
@@ -357,17 +361,18 @@ cd grub-efi-%{tarversion}
 	--disable-werror
 make %{?_smp_mflags}
 
-GRUB_MODULES="	all_video backtrace boot btrfs cat chain configfile echo \
+GRUB_MODULES="	all_video boot btrfs cat chain configfile echo \
 		efifwsetup efinet ext2 fat font gfxmenu gfxterm gzio halt \
 		hfsplus iso9660 jpeg loadenv lvm mdraid09 mdraid1x minicmd \
 		normal part_apple part_msdos part_gpt password_pbkdf2 png \
 		reboot search search_fs_uuid search_fs_file search_label \
-		serial sleep syslinuxcfg test tftp usb usbserial_common \
-		usbserial_pl2303 usbserial_ftdi usbserial_usbdebug video xfs"
+		serial sleep syslinuxcfg test tftp video xfs"
 %ifarch aarch64
-GRUB_MODULES="${GRUB_MODULES} linux"
+GRUB_MODULES+=" linux "
 %else
-GRUB_MODULES+="${GRUB_MODULES} linuxefi multiboot2 multiboot"
+GRUB_MODULES+=" backtrace usb usbserial_common "
+GRUB_MODULES+=" usbserial_pl2303 usbserial_ftdi usbserial_usbdebug "
+GRUB_MODULES+=" linuxefi multiboot2 multiboot "
 %endif
 ./grub-mkimage -O %{grubefiarch} -o %{grubefiname}.orig -p /EFI/%{efidir} \
 		-d grub-core ${GRUB_MODULES}
@@ -444,9 +449,7 @@ touch $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/grub.cfg
 ln -s ../boot/efi/EFI/%{efidir}/grub.cfg $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-efi.cfg
 
 install -m 755 %{grubefiname} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{grubefiname}
-%ifnarch aarch64
 install -m 755 %{grubeficdname} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{grubeficdname}
-%endif
 install -D -m 644 unicode.pf2 $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/fonts/unicode.pf2
 cd ..
 %endif
@@ -647,6 +650,19 @@ fi
 %{_datarootdir}/grub/themes/
 
 %changelog
+* Thu Dec 04 2014 Peter Jones <pjones@redhat.com> - 2.02-0.13
+- Update minilzo to 2.08 for CVE-2014-4607
+  Resolves: rhbz#1131793
+
+* Thu Nov 13 2014 Peter Jones <pjones@redhat.com> - 2.02-0.12
+- Make backtrace and usb conditional on !arm
+- Make sure gcdaa64.efi is packaged.
+  Resolves: rhbz#1163481
+
+* Fri Nov 07 2014 Peter Jones <pjones@redhat.com> - 2.02-0.11
+- fix a copy-paste error in patch 0154.
+  Resolves: rhbz#964828
+
 * Mon Oct 27 2014 Peter Jones <pjones@redhat.com> - 2.02-0.10
 - Try to emit linux16/initrd16 and linuxefi/initrdefi when appropriate
   in 30_os-prober.