Version bump #151529 by Jesse Adelman.

(Portage version: 2.1.2_pre3-r5)

4 files changed, 223 insertions, 1 deletions

diff --git a/sys-boot/syslinux/ChangeLog b/sys-boot/syslinux/ChangeLog
index be86771a0a70..e77d62f6329f 100644
--- a/sys-boot/syslinux/ChangeLog
+++ b/sys-boot/syslinux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-boot/syslinux
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.24 2006/09/18 14:13:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.25 2006/10/22 06:02:10 vapier Exp $
+
+*syslinux-3.31 (22 Oct 2006)
+
+  22 Oct 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/syslinux-3.31-nossp.patch, +syslinux-3.31.ebuild:
+  Version bump #151529 by Jesse Adelman.
 
 *syslinux-3.20 (18 Sep 2006)
 
diff --git a/sys-boot/syslinux/files/digest-syslinux-3.31 b/sys-boot/syslinux/files/digest-syslinux-3.31
new file mode 100644
index 000000000000..e7541fec8c65
--- /dev/null
+++ b/sys-boot/syslinux/files/digest-syslinux-3.31
@@ -0,0 +1,3 @@
+MD5 5faae89d18baf92e28bc820c62270db9 syslinux-3.31.tar.bz2 1621330
+RMD160 e3c9bac6b6a5970fc2adae7ca5f27d8413ea1a44 syslinux-3.31.tar.bz2 1621330
+SHA256 57c4ca6e7836460297edcc45148373ec131157b29c184ee011b29ec491e010f0 syslinux-3.31.tar.bz2 1621330
diff --git a/sys-boot/syslinux/files/syslinux-3.31-nossp.patch b/sys-boot/syslinux/files/syslinux-3.31-nossp.patch
new file mode 100644
index 000000000000..157e9e30b943
--- /dev/null
+++ b/sys-boot/syslinux/files/syslinux-3.31-nossp.patch
@@ -0,0 +1,172 @@
+--- 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
+@@ -194,9 +194,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
+@@ -23,7 +23,7 @@
+ 
+ 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 -ffast-math -fomit-frame-pointer
++	    -falign-labels=0 -ffast-math -fomit-frame-pointer -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 -march=i386 -Os -fomit-frame-pointer -I./include -I../include $(call gcc_ok,-fno-stack-protector,)
+ SFLAGS     = $(M32) -D__COM32__ -march=i386
+ LDFLAGS    = -T ../lib/com32.ld
+-LNXCFLAGS  = -I./include -W -Wall -O -g
++LNXCFLAGS  = -I./include -W -Wall -O -g $(call gcc_ok,-fno-stack-protector,)
+ 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 -march=i386 -Os -fomit-frame-pointer -I../libutil/include -I../include  -D__COM32__ $(call gcc_ok,-fno-stack-protector,)
++LNXCFLAGS  = -W -Wall -O -g -I../libutil/include $(call gcc_ok,-fno-stack-protector,)
+ 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 -march=i386 -Os -fomit-frame-pointer -I../libutil/include -I../include  -D__COM32__ $(call gcc_ok,-fno-stack-protector,)
++LNXCFLAGS  = -W -Wall -O -g -I../libutil/include $(call gcc_ok,-fno-stack-protector,)
+ 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,)
+ FREE    := $(call gcc_ok,-ffreestanding,)
+ 
+ CC       = gcc $(M32) $(FREE)
+-CFLAGS   = -g -W -Wall -Wno-sign-compare \
++CFLAGS   = -g -W -Wall -Wno-sign-compare $(call gcc_ok,-fno-stack-protector,) \
+ 	   -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__ $(call gcc_ok,-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 -march=i386 -Os -fomit-frame-pointer -I../com32/include $(call gcc_ok,-fno-stack-protector,)
+ 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/syslinux-3.31.ebuild b/sys-boot/syslinux/syslinux-3.31.ebuild
new file mode 100644
index 000000000000..867078df1aaa
--- /dev/null
+++ b/sys-boot/syslinux/syslinux-3.31.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.31.ebuild,v 1.1 2006/10/22 06:02:10 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}"
+	rm -f gethostip #137081
+	epatch "${FILESDIR}"/syslinux-3.31-nossp.patch
+	epatch "${FILESDIR}"/syslinux-3.11-nopie.patch
+}
+
+src_compile() {
+	emake installer || die
+}
+
+src_install() {
+	make INSTALLROOT="${D}" install || die
+	dodoc README* NEWS TODO *.doc memdisk/memdisk.doc
+}