Re-setting/correcting ipxe-nopie.patch to match source content in 4.2.0-r3 and disabling the patch in -4.2.1-r1 (pending further testing) consequent to Bug #447716, removed redunadant 4-add-nopie.patch

(Portage version: 2.1.11.40/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

5 files changed, 26 insertions, 13 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index f75da1b7df87..6733d026ef99 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.129 2013/01/30 09:09:01 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.130 2013/01/31 17:57:10 idella4 Exp $
+
+  31 Jan 2013; Ian Delaney <idella4@gentoo.org> files/ipxe-nopie.patch,
+  xen-tools-4.2.0-r2.ebuild, xen-tools-4.2.0-r3.ebuild,
+  xen-tools-4.2.1-r1.ebuild:
+  Re-setting/correcting ipxe-nopie.patch to match source content in 4.2.0-r3 and
+  disabling the patch in -4.2.1-r1 (pending further testing) consequent to Bug
+  #447716, removed redunadant 4-add-nopie.patch
 
 *xen-tools-4.2.0-r3 (30 Jan 2013)
 *xen-tools-4.2.1-r1 (30 Jan 2013)
diff --git a/app-emulation/xen-tools/files/ipxe-nopie.patch b/app-emulation/xen-tools/files/ipxe-nopie.patch
index 86dc9a32ad2b..c5be735f1e35 100644
--- a/app-emulation/xen-tools/files/ipxe-nopie.patch
+++ b/app-emulation/xen-tools/files/ipxe-nopie.patch
@@ -4,8 +4,8 @@
 		* /tools/firmware/etherboot/patches/ipxe-nopie.patche		New patch
 		* /tools/firmware/etherboot/patches/series				Add ipxe-nopie.patch
 
-#--- tools/firmware/etherboot/patches/ipxe-nopie.patch	1970-01-01 01:00:00.000000000 +0100
-#+++ tools/firmware/etherboot/patches/ipxe-nopie.patch	2011-03-27 17:45:13.929697782 +0200
+--- a/tools/firmware/etherboot/patches/ipxe-nopie.patch	1970-01-01 01:00:00.000000000 +0100
++++ b/tools/firmware/etherboot/patches/ipxe-nopie.patch	2011-03-27 17:45:13.929697782 +0200
 @@ -0,0 +1,11 @@
 +--- ipxe/src/Makefile~	2011-03-27 17:41:52.000000000 +0200
 ++++ ipxe/src/Makefile	2011-03-27 17:43:20.869446433 +0200
@@ -18,3 +18,12 @@
 + ASFLAGS		:=
 + LDFLAGS		:=
 + MAKEDEPS	:= Makefile
+--- a/tools/firmware/etherboot/patches/series	2011-03-25 11:42:50.000000000 +0100
++++ b/tools/firmware/etherboot/patches/series	2011-03-27 17:45:45.140446216 +0200
+@@ -1,4 +1,5 @@
+ boot_prompt_option.patch
+ build_fix_1.patch
+ build_fix_2.patch
+ build_fix_3.patch
++ipxe-nopie.patch
+
diff --git a/app-emulation/xen-tools/xen-tools-4.2.0-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.2.0-r2.ebuild
index ec6fe3e3b2b6..ac6e590a0ae2 100644
--- a/app-emulation/xen-tools/xen-tools-4.2.0-r2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.0-r2.ebuild,v 1.7 2013/01/30 09:09:01 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.0-r2.ebuild,v 1.8 2013/01/31 17:57:10 idella4 Exp $
 
 EAPI=5
 
@@ -132,7 +132,6 @@ src_prepare() {
 	# Drop .config
 	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
 
-
 	# Xend
 	if ! use xend; then
 		sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \
diff --git a/app-emulation/xen-tools/xen-tools-4.2.0-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.2.0-r3.ebuild
index ec3116004b10..040b7d8d40c4 100644
--- a/app-emulation/xen-tools/xen-tools-4.2.0-r3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.0-r3.ebuild,v 1.1 2013/01/30 09:09:01 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.0-r3.ebuild,v 1.2 2013/01/31 17:57:10 idella4 Exp $
 
 EAPI=5
 
@@ -185,8 +185,7 @@ src_prepare() {
 
 	# Don't build ipxe with pie on hardened, Bug #360805
 	if gcc-specs-pie; then
-		cp -f "${FILESDIR}"/ipxe-nopie.patch tools/firmware/etherboot/patches/ || die
-		epatch "${FILESDIR}"/${PN}-4-add-nopie.patch
+		epatch "${FILESDIR}"/ipxe-nopie.patch
 	fi
 
 	# Prevent double stripping of files at install
diff --git a/app-emulation/xen-tools/xen-tools-4.2.1-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.2.1-r1.ebuild
index 6a4311894d39..f8e56cd6c13a 100644
--- a/app-emulation/xen-tools/xen-tools-4.2.1-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.1-r1.ebuild,v 1.1 2013/01/30 09:09:01 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.1-r1.ebuild,v 1.2 2013/01/31 17:57:10 idella4 Exp $
 
 EAPI=5
 
@@ -184,10 +184,9 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch"
 
 	# Don't build ipxe with pie on hardened, Bug #360805
-	if gcc-specs-pie; then
-		cp -f "${FILESDIR}"/ipxe-nopie.patch tools/firmware/etherboot/patches/ || die
-		epatch "${FILESDIR}"/${PN}-4-add-nopie.patch
-	fi
+#	if gcc-specs-pie; then
+#		epatch "${FILESDIR}"/ipxe-nopie.patch
+#	fi
 
 	# Prevent double stripping of files at install
 	epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip.patch