Fix bug #141233 and add myself as a maintainer.

Package-Manager: portage-2.1-r1

7 files changed, 136 insertions, 19 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index a6cc7cf6244e..785d50ead041 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.13 2006/08/04 13:53:26 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.14 2006/08/09 09:10:52 aross Exp $
+
+  10 Aug 2006; Andrew Ross <aross@gentoo.org>
+  +files/xen-tools-3.0.2-test-uuid.patch,
+  +files/xen-tools-3.0.2-test-xauthority.patch, metadata.xml,
+  xen-tools-3.0.2-r1.ebuild, xen-tools-3.0.2-r2.ebuild:
+  Fix bug #141233 and add myself as a maintainer.
 
 *xen-tools-3.0.2-r2 (04 Aug 2006)
 
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index f7ba341a3dad..b87cc6d9a32d 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -6,6 +6,14 @@ AUX xen-tools-3.0.2--as-needed.patch 283 RMD160 852e850b72b9860420f5f2132c2e0714
 MD5 7c8f508f547c0e1f78b185fd9f980b1b files/xen-tools-3.0.2--as-needed.patch 283
 RMD160 852e850b72b9860420f5f2132c2e071474bc87ba files/xen-tools-3.0.2--as-needed.patch 283
 SHA256 9fcf772662863f74f4dc7cbc7ec195c2ad447ea757364e0cd6907d633d237919 files/xen-tools-3.0.2--as-needed.patch 283
+AUX xen-tools-3.0.2-test-uuid.patch 777 RMD160 268ddfc7d8c194d43e8c24a9966561df04246196 SHA1 2c60427e1dcc7995a25e38295297a2c7ae620893 SHA256 e789ef34b4a7066b7b476675d04d14b1a4272708c8ba51c5d4930119acbec76c
+MD5 3b1e6f226e33f6d583cd1a6b6760c9f4 files/xen-tools-3.0.2-test-uuid.patch 777
+RMD160 268ddfc7d8c194d43e8c24a9966561df04246196 files/xen-tools-3.0.2-test-uuid.patch 777
+SHA256 e789ef34b4a7066b7b476675d04d14b1a4272708c8ba51c5d4930119acbec76c files/xen-tools-3.0.2-test-uuid.patch 777
+AUX xen-tools-3.0.2-test-xauthority.patch 2362 RMD160 4974965318e02b151c0ba2cb516b4f246388e465 SHA1 45ad2861132d7dda81788cc2854cf8be33afb7d6 SHA256 a232f43a7a560b6cdea93daca422addbbc85f3ee75d10895423db3d5d3c6a452
+MD5 0f94816ea4743531f5919592ce077c00 files/xen-tools-3.0.2-test-xauthority.patch 2362
+RMD160 4974965318e02b151c0ba2cb516b4f246388e465 files/xen-tools-3.0.2-test-xauthority.patch 2362
+SHA256 a232f43a7a560b6cdea93daca422addbbc85f3ee75d10895423db3d5d3c6a452 files/xen-tools-3.0.2-test-xauthority.patch 2362
 AUX xend-conf 357 RMD160 e2b04f3d7cfb4fa8407adf2a4470e461901f9681 SHA1 b196023b5b9cf05be8d16e826d6709bcb6ea7ccc SHA256 7edcef347bfd373144140883ff9f38c9ff76614b71d912759fa635fb840911bc
 MD5 0664978b7f05728a0f4ffdbacec90f01 files/xend-conf 357
 RMD160 e2b04f3d7cfb4fa8407adf2a4470e461901f9681 files/xend-conf 357
@@ -23,22 +31,22 @@ MD5 23de87e566971e687ab2a7c2353a3c17 files/xendomains-init 1681
 RMD160 8a274725bee24929b97d5e199da4e5cfd0f3edf5 files/xendomains-init 1681
 SHA256 c3537920096cd94e80024b4d05706cd901f546c54ea8449b45399419b2ca51d0 files/xendomains-init 1681
 DIST xen-3.0.2-src.tgz 4933621 RMD160 34e4431a981891319f8a5ea0c3f604e7d8d7d7af SHA1 b7e797048b516f8b385afd3da9ae2eded1b8033a SHA256 f18ffab16a457fa721d11933c75f8288f6958c88c2669857c7c11d5107ba2951
