5e72956199
This reverts commit 93004a8494,
because it broke Rawhide. It also tries to fixes BLS ostree
detection to work in chroots (e.g. during installation) by also
checking for /ostree/repo.
98 lines
3.8 KiB
Diff
98 lines
3.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Robbie Harwood <rharwood@redhat.com>
|
|
Date: Wed, 5 Jan 2022 16:42:11 -0500
|
|
Subject: [PATCH] Drop gnulib no-abort.patch
|
|
|
|
Originally added in db7337a3d353a817ffe9eb4a3702120527100be9, this
|
|
patched out all relevant invocations of abort() in gnulib. While it was
|
|
not documented why at the time, testing suggests that there's no abort()
|
|
implementation available for gnulib to use.
|
|
|
|
gnulib's position is that the use of abort() is correct here, since it
|
|
happens when input violates a "shall" from POSIX. Additionally, the
|
|
code in question is probably not reachable. Since abort() is more
|
|
friendly to user-space, they prefer to make no change, so we can just
|
|
carry a define instead. (Suggested by Paul Eggert.)
|
|
|
|
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
|
|
(cherry picked from commit 5137c8eb3ec11c3217acea1a93a3f88f3fa4cbca)
|
|
---
|
|
bootstrap.conf | 2 +-
|
|
conf/Makefile.extra-dist | 1 -
|
|
config.h.in | 3 +++
|
|
grub-core/lib/gnulib-patches/no-abort.patch | 26 --------------------------
|
|
4 files changed, 4 insertions(+), 28 deletions(-)
|
|
delete mode 100644 grub-core/lib/gnulib-patches/no-abort.patch
|
|
|
|
diff --git a/bootstrap.conf b/bootstrap.conf
|
|
index 645e3a459ce..71ce943c7d4 100644
|
|
--- a/bootstrap.conf
|
|
+++ b/bootstrap.conf
|
|
@@ -81,7 +81,7 @@ cp -a INSTALL INSTALL.grub
|
|
bootstrap_post_import_hook () {
|
|
set -e
|
|
for patchname in fix-null-deref fix-null-state-deref fix-regcomp-uninit-token \
|
|
- fix-regexec-null-deref fix-uninit-structure fix-unused-value fix-width no-abort; do
|
|
+ fix-regexec-null-deref fix-uninit-structure fix-unused-value fix-width; do
|
|
patch -d grub-core/lib/gnulib -p2 \
|
|
< "grub-core/lib/gnulib-patches/$patchname.patch"
|
|
done
|
|
diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
|
|
index ca6a50deca9..16248ccf032 100644
|
|
--- a/conf/Makefile.extra-dist
|
|
+++ b/conf/Makefile.extra-dist
|
|
@@ -37,7 +37,6 @@ EXTRA_DIST += grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch
|
|
EXTRA_DIST += grub-core/lib/gnulib-patches/fix-uninit-structure.patch
|
|
EXTRA_DIST += grub-core/lib/gnulib-patches/fix-unused-value.patch
|
|
EXTRA_DIST += grub-core/lib/gnulib-patches/fix-width.patch
|
|
-EXTRA_DIST += grub-core/lib/gnulib-patches/no-abort.patch
|
|
|
|
EXTRA_DIST += grub-core/lib/libgcrypt
|
|
EXTRA_DIST += grub-core/lib/libgcrypt-grub/mpi/generic
|
|
diff --git a/config.h.in b/config.h.in
|
|
index 9c7b4afaaad..c3134309c63 100644
|
|
--- a/config.h.in
|
|
+++ b/config.h.in
|
|
@@ -68,6 +68,9 @@
|
|
|
|
# ifndef _GL_INLINE_HEADER_BEGIN
|
|
# define _GL_ATTRIBUTE_CONST __attribute__ ((const))
|
|
+
|
|
+/* We don't have an abort() for gnulib to call in regexp. */
|
|
+# define abort __builtin_unreachable
|
|
# endif /* !_GL_INLINE_HEADER_BEGIN */
|
|
|
|
#endif
|
|
diff --git a/grub-core/lib/gnulib-patches/no-abort.patch b/grub-core/lib/gnulib-patches/no-abort.patch
|
|
deleted file mode 100644
|
|
index e469c4762eb..00000000000
|
|
--- a/grub-core/lib/gnulib-patches/no-abort.patch
|
|
+++ /dev/null
|
|
@@ -1,26 +0,0 @@
|
|
-diff --git a/lib/regcomp.c b/lib/regcomp.c
|
|
-index cc85f35ac..de45ebb5c 100644
|
|
---- a/lib/regcomp.c
|
|
-+++ b/lib/regcomp.c
|
|
-@@ -528,9 +528,9 @@ regerror (int errcode, const regex_t *__restrict preg, char *__restrict errbuf,
|
|
- to this routine. If we are given anything else, or if other regex
|
|
- code generates an invalid error code, then the program has a bug.
|
|
- Dump core so we can fix it. */
|
|
-- abort ();
|
|
--
|
|
-- msg = gettext (__re_error_msgid + __re_error_msgid_idx[errcode]);
|
|
-+ msg = gettext ("unknown regexp error");
|
|
-+ else
|
|
-+ msg = gettext (__re_error_msgid + __re_error_msgid_idx[errcode]);
|
|
-
|
|
- msg_size = strlen (msg) + 1; /* Includes the null. */
|
|
-
|
|
-@@ -1136,7 +1136,7 @@ optimize_utf8 (re_dfa_t *dfa)
|
|
- }
|
|
- break;
|
|
- default:
|
|
-- abort ();
|
|
-+ break;
|
|
- }
|
|
-
|
|
- if (mb_chars || has_period)
|