[QA] Remove unused files. Added quotes to unquoted DISTDIR variables.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

10 files changed, 32 insertions, 1075 deletions

diff --git a/app-emulation/xen-pvgrub/ChangeLog b/app-emulation/xen-pvgrub/ChangeLog
index abf29fb504a4..48d6d34e3a97 100644
--- a/app-emulation/xen-pvgrub/ChangeLog
+++ b/app-emulation/xen-pvgrub/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/xen-pvgrub
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog,v 1.44 2013/12/10 13:35:02 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog,v 1.45 2014/01/01 11:47:20 tomwij Exp $
+
+  01 Jan 2014; Tom Wijsman <TomWij@gentoo.org>
+  -files/xen-4-CVE-2013-0215-XSA-38.patch,
+  -files/xen-4-CVE-2013-1919-XSA-46.patch,
+  -files/xen-4-CVE-2013-1952-XSA_49.patch,
+  -files/xen-4.2-CVE-2013-6-XSA-55.patch,
+  -files/xen-4.2-CVE-2013-7-XSA-55.patch, xen-pvgrub-4.2.2-r1.ebuild,
+  xen-pvgrub-4.3.0.ebuild, xen-pvgrub-4.3.1.ebuild:
+  [QA] Remove unused files. Added quotes to unquoted DISTDIR variables.
 
   10 Dec 2013; Agostino Sarubbo <ago@gentoo.org> xen-pvgrub-4.3.1.ebuild:
   Stable for x86, wrt bug #486354
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index 67e625bad569..561b52be4378 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -1,13 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX newlib-implicits.patch 5307 SHA256 34e85aa0380d10271748cdc6cb0ff3f502fe5c3113724ba8a2c2f69668970c46 SHA512 582cfa36dbb44e8abc83120d44af78a7a7cd3f7a009c65858f3d68276bf5f772b18c4692b7e68202f9ec246e29c785fa111b19bcaefc2f04f429f1b69e77d48f WHIRLPOOL 0d36e2f4ac6476522a05842ab1194e6c58d4fa6a03ae53b14b839aa4057ce55fdd6ec5fa47d28ddcaea22fed153ca60f50413cc77f9a4ded2397168395bf336b
 AUX xen-4-CVE-2012-6075-XSA-41.patch 1393 SHA256 6aa21c02e94cb9b4f612c7a9d1a8f980967692b1f20346da9670abb1d7ec688c SHA512 547f63e7eaf0a6db1a9de267cc6f9aa0f28e2221f2c69ca463ada85edbc07ac84c276dcd3ee017ab8846d4e4129e182fb76be35b91ae9a0e0afecdc091e0c305 WHIRLPOOL 848359780edc15895a09bf76afeaa503f907ac98a856b52d64ef4dcb137e2319222a47cd7a2866e6f25731498f487cfca2a462fb6dfcda8404026d8acfff5bcc
-AUX xen-4-CVE-2013-0215-XSA-38.patch 2515 SHA256 7d7a5746bc76da747bf61eb87b3303a8f3abb0d96561f35a706c671317ebe4eb SHA512 2abe25c83a3ede047db380b0477ba1aaaf9d955e87244f8d2404699e011cac46ad5501a0f75b76b90b5dc276d19ae08600a2fe57a69681f97088b5d17d977066 WHIRLPOOL 5176ba1c9f3019c50c087c56185c393ae99c0504f10abf08d896998f80d9f0a05c8c103b4276c3370c72171fab2fdc07ba9c68261ac02c6a859ed7a74b6bd056
-AUX xen-4-CVE-2013-1919-XSA-46.patch 9844 SHA256 822da2303f1fc69648d7a29eb72fdda8e64baab3edc0e1548456d31e66ed1d7c SHA512 35ed4d580d219e977ee1085c223563f51ccd9ce3675df2660d10d99c366a2fe2446269c98ac9dbf57c37de83340f4b0868d0eb3c5d898be4c0fc80357f6ed780 WHIRLPOOL 36015584e3f72c3eea62cd0658230805645983be571768f068baa605b274d16cca9fc4dcb27152016dde81f6a1dbcd91430654af5c2c1b5211ed5c2441b65c1c
 AUX xen-4-CVE-2013-1922-XSA-48.patch 3846 SHA256 dc23077028584e71a08dd0dc9e81552c76744a5ce9d39df5958a95ae9cf3107b SHA512 31dd8c62d41cc0a01a79d9b24a5b793f5e2058230808d9c5364c6ff3477ab02f3258f1bbd761d97dc1b97ee120b41524b999eaac77f33b606496fc324b5fa2e4 WHIRLPOOL 6913705b070daeac8925a44585f94f78ec43cf1d7a8feeba6839499b0340a727f3c39848627bcd58217b589a932fbfce13628bdca2b815e2ddf58b9c69c11721
 AUX xen-4-CVE-2013-1952-XSA-49.patch 1877 SHA256 37055cbc74111cbc507af3f09d6ac2e472f24efd54cd3e08583dc635e66a539f SHA512 1e3ef057744076b9fca22c1982f33d38be06ab8e5d57e40e3160fc2850b69711a1765e4a2b037f7bc1fdb8a9f93f1649d86ea3da972ec4af147b7b80191069f8 WHIRLPOOL 43e78ad3ba597e7084b6194507839b8cc4c21f45c8fd70f00cb061a4ad22ec9ec690bf35ffffc7e02c616de5f35b329c6c4e3a9cf5ddaf23cdf0525681f70639
-AUX xen-4-CVE-2013-1952-XSA_49.patch 1597 SHA256 f7daee05c81bfa4effa821e22c8b0861c254b3a1d4e14b7da5709a6102997b87 SHA512 f4d49b90b08b5ac52a5e41f0b555db20e846016f0020e67ea243eed24f621b4b356c3c9e7c181e97fa2d428024a941b7b52eb5bfd933a850aafc4a7b51bb3295 WHIRLPOOL e0fb3d0d9463276dc6331547ef13d4117d7c3bb1503f9e60885553056a3452cba4937500834dedc79fde29198420bf0c7e5c7e9e596c8d27202559dd00c94bb7
 AUX xen-4-fix_dotconfig-gcc.patch 9551 SHA256 93c8726fc3e0bd3f54d4162a3fdace45e3c3ea24fecf5f54270c6dc55c3924ab SHA512 64bfc2dd60bf5a7db593250f9da62cdea4daa458aa8c474ec47b065f6e19509555f48d49ec8624c484d873fe947b6f9cab98cdcd2c24ca8795eb1b64b378a004 WHIRLPOOL 341506ced55ae2ad30af1696434df25ba77c665042aa82dda35d0722f0cccbe567c8cebf51c2e20e0df3084f74f7eb7a69808dea2801f911b2d3c46a293b6ba2
 AUX xen-4.2-CVE-2013-1-XSA-55.patch 12309 SHA256 03589da73c958503cc9d3a7403b07ee165cda2a61b696a12e432f071d33c8b8d SHA512 1f1e11233ae2503061f66e23bb8e438ceeb55504f9ce140a4093d7b826e42956baa477e2a02bb660e33874ea6fc671dce89094c6c8959aedf9137ff8e2efc9bd WHIRLPOOL 48fd1c4702ce347bbbc2b5a9cfc1d8198a995cc95182005625df71b4cab1b1dacc38a07d5751d17b411e76acba49ff5669c1fe9afbe208634c25a90a8eae4649
 AUX xen-4.2-CVE-2013-12to13-XSA-55.patch 12653 SHA256 0f150534386d4a54e9b8110988f2511b7f045b526e39985dc5dc904b0814b6c6 SHA512 d1c4ef396d90079c2bb4e12e2bfca1be55a12fe9d1f6388d159a996b2cd10d965c96fb84906f87e31fec6831cfd1ce38cb8964fe9b9bde3c19d37e5b88723551 WHIRLPOOL 884215d7cfd8ed1a4254d3dc41725782966f6a32929a5d74610fe350421a07b8e9d34d4b049e8f472d5d5052de8682a8837368be5007bc09e248790576cf4a3e
@@ -20,8 +17,6 @@ AUX xen-4.2-CVE-2013-20to23-XSA-55.patch 12908 SHA256 7422a1ae6d9aea2c0f7df0c459
 AUX xen-4.2-CVE-2013-3-XSA-55.patch 6149 SHA256 f5b809eceb7d342bac01f6a204eca7c89e1c62287040d2588b093b9cd0b5be22 SHA512 6f1ae849160076202d7dfacf2b8b880effeec19112ef18bb40ceaeac6649f9cd235e26eaaf78ffc83907f5098926818633b1344a3626454ad95dd97a1894ccf4 WHIRLPOOL 88f142e62caddffc611917e79dbbbda9870a779514fbee86c42888d53a2e94ad23fb25c626630410ef9cbb704fd5a3358d1a9bc98e2f9ef82298c2b00ba2bf95
 AUX xen-4.2-CVE-2013-4-XSA-55.patch 2139 SHA256 51b5f8a996f0d84c715235b1497e0816a6b31fbeea593b7c14925d11856e48b1 SHA512 41034da15f7ffdb6efee41dcc763276b1fcdf160edda88a15b0e0c39bc175a592825e9faa78b209a54f01dcb0e5198b6b40a924f49aed1334fdca54739f35e56 WHIRLPOOL 4da524a196fc713f75f57aacc178ad1b0e2e5ab6b00b941620f682a8894fca79a212155bc3e8200b870d3df959ef68f18cdd116ce64f1d3c93007159bdac4201
 AUX xen-4.2-CVE-2013-5to7-XSA-55.patch 6392 SHA256 2861fc68d7b9c49784deb43eeb7196e53316f5439d129d686b7b2157543f9c0a SHA512 1f69e1d9c56244bb8a97b0f9a426007e5779a7e88f2add879a289eda923723e3b4bddcc034797a4e79646780bca1b445fbbc857c9155e72d2177739525d5d88b WHIRLPOOL 4bd68553974eab849315ffff90ef7e0d7811923763ab3c0f111d60f15d574e65652aa5c60708bf60410f5caa0914a2d43dfb4242d7451fb76576a4d2b79fe1a8