-EBUILD xen-tools-3.0.2-r1.ebuild 3790 RMD160 6de97a5ae04cc5368376f88d458070c097f61f7f SHA1 b97e5bb591cb246eb7b122874822e774e206baae SHA256 7edf5561b6902c1a809715849c3bf8fb4f790d794d4dde76a3d9d90f143d6ff8
-MD5 d1ae3c3fbb8ba67b839d2484811c2c34 xen-tools-3.0.2-r1.ebuild 3790
-RMD160 6de97a5ae04cc5368376f88d458070c097f61f7f xen-tools-3.0.2-r1.ebuild 3790
-SHA256 7edf5561b6902c1a809715849c3bf8fb4f790d794d4dde76a3d9d90f143d6ff8 xen-tools-3.0.2-r1.ebuild 3790
-EBUILD xen-tools-3.0.2-r2.ebuild 4299 RMD160 17e8b5e04a3e990a1e3625be8fba8061a5ac639a SHA1 0e69035f277b04038d4a10acf41df67dcf2c2f31 SHA256 ee69ecb468a22c0a8156349559724f2914f2e99ea8cc06e864f27aa8fdfccf45
-MD5 8c866ff645e665a8fd13f4602342d38c xen-tools-3.0.2-r2.ebuild 4299
-RMD160 17e8b5e04a3e990a1e3625be8fba8061a5ac639a xen-tools-3.0.2-r2.ebuild 4299
-SHA256 ee69ecb468a22c0a8156349559724f2914f2e99ea8cc06e864f27aa8fdfccf45 xen-tools-3.0.2-r2.ebuild 4299
-MISC ChangeLog 2789 RMD160 329b1c97b112c0de9c5025eb9c5d2679dbf2f0d2 SHA1 1d1bcc0e76f5d80b24269af604ec4de84bd680d5 SHA256 946a05115290ff5095470a7d66e1f3b16a4565a82f184824aaf24592b533b69c
-MD5 fc2aca30469f5a0fbc123e1ff6fff1b7 ChangeLog 2789
-RMD160 329b1c97b112c0de9c5025eb9c5d2679dbf2f0d2 ChangeLog 2789
-SHA256 946a05115290ff5095470a7d66e1f3b16a4565a82f184824aaf24592b533b69c ChangeLog 2789
-MISC metadata.xml 344 RMD160 237bf24416240057f09b2180e143579e22a24859 SHA1 da9f05207fa34cf639558c4d49b8f1e1dc9bf45f SHA256 79ddf2debe775cd0465984dd0d1e706e7b967b0590a3e36aba5b13239586272f
-MD5 1345a3b29c0fde61a34873dae98c7f34 metadata.xml 344
-RMD160 237bf24416240057f09b2180e143579e22a24859 metadata.xml 344
-SHA256 79ddf2debe775cd0465984dd0d1e706e7b967b0590a3e36aba5b13239586272f metadata.xml 344
+EBUILD xen-tools-3.0.2-r1.ebuild 3945 RMD160 326ea8e281030efb84b47dbbeea895b253a04752 SHA1 858ac99783b9f888cc23ae19c080ab76c891df83 SHA256 9550c198f5c2d03385d1708860f3be79cd612c51b1c0008485b08ba062df5ae9
+MD5 ad525ca59ea78e60e0a7c4c139ca57b3 xen-tools-3.0.2-r1.ebuild 3945
+RMD160 326ea8e281030efb84b47dbbeea895b253a04752 xen-tools-3.0.2-r1.ebuild 3945
+SHA256 9550c198f5c2d03385d1708860f3be79cd612c51b1c0008485b08ba062df5ae9 xen-tools-3.0.2-r1.ebuild 3945
+EBUILD xen-tools-3.0.2-r2.ebuild 4454 RMD160 e8d1bec33071493d88599a99344cbc9a2fa40d54 SHA1 be6087a8232191175ffb457ba503261c3edd132d SHA256 674131c8e1b8df7ee7f6a34c1a53fdb3219db70f811b75efc44d40bea5eca07b
+MD5 cdfe1fe2c06896ef0f3cc829de23fb99 xen-tools-3.0.2-r2.ebuild 4454
+RMD160 e8d1bec33071493d88599a99344cbc9a2fa40d54 xen-tools-3.0.2-r2.ebuild 4454
+SHA256 674131c8e1b8df7ee7f6a34c1a53fdb3219db70f811b75efc44d40bea5eca07b xen-tools-3.0.2-r2.ebuild 4454
+MISC ChangeLog 3047 RMD160 3a7df9b75014b2260367319a2a665ac2377ed4bc SHA1 a15389005696f00e2a5704e57cfe49e234ba1420 SHA256 3b6c76b78a27ce797bad66c7f1b23e2e808d679a264cfba86f7e70968ac3c083
+MD5 e9526c6490598e723f896df7e709d91e ChangeLog 3047
+RMD160 3a7df9b75014b2260367319a2a665ac2377ed4bc ChangeLog 3047
+SHA256 3b6c76b78a27ce797bad66c7f1b23e2e808d679a264cfba86f7e70968ac3c083 ChangeLog 3047
+MISC metadata.xml 432 RMD160 eafc439c7269ef22e0d750e94dcba03baeabfdfd SHA1 1c3b3f8f85025c2302322357be761f0a798b2a07 SHA256 8fd16f4fcd3ec230fe35684215f427844000f430170fd002ad95a880701fe440
+MD5 ed1af8b3d29a9c324a2d8041592287a5 metadata.xml 432
+RMD160 eafc439c7269ef22e0d750e94dcba03baeabfdfd metadata.xml 432
+SHA256 8fd16f4fcd3ec230fe35684215f427844000f430170fd002ad95a880701fe440 metadata.xml 432
 MD5 6618adc624bc8ab64af0f4555c33529a files/digest-xen-tools-3.0.2-r1 235
 RMD160 ad3a1d2a82c40b0bca653431c2d7964809580e5e files/digest-xen-tools-3.0.2-r1 235
 SHA256 274536fc8a3cb10fda114e533062b0dbddcda4ae15f52033a39b85785b221794 files/digest-xen-tools-3.0.2-r1 235
diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.2-test-uuid.patch b/app-emulation/xen-tools/files/xen-tools-3.0.2-test-uuid.patch
new file mode 100644
index 000000000000..b4829e491eb2
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-3.0.2-test-uuid.patch
@@ -0,0 +1,17 @@
+# Backported from
+# http://lists.xensource.com/archives/html/xen-changelog/2006-04/msg00086.html
+
+--- tools/python/xen/xend/tests/test_uuid.py	2006-07-22 12:10:00.000000000 +1000
++++ tools/python/xen/xend/tests/test_uuid.py	2006-07-22 12:11:01.000000000 +1000
+@@ -21,9 +21,9 @@
+             self.assertEqual(uuid.toString(inp), expected)
+             self.assertEqual(uuid.fromString(expected), inp)
+ 
+-        t([0 for _ in range(0, 16)], "00000000-00000000-00000000-00000000")
++        t([0 for _ in range(0, 16)], "00000000-0000-0000-0000-000000000000")
+         t([185, 158, 125, 206, 250, 178, 125, 57, 2, 6, 162, 74, 178, 236,
+-           196, 5], "b99e7dce-fab27d39-0206a24a-b2ecc405")
++           196, 5], "b99e7dce-fab2-7d39-0206-a24ab2ecc405")
+ 
+ 
+ def test_suite():
diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.2-test-xauthority.patch b/app-emulation/xen-tools/files/xen-tools-3.0.2-test-xauthority.patch
new file mode 100644
index 000000000000..c462c59db9ed
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-3.0.2-test-xauthority.patch
@@ -0,0 +1,72 @@
+# Backported from
+# http://lists.xensource.com/archives/html/xen-changelog/2006-04/msg00087.html
+
+--- tools/python/xen/xm/create.py	2006-07-22 12:50:35.000000000 +1000
++++ tools/python/xen/xm/create.py	2006-07-22 12:52:52.000000000 +1000
+@@ -850,6 +850,16 @@
+     opts.info("Started domain %s" % (dom))
+     return int(sxp.child_value(dominfo, 'domid'))
+ 
++def get_xauthority():
++    xauth = os.getenv("XAUTHORITY")
++    if not xauth:
++        home = os.getenv("HOME")
++        if not home:
++            import posix, pwd
++            home = pwd.getpwuid(posix.getuid())[5]
++        xauth = home + "/.Xauthority"
++    return xauth
++
+ def parseCommandLine(argv):
+     gopts.reset()
+     args = gopts.parse(argv)
+@@ -864,14 +874,7 @@
+         gopts.vals.display = os.getenv("DISPLAY")
+ 
+     if not gopts.vals.xauthority:
+-        xauth = os.getenv("XAUTHORITY")
+-        if not xauth:
+-            home = os.getenv("HOME")
+-            if not home:
+-                import posix, pwd
+-                home = pwd.getpwuid(posix.getuid())[5]
+-            xauth = home + "/.Xauthority"
+-        gopts.vals.xauthority = xauth
++        gopts.vals.xauthority = get_xauthority()
+ 
+     # Process remaining args as config variables.
+     for arg in args:
+--- tools/python/xen/xm/tests/test_create.py	2006-07-22 12:59:13.000000000 +1000
++++ tools/python/xen/xm/tests/test_create.py	2006-07-22 12:59:13.000000000 +1000
+@@ -51,6 +51,7 @@
+                  'path'      : '.:/etc/xen',
+                  'builder'   : 'linux',
+                  'nics'      : -1,
++                 'xauthority': xen.xm.create.get_xauthority(),
+                  })
+ 
+ 
+@@ -99,6 +100,7 @@
+                  'interface'   : 'eth0',
+                  'path'        : '.:/etc/xen',
+                  'builder'     : 'linux',
++                 'xauthority': xen.xm.create.get_xauthority(),
+                })
+ 
+ 
+@@ -138,6 +140,7 @@
+                  'path'       : '.:/etc/xen',
+                  'builder'    : 'linux',
+                  'nics'       : -1,
++                 'xauthority': xen.xm.create.get_xauthority(),
+                  })
+             
+ 
+@@ -188,6 +191,7 @@
+                  'dhcp'        : 'off',
+                  'interface'   : 'eth0',
+                  'path'        : '.:/etc/xen',
++                 'xauthority': xen.xm.create.get_xauthority(),
+                })
+ 
+ 
diff --git a/app-emulation/xen-tools/metadata.xml b/app-emulation/xen-tools/metadata.xml
index 16aa7478b44c..4b5f7ad49065 100644
--- a/app-emulation/xen-tools/metadata.xml
+++ b/app-emulation/xen-tools/metadata.xml
@@ -10,4 +10,8 @@
   <email>agriffis@gentoo.org</email>
   <name>Aron Griffis</name>
 </maintainer>
