From fceb7acdbaffee7bc491082a51ce13dfba591549 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Wed, 28 Nov 2012 12:18:07 -0500 Subject: [PATCH] Fix secure_mode() always returning true --- 0002-Remove-extraneous-debug-code.patch | 25 +++++++++++++++++++++++++ shim.spec | 6 +++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 0002-Remove-extraneous-debug-code.patch diff --git a/0002-Remove-extraneous-debug-code.patch b/0002-Remove-extraneous-debug-code.patch new file mode 100644 index 0000000..b36df97 --- /dev/null +++ b/0002-Remove-extraneous-debug-code.patch @@ -0,0 +1,25 @@ +From a949ce8f56363b48fa32fd4b0c6e656e95b08e06 Mon Sep 17 00:00:00 2001 +From: Fedora Ninjas +Date: Wed, 28 Nov 2012 12:14:50 -0500 +Subject: [PATCH] Remove extraneous debug code + +--- + shim.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/shim.c b/shim.c +index 88c8209..d0acd0a 100644 +--- a/shim.c ++++ b/shim.c +@@ -416,8 +416,6 @@ static BOOLEAN secure_mode (void) + UINT8 sb, setupmode; + UINT32 attributes; + +- return TRUE; +- + if (insecure_mode) + return FALSE; + +-- +1.8.0 + diff --git a/shim.spec b/shim.spec index db45e19..6446e5b 100644 --- a/shim.spec +++ b/shim.spec @@ -1,6 +1,6 @@ Name: shim Version: 0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: First-stage UEFI bootloader License: BSD @@ -23,6 +23,7 @@ Source2: http://www.codon.org.uk/~mjg59/mokutil/mokutil-%{mokutilver}.tar.bz2 Source3: dbx.esl Patch0: 0001-Fix-grub-path.patch +Patch1: 0002-Remove-extraneous-debug-code.patch BuildRequires: gnu-efi git openssl-devel openssl BuildRequires: pesign >= 0.99-9 @@ -107,6 +108,9 @@ make PREFIX=%{_prefix} LIBDIR=%{_libdir} DESTDIR=%{buildroot} install /usr/share/man/man1/mokutil.1.gz %changelog +* Wed Nov 28 2012 Matthew Garrett - 0.2-2 +- Fix secure_mode() always returning true + * Mon Nov 26 2012 Matthew Garrett - 0.2-1 - Update shim - Include mokutil