Version bump.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

5 files changed, 100 insertions, 12 deletions

diff --git a/sys-boot/syslinux/ChangeLog b/sys-boot/syslinux/ChangeLog
index af3838422de8..139e831a9d93 100644
--- a/sys-boot/syslinux/ChangeLog
+++ b/sys-boot/syslinux/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-boot/syslinux
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.80 2011/07/13 08:47:59 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.81 2011/12/18 23:22:01 chithanh Exp $
+
+*syslinux-4.05 (18 Dec 2011)
+
+  18 Dec 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +syslinux-4.05.ebuild, +files/syslinux-4.05-asneeded-linking-order.patch,
+  +files/syslinux-4.05-nopie.patch:
+  Version bump.
 
   13 Jul 2011; Thomas Kahle <tomka@gentoo.org> syslinux-4.04.ebuild:
   x86 stable per bug 369791
diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index 49b71af81cdc..d9d7927615d8 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -1,22 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX syslinux-3.86-nopie.patch 551 RMD160 9facd00e8b1fb60affa4efd6622d6cecaaf3b615 SHA1 6ee3cb73478896759adff35060adebad45c2bb6c SHA256 90c3173728f6b3efef6fe9865d64bd571a7638537f51fae0cda14df5c7d9a39b
 AUX syslinux-4.00-nopie.patch 527 RMD160 485901ad3c55f50c3e3795efd5d2c5b18a406a5a SHA1 44152e5e2afd2d032e148349898ee78d3d9b1eb1 SHA256 d0d4834043d52f73969ca60eb37729ee44d866ecddf13bceacd7c71147698323
+AUX syslinux-4.05-asneeded-linking-order.patch 380 RMD160 77af89c19745f11ddc4a20c95dc4fb9b1c18d729 SHA1 8deeb58db51c63dc2646cb534ae3b553e5ef7b4c SHA256 f4bdd9a519509e6ab18963841475b3bbf56b00c7467587a61f4881a7b7af06c1
+AUX syslinux-4.05-nopie.patch 519 RMD160 a9b05830bef6413d3dd1a95a465bf8ccf9d5a615 SHA1 95d43f2243ca9fba1559837f2c55d0bfe404204c SHA256 2780aa55dec67a2375e28579392ed9658c4d47d0c47e4c43c22371dc926c47fc
 DIST syslinux-2.13.tar.bz2 421753 RMD160 fa11d68d2758b34b38d670f4866fb39eb4e246c4 SHA1 3c0bf23f35d91c5db7ad8976645ae86ab7320a85 SHA256 44aab24c05570e34a25e5192206098c3f220d7669be9cd9de9117d400a95c65e
 DIST syslinux-3.86.tar.bz2 3735823 RMD160 84a25e275da0d134bce620f1910b04aef9599407 SHA1 2d41043a3083c26e5e6bac3a5e8f17c3c0d963a1 SHA256 82a8d2a242f869cb4c34b3a074871f472762343e1879a4dca23d7ce5c4dcd06d
 DIST syslinux-4.03.tar.bz2 4381187 RMD160 11dcf7d0bf58dd8cb4fc573212f9206bfb81a472 SHA1 24e260facca404f075485a635f0ddffd6f97fd1a SHA256 c65567e324f9d1f7f794ae8f9578a0292bbd47d7b8d895a004d2f0152d0bda38
 DIST syslinux-4.04.tar.bz2 5340791 RMD160 6460ffcc0f4e291a86a4044b497c01b87bf090b7 SHA1 f3b434b6d0133984e0e523d8404a6463c03e6586 SHA256 e186a21cb1b3b1874f253df21546e8d0595d803bd6a60f38cfafbc10bee90e0b
+DIST syslinux-4.05.tar.bz2 5486307 RMD160 e380c5fec300105026a20aa54a22292c4a4e085e SHA1 1be0d53288740794af91433cd5cb27a518fc5302 SHA256 9093f246038a3671a323bd9dd7eb685338578f67f3da949123c6462e0903c0b8
 EBUILD syslinux-2.13.ebuild 953 RMD160 aacd2969a72d699beb9ccbc7591033193542411b SHA1 645c4f515c9f89bc73b48c071ce4b6d5e140176a SHA256 611542db39b3bebeb05afe699cdd761663cb11461af1041e6c5fd12df39d8a0c
 EBUILD syslinux-3.86.ebuild 1572 RMD160 b45975474c2321d43cba0e57b865f7bdeac72888 SHA1 426fe981858dbc144b08360c19e9f132e18c2b39 SHA256 b3a43fd1be11053fb6e5f90b65abf5c00e83f73aa5963f003c47a7ddbd4d218c
 EBUILD syslinux-4.03.ebuild 1709 RMD160 fe4973a7fd1c1ffd696bed9e92a90c1c3692a289 SHA1 8cd8b11ddcbc589b5f381408d78b9359a23d7682 SHA256 fa8db3b31158047b9612b4aa125338670fe3b189d329b40b50f8f4f76dd48f7c
 EBUILD syslinux-4.04.ebuild 1704 RMD160 eed0c71ef6240d4fa4475703c4be60b5f098c005 SHA1 53d1ec064e538498c93cc35d13e8c6f5f323e3c5 SHA256 2c276a0893dbb0a9d289853d2843f54184c8de01836e82655447af02e2781c12