+<maintainer>
+  <email>aross@gentoo.org</email>
+  <name>Andrew Ross</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-emulation/xen-tools/xen-tools-3.0.2-r1.ebuild b/app-emulation/xen-tools/xen-tools-3.0.2-r1.ebuild
index ff29e12dd398..5cd47ac60a4a 100644
--- a/app-emulation/xen-tools/xen-tools-3.0.2-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.0.2-r1.ebuild,v 1.1 2006/06/09 17:59:12 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.0.2-r1.ebuild,v 1.2 2006/08/09 09:10:52 aross Exp $
 
 inherit mount-boot flag-o-matic distutils eutils
 
@@ -66,6 +66,11 @@ src_unpack() {
 
 	# Allow --as-needed LDFLAGS
 	epatch "${FILESDIR}/${P}"--as-needed.patch
+
+	# Fix upstream's broken test cases (bug #141233)
+	cd "${S}"
+	epatch "${FILESDIR}/${P}"-test-uuid.patch
+	epatch "${FILESDIR}/${P}"-test-xauthority.patch
 }
 
 src_compile() {
diff --git a/app-emulation/xen-tools/xen-tools-3.0.2-r2.ebuild b/app-emulation/xen-tools/xen-tools-3.0.2-r2.ebuild
index 34e96c5d7aeb..661ee8fcc2ff 100644
--- a/app-emulation/xen-tools/xen-tools-3.0.2-r2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.0.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.0.2-r2.ebuild,v 1.1 2006/08/04 13:53:26 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.0.2-r2.ebuild,v 1.2 2006/08/09 09:10:52 aross Exp $
 
 inherit mount-boot flag-o-matic distutils eutils
 
@@ -81,6 +81,11 @@ src_unpack() {
 
 	# Allow --as-needed LDFLAGS
 	epatch "${FILESDIR}/${P}"--as-needed.patch
+
+	# Fix upstream's broken test cases (bug #141233)
+	cd "${S}"
+	epatch "${FILESDIR}/${P}"-test-uuid.patch
+	epatch "${FILESDIR}/${P}"-test-xauthority.patch
 }
 
 src_compile() {