summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch50
-rw-r--r--libre/grub/60_memtest86+32
2 files changed, 0 insertions, 82 deletions
diff --git a/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch b/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
deleted file mode 100644
index e043633af..000000000
--- a/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From d09689a5a2863043d007c1acb9bf0a8d1d3b776d Mon Sep 17 00:00:00 2001
-From: Colin Watson <cjwatson@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
-
diff --git a/libre/grub/60_memtest86+ b/libre/grub/60_memtest86+
deleted file mode 100644
index 086f0cc84..000000000
--- a/libre/grub/60_memtest86+
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-########################################################
-# This script generates a memtest86+ entry on grub.cfg #
-# if memtest is installed on the system. #
-########################################################
-
-prefix="/usr"
-exec_prefix="${prefix}"
-
-datarootdir="/usr/share"
-datadir="${datarootdir}"
-
-. "${datadir}/grub/grub-mkconfig_lib"
-
-MEMTEST86_IMAGE="/boot/memtest86+/memtest.bin"
-CLASS="--class memtest86 --class gnu --class tool"
-
-if [ -e "${MEMTEST86_IMAGE}" ] && is_path_readable_by_grub "${MEMTEST86_IMAGE}" ; then
- ## image exists, create menu entry
- echo "Found memtest86+ image: ${MEMTEST86_IMAGE}" >&2
- _GRUB_MEMTEST_HINTS_STRING="$(${grub_probe} --target=hints_string ${MEMTEST86_IMAGE})"
- _GRUB_MEMTEST_FS_UUID="$(${grub_probe} --target=fs_uuid ${MEMTEST86_IMAGE})"
- _GRUB_MEMTEST_REL_PATH="$(make_system_path_relative_to_its_root ${MEMTEST86_IMAGE})"
- cat << EOF
-if [ "\${grub_platform}" == "pc" ]; then
- menuentry "Memory Tester (memtest86+)" ${CLASS} {
- search --fs-uuid --no-floppy --set=root ${_GRUB_MEMTEST_HINTS_STRING} ${_GRUB_MEMTEST_FS_UUID}
- linux16 ${_GRUB_MEMTEST_REL_PATH} ${GRUB_CMDLINE_MEMTEST86}
- }
-fi
-EOF
-fi