grub2/0132-Do-better-in-bootstrap.conf.patch

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Mon, 29 Jul 2019 10:58:52 -0400
Subject: [PATCH] Do better in bootstrap.conf

---
 bootstrap.conf | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index 186be9c48ce..9259526e891 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -16,7 +16,13 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 
-GNULIB_REVISION=d271f868a8df9bbec29049d01e056481b7a1a263
+# GNULIB_REVISION=d271f868a8df9bbec29049d01e056481b7a1a263
+if [[ -z "${GNULIB_REVISION}" ]] ;then
+  GNULIB_REVISION=fixes
+fi
+if [[ -z "${GNULIB_URL}" ]] ;then
+  GNULIB_URL=https://github.com/rhboot/gnulib.git
+fi
 
 # gnulib modules used by this package.
 # mbswidth is used by gnulib-fix-width.diff's changes to argp rather than
Update to grub 2.04 This change updates grub to the 2.04 release. The new release changed how grub is built, so the bootstrap and bootstrap.conf files have to be added to the dist-git. Also, the gitignore file changed so it has to be updated. Since the patches have been forward ported to 2.04, there's no need for a logic to maintain a patch with the delta between the release and the grub master branch. So the release-to-master.patch is dropped and no longer is updated by the do-rebase script. Also since gnulib isn't part of the grub repository anymore and cloned by the boostrap tool, a gnulib tarball is included as other source file and copied before calling the bootstrap tool. That way grub can be built even in builders that only have access to the sources lookaside cache. Resolves: rhbz#1727279 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> 2019-08-15 06:01:31 +00:00			`From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001`
			`From: Peter Jones <pjones@redhat.com>`
			`Date: Mon, 29 Jul 2019 10:58:52 -0400`
			`Subject: [PATCH] Do better in bootstrap.conf`

			`---`
			`bootstrap.conf \| 8 +++++++-`
			`1 file changed, 7 insertions(+), 1 deletion(-)`

			`diff --git a/bootstrap.conf b/bootstrap.conf`
Update to 2.06~rc1 to fix a bunch of CVEs Resolves: CVE-2020-14372 Resolves: CVE-2020-25632 Resolves: CVE-2020-25647 Resolves: CVE-2020-27749 Resolves: CVE-2020-27779 Resolves: CVE-2021-20225 Resolves: CVE-2021-20233 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> 2021-04-06 15:48:28 +00:00			`index 186be9c48ce..9259526e891 100644`
Update to grub 2.04 This change updates grub to the 2.04 release. The new release changed how grub is built, so the bootstrap and bootstrap.conf files have to be added to the dist-git. Also, the gitignore file changed so it has to be updated. Since the patches have been forward ported to 2.04, there's no need for a logic to maintain a patch with the delta between the release and the grub master branch. So the release-to-master.patch is dropped and no longer is updated by the do-rebase script. Also since gnulib isn't part of the grub repository anymore and cloned by the boostrap tool, a gnulib tarball is included as other source file and copied before calling the bootstrap tool. That way grub can be built even in builders that only have access to the sources lookaside cache. Resolves: rhbz#1727279 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> 2019-08-15 06:01:31 +00:00			`--- a/bootstrap.conf`
			`+++ b/bootstrap.conf`
			`@@ -16,7 +16,13 @@`
			`# along with this program. If not, see <https://www.gnu.org/licenses/>.`


			`-GNULIB_REVISION=d271f868a8df9bbec29049d01e056481b7a1a263`
			`+# GNULIB_REVISION=d271f868a8df9bbec29049d01e056481b7a1a263`
			`+if [[ -z "${GNULIB_REVISION}" ]] ;then`
			`+ GNULIB_REVISION=fixes`
			`+fi`
			`+if [[ -z "${GNULIB_URL}" ]] ;then`
			`+ GNULIB_URL=https://github.com/rhboot/gnulib.git`
			`+fi`

			`# gnulib modules used by this package.`
			`# mbswidth is used by gnulib-fix-width.diff's changes to argp rather than`