memtest86+: import patches from Debian

3 files changed, 51 insertions, 2 deletions

diff --git a/libre/memtest86+/PKGBUILD b/libre/memtest86+/PKGBUILD
index 76c3bb3b7..245e611c3 100644
--- a/libre/memtest86+/PKGBUILD
+++ b/libre/memtest86+/PKGBUILD
@@ -13,20 +13,26 @@ license=('GPL2')
 makedepends_x86_64=('gcc-multilib' 'lib32-glibc')
 source=("http://www.memtest.org/download/${pkgver}/${pkgname}-${pkgver}.tar.gz"
         '60_memtest86+'
+        'doc-serialconsole.patch'
         'multiboot.patch'
         "${pkgname}-5.01-O0.patch"
-        "${pkgname}-5.01-array-size.patch")
+        "${pkgname}-5.01-array-size.patch"
+        'gcc-5.patch')
 sha1sums=('eb4b6d70114db3c9ed320785da44c0ba8349c10c'
           '2aa2deeb7d7dc56f389aa1487b7a57b0d44ce559'
+          '31dc513de83e207e8e160b9f43c67c7f6dda48f2'
           '53d3c0106644e6e085b8576e48e9981e5ccc3145'
           '83e20932625bb38137b01c0cbe1b8528629e0a76'
-          '04654951868e73b53a67ce3288f2bd1843b40870')
+          '04654951868e73b53a67ce3288f2bd1843b40870'
+          '225895ea59684a8d6a14c40d92db527dce8187c4')
 
 prepare() {
   cd ${pkgname}-${pkgver}
+  patch -p1 -i ${srcdir}/doc-serialconsole.patch
   patch -p1 -i ${srcdir}/multiboot.patch
   patch -p1 -i ${srcdir}/${pkgname}-5.01-O0.patch
   patch -p1 -i ${srcdir}/${pkgname}-5.01-array-size.patch
+  patch -p1 -i ${srcdir}/gcc-5.patch
   sed -i 's|CC[=]gcc|CC=gcc -I/usr/include|
           s|[-]fno[-]stack[-]protector|-fno-stack-protector -fno-aggressive-loop-optimizations|
           \|scp memtest[.]bin|d
diff --git a/libre/memtest86+/doc-serialconsole.patch b/libre/memtest86+/doc-serialconsole.patch
new file mode 100644
index 000000000..c124e7a38
--- /dev/null
+++ b/libre/memtest86+/doc-serialconsole.patch
@@ -0,0 +1,27 @@
+commit 03867c811369be70cd81a42d150e0a250c9d1248
+Author: Yann Dirson <dirson@debian.org>
+Date:   Tue Sep 29 23:40:15 2009 +0200
+
+    git-debimport memtest86+_4.00-1.diff.gz
+
+Index: memtest86+/README
+===================================================================
+--- memtest86+.orig/README
++++ memtest86+/README
+@@ -89,12 +89,10 @@ To create a boot-disk with this pre-buil
+ =================
+ Memtest86 can be used on PC's equipped with a serial port for the console.
+ By default serial port console support is not enabled since it slows
+-down testing.  To enable change the SERIAL_CONSOLE_DEFAULT define in
+-config.h from a zero to a one.  The serial console baud rate may also
+-be set in config.h with the SERIAL_BAUD_RATE define.  The other serial
+-port settings are no parity, 8 data bits, 1 stop bit.  All of the features
+-used by memtest86 are accessible via the serial console.  However, the
+-screen sometimes is garbled when the online commands are used.
++down testing.
++
++To activate it, add a console parameter on the memtest86+
++command-line, like: "/boot/memtest86+.bin console=ttyS0,115200n8".
+ 
+ 
+ 5) Online Commands
diff --git a/libre/memtest86+/gcc-5.patch b/libre/memtest86+/gcc-5.patch
new file mode 100644
index 000000000..a88c243d5
--- /dev/null
+++ b/libre/memtest86+/gcc-5.patch
@@ -0,0 +1,16 @@
+Description: Build with -fgnu89-inline for GCC 5.
+Author: Matthias Klose <doko@ubuntu.com>
+Bug-Debian: https://bugs.debian.org/778001
+Origin: http://launchpadlibrarian.net/199536689/memtest86%2B_4.20-1.1ubuntu8_4.20-1.1ubuntu9.diff.gz
+
+--- memtest86+-5.01.orig/Makefile
++++ memtest86+-5.01/Makefile
+@@ -13,7 +13,7 @@ AS=as -32
+ CC=gcc
+ 
+ CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
+-	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector 
++	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector -fgnu89-inline
+ 
+ # This reverts a change introduced with recent binutils (post
+ # http://sourceware.org/bugzilla/show_bug.cgi?id=10569).  Needed to