diff options
author | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2010-02-27 08:33:13 +0000 |
---|---|---|
committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2010-02-27 08:33:13 +0000 |
commit | 6aff5971645380c2c0afd8117dda3dcb32bef1ae (patch) | |
tree | 0c76cc45307b170981b420654fa7a18c16dcd53c /sys-boot/syslinux | |
parent | Add dev-ruby/ruby-glib2 dependency to fix bug 239618. (diff) | |
download | gentoo-2-6aff5971645380c2c0afd8117dda3dcb32bef1ae.tar.gz gentoo-2-6aff5971645380c2c0afd8117dda3dcb32bef1ae.tar.bz2 gentoo-2-6aff5971645380c2c0afd8117dda3dcb32bef1ae.zip |
syslinux version bump, remove old
(Portage version: 2.2_rc63/cvs/Linux x86_64)
Diffstat (limited to 'sys-boot/syslinux')
-rw-r--r-- | sys-boot/syslinux/ChangeLog | 13 | ||||
-rw-r--r-- | sys-boot/syslinux/files/syslinux-3.07-nossp.patch | 186 | ||||
-rw-r--r-- | sys-boot/syslinux/files/syslinux-3.08-nossp.patch | 172 | ||||
-rw-r--r-- | sys-boot/syslinux/files/syslinux-3.09-nopie.patch | 24 | ||||
-rw-r--r-- | sys-boot/syslinux/syslinux-3.36.ebuild | 37 | ||||
-rw-r--r-- | sys-boot/syslinux/syslinux-3.51.ebuild | 37 | ||||
-rw-r--r-- | sys-boot/syslinux/syslinux-3.70.ebuild | 42 | ||||
-rw-r--r-- | sys-boot/syslinux/syslinux-3.72.ebuild | 45 | ||||
-rw-r--r-- | sys-boot/syslinux/syslinux-3.75.ebuild | 45 | ||||
-rw-r--r-- | sys-boot/syslinux/syslinux-3.80.ebuild | 45 | ||||
-rw-r--r-- | sys-boot/syslinux/syslinux-3.82-r1.ebuild | 45 | ||||
-rw-r--r-- | sys-boot/syslinux/syslinux-3.82.ebuild | 45 | ||||
-rw-r--r-- | sys-boot/syslinux/syslinux-4.00_pre29.ebuild (renamed from sys-boot/syslinux/syslinux-4.00_pre24.ebuild) | 2 |
13 files changed, 13 insertions, 725 deletions
diff --git a/sys-boot/syslinux/ChangeLog b/sys-boot/syslinux/ChangeLog index dded03cf2b08..77c1ba37a78f 100644 --- a/sys-boot/syslinux/ChangeLog +++ b/sys-boot/syslinux/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for sys-boot/syslinux # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.55 2010/02/26 12:10:54 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.56 2010/02/27 08:33:12 chithanh Exp $ + +*syslinux-4.00_pre29 (27 Feb 2010) + + 27 Feb 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + -files/syslinux-3.07-nossp.patch, -files/syslinux-3.08-nossp.patch, + -files/syslinux-3.09-nopie.patch, -syslinux-3.36.ebuild, + -syslinux-3.51.ebuild, -syslinux-3.70.ebuild, -syslinux-3.72.ebuild, + -syslinux-3.75.ebuild, -syslinux-3.80.ebuild, -syslinux-3.82.ebuild, + -syslinux-3.82-r1.ebuild, -syslinux-4.00_pre24.ebuild, + +syslinux-4.00_pre29.ebuild: + version bump, remove versions that will never go stable 26 Feb 2010; Christian Faulhammer <fauli@gentoo.org> syslinux-3.83.ebuild: stable x86, bug 292442 diff --git a/sys-boot/syslinux/files/syslinux-3.07-nossp.patch b/sys-boot/syslinux/files/syslinux-3.07-nossp.patch deleted file mode 100644 index 4e1b5def36fb..000000000000 --- a/sys-boot/syslinux/files/syslinux-3.07-nossp.patch +++ /dev/null @@ -1,186 +0,0 @@ -diff -Nrup syslinux-3.07/Makefile syslinux-3.07-solar/Makefile ---- syslinux-3.07/Makefile 2005-01-06 17:34:06.000000000 -0500 -+++ syslinux-3.07-solar/Makefile 2005-01-18 09:56:37.000000000 -0500 -@@ -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 -fno-stack-protector -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 - PIC = -fPIC - LDFLAGS = -O2 -s - AR = ar -@@ -191,9 +191,8 @@ libsyslinux.a: bootsect_bin.o ldlinux_bi - $(LIB_SO): bootsect_bin.o ldlinux_bin.o syslxmod.o - $(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIB_SONAME) -o $@ $^ - --gethostip.o: gethostip.c -- --gethostip: gethostip.o -+gethostip: gethostip.c -+ $(CC) $(LDFLAGS) gethostip.c -o gethostip -fno-stack-protector - - mkdiskimage: mkdiskimage.in mbr.bin bin2hex.pl - $(PERL) bin2hex.pl < mbr.bin | cat mkdiskimage.in - > $@ -diff -Nrup syslinux-3.07/com32/lib/MCONFIG syslinux-3.07-solar/com32/lib/MCONFIG ---- syslinux-3.07/com32/lib/MCONFIG 2005-01-08 00:58:20.000000000 -0500 -+++ syslinux-3.07-solar/com32/lib/MCONFIG 2005-01-18 09:59:44.000000000 -0500 -@@ -18,7 +18,7 @@ LIBFLAGS = -DDYNAMIC_CRC_TABLE -DPNG_NO_ - - REQFLAGS = -g -m32 -mregparm=3 -DREGPARM=3 -D__COM32__ -I. -I./sys -I../include - OPTFLAGS = -Os -march=i386 -falign-functions=0 -falign-jumps=0 \ -- -falign-labels=0 -+ -falign-labels=0 -fno-stack-protector - WARNFLAGS = -W -Wall -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Winline - - CFLAGS = -Wp,-MT,$@,-MD,$(dir $@).$(notdir $@).d $(OPTFLAGS) \ -Files syslinux-3.07/com32/lib/libcom32.a and syslinux-3.07-solar/com32/lib/libcom32.a differ -diff -Nrup syslinux-3.07/com32/libutil/Makefile syslinux-3.07-solar/com32/libutil/Makefile ---- syslinux-3.07/com32/libutil/Makefile 2005-01-03 22:05:17.000000000 -0500 -+++ syslinux-3.07-solar/com32/libutil/Makefile 2005-01-18 09:56:37.000000000 -0500 -@@ -40,10 +40,10 @@ LD = ld -m elf_i386 - AR = ar - NASM = nasm - RANLIB = ranlib --CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -D__COM32__ -W -Wall -march=i386 -Os -fomit-frame-pointer -I./include -I../include -+CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -D__COM32__ -W -Wall -fno-stack-protector -march=i386 -Os -fomit-frame-pointer -I./include -I../include - SFLAGS = $(M32) -D__COM32__ -march=i386 - LDFLAGS = -T ../lib/com32.ld --LNXCFLAGS = -I./include -W -Wall -O -g -+LNXCFLAGS = -I./include -W -Wall -fno-stack-protector -O -g - LNXSFLAGS = -g - LNXLDFLAGS = -g - OBJCOPY = objcopy -diff -Nrup syslinux-3.07/com32/modules/Makefile syslinux-3.07-solar/com32/modules/Makefile ---- syslinux-3.07/com32/modules/Makefile 2005-01-04 19:07:01.000000000 -0500 -+++ syslinux-3.07-solar/com32/modules/Makefile 2005-01-18 09:56:37.000000000 -0500 -@@ -25,8 +25,8 @@ LD = ld -m elf_i386 - AR = ar - NASM = nasm - RANLIB = ranlib --CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I../libutil/include -I../include -D__COM32__ --LNXCFLAGS = -W -Wall -O -g -I../libutil/include -+CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -fno-stack-protector -march=i386 -Os -fomit-frame-pointer -I../libutil/include -I../include -D__COM32__ -+LNXCFLAGS = -W -Wall -fno-stack-protector -O -g -I../libutil/include - LNXSFLAGS = -g - LNXLDFLAGS = -g - SFLAGS = -D__COM32__ -march=i386 -diff -Nrup syslinux-3.07/com32/samples/Makefile syslinux-3.07-solar/com32/samples/Makefile ---- syslinux-3.07/com32/samples/Makefile 2005-01-03 22:05:17.000000000 -0500 -+++ syslinux-3.07-solar/com32/samples/Makefile 2005-01-18 09:56:37.000000000 -0500 -@@ -25,8 +25,8 @@ LD = ld -m elf_i386 - AR = ar - NASM = nasm - RANLIB = ranlib --CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I../libutil/include -I../include -D__COM32__ --LNXCFLAGS = -W -Wall -O -g -I../libutil/include -+CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -fno-stack-protector -march=i386 -Os -fomit-frame-pointer -I../libutil/include -I../include -D__COM32__ -+LNXCFLAGS = -W -Wall -fno-stack-protector -O -g -I../libutil/include - LNXSFLAGS = -g - LNXLDFLAGS = -g - SFLAGS = -D__COM32__ -march=i386 -diff -Nrup syslinux-3.07/dos/Makefile syslinux-3.07-solar/dos/Makefile ---- syslinux-3.07/dos/Makefile 2004-12-30 16:34:18.000000000 -0500 -+++ syslinux-3.07-solar/dos/Makefile 2005-01-18 09:56:37.000000000 -0500 -@@ -3,7 +3,7 @@ LD = ld -m elf_i386 - OBJCOPY = objcopy - OPTFLAGS = -g -Os -march=i386 -falign-functions=0 -falign-jumps=0 -falign-loops=0 -fomit-frame-pointer - INCLUDES = -include code16.h -I. -I.. -I../libfat --CFLAGS = -W -Wall -ffreestanding -msoft-float $(OPTFLAGS) $(INCLUDES) -+CFLAGS = -W -Wall -fno-stack-protector -ffreestanding -msoft-float $(OPTFLAGS) $(INCLUDES) - LDFLAGS = -T com16.ld - AR = ar - RANLIB = ranlib -diff -Nrup syslinux-3.07/extlinux/Makefile syslinux-3.07-solar/extlinux/Makefile ---- syslinux-3.07/extlinux/Makefile 2004-12-22 02:17:53.000000000 -0500 -+++ syslinux-3.07-solar/extlinux/Makefile 2005-01-18 09:56:37.000000000 -0500 -@@ -1,7 +1,7 @@ - CC = gcc - OPTFLAGS = -g -Os - INCLUDES = -I. -I.. -I../libfat --CFLAGS = -W -Wall -Wno-sign-compare -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) -+CFLAGS = -W -Wall -fno-stack-protector -Wno-sign-compare -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) - LDFLAGS = -s - - SRCS = extlinux.c ../extlinux_bss_bin.c ../extlinux_sys_bin.c -diff -Nrup syslinux-3.07/memdisk/Makefile syslinux-3.07-solar/memdisk/Makefile ---- syslinux-3.07/memdisk/Makefile 2004-12-28 20:58:02.000000000 -0500 -+++ syslinux-3.07-solar/memdisk/Makefile 2005-01-18 09:56:37.000000000 -0500 -@@ -20,7 +20,7 @@ M32 := $(call gcc_ok,-m32,) - 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 -Wno-sign-compare \ -+CFLAGS = -g -W -Wall -fno-stack-protector -Wno-sign-compare \ - -Os -fomit-frame-pointer -march=i386 $(ALIGN) \ - -DVERSION='"$(VERSION)"' -DDATE='"$(DATE)"' - LDFLAGS = -g -diff -Nrup syslinux-3.07/menu/Makefile syslinux-3.07-solar/menu/Makefile ---- syslinux-3.07/menu/Makefile 2004-02-25 01:48:05.000000000 -0500 -+++ syslinux-3.07-solar/menu/Makefile 2005-01-18 09:56:37.000000000 -0500 -@@ -5,7 +5,7 @@ M32 := $(call gcc_ok,-m32,) - 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 -fno-stack-protector -march=i386 $(ALIGN) -Os - AR = ar - AS = as - LD = ld -m elf_i386 -diff -Nrup syslinux-3.07/mtools/Makefile syslinux-3.07-solar/mtools/Makefile ---- syslinux-3.07/mtools/Makefile 2004-12-15 05:51:18.000000000 -0500 -+++ syslinux-3.07-solar/mtools/Makefile 2005-01-18 09:56:37.000000000 -0500 -@@ -1,7 +1,7 @@ - CC = gcc - OPTFLAGS = -g -Os - INCLUDES = -I. -I.. -I../libfat --CFLAGS = -W -Wall -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) -+CFLAGS = -W -Wall -fno-stack-protector -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) - LDFLAGS = -s - - SRCS = syslinux.c ../syslxmod.c ../bootsect_bin.c ../ldlinux_bin.c $(wildcard ../libfat/*.c) -diff -Nrup syslinux-3.07/sample/Makefile syslinux-3.07-solar/sample/Makefile ---- syslinux-3.07/sample/Makefile 2005-01-03 03:23:16.000000000 -0500 -+++ syslinux-3.07-solar/sample/Makefile 2005-01-18 09:56:37.000000000 -0500 -@@ -25,7 +25,7 @@ LD = ld -m elf_i386 - AR = ar - NASM = nasm - RANLIB = ranlib --CFLAGS = -W -Wall -march=i386 -Os -fomit-frame-pointer -I../com32/include -+CFLAGS = -W -Wall -fno-stack-protector -march=i386 -Os -fomit-frame-pointer -I../com32/include - SFLAGS = -march=i386 - LDFLAGS = -s - OBJCOPY = objcopy -diff -Nrup syslinux-3.07/unix/Makefile syslinux-3.07-solar/unix/Makefile ---- syslinux-3.07/unix/Makefile 2004-12-15 21:51:29.000000000 -0500 -+++ syslinux-3.07-solar/unix/Makefile 2005-01-18 09:56:37.000000000 -0500 -@@ -1,7 +1,7 @@ - CC = gcc - OPTFLAGS = -g -Os - INCLUDES = -I. -I.. -I../libfat --CFLAGS = -W -Wall -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) -+CFLAGS = -W -Wall -fno-stack-protector -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) - LDFLAGS = -s - - SRCS = syslinux.c ../syslxmod.c ../bootsect_bin.c ../ldlinux_bin.c $(wildcard ../libfat/*.c) -diff -Nrup syslinux-3.07/win32/Makefile syslinux-3.07-solar/win32/Makefile ---- syslinux-3.07/win32/Makefile 2004-12-22 12:53:54.000000000 -0500 -+++ syslinux-3.07-solar/win32/Makefile 2005-01-18 09:56:37.000000000 -0500 -@@ -23,7 +23,7 @@ ifeq ($(findstring CYGWIN,$(OSTYPE)),CYG - CC = gcc - AR = ar - RANLIB = ranlib --CFLAGS = -mno-cygwin -W -Wall -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -+CFLAGS = -mno-cygwin -W -Wall -fno-stack-protector -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 - PIC = - LDFLAGS = -mno-cygwin -Os -s - else -@@ -37,7 +37,7 @@ AR = mingw-ar - RANLIB = mingw-ranlib - endif - --CFLAGS = -W -Wall -Wno-sign-compare -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -+CFLAGS = -W -Wall -fno-stack-protector -Wno-sign-compare -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 - PIC = - LDFLAGS = -Os -s - endif diff --git a/sys-boot/syslinux/files/syslinux-3.08-nossp.patch b/sys-boot/syslinux/files/syslinux-3.08-nossp.patch deleted file mode 100644 index ad8e1ac6700c..000000000000 --- a/sys-boot/syslinux/files/syslinux-3.08-nossp.patch +++ /dev/null @@ -1,172 +0,0 @@ ---- syslinux/Makefile -+++ syslinux/Makefile -@@ -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 -fno-stack-protector -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 - PIC = -fPIC - LDFLAGS = -O2 -s - AR = ar -@@ -191,9 +191,8 @@ libsyslinux.a: bootsect_bin.o ldlinux_bi - $(LIB_SO): bootsect_bin.o ldlinux_bin.o syslxmod.o - $(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIB_SONAME) -o $@ $^ - --gethostip.o: gethostip.c -- --gethostip: gethostip.o -+gethostip: gethostip.c -+ $(CC) $(LDFLAGS) gethostip.c -o gethostip -fno-stack-protector - - mkdiskimage: mkdiskimage.in mbr.bin bin2hex.pl - $(PERL) bin2hex.pl < mbr.bin | cat mkdiskimage.in - > $@ ---- syslinux/com32/lib/MCONFIG -+++ syslinux/com32/lib/MCONFIG -@@ -18,7 +18,7 @@ LIBFLAGS = -DDYNAMIC_CRC_TABLE -DPNG_NO_ - - REQFLAGS = -g -m32 -mregparm=3 -DREGPARM=3 -D__COM32__ -I. -I./sys -I../include - OPTFLAGS = -Os -march=i386 -falign-functions=0 -falign-jumps=0 \ -- -falign-labels=0 -+ -falign-labels=0 -fno-stack-protector - WARNFLAGS = -W -Wall -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Winline - - CFLAGS = -Wp,-MT,$@,-MD,$(dir $@).$(notdir $@).d $(OPTFLAGS) \ ---- syslinux/com32/libutil/Makefile -+++ syslinux/com32/libutil/Makefile -@@ -40,10 +40,10 @@ LD = ld -m elf_i386 - AR = ar - NASM = nasm - RANLIB = ranlib --CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -D__COM32__ -W -Wall -march=i386 -Os -fomit-frame-pointer -I./include -I../include -+CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -D__COM32__ -W -Wall -fno-stack-protector -march=i386 -Os -fomit-frame-pointer -I./include -I../include - SFLAGS = $(M32) -D__COM32__ -march=i386 - LDFLAGS = -T ../lib/com32.ld --LNXCFLAGS = -I./include -W -Wall -O -g -+LNXCFLAGS = -I./include -W -Wall -fno-stack-protector -O -g - LNXSFLAGS = -g - LNXLDFLAGS = -g - OBJCOPY = objcopy ---- syslinux/com32/modules/Makefile -+++ syslinux/com32/modules/Makefile -@@ -25,8 +25,8 @@ LD = ld -m elf_i386 - AR = ar - NASM = nasm - RANLIB = ranlib --CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I../libutil/include -I../include -D__COM32__ --LNXCFLAGS = -W -Wall -O -g -I../libutil/include -+CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -fno-stack-protector -march=i386 -Os -fomit-frame-pointer -I../libutil/include -I../include -D__COM32__ -+LNXCFLAGS = -W -Wall -fno-stack-protector -O -g -I../libutil/include - LNXSFLAGS = -g - LNXLDFLAGS = -g - SFLAGS = -D__COM32__ -march=i386 ---- syslinux/com32/samples/Makefile -+++ syslinux/com32/samples/Makefile -@@ -25,8 +25,8 @@ LD = ld -m elf_i386 - AR = ar - NASM = nasm - RANLIB = ranlib --CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I../libutil/include -I../include -D__COM32__ --LNXCFLAGS = -W -Wall -O -g -I../libutil/include -+CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -fno-stack-protector -march=i386 -Os -fomit-frame-pointer -I../libutil/include -I../include -D__COM32__ -+LNXCFLAGS = -W -Wall -fno-stack-protector -O -g -I../libutil/include - LNXSFLAGS = -g - LNXLDFLAGS = -g - SFLAGS = -D__COM32__ -march=i386 ---- syslinux/dos/Makefile -+++ syslinux/dos/Makefile -@@ -3,7 +3,7 @@ LD = ld -m elf_i386 - OBJCOPY = objcopy - OPTFLAGS = -g -Os -march=i386 -falign-functions=0 -falign-jumps=0 -falign-loops=0 -fomit-frame-pointer - INCLUDES = -include code16.h -I. -I.. -I../libfat --CFLAGS = -W -Wall -ffreestanding -msoft-float $(OPTFLAGS) $(INCLUDES) -+CFLAGS = -W -Wall -fno-stack-protector -ffreestanding -msoft-float $(OPTFLAGS) $(INCLUDES) - LDFLAGS = -T com16.ld - AR = ar - RANLIB = ranlib ---- syslinux/extlinux/Makefile -+++ syslinux/extlinux/Makefile -@@ -1,7 +1,7 @@ - CC = gcc - OPTFLAGS = -g -Os - INCLUDES = -I. -I.. -I../libfat --CFLAGS = -W -Wall -Wno-sign-compare -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) -+CFLAGS = -W -Wall -fno-stack-protector -Wno-sign-compare -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) - LDFLAGS = -s - - SRCS = extlinux.c ../extlinux_bss_bin.c ../extlinux_sys_bin.c ---- syslinux/memdisk/Makefile -+++ syslinux/memdisk/Makefile -@@ -20,7 +20,7 @@ M32 := $(call gcc_ok,-m32,) - 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 -Wno-sign-compare \ -+CFLAGS = -g -W -Wall -fno-stack-protector -Wno-sign-compare \ - -Os -fomit-frame-pointer -march=i386 $(ALIGN) \ - -DVERSION='"$(VERSION)"' -DDATE='"$(DATE)"' - LDFLAGS = -g ---- syslinux/menu/Makefile -+++ syslinux/menu/Makefile -@@ -5,7 +5,7 @@ M32 := $(call gcc_ok,-m32,) - COM32DIR = ../com32 - LUDIR = $(COM32DIR)/libutil - LDIR = $(COM32DIR)/lib --CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I$(LUDIR)/include -I$(COM32DIR)/include -Ilibmenu -D__COM32__ -+CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I$(LUDIR)/include -I$(COM32DIR)/include -Ilibmenu -D__COM32__ -fno-stack-protector - SFLAGS = -D__COM32__ -march=i386 - LDFLAGS = -T $(LDIR)/com32.ld - OBJCOPY = objcopy ---- syslinux/mtools/Makefile -+++ syslinux/mtools/Makefile -@@ -1,7 +1,7 @@ - CC = gcc - OPTFLAGS = -g -Os - INCLUDES = -I. -I.. -I../libfat --CFLAGS = -W -Wall -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) -+CFLAGS = -W -Wall -fno-stack-protector -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) - LDFLAGS = -s - - SRCS = syslinux.c ../syslxmod.c ../bootsect_bin.c ../ldlinux_bin.c $(wildcard ../libfat/*.c) ---- syslinux/sample/Makefile -+++ syslinux/sample/Makefile -@@ -25,7 +25,7 @@ LD = ld -m elf_i386 - AR = ar - NASM = nasm - RANLIB = ranlib --CFLAGS = -W -Wall -march=i386 -Os -fomit-frame-pointer -I../com32/include -+CFLAGS = -W -Wall -fno-stack-protector -march=i386 -Os -fomit-frame-pointer -I../com32/include - SFLAGS = -march=i386 - LDFLAGS = -s - OBJCOPY = objcopy ---- syslinux/unix/Makefile -+++ syslinux/unix/Makefile -@@ -1,7 +1,7 @@ - CC = gcc - OPTFLAGS = -g -Os - INCLUDES = -I. -I.. -I../libfat --CFLAGS = -W -Wall -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) -+CFLAGS = -W -Wall -fno-stack-protector -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) - LDFLAGS = -s - - SRCS = syslinux.c ../syslxmod.c ../bootsect_bin.c ../ldlinux_bin.c $(wildcard ../libfat/*.c) ---- syslinux/win32/Makefile -+++ syslinux/win32/Makefile -@@ -23,7 +23,7 @@ ifeq ($(findstring CYGWIN,$(OSTYPE)),CYG - CC = gcc - AR = ar - RANLIB = ranlib --CFLAGS = -mno-cygwin -W -Wall -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -+CFLAGS = -mno-cygwin -W -Wall -fno-stack-protector -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 - PIC = - LDFLAGS = -mno-cygwin -Os -s - else -@@ -37,7 +37,7 @@ AR = mingw-ar - RANLIB = mingw-ranlib - endif - --CFLAGS = -W -Wall -Wno-sign-compare -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -+CFLAGS = -W -Wall -fno-stack-protector -Wno-sign-compare -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 - PIC = - LDFLAGS = -Os -s - endif diff --git a/sys-boot/syslinux/files/syslinux-3.09-nopie.patch b/sys-boot/syslinux/files/syslinux-3.09-nopie.patch deleted file mode 100644 index 3d654d33cff0..000000000000 --- a/sys-boot/syslinux/files/syslinux-3.09-nopie.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -u syslinux/com32/libutil/Makefile syslinux/com32/libutil/Makefile ---- syslinux/com32/libutil/Makefile -+++ syslinux/com32/libutil/Makefile -@@ -40,7 +40,7 @@ - AR = ar - NASM = nasm - RANLIB = ranlib --CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -D__COM32__ -W -Wall -fno-stack-protector -march=i386 -Os -fomit-frame-pointer -I./include -I../include -+CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -D__COM32__ -W -Wall -fno-stack-protector -nopie -march=i386 -Os -fomit-frame-pointer -I./include -I../include - SFLAGS = $(M32) -D__COM32__ -march=i386 - LDFLAGS = -T ../lib/com32.ld - LNXCFLAGS = -I./include -W -Wall -fno-stack-protector -O -g -diff -u syslinux/dos/Makefile syslinux/dos/Makefile ---- syslinux/dos/Makefile -+++ syslinux/dos/Makefile -@@ -3,7 +3,7 @@ - OBJCOPY = objcopy - OPTFLAGS = -g -Os -march=i386 -falign-functions=0 -falign-jumps=0 -falign-loops=0 -fomit-frame-pointer - INCLUDES = -include code16.h -I. -I.. -I../libfat --CFLAGS = -W -Wall -fno-stack-protector -ffreestanding -msoft-float $(OPTFLAGS) $(INCLUDES) -+CFLAGS = -W -Wall -nopie -fno-stack-protector -ffreestanding -msoft-float $(OPTFLAGS) $(INCLUDES) - LDFLAGS = -T com16.ld - AR = ar - RANLIB = ranlib diff --git a/sys-boot/syslinux/syslinux-3.36.ebuild b/sys-boot/syslinux/syslinux-3.36.ebuild deleted file mode 100644 index 0d79260dbd12..000000000000 --- a/sys-boot/syslinux/syslinux-3.36.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.36.ebuild,v 1.1 2007/02/11 09:49:01 vapier Exp $ - -DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader" -HOMEPAGE="http://syslinux.zytor.com/" -SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="" - -RDEPEND="sys-fs/mtools" -DEPEND="${RDEPEND} - dev-lang/nasm" - -# This ebuild is a departure from the old way of rebuilding everything in syslinux -# This departure is necessary since hpa doesn't support the rebuilding of anything other -# than the installers. - -# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore - -src_unpack() { - unpack ${A} - cd "${S}" - rm -f gethostip #137081 -} - -src_compile() { - emake installer || die -} - -src_install() { - emake INSTALLROOT="${D}" install || die - dodoc README* NEWS TODO *.doc memdisk/memdisk.doc -} diff --git a/sys-boot/syslinux/syslinux-3.51.ebuild b/sys-boot/syslinux/syslinux-3.51.ebuild deleted file mode 100644 index ea52db29024f..000000000000 --- a/sys-boot/syslinux/syslinux-3.51.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.51.ebuild,v 1.1 2007/10/24 18:12:17 beandog Exp $ - -DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader" -HOMEPAGE="http://syslinux.zytor.com/" -SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="" - -RDEPEND="sys-fs/mtools" -DEPEND="${RDEPEND} - dev-lang/nasm" - -# This ebuild is a departure from the old way of rebuilding everything in syslinux -# This departure is necessary since hpa doesn't support the rebuilding of anything other -# than the installers. - -# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore - -src_unpack() { - unpack ${A} - cd "${S}" - rm -f gethostip #137081 -} - -src_compile() { - emake installer || die -} - -src_install() { - emake INSTALLROOT="${D}" install || die - dodoc README* NEWS TODO *.doc memdisk/memdisk.doc -} diff --git a/sys-boot/syslinux/syslinux-3.70.ebuild b/sys-boot/syslinux/syslinux-3.70.ebuild deleted file mode 100644 index 83f049e115c6..000000000000 --- a/sys-boot/syslinux/syslinux-3.70.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.70.ebuild,v 1.2 2008/08/18 03:15:46 vapier Exp $ - -inherit eutils - -DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader" -HOMEPAGE="http://syslinux.zytor.com/" -SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="" - -RDEPEND="sys-fs/mtools" -DEPEND="${RDEPEND} - dev-lang/nasm" - -# This ebuild is a departure from the old way of rebuilding everything in syslinux -# This departure is necessary since hpa doesn't support the rebuilding of anything other -# than the installers. - -# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-nopie.patch - # Don't prestrip, makes portage angry - epatch "${FILESDIR}/${P}-nostrip.patch" - rm -f gethostip #137081 -} - -src_compile() { - emake installer || die -} - -src_install() { - emake INSTALLROOT="${D}" install || die - dodoc README NEWS TODO doc/* -} diff --git a/sys-boot/syslinux/syslinux-3.72.ebuild b/sys-boot/syslinux/syslinux-3.72.ebuild deleted file mode 100644 index 8e73275807ef..000000000000 --- a/sys-boot/syslinux/syslinux-3.72.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.72.ebuild,v 1.2 2008/12/21 20:39:27 solar Exp $ - -inherit eutils - -DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader" -HOMEPAGE="http://syslinux.zytor.com/" -SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="" - -RDEPEND="sys-fs/mtools - dev-perl/Crypt-PasswdMD5 - dev-perl/Digest-SHA1" -DEPEND="${RDEPEND} - dev-lang/nasm" - -# This ebuild is a departure from the old way of rebuilding everything in syslinux -# This departure is necessary since hpa doesn't support the rebuilding of anything other -# than the installers. - -# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-3.72-nopie.patch - # Don't prestrip, makes portage angry - epatch "${FILESDIR}"/${PN}-3.72-nostrip.patch - - rm -f gethostip #bug 137081 -} - -src_compile() { - emake installer || die -} - -src_install() { - emake INSTALLROOT="${D}" MANDIR=/usr/share/man local-install || die - dodoc README NEWS TODO doc/* -} diff --git a/sys-boot/syslinux/syslinux-3.75.ebuild b/sys-boot/syslinux/syslinux-3.75.ebuild deleted file mode 100644 index 519526f959f5..000000000000 --- a/sys-boot/syslinux/syslinux-3.75.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.75.ebuild,v 1.1 2009/04/29 15:51:18 jer Exp $ - -inherit eutils - -DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader" -HOMEPAGE="http://syslinux.zytor.com/" -SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="" - -RDEPEND="sys-fs/mtools - dev-perl/Crypt-PasswdMD5 - dev-perl/Digest-SHA1" -DEPEND="${RDEPEND} - dev-lang/nasm" - -# This ebuild is a departure from the old way of rebuilding everything in syslinux -# This departure is necessary since hpa doesn't support the rebuilding of anything other -# than the installers. - -# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-3.72-nopie.patch - # Don't prestrip, makes portage angry - epatch "${FILESDIR}"/${PN}-3.72-nostrip.patch - - rm -f gethostip #bug 137081 -} - -src_compile() { - emake installer || die -} - -src_install() { - emake INSTALLROOT="${D}" MANDIR=/usr/share/man local-install || die - dodoc README NEWS TODO doc/* -} diff --git a/sys-boot/syslinux/syslinux-3.80.ebuild b/sys-boot/syslinux/syslinux-3.80.ebuild deleted file mode 100644 index 69fec3892343..000000000000 --- a/sys-boot/syslinux/syslinux-3.80.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.80.ebuild,v 1.1 2009/05/15 18:33:46 jer Exp $ - -inherit eutils - -DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader" -HOMEPAGE="http://syslinux.zytor.com/" -SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="" - -RDEPEND="sys-fs/mtools - dev-perl/Crypt-PasswdMD5 - dev-perl/Digest-SHA1" -DEPEND="${RDEPEND} - dev-lang/nasm" - -# This ebuild is a departure from the old way of rebuilding everything in syslinux -# This departure is necessary since hpa doesn't support the rebuilding of anything other -# than the installers. - -# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-3.72-nopie.patch - # Don't prestrip, makes portage angry - epatch "${FILESDIR}"/${PN}-3.72-nostrip.patch - - rm -f gethostip #bug 137081 -} - -src_compile() { - emake installer || die -} - -src_install() { - emake INSTALLROOT="${D}" MANDIR=/usr/share/man local-install || die - dodoc README NEWS TODO doc/* -} diff --git a/sys-boot/syslinux/syslinux-3.82-r1.ebuild b/sys-boot/syslinux/syslinux-3.82-r1.ebuild deleted file mode 100644 index 046a0a530175..000000000000 --- a/sys-boot/syslinux/syslinux-3.82-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.82-r1.ebuild,v 1.1 2009/09/14 10:49:54 ssuominen Exp $ - -inherit eutils - -DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader" -HOMEPAGE="http://syslinux.zytor.com/" -SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="" - -RDEPEND="sys-fs/mtools - dev-perl/Crypt-PasswdMD5 - dev-perl/Digest-SHA1" -DEPEND="${RDEPEND} - dev-lang/nasm" - -# This ebuild is a departure from the old way of rebuilding everything in syslinux -# This departure is necessary since hpa doesn't support the rebuilding of anything other -# than the installers. - -# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-3.72-nopie.patch - # Don't prestrip, makes portage angry - epatch "${FILESDIR}"/${PN}-3.72-nostrip.patch - - rm -f gethostip #bug 137081 -} - -src_compile() { - emake installer || die -} - -src_install() { - emake INSTALLSUBDIRS=utils INSTALLROOT="${D}" MANDIR=/usr/share/man install || die - dodoc README NEWS TODO doc/* -} diff --git a/sys-boot/syslinux/syslinux-3.82.ebuild b/sys-boot/syslinux/syslinux-3.82.ebuild deleted file mode 100644 index 81f7e53987f7..000000000000 --- a/sys-boot/syslinux/syslinux-3.82.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.82.ebuild,v 1.1 2009/06/27 17:42:59 beandog Exp $ - -inherit eutils - -DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader" -HOMEPAGE="http://syslinux.zytor.com/" -SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="" - -RDEPEND="sys-fs/mtools - dev-perl/Crypt-PasswdMD5 - dev-perl/Digest-SHA1" -DEPEND="${RDEPEND} - dev-lang/nasm" - -# This ebuild is a departure from the old way of rebuilding everything in syslinux -# This departure is necessary since hpa doesn't support the rebuilding of anything other -# than the installers. - -# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-3.72-nopie.patch - # Don't prestrip, makes portage angry - epatch "${FILESDIR}"/${PN}-3.72-nostrip.patch - - rm -f gethostip #bug 137081 -} - -src_compile() { - emake installer || die -} - -src_install() { - emake INSTALLROOT="${D}" MANDIR=/usr/share/man local-install || die - dodoc README NEWS TODO doc/* -} diff --git a/sys-boot/syslinux/syslinux-4.00_pre24.ebuild b/sys-boot/syslinux/syslinux-4.00_pre29.ebuild index 2f2b67f173d3..af2b0069e0bd 100644 --- a/sys-boot/syslinux/syslinux-4.00_pre24.ebuild +++ b/sys-boot/syslinux/syslinux-4.00_pre29.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-4.00_pre24.ebuild,v 1.1 2010/02/18 21:52:04 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-4.00_pre29.ebuild,v 1.1 2010/02/27 08:33:12 chithanh Exp $ inherit eutils toolchain-funcs |