Switching to git master to fix multiple new vulnerabilities:
[SECURITY PATCH 000/117] Multiple GRUB2 vulnerabilities - 2021/03/02 round https://www.mail-archive.com/grub-devel@gnu.org/msg31641.html
This commit is contained in:
parent
74c4729474
commit
1a7eab23c1
@ -1,36 +0,0 @@
|
||||
From ee855b15ff185bad3b0495500ab234b9cab7436c Mon Sep 17 00:00:00 2001
|
||||
From: Martin Whitaker <fsf@martin-whitaker.me.uk>
|
||||
Date: Mon, 24 Feb 2020 22:11:29 +0000
|
||||
Subject: [PATCH] grub-install: fix inverted test for NLS enabled when copying
|
||||
locales.
|
||||
|
||||
Commit 3d8439da8c9a4acf9bc1c41b364ec6e1680ef052 attempted to avoid
|
||||
copying locale files to the target directory when NLS was disabled.
|
||||
However the test is inverted, and it does the opposite.
|
||||
|
||||
Signed-off-by: Martin Whitaker <fsf@martin-whitaker.me.uk>
|
||||
|
||||
diff --git a/util/grub-install-common.c b/util/grub-install-common.c
|
||||
index ca0ac612a..f53bf0694 100644
|
||||
--- a/util/grub-install-common.c
|
||||
+++ b/util/grub-install-common.c
|
||||
@@ -598,7 +598,7 @@ copy_all (const char *srcd,
|
||||
grub_util_fd_closedir (d);
|
||||
}
|
||||
|
||||
-#if !(defined (GRUB_UTIL) && defined(ENABLE_NLS) && ENABLE_NLS)
|
||||
+#if (defined (GRUB_UTIL) && defined(ENABLE_NLS) && ENABLE_NLS)
|
||||
static const char *
|
||||
get_localedir (void)
|
||||
{
|
||||
@@ -659,7 +659,7 @@ static void
|
||||
grub_install_copy_nls(const char *src __attribute__ ((unused)),
|
||||
const char *dst __attribute__ ((unused)))
|
||||
{
|
||||
-#if !(defined (GRUB_UTIL) && defined(ENABLE_NLS) && ENABLE_NLS)
|
||||
+#if (defined (GRUB_UTIL) && defined(ENABLE_NLS) && ENABLE_NLS)
|
||||
char *dst_locale;
|
||||
|
||||
dst_locale = grub_util_path_concat (2, dst, "locale");
|
||||
--
|
||||
2.21.1
|
5936
0006-BootHole.patch
5936
0006-BootHole.patch
File diff suppressed because it is too large
Load Diff
22
PKGBUILD
22
PKGBUILD
@ -22,9 +22,10 @@ _UNIFONT_VER="13.0.06"
|
||||
pkgname='grub'
|
||||
pkgdesc='GNU GRand Unified Bootloader (2)'
|
||||
epoch=2
|
||||
_pkgver=2.04
|
||||
_commit='8fcfd1e0fc72d58766ce3dc09cf883c032f063f6'
|
||||
_pkgver=2.04.r340.g8fcfd1e0f
|
||||
pkgver=${_pkgver/-/}
|
||||
pkgrel=10
|
||||
pkgrel=1
|
||||
url='https://www.gnu.org/software/grub/'
|
||||
arch=('x86_64')
|
||||
license=('GPL3')
|
||||
@ -58,14 +59,12 @@ validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209' # Vladimir 'phcoder' S
|
||||
'BE5C23209ACDDACEB20DB0A28C8189F1988C2166' # Daniel Kiper <dkiper@net-space.pl>
|
||||
'95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy <unifoundry@unifoundry.com>
|
||||
|
||||
source=("git+https://git.savannah.gnu.org/git/grub.git#tag=grub-${_pkgver}?signed"
|
||||
source=("git+https://git.savannah.gnu.org/git/grub.git#commit=${_commit}"
|
||||
"git+https://git.savannah.gnu.org/git/grub-extras.git#commit=${_GRUB_EXTRAS_COMMIT}"
|
||||
"git+https://git.savannah.gnu.org/git/gnulib.git#commit=${_GNULIB_COMMIT}"
|
||||
"https://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz"{,.sig}
|
||||
'0003-10_linux-detect-archlinux-initramfs.patch'
|
||||
'0004-add-GRUB_COLOR_variables.patch'
|
||||
'0005-grub-install-fix-inverted-test-for-NLS-enabled-when-.patch'
|
||||
'0006-BootHole.patch'
|
||||
'grub.default')
|
||||
|
||||
sha256sums=('SKIP'
|
||||
@ -75,16 +74,9 @@ sha256sums=('SKIP'
|
||||
'SKIP'
|
||||
'171415ab075d1ac806f36c454feeb060f870416f24279b70104bba94bd6076d4'
|
||||
'a5198267ceb04dceb6d2ea7800281a42b3f91fd02da55d2cc9ea20d47273ca29'
|
||||
'06820004912a3db195a76e68b376fce1ba6507ac740129f0b99257ef07aba1ea'
|
||||
'55c559b6d8c4a832a43cc35c7635de37402ec9e3e3bfd8b2b7761a06f0bfda02'
|
||||
'791fadf182edf8d5bee4b45c008b08adce9689a9624971136527891a8f67d206')
|
||||
|
||||
_backports=(
|
||||
# grub-mkconfig: Use portable "command -v" to detect installed programs
|
||||
'28a7e597de0d5584f65e36f9588ff9041936e617'
|
||||
|
||||
# build: Fix GRUB i386-pc build with Ubuntu gcc
|
||||
'6643507ce30f775008e093580f0c9499dfb2c485'
|
||||
)
|
||||
|
||||
_configure_options=(
|
||||
@ -127,12 +119,6 @@ prepare() {
|
||||
## Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html
|
||||
patch -Np1 -i "${srcdir}/0004-add-GRUB_COLOR_variables.patch"
|
||||
|
||||
echo "Patch to NLS installation..."
|
||||
patch -Np1 -i "${srcdir}/0005-grub-install-fix-inverted-test-for-NLS-enabled-when-.patch"
|
||||
|
||||
echo "Patch BootHole..."
|
||||
patch -Np1 -i "${srcdir}/0006-BootHole.patch"
|
||||
|
||||
echo "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme..."
|
||||
sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user