Bug #244775, version bump.

(Portage version: 2.2_rc18/cvs/Linux 2.6.28-rc5-00117-g7f0f598 x86_64)

4 files changed, 101 insertions, 1 deletions

diff --git a/sys-boot/syslinux/ChangeLog b/sys-boot/syslinux/ChangeLog
index fece1bdf3126..5e9db1d2d05c 100644
--- a/sys-boot/syslinux/ChangeLog
+++ b/sys-boot/syslinux/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-boot/syslinux
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.38 2008/10/25 18:43:33 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.39 2008/12/21 01:02:30 robbat2 Exp $
+
+*syslinux-3.72 (21 Dec 2008)
+
+  21 Dec 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +files/syslinux-3.72-nopie.patch, +files/syslinux-3.72-nostrip.patch,
+  +syslinux-3.72.ebuild:
+  Bug #244775, version bump.
 
   25 Oct 2008; Zac Medico <zmedico@gentoo.org> syslinux-3.71.ebuild:
   Bug #244300 - Call `emake install` with MANDIR=/usr/share/man.
diff --git a/sys-boot/syslinux/files/syslinux-3.72-nopie.patch b/sys-boot/syslinux/files/syslinux-3.72-nopie.patch
new file mode 100644
index 000000000000..ea92b8fb5c60
--- /dev/null
+++ b/sys-boot/syslinux/files/syslinux-3.72-nopie.patch
@@ -0,0 +1,12 @@
+diff -ur a/com32/MCONFIG b/com32/MCONFIG
+--- a/com32/MCONFIG	2008-09-26 01:46:02.000000000 +0200
++++ b/com32/MCONFIG	2008-10-28 16:10:16.107964907 +0100
+@@ -19,6 +19,8 @@
+ GCCOPT := $(call gcc_ok,-std=gnu99,) \
+ 	  $(call gcc_ok,-m32,) \
+ 	  $(call gcc_ok,-fno-stack-protector,) \
++	  $(call gcc_ok,-nopie,) \
++	  $(call gcc_ok,-fnopie,) \
+ 	  -mregparm=3 -DREGPARM=3 -march=i386 -Os
+ 
+ com32 = $(topdir)/com32
diff --git a/sys-boot/syslinux/files/syslinux-3.72-nostrip.patch b/sys-boot/syslinux/files/syslinux-3.72-nostrip.patch
new file mode 100644
index 000000000000..a8d0270500a8
--- /dev/null
+++ b/sys-boot/syslinux/files/syslinux-3.72-nostrip.patch
@@ -0,0 +1,36 @@
+diff -ur a/linux/Makefile b/linux/Makefile
+--- a/linux/Makefile	2008-09-26 01:46:02.000000000 +0200
++++ b/linux/Makefile	2008-10-28 15:56:25.818399544 +0100
+@@ -20,7 +20,7 @@
+ OPTFLAGS = -g -Os
+ INCLUDES = -I. -I.. -I../libinstaller
+ CFLAGS	 = -W -Wall -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
+-LDFLAGS	 = -s
++LDFLAGS	 = 
+ 
+ SRCS     = syslinux.c \
+            ../libinstaller/syslxmod.c \
+diff -ur a/mtools/Makefile b/mtools/Makefile
+--- a/mtools/Makefile	2008-09-26 01:46:02.000000000 +0200
++++ b/mtools/Makefile	2008-10-28 15:56:45.113477480 +0100
+@@ -4,7 +4,7 @@
+ OPTFLAGS = -g -Os
+ INCLUDES = -I. -I.. -I../libfat -I../libinstaller
+ CFLAGS	 = -W -Wall -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
+-LDFLAGS	 = -s
++LDFLAGS	 = 
+ 
+ SRCS     = syslinux.c \
+ 	   ../libinstaller/syslxmod.c \
+diff -ur a/utils/Makefile b/utils/Makefile
+--- a/utils/Makefile	2008-09-26 01:46:02.000000000 +0200
++++ b/utils/Makefile	2008-10-28 15:56:55.843968018 +0100
+@@ -18,7 +18,7 @@
+ include $(topdir)/MCONFIG
+ 
+ CFLAGS   = -W -Wall -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
+-LDFLAGS  = -O2 -s
++LDFLAGS  = -O2
+ 
+ TARGETS	 = mkdiskimage isohybrid gethostip
+ ASIS     = keytab-lilo lss16toppm md5pass ppmtolss16 sha1pass syslinux2ansi
diff --git a/sys-boot/syslinux/syslinux-3.72.ebuild b/sys-boot/syslinux/syslinux-3.72.ebuild
new file mode 100644
index 000000000000..e3eca7f285ac
--- /dev/null
+++ b/sys-boot/syslinux/syslinux-3.72.ebuild
@@ -0,0 +1,45 @@
+# 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.1 2008/12/21 01:02:30 robbat2 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 install || die
+	dodoc README NEWS TODO doc/*
+}