[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/07: gnu: grub: Update to 2.02-beta2-668-g67dba97.
From: |
Mark H. Weaver |
Subject: |
02/07: gnu: grub: Update to 2.02-beta2-668-g67dba97. |
Date: |
Thu, 24 Mar 2016 03:21:58 +0000 |
mhw pushed a commit to branch wip-loongson2f
in repository guix.
commit 1578257e9632e923d991fa47824ec475f24fc0b0
Author: Mark H Weaver <address@hidden>
Date: Sun Aug 16 00:59:11 2015 -0400
gnu: grub: Update to 2.02-beta2-668-g67dba97.
* gnu/packages/patches/grub-CVE-2015-8370.patch,
gnu/packages/patches/grub-freetype.patch,
gnu/packages/patches/grub-gets-undeclared.patch: Delete files.
* gnu-system.am (dist_patch_DATA): Remove them.
* gnu/packages/grub.scm (grub): Update to 2.02-beta2-668-g67dba97.
[source]: Change to use git-fetch. Remove patches.
[arguments]: Patch Makefile.am instead of Makefile.in in 'phase-stuff'
phase. Add 'autogen' phase.
[native-inputs]: Add python, autoconf, and automake.
---
gnu-system.am | 3 --
gnu/packages/grub.scm | 36 ++++++++++++-------
gnu/packages/patches/grub-CVE-2015-8370.patch | 45 -----------------------
gnu/packages/patches/grub-freetype.patch | 24 ------------
gnu/packages/patches/grub-gets-undeclared.patch | 42 ---------------------
5 files changed, 23 insertions(+), 127 deletions(-)
diff --git a/gnu-system.am b/gnu-system.am
index 1e7976a..c642eb2 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -506,9 +506,6 @@ dist_patch_DATA =
\
gnu/packages/patches/gobject-introspection-cc.patch \
gnu/packages/patches/gobject-introspection-girepository.patch \
gnu/packages/patches/grep-timing-sensitive-test.patch \
- gnu/packages/patches/grub-CVE-2015-8370.patch \
- gnu/packages/patches/grub-gets-undeclared.patch \
- gnu/packages/patches/grub-freetype.patch \
gnu/packages/patches/guile-1.8-cpp-4.5.patch \
gnu/packages/patches/guile-arm-fixes.patch \
gnu/packages/patches/guile-default-utf8.patch \
diff --git a/gnu/packages/grub.scm b/gnu/packages/grub.scm
index 96d284c..e9512d2 100644
--- a/gnu/packages/grub.scm
+++ b/gnu/packages/grub.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <address@hidden>
-;;; Copyright © 2015 Mark H Weaver <address@hidden>
+;;; Copyright © 2015, 2016 Mark H Weaver <address@hidden>
;;; Copyright © 2015 Leo Famulari <address@hidden>
;;;
;;; This file is part of GNU Guix.
@@ -20,12 +20,14 @@
(define-module (gnu packages grub)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module (guix packages)
#:use-module ((guix licenses) #:select (gpl3+))
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
#:use-module (gnu packages flex)
#:use-module (gnu packages bison)
+ #:use-module (gnu packages autotools)
#:use-module (gnu packages gettext)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages linux)
@@ -34,6 +36,7 @@
#:use-module (gnu packages texinfo)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages cdrom)
+ #:use-module (gnu packages python)
#:use-module (srfi srfi-1))
(define qemu-for-tests
@@ -75,17 +78,16 @@
(define-public grub
(package
(name "grub")
- (version "2.00")
+ (version "2.02-beta2-668-g67dba97")
(source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnu/grub/grub-"
- version ".tar.xz"))
- (sha256
- (base32
- "0n64hpmsccvicagvr0c6v0kgp2yw0kgnd3jvsyd26cnwgs7c6kkq"))
- (patches (list (search-patch "grub-gets-undeclared.patch")
- (search-patch "grub-freetype.patch")
- (search-patch "grub-CVE-2015-8370.patch")))))
+ (method git-fetch)
+ (uri (git-reference
+ (url "git://git.savannah.gnu.org/grub.git")
+ (commit (last (string-split version #\g)))))
+ (file-name (string-append name "-" version "-checkout"))
+ (sha256
+ (base32
+ "093gzr3m8i63fvlahih2g7493zk01d18hp9yhiby4z1m2435aiqs"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--disable-werror")
@@ -93,7 +95,7 @@
(add-after
'unpack 'patch-stuff
(lambda* (#:key inputs #:allow-other-keys)
- (substitute* "grub-core/Makefile.in"
+ (substitute* "grub-core/Makefile.am"
(("/bin/sh") (which "sh")))
;; Make the font visible.
@@ -104,7 +106,11 @@
(substitute* "tests/partmap_test.in"
(("set -e") "exit 77"))
- #t)))))
+ #t))
+ (add-after
+ 'patch-stuff 'autogen
+ (lambda _
+ (zero? (system* "bash" "autogen.sh")))))))
(inputs
`(;; ("lvm2" ,lvm2)
("gettext" ,gnu-gettext)
@@ -119,6 +125,10 @@
("texinfo" ,texinfo)
("help2man" ,help2man)
+ ("python" ,python-2)
+ ("autoconf" ,autoconf)
+ ("automake" ,automake)
+
;; Dependencies for the test suite. The "real" QEMU is needed here,
;; because several targets are used.
("qemu" ,qemu-for-tests)
diff --git a/gnu/packages/patches/grub-CVE-2015-8370.patch
b/gnu/packages/patches/grub-CVE-2015-8370.patch
deleted file mode 100644
index 5701b54..0000000
--- a/gnu/packages/patches/grub-CVE-2015-8370.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 88c9657960a6c5d3673a25c266781e876c181add Mon Sep 17 00:00:00 2001
-From: Hector Marco-Gisbert <address@hidden>
-Date: Fri, 13 Nov 2015 16:21:09 +0100
-Subject: [PATCH] Fix security issue when reading username and password
-
- This patch fixes two integer underflows at:
- * grub-core/lib/crypto.c
- * grub-core/normal/auth.c
-
-Signed-off-by: Hector Marco-Gisbert <address@hidden>
-Signed-off-by: Ismael Ripoll-Ripoll <address@hidden>
----
- grub-core/lib/crypto.c | 2 +-
- grub-core/normal/auth.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c
-index 010e550..524a3d8 100644
---- a/grub-core/lib/crypto.c
-+++ b/grub-core/lib/crypto.c
-@@ -468,7 +468,7 @@ grub_password_get (char buf[], unsigned buf_size)
- break;
- }
-
-- if (key == '\b')
-+ if (key == '\b' && cur_len)
- {
- cur_len--;
- continue;
-diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c
-index c6bd96e..5782ec5 100644
---- a/grub-core/normal/auth.c
-+++ b/grub-core/normal/auth.c
-@@ -172,7 +172,7 @@ grub_username_get (char buf[], unsigned buf_size)
- break;
- }
-
-- if (key == '\b')
-+ if (key == '\b' && cur_len)
- {
- cur_len--;
- grub_printf ("\b");
---
-1.9.1
-
diff --git a/gnu/packages/patches/grub-freetype.patch
b/gnu/packages/patches/grub-freetype.patch
deleted file mode 100644
index 286830c..0000000
--- a/gnu/packages/patches/grub-freetype.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit fd0df6d098b1e6a4f60275c48a3ec88d15ba1fbb
-Author: Colin Watson <address@hidden>
-Date: Fri Nov 29 12:19:36 2013 +0000
-
- Fix build with FreeType 2.5.1
-
- * util/grub-gen-asciih.c: Include FT_SYNTHESIS_H rather than
- <freetype/ftsynth.h>, fixing build with FreeType 2.5.1.
- * util/grub-gen-widthspec.c: Likewise.
- * util/grub-mkfont.c: Likewise.
-
-diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
-index 0d8eb78..242dd01 100644
---- a/util/grub-mkfont.c
-+++ b/util/grub-mkfont.c
-@@ -43,7 +43,7 @@
- #include FT_FREETYPE_H
- #include FT_TRUETYPE_TAGS_H
- #include FT_TRUETYPE_TABLES_H
--#include <freetype/ftsynth.h>
-+#include FT_SYNTHESIS_H
-
- #undef __FTERRORS_H__
- #define FT_ERROR_START_LIST const char *ft_errmsgs[] = {
diff --git a/gnu/packages/patches/grub-gets-undeclared.patch
b/gnu/packages/patches/grub-gets-undeclared.patch
deleted file mode 100644
index 41dddbd..0000000
--- a/gnu/packages/patches/grub-gets-undeclared.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-This patch is needed to allow builds with newer versions of
-the GNU libc (2.16+).
-
-
-commit 66712c23388e93e5c518ebc8515140fa0c807348
-Author: Eric Blake <address@hidden>
-Date: Thu Mar 29 13:30:41 2012 -0600
-
- stdio: don't assume gets any more
-
- Gnulib intentionally does not have a gets module, and now that C11
- and glibc have dropped it, we should be more proactive about warning
- any user on a platform that still has a declaration of this dangerous
- interface.
-
- * m4/stdio_h.m4 (gl_STDIO_H, gl_STDIO_H_DEFAULTS): Drop gets
- support.
- * modules/stdio (Makefile.am): Likewise.
- * lib/stdio-read.c (gets): Likewise.
- * tests/test-stdio-c++.cc: Likewise.
- * m4/warn-on-use.m4 (gl_WARN_ON_USE_PREPARE): Fix comment.
- * lib/stdio.in.h (gets): Make warning occur in more places.
- * doc/posix-functions/gets.texi (gets): Update documentation.
- Reported by Christer Solskogen.
-
- Signed-off-by: Eric Blake <address@hidden>
-
---- grub-2.00/grub-core/gnulib/stdio.in.h 2013-02-10 16:17:09.000000000
+0100
-+++ grub-2.00/grub-core/gnulib/stdio.in.h 2013-02-10 16:17:11.000000000
+0100
-@@ -137,12 +137,6 @@ _GL_WARN_ON_USE (fflush, "fflush is not
- "use gnulib module fflush for portable POSIX compliance");
- #endif
-
--/* It is very rare that the developer ever has full control of stdin,
-- so any use of gets warrants an unconditional warning. Assume it is
-- always declared, since it is required by C89. */
--#undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
--
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
- # if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- branch wip-loongson2f created (now d2f7a90), Mark H. Weaver, 2016/03/23
- 04/07: NON_INTEL_ONLY: services: xorg: Remove xf86-video-intel., Mark H. Weaver, 2016/03/23
- 05/07: TEMPORARY_HACK: gnu: gst-plugins-base: Disable tests on MIPS and ARM., Mark H. Weaver, 2016/03/23
- 03/07: gnu: grub: Add support for Loongson-based machines., Mark H. Weaver, 2016/03/23
- 06/07: TEMPORARY_HACK: Disable tests in python-urwid., Mark H. Weaver, 2016/03/23
- 02/07: gnu: grub: Update to 2.02-beta2-668-g67dba97.,
Mark H. Weaver <=
- 07/07: TEMPORARY HACK: Remove polkit and upower inputs from xfce4-session., Mark H. Weaver, 2016/03/23
- 01/07: gnu: Add linux-libre-loongson2f., Mark H. Weaver, 2016/03/23