From 6125eacedce7cd1bd0fb334ccaa08129ccc90b47 Mon Sep 17 00:00:00 2001
From: Chunmei Xu <xuchunmei@linux.alibaba.com>
Date: Mon, 17 Oct 2022 15:25:19 +0800
Subject: [PATCH] fix bls config update failed because of grub-rpm-sort

Signed-off-by: Chunmei Xu <xuchunmei@linux.alibaba.com>
---
 ...prereqs-for-declaration-of-strchrnul.patch | 36 +++++++++++++++++++
 grub.patches                                  |  1 +
 grub2.spec                                    |  5 ++-
 3 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 0213-rpm-sort-add-prereqs-for-declaration-of-strchrnul.patch

diff --git a/0213-rpm-sort-add-prereqs-for-declaration-of-strchrnul.patch b/0213-rpm-sort-add-prereqs-for-declaration-of-strchrnul.patch
new file mode 100644
index 0000000..d2458d0
--- /dev/null
+++ b/0213-rpm-sort-add-prereqs-for-declaration-of-strchrnul.patch
@@ -0,0 +1,36 @@
+From 0000000000000000000000000000000000000000 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()
+
+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 8345944105..71d038bb69 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)
diff --git a/grub.patches b/grub.patches
index 0ffa64a..21f7fab 100644
--- a/grub.patches
+++ b/grub.patches
@@ -210,5 +210,6 @@ Patch0209: 0209-Update-gnulib-version-and-drop-most-gnulib-patches.patch
 Patch0210: 0210-commands-search-Fix-bug-stopping-iteration-when-no-f.patch
 Patch0211: 0211-search-new-efidisk-only-option-on-EFI-systems.patch
 Patch0212: 0212-efi-new-connectefi-command.patch
+patch0213: 0213-rpm-sort-add-prereqs-for-declaration-of-strchrnul.patch
 
 Patch1000: 1000-change-to-use-fuse3.patch
diff --git a/grub2.spec b/grub2.spec
index b48169c..daa1b5b 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -1,4 +1,4 @@
-%define anolis_release 5
+%define anolis_release 6
 %global _lto_cflags %{nil}
 
 %undefine _hardened_build
@@ -511,6 +511,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %endif
 
 %changelog
+* Mon Oct 17 2022 Chunmei Xu <xuchunmei@linux.alibaba.com> - 2.06-6
+- fix bls config update failed because of grub-rpm-sort
+
 * Fri Sep 30 2022 mgb01105731 <mgb01105731@alibaba-inc.com> - 2.06-5
 - add doc package
 
-- 
Gitee