-AUX xen-4.2-CVE-2013-6-XSA-55.patch 10103 SHA256 d9df769e1b6847a84cd85e3909acee85ce71fd3bc84945890d586388bc69cb11 SHA512 fcd09ca508e78a97169daf38ee455df6646c954bce7042259c7528b3cd2e6d24416d293b7c3b7fd4707caa29ee8d3916f07af5295341a043b350293a3dfe826f WHIRLPOOL 7d7599ca36bba2cbc9ea899dab98a231d4bdb60363aa5f5da36c00269bdb67f091e84c823c2c80cef985bfebbc8c1a3a207148c2b296084cf30d5252dee68eaf
-AUX xen-4.2-CVE-2013-7-XSA-55.patch 15024 SHA256 4bca58ac49bd56f6defefbfa76cfd0e6d45aabb1641fa9e9f983edbc784a9d89 SHA512 0622b2cbb0dc6f7b6a86a0ed41229fa2574d655b2d7c7727e3c0c4416155e26dbd933af8812f0e3b13f196da4d9de1064dc620751ddd4f66b587ecd6f30902f5 WHIRLPOOL 9ffda09ae380b2417d3599a9fbf894becef9f9bf88277cf8b4195f86e271bb6452aedb33050ddac1c25c7fdf71bb754a361633526a90d61d5489d5dae064c4e4
 AUX xen-4.2-CVE-2013-9to10-XSA-55.patch 11035 SHA256 c73c57ff530c15efa62ee4853d8213f0bac9c31280485f7b54e8b96721fadd92 SHA512 2991e7bf598ac2af57a96204a8babb4c15e5eb7c35c2477e4171b6c600ddc98906fe6dcda02fd5c155d196135b6c28631422bde5302db173ebdfc821089b8de1 WHIRLPOOL dbe8fa7421a68c13159b18b3bf898088c02d9b49d587a2f70a733d6a509fea13246b28b73136510b019d2b28fb23c45fb59e8711d189c0538a758639aaa62dd3
 AUX xen-4.2.1-externals.patch 3188 SHA256 08178c57f3de4dc5227a3a8dc3a7f6c951ddb7224cf1566066f0ca39a3f772bf SHA512 50455f5544f381fe75a3c00b8920fc30ed5f5738343a89dbb9af3883745b6dbd792f458fe073ee8a6bc41bde061aeab64fde28c2ac008fe8a7bb8a9e1c2ca823 WHIRLPOOL 9be67a23c4594737c2c531b068cebd1d456855417c762db9392c81bce2c7ecd5c94a06dafe872e1e7ee2f8ef2a72a55f12e5b2fc6cb3b59d01d20779521b2694
 AUX xen-4.3-externals.patch 2806 SHA256 f4693d85070c0983b440eaa061b4a769119e12fc0304561a9cc302d04d0dfd3d SHA512 07e9270ef404dfb765be284887e6d24202ac1783d08e7d30a768d461d6565fac4a4e9625b245610353bf2b76baf54c736170bfc84ed507491f7876e0d7a11c7d WHIRLPOOL 9240067e706ec4a2d33c8a6e1556f8df137984b7015e4347e52b35e2f562284669634137357e7651d7f747638592cf429ef3e60792489e0c287b6387690fd9ad
@@ -39,25 +34,19 @@ DIST xen-4.2.2.tar.gz 15602746 SHA256 c9bfe91a5e72f8545acebad9889d64368020359bfe
 DIST xen-4.3.0.tar.gz 16425975 SHA256 e1e9faabe4886e2227aacdbde74410653b233d66642ca1972a860cbec6439961 SHA512 e6b8f64e15e48704ea5cee5585cd6151fe6a5a62bc4670caf0b762c1aa71c9598db236c637ac34c42c92c6e8a5001acdd3d9d4b9305401a26273279358f481d6 WHIRLPOOL a91f14bc6535127ab17d3867b92fb3e008089453d5ba7996fd1d0b5c6d32a881c07df320f018c928e919f28de7b4ab4757c6bdb020e0cdb7d67960d4cab9dda0
 DIST xen-4.3.1.tar.gz 16429423 SHA256 3b5b7cc508b1739753585b5c25635471cdcef680e8770a78bf6ef9333d26a9fd SHA512 f5250ad5ad3defc5dc1207eb6208a3928128ef57ac4162018bd92b750dc1df1eaaf37835528aca33a0f9e04c82d5f8c4ba79c03a1780d2b72cbb90cc26f77275 WHIRLPOOL 087390786cea9aee273a5d81988436303991aa5ea92faf111d3b619517368f8c8feef84f4f8c602cac723980a344eb90414887db4ca88a2ee14bc6b0253e36ca
 DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276
