Merge pull request #1 from neverware/bishop-15-1

Update to shim 15.1

Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 5d71540..3c9f689 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,12 +4,17 @@
     gcc \
     git \
     gnu-efi-devel \
-    make
+    make \
+    patch
 
-# Clone shim, check out version 15
-RUN git clone --branch 15 https://github.com/rhboot/shim.git /build/shim
+# Clone shim, check out tag shim-15.1
+RUN git clone --branch shim-15.1 https://github.com/rhboot/shim.git /build/shim
 WORKDIR /build/shim
 
+# Apply a patch to fix compilation
+ADD build-fix.patch .
+RUN patch -p1 -i build-fix.patch
+
 # Add our public certificate
 ADD neverware.cer .
 

build-fix.patch

diff --git a/build-fix.patch b/build-fix.patch
new file mode 100644
index 0000000..59898a5
--- /dev/null
+++ b/build-fix.patch
@@ -0,0 +1,12 @@
+diff --git a/mok.c b/mok.c
+index 2216e98..afee969 100644
+--- a/mok.c
++++ b/mok.c
+@@ -323,6 +323,7 @@ maybe_mirror_one_mok_variable(struct mok_state_variable *v, EFI_STATUS ret)
+ 				ret = efi_status;
+ 			perror(L"Could not create %s: %r\n", v->rtname,
+ 			       efi_status);
++		}
+ 	}
+ 	return ret;
+ }