Version bump.

(Portage version: 2.1.2-r9)

5 files changed, 245 insertions, 1 deletions

diff --git a/sys-boot/syslinux/ChangeLog b/sys-boot/syslinux/ChangeLog
index 5e603c47b2e1..d8900024e966 100644
--- a/sys-boot/syslinux/ChangeLog
+++ b/sys-boot/syslinux/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-boot/syslinux
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.28 2007/02/09 23:39:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.29 2007/02/09 23:52:51 vapier Exp $
+
+*syslinux-3.35 (09 Feb 2007)
+
+  09 Feb 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/syslinux-3.35-nopie.patch, +files/syslinux-3.35-nossp.patch,
+  +syslinux-3.35.ebuild:
+  Version bump.
 
   09 Feb 2007; Mike Frysinger <vapier@gentoo.org> syslinux-3.31.ebuild:
   Remove pregenerated dependency files #155644 by Daniel Black.
diff --git a/sys-boot/syslinux/files/digest-syslinux-3.35 b/sys-boot/syslinux/files/digest-syslinux-3.35
new file mode 100644
index 000000000000..675a231ea155
--- /dev/null
+++ b/sys-boot/syslinux/files/digest-syslinux-3.35
@@ -0,0 +1,3 @@
+MD5 e6e1436a61bd024844426f5f7a9fd727 syslinux-3.35.tar.bz2 1562254
+RMD160 5496414de57dfa137eb70d214b8ca2f4c8aee04f syslinux-3.35.tar.bz2 1562254
+SHA256 86026ede9cdaa29da5d9d5bc307f8552edf780179ab29ea21a9530d0e0176e9a syslinux-3.35.tar.bz2 1562254
diff --git a/sys-boot/syslinux/files/syslinux-3.35-nopie.patch b/sys-boot/syslinux/files/syslinux-3.35-nopie.patch
new file mode 100644
index 000000000000..fb930577a6ee
--- /dev/null
+++ b/sys-boot/syslinux/files/syslinux-3.35-nopie.patch
@@ -0,0 +1,22 @@
+--- 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 -march=i386 -Os -fomit-frame-pointer -I./include -I../include $(call gcc_ok,-fno-stack-protector,)
++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,) $(call gcc_ok,-nopie,)
+ SFLAGS     = $(M32) -D__COM32__ -march=i386
+ LDFLAGS    = -T ../lib/com32.ld
+ LNXCFLAGS  = -I./include -W -Wall -fno-stack-protector -O -g
+--- 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	 = -m32 -mregparm=3 -DREGPARM=3 -W -Wall -ffreestanding -msoft-float $(OPTFLAGS) $(INCLUDES) -fno-stack-protector
++CFLAGS	 = -m32 -mregparm=3 -DREGPARM=3 -W -Wall -ffreestanding -msoft-float $(OPTFLAGS) $(INCLUDES) -fno-stack-protector -nopie
+ LDFLAGS	 = -T com16.ld
+ AR       = ar
+ RANLIB   = ranlib
diff --git a/sys-boot/syslinux/files/syslinux-3.35-nossp.patch b/sys-boot/syslinux/files/syslinux-3.35-nossp.patch
new file mode 100644
index 000000000000..9d52aaac36d3
--- /dev/null
+++ b/sys-boot/syslinux/files/syslinux-3.35-nossp.patch
@@ -0,0 +1,171 @@
+--- 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,8 +194,8 @@
+ $(LIB_SO): bootsect_bin.o ldlinux_bin.o syslxmod.o
+ 	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIB_SONAME) -o $@ $^
+ 
+-gethostip: gethostip.o
+-	$(CC) $(LDFLAGS) -o $@ $^
++gethostip: gethostip.c
++	$(CC) $(LDFLAGS) -o $@ $^ -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 @@
+ 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	 = -m32 -mregparm=3 -DREGPARM=3 -W -Wall -ffreestanding -msoft-float $(OPTFLAGS) $(INCLUDES)
++CFLAGS	 = -m32 -mregparm=3 -DREGPARM=3 -W -Wall -ffreestanding -msoft-float $(OPTFLAGS) $(INCLUDES) -fno-stack-protector
+ 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
+-CFLAGS   =  $(M32) $(FREE) -g -W -Wall -Wno-sign-compare \
++CFLAGS   =  $(M32) $(FREE) -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 @@
+ AR	   = ar
+ NASM	   = nasm
+ RANLIB	   = ranlib
+-CFLAGS     = $(M32) -W -Wall -march=i386 -Os -fomit-frame-pointer -I../com32/include
++CFLAGS     = $(M32) -W -Wall -march=i386 -Os -fomit-frame-pointer -I../com32/include $(call gcc_ok,-fno-stack-protector,)
+ SFLAGS     = $(M32) -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 @@
+ WINCC       = gcc
+ WINAR  	    = ar
+ WINRANLIB   = ranlib
+-WINCFLAGS   = -mno-cygwin -W -Wall -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
++WINCFLAGS   = -mno-cygwin -W -Wall -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -fno-stack-protector
+ WINPIC	    =
+ WINLDFLAGS  = -mno-cygwin -Os -s
+ else
+@@ -37,7 +37,7 @@
+ WINRANLIB   = mingw-ranlib
+ endif
+ 
+-WINCFLAGS   = -W -Wall -Wno-sign-compare -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
++WINCFLAGS   = -W -Wall -Wno-sign-compare -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -fno-stack-protector
+ WINPIC      =
+ WINLDFLAGS  = -Os -s
+ endif
diff --git a/sys-boot/syslinux/syslinux-3.35.ebuild b/sys-boot/syslinux/syslinux-3.35.ebuild
new file mode 100644
index 000000000000..4854533c1f86
--- /dev/null
+++ b/sys-boot/syslinux/syslinux-3.35.ebuild
@@ -0,0 +1,41 @@
+# 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.35.ebuild,v 1.1 2007/02/09 23:52:51 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.35-nossp.patch
+	epatch "${FILESDIR}"/syslinux-3.35-nopie.patch
+}
+
+src_compile() {
+	emake installer || die
+}
+
+src_install() {
+	make INSTALLROOT="${D}" install || die
+	dodoc README* NEWS TODO *.doc memdisk/memdisk.doc
+}