Fix xen-tools-3.1.0 on x86 hardened

Package-Manager: portage-2.1.2.12

4 files changed, 32 insertions, 10 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 733e75ea33c3..027434bc817a 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.25 2007/08/24 23:21:52 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.26 2007/08/26 21:40:41 marineam Exp $
+
+  26 Aug 2007; Michael Marineau <marineam@gentoo.org>
+  +files/xen-tools-3.1.0-xen-detect-nopie-fix.patch, xen-tools-3.1.0.ebuild:
+  Fix build on x86 hardened.
 
 *xen-tools-3.1.0 (24 Aug 2007)
 
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 7cbab03ee819..a3fd9e774fbc 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -22,6 +22,10 @@ AUX xen-tools-3.1.0-python-site-packages.patch 1205 RMD160 319e95a53b9860358849f
 MD5 e95f0b1dfd034e510237b90e9601c095 files/xen-tools-3.1.0-python-site-packages.patch 1205
 RMD160 319e95a53b9860358849fef1eea6454a088f3b33 files/xen-tools-3.1.0-python-site-packages.patch 1205
 SHA256 ff26da54fad7ac66b17774963220f265950d28ad167808bf41f9084425eb07d6 files/xen-tools-3.1.0-python-site-packages.patch 1205
+AUX xen-tools-3.1.0-xen-detect-nopie-fix.patch 385 RMD160 5ad84ac847c1eeeaa7aac2fbcfd3b476ee7c991d SHA1 bd59257c972b7cd976b4b1953ff44a43a1d2b003 SHA256 c8b7a0858001b15ff12cc652977eb7ada06b036a8c593fccac9015ce05c84816
+MD5 bd84228a8540517a0eb0353f6b5c28fa files/xen-tools-3.1.0-xen-detect-nopie-fix.patch 385
+RMD160 5ad84ac847c1eeeaa7aac2fbcfd3b476ee7c991d files/xen-tools-3.1.0-xen-detect-nopie-fix.patch 385
+SHA256 c8b7a0858001b15ff12cc652977eb7ada06b036a8c593fccac9015ce05c84816 files/xen-tools-3.1.0-xen-detect-nopie-fix.patch 385
 AUX xend.initd 1291 RMD160 96659d237688d0c42e5c30491ad883d4af0f1c0f SHA1 2ffe2b29df7014d1dbf69f850a23a95e1b294288 SHA256 41ae7f38565a477abc1fb8ac5af9d6285bf90d171b922c6413aa8aefe5b00889
 MD5 7f0fd3d9e324921b0ffabfb2b6e17945 files/xend.initd 1291
 RMD160 96659d237688d0c42e5c30491ad883d4af0f1c0f files/xend.initd 1291
@@ -44,14 +48,14 @@ EBUILD xen-tools-3.0.4_p1.ebuild 5801 RMD160 5d7003e22f5dfbc29af8171041cf1f4f002
 MD5 af46ed842f891707805c1bef0a0c1579 xen-tools-3.0.4_p1.ebuild 5801
 RMD160 5d7003e22f5dfbc29af8171041cf1f4f00286c29 xen-tools-3.0.4_p1.ebuild 5801
 SHA256 6986e362ef29959ef6bbe2897dc5d79ae7af90682084e054d549ae7c362cf600 xen-tools-3.0.4_p1.ebuild 5801
