From 3a3516d36054d05c69e378e2350e6e88a19b8b5b Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Mon, 6 Feb 2023 18:54:15 +0000
Subject: [PATCH] Fix implicit function declaration warnings

Signed-off-by: Robbie Harwood <rharwood@redhat.com>
---
 ...veral-implicit-function-declarations.patch | 54 +++++++++++++++++++
 grub.patches                                  |  1 +
 grub2.spec                                    |  5 +-
 3 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 0319-core-Fix-several-implicit-function-declarations.patch

diff --git a/0319-core-Fix-several-implicit-function-declarations.patch b/0319-core-Fix-several-implicit-function-declarations.patch
new file mode 100644
index 0000000..48c5bb0
--- /dev/null
+++ b/0319-core-Fix-several-implicit-function-declarations.patch
@@ -0,0 +1,54 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Arjun Shankar <arjun@redhat.com>
+Date: Sun, 5 Feb 2023 11:13:55 +0100
+Subject: [PATCH] core: Fix several implicit function declarations
+
+These #include lines ensure that grub2 continues to build with C99
+where implicit function declarations are removed.
+
+Related to:
+
+  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
+  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
+---
+ grub-core/commands/efi/connectefi.c | 1 +
+ grub-core/net/http.c                | 1 +
+ grub-core/term/at_keyboard.c        | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/grub-core/commands/efi/connectefi.c b/grub-core/commands/efi/connectefi.c
+index 8ab75bd51b..3752ae17ed 100644
+--- a/grub-core/commands/efi/connectefi.c
++++ b/grub-core/commands/efi/connectefi.c
+@@ -21,6 +21,7 @@
+ #include <grub/efi/api.h>
+ #include <grub/efi/pci.h>
+ #include <grub/efi/efi.h>
++#include <grub/efi/disk.h>
+ #include <grub/command.h>
+ #include <grub/err.h>
+ #include <grub/i18n.h>
+diff --git a/grub-core/net/http.c b/grub-core/net/http.c
+index 57d2721719..5f956b743e 100644
+--- a/grub-core/net/http.c
++++ b/grub-core/net/http.c
+@@ -26,6 +26,7 @@
+ #include <grub/dl.h>
+ #include <grub/file.h>
+ #include <grub/i18n.h>
++#include <grub/env.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c
+index dac0f946fe..de3e4abe44 100644
+--- a/grub-core/term/at_keyboard.c
++++ b/grub-core/term/at_keyboard.c
+@@ -25,6 +25,7 @@
+ #include <grub/time.h>
+ #include <grub/loader.h>
+ #include <grub/ps2.h>
++#include <grub/env.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
diff --git a/grub.patches b/grub.patches
index b5e46f0..a0cba84 100644
--- a/grub.patches
+++ b/grub.patches
@@ -316,3 +316,4 @@ Patch0315: 0315-kern-efi-mm-Implement-runtime-addition-of-pages.patch
 Patch0316: 0316-efi-Increase-default-memory-allocation-to-32-MiB.patch
 Patch0317: 0317-mm-Try-invalidate-disk-caches-last-when-out-of-memor.patch
 Patch0318: 0318-ppc64le-signed-boot-media-changes.patch
+Patch0319: 0319-core-Fix-several-implicit-function-declarations.patch
diff --git a/grub2.spec b/grub2.spec
index 053b698..fa45fcf 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -17,7 +17,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.06
-Release:	81%{?dist}
+Release:	82%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPLv3+
 URL:		http://www.gnu.org/software/grub/
@@ -544,6 +544,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %endif
 
 %changelog
+* Mon Feb 06 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-82
+- Fix implicit function declaration warnings
+
 * Wed Feb 01 2023 Javier Martinez Canillas <javierm@redhat.com> - 2.06-81
 - 20-grub-install: Explicitly check '+debug' suffix for debug kernels
 - Resolves: #2148351