Small sandbox fix, closes 253134. Patch originally from RB.

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

4 files changed, 32 insertions, 4 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index a30e279ec66f..065521f773a6 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.45 2009/04/27 15:44:54 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.46 2009/04/28 07:57:21 patrick Exp $
+
+  28 Apr 2009; Patrick Lauer <patrick@gentoo.org>
+  +files/xen-tools-3.3.1-sandbox-fix.patch, xen-tools-3.3.1:
+  Small sandbox fix, closes 253134. Patch originally from RB.
 
   27 Apr 2009; Patrick Lauer <patrick@gentoo.org> xen-tools-3.3.1:
   Bump to eapi2 for usedeps, fixing depends for use=doc, closes #199764
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 15cf68e9f6c8..0d2ef07d743d 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -9,6 +9,7 @@ AUX xen-tools-3.3.0--as-needed.patch 1044 RMD160 67f097f26a2a14218c3b9e41b9e5f81
 AUX xen-tools-3.3.0-nostrip.patch 1021 RMD160 f702b588596dfdebf71fafbf866d270ac5bb549e SHA1 bb4db097af6e206ed68bcc1a1c3ef48b02e9a4c5 SHA256 2debac718c01a7eac4daf3182a7ae04aa562137d791cd510ecf1848d7eaccebd
 AUX xen-tools-3.3.0-warning-fix.patch 1434 RMD160 28f6077a55c5ef7989f3880de999ce477b381c1e SHA1 69b54a1c3404634c341d53b0ab40812a99d31fb0 SHA256 111ff6d0cda77efe84895ecbc39f548d6292ce04e2a574934fb6501a908beaea
 AUX xen-tools-3.3.0-xen-detect-nopie-fix.patch 394 RMD160 77f48ee4bdeb61f91f5dd1c0ebf2351c8ffa1b55 SHA1 07eea51bb2979f7fe342954902b8680a6bd1a7bc SHA256 64266079194f5b8374ae0c2537645f4e3658817b42e55971ebc869dc03f37208
+AUX xen-tools-3.3.1-sandbox-fix.patch 828 RMD160 6c637b0883b72f12ce33b9c6d2dc7cf5267fc85a SHA1 51b35f096c0ad5c83e9654cfe0267b8efc51367e SHA256 519236a71e81e1da1c9a7616745422e6f205f4f7901abba7af0e0aef665af343
 AUX xend.initd 1291 RMD160 96659d237688d0c42e5c30491ad883d4af0f1c0f SHA1 2ffe2b29df7014d1dbf69f850a23a95e1b294288 SHA256 41ae7f38565a477abc1fb8ac5af9d6285bf90d171b922c6413aa8aefe5b00889
 AUX xendomains-screen.confd 594 RMD160 79c7a3546cf1d3f8558c2120d6e8c93c753e66b9 SHA1 7f9ed2986495d5fa4a6f8b050cd632fde6a19994 SHA256 c4d7ffcdbeccc5e93460e2abbf70d642a78a363d79ccbbce0407f50cace54e0a
 AUX xendomains.confd 291 RMD160 75d55db5360da12fc3d721c37001ccbfbb844e52 SHA1 e7be8973a4bcbfc7680258e369b07e2ed097ef49 SHA256 2fac318bb96b357dd185f7729d83c0a0b941799cdb89c24ed83051bb085735dc
