Apply upstream commits to fix FTBFS

Signed-off-by: Peter Jones <pjones@redhat.com>

0010-Fix-a-integer-comparison-sign-issue.patch

@@ -0,0 +1,33 @@
+From 9292352eb29a4fca41909448799efc524ee3c255 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Wed, 25 Jul 2018 10:27:34 -0400
+Subject: [PATCH] Fix a integer comparison sign issue.
+
+I introduced this, and it's stupid:
+
+mokutil.c: In function 'generate_pw_hash':
+mokutil.c:1971:16: error: comparison of integer expressions of different signedness: 'unsigned int' and 'int' [-Werror=sign-compare]
+  if (salt_size > settings_len - (next - settings)) {
+                ^
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ src/mokutil.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mokutil.c b/src/mokutil.c
+index d03127abf54..068df0d109c 100644
+--- a/src/mokutil.c
++++ b/src/mokutil.c
+@@ -1938,7 +1938,7 @@ generate_pw_hash (const char *input_pw)
+ 	char *password = NULL;
+ 	char *crypt_string;
+ 	const char *prefix;
+-	int settings_len = sizeof (settings) - 2;
++	unsigned int settings_len = sizeof (settings) - 2;
+ 	unsigned int pw_len, salt_size;
+ 
+ 	if (input_pw) {
+-- 
+2.23.0
+

mokutil.spec

@@ -1,7 +1,7 @@
 Name:           mokutil
 Version:        0.3.0
 Release:        14%{?dist}
-Epoch:          1
+Epoch:          2
 Summary:        Tool to manage UEFI Secure Boot MoK Keys
 License:        GPLv3+
 URL:            https://github.com/lcp/mokutil
@@ -22,6 +22,7 @@ Patch0006: 0006-mokutil-be-explicit-about-file-modes-in-all-cases.patch
 Patch0007: 0007-Add-bash-completion-file.patch
 Patch0008: 0008-generate_hash-generate_pw_hash-don-t-use-strlen-for-.patch
 Patch0009: 0009-Avoid-taking-pointer-to-packed-struct.patch
+Patch0010: 0010-Fix-a-integer-comparison-sign-issue.patch
 
 %description
 mokutil provides a tool to manage keys for Secure Boot through the MoK
@@ -56,6 +57,9 @@ make PREFIX=%{_prefix} LIBDIR=%{_libdir} DESTDIR=%{buildroot} install
 %{_datadir}/bash-completion/completions/mokutil
 
 %changelog
+* Tue Nov 12 2019 Peter Jones <pjones@redhat.com> - 0.3.0-14
+- Pull one more upstream patch to keep this in sync with the f31 build.
+
 * Thu Oct 24 2019 Leigh Scott <leigh123linux@googlemail.com> - 1:0.3.0-14
 - Apply upstream commits to fix FTBFS