diff --git a/disable-some-unsupported-filesystems.patch b/disable-some-unsupported-filesystems.patch new file mode 100644 index 0000000..5cf489a --- /dev/null +++ b/disable-some-unsupported-filesystems.patch @@ -0,0 +1,53 @@ +From 5d3654738c78291a2252eec2fdee9cd4b6c9c2f4 Mon Sep 17 00:00:00 2001 +From: Qiumiao Zhang +Date: Thu, 2 Feb 2023 14:37:52 +0800 +Subject: [PATCH] disable some unsupported filesystems + +Signed-off-by: Qiumiao Zhang +--- + Makefile.util.def | 17 ----------------- + 1 file changed, 17 deletions(-) + +diff --git a/Makefile.util.def b/Makefile.util.def +index b7a6311..de156f9 100644 +--- a/Makefile.util.def ++++ b/Makefile.util.def +@@ -95,9 +95,6 @@ library = { + common = grub-core/video/colors.c; + common = grub-core/unidata.c; + common = grub-core/io/bufio.c; +- common = grub-core/fs/affs.c; +- common = grub-core/fs/afs.c; +- common = grub-core/fs/bfs.c; + common = grub-core/fs/btrfs.c; + common = grub-core/fs/cbfs.c; + common = grub-core/fs/cpio.c; +@@ -113,25 +110,11 @@ library = { + common = grub-core/fs/hfsplus.c; + common = grub-core/fs/hfspluscomp.c; + common = grub-core/fs/iso9660.c; +- common = grub-core/fs/jfs.c; +- common = grub-core/fs/minix.c; +- common = grub-core/fs/minix2.c; +- common = grub-core/fs/minix3.c; +- common = grub-core/fs/minix_be.c; +- common = grub-core/fs/minix2_be.c; +- common = grub-core/fs/minix3_be.c; +- common = grub-core/fs/nilfs2.c; + common = grub-core/fs/ntfs.c; + common = grub-core/fs/ntfscomp.c; +- common = grub-core/fs/reiserfs.c; +- common = grub-core/fs/romfs.c; +- common = grub-core/fs/sfs.c; + common = grub-core/fs/squash4.c; + common = grub-core/fs/tar.c; + common = grub-core/fs/udf.c; +- common = grub-core/fs/ufs2.c; +- common = grub-core/fs/ufs.c; +- common = grub-core/fs/ufs_be.c; + common = grub-core/fs/xfs.c; + common = grub-core/fs/zfs/zfscrypt.c; + common = grub-core/fs/zfs/zfs.c; +-- +2.27.0 + diff --git a/grub.macros b/grub.macros index 1de44b3..f7a1b9b 100644 --- a/grub.macros +++ b/grub.macros @@ -627,6 +627,9 @@ touch ${RPM_BUILD_ROOT}/boot/%{name}/grub.cfg \ %exclude %{_libdir}/grub/%{2}/*.module \ %exclude %{_libdir}/grub/%{2}/{boot,boot_hybrid,cdboot,diskboot,lzma_decompress,pxeboot}.image \ %exclude %{_libdir}/grub/%{2}/*.o \ +%exclude %{_libdir}/grub/%{2}/{affs,afs,bfs,jfs,nilfs2,reiserfs,romfs,sfs}.mod \ +%exclude %{_libdir}/grub/%{2}/minix*.mod \ +%exclude %{_libdir}/grub/%{2}/ufs*.mod \ %else \ %%exclude %%{_libdir}/grub/%%{grublegacyarch}/* \ %endif} \ @@ -653,6 +656,9 @@ touch ${RPM_BUILD_ROOT}/boot/%{name}/grub.cfg \ %dir %{_libdir}/grub/%{6}/ \ %{_libdir}/grub/%{6}/* \ %exclude %{_libdir}/grub/%{6}/*.module \ +%exclude %{_libdir}/grub/%{6}/{affs,afs,bfs,jfs,nilfs2,reiserfs,romfs,sfs}.mod \ +%exclude %{_libdir}/grub/%{6}/minix*.mod \ +%exclude %{_libdir}/grub/%{6}/ufs*.mod \ %endif} \ \ %{expand:%%files %{1}-cdboot} \ diff --git a/grub.patches b/grub.patches index 4603e76..4525648 100644 --- a/grub.patches +++ b/grub.patches @@ -289,3 +289,4 @@ Patch0289: backport-normal-charset-Fix-an-integer-overflow-in-grub_unico.patch %ifarch loongarch64 Patch0290: port-Add-LoongArch-support.patch %endif +Patch0291: disable-some-unsupported-filesystems.patch diff --git a/grub2.spec b/grub2.spec index d968ab5..d78c10e 100644 --- a/grub2.spec +++ b/grub2.spec @@ -14,7 +14,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 18 +Release: 19 Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -439,6 +439,12 @@ fi %{_datadir}/man/man* %changelog +* Thu Feb 2 2023 zhangqiumiao - 1:2.06-19 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:disable some unsupported filesystems + * Tue Jan 10 2023 mengyingkun - 1:2.06-18 - Type:bugfix - CVE:NA