@@ -21,6 +22,6 @@ EBUILD xen-tools-3.1.3-r1.ebuild 6763 RMD160 6c6e3ebcd62eb7d08ef86f93aa18f0ae1da
 EBUILD xen-tools-3.1.3.ebuild 6657 RMD160 908c386349e533e85e7ed3aaf30c21960da26d69 SHA1 240d5ee186ca824ea9ea8a727c7dc1460c4acd84 SHA256 f77bde05f6bfb6fb1b111b51837eec57872b0533219ddb300843aeb1733ff414
 EBUILD xen-tools-3.2.1.ebuild 6831 RMD160 5c59bc41afbab20a9cd6d42aa48bbfc8bb71d187 SHA1 3fdec239a85be84b6f321f42ece5b9b7c01ab555 SHA256 60a352407c7e737ab278cbef4ea78091de26ee54e1d56ad09259d65c4bf1ce6e
 EBUILD xen-tools-3.3.0.ebuild 7817 RMD160 0e6ac767cb100959c3274a038bef0ce5c25a0428 SHA1 0eb2b151306888302ed5083abd6954bd4a2bb081 SHA256 5328c8d3b388fc4d2ea5a42f73db6aab4191dd339abfbccb3cedfafc2e381cdc
-EBUILD xen-tools-3.3.1.ebuild 6990 RMD160 dfdfb14dabe295079f1b523264a239f7727da6d2 SHA1 47a383147bb0f33afbe40c54036fef5ab4b2314d SHA256 3c8b6a925de86b2fe439438eaba8d47d3cce79adffe00d9ce6cb1146b341e2d1
-MISC ChangeLog 13127 RMD160 8921b38a48288966cde2cb99c568cc4fb7a9b049 SHA1 b94bf4b402a3420126caaac224c4f78fb7a7eaf8 SHA256 28682a7a36145a77886fe8b7681a12313e79bba9f8bdced459b7646343459ec0
+EBUILD xen-tools-3.3.1.ebuild 7102 RMD160 d1777e8006b669077d73104c384613d6c0e19f4b SHA1 a633182e2be5dfb408dca158fad64ae94ab442f9 SHA256 f5a023b1cf3d60cb8cfaedc0641d1d5fd3226bdd1e77860d2ff28b357549bd1f
+MISC ChangeLog 13301 RMD160 3ab4cdc8c85048fec84252ca84cca227406205a5 SHA1 9917abbb85c28b91548dd2d8341840d3af9d6379 SHA256 d7d423970f95cbfd2e2fb241910d6e76195409094db0a67b331bf30a8df3b5bc
 MISC metadata.xml 673 RMD160 021c0a8f46b9d3025871c246aa7611904be2e2f9 SHA1 3af764dc6af79bcda8611546d4fb8693f784fa0c SHA256 137fa204b41b1b552deff15a977df2a3acde6f263c5034f75735de4f80028609
diff --git a/app-emulation/xen-tools/files/xen-tools-3.3.1-sandbox-fix.patch b/app-emulation/xen-tools/files/xen-tools-3.3.1-sandbox-fix.patch
new file mode 100644
index 000000000000..be0527a7c8f8
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-3.3.1-sandbox-fix.patch
@@ -0,0 +1,21 @@
+diff -urN xen-3.3.1/tools/ioemu-qemu-xen/xen-setup xen-3.3.1-fix/tools/ioemu-qemu-xen/xen-setup
+--- xen-3.3.1/tools/ioemu-qemu-xen/xen-setup	2009-01-05 04:36:22.000000000 -0700
++++ xen-3.3.1-fix/tools/ioemu-qemu-xen/xen-setup	2009-04-25 17:55:03.000000000 -0600
+@@ -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-tools/xen-tools-3.3.1.ebuild b/app-emulation/xen-tools/xen-tools-3.3.1.ebuild
index afd53547b22a..159c2e5b3276 100644
--- a/app-emulation/xen-tools/xen-tools-3.3.1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.3.1.ebuild,v 1.2 2009/04/27 15:44:54 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.3.1.ebuild,v 1.3 2009/04/28 07:57:21 patrick Exp $
 
 EAPI="2"
 
@@ -127,6 +127,8 @@ src_unpack() {
 	# Do not strip binaries
 	epatch "${FILESDIR}/${PN}-3.3.0-nostrip.patch"
 
+	# fix variable declaration to avoid sandbox issue, #253134
+	epatch "${FILESDIR}/${PN}-3.3.1-sandbox-fix.patch"
 }
 
 src_compile() {