summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps/memtest86+/files')
-rw-r--r--sys-apps/memtest86+/files/memtest86+-1.50-hardened.patch24
-rw-r--r--sys-apps/memtest86+/files/memtest86+-1.70-hardcoded_cc.patch61
-rw-r--r--sys-apps/memtest86+/files/memtest86+-2.00-hardcoded_cc.patch29
3 files changed, 0 insertions, 114 deletions
diff --git a/sys-apps/memtest86+/files/memtest86+-1.50-hardened.patch b/sys-apps/memtest86+/files/memtest86+-1.50-hardened.patch
deleted file mode 100644
index 3501a7cfa6f6..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-1.50-hardened.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.orig 2005-01-23 10:17:43.000000000 -0500
-+++ Makefile 2005-01-23 10:18:07.000000000 -0500
-@@ -12,7 +12,7 @@
- #
- # gcc compiler options, these settings should suffice
- #
--CCFLAGS=-Wall -m32 -march=i486 -Os -fomit-frame-pointer -fno-builtin -ffreestanding
-+CCFLAGS=-Wall -m32 -march=i486 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector
-
- AS=as -32
-
-@@ -21,10 +21,10 @@
- all: memtest.bin memtest
-
- reloc.o: reloc.c
-- $(CC) -c -m32 -march=i486 -fPIC -Wall -g -O2 -fno-strict-aliasing reloc.c
-+ $(CC) -c -m32 -march=i486 -fPIC -Wall -g -O2 -fno-strict-aliasing reloc.c -fno-stack-protector
-
- test.o: test.c test.h defs.h config.h
-- $(CC) -c $(CCFLAGS) test.c
-+ $(CC) -c $(CCFLAGS) -fno-PIC test.c
-
- main.o: main.c test.h defs.h
- $(CC) -c $(CCFLAGS) -fPIC main.c
diff --git a/sys-apps/memtest86+/files/memtest86+-1.70-hardcoded_cc.patch b/sys-apps/memtest86+/files/memtest86+-1.70-hardcoded_cc.patch
deleted file mode 100644
index aa6c9c373c9f..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-1.70-hardcoded_cc.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -Naurp memtest86+-1.70-orig/Makefile memtest86+-1.70/Makefile
---- memtest86+-1.70-orig/Makefile 2007-01-27 15:17:59.000000000 +0100
-+++ memtest86+-1.70/Makefile 2007-01-27 15:31:43.000000000 +0100
-@@ -8,23 +8,21 @@
- #
- FDISK=/dev/fd0
-
--CC=gcc
- #
- # gcc compiler options, these settings should suffice
- #
--CCFLAGS=-Wall -m32 -march=i486 -Os -fomit-frame-pointer -fno-builtin -ffreestanding
--
--AS=as -32
-+CCFLAGS=-Wall -m32 -march=i486 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector
-+ASFLAGS=-32
-
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o config.o linuxbios.o memsize.o pci.o controller.o extra.o random.o dmi.o
-
- all: memtest.bin memtest
-
- reloc.o: reloc.c
-- $(CC) -c -m32 -march=i486 -fPIC -Wall -g -O2 -fno-strict-aliasing reloc.c
-+ $(CC) -c -m32 -march=i486 -fPIC -Wall -g -O2 -fno-strict-aliasing -fno-stack-protector reloc.c
-
- test.o: test.c test.h defs.h config.h
-- $(CC) -c $(CCFLAGS) test.c
-+ $(CC) -c $(CCFLAGS) -fno-PIC test.c
-
- main.o: main.c test.h defs.h
- $(CC) -c $(CCFLAGS) -fPIC main.c
-@@ -69,9 +67,9 @@ head.s: head.S
- $(CC) -E -m32 -traditional $< -o $@
-
- head.o: head.s
-- $(AS) -o $@ $<
-+ $(AS) $(ASFLAGS) -o $@ $<
- dmi.o: dmi.c test.h
-- $(CC) -c $(CCFLAGS) -fPIC dmi.c
-+ $(CC) -c $(CCFLAGS) -fPIC dmi.c
-
- makedefs: makedefs.c defs.h
- $(CC) $(CCFLAGS) makedefs.c -o $@
-@@ -94,7 +92,7 @@ bootsect.s: bootsect.S defs.h
- $(CC) -E -traditional $< -o $@
-
- bootsect.o: bootsect.s
-- $(AS) -o $@ $<
-+ $(AS) $(ASFLAGS) -o $@ $<
-
- bootsect: bootsect.o
- $(LD) -Ttext 0x00 -s --oformat binary -e _main --just-symbols=memtest_shared.o -o $@ $<
-@@ -103,7 +101,7 @@ setup.s: setup.S config.h defs.h
- $(CC) -E -traditional $< -o $@
-
- setup.o: setup.s
-- $(AS) -o $@ $<
-+ $(AS) $(ASFLAGS) -o $@ $<
-
-
- memtest.bin: memtest_shared.bin bootsect.o setup.o memtest.bin.lds
diff --git a/sys-apps/memtest86+/files/memtest86+-2.00-hardcoded_cc.patch b/sys-apps/memtest86+/files/memtest86+-2.00-hardcoded_cc.patch
deleted file mode 100644
index 98b8f692a893..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-2.00-hardcoded_cc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naurp memtest86+-2.00-orig/Makefile memtest86+-2.00/Makefile
---- memtest86+-2.00-orig/Makefile 2008-02-14 15:01:14.000000000 +0100
-+++ memtest86+-2.00/Makefile 2008-02-14 15:03:00.000000000 +0100
-@@ -8,9 +8,9 @@
- #
- FDISK=/dev/fd0
-
--CC=gcc
--
--CFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC
-+CPPFLAGS=-m32
-+CFLAGS=-Wall -m32 -march=i486 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector
-+ASFLAGS=-32
-
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
- config.o linuxbios.o memsize.o pci.o controller.o random.o extra.o \
-@@ -37,10 +37,10 @@ memtest.bin: memtest_shared.bin bootsect
- memtest_shared.bin -o memtest.bin
-
- reloc.o: reloc.c
-- $(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
-+ $(CC) -c $(CFLAGS) -fno-strict-aliasing -fno-stack-protector reloc.c
-
- test.o: test.c
-- $(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding test.c
-+ $(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector -fno-pie -nopie test.c
-
- clean:
- rm -f *.o memtest.bin memtest memtest_shared memtest_shared.bin