From 4c7260011e219eb3ebf5da976ab107dbd5997829 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 16 Jun 2016 09:50:27 +0200
Subject: [PATCH] gnu: grub: Update to 2.02~beta3.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/grub.scm (grub): Update to 2.02~beta3.
[arguments]: Modify tests/grub_func_test.in in 'patch-stuff' phase.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/grub.scm | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/grub.scm b/gnu/packages/grub.scm
index 31b270c0d8..01f2a8454d 100644
--- a/gnu/packages/grub.scm
+++ b/gnu/packages/grub.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -76,20 +77,21 @@ (define unifont
 (define-public grub
   (package
     (name "grub")
-    (version "2.00")
+    (version "2.02beta3")
     (source (origin
              (method url-fetch)
-             (uri (string-append "mirror://gnu/grub/grub-"
-                                 version ".tar.xz"))
+             (uri (string-append
+                   "ftp://alpha.gnu.org/gnu/grub/grub-"
+                   "2.02~beta3"
+                   ".tar.xz"))
+             (file-name (string-append name "-" version ".tar.xz"))
              (sha256
               (base32
-               "0n64hpmsccvicagvr0c6v0kgp2yw0kgnd3jvsyd26cnwgs7c6kkq"))
-             (patches (search-patches "grub-gets-undeclared.patch"
-                                      "grub-freetype.patch"
-                                      "grub-CVE-2015-8370.patch"))))
+               "18ddwnw0vxs7zigvah0g6a5z5vvlz0p8fjglxv1h59sjbrakvv1h"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:configure-flags '("--disable-werror")
+     '(;; Two warnings: suggest braces, signed/unsigned comparison.
+       #:configure-flags '("--disable-werror")
        #:phases (modify-phases %standard-phases
                   (add-after
                    'unpack 'patch-stuff
@@ -100,6 +102,13 @@ (define-public grub
                      ;; Make the font visible.
                      (copy-file (assoc-ref inputs "unifont") "unifont.bdf.gz")
                      (system* "gunzip" "unifont.bdf.gz")
+
+                     ;; We hit an assertion failure in
+                     ;; grub-core/tests/video_checksum.c, as reported at
+                     ;; <https://lists.gnu.org/archive/html/grub-devel/2016-07/msg00026.html>.
+                     ;; Disable this test for now.
+                     (substitute* "tests/grub_func_test.in"
+                       (("set -e") "exit 77\nset -e"))
                      #t)))))
     (inputs
      `(;; ("lvm2" ,lvm2)