diff options
| author | Stijn Tintel <stijn@linux-ipv6.be> | 2021-05-14 17:11:42 +0300 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2021-05-16 04:00:29 +0300 |
| commit | e74d81ece2e2932a4f370d8e6d180061a6a2c229 (patch) | |
| tree | ccc84b9b2cb54a0f5eb5db2d48bc3f1273f94000 /package/boot/grub2/Makefile | |
| parent | 844598dcbbd1dd042c1e8ed0b968ec6ce079b7f0 (diff) | |
| download | upstream-e74d81ece2e2932a4f370d8e6d180061a6a2c229.tar.gz upstream-e74d81ece2e2932a4f370d8e6d180061a6a2c229.tar.bz2 upstream-e74d81ece2e2932a4f370d8e6d180061a6a2c229.zip | |
grub2: bump to 2.06-rc1
When building GRUB with binutils 2.35.2 or later, an error occurs due to
a section .note.gnu.property that is placed at an offset such that
objcopy needs to pad the img file with zeros. This in turn causes the
following error: "error: Decompressor is too big.".
The fix accepted by upstream patches a python script that isn't executed
at all when building GRUB with OpenWrt buildroot. There's another patch
that patches the files generated by that python script directly, but by
including it we would deviate further from upstream. Instead of doing
that, simply bump to the latest release candidate.
As one of the fixes for the CVEs causes grub to crash on some x86
hardware using legacy BIOS when compiled with -O2, filter -O2 and
-O3 out of TARGET_CFLAGS.
Fixes the following CVEs:
- CVE-2020-14372
- CVE-2020-25632
- CVE-2020-25647
- CVE-2020-27749
- CVE-2020-27779
- CVE-2021-3418
- CVE-2021-20225
- CVE-2021-20233
Runtime-tested on x86/64.
Fixes: FS#3790
Suggested-by: Dirk Neukirchen <plntyk.lede@plntyk.name>
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Acked-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'package/boot/grub2/Makefile')
| -rw-r--r-- | package/boot/grub2/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/boot/grub2/Makefile b/package/boot/grub2/Makefile index 46e3597cc2..b3cb5e076f 100644 --- a/package/boot/grub2/Makefile +++ b/package/boot/grub2/Makefile @@ -10,12 +10,12 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=grub PKG_CPE_ID:=cpe:/a:gnu:grub2 -PKG_VERSION:=2.04 -PKG_RELEASE:=3 +PKG_VERSION:=2.06~rc1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=@GNU/grub -PKG_HASH:=e5292496995ad42dabe843a0192cf2a2c502e7ffcc7479398232b10a472df77d +PKG_SOURCE_URL:=https://alpha.gnu.org/gnu/grub +PKG_HASH:=2c87f1f21e2ab50043e6cd9163c08f1b6c3a6171556bf23ff9ed65b074145484 HOST_BUILD_PARALLEL:=1 PKG_BUILD_DEPENDS:=grub2/host @@ -84,7 +84,7 @@ HOST_MAKE_FLAGS += \ TARGET_RANLIB=$(TARGET_RANLIB) \ LIBLZMA=$(STAGING_DIR_HOST)/lib/liblzma.a -TARGET_CFLAGS := $(filter-out -fno-plt,$(TARGET_CFLAGS)) +TARGET_CFLAGS := $(filter-out -O2 -O3 -fno-plt,$(TARGET_CFLAGS)) define Host/Configure $(SED) 's,(RANLIB),(TARGET_RANLIB),' $(HOST_BUILD_DIR)/grub-core/Makefile.in |