-EBUILD xen-tools-3.1.0.ebuild 6006 RMD160 e21d833f5964d41e285ada568e123c72ba605301 SHA1 1894e382f40cb4fb604fc488894983b72df179ba SHA256 b5e591fbb6a5eccf83355417c6dc3fcbf571356692429ed7301ddf70378b0cca
-MD5 8b8d0d396fe86b91308cef7717377ba4 xen-tools-3.1.0.ebuild 6006
-RMD160 e21d833f5964d41e285ada568e123c72ba605301 xen-tools-3.1.0.ebuild 6006
-SHA256 b5e591fbb6a5eccf83355417c6dc3fcbf571356692429ed7301ddf70378b0cca xen-tools-3.1.0.ebuild 6006
-MISC ChangeLog 8131 RMD160 7cf7d785c6d8ed6e73dcc1cc0fc2eb32acc8e667 SHA1 1bac7a3ae58760d204e808342023a54f41a06f9e SHA256 c12aac493e652a804e00fb3964940795350e04a3b09002e6708cec9be6b05093
-MD5 10ff6b5dc6139850d7bfa3a2bf06d250 ChangeLog 8131
-RMD160 7cf7d785c6d8ed6e73dcc1cc0fc2eb32acc8e667 ChangeLog 8131
-SHA256 c12aac493e652a804e00fb3964940795350e04a3b09002e6708cec9be6b05093 ChangeLog 8131
+EBUILD xen-tools-3.1.0.ebuild 6134 RMD160 2525571a23c24b9f4d92add3f66b0ede5f73823c SHA1 368a1fd1be53b70f0f553fd60c77e048f739db1f SHA256 b4e5388bd4676601c259cdab0ea9a9b95ae560123f802bf2ce26ccc183e939c1
+MD5 cbd48fbfb9fe95d52ccd580f5aa7ef39 xen-tools-3.1.0.ebuild 6134
+RMD160 2525571a23c24b9f4d92add3f66b0ede5f73823c xen-tools-3.1.0.ebuild 6134
+SHA256 b4e5388bd4676601c259cdab0ea9a9b95ae560123f802bf2ce26ccc183e939c1 xen-tools-3.1.0.ebuild 6134
+MISC ChangeLog 8292 RMD160 38752f8de3fc2bc1a5ff98dd04608ba2661e2a74 SHA1 e2a4a69fe459756bbc0c75ad2a69e6d667605963 SHA256 40254011a44d1162f55bdd70f155a6b92b717ce89317300a22c3d70022a18874
+MD5 06e3b1b09a9b21e121a0345359a1a031 ChangeLog 8292
+RMD160 38752f8de3fc2bc1a5ff98dd04608ba2661e2a74 ChangeLog 8292
+SHA256 40254011a44d1162f55bdd70f155a6b92b717ce89317300a22c3d70022a18874 ChangeLog 8292
 MISC metadata.xml 156 RMD160 bb062b1ba5554779dcfd0e73baf533ce9fbcdf68 SHA1 e6da014f2004758c7a806592ef9450489eebf593 SHA256 4a030777459245372bda9f7925f3a5ed3ef2b29b77e1a2971f3400ac2059b1e2
 MD5 559b4095659a2a2a489784de8a6ef95e metadata.xml 156
 RMD160 bb062b1ba5554779dcfd0e73baf533ce9fbcdf68 metadata.xml 156
diff --git a/app-emulation/xen-tools/files/xen-tools-3.1.0-xen-detect-nopie-fix.patch b/app-emulation/xen-tools/files/xen-tools-3.1.0-xen-detect-nopie-fix.patch
new file mode 100644
index 000000000000..6515d123c8a0
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-3.1.0-xen-detect-nopie-fix.patch
@@ -0,0 +1,11 @@
+Index: xen-3.1.0-src/tools/misc/Makefile
+===================================================================
+--- xen-3.1.0-src.orig/tools/misc/Makefile
++++ xen-3.1.0-src/tools/misc/Makefile
+@@ -45,3 +45,6 @@ clean:
+ 
+ xenperf: %: %.o Makefile
+ 	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
++
++xen-detect: %: %.c Makefile
++	$(CC) $(CFLAGS) $(call cc-option,$(CC),-nopie,) -o $@ $<
diff --git a/app-emulation/xen-tools/xen-tools-3.1.0.ebuild b/app-emulation/xen-tools/xen-tools-3.1.0.ebuild
index eefc551bb1e5..d20d66f0b70b 100644
--- a/app-emulation/xen-tools/xen-tools-3.1.0.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.1.0.ebuild,v 1.2 2007/08/25 22:56:49 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.1.0.ebuild,v 1.3 2007/08/26 21:40:41 marineam Exp $
 
 inherit flag-o-matic distutils eutils multilib
 
@@ -107,6 +107,9 @@ src_unpack() {
 
 	# Also look in python's site packages for xen, as it installs there
 	epatch "${FILESDIR}/${PN}-3.1.0-python-site-packages.patch"
+
+	# Fix building small dumb utility called 'xen-detect' on hardened
+	epatch "${FILESDIR}/${PN}-3.1.0-xen-detect-nopie-fix.patch"
 }
 
 src_compile() {