old

4 files changed, 3 insertions, 115 deletions

diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index 13e05a10e29b..90750c6a4d46 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -5,15 +5,12 @@ MD5 0bf1a1696767cc23af51074e00a02601 ChangeLog 3140
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 be91e91e8fbb5560f3cbd9adc6a38677 syslinux-2.11.ebuild 959
 MD5 fad406869474fc3a7cfde4203eb896fe syslinux-1.76.ebuild 760
-MD5 5c685d9bd473e15d95fd52707ff69cfa files/2.06-nasm.patch 1159
 MD5 26489361fe682baf353e4b7cef7bba16 files/digest-syslinux-1.76 65
-MD5 cef56845517154743833aa8ced0d52a6 files/syslinux-2.06-nossp.patch 1535
-MD5 f38ec993dba486ddbaf4a50773db388e files/syslinux-2.09-nossp.patch 2257
 MD5 437dcea1ca8e2c9469874b045a9e76cb files/digest-syslinux-2.11 66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.14 (GNU/Linux)
 
-iD8DBQFB4cxdroRuSHgZdywRAlaHAJ9K/igNYZzLOMt3ILukCM3Cn+VwjQCfROEr
-d3H0aKGCrl8lUQyXjSJ7UNE=
-=ZOGF
+iD8DBQFB4cyVroRuSHgZdywRAn9IAJ9u8vCEyIVRV4SHdsJsApRgNpmaNwCdHiUa
+Fl+DwLVotK46Fh8084Cd64Y=
+=smUM
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/syslinux/files/2.06-nasm.patch b/sys-boot/syslinux/files/2.06-nasm.patch
deleted file mode 100644
index 21ed9a1bdc82..000000000000
--- a/sys-boot/syslinux/files/2.06-nasm.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urN syslinux-2.04.orig/memdisk/Makefile syslinux-2.04/memdisk/Makefile
---- syslinux-2.04.orig/memdisk/Makefile	2003-04-15 00:28:04.000000000 +0200
-+++ syslinux-2.04/memdisk/Makefile	2003-09-01 00:29:23.000000000 +0200
-@@ -60,10 +60,10 @@
- 	echo '.code16gcc' | cat - $< > $@
- 
- %.s: %.S
--	$(CC) -x c $(INCLUDE) $(CFLAGS) -traditional -E -o $@ $<
-+	$(CC) -x assembler-with-cpp $(INCLUDE) $(CFLAGS) -traditional -E -o $@ $<
- 
- %.s16: %.S16
--	$(CC) -x c $(INCLUDE) $(CFLAGS) -traditional -E -o $@ $<
-+	$(CC) -x assembler-with-cpp $(INCLUDE) $(CFLAGS) -traditional -E -o $@ $<
- 
- %.s: %.c
- 	$(CC) $(INCLUDE) $(CFLAGS) -S -o $@ $<
-@@ -98,7 +98,7 @@
- .depend:
- 	rm -f .depend
- 	for csrc in *.c ; do $(CC) $(INCLUDE) -MM $$csrc | sed -e 's/\.o/\.s/' >> .depend ; done
--	for ssrc in $(SSRC) ; do $(CC) $(INCLUDE) -x c -traditional -MM $$ssrc | sed -e 's/\.S16\.o/\.o16/' >> .depend ; done
-+	for ssrc in $(SSRC) ; do $(CC) $(INCLUDE) -x assembler-with-cpp -traditional -MM $$ssrc | sed -e 's/\.o/\.o16/' >> .depend ; done
- 	for nsrc in $(NASMSRC) ; do $(NASM) -DDEPEND $(NINCLUDE) -o `echo $$nsrc | sed -e 's/\.asm/\.bin/'` -M $$nsrc >> .depend ; done
- 
- depend:
diff --git a/sys-boot/syslinux/files/syslinux-2.06-nossp.patch b/sys-boot/syslinux/files/syslinux-2.06-nossp.patch
deleted file mode 100644
index a1175ada2e82..000000000000
--- a/sys-boot/syslinux/files/syslinux-2.06-nossp.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Nrup syslinux-2.06/Makefile syslinux-2.06-solar/Makefile
---- syslinux-2.06/Makefile	2004-04-28 23:31:56.000000000 -0400
-+++ syslinux-2.06-solar/Makefile	2004-04-28 23:32:40.000000000 -0400
-@@ -18,7 +18,7 @@
- OSTYPE   = $(shell uname -msr)
- CC	 = gcc
- INCLUDE  =
--CFLAGS   = -Wall -O2 -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
-+CFLAGS   = -Wall -O2 -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -fno-stack-protector
- PIC      = -fPIC
- LDFLAGS  = -O2 -s
- AR	 = ar
-diff -Nrup syslinux-2.06/memdisk/Makefile syslinux-2.06-solar/memdisk/Makefile
---- syslinux-2.06/memdisk/Makefile	2004-04-28 23:31:55.000000000 -0400
-+++ syslinux-2.06-solar/memdisk/Makefile	2004-04-28 23:33:34.000000000 -0400
-@@ -14,7 +14,7 @@
- VERSION := $(shell cat ../version)
- 
- CC       = gcc
--CFLAGS   = -g -Wall -O2 -fomit-frame-pointer -march=i386 \
-+CFLAGS   = -g -Wall -fno-stack-protector -O2 -fomit-frame-pointer -march=i386 \
- 	   -malign-functions=0 -malign-jumps=0 -malign-loops=0 \
- 	   -DVERSION='"$(VERSION)"' -DDATE='"$(DATE)"'
- LDFLAGS  = -g
-diff -Nrup syslinux-2.06/sample/Makefile syslinux-2.06-solar/sample/Makefile
---- syslinux-2.06/sample/Makefile	2002-11-18 20:00:31.000000000 -0500
-+++ syslinux-2.06-solar/sample/Makefile	2004-04-28 23:33:56.000000000 -0400
-@@ -17,7 +17,7 @@
- 
- CC         = gcc
- LD         = ld
--CFLAGS     = -march=i386 -O2 -fomit-frame-pointer -I../com32/include
-+CFLAGS     = -march=i386 -O2 -fomit-frame-pointer -I../com32/include -fno-stack-protector
- SFLAGS     = -march=i386
- LDFLAGS    = -s
- OBJCOPY    = objcopy
diff --git a/sys-boot/syslinux/files/syslinux-2.09-nossp.patch b/sys-boot/syslinux/files/syslinux-2.09-nossp.patch
deleted file mode 100644
index 1390e17d478f..000000000000
--- a/sys-boot/syslinux/files/syslinux-2.09-nossp.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Nru syslinux-2.09/Makefile syslinux-2.09-solar/Makefile
---- syslinux-2.09/Makefile	2004-02-02 03:47:24.000000000 -0500
-+++ syslinux-2.09-solar/Makefile	2004-04-28 23:43:00.000000000 -0400
-@@ -18,7 +18,7 @@
- OSTYPE   = $(shell uname -msr)
- CC	 = gcc
- INCLUDE  =
--CFLAGS   = -W -Wall -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
-+CFLAGS   = -W -Wall -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -fno-stack-protector
- PIC      = -fPIC
- LDFLAGS  = -O2 -s
- AR	 = ar
-diff -Nru syslinux-2.09/memdisk/Makefile syslinux-2.09-solar/memdisk/Makefile
---- syslinux-2.09/memdisk/Makefile	2004-01-24 16:37:22.000000000 -0500
-+++ syslinux-2.09-solar/memdisk/Makefile	2004-04-28 23:43:20.000000000 -0400
-@@ -20,7 +20,7 @@
- ALIGN   := $(call gcc_ok,-falign-functions=0 -falign-jumps=0 -falign-loops=0,-malign-functions=0 -malign-jumps=0 -malign-loops=0)
- 
- CC       = gcc $(M32)
--CFLAGS   = -g -W -Wall -Os -fomit-frame-pointer -march=i386 $(ALIGN) \
-+CFLAGS   = -g -W -Wall -Os -fomit-frame-pointer -march=i386 $(ALIGN) -fno-stack-protector \
- 	   -DVERSION='"$(VERSION)"' -DDATE='"$(DATE)"'
- LDFLAGS  = -g
- INCLUDE  = -I../com32/include
-diff -Nru syslinux-2.09/menu/Makefile syslinux-2.09-solar/menu/Makefile
---- syslinux-2.09/menu/Makefile	2004-02-25 01:48:05.000000000 -0500
-+++ syslinux-2.09-solar/menu/Makefile	2004-04-28 23:43:50.000000000 -0400
-@@ -5,7 +5,7 @@
- ALIGN   := $(call gcc_ok,-falign-functions=0 -falign-jumps=0 -falign-loops=0,-malign-functions=0 -malign-jumps=0 -malign-loops=0)
- 
- CC	= gcc
--CFLAGS  =  $(M32) -funsigned-char -g -W -Wall -march=i386 $(ALIGN) -Os
-+CFLAGS  =  $(M32) -funsigned-char -g -W -Wall -march=i386 $(ALIGN) -Os -fno-stack-protector
- AR      = ar
- AS      = as
- LD      = ld -m elf_i386
-diff -Nru syslinux-2.09/sample/Makefile syslinux-2.09-solar/sample/Makefile
---- syslinux-2.09/sample/Makefile	2004-01-24 16:37:22.000000000 -0500
-+++ syslinux-2.09-solar/sample/Makefile	2004-04-28 23:44:09.000000000 -0400
-@@ -25,7 +25,7 @@
- AR	   = ar
- NASM	   = nasm
- RANLIB	   = ranlib
--CFLAGS     = -W -Wall -march=i386 -Os -fomit-frame-pointer -I../com32/include
-+CFLAGS     = -W -Wall -march=i386 -Os -fomit-frame-pointer -I../com32/include -fno-stack-protector
- SFLAGS     = -march=i386
- LDFLAGS    = -s
- OBJCOPY    = objcopy