commit 4f7423242d86a9898bfff60864fb96238b79145f Author: Matt Housh <jaeger@crux.ninja> Date: Sun Jun 5 14:16:03 2016 -0500 grub2: updated to version 2.02-beta3 diff --git a/grub2/.footprint b/grub2/.footprint index 34b34a5..19cde90 100644 --- a/grub2/.footprint +++ b/grub2/.footprint @@ -73,6 +73,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -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/bswap_test.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/bswap_test.module -rw-r--r-- root/root usr/lib/grub/i386-pc/btrfs.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/btrfs.module -rw-r--r-- root/root usr/lib/grub/i386-pc/bufio.mod @@ -101,6 +103,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/cmostest.module -rw-r--r-- root/root usr/lib/grub/i386-pc/cmp.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/cmp.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/cmp_test.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/cmp_test.module -rw-r--r-- root/root usr/lib/grub/i386-pc/command.lst -rw-r--r-- root/root usr/lib/grub/i386-pc/config.h -rw-r--r-- root/root usr/lib/grub/i386-pc/configfile.mod @@ -120,6 +124,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/cryptodisk.module -rw-r--r-- root/root usr/lib/grub/i386-pc/cs5536.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/cs5536.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/ctz_test.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/ctz_test.module -rw-r--r-- root/root usr/lib/grub/i386-pc/date.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/date.module -rw-r--r-- root/root usr/lib/grub/i386-pc/datehook.mod @@ -132,6 +138,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -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.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/div.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 @@ -215,7 +223,7 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/gcry_whirlpool.module -rw-r--r-- root/root usr/lib/grub/i386-pc/gdb.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/gdb.module --rwxr-xr-x root/root usr/lib/grub/i386-pc/gdb_grub +-rw-r--r-- root/root usr/lib/grub/i386-pc/gdb_grub -rw-r--r-- root/root usr/lib/grub/i386-pc/geli.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/geli.module -rw-r--r-- root/root usr/lib/grub/i386-pc/gettext.mod @@ -228,7 +236,7 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -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/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 -rw-r--r-- root/root usr/lib/grub/i386-pc/gzio.mod @@ -341,6 +349,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -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/mul_test.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/mul_test.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 @@ -431,6 +441,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/raid5rec.module -rw-r--r-- root/root usr/lib/grub/i386-pc/raid6rec.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/raid6rec.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/random.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/random.module -rw-r--r-- root/root usr/lib/grub/i386-pc/read.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/read.module -rw-r--r-- root/root usr/lib/grub/i386-pc/reboot.mod @@ -465,6 +477,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -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/shift_test.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/shift_test.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 diff --git a/grub2/.md5sum b/grub2/.md5sum index 751bfbe..06b528a 100644 --- a/grub2/.md5sum +++ b/grub2/.md5sum @@ -1,6 +1,5 @@ -be62932eade308a364ea4bbc91295930 grub-2.02~beta2.tar.xz +ab399fc6f74a97d66ff77f04b743149c grub-2.02~beta3.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 1ca888b..4c3766d 100644 --- a/grub2/Pkgfile +++ b/grub2/Pkgfile @@ -1,26 +1,24 @@ # Description: A Multiboot boot loader # URL: http://www.gnu.org/software/grub/ -# Maintainer: Matt Housh, jaeger at morpheus dot net +# Maintainer: Matt Housh, jaeger at crux dot ninja # Depends on: libdevmapper freetype name=grub2 -version=2.02-beta2 +version=2.02-beta3 release=1 -source=(http://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.xz \ +source=(http://alpha.gnu.org/gnu/grub/grub-2.02~beta3.tar.xz \ http://unifoundry.com/unifont-5.1.20080820.pcf.gz \ - $name-00_header.diff $name-10_linux.diff grub.cfg.sample \ - $name-cve-2015-8370.patch) + $name-00_header.diff $name-10_linux.diff grub.cfg.sample) build() { export CFLAGS="${CFLAGS} -Wno-error" - cd grub-2.02~beta2 + cd grub-2.02~beta3 # 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 deleted file mode 100644 index 802affb..0000000 --- a/grub2/grub2-cve-2015-8370.patch +++ /dev/null @@ -1,32 +0,0 @@ -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; - } -