Fix build with glibc-2.36

Signed-off-by: Robbie Harwood <rharwood@redhat.com>

0002-Fix-glibc-2.36-build-mount.h-conflicts.patch

@@ -0,0 +1,56 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Thu, 28 Jul 2022 16:11:24 -0400
+Subject: [PATCH] Fix glibc 2.36 build (mount.h conflicts)
+
+glibc has decided that sys/mount.h and linux/mount.h are no longer
+usable at the same time.  This broke the build, since linux/fs.h itself
+includes linux/mount.h.  For now, fix the build by only including
+sys/mount.h where we need it.
+
+See-also: https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
+Resolves: #227
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+(cherry picked from commit bc65d63ebf8fe6ac8a099ff15ca200986dba1565)
+---
+ src/gpt.c   | 1 +
+ src/linux.c | 1 +
+ src/util.h  | 1 -
+ 3 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/gpt.c b/src/gpt.c
+index 1eda049..21413c3 100644
+--- a/src/gpt.c
++++ b/src/gpt.c
+@@ -17,6 +17,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/mount.h>
+ #include <sys/param.h>
+ #include <sys/stat.h>
+ #include <sys/utsname.h>
+diff --git a/src/linux.c b/src/linux.c
+index 47e45ae..1780816 100644
+--- a/src/linux.c
++++ b/src/linux.c
+@@ -20,6 +20,7 @@
+ #include <stdbool.h>
+ #include <stdio.h>
+ #include <sys/ioctl.h>
++#include <sys/mount.h>
+ #include <sys/socket.h>
+ #include <sys/sysmacros.h>
+ #include <sys/types.h>
+diff --git a/src/util.h b/src/util.h
+index 3300666..1e67e44 100644
+--- a/src/util.h
++++ b/src/util.h
+@@ -23,7 +23,6 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <sys/ioctl.h>
+-#include <sys/mount.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <tgmath.h>

efivar.patches

@@ -1 +1,2 @@
 Patch0001: 0001-Fix-the-march-issue-for-riscv64.patch
+Patch0002: 0002-Fix-glibc-2.36-build-mount.h-conflicts.patch

efivar.spec

@@ -1,6 +1,6 @@
 Name:           efivar
 Version:        38
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Tools to manage UEFI variables
 License:        LGPL-2.1-only
 URL:            https://github.com/rhboot/efivar
@@ -84,10 +84,13 @@ make abicheck
 %{_libdir}/*.so.*
 
 %changelog
+* Thu Jul 28 2022 Robbie Harwood <rharwood@redhat.com> - 38-5
+- Fix build with glibc-2.36
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
-* Fri Apr 08 2022 Robbie Harwood <rharwood@redhat.com> 38-3
+* Fri Apr 08 2022 Robbie Harwood <rharwood@redhat.com> - 38-3
 - Apply fix for risxv64 (wefu)
 
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 38-2