From 1ad61d61d622abccf3f4b669917578d9f984edc9 Mon Sep 17 00:00:00 2001
From: Qiumiao Zhang <zhangqiumiao1@huawei.com>
Date: Sat, 11 Mar 2023 16:18:53 +0800
Subject: [PATCH] Fix missing declaration of strchrnul in rpm-sort

Signed-off-by: Qiumiao Zhang <zhangqiumiao1@huawei.com>
(cherry picked from commit 2f4cce557532c26c2cc6310f0286bb7a082ba5a8)
---
 ...prereqs-for-declaration-of-strchrnul.patch | 42 +++++++++++++++++++
 grub.patches                                  |  1 +
 grub2.spec                                    |  8 +++-
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 0202-rpm-sort-add-prereqs-for-declaration-of-strchrnul.patch

diff --git a/0202-rpm-sort-add-prereqs-for-declaration-of-strchrnul.patch b/0202-rpm-sort-add-prereqs-for-declaration-of-strchrnul.patch
new file mode 100644
index 0000000..9847347
--- /dev/null
+++ b/0202-rpm-sort-add-prereqs-for-declaration-of-strchrnul.patch
@@ -0,0 +1,42 @@
+From da43f9b55b5084a1c9f72785fa29ec62e70658c2 Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Thu, 5 May 2022 18:01:05 -0400
+Subject: [PATCH] rpm-sort: add prereqs for declaration of strchrnul()
+
+Reference:https://src.fedoraproject.org/rpms/grub2/c/ea7cfdf72690c5d6e15af02a3e395a40dd24f7c7
+Conflict:NA
+
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+---
+ util/grub-rpm-sort.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/util/grub-rpm-sort.c b/util/grub-rpm-sort.c
+index 8345944..71d038b 100644
+--- a/util/grub-rpm-sort.c
++++ b/util/grub-rpm-sort.c
+@@ -1,13 +1,17 @@
++#define _GNU_SOURCE 1
++
+ #include <config.h>
++
++#include <argp.h>
++#include <assert.h>
++#include <errno.h>
+ #include <grub/types.h>
+ #include <grub/util/misc.h>
++#include <rpm/rpmlib.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+-#include <errno.h>
+-#include <assert.h>
+-#include <argp.h>
+-#include <rpm/rpmlib.h>
+ 
+ static size_t
+ read_file (const char *input, char **ret)
+-- 
+2.27.0
+
diff --git a/grub.patches b/grub.patches
index 4c6b329..8fb6903 100644
--- a/grub.patches
+++ b/grub.patches
@@ -309,3 +309,4 @@ Patch0304: loongarch-Add-EFI-frame-buffer-support.patch
 Patch0305: loongarch-Add-support-for-v4.0-interface.patch
 Patch0306: loongarch-Add-support-for-new-EFI-screen-info-GUID.patch
 %endif
+Patch0307: 0202-rpm-sort-add-prereqs-for-declaration-of-strchrnul.patch
diff --git a/grub2.spec b/grub2.spec
index 718d044..78b2087 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -14,7 +14,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.06
-Release:	24
+Release:	25
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPLv3+
 URL:		http://www.gnu.org/software/grub/
@@ -439,6 +439,12 @@ fi
 %{_datadir}/man/man*
 
 %changelog
+* Sat Mar 11 2023 zhangqiumiao <zhangqiumiao1@huawei.com> - 1:2.06-25
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:Fix missing declaration of strchrnul in rpm-sort
+
 * Fri Mar 10 2023 mengyingkun <mengyingkun@loongson.cn> - 1:2.06-24
 - Type:bugfix
 - CVE:NA
-- 
Gitee