Fix sandbox violation, http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=1405 Closes #259670

Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

4 files changed, 137 insertions, 2 deletions

diff --git a/app-emulation/xen/ChangeLog b/app-emulation/xen/ChangeLog
index 9abab23edc2a..219b4b620c15 100644
--- a/app-emulation/xen/ChangeLog
+++ b/app-emulation/xen/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/xen
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.59 2009/04/26 13:16:10 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.60 2009/04/27 12:51:21 patrick Exp $
+
+*xen-3.3.1-r1 (27 Apr 2009)
+
+  27 Apr 2009; Patrick Lauer <patrick@gentoo.org>
+  +files/xen-3.3.0-unexported-target-fix.patch, +xen-3.3.1-r1.ebuild:
+  Fix sandbox violation,
+  http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=1405 Closes #259670
 
 *xen-3.3.1 (26 Apr 2009)
 
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 07145d3f2f87..2c160d901171 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,3 +1,4 @@
+AUX xen-3.3.0-unexported-target-fix.patch 788 RMD160 4b30444c021479cbd3969493639533fc1e43e781 SHA1 9119f06b4a005c385ac27e085e2d96ccf9cd4dc9 SHA256 e46f5fbe4c579b84f895f0ac6e05589553a11305ca30e69405082d58abd9ee07
 AUX xen-3.3.0-warning-fix.patch 968 RMD160 7834653a79cece5fe6c891a9fa60999d3017d53d SHA1 7dc792eace2fb3fdeccce4b3d791701a92095592 SHA256 1072d031b2bc4b217f4c2b4795d30cd81d592c1838ea6b399f2e62f0077e15f3
 AUX xen-sed-gcc.patch 1026 RMD160 ddb00f6a04cb791fd895ca0221987df624fe8a35 SHA1 602f9779f56c3a9f0a97f458a6d3eec2740440ef SHA256 7b6d10a51aa56991b1624252edf7842f6e7883a0b0f0e77edf0414f57cc390b0
 DIST xen-3.1.3.tar.bz2 5852287 RMD160 df36208c8e709c61f2b4a74d18d2e81531ab4721 SHA1 5542d2bd07afaf80d70c85f7b75c6e6b432be08b SHA256 b94ab7a07269848dec8904625f348405c4af4ac7b579a402b2d830503ecd53a1
@@ -7,6 +8,7 @@ DIST xen-3.3.1.tar.gz 11329774 RMD160 31d3e801b4eec37715900c6247be403aaafdd5e1 S
 EBUILD xen-3.1.3.ebuild 2543 RMD160 d0f4eb913ebd5e9721698ad9c6f3baec75cb8372 SHA1 94fac9d73c522205c04ae37d500d7dc326317959 SHA256 dad9c783e17507e9461347add4529100c82ca331025d7485c4ca55527fc3ceb7
 EBUILD xen-3.2.1.ebuild 2565 RMD160 2a2829c2552c0df03834eaaf120a796fc3d22bf3 SHA1 82c5d1189e95edbb1d6085add13a3e05e7b8028c SHA256 8892ac5ff60d04b328794712568b7cbee543fb2aae332b465496eedd1388f844
 EBUILD xen-3.3.0.ebuild 3003 RMD160 e34ed745379cd983d605b8b152de73d12e80070e SHA1 200acd89bb8e43ff38a437c413c83dd63c915652 SHA256 498fa05f3bccef4f9a4dcc62afd72a0fb003c2139cbed19c0520b472bfe104ea
+EBUILD xen-3.3.1-r1.ebuild 2978 RMD160 167b03e580c6adb72a7049fe0930d5becaa12b39 SHA1 472fd48251e0c61bd84dc10359a398ef2cbb3ce5 SHA256 817514684de4593cf8894905b2d3442deb78a93899a348017a983c7fd163920d
 EBUILD xen-3.3.1.ebuild 2875 RMD160 a96987e2db6bfbb098b6f60b1274a85ef9d5253a SHA1 c8041ccaa2294da8787726500b02fd0b5e221719 SHA256 546778f9303988dbefd3bff516a8ac185add3c4f69ee709e82d5572622facf03
