commit 827f9c89e4a1a399180a6b0bd40cf8945588a33f Author: Matt Housh <jaeger@crux.ninja> Date: Thu Dec 17 15:59:41 2015 -0600 [notify] grub2: updated to version 2.02-beta2 and patched for CVE-2015-8370 See https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-8370 diff --git a/grub2/.footprint b/grub2/.footprint index 256c322..34b34a5 100644 --- a/grub2/.footprint +++ b/grub2/.footprint @@ -12,17 +12,22 @@ drwxr-xr-x root/root etc/grub.d/ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/grub-editenv +-rwxr-xr-x root/root usr/bin/grub-file -rwxr-xr-x root/root usr/bin/grub-fstest +-rwxr-xr-x root/root usr/bin/grub-glue-efi -rwxr-xr-x root/root usr/bin/grub-kbdcomp -rwxr-xr-x root/root usr/bin/grub-menulst2cfg -rwxr-xr-x root/root usr/bin/grub-mkfont -rwxr-xr-x root/root usr/bin/grub-mkimage -rwxr-xr-x root/root usr/bin/grub-mklayout +-rwxr-xr-x root/root usr/bin/grub-mknetdir -rwxr-xr-x root/root usr/bin/grub-mkpasswd-pbkdf2 -rwxr-xr-x root/root usr/bin/grub-mkrelpath -rwxr-xr-x root/root usr/bin/grub-mkrescue -rwxr-xr-x root/root usr/bin/grub-mkstandalone +-rwxr-xr-x root/root usr/bin/grub-render-label -rwxr-xr-x root/root usr/bin/grub-script-check +-rwxr-xr-x root/root usr/bin/grub-syslinux2cfg drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/grub/ drwxr-xr-x root/root usr/lib/grub/fonts/ @@ -42,6 +47,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/all_video.module -rw-r--r-- root/root usr/lib/grub/i386-pc/aout.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/aout.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/archelp.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/archelp.module -rw-r--r-- root/root usr/lib/grub/i386-pc/at_keyboard.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/at_keyboard.module -rw-r--r-- root/root usr/lib/grub/i386-pc/ata.mod @@ -62,6 +69,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rw-r--r-- root/root usr/lib/grub/i386-pc/boot.img -rw-r--r-- root/root usr/lib/grub/i386-pc/boot.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/boot.module +-rwxr-xr-x root/root usr/lib/grub/i386-pc/boot_hybrid.image +-rw-r--r-- root/root usr/lib/grub/i386-pc/boot_hybrid.img -rw-r--r-- root/root usr/lib/grub/i386-pc/bsd.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/bsd.module -rw-r--r-- root/root usr/lib/grub/i386-pc/btrfs.mod @@ -70,10 +79,24 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/bufio.module -rw-r--r-- root/root usr/lib/grub/i386-pc/cat.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/cat.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/cbfs.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/cbfs.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/cbls.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/cbls.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/cbmemc.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/cbmemc.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/cbtable.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/cbtable.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/cbtime.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/cbtime.module -rwxr-xr-x root/root usr/lib/grub/i386-pc/cdboot.image -rw-r--r-- root/root usr/lib/grub/i386-pc/cdboot.img -rw-r--r-- root/root usr/lib/grub/i386-pc/chain.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/chain.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/cmdline_cat_test.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/cmdline_cat_test.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/cmosdump.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/cmosdump.module -rw-r--r-- root/root usr/lib/grub/i386-pc/cmostest.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/cmostest.module -rw-r--r-- root/root usr/lib/grub/i386-pc/cmp.mod @@ -103,10 +126,14 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/datehook.module -rw-r--r-- root/root usr/lib/grub/i386-pc/datetime.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/datetime.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/disk.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/disk.module -rwxr-xr-x root/root usr/lib/grub/i386-pc/diskboot.image -rw-r--r-- root/root usr/lib/grub/i386-pc/diskboot.img -rw-r--r-- root/root usr/lib/grub/i386-pc/diskfilter.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/diskfilter.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/div_test.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/div_test.module -rw-r--r-- root/root usr/lib/grub/i386-pc/dm_nv.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/dm_nv.module -rw-r--r-- root/root usr/lib/grub/i386-pc/drivemap.mod @@ -119,6 +146,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/ehci.module -rw-r--r-- root/root usr/lib/grub/i386-pc/elf.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/elf.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/eval.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/eval.module -rw-r--r-- root/root usr/lib/grub/i386-pc/exfat.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/exfat.module -rw-r--r-- root/root usr/lib/grub/i386-pc/exfctest.mod @@ -129,6 +158,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/extcmd.module -rw-r--r-- root/root usr/lib/grub/i386-pc/fat.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/fat.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/file.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/file.module -rw-r--r-- root/root usr/lib/grub/i386-pc/font.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/font.module -rw-r--r-- root/root usr/lib/grub/i386-pc/freedos.mod @@ -150,6 +181,10 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/gcry_crc.module -rw-r--r-- root/root usr/lib/grub/i386-pc/gcry_des.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/gcry_des.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/gcry_dsa.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/gcry_dsa.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/gcry_idea.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/gcry_idea.module -rw-r--r-- root/root usr/lib/grub/i386-pc/gcry_md4.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/gcry_md4.module -rw-r--r-- root/root usr/lib/grub/i386-pc/gcry_md5.mod @@ -160,6 +195,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/gcry_rijndael.module -rw-r--r-- root/root usr/lib/grub/i386-pc/gcry_rmd160.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/gcry_rmd160.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/gcry_rsa.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/gcry_rsa.module -rw-r--r-- root/root usr/lib/grub/i386-pc/gcry_seed.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/gcry_seed.module -rw-r--r-- root/root usr/lib/grub/i386-pc/gcry_serpent.mod @@ -187,6 +224,10 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/gfxmenu.module -rw-r--r-- root/root usr/lib/grub/i386-pc/gfxterm.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/gfxterm.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/gfxterm_background.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/gfxterm_background.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/gfxterm_menu.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/gfxterm_menu.module -rwxr-xr-x root/root usr/lib/grub/i386-pc/gmodule.pl -rw-r--r-- root/root usr/lib/grub/i386-pc/gptsync.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/gptsync.module @@ -208,6 +249,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/hfs.module -rw-r--r-- root/root usr/lib/grub/i386-pc/hfsplus.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/hfsplus.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/hfspluscomp.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/hfspluscomp.module -rw-r--r-- root/root usr/lib/grub/i386-pc/http.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/http.module -rw-r--r-- root/root usr/lib/grub/i386-pc/iorw.mod @@ -226,6 +269,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/keystatus.module -rw-r--r-- root/root usr/lib/grub/i386-pc/ldm.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/ldm.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/legacy_password_test.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/legacy_password_test.module -rw-r--r-- root/root usr/lib/grub/i386-pc/legacycfg.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/legacycfg.module -rw-r--r-- root/root usr/lib/grub/i386-pc/linux.mod @@ -256,6 +301,12 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rw-r--r-- root/root usr/lib/grub/i386-pc/lzma_decompress.img -rw-r--r-- root/root usr/lib/grub/i386-pc/lzopio.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/lzopio.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/macbless.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/macbless.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/macho.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/macho.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/mda_text.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/mda_text.module -rw-r--r-- root/root usr/lib/grub/i386-pc/mdraid09.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/mdraid09.module -rw-r--r-- root/root usr/lib/grub/i386-pc/mdraid09_be.mod @@ -284,12 +335,18 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/mmap.module -rw-r--r-- root/root usr/lib/grub/i386-pc/moddep.lst -rw-r--r-- root/root usr/lib/grub/i386-pc/modinfo.sh +-rw-r--r-- root/root usr/lib/grub/i386-pc/morse.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/morse.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/mpi.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/mpi.module -rw-r--r-- root/root usr/lib/grub/i386-pc/msdospart.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/msdospart.module -rw-r--r-- root/root usr/lib/grub/i386-pc/multiboot.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/multiboot.module -rw-r--r-- root/root usr/lib/grub/i386-pc/multiboot2.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/multiboot2.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/nativedisk.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/nativedisk.module -rw-r--r-- root/root usr/lib/grub/i386-pc/net.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/net.module -rw-r--r-- root/root usr/lib/grub/i386-pc/newc.mod @@ -306,6 +363,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/ntldr.module -rw-r--r-- root/root usr/lib/grub/i386-pc/odc.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/odc.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/offsetio.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/offsetio.module -rw-r--r-- root/root usr/lib/grub/i386-pc/ohci.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/ohci.module -rw-r--r-- root/root usr/lib/grub/i386-pc/part_acorn.mod @@ -316,6 +375,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/part_apple.module -rw-r--r-- root/root usr/lib/grub/i386-pc/part_bsd.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/part_bsd.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/part_dfly.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/part_dfly.module -rw-r--r-- root/root usr/lib/grub/i386-pc/part_dvh.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/part_dvh.module -rw-r--r-- root/root usr/lib/grub/i386-pc/part_gpt.mod @@ -340,8 +401,12 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/pata.module -rw-r--r-- root/root usr/lib/grub/i386-pc/pbkdf2.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/pbkdf2.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/pbkdf2_test.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/pbkdf2_test.module -rw-r--r-- root/root usr/lib/grub/i386-pc/pci.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/pci.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/pcidump.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/pcidump.module -rw-r--r-- root/root usr/lib/grub/i386-pc/plan9.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/plan9.module -rw-r--r-- root/root usr/lib/grub/i386-pc/play.mod @@ -352,6 +417,10 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/priority_queue.module -rw-r--r-- root/root usr/lib/grub/i386-pc/probe.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/probe.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/procfs.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/procfs.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/progress.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/progress.module -rw-r--r-- root/root usr/lib/grub/i386-pc/pxe.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/pxe.module -rwxr-xr-x root/root usr/lib/grub/i386-pc/pxeboot.image @@ -390,14 +459,24 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/serial.module -rw-r--r-- root/root usr/lib/grub/i386-pc/setjmp.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/setjmp.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/setjmp_test.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/setjmp_test.module -rw-r--r-- root/root usr/lib/grub/i386-pc/setpci.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/setpci.module -rw-r--r-- root/root usr/lib/grub/i386-pc/sfs.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/sfs.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/signature_test.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/signature_test.module -rw-r--r-- root/root usr/lib/grub/i386-pc/sleep.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/sleep.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/sleep_test.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/sleep_test.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/spkmodem.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/spkmodem.module -rw-r--r-- root/root usr/lib/grub/i386-pc/squash4.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/squash4.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/syslinuxcfg.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/syslinuxcfg.module -rw-r--r-- root/root usr/lib/grub/i386-pc/tar.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/tar.module -rw-r--r-- root/root usr/lib/grub/i386-pc/terminal.lst @@ -411,20 +490,28 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/test_blockarg.module -rw-r--r-- root/root usr/lib/grub/i386-pc/testload.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/testload.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/testspeed.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/testspeed.module -rw-r--r-- root/root usr/lib/grub/i386-pc/tftp.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/tftp.module -rw-r--r-- root/root usr/lib/grub/i386-pc/tga.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/tga.module -rw-r--r-- root/root usr/lib/grub/i386-pc/time.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/time.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/tr.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/tr.module -rw-r--r-- root/root usr/lib/grub/i386-pc/trig.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/trig.module -rw-r--r-- root/root usr/lib/grub/i386-pc/true.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/true.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/truecrypt.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/truecrypt.module -rw-r--r-- root/root usr/lib/grub/i386-pc/udf.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/udf.module -rw-r--r-- root/root usr/lib/grub/i386-pc/ufs1.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/ufs1.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/ufs1_be.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/ufs1_be.module -rw-r--r-- root/root usr/lib/grub/i386-pc/ufs2.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/ufs2.module -rw-r--r-- root/root usr/lib/grub/i386-pc/uhci.mod @@ -441,10 +528,14 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/usbserial_ftdi.module -rw-r--r-- root/root usr/lib/grub/i386-pc/usbserial_pl2303.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/usbserial_pl2303.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/usbserial_usbdebug.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/usbserial_usbdebug.module -rw-r--r-- root/root usr/lib/grub/i386-pc/usbtest.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/usbtest.module -rw-r--r-- root/root usr/lib/grub/i386-pc/vbe.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/vbe.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/verify.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/verify.module -rw-r--r-- root/root usr/lib/grub/i386-pc/vga.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/vga.module -rw-r--r-- root/root usr/lib/grub/i386-pc/vga_text.mod @@ -456,18 +547,24 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/video_bochs.module -rw-r--r-- root/root usr/lib/grub/i386-pc/video_cirrus.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/video_cirrus.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/video_colors.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/video_colors.module -rw-r--r-- root/root usr/lib/grub/i386-pc/video_fb.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/video_fb.module -rw-r--r-- root/root usr/lib/grub/i386-pc/videoinfo.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/videoinfo.module -rw-r--r-- root/root usr/lib/grub/i386-pc/videotest.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/videotest.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/videotest_checksum.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/videotest_checksum.module -rw-r--r-- root/root usr/lib/grub/i386-pc/xfs.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/xfs.module -rw-r--r-- root/root usr/lib/grub/i386-pc/xnu.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/xnu.module -rw-r--r-- root/root usr/lib/grub/i386-pc/xnu_uuid.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/xnu_uuid.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/xnu_uuid_test.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/xnu_uuid_test.module -rw-r--r-- root/root usr/lib/grub/i386-pc/xzio.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/xzio.module -rw-r--r-- root/root usr/lib/grub/i386-pc/zfs.mod @@ -479,8 +576,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/grub-bios-setup -rwxr-xr-x root/root usr/sbin/grub-install +-rwxr-xr-x root/root usr/sbin/grub-macbless -rwxr-xr-x root/root usr/sbin/grub-mkconfig --rwxr-xr-x root/root usr/sbin/grub-mknetdir -rwxr-xr-x root/root usr/sbin/grub-ofpathname -rwxr-xr-x root/root usr/sbin/grub-probe -rwxr-xr-x root/root usr/sbin/grub-reboot diff --git a/grub2/.md5sum b/grub2/.md5sum index 83bc889..751bfbe 100644 --- a/grub2/.md5sum +++ b/grub2/.md5sum @@ -1,5 +1,6 @@ -a1043102fbc7bcedbf53e7ee3d17ab91 grub-2.00.tar.xz +be62932eade308a364ea4bbc91295930 grub-2.02~beta2.tar.xz 8459e7425bf9eea9d482e53c5b5c91c9 grub.cfg.sample 3a03d3f53911ac1889e6e68c8429f700 grub2-00_header.diff 0d8c1aa18cbb52ac57c8414abb185e19 grub2-10_linux.diff +1428560966c0b87094ec86589a45b44d grub2-cve-2015-8370.patch 8c28087c5fcb3188f1244b390efffdbe unifont-5.1.20080820.pcf.gz diff --git a/grub2/Pkgfile b/grub2/Pkgfile index 54cc3c7..1ca888b 100644 --- a/grub2/Pkgfile +++ b/grub2/Pkgfile @@ -4,21 +4,23 @@ # Depends on: libdevmapper freetype name=grub2 -version=2.00 -release=7 -source=(ftp://ftp.gnu.org/gnu/grub/grub-$version.tar.xz \ +version=2.02-beta2 +release=1 +source=(http://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.xz \ http://unifoundry.com/unifont-5.1.20080820.pcf.gz \ - $name-00_header.diff $name-10_linux.diff grub.cfg.sample) + $name-00_header.diff $name-10_linux.diff grub.cfg.sample \ + $name-cve-2015-8370.patch) build() { export CFLAGS="${CFLAGS} -Wno-error" - cd grub-$version + cd grub-2.02~beta2 # fix for glibc 'gets' removal sed -i -e '/gets is a/d' grub-core/gnulib/stdio.in.h patch -i $SRC/$name-00_header.diff util/grub.d/00_header.in patch -i $SRC/$name-10_linux.diff util/grub.d/10_linux.in + patch -p1 -i $SRC/$name-cve-2015-8370.patch ./configure --prefix=/usr \ --sysconfdir=/etc \ diff --git a/grub2/grub2-cve-2015-8370.patch b/grub2/grub2-cve-2015-8370.patch new file mode 100644 index 0000000..802affb --- /dev/null +++ b/grub2/grub2-cve-2015-8370.patch @@ -0,0 +1,32 @@ +diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c +index 010e550..683a8aa 100644 +--- a/grub-core/lib/crypto.c ++++ b/grub-core/lib/crypto.c +@@ -470,7 +470,8 @@ grub_password_get (char buf[], unsigned buf_size) + + if (key == '\b') + { +- cur_len--; ++ if (cur_len) ++ cur_len--; + continue; + } + +diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c +index c6bd96e..8615c48 100644 +--- a/grub-core/normal/auth.c ++++ b/grub-core/normal/auth.c +@@ -174,8 +174,11 @@ grub_username_get (char buf[], unsigned buf_size) + + if (key == '\b') + { +- cur_len--; +- grub_printf ("\b"); ++ if (cur_len) ++ { ++ cur_len--; ++ grub_printf ("\b"); ++ } + continue; + } +