Compare commits

...

3 Commits
master ... f20

Author SHA1 Message Date
Peter Jones
5f7cfffdfb Update minilzo to 2.08 for CVE-2014-4607
Resolves: rhbz#1131793

Signed-off-by: Peter Jones <pjones@redhat.com>
2014-12-05 09:35:09 -05:00
Adam Williamson
d6f736163a Don't require password to boot normally - #840204 2014-06-23 19:07:59 -07:00
Peter Jones
c24bd092bc On UEFI, put modules in a subpackage.
Since they don't normally get used, there's no reason to normally
install them.

Signed-off-by: Peter Jones <pjones@redhat.com>
2013-10-02 16:48:57 -04:00
3 changed files with 8847 additions and 2 deletions

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,31 @@
From 620f2b6d613c1a1c176a24d338ebb112e9db0c1d Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Tue, 11 Feb 2014 11:14:50 -0500
Subject: [PATCH] Don't require a password to boot entries generated by
grub-mkconfig.
When we set a password, we just want that to mean you can't /edit/ an entry.
Resolves: rhbz#1030176
Signed-off-by: Peter Jones <pjones@redhat.com>
---
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 acf2e0e..136abd7 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -26,7 +26,7 @@ datarootdir="@datarootdir@"
export TEXTDOMAIN=@PACKAGE@
export TEXTDOMAINDIR="@localedir@"
-CLASS="--class gnu-linux --class gnu --class os"
+CLASS="--class gnu-linux --class gnu --class os --unrestricted"
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
OS="$(sed 's, release .*$,,g' /etc/system-release)"
--
1.8.5.3

View File

@ -41,7 +41,7 @@
Name: grub2
Epoch: 1
Version: 2.00
Release: 25%{?dist}
Release: 27%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more
Group: System Environment/Base
@ -538,6 +538,8 @@ Patch0481: 0481-Revert-Add-bootpath-device-to-the-list-967862.patch
Patch0482: 0482-Fix-net_bootp-cmd-crash-when-there-isn-t-network-car.patch
Patch0483: 0483-Initialize-grub_file_filters_-all-enabled.patch
Patch0484: 0484-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
Patch0485: 0485-Don-t-require-a-password-to-boot-entries-generated-b.patch
Patch0486: 0001-Update-to-minilzo-2.08.patch
BuildRequires: flex bison binutils python
BuildRequires: ncurses-devel xz-devel
@ -584,6 +586,18 @@ The GRand Unified Bootloader (GRUB) is a highly configurable and customizable
bootloader with modular architecture. It support rich varietyof kernel formats,
file systems, computer architectures and hardware devices. This subpackage
provides support for EFI systems.
%package efi-modules
Summary: Modules used to build custom grub.efi images
Group: System Environment/Base
Requires: %{name}-tools = %{epoch}:%{version}-%{release}
Obsoletes: grub2-efi <= 1:2.00-20%{?dist}
%description efi-modules
The GRand Unified Bootloader (GRUB) is a highly configurable and customizable
bootloader with modular architecture. It support rich varietyof kernel formats,
file systems, computer architectures and hardware devices. This subpackage
provides support for rebuilding your own grub.efi on EFI systems.
%endif
%package tools
@ -856,12 +870,15 @@ fi
%ifarch %{efiarchs}
%files efi
%defattr(-,root,root,-)
%{_libdir}/grub/%{grubefiarch}
%config(noreplace) %{_sysconfdir}/%{name}-efi.cfg
%attr(0755,root,root)/boot/efi/EFI/%{efidir}
%attr(0755,root,root)/boot/efi/EFI/%{efidir}/fonts
%ghost %config(noreplace) /boot/efi/EFI/%{efidir}/grub.cfg
%doc grub-%{tarversion}/COPYING
%files efi-modules
%defattr(-,root,root,-)
%{_libdir}/grub/%{grubefiarch}
%endif
%files tools -f grub.lang
@ -925,6 +942,13 @@ fi
%{_datarootdir}/grub/themes/
%changelog
* Fri Dec 05 2014 Peter Jones <pjones@redhat.com> - 2.00-27
- Update minilzo to 2.08 for CVE-2014-4607
Resolves: rhbz#1131793
* Mon Jun 23 2014 Adam Williamson <awilliam@redhat.com> - 2.00-26
- Don't require password to boot normally - #840204
* Sat Aug 10 2013 Peter Jones <pjones@redhat.com> - 2.00-25
- Last build failed because of a hardware error on the builder.