From 9f500961fec7d0fcefa03dd4fa55efad40568696 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 05 2016 08:46:43 +0000 Subject: import grub2-2.02-0.34.el7_2 --- diff --git a/.gitignore b/.gitignore index 618dc68..0342d81 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ SOURCES/grub-2.02~beta2.tar.xz SOURCES/theme.tar.bz2 SOURCES/unifont-5.1.20080820.pcf.gz -SOURCES/centos.cer diff --git a/.grub2.metadata b/.grub2.metadata index a5c2c6a..261f908 100644 --- a/.grub2.metadata +++ b/.grub2.metadata @@ -1,4 +1,3 @@ 1bf580f1e8bce4909a7ac7ca485cee02b00ed383 SOURCES/grub-2.02~beta2.tar.xz cf0b7763c528902da7e8b05cfa248f20c8825ce5 SOURCES/theme.tar.bz2 87f8600ba24e521b5d20bdf6c4b71af8ae861e3a SOURCES/unifont-5.1.20080820.pcf.gz -6e9105eb51e55a46761838f289a917611cad8091 SOURCES/centos.cer diff --git a/SOURCES/0001-centos-grub2-password-fix.patch b/SOURCES/0001-centos-grub2-password-fix.patch deleted file mode 100644 index ac0966b..0000000 --- a/SOURCES/0001-centos-grub2-password-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b6370991cc254737d07d04d2dca4fef1215e2536 Mon Sep 17 00:00:00 2001 -From: Johnny Hughes -Date: Tue, 15 Dec 2015 12:26:48 -0600 -Subject: [PATCH] centos grub2-password fix - ---- - util/grub-setpassword.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in -index dd76f00..a322dfb 100755 ---- a/util/grub-setpassword.in -+++ b/util/grub-setpassword.in -@@ -1,7 +1,7 @@ - #!/bin/sh -e - - if [ -d /sys/firmware/efi/efivars/ ]; then -- grubdir=`echo "/@bootdirname@/efi/EFI/redhat/" | sed 's,//*,/,g'` -+ grubdir=`echo "/@bootdirname@/efi/EFI/centos/" | sed 's,//*,/,g'` - else - grubdir=`echo "/@bootdirname@/@grubdirname@" | sed 's,//*,/,g'` - fi --- -1.8.3.1 - diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec index 3a8f718..4629ee5 100644 --- a/SPECS/grub2.spec +++ b/SPECS/grub2.spec @@ -33,9 +33,6 @@ %if 0%{?fedora} %global efidir fedora %endif -%if 0%{?centos} -%global efidir centos -%endif %endif @@ -45,7 +42,7 @@ Name: grub2 Epoch: 1 Version: 2.02 -Release: 0.33%{?dist} +Release: 0.34%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base @@ -54,8 +51,8 @@ URL: http://www.gnu.org/software/grub/ Obsoletes: grub < 1:0.98 Source0: ftp://alpha.gnu.org/gnu/grub/grub-%{tarversion}.tar.xz #Source0: ftp://ftp.gnu.org/gnu/grub/grub-%%{tarversion}.tar.xz -Source1: centos.cer -#(source removed) +Source1: securebootca.cer +Source2: secureboot.cer Source4: http://unifoundry.com/unifont-5.1.20080820.pcf.gz Source5: theme.tar.bz2 Source6: gitignore @@ -248,7 +245,7 @@ Patch0184: 0184-Be-more-aggro-about-actually-using-the-configured-ne.patch Patch0185: 0185-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch Patch0186: 0186-Fix-security-issue-when-reading-username-and-passwor.patch Patch0187: 0187-01_users-Handle-GRUB_PASSWORD-better.patch -Patch9999: 0001-centos-grub2-password-fix.patch + BuildRequires: flex bison binutils python @@ -399,8 +396,8 @@ GRUB_MODULES="${GRUB_MODULES} linuxefi" mv %{grubefiname}.orig %{grubefiname} mv %{grubeficdname}.orig %{grubeficdname} %else -%pesign -s -i %{grubefiname}.orig -o %{grubefiname} -a %{SOURCE1} -c %{SOURCE1} -n redhatsecureboot301 -%pesign -s -i %{grubeficdname}.orig -o %{grubeficdname} -a %{SOURCE1} -c %{SOURCE1} -n redhatsecureboot301 +%pesign -s -i %{grubefiname}.orig -o %{grubefiname} -a %{SOURCE1} -c %{SOURCE2} -n redhatsecureboot301 +%pesign -s -i %{grubeficdname}.orig -o %{grubeficdname} -a %{SOURCE1} -c %{SOURCE2} -n redhatsecureboot301 %endif cd .. %endif @@ -704,9 +701,9 @@ fi %exclude %{_datarootdir}/grub/themes/starfield %changelog -* Tue Dec 15 2015 CentOS Sources - 2.02-0.33.el7.centos -- Roll in CentOS Secureboot keys -- Move the edidir to be CentOS, so people can co-install fedora, rhel and centos +* Tue Dec 15 2015 Peter Jones - 2.02-0.34 +- Rebuild with the right credentials. + Related: rhbz#1290089 * Thu Dec 10 2015 Peter Jones - 2.02-0.33 - Don't remove 01_users, it's the wrong thing to do.