-EBUILD xen-pvgrub-4.2.2-r1.ebuild 5322 SHA256 ddd4ea3dd4b80496cfc9e0362ab060ba8d4359b8ab4bc919e4cfceb0758a41fe SHA512 e5a068e656be6e42f6a1468e2b3e1ee370b448e579ec19cac18e701e0d4d3697c20f955ac937f655571a29b2fecdf925faf87dc0c7beee1d3ac95932360dad3c WHIRLPOOL 0592253e270d0d7e28be70f2fef475ed628274724c6ddd3ca106ebb32c36fa1d95252c01328c61c6e013a8cb1f143f1d636a08beac5b59ae5532230ce504d2d2
-EBUILD xen-pvgrub-4.3.0.ebuild 4521 SHA256 8c9c33a6467268b915e49008d692edfcf8a1a1569008ec74ab133e4400314805 SHA512 d1d4552aae3671916b8ed2a8230d9e189ed038bed6ec60021de2f70cad956ea49408e27d43191ff2b97f7eb9fbc6ef463e8bf4f3ff5fc912a01215185adce383 WHIRLPOOL f74f97bffc804d24c5c3bba92dfcfa1cd3a4454254fc6b39c5ca378c6c7a16db47bd58879d28501fc5c52bfbb5e6ab5e7fc6e725380f2fa09b90775d5b3c8a1c
-EBUILD xen-pvgrub-4.3.1.ebuild 4451 SHA256 1da8be5f9e67e7e68dfe715f8b52c973ec889bdf31b538209a1fee0fd4368d99 SHA512 97dc7925d7d7b347876c83029a8b6c90cb4b2325d24024733a6a3b5b337062cef254f84b150fd0cce67d27a5acd63c8bfbf537978a850985718ec7fc5e6ed69b WHIRLPOOL 82e1165ac93d9e81f73bbf6dd834afc35b1c389a7a58e6353601aa7b80db166e26e6066cfb13240830baf8541afe2949cd1fa7108f41ce88f9d0ee47a11ec0e3
-MISC ChangeLog 10020 SHA256 e03bb711cece7da7775801242b752f9afacf897713aacb4be2ef4e6d39e6dd2e SHA512 933b9cc97320e694f96061c3ff51b5ccd32262bf98b8bd261bff7220a7c23c3589dcf861e5d23feb72c8f3030c2f78211eb6547aa71498d00dc56699e018fb04 WHIRLPOOL 0291c2e0743615eb13e4efc4ec7672a185b76452659a1c04aa97879f16d5ecc4bdc11dfb14995cb6e97422f7a626d3775a3561e84cf70d8dc8015e33230b4316
+EBUILD xen-pvgrub-4.2.2-r1.ebuild 5325 SHA256 a23db43442635dc2202dcb185c1a8fcd2bbe8f224e99bd40f7f7acabf8575c5b SHA512 653ea6d984e2e7ba200c83493299dcbfb8f1028be56dd397bdbe76ff7cd0a82ea26b0addea7d67b95d89bbaae0306b80d58f2aaf03df805e0a5cf133cde3196e WHIRLPOOL ab5c1eba1b6bb58b9fe7c28ac72be0fb021032c0eab359ceac268f458ea1d24dcd813e3711c2090eef2cf1412d1425aa8993e4afa94931890d06adf2f1fe4fec
+EBUILD xen-pvgrub-4.3.0.ebuild 4524 SHA256 a02aab78eca1b99e6feb1470ab89a2a48ce690539842971abcb9a598aca3c35a SHA512 e769233e5134ebafe0ecdc9e6b798d24a9bfafe9d4f6c9b26ae21801fddca3c8076570e2c96f50cf1439d9db7ede5b8b3b47ac48448034b384d6a149c446804f WHIRLPOOL cff2757c6bc4f3cb62b81c68918847df244c953c1e2bcc2fb68248b2a71f27ff849f1db49c11bdd1945ddc153b0b282bbd2199a1d7e338bb34734c74ce229059
+EBUILD xen-pvgrub-4.3.1.ebuild 4458 SHA256 223802e59303b47dcbf895e6e29c90a8ffbb9d43711ccaf535b455807eafcafb SHA512 c6cef380fdc84fa065fb50996f52925ef70bb6fc712190f012820598dc48822fad7cc5982f4e3884ba7e1713757ec9e22b5da42947c265f0235ad594a8f6d92f WHIRLPOOL 533f6941a30b7c3457f0f942047072244150d1e319f99aa48af97d65efbd58cbdf76721313e70a6e125b66b00123aec12ebae5010b51292605af7450c4730aa8
+MISC ChangeLog 10436 SHA256 632db0c0da56bf256abd62b884872628ce4a5cfd04324a51f6a8c959b3cc7382 SHA512 731edabe8d1470518dd0e286e3a4471ad999f36fac8f77956063fd957cf29cb372eaefd56c847ca42877a45d95043be92113bece54ea0d107082080271369ebb WHIRLPOOL cd4021b288f1fe834a43fbe0f2437f6cbbe19cc775e8b4d69c836767cba42c4d9fe1f6e4e1a2da24ac1b76219ba3558dccad91954c71d2c7be5439be8dac39ab
 MISC metadata.xml 156 SHA256 4a030777459245372bda9f7925f3a5ed3ef2b29b77e1a2971f3400ac2059b1e2 SHA512 66b610ce3a3c525f52ad132e0c6cab329866069d8f40cbfc7302b12f8fc1217705ce9d5aab9c08ee3f7eb86bd880b5c3595b10c3eb67932148a109ec11b88c22 WHIRLPOOL e7f151fa553d737c02f8791448170ddd88b9330b1b01a868cd5c32a875b58b36dd1e2b041308f657d35550f22e5798cd96037c3c890c0646119046f984505c23
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSpxh8AAoJELp701BxlEWfU+kP/jzAshGM1D8gpYiHFyQ88mV8
-GVQ+KL2+sqyqLOZHF6IAWAYJ4vZ2oqHsat4IHMF0SKiTlfxJ6Bq2wf8ZL/4xpKgx
-MYLHlEL7betuaIi4m1Lk1bcfJ/J6KhUJmOhAJqcIgUdvhx9FDK1QzvP/y6+NaSBg
-Yb/Ipd1i2kcBCOrkqbYdR+9iUUV3S1a1lK+YXgbA5iSrBTKAOkjGoeKZWSm1j5Nq
-YVEmkgGKL7nHHXfhn//m0PnWTy4RXtr5WTc9JSt2lykv3oFjesm33l86h9lV074W
-3cic67gyBlSCwMhBLoAyAjnyFaVtc9h3G84i7g6bEtmDmPvdkTlZnSR+5Vuvljly
-heR/qNJ1+cs4aY0lN9ORo0qV9+yvTiOUdJs/WP03uBKOVuxAqKPr0HODYaxwAkah
-6BItkHvKpydHQ0OX7Va1Xkk2QNq2g8gSUxUiRLXNJerYogbrsEgbpPtPjfAb1lts
-X+46JBBXZ58T4ZjRBFPU4x1SmIR/f47BISZpL9dNMlVufKxuj3ov1Ui2Y450J5pJ
-O2MofCaqmGwm9fXQT3OL4Ve9v1U2NyTAA/DopBSg2yVnW1BSSuvwuucgYPmgH+1c
-ZU0oHrAkxK3VlWRrQeqlbO4QLH63CyAhy0MG5WG2PZKahKXGQgvRKW6ZY94NTE+H
-/pzvfQFLUn+24Lvzr+pZ
-=Phps
+iQEcBAEBCAAGBQJSxAAyAAoJEJWyH81tNOV9HHQIAJ0dIHHVZnEBmfwNF6xpUwAo
+3ClPQ9OXuyikA+uBBP6kj+EwXraqeObEXLDvJhRYCAOxFdcsLyTGb3OuTa2XaOpq
+/pCOv/hl2lRQWhqXnfwniA4KKXQC2tzvUNSxhq6Ts6gpvqPJfpXjNkhGEeCZgPFZ
+ptE6jam7Ld6+n+cxLG3UtzR4onBogshEXquTX4Ch/FH5pNb+6VKV9RSQmdR+A2DF
+8WX12c2CRGNJgtIMRAWOSVUboFaEGz31CuNIHFf2KNJNorWitnpmpHKa3oC2Ffw0
+MobruiuL91dEtIi3MIs7KREk2w6Pzt5aHgP/IJC1HYJ+rD6LJNgOsoYHfBovo8o=
+=GwCG
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-pvgrub/files/xen-4-CVE-2013-0215-XSA-38.patch b/app-emulation/xen-pvgrub/files/xen-4-CVE-2013-0215-XSA-38.patch
deleted file mode 100644
index f4a5dc0881e8..000000000000
--- a/app-emulation/xen-pvgrub/files/xen-4-CVE-2013-0215-XSA-38.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff --git a/tools/ocaml/libs/xb/partial.ml b/tools/ocaml/libs/xb/partial.ml
-index 3558889..d4d1c7b 100644
---- a/tools/ocaml/libs/xb/partial.ml
-+++ b/tools/ocaml/libs/xb/partial.ml
-@@ -27,8 +27,15 @@ external header_size: unit -> int = "stub_header_size"
- external header_of_string_internal: string -> int * int * int * int
-          = "stub_header_of_string"
- 
-+let xenstore_payload_max = 4096 (* xen/include/public/io/xs_wire.h *)
-+
- let of_string s =
- 	let tid, rid, opint, dlen = header_of_string_internal s in
-+	(* A packet which is bigger than xenstore_payload_max is illegal.
-+	   This will leave the guest connection is a bad state and will
-+	   be hard to recover from without restarting the connection
-+	   (ie rebooting the guest) *)
-+	let dlen = min xenstore_payload_max dlen in
- 	{
- 		tid = tid;
- 		rid = rid;
-@@ -38,6 +45,7 @@ let of_string s =
- 	}
- 
- let append pkt s sz =
-+	if pkt.len > 4096 then failwith "Buffer.add: cannot grow buffer";
- 	Buffer.add_string pkt.buf (String.sub s 0 sz)
- 
- let to_complete pkt =
-diff --git a/tools/ocaml/libs/xb/xs_ring_stubs.c b/tools/ocaml/libs/xb/xs_ring_stubs.c
-index 00414c5..4888ac5 100644
---- a/tools/ocaml/libs/xb/xs_ring_stubs.c
-+++ b/tools/ocaml/libs/xb/xs_ring_stubs.c
-@@ -39,21 +39,23 @@ static int xs_ring_read(struct mmap_interface *interface,
-                              char *buffer, int len)
- {
- 	struct xenstore_domain_interface *intf = interface->addr;
--	XENSTORE_RING_IDX cons, prod;
-+	XENSTORE_RING_IDX cons, prod; /* offsets only */
- 	int to_read;
- 
--	cons = intf->req_cons;
--	prod = intf->req_prod;
-+	cons = *(volatile uint32*)&intf->req_cons;
-+	prod = *(volatile uint32*)&intf->req_prod;
- 	xen_mb();
-+	cons = MASK_XENSTORE_IDX(cons);
-+	prod = MASK_XENSTORE_IDX(prod);
- 	if (prod == cons)
- 		return 0;
--	if (MASK_XENSTORE_IDX(prod) > MASK_XENSTORE_IDX(cons)) 
-+	if (prod > cons)
- 		to_read = prod - cons;
- 	else
--		to_read = XENSTORE_RING_SIZE - MASK_XENSTORE_IDX(cons);
-+		to_read = XENSTORE_RING_SIZE - cons;
- 	if (to_read < len)
- 		len = to_read;
--	memcpy(buffer, intf->req + MASK_XENSTORE_IDX(cons), len);
-+	memcpy(buffer, intf->req + cons, len);
- 	xen_mb();
- 	intf->req_cons += len;
- 	return len;
-@@ -66,8 +68,8 @@ static int xs_ring_write(struct mmap_interface *interface,
- 	XENSTORE_RING_IDX cons, prod;
- 	int can_write;
- 
--	cons = intf->rsp_cons;
--	prod = intf->rsp_prod;
-+	cons = *(volatile uint32*)&intf->rsp_cons;
-+	prod = *(volatile uint32*)&intf->rsp_prod;
- 	xen_mb();
- 	if ( (prod - cons) >= XENSTORE_RING_SIZE )
- 		return 0;
diff --git a/app-emulation/xen-pvgrub/files/xen-4-CVE-2013-1919-XSA-46.patch b/app-emulation/xen-pvgrub/files/xen-4-CVE-2013-1919-XSA-46.patch
deleted file mode 100644
index 9448ea9c6748..000000000000
--- a/app-emulation/xen-pvgrub/files/xen-4-CVE-2013-1919-XSA-46.patch
+++ /dev/null
@@ -1,293 +0,0 @@
-x86: fix various issues with handling guest IRQs
-
-- properly revoke IRQ access in map_domain_pirq() error path
-- don't permit replacing an in use IRQ
-- don't accept inputs in the GSI range for MAP_PIRQ_TYPE_MSI
-- track IRQ access permission in host IRQ terms, not guest IRQ ones
-  (and with that, also disallow Dom0 access to IRQ0)
-
-This is CVE-2013-1919 / XSA-46.
-
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
-
---- a/tools/libxl/libxl_create.c
-+++ b/tools/libxl/libxl_create.c
-@@ -968,14 +968,16 @@ static void domcreate_launch_dm(libxl__e
-     }
- 
-     for (i = 0; i < d_config->b_info.num_irqs; i++) {
--        uint32_t irq = d_config->b_info.irqs[i];
-+        int irq = d_config->b_info.irqs[i];
- 
--        LOG(DEBUG, "dom%d irq %"PRIx32, domid, irq);
-+        LOG(DEBUG, "dom%d irq %d", domid, irq);
- 
--        ret = xc_domain_irq_permission(CTX->xch, domid, irq, 1);
-+        ret = irq >= 0 ? xc_physdev_map_pirq(CTX->xch, domid, irq, &irq)
-+                       : -EOVERFLOW;
-+        if (!ret)
-+            ret = xc_domain_irq_permission(CTX->xch, domid, irq, 1);
-         if ( ret<0 ){
--            LOGE(ERROR,
--                 "failed give dom%d access to irq %"PRId32, domid, irq);
-+            LOGE(ERROR, "failed give dom%d access to irq %d", domid, irq);
-             ret = ERROR_FAIL;
-         }
-     }
---- a/tools/python/xen/xend/server/irqif.py
-+++ b/tools/python/xen/xend/server/irqif.py
-@@ -73,6 +73,12 @@ class IRQController(DevController):
-        
-         pirq = get_param('irq')
- 
-+        rc = xc.physdev_map_pirq(domid = self.getDomid(),
-+                                 index = pirq,
-+                                 pirq  = pirq)
-+        if rc < 0:
-+            raise VmError('irq: Failed to map irq %x' % (pirq))
-+
-         rc = xc.domain_irq_permission(domid        = self.getDomid(),
-                                       pirq         = pirq,
-                                       allow_access = True)
-@@ -81,12 +87,6 @@ class IRQController(DevController):
-             #todo non-fatal
-             raise VmError(
-                 'irq: Failed to configure irq: %d' % (pirq))
--        rc = xc.physdev_map_pirq(domid = self.getDomid(),
--                                index = pirq,
--                                pirq  = pirq)
--        if rc < 0:
--            raise VmError(
--                'irq: Failed to map irq %x' % (pirq))
-         back = dict([(k, config[k]) for k in self.valid_cfg if k in config])
-         return (self.allocateDeviceID(), back, {})
- 
---- a/xen/arch/x86/domain_build.c
-+++ b/xen/arch/x86/domain_build.c
-@@ -1219,7 +1219,7 @@ int __init construct_dom0(
-     /* DOM0 is permitted full I/O capabilities. */
-     rc |= ioports_permit_access(dom0, 0, 0xFFFF);
-     rc |= iomem_permit_access(dom0, 0UL, ~0UL);
--    rc |= irqs_permit_access(dom0, 0, d->nr_pirqs - 1);
-+    rc |= irqs_permit_access(dom0, 1, nr_irqs_gsi - 1);
- 
-     /*
-      * Modify I/O port access permissions.
---- a/xen/arch/x86/domctl.c
-+++ b/xen/arch/x86/domctl.c
-@@ -772,9 +772,13 @@ long arch_do_domctl(
-             goto bind_out;
- 
-         ret = -EPERM;
--        if ( !IS_PRIV(current->domain) &&
--             !irq_access_permitted(current->domain, bind->machine_irq) )
--            goto bind_out;
-+        if ( !IS_PRIV(current->domain) )
-+        {
-+            int irq = domain_pirq_to_irq(d, bind->machine_irq);
-+
-+            if ( irq <= 0 || !irq_access_permitted(current->domain, irq) )
-+                goto bind_out;
-+        }
- 
-         ret = -ESRCH;
-         if ( iommu_enabled )
-@@ -803,9 +807,13 @@ long arch_do_domctl(
-         bind = &(domctl->u.bind_pt_irq);
- 
-         ret = -EPERM;
--        if ( !IS_PRIV(current->domain) &&
--             !irq_access_permitted(current->domain, bind->machine_irq) )
--            goto unbind_out;
-+        if ( !IS_PRIV(current->domain) )
-+        {
-+            int irq = domain_pirq_to_irq(d, bind->machine_irq);
-+
-+            if ( irq <= 0 || !irq_access_permitted(current->domain, irq) )
-+                goto unbind_out;
-+        }
- 
-         if ( iommu_enabled )
-         {
---- a/xen/arch/x86/irq.c
-+++ b/xen/arch/x86/irq.c
-@@ -184,6 +184,14 @@ int create_irq(int node)
-         desc->arch.used = IRQ_UNUSED;
-         irq = ret;
-     }
-+    else if ( dom0 )
-+    {
-+        ret = irq_permit_access(dom0, irq);
-+        if ( ret )
-+            printk(XENLOG_G_ERR
-+                   "Could not grant Dom0 access to IRQ%d (error %d)\n",
-+                   irq, ret);
-+    }
- 
-     return irq;
- }
-@@ -280,6 +288,17 @@ void clear_irq_vector(int irq)
- void destroy_irq(unsigned int irq)
- {
-     BUG_ON(!MSI_IRQ(irq));
-+
-+    if ( dom0 )
-+    {
-+        int err = irq_deny_access(dom0, irq);
-+
-+        if ( err )
-+            printk(XENLOG_G_ERR
-+                   "Could not revoke Dom0 access to IRQ%u (error %d)\n",
-+                   irq, err);
-+    }
-+
-     dynamic_irq_cleanup(irq);
-     clear_irq_vector(irq);
- }
-@@ -1858,7 +1877,7 @@ int map_domain_pirq(
- 
-     if ( !IS_PRIV(current->domain) &&
-          !(IS_PRIV_FOR(current->domain, d) &&
--           irq_access_permitted(current->domain, pirq)))
-+           irq_access_permitted(current->domain, irq)))
-         return -EPERM;
- 
-     if ( pirq < 0 || pirq >= d->nr_pirqs || irq < 0 || irq >= nr_irqs )
-@@ -1887,17 +1906,18 @@ int map_domain_pirq(
-         return ret;
-     }
- 
--    ret = irq_permit_access(d, pirq);
-+    ret = irq_permit_access(d, irq);
-     if ( ret )
-     {
--        dprintk(XENLOG_G_ERR, "dom%d: could not permit access to irq %d\n",
--                d->domain_id, pirq);
-+        printk(XENLOG_G_ERR
-+               "dom%d: could not permit access to IRQ%d (pirq %d)\n",
-+               d->domain_id, irq, pirq);
-         return ret;
-     }
- 
-     ret = prepare_domain_irq_pirq(d, irq, pirq, &info);
-     if ( ret )
--        return ret;
-+        goto revoke;
- 
-     desc = irq_to_desc(irq);
- 
-@@ -1921,8 +1941,14 @@ int map_domain_pirq(
-         spin_lock_irqsave(&desc->lock, flags);
- 
-         if ( desc->handler != &no_irq_type )
-+        {
-+            spin_unlock_irqrestore(&desc->lock, flags);
-             dprintk(XENLOG_G_ERR, "dom%d: irq %d in use\n",
-                     d->domain_id, irq);
-+            pci_disable_msi(msi_desc);
-+            ret = -EBUSY;
-+            goto done;
-+        }
-         setup_msi_handler(desc, msi_desc);
- 
-         if ( opt_irq_vector_map == OPT_IRQ_VECTOR_MAP_PERDEV
-@@ -1951,7 +1977,14 @@ int map_domain_pirq(
- 
- done:
-     if ( ret )
-+    {
-         cleanup_domain_irq_pirq(d, irq, info);
-+ revoke:
-+        if ( irq_deny_access(d, irq) )
-+            printk(XENLOG_G_ERR
-+                   "dom%d: could not revoke access to IRQ%d (pirq %d)\n",
-+                   d->domain_id, irq, pirq);
-+    }
-     return ret;
- }
- 
-@@ -2017,10 +2050,11 @@ int unmap_domain_pirq(struct domain *d, 
-     if ( !forced_unbind )
-         cleanup_domain_irq_pirq(d, irq, info);
- 
--    ret = irq_deny_access(d, pirq);
-+    ret = irq_deny_access(d, irq);
-     if ( ret )
--        dprintk(XENLOG_G_ERR, "dom%d: could not deny access to irq %d\n",
--                d->domain_id, pirq);
-+        printk(XENLOG_G_ERR
-+               "dom%d: could not deny access to IRQ%d (pirq %d)\n",
-+               d->domain_id, irq, pirq);
- 
-  done:
-     return ret;
---- a/xen/arch/x86/physdev.c
-+++ b/xen/arch/x86/physdev.c
-@@ -147,7 +147,7 @@ int physdev_map_pirq(domid_t domid, int 
-         if ( irq == -1 )
-             irq = create_irq(NUMA_NO_NODE);
- 
--        if ( irq < 0 || irq >= nr_irqs )
-+        if ( irq < nr_irqs_gsi || irq >= nr_irqs )
-         {
-             dprintk(XENLOG_G_ERR, "dom%d: can't create irq for msi!\n",
-                     d->domain_id);
---- a/xen/common/domctl.c
-+++ b/xen/common/domctl.c
-@@ -25,6 +25,7 @@
- #include <xen/paging.h>
- #include <xen/hypercall.h>
- #include <asm/current.h>
-+#include <asm/irq.h>
- #include <asm/page.h>
- #include <public/domctl.h>
- #include <xsm/xsm.h>
-@@ -897,9 +898,9 @@ long do_domctl(XEN_GUEST_HANDLE(xen_domc
-         else if ( xsm_irq_permission(d, pirq, allow) )
-             ret = -EPERM;
-         else if ( allow )
--            ret = irq_permit_access(d, pirq);
-+            ret = pirq_permit_access(d, pirq);
-         else
--            ret = irq_deny_access(d, pirq);
-+            ret = pirq_deny_access(d, pirq);
- 
-         rcu_unlock_domain(d);
-     }
---- a/xen/common/event_channel.c
-+++ b/xen/common/event_channel.c
-@@ -369,7 +369,7 @@ static long evtchn_bind_pirq(evtchn_bind
-     if ( (pirq < 0) || (pirq >= d->nr_pirqs) )
-         return -EINVAL;
- 
--    if ( !is_hvm_domain(d) && !irq_access_permitted(d, pirq) )
-+    if ( !is_hvm_domain(d) && !pirq_access_permitted(d, pirq) )
-         return -EPERM;
- 
-     spin_lock(&d->event_lock);
---- a/xen/include/xen/iocap.h
-+++ b/xen/include/xen/iocap.h
-@@ -28,4 +28,22 @@
- #define irq_access_permitted(d, i)                      \
-     rangeset_contains_singleton((d)->irq_caps, i)
- 
-+#define pirq_permit_access(d, i) ({                     \
-+    struct domain *d__ = (d);                           \
-+    int i__ = domain_pirq_to_irq(d__, i);               \
-+    i__ > 0 ? rangeset_add_singleton(d__->irq_caps, i__)\
-+            : -EINVAL;                                  \
-+})
-+#define pirq_deny_access(d, i) ({                       \
-+    struct domain *d__ = (d);                           \
-+    int i__ = domain_pirq_to_irq(d__, i);               \
-+    i__ > 0 ? rangeset_remove_singleton(d__->irq_caps, i__)\
-+            : -EINVAL;                                  \
-+})
-+#define pirq_access_permitted(d, i) ({                  \
-+    struct domain *d__ = (d);                           \
-+    rangeset_contains_singleton(d__->irq_caps,          \
-+                                domain_pirq_to_irq(d__, i));\
-+})
-+
- #endif /* __XEN_IOCAP_H__ */
diff --git a/app-emulation/xen-pvgrub/files/xen-4-CVE-2013-1952-XSA_49.patch b/app-emulation/xen-pvgrub/files/xen-4-CVE-2013-1952-XSA_49.patch
deleted file mode 100644
index 4543f21bc460..000000000000
--- a/app-emulation/xen-pvgrub/files/xen-4-CVE-2013-1952-XSA_49.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ur xen-4.2.1.orig/xen/drivers/passthrough/vtd/intremap.c xen-4.2.1/xen/drivers/passthrough/vtd/intremap.c
---- xen/drivers/passthrough/vtd/intremap.c	2012-12-17 23:01:55.000000000 +0800
-+++ xen/drivers/passthrough/vtd/intremap.c	2013-05-15 23:09:06.704546506 +0800
-@@ -440,16 +440,17 @@
-     type = pdev_type(seg, bus, devfn);
-     switch ( type )
-     {
-+    case DEV_TYPE_PCIe_ENDPOINT:
-     case DEV_TYPE_PCIe_BRIDGE:
-     case DEV_TYPE_PCIe2PCI_BRIDGE:
--    case DEV_TYPE_LEGACY_PCI_BRIDGE:
--        break;
- 
--    case DEV_TYPE_PCIe_ENDPOINT:
-         set_ire_sid(ire, SVT_VERIFY_SID_SQ, SQ_ALL_16, PCI_BDF2(bus, devfn));
-         break;
- 
-     case DEV_TYPE_PCI:
-+    case DEV_TYPE_LEGACY_PCI_BRIDGE:
-+    /* case DEV_TYPE_PCI2PCIe_BRIDGE: */
-+
-         ret = find_upstream_bridge(seg, &bus, &devfn, &secbus);
-         if ( ret == 0 ) /* integrated PCI device */
-         {
-@@ -461,10 +462,15 @@
-             if ( pdev_type(seg, bus, devfn) == DEV_TYPE_PCIe2PCI_BRIDGE )
-                 set_ire_sid(ire, SVT_VERIFY_BUS, SQ_ALL_16,
-                             (bus << 8) | pdev->bus);
--            else if ( pdev_type(seg, bus, devfn) == DEV_TYPE_LEGACY_PCI_BRIDGE )
-+            else
-                 set_ire_sid(ire, SVT_VERIFY_BUS, SQ_ALL_16,
-                             PCI_BDF2(bus, devfn));
-         }
-+        else
-+            dprintk(XENLOG_WARNING VTDPREFIX,
-+                    "d%d: no upstream bridge for %04x:%02x:%02x.%u\n",
-+                    pdev->domain->domain_id,
-+                    seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
-         break;
- 
-     default:
diff --git a/app-emulation/xen-pvgrub/files/xen-4.2-CVE-2013-6-XSA-55.patch b/app-emulation/xen-pvgrub/files/xen-4.2-CVE-2013-6-XSA-55.patch
deleted file mode 100644
index 67990a2435c3..000000000000
--- a/app-emulation/xen-pvgrub/files/xen-4.2-CVE-2013-6-XSA-55.patch
+++ /dev/null
@@ -1,252 +0,0 @@
-From 3fb6ccf2faccaf5e22e33a3155ccc72d732896d8 Mon Sep 17 00:00:00 2001
-From: Ian Jackson <ian.jackson@eu.citrix.com>
-Date: Fri, 14 Jun 2013 16:43:18 +0100
-Subject: [PATCH 14/23] libelf: use C99 bool for booleans
-
-We want to remove uses of "int" because signed integers have
-undesirable undefined behaviours on overflow.  Malicious compilers can
-turn apparently-correct code into code with security vulnerabilities
-etc.
-
-In this patch we change all the booleans in libelf to C99 bool,
-from <stdbool.h>.
-
-For the one visible libelf boolean in libxc's public interface we
-retain the use of int to avoid changing the ABI; libxc converts it to
-a bool for consumption by libelf.
-
-It is OK to change all values only ever used as booleans to _Bool
-(bool) because conversion from any scalar type to a _Bool works the
-same as the boolean test in if() or ?: and is always defined (C99
-6.3.1.2).  But we do need to check that all these variables really are
-only ever used that way.  (It is theoretically possible that the old
-code truncated some 64-bit values to 32-bit ints which might become
-zero depending on the value, which would mean a behavioural change in
-this patch, but it seems implausible that treating 0x????????00000000
-as false could have been intended.)
-
-This is part of the fix to a security issue, XSA-55.
-
-Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
-Acked-by: George Dunlap <george.dunlap@eu.citrix.com>
----
- tools/libxc/xc_dom_elfloader.c     |    8 ++++----
- xen/common/libelf/libelf-dominfo.c |    2 +-
- xen/common/libelf/libelf-loader.c  |    4 ++--
- xen/common/libelf/libelf-private.h |    2 +-
- xen/common/libelf/libelf-tools.c   |   10 +++++-----
- xen/include/xen/libelf.h           |   18 ++++++++++--------
- 6 files changed, 23 insertions(+), 21 deletions(-)
-
-diff --git a/tools/libxc/xc_dom_elfloader.c b/tools/libxc/xc_dom_elfloader.c
-index 4fb4da2..9ba64ae 100644
---- a/tools/libxc/xc_dom_elfloader.c
-+++ b/tools/libxc/xc_dom_elfloader.c
-@@ -34,7 +34,7 @@
- /* ------------------------------------------------------------------------ */
- 
- static void log_callback(struct elf_binary *elf, void *caller_data,
--                         int iserr, const char *fmt, va_list al) {
-+                         bool iserr, const char *fmt, va_list al) {
-     xc_interface *xch = caller_data;
- 
-     xc_reportv(xch,
-@@ -46,7 +46,7 @@ static void log_callback(struct elf_binary *elf, void *caller_data,
- 
- void xc_elf_set_logfile(xc_interface *xch, struct elf_binary *elf,
-                         int verbose) {
--    elf_set_log(elf, log_callback, xch, verbose);
-+    elf_set_log(elf, log_callback, xch, verbose /* convert to bool */);
- }
- 
- /* ------------------------------------------------------------------------ */
-@@ -84,7 +84,7 @@ static char *xc_dom_guest_type(struct xc_dom_image *dom,
- /* ------------------------------------------------------------------------ */
- /* parse elf binary                                                         */
- 
--static int check_elf_kernel(struct xc_dom_image *dom, int verbose)
-+static int check_elf_kernel(struct xc_dom_image *dom, bool verbose)
- {
-     if ( dom->kernel_blob == NULL )
-     {
-@@ -112,7 +112,7 @@ static int xc_dom_probe_elf_kernel(struct xc_dom_image *dom)
- }
- 
- static int xc_dom_load_elf_symtab(struct xc_dom_image *dom,
--                                  struct elf_binary *elf, int load)
-+                                  struct elf_binary *elf, bool load)
- {
-     struct elf_binary syms;
-     ELF_HANDLE_DECL_NONCONST(elf_shdr) shdr; ELF_HANDLE_DECL(elf_shdr) shdr2;
-diff --git a/xen/common/libelf/libelf-dominfo.c b/xen/common/libelf/libelf-dominfo.c
-index 98c80dc..12b6c2a 100644
---- a/xen/common/libelf/libelf-dominfo.c
-+++ b/xen/common/libelf/libelf-dominfo.c
-@@ -101,7 +101,7 @@ int elf_xen_parse_note(struct elf_binary *elf,
- /* *INDENT-OFF* */
-     static const struct {
-         char *name;
--        int str;
-+        bool str;
-     } note_desc[] = {
-         [XEN_ELFNOTE_ENTRY] = { "ENTRY", 0},
-         [XEN_ELFNOTE_HYPERCALL_PAGE] = { "HYPERCALL_PAGE", 0},
-diff --git a/xen/common/libelf/libelf-loader.c b/xen/common/libelf/libelf-loader.c
-index f8be635..0dccd4d 100644
---- a/xen/common/libelf/libelf-loader.c
-+++ b/xen/common/libelf/libelf-loader.c
-@@ -92,7 +92,7 @@ int elf_init(struct elf_binary *elf, const char *image_input, size_t size)
- }
- 
- #ifndef __XEN__
--void elf_call_log_callback(struct elf_binary *elf, int iserr,
-+void elf_call_log_callback(struct elf_binary *elf, bool iserr,
-                            const char *fmt,...) {
-     va_list al;
- 
-@@ -107,7 +107,7 @@ void elf_call_log_callback(struct elf_binary *elf, int iserr,
- }
-     
- void elf_set_log(struct elf_binary *elf, elf_log_callback *log_callback,
--                 void *log_caller_data, int verbose)
-+                 void *log_caller_data, bool verbose)
- {
-     elf->log_callback = log_callback;
-     elf->log_caller_data = log_caller_data;
-diff --git a/xen/common/libelf/libelf-private.h b/xen/common/libelf/libelf-private.h
-index 280dfd1..277be04 100644
---- a/xen/common/libelf/libelf-private.h
-+++ b/xen/common/libelf/libelf-private.h
-@@ -77,7 +77,7 @@
- #define elf_err(elf, fmt, args ... )                    \
-     elf_call_log_callback(elf, 1, fmt , ## args );
- 
--void elf_call_log_callback(struct elf_binary*, int iserr, const char *fmt,...);
-+void elf_call_log_callback(struct elf_binary*, bool iserr, const char *fmt,...);
- 
- #define safe_strcpy(d,s)                        \
- do { strncpy((d),(s),sizeof((d))-1);            \
-diff --git a/xen/common/libelf/libelf-tools.c b/xen/common/libelf/libelf-tools.c
-index 744027e..fa58f76 100644
---- a/xen/common/libelf/libelf-tools.c
-+++ b/xen/common/libelf/libelf-tools.c
-@@ -31,7 +31,7 @@ const char *elf_check_broken(const struct elf_binary *elf)
-     return elf->broken;
- }
- 
--static int elf_ptrval_in_range(elf_ptrval ptrval, uint64_t size,
-+static bool elf_ptrval_in_range(elf_ptrval ptrval, uint64_t size,
-                                const void *region, uint64_t regionsize)
-     /*
-      * Returns true if the putative memory area [ptrval,ptrval+size>
-@@ -53,7 +53,7 @@ static int elf_ptrval_in_range(elf_ptrval ptrval, uint64_t size,
-     return 1;
- }
- 
--int elf_access_ok(struct elf_binary * elf,
-+bool elf_access_ok(struct elf_binary * elf,
-                   uint64_t ptrval, size_t size)
- {
-     if ( elf_ptrval_in_range(ptrval, size, elf->image_base, elf->size) )
-@@ -92,7 +92,7 @@ uint64_t elf_access_unsigned(struct elf_binary * elf, elf_ptrval base,
-                              uint64_t moreoffset, size_t size)
- {
-     elf_ptrval ptrval = base + moreoffset;
--    int need_swap = elf_swap(elf);
-+    bool need_swap = elf_swap(elf);
-     const uint8_t *u8;
-     const uint16_t *u16;
-     const uint32_t *u32;
-@@ -332,7 +332,7 @@ ELF_HANDLE_DECL(elf_note) elf_note_next(struct elf_binary *elf, ELF_HANDLE_DECL(
- 
- /* ------------------------------------------------------------------------ */
- 
--int elf_is_elfbinary(const void *image_start, size_t image_size)
-+bool elf_is_elfbinary(const void *image_start, size_t image_size)
- {
-     const Elf32_Ehdr *ehdr = image_start;
- 
-@@ -342,7 +342,7 @@ int elf_is_elfbinary(const void *image_start, size_t image_size)
-     return IS_ELF(*ehdr);
- }
- 
--int elf_phdr_is_loadable(struct elf_binary *elf, ELF_HANDLE_DECL(elf_phdr) phdr)
-+bool elf_phdr_is_loadable(struct elf_binary *elf, ELF_HANDLE_DECL(elf_phdr) phdr)
- {
-     uint64_t p_type = elf_uval(elf, phdr, p_type);
-     uint64_t p_flags = elf_uval(elf, phdr, p_flags);
-diff --git a/xen/include/xen/libelf.h b/xen/include/xen/libelf.h
-index ac93858..951430f 100644
---- a/xen/include/xen/libelf.h
-+++ b/xen/include/xen/libelf.h
-@@ -29,6 +29,8 @@
- #error define architectural endianness
- #endif
- 
-+#include <stdbool.h>
-+
- #undef ELFSIZE
- #include "elfstructs.h"
- #ifdef __XEN__
-@@ -42,7 +44,7 @@
- 
- struct elf_binary;
- typedef void elf_log_callback(struct elf_binary*, void *caller_data,
--                              int iserr, const char *fmt, va_list al);
-+                              bool iserr, const char *fmt, va_list al);
- 
- #endif
- 
-@@ -237,7 +239,7 @@ struct elf_binary {
-     elf_log_callback *log_callback;
-     void *log_caller_data;
- #endif
--    int verbose;
-+    bool verbose;
-     const char *broken;
- };
- 
-@@ -301,8 +303,8 @@ void elf_memset_safe(struct elf_binary*, elf_ptrval dst, int c, size_t);
-    * outside permitted areas.
-    */
- 
--int elf_access_ok(struct elf_binary * elf,
--                  uint64_t ptrval, size_t size);
-+bool elf_access_ok(struct elf_binary * elf,
-+                   uint64_t ptrval, size_t size);
- 
- #define elf_store_val(elf, type, ptr, val)                              \
-     ({                                                                  \
-@@ -351,9 +353,9 @@ uint64_t elf_note_numeric_array(struct elf_binary *, ELF_HANDLE_DECL(elf_note),
- ELF_HANDLE_DECL(elf_note) elf_note_next(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note);
- 
- /* (Only) checks that the image has the right magic number. */
--int elf_is_elfbinary(const void *image_start, size_t image_size);
-+bool elf_is_elfbinary(const void *image_start, size_t image_size);
- 
--int elf_phdr_is_loadable(struct elf_binary *elf, ELF_HANDLE_DECL(elf_phdr) phdr);
-+bool elf_phdr_is_loadable(struct elf_binary *elf, ELF_HANDLE_DECL(elf_phdr) phdr);
- 
- /* ------------------------------------------------------------------------ */
- /* xc_libelf_loader.c                                                       */
-@@ -367,7 +369,7 @@ int elf_init(struct elf_binary *elf, const char *image, size_t size);
- void elf_set_verbose(struct elf_binary *elf);
- #else
- void elf_set_log(struct elf_binary *elf, elf_log_callback*,
--                 void *log_caller_pointer, int verbose);
-+                 void *log_caller_pointer, bool verbose);
- #endif
- 
- void elf_parse_binary(struct elf_binary *elf);
-@@ -419,7 +421,7 @@ struct elf_dom_parms {
-     char xen_ver[16];
-     char loader[16];
-     int pae;
--    int bsd_symtab;
-+    bool bsd_symtab;
-     uint64_t virt_base;
-     uint64_t virt_entry;
-     uint64_t virt_hypercall;
--- 
-1.7.2.5
-
diff --git a/app-emulation/xen-pvgrub/files/xen-4.2-CVE-2013-7-XSA-55.patch b/app-emulation/xen-pvgrub/files/xen-4.2-CVE-2013-7-XSA-55.patch
deleted file mode 100644
index 61076204fa30..000000000000
--- a/app-emulation/xen-pvgrub/files/xen-4.2-CVE-2013-7-XSA-55.patch
+++ /dev/null
@@ -1,382 +0,0 @@
-From 77c0829fa751f052f7b8ec08287aef6e7ba97bc5 Mon Sep 17 00:00:00 2001
-From: Ian Jackson <ian.jackson@eu.citrix.com>
-Date: Fri, 14 Jun 2013 16:43:19 +0100
-Subject: [PATCH 19/23] libxc: check failure of xc_dom_*_to_ptr, xc_map_foreign_range
-
-The return values from xc_dom_*_to_ptr and xc_map_foreign_range are
-sometimes dereferenced, or subjected to pointer arithmetic, without
-checking whether the relevant function failed and returned NULL.
-
-Add an appropriate error check at every call site.
-
-Changes in the 4.2 backport of this series:
-* Fix tools/libxc/xc_dom_x86.c:setup_pgtables_x86_32.
-* Fix tools/libxc/xc_dom_ia64.c:start_info_ia64.
-* Fix tools/libxc/ia64/xc_ia64_dom_fwloader.c:xc_dom_load_fw_kernel.
-
-This is part of the fix to a security issue, XSA-55.
-
-Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
----
- tools/libxc/ia64/xc_ia64_dom_fwloader.c |    2 +
- tools/libxc/xc_dom_binloader.c          |    6 +++
- tools/libxc/xc_dom_core.c               |    6 +++
- tools/libxc/xc_dom_elfloader.c          |   13 +++++++
- tools/libxc/xc_dom_ia64.c               |    6 +++
- tools/libxc/xc_dom_x86.c                |   55 +++++++++++++++++++++++++++++++
- tools/libxc/xc_domain_restore.c         |   27 +++++++++++++++
- tools/libxc/xc_offline_page.c           |    5 +++
- 8 files changed, 120 insertions(+), 0 deletions(-)
-
-diff --git a/tools/libxc/ia64/xc_ia64_dom_fwloader.c b/tools/libxc/ia64/xc_ia64_dom_fwloader.c
-index cdf3333..dbd3349 100644
---- a/tools/libxc/ia64/xc_ia64_dom_fwloader.c
-+++ b/tools/libxc/ia64/xc_ia64_dom_fwloader.c
-@@ -60,6 +60,8 @@ static int xc_dom_load_fw_kernel(struct xc_dom_image *dom)
-     unsigned long i;
- 
-     dest = xc_dom_vaddr_to_ptr(dom, dom->kernel_seg.vstart);
-+    if ( dest == NULL )
-+        return -1;
-     memcpy(dest, dom->kernel_blob, FW_SIZE);
- 
-     /* Synchronize cache.  */
-diff --git a/tools/libxc/xc_dom_binloader.c b/tools/libxc/xc_dom_binloader.c
-index 8596a28..553b366 100644
---- a/tools/libxc/xc_dom_binloader.c
-+++ b/tools/libxc/xc_dom_binloader.c
-@@ -277,6 +277,12 @@ static int xc_dom_load_bin_kernel(struct xc_dom_image *dom)
-     DOMPRINTF("  bss_size:  0x%" PRIx32 "", bss_size);
- 
-     dest = xc_dom_vaddr_to_ptr(dom, dom->kernel_seg.vstart, &dest_size);
-+    if ( dest == NULL )
-+    {
-+        DOMPRINTF("%s: xc_dom_vaddr_to_ptr(dom, dom->kernel_seg.vstart)"
-+                  " => NULL", __FUNCTION__);
-+        return -EINVAL;
-+    }
- 
-     if ( dest_size < text_size ||
-          dest_size - text_size < bss_size )
-diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c
-index 8913e41..a54ddae 100644
---- a/tools/libxc/xc_dom_core.c
-+++ b/tools/libxc/xc_dom_core.c
-@@ -868,6 +868,12 @@ int xc_dom_build_image(struct xc_dom_image *dom)
-                                   ramdisklen) != 0 )
-             goto err;
-         ramdiskmap = xc_dom_seg_to_ptr(dom, &dom->ramdisk_seg);
-+        if ( ramdiskmap == NULL )
-+        {
-+            DOMPRINTF("%s: xc_dom_seg_to_ptr(dom, &dom->ramdisk_seg) => NULL",
-+                      __FUNCTION__);
-+            goto err;
-+        }
-         if ( unziplen )
-         {
-             if ( xc_dom_do_gunzip(dom->xch,
-diff --git a/tools/libxc/xc_dom_elfloader.c b/tools/libxc/xc_dom_elfloader.c
-index 9fc4b94..61b5798 100644
---- a/tools/libxc/xc_dom_elfloader.c
-+++ b/tools/libxc/xc_dom_elfloader.c
-@@ -139,6 +139,12 @@ static elf_errorstatus xc_dom_load_elf_symtab(struct xc_dom_image *dom,
-             return 0;
-         size = dom->kernel_seg.vend - dom->bsd_symtab_start;
-         hdr_ptr = xc_dom_vaddr_to_ptr(dom, dom->bsd_symtab_start, &allow_size);
-+        if ( hdr_ptr == NULL )
-+        {
-+            DOMPRINTF("%s/load: xc_dom_vaddr_to_ptr(dom,dom->bsd_symtab_start"
-+                      " => NULL", __FUNCTION__);
-+            return -1;
-+        }
-         elf->caller_xdest_base = hdr_ptr;
-         elf->caller_xdest_size = allow_size;
-         hdr = ELF_REALPTR2PTRVAL(hdr_ptr);
-@@ -384,7 +390,14 @@ static elf_errorstatus xc_dom_load_elf_kernel(struct xc_dom_image *dom)
-     xen_pfn_t pages;
- 
-     elf->dest_base = xc_dom_seg_to_ptr_pages(dom, &dom->kernel_seg, &pages);
-+    if ( elf->dest_base == NULL )
-+    {
-+        DOMPRINTF("%s: xc_dom_vaddr_to_ptr(dom,dom->kernel_seg)"
-+                  " => NULL", __FUNCTION__);
-+        return -1;
-+    }
-     elf->dest_size = pages * XC_DOM_PAGE_SIZE(dom);
-+
-     rc = elf_load_binary(elf);
-     if ( rc < 0 )
-     {
-diff --git a/tools/libxc/xc_dom_ia64.c b/tools/libxc/xc_dom_ia64.c
-index dcd1523..7c0eff1 100644
---- a/tools/libxc/xc_dom_ia64.c
-+++ b/tools/libxc/xc_dom_ia64.c
-@@ -60,6 +60,12 @@ int start_info_ia64(struct xc_dom_image *dom)
- 
-     DOMPRINTF_CALLED(dom->xch);
- 
-+    if ( start_info == NULL )
-+    {
-+        DOMPRINTF("%s: xc_dom_pfn_to_ptr failed on start_info", __FUNCTION__);
-+        return -1; /* our caller throws away our return value :-/ */
-+    }
-+
-     memset(start_info, 0, sizeof(*start_info));
-     sprintf(start_info->magic, dom->guest_type);
-     start_info->flags = dom->flags;
-diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c
-index 0cf1687..75d6b83 100644
---- a/tools/libxc/xc_dom_x86.c
-+++ b/tools/libxc/xc_dom_x86.c
-@@ -144,6 +144,9 @@ static int setup_pgtables_x86_32(struct xc_dom_image *dom)
-     xen_vaddr_t addr;
-     xen_pfn_t pgpfn;
- 
-+    if ( l2tab == NULL )
-+        goto pfn_error;
-+
-     for ( addr = dom->parms.virt_base; addr < dom->virt_pgtab_end;
-           addr += PAGE_SIZE_X86 )
-     {
-@@ -151,6 +154,8 @@ static int setup_pgtables_x86_32(struct xc_dom_image *dom)
-         {
-             /* get L1 tab, make L2 entry */
-             l1tab = xc_dom_pfn_to_ptr(dom, l1pfn, 1);
-+            if ( l1tab == NULL )
-+                goto pfn_error;
-             l2off = l2_table_offset_i386(addr);
-             l2tab[l2off] =
-                 pfn_to_paddr(xc_dom_p2m_guest(dom, l1pfn)) | L2_PROT;
-@@ -169,6 +174,11 @@ static int setup_pgtables_x86_32(struct xc_dom_image *dom)
-             l1tab = NULL;
-     }
-     return 0;
-+
-+pfn_error:
-+    xc_dom_panic(dom->xch, XC_INTERNAL_ERROR,
-+                 "%s: xc_dom_pfn_to_ptr failed", __FUNCTION__);
-+    return -EINVAL;
- }
- 
- /*
-@@ -219,6 +229,12 @@ static xen_pfn_t move_l3_below_4G(struct xc_dom_image *dom,
-         goto out;
- 
-     l3tab = xc_dom_pfn_to_ptr(dom, l3pfn, 1);
-+    if ( l3tab == NULL )
-+    {
-+        DOMPRINTF("%s: xc_dom_pfn_to_ptr(dom, l3pfn, 1) => NULL",
-+                  __FUNCTION__);
-+        return l3mfn; /* our one call site will call xc_dom_panic and fail */
-+    }
-     memset(l3tab, 0, XC_DOM_PAGE_SIZE(dom));
- 
-     DOMPRINTF("%s: successfully relocated L3 below 4G. "
-@@ -262,6 +278,8 @@ static int setup_pgtables_x86_32_pae(struct xc_dom_image *dom)
-     }
- 
-     l3tab = xc_dom_pfn_to_ptr(dom, l3pfn, 1);
-+    if ( l3tab == NULL )
-+        goto pfn_error;
- 
-     for ( addr = dom->parms.virt_base; addr < dom->virt_pgtab_end;
-           addr += PAGE_SIZE_X86 )
-@@ -270,6 +288,8 @@ static int setup_pgtables_x86_32_pae(struct xc_dom_image *dom)
-         {
-             /* get L2 tab, make L3 entry */
-             l2tab = xc_dom_pfn_to_ptr(dom, l2pfn, 1);
-+            if ( l2tab == NULL )
-+                goto pfn_error;
-             l3off = l3_table_offset_pae(addr);
-             l3tab[l3off] =
-                 pfn_to_paddr(xc_dom_p2m_guest(dom, l2pfn)) | L3_PROT;
-@@ -280,6 +300,8 @@ static int setup_pgtables_x86_32_pae(struct xc_dom_image *dom)
-         {
-             /* get L1 tab, make L2 entry */
-             l1tab = xc_dom_pfn_to_ptr(dom, l1pfn, 1);
-+            if ( l1tab == NULL )
-+                goto pfn_error;
-             l2off = l2_table_offset_pae(addr);
-             l2tab[l2off] =
-                 pfn_to_paddr(xc_dom_p2m_guest(dom, l1pfn)) | L2_PROT;
-@@ -306,6 +328,11 @@ static int setup_pgtables_x86_32_pae(struct xc_dom_image *dom)
-         l3tab[3] = pfn_to_paddr(xc_dom_p2m_guest(dom, l2pfn)) | L3_PROT;
-     }
-     return 0;
-+
-+pfn_error:
-+    xc_dom_panic(dom->xch, XC_INTERNAL_ERROR,
-+                 "%s: xc_dom_pfn_to_ptr failed", __FUNCTION__);
-+    return -EINVAL;
- }
- 
- #undef L1_PROT
-@@ -344,6 +371,9 @@ static int setup_pgtables_x86_64(struct xc_dom_image *dom)
-     uint64_t addr;
-     xen_pfn_t pgpfn;
- 
-+    if ( l4tab == NULL )
-+        goto pfn_error;
-+
-     for ( addr = dom->parms.virt_base; addr < dom->virt_pgtab_end;
-           addr += PAGE_SIZE_X86 )
-     {
-@@ -351,6 +381,8 @@ static int setup_pgtables_x86_64(struct xc_dom_image *dom)
-         {
-             /* get L3 tab, make L4 entry */
-             l3tab = xc_dom_pfn_to_ptr(dom, l3pfn, 1);
-+            if ( l3tab == NULL )
-+                goto pfn_error;
-             l4off = l4_table_offset_x86_64(addr);
-             l4tab[l4off] =
-                 pfn_to_paddr(xc_dom_p2m_guest(dom, l3pfn)) | L4_PROT;
-@@ -361,6 +393,8 @@ static int setup_pgtables_x86_64(struct xc_dom_image *dom)
-         {
-             /* get L2 tab, make L3 entry */
-             l2tab = xc_dom_pfn_to_ptr(dom, l2pfn, 1);
-+            if ( l2tab == NULL )
-+                goto pfn_error;
-             l3off = l3_table_offset_x86_64(addr);
-             l3tab[l3off] =
-                 pfn_to_paddr(xc_dom_p2m_guest(dom, l2pfn)) | L3_PROT;
-@@ -373,6 +407,8 @@ static int setup_pgtables_x86_64(struct xc_dom_image *dom)
-         {
-             /* get L1 tab, make L2 entry */
-             l1tab = xc_dom_pfn_to_ptr(dom, l1pfn, 1);
-+            if ( l1tab == NULL )
-+                goto pfn_error;
-             l2off = l2_table_offset_x86_64(addr);
-             l2tab[l2off] =
-                 pfn_to_paddr(xc_dom_p2m_guest(dom, l1pfn)) | L2_PROT;
-@@ -393,6 +429,11 @@ static int setup_pgtables_x86_64(struct xc_dom_image *dom)
-             l1tab = NULL;
-     }
-     return 0;
-+
-+pfn_error:
-+    xc_dom_panic(dom->xch, XC_INTERNAL_ERROR,
-+                 "%s: xc_dom_pfn_to_ptr failed", __FUNCTION__);
-+    return -EINVAL;
- }
- 
- #undef L1_PROT
-@@ -410,6 +451,8 @@ static int alloc_magic_pages(struct xc_dom_image *dom)
-     if ( xc_dom_alloc_segment(dom, &dom->p2m_seg, "phys2mach", 0, p2m_size) )
-         return -1;
-     dom->p2m_guest = xc_dom_seg_to_ptr(dom, &dom->p2m_seg);
-+    if ( dom->p2m_guest == NULL )
-+        return -1;
- 
-     /* allocate special pages */
-     dom->start_info_pfn = xc_dom_alloc_page(dom, "start info");
-@@ -434,6 +477,12 @@ static int start_info_x86_32(struct xc_dom_image *dom)
- 
-     DOMPRINTF_CALLED(dom->xch);
- 
-+    if ( start_info == NULL )
-+    {
-+        DOMPRINTF("%s: xc_dom_pfn_to_ptr failed on start_info", __FUNCTION__);
-+        return -1; /* our caller throws away our return value :-/ */
-+    }
-+
-     memset(start_info, 0, sizeof(*start_info));
-     strncpy(start_info->magic, dom->guest_type, sizeof(start_info->magic));
-     start_info->magic[sizeof(start_info->magic) - 1] = '\0';
-@@ -474,6 +523,12 @@ static int start_info_x86_64(struct xc_dom_image *dom)
- 
-     DOMPRINTF_CALLED(dom->xch);
- 
-+    if ( start_info == NULL )
-+    {
-+        DOMPRINTF("%s: xc_dom_pfn_to_ptr failed on start_info", __FUNCTION__);
-+        return -1; /* our caller throws away our return value :-/ */
-+    }
-+
-     memset(start_info, 0, sizeof(*start_info));
-     strncpy(start_info->magic, dom->guest_type, sizeof(start_info->magic));
-     start_info->magic[sizeof(start_info->magic) - 1] = '\0';
-diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c
-index b4c0b10..3994f8f 100644
---- a/tools/libxc/xc_domain_restore.c
-+++ b/tools/libxc/xc_domain_restore.c
-@@ -1556,6 +1556,12 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom,
-                     mfn = ctx->p2m[pfn];
-                     buf = xc_map_foreign_range(xch, dom, PAGE_SIZE,
-                                                PROT_READ | PROT_WRITE, mfn);
-+                    if ( buf == NULL )
-+                    {
-+                        ERROR("xc_map_foreign_range for generation id"
-+                              " buffer failed");
-+                        goto out;
-+                    }
- 
-                     generationid = *(unsigned long long *)(buf + offset);
-                     *(unsigned long long *)(buf + offset) = generationid + 1;
-@@ -1713,6 +1719,11 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom,
-                 l3tab = (uint64_t *)
-                     xc_map_foreign_range(xch, dom, PAGE_SIZE,
-                                          PROT_READ, ctx->p2m[i]);
-+                if ( l3tab == NULL )
-+                {
-+                    PERROR("xc_map_foreign_range failed (for l3tab)");
-+                    goto out;
-+                }
- 
-                 for ( j = 0; j < 4; j++ )
-                     l3ptes[j] = l3tab[j];
-@@ -1739,6 +1750,11 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom,
-                 l3tab = (uint64_t *)
-                     xc_map_foreign_range(xch, dom, PAGE_SIZE,
-                                          PROT_READ | PROT_WRITE, ctx->p2m[i]);
-+                if ( l3tab == NULL )
-+                {
-+                    PERROR("xc_map_foreign_range failed (for l3tab, 2nd)");
-+                    goto out;
-+                }
- 
-                 for ( j = 0; j < 4; j++ )
-                     l3tab[j] = l3ptes[j];
-@@ -1909,6 +1925,12 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom,
-             SET_FIELD(ctxt, user_regs.edx, mfn);
-             start_info = xc_map_foreign_range(
-                 xch, dom, PAGE_SIZE, PROT_READ | PROT_WRITE, mfn);
-+            if ( start_info == NULL )
-+            {
-+                PERROR("xc_map_foreign_range failed (for start_info)");
-+                goto out;
-+            }
-+
-             SET_FIELD(start_info, nr_pages, dinfo->p2m_size);
-             SET_FIELD(start_info, shared_info, shared_info_frame<<PAGE_SHIFT);
-             SET_FIELD(start_info, flags, 0);
-@@ -2056,6 +2078,11 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom,
-     /* Restore contents of shared-info page. No checking needed. */
-     new_shared_info = xc_map_foreign_range(
-         xch, dom, PAGE_SIZE, PROT_WRITE, shared_info_frame);
-+    if ( new_shared_info == NULL )
-+    {
-+        PERROR("xc_map_foreign_range failed (for new_shared_info)");
-+        goto out;
-+    }
- 
-     /* restore saved vcpu_info and arch specific info */
-     MEMCPY_FIELD(new_shared_info, old_shared_info, vcpu_info);
-diff --git a/tools/libxc/xc_offline_page.c b/tools/libxc/xc_offline_page.c
-index 089a361..36b9812 100644
---- a/tools/libxc/xc_offline_page.c
-+++ b/tools/libxc/xc_offline_page.c
-@@ -714,6 +714,11 @@ int xc_exchange_page(xc_interface *xch, int domid, xen_pfn_t mfn)
- 
-         new_p = xc_map_foreign_range(xch, domid, PAGE_SIZE,
-                                      PROT_READ|PROT_WRITE, new_mfn);
-+        if ( new_p == NULL )
-+        {
-+            ERROR("failed to map new_p for copy, guest may be broken?");
-+            goto failed;
-+        }
-         memcpy(new_p, backup, PAGE_SIZE);
-         munmap(new_p, PAGE_SIZE);
-         mops.arg1.mfn = new_mfn;
--- 
-1.7.2.5
-
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.2.2-r1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.2-r1.ebuild
index cbe6aa74584f..61ebab624565 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.2.2-r1.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.2-r1.ebuild,v 1.8 2013/09/26 10:13:20 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.2-r1.ebuild,v 1.9 2014/01/01 11:47:20 tomwij Exp $
 
 EAPI=4
 PYTHON_DEPEND="2:2.6"
@@ -110,7 +110,7 @@ src_prepare() {
 		"${FILESDIR}"/xen-4.2-CVE-2013-20to23-XSA-55.patch
 
 	#Substitute for internal downloading. pciutils copied only due to the only .bz2
-	cp $DISTDIR/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
+	cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
 	retar-externals || die "re-tar procedure failed"
 }
 
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.3.0.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.3.0.ebuild
index 6559e64d3a10..e9e8f6e9c2e7 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.3.0.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.3.0.ebuild,v 1.3 2013/08/23 13:14:52 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.3.0.ebuild,v 1.4 2014/01/01 11:47:20 tomwij Exp $
 
 EAPI=4
 PYTHON_DEPEND="2:2.7"
@@ -94,7 +94,7 @@ src_prepare() {
 		"${FILESDIR}"/xen-4-CVE-2013-1922-XSA-48.patch
 
 	#Substitute for internal downloading. pciutils copied only due to the only .bz2
-	cp $DISTDIR/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
+	cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
 	retar-externals || die "re-tar procedure failed"
 }
 
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.3.1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.3.1.ebuild
index e947ce10b298..0166a0b339b9 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.3.1.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.3.1.ebuild,v 1.3 2013/12/10 13:35:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.3.1.ebuild,v 1.4 2014/01/01 11:47:20 tomwij Exp $
 
 EAPI=4
 PYTHON_DEPEND="2:2.7"
@@ -93,7 +93,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN/-pvgrub/}-4-CVE-2012-6075-XSA-41.patch
 
 	#Substitute for internal downloading. pciutils copied only due to the only .bz2
-	cp $DISTDIR/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
+	cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
 	retar-externals || die "re-tar procedure failed"
 }