-MISC ChangeLog 14349 RMD160 7f6d011ecb2606b892eb95c9788974e852e398d5 SHA1 10f0147e0733103024014de3fa11aa49dd422105 SHA256 be7cf0e0b98cbec506eec6570288528d9c6b2ed52414c3777671b63875ac3ef8
+EBUILD syslinux-4.05.ebuild 1805 RMD160 69ea61a8b4170910d14063484b9c923b27c68bdb SHA1 20d905e774a1cfc71508c92eaa3375921eb15d8c SHA256 bc0041431cfba2bc396b1698b4332dfcdc68ae93c317590db91f7fcc07f9ccaf
+MISC ChangeLog 14580 RMD160 7a29ec9f1840f0e213be9e2424821935a3794a7d SHA1 6eab642ec22444695af6bef455c70b730257c693 SHA256 66bf34b0592d70c930b7ab3231708f7ba0b5cb418cab0bacd408f48952a2e2b2
 MISC metadata.xml 273 RMD160 1fe6f9528f6f46e20406b962509bf77704a16769 SHA1 820cb70004d78f987a9793acd126c662e28e180a SHA256 ea16e9afcad5ef9e9b29e6959a4632309279e4e0de69c29b40279226c3917b80
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk4dW8UACgkQodBTJSDyo64lTQD+K6ENq1eGWWKUblB2US1s1VJv
-ToGWuzUtTEyJqiAYmMUA/2cs8bC0n7LaSAYnbS+0YOBd53EnaDlVvOToq9S/caS8
-=HGW3
------END PGP SIGNATURE-----
diff --git a/sys-boot/syslinux/files/syslinux-4.05-asneeded-linking-order.patch b/sys-boot/syslinux/files/syslinux-4.05-asneeded-linking-order.patch
new file mode 100644
index 000000000000..8dca7cc42a59
--- /dev/null
+++ b/sys-boot/syslinux/files/syslinux-4.05-asneeded-linking-order.patch
@@ -0,0 +1,12 @@
+diff -ur a/utils/Makefile b/utils/Makefile
+--- a/utils/Makefile	2011-12-09 19:28:17.000000000 +0100
++++ b/utils/Makefile	2011-12-18 20:56:24.306014471 +0100
+@@ -51,7 +51,7 @@
+ 	$(PERL) isohdpfxarray.pl $(ISOHDPFX) > $@
+ 
+ isohybrid: isohybrid.o isohdpfx.o
+-	$(CC) $(LDFLAGS) -luuid -o $@ $^
++	$(CC) $(LDFLAGS) -o $@ $^ -luuid
+ 
+ gethostip: gethostip.o
+ 	$(CC) $(LDFLAGS) -o $@ $^
diff --git a/sys-boot/syslinux/files/syslinux-4.05-nopie.patch b/sys-boot/syslinux/files/syslinux-4.05-nopie.patch
new file mode 100644
index 000000000000..b50b6b476895
--- /dev/null
+++ b/sys-boot/syslinux/files/syslinux-4.05-nopie.patch
@@ -0,0 +1,12 @@
+diff -ur a/mk/com32.mk b/mk/com32.mk
+--- a/mk/com32.mk	2011-12-09 19:28:17.000000000 +0100
++++ b/mk/com32.mk	2011-12-18 18:22:11.032342645 +0100
+@@ -24,6 +24,8 @@
+ GCCOPT += $(call gcc_ok,-freg-struct-return,)
+ GCCOPT += -mregparm=3 -DREGPARM=3 -march=i386 -Os
+ GCCOPT += $(call gcc_ok,-fPIE,-fPIC)
++GCCOPT += $(call gcc_ok,-nopie,)
++GCCOPT += $(call gcc_ok,-fno-pie,)
+ GCCOPT += $(call gcc_ok,-fno-exceptions,)
+ GCCOPT += $(call gcc_ok,-fno-asynchronous-unwind-tables,)
+ GCCOPT += $(call gcc_ok,-fno-strict-aliasing,)
diff --git a/sys-boot/syslinux/syslinux-4.05.ebuild b/sys-boot/syslinux/syslinux-4.05.ebuild
new file mode 100644
index 000000000000..51a8af15f9d6
--- /dev/null
+++ b/sys-boot/syslinux/syslinux-4.05.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-4.05.ebuild,v 1.1 2011/12/18 23:22:01 chithanh Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
+HOMEPAGE="http://syslinux.zytor.com/"
+SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="custom-cflags"
+
+RDEPEND="sys-fs/mtools
+		dev-perl/Crypt-PasswdMD5
+		dev-perl/Digest-SHA1"
+DEPEND="${RDEPEND}
+	dev-lang/nasm"
+
+S=${WORKDIR}/${P/_/-}
+
+# 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}"
+	# Fix building on hardened
+	epatch "${FILESDIR}"/${PN}-4.05-nopie.patch
+
+	# Fix building with --as-needed
+	epatch "${FILESDIR}"/${PN}-4.05-asneeded-linking-order.patch
+
+	rm -f gethostip #bug 137081
+
+	# Don't prestrip or override user LDFLAGS, bug #305783
+	local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \
+		sample/Makefile utils/Makefile"
+	sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed"
+
+	if use custom-cflags; then
+		sed -i ${SYSLINUX_MAKEFILES} \
+			-e 's|-g -Os||g' \
+			-e 's|-Os||g' \
+			-e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \
+			|| die "sed custom-cflags failed"
+	fi
+
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) installer || die
+}
+
+src_install() {
+	emake INSTALLSUBDIRS=utils INSTALLROOT="${D}" MANDIR=/usr/share/man install || die
+	dodoc README NEWS doc/* || die
+}