-MISC ChangeLog 9737 RMD160 6db1fe7d8a75d0e0eb8c243381c33d6f43424803 SHA1 7e2f67c1e52535e3c91c7eaa1acf6a2874546957 SHA256 560d9da0075932cb42fe94ea3e9b6ee1070a2b907699c802f9c509673aecf7a1
+MISC ChangeLog 9989 RMD160 a5033bee0765bcb878c209ac56ccbe61e6870c94 SHA1 0928918dc4c866103c5b40ea002160282ca77c45 SHA256 d33bcef15eab405854f24e18c64e7a2a7962821477e12a6b409ce83811b97512
 MISC metadata.xml 454 RMD160 669ebed46522166118d55bf6f6917b5902a8edb4 SHA1 76bc8f2ae3abb50dbf778d8051fcf797b19b092c SHA256 383ef9830d024c489d6edec8c78bf391821c7f1076c6b56d6e1dd2a754754279
diff --git a/app-emulation/xen/files/xen-3.3.0-unexported-target-fix.patch b/app-emulation/xen/files/xen-3.3.0-unexported-target-fix.patch
new file mode 100644
index 000000000000..89f91a49a0d4
--- /dev/null
+++ b/app-emulation/xen/files/xen-3.3.0-unexported-target-fix.patch
@@ -0,0 +1,21 @@
+diff -Nru a/tools/ioemu-qemu-xen/xen-setup b/tools/ioemu-qemu-xen/xen-setup
+--- a/tools/ioemu-qemu-xen/xen-setup	2008-08-22 17:56:41.000000000 +0800
++++ b/tools/ioemu-qemu-xen/xen-setup	2009-02-20 10:55:37.000000000 +0800
+@@ -3,6 +3,8 @@
+ 
+ # git-clean -x -d && ./xen-setup && make prefix=/usr CMDLINE_CFLAGS='-O0 -g' -j4 && make install DESTDIR=`pwd`/dist/ prefix=/usr && rsync -a --stats --delete . thule:shadow/qemu-iwj.git/ && rsync -a --stats dist/. root@thule:/
+ 
++target=i386-dm
++
+ rm -f $target/Makefile
+ rm -f $target/config.mak
+ rm -f config-host.mak
+@@ -11,8 +13,6 @@
+ 
+ ./configure --disable-gfx-check --disable-gcc-check --disable-curses --disable-slirp "$@" --prefix=/usr
+ 
+-target=i386-dm
+-
+ if [ "x$XEN_ROOT" != x ]; then
+ 	echo "XEN_ROOT=$XEN_ROOT" >>config-host.mak
+ fi
diff --git a/app-emulation/xen/xen-3.3.1-r1.ebuild b/app-emulation/xen/xen-3.3.1-r1.ebuild
new file mode 100644
index 000000000000..38cb2c7a777d
--- /dev/null
+++ b/app-emulation/xen/xen-3.3.1-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.3.1-r1.ebuild,v 1.1 2009/04/27 12:51:21 patrick Exp $
+
+inherit mount-boot flag-o-matic toolchain-funcs
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug custom-cflags pae acm flask xsm"
+
+RDEPEND="|| ( sys-boot/grub
+		sys-boot/grub-static )
+		>=sys-kernel/xen-sources-2.6.18"
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+RESTRICT="test"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+pkg_setup() {
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use xsm ; then
+		export "XSM_ENABLE=y"
+		use acm && export "ACM_SECURITY=y"
+		if use flask ; then
+			! use acm  && export "FLASK_ENABLE=y"
+			  use acm  && ewarn "Both acm and flask XSM specified, defaulting to acm."
+		fi
+	elif use acm || use flask ; then
+		ewarn "acm and flask require USE=xsm to be set, dropping use flags"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix unexport $target in xen-setup
+	epatch "${FILESDIR}/"${PN}-3.3.0-unexported-target-fix.patch
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \;
+	fi
+}
+
+src_compile() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+	use pae && myopt="${myopt} pae=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+	fi
+
+	# Send raw LDFLAGS so that --as-needed works
+	emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" -C xen ${myopt} || die "compile failed"
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+	use pae && myopt="${myopt} pae=y"
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install || die "install failed"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the unoffical wiki page:"
+	elog " http://www.gentoo.org/doc/en/xen-guide.xml"
+	elog " http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo"
+
+	if use pae; then
+		echo
+		ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
+	fi
+}