* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/files/
@ 2015-12-18 17:01 Mike Gilbert
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert @ 2015-12-18 17:01 UTC (permalink / raw
To: gentoo-commits
commit: 27cb6e8ce5f9c2faea0b4a39887d5d937b6107ef
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 18 17:00:47 2015 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Dec 18 17:00:47 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27cb6e8c
sys-boot/grub: Replace patch for CVE-2015-8370
Use what actually got accepted upstream.
Package-Manager: portage-2.2.26_p32
sys-boot/grub/files/CVE-2015-8370.patch | 57 +++++++++++++++++++--------------
1 file changed, 33 insertions(+), 24 deletions(-)
diff --git a/sys-boot/grub/files/CVE-2015-8370.patch b/sys-boot/grub/files/CVE-2015-8370.patch
index 5701b54..69e419e 100644
--- a/sys-boot/grub/files/CVE-2015-8370.patch
+++ b/sys-boot/grub/files/CVE-2015-8370.patch
@@ -1,45 +1,54 @@
-From 88c9657960a6c5d3673a25c266781e876c181add Mon Sep 17 00:00:00 2001
+From 451d80e52d851432e109771bb8febafca7a5f1f2 Mon Sep 17 00:00:00 2001
From: Hector Marco-Gisbert <hecmargi@upv.es>
-Date: Fri, 13 Nov 2015 16:21:09 +0100
+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
+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 <hecmargi@upv.es>
Signed-off-by: Ismael Ripoll-Ripoll <iripoll@disca.upv.es>
+Also-By: Andrey Borzenkov <arvidjaar@gmail.com>
---
- grub-core/lib/crypto.c | 2 +-
- grub-core/normal/auth.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ 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..524a3d8 100644
+index 010e550..683a8aa 100644
--- a/grub-core/lib/crypto.c
+++ b/grub-core/lib/crypto.c
-@@ -468,7 +468,7 @@ grub_password_get (char buf[], unsigned buf_size)
- break;
- }
+@@ -470,7 +470,8 @@ grub_password_get (char buf[], unsigned buf_size)
-- if (key == '\b')
-+ if (key == '\b' && cur_len)
+ if (key == '\b')
{
- cur_len--;
+- cur_len--;
++ if (cur_len)
++ cur_len--;
continue;
+ }
+
diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c
-index c6bd96e..5782ec5 100644
+index c6bd96e..8615c48 100644
--- a/grub-core/normal/auth.c
+++ b/grub-core/normal/auth.c
-@@ -172,7 +172,7 @@ grub_username_get (char buf[], unsigned buf_size)
- break;
- }
+@@ -174,8 +174,11 @@ grub_username_get (char buf[], unsigned buf_size)
-- if (key == '\b')
-+ if (key == '\b' && cur_len)
+ if (key == '\b')
{
- cur_len--;
- grub_printf ("\b");
+- cur_len--;
+- grub_printf ("\b");
++ if (cur_len)
++ {
++ cur_len--;
++ grub_printf ("\b");
++ }
+ continue;
+ }
+
--
-1.9.1
+2.6.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/files/
@ 2016-10-05 15:48 Mike Gilbert
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert @ 2016-10-05 15:48 UTC (permalink / raw
To: gentoo-commits
commit: e201362dcb90bc23918d638bd0309ce7acc7fcbb
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 5 15:48:25 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Oct 5 15:48:47 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e201362d
sys-boot/grub: typo
sys-boot/grub/files/grub.cfg.example | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/files/grub.cfg.example b/sys-boot/grub/files/grub.cfg.example
index 4c6e464..1a19929 100644
--- a/sys-boot/grub/files/grub.cfg.example
+++ b/sys-boot/grub/files/grub.cfg.example
@@ -35,7 +35,7 @@ menuentry "Gentoo Linux 4.7.2" {
#insmod btrfs
insmod ext2
#insmod xfs
- #inmod zfs
+ #insmod zfs
# Search all block devices for a matching UUID (for /boot)
search --set=root --fs-uuid 33d4013a-ec25-4462-a540-8078aeb8ed17
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/files/
@ 2016-10-05 19:35 Mike Gilbert
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert @ 2016-10-05 19:35 UTC (permalink / raw
To: gentoo-commits
commit: fcd0a7641b420e154d6075b203d51e74c268c0ff
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 5 19:34:34 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Oct 5 19:35:06 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcd0a764
sys-boot/grub: prune the more obscure examples
sys-boot/grub/files/grub.cfg.example | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/sys-boot/grub/files/grub.cfg.example b/sys-boot/grub/files/grub.cfg.example
index 1a19929..583e1df 100644
--- a/sys-boot/grub/files/grub.cfg.example
+++ b/sys-boot/grub/files/grub.cfg.example
@@ -70,21 +70,3 @@ menuentry "FreeBSD" {
set kFreeBSD.vfs.root.mountfrom=zfs:freepool/freebsd
set kFreeBSD.hw.psm.synaptics_support=1
}
-
-menuentry "Fedora 16 installer" {
- search --set=root --label GRUB --hint hd0,msdos5
- linux /fedora/vmlinuz lang=en_US keymap=sg resolution=1280x800
- initrd /fedora/initrd.img
-}
-
-menuentry "Fedora rawhide installer" {
- search --set=root --label GRUB --hint hd0,msdos5
- linux /fedora/vmlinuz repo=ftp://mirror.switch.ch/mirror/fedora/linux/development/rawhide/x86_64 lang=en_US keymap=sg resolution=1280x800
- initrd /fedora/initrd.img
-}
-
-menuentry "Debian sid installer" {
- search --set=root --label GRUB --hint hd0,msdos5
- linux /debian/dists/sid/main/installer-amd64/current/images/hd-media/vmlinuz
- initrd /debian/dists/sid/main/installer-amd64/current/images/hd-media/initrd.gz
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/files/
@ 2017-02-04 21:22 David Seifert
0 siblings, 0 replies; 13+ messages in thread
From: David Seifert @ 2017-02-04 21:22 UTC (permalink / raw
To: gentoo-commits
commit: c6647c7fa1140556799804693b013900bb57a5e1
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Feb 3 15:19:47 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 4 21:20:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6647c7f
sys-boot/grub: remove unused patches/file
Closes: https://github.com/gentoo/gentoo/pull/3791
sys-boot/grub/files/grub-2.00-freetype-2.5.1.patch | 24 -----------
sys-boot/grub/files/grub-2.02_beta2-libzfs.patch | 19 ---------
sys-boot/grub/files/grub.default-2 | 46 ----------------------
3 files changed, 89 deletions(-)
diff --git a/sys-boot/grub/files/grub-2.00-freetype-2.5.1.patch b/sys-boot/grub/files/grub-2.00-freetype-2.5.1.patch
deleted file mode 100644
index 286830c..00000000
--- a/sys-boot/grub/files/grub-2.00-freetype-2.5.1.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit fd0df6d098b1e6a4f60275c48a3ec88d15ba1fbb
-Author: Colin Watson <cjwatson@ubuntu.com>
-Date: Fri Nov 29 12:19:36 2013 +0000
-
- Fix build with FreeType 2.5.1
-
- * util/grub-gen-asciih.c: Include FT_SYNTHESIS_H rather than
- <freetype/ftsynth.h>, fixing build with FreeType 2.5.1.
- * util/grub-gen-widthspec.c: Likewise.
- * util/grub-mkfont.c: Likewise.
-
-diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
-index 0d8eb78..242dd01 100644
---- a/util/grub-mkfont.c
-+++ b/util/grub-mkfont.c
-@@ -43,7 +43,7 @@
- #include FT_FREETYPE_H
- #include FT_TRUETYPE_TAGS_H
- #include FT_TRUETYPE_TABLES_H
--#include <freetype/ftsynth.h>
-+#include FT_SYNTHESIS_H
-
- #undef __FTERRORS_H__
- #define FT_ERROR_START_LIST const char *ft_errmsgs[] = {
diff --git a/sys-boot/grub/files/grub-2.02_beta2-libzfs.patch b/sys-boot/grub/files/grub-2.02_beta2-libzfs.patch
deleted file mode 100644
index d76a903..00000000
--- a/sys-boot/grub/files/grub-2.02_beta2-libzfs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 6ba983559dcffa0fa69c7fc861b5a16b4877a92c
-Author: Mike Gilbert <floppym@gentoo.org>
-Date: Sat Jan 18 19:41:15 2014 +0100
-
- * Makefile.util.def: Link grub-ofpathname with zfs libs.
-
-diff --git a/Makefile.util.def b/Makefile.util.def
-index 83df212..a286a89 100644
---- a/Makefile.util.def
-+++ b/Makefile.util.def
-@@ -384,7 +384,7 @@ program = {
- ldadd = libgrubgcry.a;
- ldadd = libgrubkern.a;
- ldadd = grub-core/gnulib/libgnu.a;
-- ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBGEOM)';
-+ ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
- };
-
- program = {
diff --git a/sys-boot/grub/files/grub.default-2 b/sys-boot/grub/files/grub.default-2
deleted file mode 100644
index 87594d2..00000000
--- a/sys-boot/grub/files/grub.default-2
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-#
-# To populate all changes in this file you need to regenerate your
-# grub configuration file afterwards:
-# 'grub2-mkconfig -o /boot/grub/grub.cfg'
-#
-# See the grub info page for documentation on possible variables and
-# their associated values.
-
-GRUB_DISTRIBUTOR="Gentoo"
-
-GRUB_DEFAULT=0
-GRUB_HIDDEN_TIMEOUT=0
-GRUB_HIDDEN_TIMEOUT_QUIET=true
-GRUB_TIMEOUT=10
-
-# Append parameters to the linux kernel command line
-# GRUB_CMDLINE_LINUX=""
-
-# Append parameters to the linux kernel command line for non-recovery entries
-#GRUB_CMDLINE_LINUX_DEFAULT=""
-
-# Uncomment to disable graphical terminal (grub-pc only)
-#GRUB_TERMINAL=console
-
-# The resolution used on graphical terminal.
-# Note that you can use only modes which your graphic card supports via VBE.
-# You can see them in real GRUB with the command `vbeinfo'.
-#GRUB_GFXMODE=640x480
-
-# Path to theme spec txt file.
-# The starfield is by default provided with use truetype.
-# NOTE: when enabling custom theme, ensure you have required font/etc.
-#GRUB_THEME="/boot/grub/themes/starfield/theme.txt"
-
-# Background image used on graphical terminal.
-# Can be in various bitmap formats.
-#GRUB_BACKGROUND="/boot/grub/mybackground.png"
-
-# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to kernel
-#GRUB_DISABLE_LINUX_UUID=true
-
-# Uncomment to disable generation of recovery mode menu entries
-#GRUB_DISABLE_RECOVERY=true
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/files/
@ 2017-08-13 11:31 David Seifert
0 siblings, 0 replies; 13+ messages in thread
From: David Seifert @ 2017-08-13 11:31 UTC (permalink / raw
To: gentoo-commits
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 <floppym@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 <zorry@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 <floppym@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 <hecmargi@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 <hecmargi@upv.es>
-Signed-off-by: Ismael Ripoll-Ripoll <iripoll@disca.upv.es>
-Also-By: Andrey Borzenkov <arvidjaar@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 <arvidjaar@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
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/files/
@ 2019-02-16 21:05 Lars Wendler
0 siblings, 0 replies; 13+ messages in thread
From: Lars Wendler @ 2019-02-16 21:05 UTC (permalink / raw
To: gentoo-commits
commit: 2926b4e0b39e90965d9d024fca535a94be94f6f4
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Feb 12 16:21:22 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Feb 16 21:05:31 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2926b4e0
sys-boot/grub: remove unused file
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-boot/grub/files/grub.conf.gentoo | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/sys-boot/grub/files/grub.conf.gentoo b/sys-boot/grub/files/grub.conf.gentoo
deleted file mode 100644
index 984470b3860..00000000000
--- a/sys-boot/grub/files/grub.conf.gentoo
+++ /dev/null
@@ -1,16 +0,0 @@
-# This is a sample grub.conf for use with Genkernel, per the Gentoo handbook
-# http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=1&chap=10#doc_chap2
-# If you are not using Genkernel and you need help creating this file, you
-# should consult the handbook. Alternatively, consult the grub.conf.sample that
-# is included with the Grub documentation.
-
-default 0
-timeout 30
-#splashimage=(hd0,0)/boot/grub/splash.xpm.gz
-
-#title Gentoo Linux 3.8.13
-#root (hd0,0)
-#kernel /boot/kernel-genkernel-x86-3.8.13-gentoo root=/dev/sda3
-#initrd /boot/initramfs-genkernel-x86-3.8.13
-
-# vim:ft=conf:
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/files/
@ 2020-02-14 11:02 Mikle Kolyada
0 siblings, 0 replies; 13+ messages in thread
From: Mikle Kolyada @ 2020-02-14 11:02 UTC (permalink / raw
To: gentoo-commits
commit: 4fd8145747493f79d1393be5a4468d9c701e1144
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 14 10:59:21 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Feb 14 11:02:02 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fd81457
sys-boot/grub: Do not reference grub2 in default file
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
sys-boot/grub/files/grub.default-3 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/files/grub.default-3 b/sys-boot/grub/files/grub.default-3
index 593b019db7d..3faabf9c6ea 100644
--- a/sys-boot/grub/files/grub.default-3
+++ b/sys-boot/grub/files/grub.default-3
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
#
# To populate all changes in this file you need to regenerate your
# grub configuration file afterwards:
-# 'grub2-mkconfig -o /boot/grub/grub.cfg'
+# 'grub-mkconfig -o /boot/grub/grub.cfg'
#
# See the grub info page for documentation on possible variables and
# their associated values.
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/files/
@ 2021-09-06 3:00 Mike Frysinger
0 siblings, 0 replies; 13+ messages in thread
From: Mike Frysinger @ 2021-09-06 3:00 UTC (permalink / raw
To: gentoo-commits
commit: 5f689c2332fa0e6f89ffaf85fb17ae745e84d737
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 6 02:57:51 2021 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Sep 6 02:59:00 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f689c23
sys-boot/grub: fix custom kernel glob patch
The variable export was missing which caused it to always be blank.
Setting it in /etc/default/grub wouldn't work as /etc/grub.d/10_linux
still wouldn't see it.
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
sys-boot/grub/files/grub-2.02_beta2-KERNEL_GLOBS.patch | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/sys-boot/grub/files/grub-2.02_beta2-KERNEL_GLOBS.patch b/sys-boot/grub/files/grub-2.02_beta2-KERNEL_GLOBS.patch
index c66ee68dc8d..0d2b96d76c1 100644
--- a/sys-boot/grub/files/grub-2.02_beta2-KERNEL_GLOBS.patch
+++ b/sys-boot/grub/files/grub-2.02_beta2-KERNEL_GLOBS.patch
@@ -62,6 +62,13 @@ index 859b608..e5ac11d 100644
case "$machine" in
i?86) GENKERNEL_ARCH="x86" ;;
---
-2.3.0
-
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -252,6 +252,7 @@
+ GRUB_BADRAM \
+ GRUB_OS_PROBER_SKIP_LIST \
+ GRUB_DISABLE_SUBMENU
++export GRUB_LINUX_KERNEL_GLOBS
+
+ if test "x${grub_cfg}" != "x"; then
+ rm -f "${grub_cfg}.new"
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/files/
@ 2022-09-28 19:32 Mike Gilbert
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert @ 2022-09-28 19:32 UTC (permalink / raw
To: gentoo-commits
commit: 7719b94e9a4bf646322889da6eafc121fdfeb1a9
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Sep 28 16:53:38 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Sep 28 19:31:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7719b94e
sys-boot/grub: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/27516
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/files/grub-2.06-binutils-2.36.patch | 44 --------
sys-boot/grub/files/grub-2.06-xfs-v4.patch | 120 ----------------------
2 files changed, 164 deletions(-)
diff --git a/sys-boot/grub/files/grub-2.06-binutils-2.36.patch b/sys-boot/grub/files/grub-2.06-binutils-2.36.patch
deleted file mode 100644
index 5cb327003adb..000000000000
--- a/sys-boot/grub/files/grub-2.06-binutils-2.36.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 5cea201f288246488e2189c49d969d00ebec2898 Mon Sep 17 00:00:00 2001
-From: Michael Chang <mchang@suse.com>
-Date: Fri, 19 Feb 2021 17:40:43 +0800
-Subject: [PATCH] Fix build error in binutils 2.36
-
-The build fails in binutils 2.36
-
-[ 520s] cat kernel_syms.lst > syminfo.lst.new
-[ 520s] /usr/lib64/gcc/x86_64-suse-linux/10/../../../../x86_64-suse-linux/bin/ld: section .note.gnu.property VMA [0000000000400158,0000000000400187] overlaps section .bss VMA [000000000000f000,000000000041e1af]
-
-It is caused by assembler now generates the GNU property notes section
-by default. Use the assmbler option -mx86-used-note=no to disable the
-section from being generated to workaround the ensuing linker issue.
-
-Signed-off-by: Michael Chang <mchang@suse.com>
----
- configure.ac | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index fa8f74bb9..38ee5f579 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -836,6 +836,20 @@ if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ) && test "x$p
- TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow"
- fi
-
-+if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ); then
-+ AC_CACHE_CHECK([whether -Wa,-mx86-used-note works], [grub_cv_cc_mx86_used_note], [
-+ CFLAGS="$TARGET_CFLAGS -Wa,-mx86-used-note=no -Werror"
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-+ [grub_cv_cc_mx86_used_note=yes],
-+ [grub_cv_cc_mx86_used_note=no])
-+ ])
-+
-+ if test "x$grub_cv_cc_mx86_used_note" = xyes; then
-+ TARGET_CFLAGS="$TARGET_CFLAGS -Wa,-mx86-used-note=no"
-+ TARGET_CCASFLAGS="$TARGET_CCASFLAGS -Wa,-mx86-used-note=no"
-+ fi
-+fi
-+
- # GRUB doesn't use float or doubles at all. Yet some toolchains may decide
- # that floats are a good fit to run instead of what's written in the code.
- # Given that floating point unit is disabled (if present to begin with)
diff --git a/sys-boot/grub/files/grub-2.06-xfs-v4.patch b/sys-boot/grub/files/grub-2.06-xfs-v4.patch
deleted file mode 100644
index fe8223780384..000000000000
--- a/sys-boot/grub/files/grub-2.06-xfs-v4.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From a4b495520e4dc41a896a8b916a64eda9970c50ea Mon Sep 17 00:00:00 2001
-From: Erwan Velu <erwanaliasr1@gmail.com>
-Date: Wed, 25 Aug 2021 15:31:52 +0200
-Subject: fs/xfs: Fix unreadable filesystem with v4 superblock
-
-The commit 8b1e5d193 (fs/xfs: Add bigtime incompat feature support)
-introduced the bigtime support by adding some features in v3 inodes.
-This change extended grub_xfs_inode struct by 76 bytes but also changed
-the computation of XFS_V2_INODE_SIZE and XFS_V3_INODE_SIZE. Prior this
-commit, XFS_V2_INODE_SIZE was 100 bytes. After the commit it's 84 bytes
-XFS_V2_INODE_SIZE becomes 16 bytes too small.
-
-As a result, the data structures aren't properly aligned and the GRUB
-generates "attempt to read or write outside of partition" errors when
-trying to read the XFS filesystem:
-
- GNU GRUB version 2.11
- ....
- grub> set debug=efi,gpt,xfs
- grub> insmod part_gpt
- grub> ls (hd0,gpt1)/
- partmap/gpt.c:93: Read a valid GPT header
- partmap/gpt.c:115: GPT entry 0: start=4096, length=1953125
- fs/xfs.c:931: Reading sb
- fs/xfs.c:270: Validating superblock
- fs/xfs.c:295: XFS v4 superblock detected
- fs/xfs.c:962: Reading root ino 128
- fs/xfs.c:515: Reading inode (128) - 64, 0
- fs/xfs.c:515: Reading inode (739521961424144223) - 344365866970255880, 3840
- error: attempt to read or write outside of partition.
-
-This commit change the XFS_V2_INODE_SIZE computation by subtracting 76
-bytes instead of 92 bytes from the actual size of grub_xfs_inode struct.
-This 76 bytes value comes from added members:
- 20 grub_uint8_t unused5
- 1 grub_uint64_t flags2
- 48 grub_uint8_t unused6
-
-This patch explicitly splits the v2 and v3 parts of the structure.
-The unused4 is still ending of the v2 structures and the v3 starts
-at unused5. Thanks to this we will avoid future corruptions of v2
-or v3 inodes.
-
-The XFS_V2_INODE_SIZE is returning to its expected size and the
-filesystem is back to a readable state:
-
- GNU GRUB version 2.11
- ....
- grub> set debug=efi,gpt,xfs
- grub> insmod part_gpt
- grub> ls (hd0,gpt1)/
- partmap/gpt.c:93: Read a valid GPT header
- partmap/gpt.c:115: GPT entry 0: start=4096, length=1953125
- fs/xfs.c:931: Reading sb
- fs/xfs.c:270: Validating superblock
- fs/xfs.c:295: XFS v4 superblock detected
- fs/xfs.c:962: Reading root ino 128
- fs/xfs.c:515: Reading inode (128) - 64, 0
- fs/xfs.c:515: Reading inode (128) - 64, 0
- fs/xfs.c:931: Reading sb
- fs/xfs.c:270: Validating superblock
- fs/xfs.c:295: XFS v4 superblock detected
- fs/xfs.c:962: Reading root ino 128
- fs/xfs.c:515: Reading inode (128) - 64, 0
- fs/xfs.c:515: Reading inode (128) - 64, 0
- fs/xfs.c:515: Reading inode (128) - 64, 0
- fs/xfs.c:515: Reading inode (131) - 64, 768
- efi/ fs/xfs.c:515: Reading inode (3145856) - 1464904, 0
- grub2/ fs/xfs.c:515: Reading inode (132) - 64, 1024
- grub/ fs/xfs.c:515: Reading inode (139) - 64, 2816
- grub>
-
-Fixes: 8b1e5d193 (fs/xfs: Add bigtime incompat feature support)
-
-Signed-off-by: Erwan Velu <e.velu@criteo.com>
-Tested-by: Carlos Maiolino <cmaiolino@redhat.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
----
- grub-core/fs/xfs.c | 14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
-index 0f524c3a8..e3816d1ec 100644
---- a/grub-core/fs/xfs.c
-+++ b/grub-core/fs/xfs.c
-@@ -192,6 +192,11 @@ struct grub_xfs_time_legacy
- grub_uint32_t nanosec;
- } GRUB_PACKED;
-
-+/*
-+ * The struct grub_xfs_inode layout was taken from the
-+ * struct xfs_dinode_core which is described here:
-+ * https://mirrors.edge.kernel.org/pub/linux/utils/fs/xfs/docs/xfs_filesystem_structure.pdf
-+ */
- struct grub_xfs_inode
- {
- grub_uint8_t magic[2];
-@@ -208,14 +213,15 @@ struct grub_xfs_inode
- grub_uint32_t nextents;
- grub_uint16_t unused3;
- grub_uint8_t fork_offset;
-- grub_uint8_t unused4[37];
-+ grub_uint8_t unused4[17]; /* Last member of inode v2. */
-+ grub_uint8_t unused5[20]; /* First member of inode v3. */
- grub_uint64_t flags2;
-- grub_uint8_t unused5[48];
-+ grub_uint8_t unused6[48]; /* Last member of inode v3. */
- } GRUB_PACKED;
-
- #define XFS_V3_INODE_SIZE sizeof(struct grub_xfs_inode)
--/* Size of struct grub_xfs_inode until fork_offset (included). */
--#define XFS_V2_INODE_SIZE (XFS_V3_INODE_SIZE - 92)
-+/* Size of struct grub_xfs_inode v2, up to unused4 member included. */
-+#define XFS_V2_INODE_SIZE (XFS_V3_INODE_SIZE - 76)
-
- struct grub_xfs_dirblock_tail
- {
---
-cgit v1.2.1
-
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/files/
@ 2023-05-11 20:28 Conrad Kostecki
0 siblings, 0 replies; 13+ messages in thread
From: Conrad Kostecki @ 2023-05-11 20:28 UTC (permalink / raw
To: gentoo-commits
commit: 47dc11ae5fb1b6ca03f8bbe50b1dd6da29182eca
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed May 10 18:18:37 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu May 11 20:28:05 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47dc11ae
sys-boot/grub: remove unused file
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30978
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
sys-boot/grub/files/grub.default-3 | 73 --------------------------------------
1 file changed, 73 deletions(-)
diff --git a/sys-boot/grub/files/grub.default-3 b/sys-boot/grub/files/grub.default-3
deleted file mode 100644
index 3faabf9c6ea9..000000000000
--- a/sys-boot/grub/files/grub.default-3
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-#
-# To populate all changes in this file you need to regenerate your
-# grub configuration file afterwards:
-# 'grub-mkconfig -o /boot/grub/grub.cfg'
-#
-# See the grub info page for documentation on possible variables and
-# their associated values.
-
-GRUB_DISTRIBUTOR="Gentoo"
-
-# Default menu entry
-#GRUB_DEFAULT=0
-
-# Boot the default entry this many seconds after the menu is displayed
-#GRUB_TIMEOUT=5
-#GRUB_TIMEOUT_STYLE=menu
-
-# Append parameters to the linux kernel command line
-#GRUB_CMDLINE_LINUX=""
-#
-# Examples:
-#
-# Boot with network interface renaming disabled
-# GRUB_CMDLINE_LINUX="net.ifnames=0"
-#
-# Boot with systemd instead of sysvinit (openrc)
-# GRUB_CMDLINE_LINUX="init=/usr/lib/systemd/systemd"
-
-# Append parameters to the linux kernel command line for non-recovery entries
-#GRUB_CMDLINE_LINUX_DEFAULT=""
-
-# Uncomment to disable graphical terminal (grub-pc only)
-#GRUB_TERMINAL=console
-
-# The resolution used on graphical terminal.
-# Note that you can use only modes which your graphic card supports via VBE.
-# You can see them in real GRUB with the command `vbeinfo'.
-#GRUB_GFXMODE=640x480
-
-# Set to 'text' to force the Linux kernel to boot in normal text
-# mode, 'keep' to preserve the graphics mode set using
-# 'GRUB_GFXMODE', 'WIDTHxHEIGHT'['xDEPTH'] to set a particular
-# graphics mode, or a sequence of these separated by commas or
-# semicolons to try several modes in sequence.
-#GRUB_GFXPAYLOAD_LINUX=
-
-# Path to theme spec txt file.
-# The starfield is by default provided with use truetype.
-# NOTE: when enabling custom theme, ensure you have required font/etc.
-#GRUB_THEME="/boot/grub/themes/starfield/theme.txt"
-
-# Background image used on graphical terminal.
-# Can be in various bitmap formats.
-#GRUB_BACKGROUND="/boot/grub/mybackground.png"
-
-# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to kernel
-#GRUB_DISABLE_LINUX_UUID=true
-
-# Uncomment to disable generation of recovery mode menu entries
-#GRUB_DISABLE_RECOVERY=true
-
-# Uncomment to disable generation of the submenu and put all choices on
-# the top-level menu.
-# Besides the visual affect of no sub menu, this makes navigation of the
-# menu easier for a user who can't see the screen.
-#GRUB_DISABLE_SUBMENU=y
-
-# Uncomment to play a tone when the main menu is displayed.
-# This is useful, for example, to allow users who can't see the screen
-# to know when they can make a choice on the menu.
-#GRUB_INIT_TUNE="60 800 1"
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/files/
@ 2024-01-20 21:22 Conrad Kostecki
0 siblings, 0 replies; 13+ messages in thread
From: Conrad Kostecki @ 2024-01-20 21:22 UTC (permalink / raw
To: gentoo-commits
commit: d3c252b3084f40c4d840283cfb448263afbf9ed2
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Jan 20 08:20:40 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Jan 20 21:21:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3c252b3
sys-boot/grub: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
...grub-2.06-arm64-linux-Remove-magic-number.patch | 45 --------------
.../grub-2.06-fs-ext2-ignore-checksum-seed.patch | 62 --------------------
...py-Remove-.interp-section-from-.img-files.patch | 31 ----------
.../grub-2.06-grub-mkconfig-restore-umask.patch | 41 -------------
sys-boot/grub/files/grub-2.06-locale.patch | 68 ----------------------
sys-boot/grub/files/grub-2.06-riscv.patch | 49 ----------------
...b.d-25_bli.in-fix-shebang-on-unmerged-usr.patch | 31 ----------
7 files changed, 327 deletions(-)
diff --git a/sys-boot/grub/files/grub-2.06-arm64-linux-Remove-magic-number.patch b/sys-boot/grub/files/grub-2.06-arm64-linux-Remove-magic-number.patch
deleted file mode 100644
index eed3bf0ca93d..000000000000
--- a/sys-boot/grub/files/grub-2.06-arm64-linux-Remove-magic-number.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://git.savannah.gnu.org/cgit/grub.git/patch/?id=69edb31205602c29293a8c6e67363bba2a4a1e66
-https://bugs.gentoo.org/913935
-
-From 69edb31205602c29293a8c6e67363bba2a4a1e66 Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Thu, 11 Aug 2022 16:51:57 +0200
-Subject: loader/arm64/linux: Remove magic number header field check
-
-The "ARM\x64" magic number in the file header identifies an image as one
-that implements the bare metal boot protocol, allowing the loader to
-simply move the file to a suitably aligned address in memory, with
-sufficient headroom for the trailing .bss segment (the required memory
-size is described in the header as well).
-
-Note of this matters for GRUB, as it only supports EFI boot. EFI does
-not care about this magic number, and nor should GRUB: this prevents us
-from booting other PE linux images, such as the generic EFI zboot
-decompressor, which is a pure PE/COFF image, and does not implement the
-bare metal boot protocol.
-
-So drop the magic number check.
-
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
----
- grub-core/loader/arm64/linux.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index ef3e9f9..4c92e48 100644
---- a/grub-core/loader/arm64/linux.c
-+++ b/grub-core/loader/arm64/linux.c
-@@ -51,9 +51,6 @@ static grub_addr_t initrd_end;
- grub_err_t
- grub_arch_efi_linux_check_image (struct linux_arch_kernel_header * lh)
- {
-- if (lh->magic != GRUB_LINUX_ARMXX_MAGIC_SIGNATURE)
-- return grub_error(GRUB_ERR_BAD_OS, "invalid magic number");
--
- if ((lh->code0 & 0xffff) != GRUB_PE32_MAGIC)
- return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
- N_("plain image kernel not supported - rebuild with CONFIG_(U)EFI_STUB enabled"));
---
-cgit v1.1
-
diff --git a/sys-boot/grub/files/grub-2.06-fs-ext2-ignore-checksum-seed.patch b/sys-boot/grub/files/grub-2.06-fs-ext2-ignore-checksum-seed.patch
deleted file mode 100644
index 9024b479a878..000000000000
--- a/sys-boot/grub/files/grub-2.06-fs-ext2-ignore-checksum-seed.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-https://bugs.gentoo.org/894200
-https://git.savannah.gnu.org/cgit/grub.git/patch/?id=7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763
-
-From 7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763 Mon Sep 17 00:00:00 2001
-From: Javier Martinez Canillas <javierm@redhat.com>
-Date: Fri, 11 Jun 2021 21:36:16 +0200
-Subject: fs/ext2: Ignore checksum seed incompat feature
-
-This incompat feature is used to denote that the filesystem stored its
-metadata checksum seed in the superblock. This is used to allow tune2fs
-changing the UUID on a mounted metdata_csum filesystem without having
-to rewrite all the disk metadata. However, the GRUB doesn't use the
-metadata checksum at all. So, it can just ignore this feature if it
-is enabled. This is consistent with the GRUB filesystem code in general
-which just does a best effort to access the filesystem's data.
-
-The checksum seed incompat feature has to be removed from the ignore
-list if the support for metadata checksum verification is added to the
-GRUB ext2 driver later.
-
-Suggested-by: Eric Sandeen <esandeen@redhat.com>
-Suggested-by: Lukas Czerner <lczerner@redhat.com>
-Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
-Reviewed-by: Lukas Czerner <lczerner@redhat.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
----
- grub-core/fs/ext2.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c
-index e7dd78e..4953a15 100644
---- a/grub-core/fs/ext2.c
-+++ b/grub-core/fs/ext2.c
-@@ -103,6 +103,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
- #define EXT4_FEATURE_INCOMPAT_64BIT 0x0080
- #define EXT4_FEATURE_INCOMPAT_MMP 0x0100
- #define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200
-+#define EXT4_FEATURE_INCOMPAT_CSUM_SEED 0x2000
- #define EXT4_FEATURE_INCOMPAT_ENCRYPT 0x10000
-
- /* The set of back-incompatible features this driver DOES support. Add (OR)
-@@ -123,10 +124,15 @@ GRUB_MOD_LICENSE ("GPLv3+");
- * mmp: Not really back-incompatible - was added as such to
- * avoid multiple read-write mounts. Safe to ignore for this
- * RO driver.
-+ * checksum seed: Not really back-incompatible - was added to allow tools
-+ * such as tune2fs to change the UUID on a mounted metadata
-+ * checksummed filesystem. Safe to ignore for now since the
-+ * driver doesn't support checksum verification. However, it
-+ * has to be removed from this list if the support is added later.
- */
- #define EXT2_DRIVER_IGNORED_INCOMPAT ( EXT3_FEATURE_INCOMPAT_RECOVER \
-- | EXT4_FEATURE_INCOMPAT_MMP)
--
-+ | EXT4_FEATURE_INCOMPAT_MMP \
-+ | EXT4_FEATURE_INCOMPAT_CSUM_SEED)
-
- #define EXT3_JOURNAL_MAGIC_NUMBER 0xc03b3998U
-
---
-cgit v1.1
-
diff --git a/sys-boot/grub/files/grub-2.06-gentpl.py-Remove-.interp-section-from-.img-files.patch b/sys-boot/grub/files/grub-2.06-gentpl.py-Remove-.interp-section-from-.img-files.patch
deleted file mode 100644
index 8d543d4ea9b9..000000000000
--- a/sys-boot/grub/files/grub-2.06-gentpl.py-Remove-.interp-section-from-.img-files.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 28ad1f9b95799afc94fa178ec935e297da94cced Mon Sep 17 00:00:00 2001
-From: Nicholas Vinson <nvinson234@gmail.com>
-Date: Fri, 13 Jan 2023 02:56:35 -0500
-Subject: [PATCH] gentpl.py: Remove .interp section from .img files.
-
-Whn building .img files, a .interp section from the .image files will
-sometimes be copied into the .img file. This additional section pushes
-the .img file beyond the 512-byte limit and causes grub-install to fail
-to run for i386-pc platforms.
-
-Signed-off-by: Nicholas Vinson <nvinson234@gmail.com>
----
- gentpl.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gentpl.py b/gentpl.py
-index c86550d4f..823a8b5f8 100644
---- a/gentpl.py
-+++ b/gentpl.py
-@@ -766,7 +766,7 @@ def image(defn, platform):
- if test x$(TARGET_APPLE_LINKER) = x1; then \
- $(MACHO2IMG) $< $@; \
- else \
-- $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; \
-+ $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx -R .interp $< $@; \
- fi
- """)
-
---
-2.39.0
-
diff --git a/sys-boot/grub/files/grub-2.06-grub-mkconfig-restore-umask.patch b/sys-boot/grub/files/grub-2.06-grub-mkconfig-restore-umask.patch
deleted file mode 100644
index e2a6414ef05b..000000000000
--- a/sys-boot/grub/files/grub-2.06-grub-mkconfig-restore-umask.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0adec29674561034771c13e446069b41ef41e4d4 Mon Sep 17 00:00:00 2001
-From: Michael Chang <mchang@suse.com>
-Date: Fri, 3 Dec 2021 16:13:28 +0800
-Subject: grub-mkconfig: Restore umask for the grub.cfg
-
-The commit ab2e53c8a (grub-mkconfig: Honor a symlink when generating
-configuration by grub-mkconfig) has inadvertently discarded umask for
-creating grub.cfg in the process of running grub-mkconfig. The resulting
-wrong permission (0644) would allow unprivileged users to read GRUB
-configuration file content. This presents a low confidentiality risk
-as grub.cfg may contain non-secured plain-text passwords.
-
-This patch restores the missing umask and sets the creation file mode
-to 0600 preventing unprivileged access.
-
-Fixes: CVE-2021-3981
-
-Signed-off-by: Michael Chang <mchang@suse.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
----
- util/grub-mkconfig.in | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index c3ea761..62335d0 100644
---- a/util/grub-mkconfig.in
-+++ b/util/grub-mkconfig.in
-@@ -301,7 +301,10 @@ and /etc/grub.d/* files or please file a bug report with
- exit 1
- else
- # none of the children aborted with error, install the new grub.cfg
-+ oldumask=$(umask)
-+ umask 077
- cat ${grub_cfg}.new > ${grub_cfg}
-+ umask $oldumask
- rm -f ${grub_cfg}.new
- fi
- fi
---
-cgit v1.1
-
diff --git a/sys-boot/grub/files/grub-2.06-locale.patch b/sys-boot/grub/files/grub-2.06-locale.patch
deleted file mode 100644
index 14706cbca3a2..000000000000
--- a/sys-boot/grub/files/grub-2.06-locale.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 5983c2c6adf1c1bbb3ecd751253d1e898bdfd8a3 Mon Sep 17 00:00:00 2001
-From: Michael Chang <mchang@suse.com>
-Date: Tue, 26 Oct 2021 15:11:00 +0800
-Subject: templates: Filter out POSIX locale for translation
-
-The POSIX locale is default or native operating system's locale
-identical to the C locale, so no translation to human speaking languages
-are provided. For this reason we should filter out LANG=POSIX as well as
-LANG=C upon generating grub.cfg to avoid looking up for it's gettext's
-message catalogs that will consequently result in an unpleasant message:
-
- error: file `/boot/grub/locale/POSIX.gmo' not found
-
-Signed-off-by: Michael Chang <mchang@suse.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
----
- util/grub.d/00_header.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 93a9023..f74c2a4 100644
---- a/util/grub.d/00_header.in
-+++ b/util/grub.d/00_header.in
-@@ -191,7 +191,7 @@ EOF
- EOF
-
- # Gettext variables and module
--if [ "x${LANG}" != "xC" ] && [ "x${LANG}" != "x" ]; then
-+if [ "x${LANG}" != "xC" ] && [ "x${LANG}" != "xPOSIX" ] && [ "x${LANG}" != "x" ]; then
- cat << EOF
- set locale_dir=\$prefix/locale
- set lang=${grub_lang}
---
-cgit v1.1
-
-From f42266a8a2a4215e4ffe419b8092bdf9ced33e8e Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail@eworm.de>
-Date: Mon, 19 Sep 2022 15:31:28 +0200
-Subject: templates: Filter C.UTF-8 locale for translation
-
-In addition to C locale there is also C.UTF-8 locale now. Filter that as
-well, by using ${grub_lang}, which contains a stripped value.
-This fixes the following message and resulting boot failure:
-
- error: file `/boot/grub/locale/C.gmo' not found.
-
-Signed-off-by: Christian Hesse <mail@eworm.de>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
----
- util/grub.d/00_header.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index f74c2a4..6a316a5 100644
---- a/util/grub.d/00_header.in
-+++ b/util/grub.d/00_header.in
-@@ -191,7 +191,7 @@ EOF
- EOF
-
- # Gettext variables and module
--if [ "x${LANG}" != "xC" ] && [ "x${LANG}" != "xPOSIX" ] && [ "x${LANG}" != "x" ]; then
-+if [ "x${grub_lang}" != "xC" ] && [ "x${LANG}" != "xPOSIX" ] && [ "x${LANG}" != "x" ]; then
- cat << EOF
- set locale_dir=\$prefix/locale
- set lang=${grub_lang}
---
-cgit v1.1
-
diff --git a/sys-boot/grub/files/grub-2.06-riscv.patch b/sys-boot/grub/files/grub-2.06-riscv.patch
deleted file mode 100644
index 83c54375704b..000000000000
--- a/sys-boot/grub/files/grub-2.06-riscv.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-https://bugs.gentoo.org/905785
-
-From 049efdd72eb7baa7b2bf8884391ee7fe650da5a0 Mon Sep 17 00:00:00 2001
-From: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
-Date: Sat, 29 Jan 2022 13:36:55 +0100
-Subject: RISC-V: Adjust -march flags for binutils 2.38
-
-As of version 2.38 binutils defaults to ISA specification version
-2019-12-13. This version of the specification has has separated the
-the csr read/write (csrr*/csrw*) instructions and the fence.i from
-the I extension and put them into separate Zicsr and Zifencei
-extensions.
-
-This implies that we have to adjust the -march flag passed to the
-compiler accordingly.
-
-Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
----
- configure.ac | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 4f649ed..5c01af0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -870,11 +870,19 @@ if test x"$platform" != xemu ; then
- CFLAGS="$TARGET_CFLAGS -march=rv32imac -mabi=ilp32 -Werror"
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
- [grub_cv_target_cc_soft_float="-march=rv32imac -mabi=ilp32"], [])
-+ # ISA spec version 20191213 factored out extensions Zicsr and Zifencei
-+ CFLAGS="$TARGET_CFLAGS -march=rv32imac_zicsr_zifencei -mabi=ilp32 -Werror"
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-+ [grub_cv_target_cc_soft_float="-march=rv32imac_zicsr_zifencei -mabi=ilp32"], [])
- fi
- if test "x$target_cpu" = xriscv64; then
- CFLAGS="$TARGET_CFLAGS -march=rv64imac -mabi=lp64 -Werror"
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
- [grub_cv_target_cc_soft_float="-march=rv64imac -mabi=lp64"], [])
-+ # ISA spec version 20191213 factored out extensions Zicsr and Zifencei
-+ CFLAGS="$TARGET_CFLAGS -march=rv64imac_zicsr_zifencei -mabi=lp64 -Werror"
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-+ [grub_cv_target_cc_soft_float="-march=rv64imac_zicsr_zifencei -mabi=lp64"], [])
- fi
- if test "x$target_cpu" = xia64; then
- CFLAGS="$TARGET_CFLAGS -mno-inline-float-divide -mno-inline-sqrt -Werror"
---
-cgit v1.1
-
diff --git a/sys-boot/grub/files/grub-2.12_rc1-util-grub.d-25_bli.in-fix-shebang-on-unmerged-usr.patch b/sys-boot/grub/files/grub-2.12_rc1-util-grub.d-25_bli.in-fix-shebang-on-unmerged-usr.patch
deleted file mode 100644
index 6c5096d35e70..000000000000
--- a/sys-boot/grub/files/grub-2.12_rc1-util-grub.d-25_bli.in-fix-shebang-on-unmerged-usr.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f827aac60d760a026db642b9d5c1ecbf587cfefc Mon Sep 17 00:00:00 2001
-From: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
-Date: Mon, 10 Jul 2023 23:55:43 -0500
-Subject: [PATCH] util/grub.d/25_bli.in: fix shebang on unmerged-usr
-
-On an unmerged-usr system, grub-mkconfig errors out with the following
-error due to /usr/bin/sh not existing:
-
-/usr/sbin/grub-mkconfig: /etc/grub.d/25_bli: /usr/bin/sh: bad interpreter: No such file or directory
-
-Use a /bin/sh shebang to fix the error as well as match the other
-existing files.
-
-Signed-off-by: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
----
- util/grub.d/25_bli.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/util/grub.d/25_bli.in b/util/grub.d/25_bli.in
-index 6e4538716..26e27a019 100644
---- a/util/grub.d/25_bli.in
-+++ b/util/grub.d/25_bli.in
-@@ -1,4 +1,4 @@
--#!/usr/bin/sh
-+#! /bin/sh
- set -e
-
- # grub-mkconfig helper script.
---
-2.41.0
-
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/files/
@ 2024-08-04 15:07 Mike Gilbert
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert @ 2024-08-04 15:07 UTC (permalink / raw
To: gentoo-commits
commit: 81e838bcee091ab342610d59feac08954a7667e1
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 4 15:06:03 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Aug 4 15:06:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81e838bc
sys-boot/grub: update GRUB_GFXMODE description
Closes: https://bugs.gentoo.org/936596
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/files/grub.default-4 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-boot/grub/files/grub.default-4 b/sys-boot/grub/files/grub.default-4
index 35d3060137a9..74f5d10aea3b 100644
--- a/sys-boot/grub/files/grub.default-4
+++ b/sys-boot/grub/files/grub.default-4
@@ -34,9 +34,9 @@ GRUB_DISTRIBUTOR="Gentoo"
# Uncomment to disable graphical terminal (grub-pc only)
#GRUB_TERMINAL=console
-# The resolution used on graphical terminal.
-# Note that you can use only modes which your graphic card supports via VBE.
-# You can see them in real GRUB with the command `vbeinfo'.
+# Resolution used on graphical terminal.
+# The list of valid modes may be obtained using the 'vbeinfo' (PC BIOS) or
+# 'videoinfo' (EFI) command from a GRUB boot prompt.
#GRUB_GFXMODE=640x480
# Set to 'text' to force the Linux kernel to boot in normal text
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/files/
@ 2024-09-06 13:17 James Le Cuirot
0 siblings, 0 replies; 13+ messages in thread
From: James Le Cuirot @ 2024-09-06 13:17 UTC (permalink / raw
To: gentoo-commits
commit: c2aceed4f0270ec08274c5c4b0356c2acb15f40e
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 6 12:39:51 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Sep 6 13:16:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2aceed4
sys-boot/grub: Fix URL typo in sbat.csv
Closes: https://github.com/gentoo/gentoo/pull/38484
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
sys-boot/grub/files/sbat.csv | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/files/sbat.csv b/sys-boot/grub/files/sbat.csv
index 2b87b532556c..f85cd8eb0632 100644
--- a/sys-boot/grub/files/sbat.csv
+++ b/sys-boot/grub/files/sbat.csv
@@ -1,3 +1,3 @@
sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
-grub,3,Free Software Foundation,grub,%PV%,https//www.gnu.org/software/grub/
+grub,3,Free Software Foundation,grub,%PV%,https://www.gnu.org/software/grub/
grub.gentoo,1,Gentoo,grub,%PV%,https://bugs.gentoo.org/
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2024-09-06 13:17 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-04 15:07 [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/files/ Mike Gilbert
-- strict thread matches above, loose matches on Subject: below --
2024-09-06 13:17 James Le Cuirot
2024-01-20 21:22 Conrad Kostecki
2023-05-11 20:28 Conrad Kostecki
2022-09-28 19:32 Mike Gilbert
2021-09-06 3:00 Mike Frysinger
2020-02-14 11:02 Mikle Kolyada
2019-02-16 21:05 Lars Wendler
2017-08-13 11:31 David Seifert
2017-02-04 21:22 David Seifert
2016-10-05 19:35 Mike Gilbert
2016-10-05 15:48 Mike Gilbert
2015-12-18 17:01 Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox