[arch-commits] Commit in grub-efi-x86_64/repos (4 files)

Mon Jun 17 10:40:53 UTC 2013

Date: Monday, June 17, 2013 @ 12:40:53
  Author: tpowa
Revision: 188649

archrelease: copy trunk to testing-any

Added:
  grub-efi-x86_64/repos/testing-any/
  grub-efi-x86_64/repos/testing-any/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
    (from rev 188648, grub-efi-x86_64/trunk/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch)
  grub-efi-x86_64/repos/testing-any/PKGBUILD
    (from rev 188648, grub-efi-x86_64/trunk/PKGBUILD)
  grub-efi-x86_64/repos/testing-any/grub-2.00-fix-docs.patch
    (from rev 188648, grub-efi-x86_64/trunk/grub-2.00-fix-docs.patch)

-----------------------------------------------------------------+
 0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch |   50 +++++
 PKGBUILD                                                        |   98 ++++++++++
 grub-2.00-fix-docs.patch                                        |   21 ++
 3 files changed, 169 insertions(+)

Copied: grub-efi-x86_64/repos/testing-any/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch (from rev 188648, grub-efi-x86_64/trunk/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch)
===================================================================

--- testing-any/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch	                        (rev 0)
+++ testing-any/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch	2013-06-17 10:40:53 UTC (rev 188649)
@@ -0,0 +1,50 @@
+From d09689a5a2863043d007c1acb9bf0a8d1d3b776d Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson at ubuntu.com>
+Date: Fri, 28 Dec 2012 06:43:35 +0000
+Subject: [PATCH 069/364] Backport gnulib fixes for C11.  Fixes Savannah bug
+ #37738.
+
+* grub-core/gnulib/stdio.in.h (gets): Warn on use only if
+HAVE_RAW_DECL_GETS.
+* m4/stdio_h.m4 (gl_STDIO_H): Check for gets.
+---
+ ChangeLog                   | 8 ++++++++
+ grub-core/gnulib/stdio.in.h | 6 ++++--
+ m4/stdio_h.m4               | 2 +-
+ 3 files changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/grub-core/gnulib/stdio.in.h b/grub-core/gnulib/stdio.in.h
+index 80b9dbf..a8b00c6 100644
+--- a/grub-core/gnulib/stdio.in.h
++++ b/grub-core/gnulib/stdio.in.h
+@@ -138,10 +138,12 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - "
+ #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.  */
++   so any use of gets warrants an unconditional warning; besides, C11
++   removed it.  */
+ #undef gets
++#if HAVE_RAW_DECL_GETS
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#endif
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
+diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4
+index f5650cd..8458bec 100644
+--- a/m4/stdio_h.m4
++++ b/m4/stdio_h.m4
+@@ -37,7 +37,7 @@ AC_DEFUN([gl_STDIO_H],
+   dnl corresponding gnulib module is not in use, and which is not
+   dnl guaranteed by C89.
+   gl_WARN_ON_USE_PREPARE([[#include <stdio.h>
+-    ]], [dprintf fpurge fseeko ftello getdelim getline popen renameat
++    ]], [dprintf fpurge fseeko ftello getdelim getline gets popen renameat
+     snprintf tmpfile vdprintf vsnprintf])
+ ])
+ 
+-- 
+1.8.1.4
+

