commit: 208609c7322de4de86dd2e580dc92e842589493c Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Fri Aug 11 14:55:48 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Aug 13 11:28:45 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=208609c7
sys-boot/grub: remove unused patches/files Closes: https://github.com/gentoo/gentoo/pull/5390 sys-boot/grub/files/2.02_beta3-10_linux-UUID.patch | 27 ------ .../grub/files/2.02_beta3-gcc6-ld-no-pie.patch | 57 ----------- sys-boot/grub/files/2.02_beta3-sysmacros.patch | 107 --------------------- sys-boot/grub/files/CVE-2015-8370.patch | 54 ----------- .../grub/files/grub-2.02_beta2-lvm2-raid1.patch | 68 ------------- sys-boot/grub/files/grub.cfg.example | 72 -------------- 6 files changed, 385 deletions(-) diff --git a/sys-boot/grub/files/2.02_beta3-10_linux-UUID.patch b/sys-boot/grub/files/2.02_beta3-10_linux-UUID.patch deleted file mode 100644 index 1dcf3b5b781..00000000000 --- a/sys-boot/grub/files/2.02_beta3-10_linux-UUID.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ea8de5d2ee58178381e5809e4d5fe79861e61b04 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <flop...@gentoo.org> -Date: Sat, 5 Mar 2016 17:21:15 -0500 -Subject: [PATCH] [2.02] 10_linux: Fix grouping of tests for GRUB_DEVICE - -Commit 7290bb562 causes GRUB_DISABLE_LINUX_UUID to be ignored due to -mixing of || and && operators. Add some parens to help with that. ---- - util/grub.d/10_linux.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 5a78513..de9044c 100644 ---- a/util/grub.d/10_linux.in -+++ b/util/grub.d/10_linux.in -@@ -47,7 +47,7 @@ esac - # and mounting btrfs requires user space scanning, so force UUID in this case. - if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \ - || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \ -- || test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm; then -+ || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); then - LINUX_ROOT_DEVICE=${GRUB_DEVICE} - else - LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID} --- -2.7.2 - diff --git a/sys-boot/grub/files/2.02_beta3-gcc6-ld-no-pie.patch b/sys-boot/grub/files/2.02_beta3-gcc6-ld-no-pie.patch deleted file mode 100644 index 0d814154478..00000000000 --- a/sys-boot/grub/files/2.02_beta3-gcc6-ld-no-pie.patch +++ /dev/null @@ -1,57 +0,0 @@ -2016-05-21 Magnus Granberg <zo...@gentoo.org> - - #583042 sys-boot/grub-2.02_beta3-r1: building w/gcc-6[pie]: error: - x86_64-pc-linux-gnu/bin/ld: -r and -shared may not be used together - - * acinclude.m4: Add -no-pie check. - * configure.ac: Add -no-pie to TARGET_LDFLAGS if needed. - ---- a/acinclude.m4 2015-11-11 20:56:52.000000000 +0100 -+++ b/acinclude.m4 2016-05-17 00:08:22.000000000 +0200 -@@ -390,6 +390,24 @@ else - [fi] - ]) - -+dnl Check if the Linker supports `-no-pie'. -+AC_DEFUN([grub_CHECK_NO_PIE], -+[AC_MSG_CHECKING([whether linker accepts -no-pie]) -+AC_CACHE_VAL(grub_cv_cc_ld_nopie, -+[save_LDFLAGS="$LDFLAGS" -+LDFLAGS="$LDFLAGS -no-pie" -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])], -+ [grub_cv_cc_ld_no_pie=yes], -+ [grub_cv_cc_ld_no_pie=no]) -+LDFLAGS="$save_LDFLAGS" -+]) -+AC_MSG_RESULT([$grub_cv_cc_ld_no_pie]) -+nopie_possible=no -+if test "x$grub_cv_cc_ld_no_pie" = xyes ; then -+ nopie_possible=yes -+fi -+]) -+ - dnl Check if the C compiler supports `-fPIC'. - AC_DEFUN([grub_CHECK_PIC],[ - [# Position independent executable. ---- a/configure.ac 2016-02-27 13:40:56.000000000 +0100 -+++ b/configure.ac 2016-05-17 00:57:29.471000000 +0200 -@@ -1184,13 +1184,18 @@ CFLAGS="$TARGET_CFLAGS" - - # Position independent executable. - grub_CHECK_PIE -+grub_CHECK_NO_PIE - [# Need that, because some distributions ship compilers that include --# `-fPIE' in the default specs. -+# `-fPIE' and '-pie' in the default specs. - if [ x"$pie_possible" = xyes ]; then - TARGET_CFLAGS="$TARGET_CFLAGS -fno-PIE" -+fi -+if [ x"$nopie_possible" = xyes ] && [ x"$pie_possible" = xyes ]; then -+ TARGET_LDFLAGS="$TARGET_LDFLAGS -no-pie" - fi] - - CFLAGS="$TARGET_CFLAGS" -+LDFLAGS="$TARGET_LDFLAGS" - - # Position independent executable. - grub_CHECK_PIC diff --git a/sys-boot/grub/files/2.02_beta3-sysmacros.patch b/sys-boot/grub/files/2.02_beta3-sysmacros.patch deleted file mode 100644 index 8610f3a1a57..00000000000 --- a/sys-boot/grub/files/2.02_beta3-sysmacros.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 7a5b301e3adb8e054288518a325135a1883c1c6c Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <flop...@gentoo.org> -Date: Tue, 19 Apr 2016 14:27:22 -0400 -Subject: [PATCH] build: Use AC_HEADER_MAJOR to find device macros - -Depending on the OS/libc, device macros are defined in different -headers. This change ensures we include the right one. - -sys/types.h - BSD -sys/mkdev.h - Sun -sys/sysmacros.h - glibc (Linux) - -glibc currently pulls sys/sysmacros.h into sys/types.h, but this may -change in a future release. - -https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html ---- - configure.ac | 3 ++- - grub-core/osdep/devmapper/getroot.c | 6 ++++++ - grub-core/osdep/devmapper/hostdisk.c | 5 +++++ - grub-core/osdep/linux/getroot.c | 6 ++++++ - grub-core/osdep/unix/getroot.c | 4 +++- - 5 files changed, 22 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 57e1713..9ddfc53 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -388,7 +388,8 @@ fi - - # Check for functions and headers. - AC_CHECK_FUNCS(posix_memalign memalign getextmntent) --AC_CHECK_HEADERS(sys/param.h sys/mount.h sys/mnttab.h sys/mkdev.h limits.h) -+AC_CHECK_HEADERS(sys/param.h sys/mount.h sys/mnttab.h limits.h) -+AC_HEADER_MAJOR - - AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,[$ac_includes_default - #include <sys/param.h> -diff --git a/grub-core/osdep/devmapper/getroot.c b/grub-core/osdep/devmapper/getroot.c -index 05eda50..72e5582 100644 ---- a/grub-core/osdep/devmapper/getroot.c -+++ b/grub-core/osdep/devmapper/getroot.c -@@ -40,6 +40,12 @@ - #include <limits.h> - #endif - -+#if defined(MAJOR_IN_MKDEV) -+#include <sys/mkdev.h> -+#elif defined(MAJOR_IN_SYSMACROS) -+#include <sys/sysmacros.h> -+#endif -+ - #include <libdevmapper.h> - - #include <grub/types.h> -diff --git a/grub-core/osdep/devmapper/hostdisk.c b/grub-core/osdep/devmapper/hostdisk.c -index 19c1101..a697bcb 100644 ---- a/grub-core/osdep/devmapper/hostdisk.c -+++ b/grub-core/osdep/devmapper/hostdisk.c -@@ -24,6 +24,11 @@ - #include <errno.h> - #include <limits.h> - -+#if defined(MAJOR_IN_MKDEV) -+#include <sys/mkdev.h> -+#elif defined(MAJOR_IN_SYSMACROS) -+#include <sys/sysmacros.h> -+#endif - - #ifdef HAVE_DEVICE_MAPPER - # include <libdevmapper.h> -diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c -index 10480b6..09e7e6e 100644 ---- a/grub-core/osdep/linux/getroot.c -+++ b/grub-core/osdep/linux/getroot.c -@@ -35,6 +35,12 @@ - #include <limits.h> - #endif - -+#if defined(MAJOR_IN_MKDEV) -+#include <sys/mkdev.h> -+#elif defined(MAJOR_IN_SYSMACROS) -+#include <sys/sysmacros.h> -+#endif -+ - #include <grub/types.h> - #include <sys/ioctl.h> /* ioctl */ - #include <sys/mount.h> -diff --git a/grub-core/osdep/unix/getroot.c b/grub-core/osdep/unix/getroot.c -index 1079a91..4bf37b0 100644 ---- a/grub-core/osdep/unix/getroot.c -+++ b/grub-core/osdep/unix/getroot.c -@@ -51,8 +51,10 @@ - #endif - - #include <sys/types.h> --#if defined(HAVE_SYS_MKDEV_H) -+#if defined(MAJOR_IN_MKDEV) - #include <sys/mkdev.h> -+#elif defined(MAJOR_IN_SYSMACROS) -+#include <sys/sysmacros.h> - #endif - - #if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR) --- -2.8.1 - diff --git a/sys-boot/grub/files/CVE-2015-8370.patch b/sys-boot/grub/files/CVE-2015-8370.patch deleted file mode 100644 index 69e419ee0c3..00000000000 --- a/sys-boot/grub/files/CVE-2015-8370.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 451d80e52d851432e109771bb8febafca7a5f1f2 Mon Sep 17 00:00:00 2001 -From: Hector Marco-Gisbert <hecma...@upv.es> -Date: Wed, 16 Dec 2015 07:57:18 +0300 -Subject: [PATCH] Fix security issue when reading username and password - -This patch fixes two integer underflows at: - * grub-core/lib/crypto.c - * grub-core/normal/auth.c - -CVE-2015-8370 - -Signed-off-by: Hector Marco-Gisbert <hecma...@upv.es> -Signed-off-by: Ismael Ripoll-Ripoll <irip...@disca.upv.es> -Also-By: Andrey Borzenkov <arvidj...@gmail.com> ---- - grub-core/lib/crypto.c | 3 ++- - grub-core/normal/auth.c | 7 +++++-- - 2 files changed, 7 insertions(+), 3 deletions(-) - -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; - } - --- -2.6.4 - diff --git a/sys-boot/grub/files/grub-2.02_beta2-lvm2-raid1.patch b/sys-boot/grub/files/grub-2.02_beta2-lvm2-raid1.patch deleted file mode 100644 index 76c72a62632..00000000000 --- a/sys-boot/grub/files/grub-2.02_beta2-lvm2-raid1.patch +++ /dev/null @@ -1,68 +0,0 @@ -From: Andrei Borzenkov <arvidj...@gmail.com> -Date: Thu, 19 Mar 2015 18:30:27 +0000 (+0300) -Subject: core: add LVM RAID1 support -X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=grub.git;a=commitdiff_plain;h=527eeeeee6c8d3d8e3bb1fac408d47bb1dcbec95;hp=7c9309e50a124817e67de38b30c6291acecad560 - -core: add LVM RAID1 support - -Closes 44534. ---- - -diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c -index 1e7f197..9b97004 100644 ---- a/grub-core/disk/lvm.c -+++ b/grub-core/disk/lvm.c -@@ -577,13 +577,17 @@ grub_lvm_detect (grub_disk_t disk, - if (is_pvmove) - seg->node_count = 1; - } -- else if (grub_memcmp (p, "raid", sizeof ("raid") - 1) -- == 0 && (p[sizeof ("raid") - 1] >= '4' -- && p[sizeof ("raid") - 1] <= '6') -+ else if (grub_memcmp (p, "raid", sizeof ("raid") - 1) == 0 -+ && ((p[sizeof ("raid") - 1] >= '4' -+ && p[sizeof ("raid") - 1] <= '6') -+ || p[sizeof ("raid") - 1] == '1') - && p[sizeof ("raidX") - 1] == '"') - { - switch (p[sizeof ("raid") - 1]) - { -+ case '1': -+ seg->type = GRUB_DISKFILTER_MIRROR; -+ break; - case '4': - seg->type = GRUB_DISKFILTER_RAID4; - seg->layout = GRUB_RAID_LAYOUT_LEFT_ASYMMETRIC; -@@ -608,16 +612,18 @@ grub_lvm_detect (grub_disk_t disk, - goto lvs_segment_fail; - } - -- seg->stripe_size = grub_lvm_getvalue (&p, "stripe_size = "); -- if (p == NULL) -+ if (seg->type != GRUB_DISKFILTER_MIRROR) - { -+ seg->stripe_size = grub_lvm_getvalue (&p, "stripe_size = "); -+ if (p == NULL) -+ { - #ifdef GRUB_UTIL -- grub_util_info ("unknown stripe_size\n"); -+ grub_util_info ("unknown stripe_size\n"); - #endif -- goto lvs_segment_fail; -+ goto lvs_segment_fail; -+ } - } - -- - seg->nodes = grub_zalloc (sizeof (seg->nodes[0]) - * seg->node_count); - -@@ -625,7 +631,7 @@ grub_lvm_detect (grub_disk_t disk, - if (p == NULL) - { - #ifdef GRUB_UTIL -- grub_util_info ("unknown mirrors\n"); -+ grub_util_info ("unknown raids\n"); - #endif - goto lvs_segment_fail2; - } diff --git a/sys-boot/grub/files/grub.cfg.example b/sys-boot/grub/files/grub.cfg.example deleted file mode 100644 index 583e1df0023..00000000000 --- a/sys-boot/grub/files/grub.cfg.example +++ /dev/null @@ -1,72 +0,0 @@ -# Example configuration for GRUB -# Much of this example configuration was taken from the GRUB manual. - -# Menu timeout -timeout=5 - -# Default menu entry -default=0 - -# If we have a font available, start graphical output. -if loadfont unifont; then - # Output resolution for GRUB (eg. 1024x768 or 'auto'). - gfxmode=auto - - # Output resolution for Linux (VESAFB only). - # 'keep' means use the same resolution as GRUB. - # For other framebuffer drivers, pass a resolution using the video= kernel param. - gfxpayload=keep - - # Load all video drivers. - insmod all_video - - # Switch to graphical output. - terminal_output gfxterm -fi - -# Load modules necessary to find any boot files (/boot). - -# Partition table(s). -insmod part_msdos -#insmod part_gpt - -menuentry "Gentoo Linux 4.7.2" { - # Filesystem for /boot - #insmod btrfs - insmod ext2 - #insmod xfs - #insmod zfs - - # Search all block devices for a matching UUID (for /boot) - search --set=root --fs-uuid 33d4013a-ec25-4462-a540-8078aeb8ed17 - - # Load a linux kernel, passing the root filesystem and init process as parameters - echo "Loading kernel..." - linux /vmlinuz-4.7.2 root=UUID=e1fce3ad-d7e4-4e2f-a1f5-537642bbccd5 rootfstype=btrfs init=/usr/lib/systemd/systemd - - echo "Loading initramfs..." - initrd /initramfs-4.7.2.img -} - -menuentry "Windows XP" { - insmod ntfs - search --set=root --label WINDOWS_XP --hint hd0,msdos1 - ntldr /ntldr -} - -menuentry "Windows 7" { - insmod ntfs - search --set=root --label WINDOWS_7 --hint hd0,msdos2 - ntldr /bootmgr -} - -menuentry "FreeBSD" { - insmod zfs - search --set=root --label freepool --hint hd0,msdos7 - kfreebsd /freebsd@/boot/kernel/kernel - kfreebsd_module_elf /freebsd@/boot/kernel/opensolaris.ko - kfreebsd_module_elf /freebsd@/boot/kernel/zfs.ko - kfreebsd_module /freebsd@/boot/zfs/zpool.cache type=/boot/zfs/zpool.cache - set kFreeBSD.vfs.root.mountfrom=zfs:freepool/freebsd - set kFreeBSD.hw.psm.synaptics_support=1 -}