Copied: grub-efi-x86_64/repos/testing-any/PKGBUILD (from rev 188648, grub-efi-x86_64/trunk/PKGBUILD)
===================================================================
--- testing-any/PKGBUILD	                        (rev 0)
+++ testing-any/PKGBUILD	2013-06-17 10:40:53 UTC (rev 188649)
@@ -0,0 +1,98 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+
+_grub_lua_ver=24
+
+pkgname=grub-efi-x86_64
+pkgver=2.00
+pkgrel=2
+pkgdesc="GNU GRand Unified Bootloader (2) - x86_64 UEFI Modules"
+url="https://www.gnu.org/software/grub/"
+arch=('any')
+license=('GPL3')
+makedepends=('xz' 'python' 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse')
+depends=("grub-common=${pkgver}" 'dosfstools' 'efibootmgr')
+
+options=('!strip' '!emptydirs')
+replaces=('grub2-efi-x86_64')
+provides=('grub2-efi-x86_64')
+
+source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz"
+        "ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
+        '0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch'
+        'grub-2.00-fix-docs.patch')
+md5sums=('a1043102fbc7bcedbf53e7ee3d17ab91'
+         '704ea9f250b6137f05fa0197fd07053a'
+         'ab751d1d8cd3fd47e5ee24d71ecc31ed'
+         '342dd18472a24e5fd252458b24f39a29')
+
+noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz")
+
+build() {
+
+	if [[ "${CARCH}" == 'i686' ]]; then
+		echo "This package can be built only in an x86_64 system. Exiting."
+		exit 1
+	fi
+
+	cd "${srcdir}/grub-${pkgver}"
+
+	## add grub-extras
+	export GRUB_CONTRIB="${srcdir}/grub-${pkgver}/grub-extras/" 
+	install -d "${srcdir}/grub-${pkgver}/grub-extras"
+
+	bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \
+		-C "${srcdir}/grub-${pkgver}/grub-extras"
+
+	# fix compiling with gcc48
+        patch -Np1 -i ${srcdir}/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
+
+	#fix docs compiling
+        patch -Np1 -i ${srcdir}/grub-2.00-fix-docs.patch
+
+	## start the actual build process
+	cd "${srcdir}/grub-${pkgver}/"
+	./autogen.sh
+
+	CFLAGS="" ./configure \
+		--with-platform="efi" \
+		--target="x86_64" \
+		--host="${CARCH}-unknown-linux-gnu" \
+		--disable-efiemu \
+		--enable-mm-debug \
+		--enable-nls \
+		--enable-device-mapper \
+		--enable-cache-stats \
+		--enable-grub-mkfont \
+		--enable-grub-mount \
+		--prefix="/usr" \
+		--bindir="/usr/bin" \
+		--sbindir="/usr/sbin" \
+		--mandir="/usr/share/man" \
+		--infodir="/usr/share/info" \
+		--datarootdir="/usr/share" \
+		--sysconfdir="/etc" \
+		--program-prefix="" \
+		--with-bootdir="/boot" \
+		--with-grubdir="grub" \
+		--disable-werror
+
+	CFLAGS="" make
+
+}
+
+package() {
+
+	cd "${srcdir}/grub-${pkgver}"
+	make DESTDIR="${pkgdir}/" install 
+
+	## remove non platform-specific files
+	rm -rf "${pkgdir}"/{boot,etc,usr/{share,bin,sbin}}
+
+	## remove gdb debugging related files
+	rm -f "${pkgdir}/usr/lib/grub/x86_64-efi"/*.module || true
+	rm -f "${pkgdir}/usr/lib/grub/x86_64-efi"/*.image || true
+	rm -f "${pkgdir}/usr/lib/grub/x86_64-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true
+
+}

Copied: grub-efi-x86_64/repos/testing-any/grub-2.00-fix-docs.patch (from rev 188648, grub-efi-x86_64/trunk/grub-2.00-fix-docs.patch)
===================================================================
--- testing-any/grub-2.00-fix-docs.patch	                        (rev 0)
+++ testing-any/grub-2.00-fix-docs.patch	2013-06-17 10:40:53 UTC (rev 188649)
@@ -0,0 +1,21 @@
+From 40d6b00fa48ae9c1cecf143da5c6061f6ffcb719 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com
+Date: Tue, 12 Mar 2013 15:23:02 -0400
+Subject: [PATCH] Fix docs
+
+I think the doc generation tools got stricter, so fix up the .texi file
+to work.
+
+diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
+--- a/docs/grub-dev.texi
++++ b/docs/grub-dev.texi
+@@ -1394,8 +1394,8 @@ grub_video_blit_glyph (&glyph, color, 0,
+ 
+ @node Bitmap API
+ @section Bitmap API
+- at itemize
+ @subsection grub_video_bitmap_create
++ at itemize
+ @item Prototype:
+ @example
+ grub_err_t grub_video_bitmap_create (struct grub_video_bitmap **bitmap, unsigned int width, unsigned int height, enum grub_video_blit_format blit_format)


